[balsa] More locking and protection against NULLs.

From: Pawel Salek <pawels src gnome org>
To: svn-commits-list gnome org
Subject: [balsa] More locking and protection against NULLs.
Date: Tue, 28 Jul 2009 21:53:07 +0000 (UTC)
commit 1605fdfa494b6a771745291b1f8bfe3312b5bb38
Author: Pawel Salek <pawsa damage localdomain>
Date:   Tue Jul 28 23:49:37 2009 +0200

    More locking and protection against NULLs.
    
    * libbalsa/address-view.c: protect against empty InternetAddressLists.
    * libbalsa/imap/imap-commands.c: lock LIST, LSUB, STATUS as well.

 libbalsa/address-view.c       |   12 +-
 libbalsa/imap/imap-commands.c |   18 +-
 po/pl.po                      | 6687 +++++++++++++++++++++++------------------
 src/sendmsg-window.c          |    2 +-
 4 files changed, 3743 insertions(+), 2976 deletions(-)
---
diff --git a/libbalsa/address-view.c b/libbalsa/address-view.c
index d2f0b75..30d1595 100644
--- a/libbalsa/address-view.c
+++ b/libbalsa/address-view.c
@@ -411,12 +411,16 @@ lbav_add_from_string(LibBalsaAddressView * address_view,
                      GtkTreeIter * iter, const gchar * string)
 {
     InternetAddressList *list = internet_address_list_parse_string(string);
-    gboolean retval = internet_address_list_length(list) > 0;
 
-    lbav_add_from_list(address_view, iter, list);
-    g_object_unref(list);
+    if (list) {
+        gboolean retval = internet_address_list_length(list) > 0;
 
-    return retval;
+        lbav_add_from_list(address_view, iter, list);
+        g_object_unref(list);
+
+        return retval;
+    } else
+        return FALSE;
 }
 
 /*
diff --git a/libbalsa/imap/imap-commands.c b/libbalsa/imap/imap-commands.c
index b6b94c9..a2ef3f1 100644
--- a/libbalsa/imap/imap-commands.c
+++ b/libbalsa/imap/imap-commands.c
@@ -317,15 +317,18 @@ imap_mbox_subscribe(ImapMboxHandle* handle,
 ImapResponse
 imap_mbox_list(ImapMboxHandle *handle, const char* what)
 {
+  ImapResponse rc;
   IMAP_REQUIRED_STATE2(handle,IMHS_AUTHENTICATED, IMHS_SELECTED, IMR_BAD);
+  HANDLE_LOCK(handle);
   {
   gchar *mbx7 = imap_utf8_to_mailbox(what);
   gchar *cmd = g_strdup_printf("LIST \"%s\" \"%%\"", mbx7);
-  ImapResponse rc = imap_cmd_exec(handle, cmd);
+  rc = imap_cmd_exec(handle, cmd);
   g_free(cmd);
   g_free(mbx7);
-  return rc;
   }
+  HANDLE_LOCK(handle);
+  return rc;
 }
 
 
@@ -333,14 +336,17 @@ imap_mbox_list(ImapMboxHandle *handle, const char* what)
 ImapResponse
 imap_mbox_lsub(ImapMboxHandle *handle, const char* what)
 {
+  ImapResponse rc;
   IMAP_REQUIRED_STATE2(handle,IMHS_AUTHENTICATED, IMHS_SELECTED, IMR_BAD);
+  HANDLE_LOCK(handle);
   {
   gchar *mbx7 = imap_utf8_to_mailbox(what);
   gchar *cmd = g_strdup_printf("LSUB \"%s\" \"%%\"", mbx7);
-  ImapResponse rc = imap_cmd_exec(handle, cmd);
+  rc = imap_cmd_exec(handle, cmd);
   g_free(mbx7); g_free(cmd);
-  return rc;
   }
+  HANDLE_UNLOCK(handle);
+  return rc;
 }
 
 
@@ -367,13 +373,15 @@ imap_mbox_status(ImapMboxHandle *r, const char*what,
     gchar *mbx7 = imap_utf8_to_mailbox(what);
     gchar *items = g_strjoinv(" ", (gchar**)&item_arr[0]);
     gchar *cmd = g_strdup_printf("STATUS \"%s\" (%s)", mbx7, items);
+    HANDLE_LOCK(r);
     g_hash_table_insert(r->status_resps, (gpointer)what, res);
     rc = imap_cmd_exec(r, cmd);
     g_hash_table_remove(r->status_resps, what);
+    HANDLE_UNLOCK(r);
     g_free(mbx7); g_free(cmd);
     g_free(items);
   }
-  return IMR_OK; 
+  return rc; 
 }
 /* 6.3.11 APPEND Command */
 static gchar*
diff --git a/po/pl.po b/po/pl.po
index 102c544..052971a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,25 +1,15 @@
-# Copyright (C) 1999-2004 Free Software Foundation, Inc.
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# AktualnÄ? wersjÄ? tego pliku moÅ¼esz odnaleÅºÄ? w repozytorium cvs.gnome.pl
-# (:pserver:anonymous cvs gnome pl:/gnomepl, puste hasÅ?o)
-# JeÅ?li masz jakiekolwiek uwagi odnoszÄ?ce siÄ? do tÅ?umaczenia lub chcesz
-# pomÃ³c w jego rozwijaniu i pielÄ?gnowaniu, napisz do nas na adres:
-# translators gnome pl
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# GNOME PL Team <translators gnome pl>, 1999-2004
-# PaweÅ? DziekoÅ?ski <pdziekonski mml ch pwr wroc pl>, 1999
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 15:21+0100\n"
-"PO-Revision-Date: 2008-12-13 12:56+0100\n"
+"POT-Creation-Date: 2009-01-02 18:33+0100\n"
+"PO-Revision-Date: 2009-06-18 18:23+0100\n"
 "Last-Translator: Dariusz Jakoniuk <pipaceliny gmail com>\n"
 "Language-Team: Polish <translation-team-pl lists sourceforge net>\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"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=2; plural=( n != 1);\n"
 
 #: ../balsa.desktop.in.h:1
 msgid "Balsa"
@@ -31,97 +21,152 @@ msgstr "Klient poczty e-mail"
 
 #. The externq database doesn't support Id's, sorry!
 #: ../libbalsa/address-book-extern.c:210
-#: ../libbalsa/address-book-ldap.c:421
-#: ../libbalsa/address-book-ldif.c:329
+#: ../libbalsa/address-book-ldap.c:494
+#: ../libbalsa/address-book-ldif.c:330
 msgid "No-Id"
 msgstr "Bez-Id"
 
 #: ../libbalsa/address-book-extern.c:215
 #: ../libbalsa/address-book-extern.c:370
-#: ../libbalsa/address-book-ldap.c:427
+#: ../libbalsa/address-book-ldap.c:500
 #: ../libbalsa/address-book-ldif.c:309
-#: ../libbalsa/address-book-ldif.c:332
-#: ../libbalsa/address-book-ldif.c:351
-#: ../libbalsa/address-book-ldif.c:355
+#: ../libbalsa/address-book-ldif.c:333
+#: ../libbalsa/address-book-ldif.c:352
+#: ../libbalsa/address-book-ldif.c:356
 #: ../libbalsa/address-book-vcard.c:158
-#: ../libbalsa/address-book-vcard.c:312
+#: ../libbalsa/address-book-vcard.c:256
+#: ../libbalsa/address.c:405
 msgid "No-Name"
 msgstr "Bez-nazwy"
 
-#: ../libbalsa/address-book-ldap.c:275
+#: ../libbalsa/address-book-ldap.c:282
+msgid "SASL Interaction\n"
+msgstr "Interakcja SASL\n"
+
+#: ../libbalsa/address-book-ldap.c:329
 msgid "TLS requested but not compiled in"
-msgstr "Wymagana funkcja TLS ktÃ³ra nie zostaÅ?a wkompilowana"
+msgstr "Wymagana funkcja TLS, ktÃ³ra nie zostaÅ?a wkompilowana"
+
+#: ../libbalsa/address-book-ldap.c:609
+msgid "Undefined location of user address book"
+msgstr "Brak okreÅ?lonej lokalizacji ksiÄ?Å¼ki adresowej uÅ¼ytkownika"
 
-#: ../libbalsa/address-book.c:301
+#: ../libbalsa/address-book.c:315
 #: ../libbalsa/filter-error.c:45
 msgid "No error"
-msgstr "Brak bÅ?Ä?dÃ³w"
+msgstr "Brak bÅ?Ä?du"
 
-#: ../libbalsa/address-book.c:302
+#: ../libbalsa/address-book.c:316
 msgid "Cannot read from address book"
 msgstr "Nie moÅ¼na czytaÄ? z ksiÄ?Å¼ki adresowej"
 
-#: ../libbalsa/address-book.c:303
+#: ../libbalsa/address-book.c:317
 msgid "Cannot write to address book"
 msgstr "Nie moÅ¼na zapisywaÄ? ksiÄ?Å¼ki adresowej"
 
-#: ../libbalsa/address-book.c:304
-msgid "Cannot connect to server"
+#: ../libbalsa/address-book.c:318
+msgid "Cannot connect to the server"
 msgstr "Nie moÅ¼na nawiÄ?zaÄ? poÅ?Ä?czenia z serwerem"
 
-#: ../libbalsa/address-book.c:305
+#: ../libbalsa/address-book.c:319
 msgid "Cannot search in the address book"
 msgstr "Nie moÅ¼na przeszukaÄ? ksiÄ?Å¼ki adresowej"
 
-#: ../libbalsa/address-book.c:307
+#: ../libbalsa/address-book.c:321
 msgid "Cannot add duplicate entry"
 msgstr "Nie moÅ¼na dodaÄ? zduplikowanego wpisu"
 
-#: ../libbalsa/address-book.c:309
+#: ../libbalsa/address-book.c:323
 msgid "Cannot find address in address book"
 msgstr "Nie moÅ¼na znaleÅºÄ? adresu w ksiÄ?Å¼ce adresowej"
 
-#: ../libbalsa/address-book.c:310
-#: ../src/main-window.c:2228
-#: ../src/main-window.c:4250
-#: ../src/sendmsg-window.c:4809
+#: ../libbalsa/address-book.c:324
+#: ../src/main-window.c:2236
+#: ../src/main-window.c:4528
+#: ../src/sendmsg-window.c:4141
 msgid "Unknown error"
 msgstr "Nieznany bÅ?Ä?d"
 
-#: ../libbalsa/address.c:436
-msgid "_Displayed Name:"
-msgstr "_WyÅ?wietlana nazwa:"
+#: ../libbalsa/address-view.c:126
+#: ../src/balsa-mime-widget-message.c:713
+#: ../src/balsa-print-object-header.c:167
+#: ../src/print.c:369
+#: ../src/sendmsg-window.c:1094
+#: ../src/sendmsg-window.c:3810
+#: ../src/store-address.c:325
+msgid "To:"
+msgstr "Do:"
+
+#: ../libbalsa/address-view.c:127
+#: ../src/balsa-mime-widget-message.c:714
+#: ../src/balsa-print-object-header.c:169
+#: ../src/print.c:370
+#: ../src/sendmsg-window.c:1094
+#: ../src/sendmsg-window.c:3818
+#: ../src/store-address.c:326
+msgid "Cc:"
+msgstr "Cc:"
+
+#: ../libbalsa/address-view.c:128
+#: ../src/balsa-mime-widget-message.c:715
+#: ../src/balsa-print-object-header.c:171
+#: ../src/print.c:371
+#: ../src/sendmsg-window.c:1094
+#: ../src/store-address.c:327
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: ../libbalsa/address-view.c:130
+msgid "Reply To:"
+msgstr "Odpowiedz do:"
 
-#: ../libbalsa/address.c:437
+#: ../libbalsa/address.c:933
+msgid "D_isplayed Name:"
+msgstr "WyÅ?w_ietlana nazwa:"
+
+#: ../libbalsa/address.c:934
 msgid "_First Name:"
 msgstr "_ImiÄ?:"
 
-#: ../libbalsa/address.c:438
+#: ../libbalsa/address.c:935
 msgid "_Last Name:"
 msgstr "_Nazwisko:"
 
-#: ../libbalsa/address.c:439
+#: ../libbalsa/address.c:936
 msgid "_Nickname:"
 msgstr "_Przydomek:"
 
-#: ../libbalsa/address.c:440
+#: ../libbalsa/address.c:937
 msgid "O_rganization:"
 msgstr "O_rganizacja:"
 
-#: ../libbalsa/address.c:441
+#: ../libbalsa/address.c:938
 msgid "_Email Address:"
-msgstr "Adres _e-mail:"
+msgstr "_Adres e-mail:"
+
+#. Right/Add button
+#: ../libbalsa/address.c:957
+#: ../src/filter-edit-callbacks.c:1064
+#: ../src/filter-run-dialog.c:327
+msgid "A_dd"
+msgstr "Do_daj"
 
-#: ../libbalsa/body.c:116
-#: ../libbalsa/mailbox_local.c:1165
-#: ../libbalsa/message.c:808
+#: ../libbalsa/body.c:124
+#: ../libbalsa/mailbox_local.c:1791
+#: ../libbalsa/message.c:831
 msgid "(No subject)"
 msgstr "(Brak tematu)"
 
-#: ../libbalsa/files.c:231
+#: ../libbalsa/body.c:340
+#: ../libbalsa/body.c:392
 #, c-format
-msgid "Open with %s"
-msgstr "OtwÃ³rz przy uÅ¼yciu %s"
+msgid "Failed to create output stream"
+msgstr "BÅ?Ä?d z utworzeniem strumienia wyjÅ?ciowego"
+
+#: ../libbalsa/body.c:465
+#, c-format
+msgid "Could not read embedded message"
+msgstr "Nie moÅ¼na odczytaÄ? osadzonej wiadomoÅ?ci"
 
 #: ../libbalsa/filter-error.c:46
 msgid "Syntax error in the filter configuration file"
@@ -144,44 +189,45 @@ msgstr "PrÃ³ba uruchomienia niepoprawnego filtru"
 msgid "Invalid filters %s for mailbox %s"
 msgstr "Niepoprawne filtry %s dla skrzynki %s"
 
-#: ../libbalsa/filter.c:132
-#: ../libbalsa/mailbox_local.c:407
+#: ../libbalsa/filter.c:125
+#: ../libbalsa/mailbox_local.c:881
 msgid "Unable to load message body to match filter"
 msgstr "Nie moÅ¼na odczytaÄ? treÅ?ci listu, aby dopasowaÄ? jÄ? do filtru"
 
-#: ../libbalsa/filter.c:240
+#: ../libbalsa/filter.c:230
 #, c-format
 msgid "Invalid filter: %s"
 msgstr "Niepoprawny filtr: %s"
 
-#: ../libbalsa/filter.c:279
-#: ../libbalsa/filter.c:302
+#: ../libbalsa/filter.c:270
+#: ../libbalsa/filter.c:293
 #, c-format
 msgid "Bad mailbox name for filter: %s"
 msgstr "Niepoprawna nazwa skrzynki dla filtru: %s"
 
-#: ../libbalsa/filter.c:283
+#: ../libbalsa/filter.c:274
 #, c-format
 msgid "Error when copying messages: %s"
 msgstr "BÅ?Ä?d przy kopiowaniu listÃ³w: %s"
 
-#: ../libbalsa/filter.c:293
+#: ../libbalsa/filter.c:284
 #, c-format
 msgid "Error when trashing messages: %s"
 msgstr "BÅ?Ä?d przy usuwaniu listÃ³w: %s"
 
-#: ../libbalsa/filter.c:306
+#: ../libbalsa/filter.c:297
 #, c-format
 msgid "Error when moving messages: %s"
 msgstr "BÅ?Ä?d przy przenoszeniu listÃ³w: %s"
 
-#: ../libbalsa/gmime-application-pkcs7.c:237
-#: ../libbalsa/gmime-application-pkcs7.c:380
+#: ../libbalsa/gmime-application-pkcs7.c:238
+#: ../libbalsa/gmime-application-pkcs7.c:382
+#, c-format
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Niepowodzenie przy odszyfrowywaniu czÄ?Å?ci MIME: bÅ?Ä?d zapisywania"
 
-#: ../libbalsa/gmime-gpgme-context.c:279
-#: ../libbalsa/rfc3156.c:1603
+#: ../libbalsa/gmime-gpgme-context.c:282
+#: ../libbalsa/rfc3156.c:1576
 #, c-format
 msgid ""
 "The passphrase for this key was bad, please try again!\n"
@@ -192,8 +238,8 @@ msgstr ""
 "\n"
 "Klucz: %s"
 
-#: ../libbalsa/gmime-gpgme-context.c:284
-#: ../libbalsa/rfc3156.c:1608
+#: ../libbalsa/gmime-gpgme-context.c:287
+#: ../libbalsa/rfc3156.c:1581
 #, c-format
 msgid ""
 "Please enter the passphrase for the secret key!\n"
@@ -204,253 +250,351 @@ msgstr ""
 "\n"
 "Klucz: %s"
 
-#: ../libbalsa/gmime-gpgme-context.c:404
+#: ../libbalsa/gmime-gpgme-context.c:405
+#: ../libbalsa/gmime-gpgme-context.c:478
 #: ../libbalsa/gmime-gpgme-context.c:486
-#: ../libbalsa/gmime-gpgme-context.c:497
-#: ../libbalsa/gmime-gpgme-context.c:612
-#: ../libbalsa/gmime-gpgme-context.c:703
-#, c-format
-msgid "%s: could not get data from stream: %s"
-msgstr "%s: nie moÅ¼na pobraÄ? danych ze strumienia: %s"
-
-#: ../libbalsa/gmime-gpgme-context.c:412
-#: ../libbalsa/gmime-gpgme-context.c:621
-#: ../libbalsa/gmime-gpgme-context.c:711
-#, c-format
-msgid "%s: could not create new data object: %s"
-msgstr "%s: nie moÅ¼na utworzyÄ? nowego obiektu danych: %s"
+#: ../libbalsa/gmime-gpgme-context.c:595
+#: ../libbalsa/gmime-gpgme-context.c:674
+msgid "could not get data from stream"
+msgstr "nie moÅ¼na pobraÄ? danych ze strumienia"
+
+#: ../libbalsa/gmime-gpgme-context.c:410
+#: ../libbalsa/gmime-gpgme-context.c:601
+#: ../libbalsa/gmime-gpgme-context.c:679
+msgid "could not create new data object"
+msgstr "nie moÅ¼na utworzyÄ? nowego obiektu danych"
+
+#: ../libbalsa/gmime-gpgme-context.c:417
+msgid "signing failed"
+msgstr "podpisanie nie powiodÅ?o siÄ?"
 
-#: ../libbalsa/gmime-gpgme-context.c:422
-#, c-format
-msgid "%s: signing failed: %s"
-msgstr "%s: podpisanie nie powiodÅ?o siÄ?: %s"
+#: ../libbalsa/gmime-gpgme-context.c:497
+#: ../libbalsa/rfc3156.c:554
+#: ../libbalsa/rfc3156.c:559
+#: ../libbalsa/rfc3156.c:836
+#: ../libbalsa/rfc3156.c:842
+msgid "signature verification failed"
+msgstr "weryfikacja podpisu nie powiodÅ?a siÄ?"
 
-#: ../libbalsa/gmime-gpgme-context.c:511
+#: ../libbalsa/gmime-gpgme-context.c:561
 #, c-format
-msgid "%s: signature verification failed: %s"
-msgstr "%s: weryfikacja podpisu nie powiodÅ?a siÄ?: %s"
-
-#: ../libbalsa/gmime-gpgme-context.c:576
 msgid "combined signing and encryption is only defined for RFC 2440"
 msgstr "kombinowane podpisanie i szyfrowanie jest zdefiniowane tylko dla RFC 2440"
 
-#: ../libbalsa/gmime-gpgme-context.c:647
-#, c-format
-msgid "%s: signing and encryption failed: %s"
-msgstr "%s: podpisanie i szyfrowanie nie powiodÅ?o siÄ?: %s"
+#: ../libbalsa/gmime-gpgme-context.c:624
+msgid "signing and encryption failed"
+msgstr "podpisanie i szyfrowanie nie powiodÅ?o siÄ?"
 
-#: ../libbalsa/gmime-gpgme-context.c:651
-#, c-format
-msgid "%s: encryption failed: %s"
-msgstr "%s: szyfrowanie nie powiodÅ?o siÄ?: %s"
+#: ../libbalsa/gmime-gpgme-context.c:626
+msgid "encryption failed"
+msgstr "szyfrowanie nie powiodÅ?o siÄ?"
 
-#: ../libbalsa/gmime-gpgme-context.c:723
-#, c-format
-msgid "%s: decryption failed: %s"
-msgstr "%s: odszyfrowanie nie powiodÅ?o siÄ?: %s"
+#: ../libbalsa/gmime-gpgme-context.c:688
+#: ../libbalsa/rfc3156.c:681
+#: ../libbalsa/rfc3156.c:686
+msgid "decryption failed"
+msgstr "odszyfrowanie nie powiodÅ?o siÄ?"
 
-#: ../libbalsa/gmime-gpgme-context.c:758
-#, c-format
-msgid "%s: could not create context: %s"
-msgstr "%s: nie moÅ¼na utworzyÄ? kontekstu: %s"
+#: ../libbalsa/gmime-gpgme-context.c:720
+msgid "could not create context"
+msgstr "nie moÅ¼na utworzyÄ? kontekstu"
 
-#: ../libbalsa/gmime-gpgme-context.c:814
+#: ../libbalsa/gmime-gpgme-context.c:775
+#, c-format
 msgid "the crypto engine for protocol OpenPGP is not available"
 msgstr "silnik szyfrowania dla protokoÅ?u OpenPGP nie jest dostÄ?pny"
 
-#: ../libbalsa/gmime-gpgme-context.c:824
+#: ../libbalsa/gmime-gpgme-context.c:785
+#, c-format
 msgid "the crypto engine for protocol CMS is not available"
 msgstr "silnik szyfrowania dla protokoÅ?u CMS nie jest dostÄ?pny"
 
-#: ../libbalsa/gmime-gpgme-context.c:831
+#: ../libbalsa/gmime-gpgme-context.c:792
 #, c-format
 msgid "invalid crypto engine %d"
 msgstr "bÅ?Ä?dny silnik szyfrowania %d"
 
-#: ../libbalsa/gmime-gpgme-context.c:862
-#: ../libbalsa/gmime-gpgme-context.c:884
+#: ../libbalsa/gmime-gpgme-context.c:823
+#: ../libbalsa/gmime-gpgme-context.c:850
+#, c-format
+msgid "could not list keys for \"%s\""
+msgstr "nie moÅ¼na uzyskaÄ? listy kluczy dla \"%s\""
+
+#: ../libbalsa/gmime-gpgme-context.c:866
 #, c-format
-msgid "%s: could not list keys for %s: %s"
-msgstr "%s: nie moÅ¼na uzyskaÄ? listy kluczy dla: %s: %s"
+msgid "%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
+msgstr "%s: klucz dla %s jest obecny, lecz wygasÅ?, jest wyÅ?Ä?czony, cofniÄ?ty lub zÅ?y"
 
-#: ../libbalsa/gmime-gpgme-context.c:896
+#: ../libbalsa/gmime-gpgme-context.c:870
 #, c-format
 msgid "%s: could not find a key for %s"
 msgstr "%s: nie moÅ¼na odnaleÅºÄ? klucza dla %s"
 
-#: ../libbalsa/gmime-gpgme-context.c:908
+#: ../libbalsa/gmime-gpgme-context.c:875
+#, c-format
+msgid "%s: a key with id %s is present, but it is expired, disabled, revoked or invalid"
+msgstr "%s: klucz z id %s jest obecny, lecz wygasÅ?, jest wyÅ?Ä?czony, cofniÄ?ty lub zÅ?y"
+
+#: ../libbalsa/gmime-gpgme-context.c:879
+#, c-format
+msgid "%s: could not find a key with id %s"
+msgstr "%s: nie moÅ¼na odnaleÅºÄ? klucza o id %s"
+
+#: ../libbalsa/gmime-gpgme-context.c:893
 #, c-format
 msgid "%s: multiple keys for %s"
 msgstr "%s: wiele kluczy dla %s"
 
-#: ../libbalsa/gmime-gpgme-context.c:953
+#: ../libbalsa/gmime-gpgme-context.c:938
 #, c-format
 msgid "%s: insufficient validity for uid %s"
 msgstr "%s: niewystarczajÄ?ca wiarygodnoÅ?Ä? dla uid %s"
 
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:101
-#: ../libbalsa/mailbox_local.c:1284
-#: ../libbalsa/mailbox_local.c:1286
-#: ../src/sendmsg-window.c:3350
-#: ../src/sendmsg-window.c:3351
+#: ../libbalsa/identity.c:105
+#: ../libbalsa/mailbox_local.c:1910
+#: ../libbalsa/mailbox_local.c:1912
+#: ../src/sendmsg-window.c:4039
+#: ../src/sendmsg-window.c:4040
 msgid "Re:"
 msgstr "Re:"
 
-#: ../libbalsa/identity.c:102
-#: ../src/sendmsg-window.c:3381
-#: ../src/sendmsg-window.c:3382
+#: ../libbalsa/identity.c:106
+#: ../src/sendmsg-window.c:3984
+#: ../src/sendmsg-window.c:3985
+#: ../src/sendmsg-window.c:3986
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: ../libbalsa/identity.c:153
+#: ../libbalsa/identity.c:170
 msgid "New Identity"
 msgstr "Nowa toÅ¼samoÅ?Ä?"
 
-#: ../libbalsa/identity.c:406
+#: ../libbalsa/identity.c:349
+#, c-format
+msgid "Error executing signature generator %s"
+msgstr "BÅ?Ä?d przy uruchamianiu generatora podpisÃ³w %s"
+
+#: ../libbalsa/identity.c:359
+#, c-format
+msgid "Cannot open signature file '%s' for reading"
+msgstr "Nie moÅ¼na otworzyÄ? pliku z podpisem %s."
+
+#: ../libbalsa/identity.c:365
+#, c-format
+msgid "Error reading signature from %s"
+msgstr "BÅ?Ä?d przy odczycie zaÅ?Ä?czonego podpisu z %s"
+
+#: ../libbalsa/identity.c:370
+#, c-format
+msgid "Signature in %s is not a UTF-8 text."
+msgstr "Podpis w %s nie jest tekstem zakodowanym w UTF-8."
+
+#: ../libbalsa/identity.c:497
 msgid "Current"
 msgstr "BieÅ¼Ä?ca"
 
-#: ../libbalsa/identity.c:646
-#: ../libbalsa/smtp-server.c:267
+#: ../libbalsa/identity.c:754
+#: ../libbalsa/smtp-server.c:270
 msgid "Default"
 msgstr "DomyÅ?lna"
 
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:953
+msgid "_Face Path"
+msgstr "Å?cieÅ¼ka do _Face"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:959
+msgid "_X-Face Path"
+msgstr "Å?cieÅ¼ka do _X-Face"
+
 #. create the "General" tab
-#: ../libbalsa/identity.c:852
-#, fuzzy
+#: ../libbalsa/identity.c:986
 msgid "General"
-msgstr "Nadawca"
+msgstr "OgÃ³lne"
 
-#: ../libbalsa/identity.c:854
-msgid "_Identity Name:"
+#: ../libbalsa/identity.c:988
+msgid "_Identity name:"
 msgstr "Nazwa _toÅ¼samoÅ?ci:"
 
-#: ../libbalsa/identity.c:856
-msgid "_Full Name:"
+#: ../libbalsa/identity.c:990
+msgid "_Full name:"
 msgstr "_PeÅ?na nazwa:"
 
-#: ../libbalsa/identity.c:858
-msgid "_Mailing Address:"
+#: ../libbalsa/identity.c:992
+msgid "_Mailing address:"
 msgstr "_Adres e-mail:"
 
-#: ../libbalsa/identity.c:860
-msgid "Reply _To:"
-msgstr "Odpo_wiedÅº do:"
+#: ../libbalsa/identity.c:994
+msgid "Reply _to:"
+msgstr "OdpowiedÅº _do:"
 
-# chyba o domenÄ? idzie a nie dziedzinÄ??
-#: ../libbalsa/identity.c:862
+#: ../libbalsa/identity.c:996
 msgid "_Domain:"
 msgstr "_Domena:"
 
-#: ../libbalsa/identity.c:864
+#. create the "Messages" tab
+#: ../libbalsa/identity.c:1000
+msgid "Messages"
+msgstr "Listy"
+
+#: ../libbalsa/identity.c:1002
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../libbalsa/identity.c:866
-msgid "Reply _String:"
-msgstr "Przed_rostek oznaczajÄ?cy odpowiedÅº:"
+#: ../libbalsa/identity.c:1004
+msgid "Reply _string:"
+msgstr "Przedrostek oznaczajÄ?cy odpowiedÅº:"
+
+#: ../libbalsa/identity.c:1006
+msgid "F_orward string:"
+msgstr "Przedrostek oznaczajÄ?cy przesÅ?anie:"
+
+#: ../libbalsa/identity.c:1009
+msgid "send messages in both plain text and _HTML format"
+msgstr "wysyÅ?aj wiadomoÅ?ci zarÃ³wno w formacie tekstowym jak i html"
 
-#: ../libbalsa/identity.c:868
-msgid "F_orward String:"
-msgstr "Pr_zedrostek oznaczajÄ?cy przesÅ?anie:"
+#: ../libbalsa/identity.c:1012
+msgid "request _Message Disposition Notification by default"
+msgstr "Å»Ä?_daj powiadomienia o otrzymaniu jako domyÅ?lne"
 
-#: ../libbalsa/identity.c:871
-msgid "SMT_P Server"
+#: ../libbalsa/identity.c:1022
+msgid "SMT_P server:"
 msgstr "Serwer SMTP"
 
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:876
+#: ../libbalsa/identity.c:1027
 msgid "Signature"
+msgstr "Podpis"
+
+#: ../libbalsa/identity.c:1030
+msgid "Signature _path"
 msgstr "Å?cieÅ¼ka pliku z podpisem:"
 
-#: ../libbalsa/identity.c:878
-msgid "Signature _Path:"
-msgstr "Å?c_ieÅ¼ka pliku z podpisem:"
+#: ../libbalsa/identity.c:1033
+msgid "_Execute signature"
+msgstr "_ZÅ?oÅ¼enie podpisu"
 
-#: ../libbalsa/identity.c:881
-msgid "_Execute Signature"
-msgstr "ZÅ?oÅ¼_enie podpisu"
+#: ../libbalsa/identity.c:1036
+msgid "Incl_ude signature"
+msgstr "DoÅ?Ä?czanie podpisu"
 
-#: ../libbalsa/identity.c:884
-msgid "Incl_ude Signature"
-msgstr "D_oÅ?Ä?czanie podpisu"
+#: ../libbalsa/identity.c:1039
+msgid "Include signature when for_warding"
+msgstr "DoÅ?Ä?czanie podpisu przy przesyÅ?aniu"
 
-#: ../libbalsa/identity.c:887
-msgid "Include Signature When For_warding"
-msgstr "DoÅ?Ä?czanie podpisu przy prz_esyÅ?aniu"
+#: ../libbalsa/identity.c:1042
+msgid "Include signature when rep_lying"
+msgstr "DoÅ?Ä?czanie podpisu przy odpowiadaniu"
 
-#: ../libbalsa/identity.c:890
-msgid "Include Signature When Rep_lying"
-msgstr "DoÅ?Ä?czanie podpi_su przy odpowiadaniu"
+#: ../libbalsa/identity.c:1045
+msgid "_Add signature separator"
+msgstr "_Oddzielenie podpisu"
 
-#: ../libbalsa/identity.c:893
-msgid "_Add Signature Separator"
-msgstr "Oddzie_lenie podpisu"
+#: ../libbalsa/identity.c:1048
+msgid "Prepend si_gnature"
+msgstr "Podpis na poczÄ?tku"
 
-#: ../libbalsa/identity.c:896
-msgid "Prepend Si_gnature"
-msgstr "Podpis na poczÄ?t_ku"
+#: ../libbalsa/identity.c:1054
+msgid ""
+"Signing and encrypting messages are possible\n"
+"only if Balsa is built with cryptographic support."
+msgstr ""
+"Podpisywanie i szyfrowanie wiadomoÅ?ci jest moÅ¼liwe\n"
+"jeÅ¼eli Balsa jest kompilowana ze wsparciem kryptograficznym."
 
-#. create the "Security" tab
-#: ../libbalsa/identity.c:901
+#: ../libbalsa/identity.c:1059
 msgid "Security"
 msgstr "Zabezpieczenie"
 
-#: ../libbalsa/identity.c:904
+#: ../libbalsa/identity.c:1062
 msgid "sign messages by default"
 msgstr "domyÅ?lne podpisywanie listÃ³w"
 
-#: ../libbalsa/identity.c:907
+#: ../libbalsa/identity.c:1065
 msgid "encrypt messages by default"
 msgstr "domyÅ?lnie szyfrowanie listÃ³w"
 
-#: ../libbalsa/identity.c:910
+#: ../libbalsa/identity.c:1068
 msgid "default protocol"
 msgstr "domyÅ?lny protokÃ³Å?"
 
-#: ../libbalsa/identity.c:913
+#: ../libbalsa/identity.c:1071
 msgid "always trust GnuPG keys when encrypting"
 msgstr "zawsze ufaj kluczom GnuPG przy szyfrowaniu"
 
-#: ../libbalsa/identity.c:1059
+#: ../libbalsa/identity.c:1074
+msgid "remind me if messages can be encrypted"
+msgstr "powiadom mnie jeÅ?li moÅ¼na zaszyfrowaÄ? wiadomoÅ?ci"
+
+#: ../libbalsa/identity.c:1077
+msgid ""
+"use secret key with this id for signing\n"
+"(leave empty for automatic selection)"
+msgstr ""
+"uÅ¼yj tajnego klucza o tym id do podpisu\n"
+"(jeÅ?li puste wybÃ³r nastÄ?pi automatycznie)"
+
+#: ../libbalsa/identity.c:1216
+#, c-format
+msgid "Error reading file %s: %s"
+msgstr "BÅ?Ä?d odczytu pliku %s: %s"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:1227
+#, c-format
+msgid "Face header file %s is too long (%lu bytes)."
+msgstr "Plik nagÅ?Ã³wkowy Face %s jest za dÅ?ugi (%lu bajtÃ³w)."
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:1237
+#, c-format
+msgid "Face header file %s contains binary data."
+msgstr "Plik nagÅ?Ã³wkowy Face %s zawiera dane w formie binarnej."
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:1257
+#: ../src/balsa-message.c:1510
+#, c-format
+msgid "Error loading Face: %s"
+msgstr "BÅ?Ä?d przy adowaniu Face: %s"
+
+#: ../libbalsa/identity.c:1453
 msgid "Error: The identity does not have a name"
 msgstr "BÅ?Ä?d: Nie podano nazwy toÅ¼samoÅ?ci"
 
-#: ../libbalsa/identity.c:1069
+#: ../libbalsa/identity.c:1463
 msgid "Error: An identity with that name already exists"
 msgstr "BÅ?Ä?d: ToÅ¼samoÅ?Ä? o tej nazwie juÅ¼ istnieje"
 
-#: ../libbalsa/identity.c:1240
+#: ../libbalsa/identity.c:1663
 msgid "Do you really want to delete the selected identity?"
 msgstr "Czy na pewno chcesz usunÄ?Ä? wybranÄ? toÅ¼samoÅ?Ä??"
 
-#: ../libbalsa/identity.c:1275
+#: ../libbalsa/identity.c:1702
 #, c-format
 msgid "Error displaying help for identities: %s\n"
 msgstr "BÅ?Ä?d przy wyÅ?wietlaniu pomocy dla toÅ¼samoÅ?ci: %s\n"
 
-#: ../libbalsa/identity.c:1321
+#: ../libbalsa/identity.c:1749
 msgid "Manage Identities"
 msgstr "ZarzÄ?dzanie toÅ¼samoÅ?ciami"
 
-# narazie nie tÅ?umaczone bo nie wiem gdzie to jest w menu
-#: ../libbalsa/identity.c:1639
-#, fuzzy
+#: ../libbalsa/identity.c:2152
 msgid "GnuPG MIME mode"
-msgstr "GnuPG uÅ¼ywa trybu MIME"
+msgstr "Tryb GpgSM S/MIME"
 
-#: ../libbalsa/identity.c:1641
-#, fuzzy
+#: ../libbalsa/identity.c:2154
 msgid "GnuPG OpenPGP mode"
 msgstr "GnuPG uÅ¼ywa trybu OpenPGP"
 
-#: ../libbalsa/identity.c:1644
+#: ../libbalsa/identity.c:2157
 msgid "GpgSM S/MIME mode"
 msgstr "Tryb GpgSM S/MIME"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:256
+#: ../libbalsa/imap-server.c:281
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -460,51 +604,111 @@ msgstr ""
 "%s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:260
+#: ../libbalsa/imap-server.c:285
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "BÅ?Ä?d serwera IMAP %s: %s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:266
+#: ../libbalsa/imap-server.c:291
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../libbalsa/imap-server.c:507
+#: ../libbalsa/imap-server.c:535
+#: ../libbalsa/server.c:346
+#: ../libbalsa/server.c:390
+msgid "Balsa passwords"
+msgstr "HasÅ?a balsy"
+
+#: ../libbalsa/imap-server.c:586
+#, c-format
+msgid "Cannot connect to %s"
+msgstr "Nie moÅ¼na nawiÄ?zaÄ? poÅ?Ä?czenia z %s"
+
+#: ../libbalsa/imap-server.c:591
+#: ../libbalsa/imap-server.c:596
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "Nie moÅ¼na nawiÄ?zaÄ? poÅ?Ä?czenia z serwerem: %s"
 
-#: ../libbalsa/imap-server.c:511
-msgid "Cannot connect to the server"
-msgstr "Nie moÅ¼na nawiÄ?zaÄ? poÅ?Ä?czenia z serwerem"
-
-#: ../libbalsa/imap-server.c:659
+#: ../libbalsa/imap-server.c:744
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Przekroczono liczbÄ? poÅ?Ä?czeÅ? na serwer %s"
 
-#: ../libbalsa/libbalsa-conf.c:204
+#: ../libbalsa/libbalsa-conf.c:203
 msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
 msgstr "Twoje ustawienia Balsy sÄ? teraz przechowywane w  \"~/.balsa/config\"."
 
-#: ../libbalsa/libbalsa.c:285
+#: ../libbalsa/libbalsa-vfs.c:207
 #, c-format
-msgid "LDAP Directory for %s"
-msgstr "Katalog LDAP dla %s"
+msgid "Failed to convert %s to a Gnome VFS URI"
+msgstr "BÅ?Ä?d przy konwersji %s do Gnome VFS URI"
+
+#: ../libbalsa/libbalsa-vfs.c:780
+#: ../libbalsa/libbalsa-vfs.c:816
+#: ../libbalsa/libbalsa-vfs.c:832
+#: ../src/sendmsg-window.c:5151
+#, c-format
+msgid "not a regular file"
+msgstr "nie jest zwykÅ?ym plikiem"
+
+#: ../libbalsa/libbalsa-vfs.c:813
+#, c-format
+msgid "cannot read file information"
+msgstr "nie moÅ¼na odczytaÄ? informacji o pliku"
+
+#: ../libbalsa/libbalsa-vfs.c:819
+#: ../libbalsa/libbalsa-vfs.c:834
+#, c-format
+msgid "cannot read"
+msgstr "nie moÅ¼na odczytaÄ?"
+
+#: ../libbalsa/libbalsa-vfs.c:823
+#, c-format
+msgid "cannot access file"
+msgstr "brak dostepu do pliku"
 
-#: ../libbalsa/libbalsa.c:391
+#: ../libbalsa/libbalsa-vfs.c:908
+#: ../libbalsa/libbalsa-vfs.c:921
+#, c-format
+msgid "Cannot launch, missing application"
+msgstr "Nie mozna uruchomiÄ? programu, brak aplikacji"
+
+#: ../libbalsa/libbalsa-vfs.c:931
+#, c-format
+msgid "Cannot find application for id %s"
+msgstr "Nie moÅ¼na znaleÅºÄ? aplikacji dla id %s"
+
+#: ../libbalsa/libbalsa-vfs.c:940
+#, c-format
+msgid "Cannot launch %s: %s"
+msgstr "Nie moÅ¼na uruchomiÄ? %s: %s"
+
+#: ../libbalsa/libbalsa-vfs.c:1023
+#: ../libbalsa/libbalsa-vfs.c:1038
+#, c-format
+msgid "Open with %s"
+msgstr "OtwÃ³rz z %s"
+
+#: ../libbalsa/libbalsa-vfs.c:1114
+#: ../libbalsa/libbalsa-vfs.c:1129
+#, c-format
+msgid "Open _part with %s"
+msgstr "OtwÃ³rz czÄ?Å?Ä? z %s"
+
+#: ../libbalsa/libbalsa.c:377
 msgid "Invalid date"
 msgstr "Niepoprawna data"
 
-#: ../libbalsa/libbalsa.c:407
-#: ../src/pref-manager.c:1206
-#: ../src/pref-manager.c:1301
+#: ../libbalsa/libbalsa.c:393
+#: ../src/pref-manager.c:1347
+#: ../src/pref-manager.c:1443
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../libbalsa/libbalsa.c:546
+#: ../libbalsa/libbalsa.c:539
 #, c-format
 msgid ""
 "Authenticity of this certificate could not be verified.\n"
@@ -515,7 +719,7 @@ msgstr ""
 "<b>PowÃ³d:</b> %s\n"
 "<b>Certyfikat ten naleÅ¼y do:</b>\n"
 
-#: ../libbalsa/libbalsa.c:558
+#: ../libbalsa/libbalsa.c:551
 msgid ""
 "\n"
 "<b>This certificate was issued by:</b>\n"
@@ -523,7 +727,7 @@ msgstr ""
 "\n"
 "<b>Certyfikat zostaÅ? wydany przez:</b>\n"
 
-#: ../libbalsa/libbalsa.c:569
+#: ../libbalsa/libbalsa.c:562
 #, c-format
 msgid ""
 "<b>This certificate is valid</b>\n"
@@ -536,69 +740,141 @@ msgstr ""
 "dla %s\n"
 "<b>Odcisk:</b> %s"
 
-#: ../libbalsa/libbalsa.c:578
+#: ../libbalsa/libbalsa.c:571
 msgid "SSL/TLS certificate"
 msgstr "Certyfikat SSL/TLS"
 
-#: ../libbalsa/libbalsa.c:580
+#: ../libbalsa/libbalsa.c:573
 msgid "_Accept Once"
-msgstr "Z_aakceptuj raz"
+msgstr "_Zaakceptuj raz"
 
-#: ../libbalsa/libbalsa.c:581
+#: ../libbalsa/libbalsa.c:574
 msgid "Accept&_Save"
-msgstr "Zaakceptuj i _zapisz"
+msgstr "Zaakceptuj i zapisz"
 
-#: ../libbalsa/libbalsa.c:582
+#: ../libbalsa/libbalsa.c:575
 msgid "_Reject"
-msgstr "O_drzuÄ?"
+msgstr "_OdrzuÄ?"
+
+#: ../libbalsa/libbalsa.c:620
+#, c-format
+msgid "Connection to %s timed out. Abort?"
+msgstr "PoÅ?Ä?czenie z %s przedawniÅ?o siÄ?. PorzuciÄ??"
+
+#: ../libbalsa/libbalsa.c:861
+#, c-format
+msgid "No image data"
+msgstr "Brak informacji o obrazie"
 
-#: ../libbalsa/mailbox.c:390
+#: ../libbalsa/libbalsa.c:905
+#, c-format
+msgid "Invalid input format"
+msgstr "ZÅ?y format wejÅ?ciowy"
+
+#: ../libbalsa/libbalsa.c:909
+#, c-format
+msgid "Internal buffer overrun"
+msgstr "PrzepeÅ?nienie bufora"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/libbalsa.c:926
+#, c-format
+msgid "Bad X-Face data"
+msgstr "ZÅ?e dane X-Face"
+
+#: ../libbalsa/mailbox.c:466
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Nie moÅ¼na otworzyÄ? skrzynki %s"
 
-#: ../libbalsa/mailbox.c:397
+#: ../libbalsa/mailbox.c:473
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Brak takiego typu skrzynki: %s"
 
-#: ../libbalsa/mailbox.c:414
+#: ../libbalsa/mailbox.c:490
 #, c-format
 msgid "Bad local mailbox path \"%s\""
 msgstr "BÅ?Ä?dna Å?cieÅ¼ka lokalnej skrzynki \"%s\""
 
-#: ../libbalsa/mailbox.c:419
+#: ../libbalsa/mailbox.c:495
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Nie moÅ¼na utworzyÄ? skrzynki typu %s"
 
+#: ../libbalsa/mailbox.c:805
+#, c-format
+msgid "Applying filter rules to %s"
+msgstr "Zaakceptuj reguÅ?y filtra dla %s"
+
+#: ../libbalsa/mailbox.c:960
+#, c-format
+msgid "Copying from %s to %s"
+msgstr "Kopiowanie z %s do %s"
+
+#: ../libbalsa/mailbox.c:1760
+#, c-format
+msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
+msgstr "libbalsa_mailbox_get_message: skrzynka pocztowa %s jest zamkniÄ?ta"
+
+#: ../libbalsa/mailbox.c:1970
+#, c-format
+msgid "Removing messages from source mailbox failed"
+msgstr "Niepowodzenie usuwania wiadomoÅ?ci ze skrzynki ÅºrÃ³dÅ?owej"
+
+#: ../libbalsa/mailbox.c:2886
+msgid "from unknown"
+msgstr "od nieznany"
+
+#: ../libbalsa/mailbox.c:2888
+msgid "Loading..."
+msgstr "Å?adowanie..."
+
+#: ../libbalsa/mailbox.c:3815
+#, c-format
+msgid "Searching %s for partial messages"
+msgstr "Szukanie %s wiadomoÅ?ci czÄ?Å?ciowych"
+
+#: ../libbalsa/mailbox.c:3906
+msgid "Reconstructing message"
+msgstr "Rekonstrukcja wiadomoÅ?ci"
+
+#: ../libbalsa/mailbox.c:4175
+#, c-format
+msgid "Finding duplicate messages in source mailbox failed"
+msgstr "Szukanie duplikatÃ³w wiadomoÅ?ci w skrzynce ÅºrÃ³dÅ?owej nie powiodÅ?o siÄ?"
+
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:538
+#: ../libbalsa/mailbox_imap.c:550
 msgid "IMAP connection has been severed. Reconnecting..."
 msgstr "PoÅ?Ä?czenie IMAP zostaÅ?o rozÅ?Ä?czone. Ponawianie Å?Ä?czenia..."
 
-#: ../libbalsa/mailbox_imap.c:541
+#: ../libbalsa/mailbox_imap.c:553
 #, c-format
 msgid "IMAP server has shut the connection: %s Reconnecting..."
 msgstr "Serwer IMAP zakoÅ?czyÅ? poÅ?Ä?czenie: %s Ponawianie Å?Ä?czenia..."
 
-#: ../libbalsa/mailbox_imap.c:1007
-#: ../libbalsa/mailbox_maildir.c:493
-#: ../libbalsa/mailbox_mbox.c:516
-#: ../libbalsa/mailbox_mh.c:518
+#: ../libbalsa/mailbox_imap.c:565
+#, c-format
+msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
+msgstr "Nie moÅ¼na byÅ?o wykonaÄ? komendy %s IMAP. Ponowne Å?lÄ?czenie..."
+
+#: ../libbalsa/mailbox_imap.c:1040
+#: ../libbalsa/mailbox_maildir.c:511
+#: ../libbalsa/mailbox_mbox.c:744
+#: ../libbalsa/mailbox_mh.c:547
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Otwieranie %s Licznik odwoÅ?aÅ?: %d\n"
 
-#: ../libbalsa/mailbox_imap.c:1081
-#: ../libbalsa/mailbox_imap.c:2221
+#: ../libbalsa/mailbox_imap.c:1123
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Pobieranie %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:1461
+#: ../libbalsa/mailbox_imap.c:1509
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -607,63 +883,120 @@ msgstr ""
 "Polecenie IMAP SEARCH dla skrzynki %s nie powiodÅ?o siÄ?.\n"
 "NastÄ?piÅ? powrÃ³t do domyÅ?lnej metody wyszukiwania"
 
-#: ../libbalsa/mailbox_imap.c:1521
+#: ../libbalsa/mailbox_imap.c:1569
 #, c-format
 msgid "No path found for mailbox \"%s\", using \"%s\""
 msgstr "Nie odnaleziono Å?cieÅ¼ki dla skrzynki \"%s\", uÅ¼ywajÄ?cej \"%s\""
 
-#: ../libbalsa/mailbox_imap.c:1610
-#: ../libbalsa/mailbox_imap.c:1651
+#: ../libbalsa/mailbox_imap.c:1658
+#: ../libbalsa/mailbox_imap.c:1699
+#, c-format
 msgid "Cannot get IMAP handle"
 msgstr "Nie moÅ¼na uzyskaÄ? dostÄ?pu do serwera IMAP"
 
-#: ../libbalsa/mailbox_imap.c:2254
+#: ../libbalsa/mailbox_imap.c:2331
+#, c-format
+msgid "Downloading %u kB"
+msgstr "Pobieranie %u kB"
+
+#: ../libbalsa/mailbox_imap.c:2363
+#, c-format
+msgid "Error fetching message from IMAP server: %s"
+msgstr "BÅ?Ä?d pobierania wiadomoÅ?ci z servera IMAP: %s"
+
+#: ../libbalsa/mailbox_imap.c:2375
+#, c-format
 msgid "Cannot create temporary file"
 msgstr "Nie moÅ¼na utworzyÄ? pliku tymczasowego"
 
-#: ../libbalsa/mailbox_imap.c:2273
+#: ../libbalsa/mailbox_imap.c:2395
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "Nie moÅ¼na zapisaÄ? do pliku tymczasowego %s"
 
-#: ../libbalsa/mailbox_imap.c:2506
+#: ../libbalsa/mailbox_imap.c:2622
+#: ../libbalsa/mailbox_imap.c:2741
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "WysyÅ?anie %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:2693
+#: ../libbalsa/mailbox_imap.c:3040
 msgid "Server-side threading not supported."
 msgstr "WÄ?tkowanie po stronie serwera nie jest obsÅ?ugiwane."
 
-#: ../libbalsa/mailbox_local.c:1450
+#: ../libbalsa/mailbox_local.c:551
+#: ../libbalsa/mailbox_mbox.c:438
+#, c-format
+msgid "Failed to create temporary file \"%s\": %s"
+msgstr "BÅ?Ä?d przy tworzeniu pliku tymczasowego \"%s\": %s"
+
+#: ../libbalsa/mailbox_local.c:570
+#, c-format
+msgid "Failed to save cache file \"%s\": %s."
+msgstr "BÅ?Ä?d przy zapisywaniu pliku bufora \"%s\": %s."
+
+#: ../libbalsa/mailbox_local.c:580
+#: ../libbalsa/mailbox_mbox.c:450
+#, c-format
+msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
+msgstr "BÅ?Ä?d przy zapisywaniu pliku bufora \"%s\": %s. Nowa wersja zapisana jako  \"%s\""
+
+#: ../libbalsa/mailbox_local.c:611
+#, c-format
+msgid "Cache file for mailbox %s will be created"
+msgstr "Plik bufora dla skrzynki %s zostanie utworzony"
+
+#: ../libbalsa/mailbox_local.c:620
+#, c-format
+msgid "Failed to read cache file %s: %s"
+msgstr "BÅ?Ä?d przy odczycie pliku bufora %s: %s"
+
+#: ../libbalsa/mailbox_local.c:638
+#: ../libbalsa/mailbox_local.c:655
+#: ../libbalsa/mailbox_local.c:679
+#, c-format
+msgid "Cache file for mailbox %s will be repaired"
+msgstr "Plik bufora dla skrzynki pocztowej %s  bÄ?dzie naprawiany"
+
+#: ../libbalsa/mailbox_local.c:1195
+#, c-format
+msgid "Filtering %s"
+msgstr "Filtrowanie %s"
+
+#: ../libbalsa/mailbox_local.c:1283
+#, c-format
+msgid "Preparing %s"
+msgstr "Przygotowywania %s"
+
+#: ../libbalsa/mailbox_local.c:2079
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Nie moÅ¼na otworzyÄ? %s. Kod bÅ?Ä?du: %d, "
 
-#: ../libbalsa/mailbox_local.c:1472
+#: ../libbalsa/mailbox_local.c:2101
 #, c-format
 msgid "Failed to sync mailbox \"%s\""
 msgstr "Nie moÅ¼na zsynchronizowaÄ? skrzynki \"%s\""
 
-#: ../libbalsa/mailbox_maildir.c:205
+#: ../libbalsa/mailbox_maildir.c:197
 #, c-format
 msgid "Mailbox %s does not appear to be a Maildir mailbox."
 msgstr "Skrzynka %s nie jest skrzynkÄ? typu Maildir."
 
-#: ../libbalsa/mailbox_maildir.c:214
+#: ../libbalsa/mailbox_maildir.c:206
 #, c-format
 msgid "Could not create a MailDir directory at %s (%s)"
 msgstr "Nie moÅ¼na utworzyÄ? katalogu Maildir w %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:221
-#: ../libbalsa/mailbox_maildir.c:229
-#: ../libbalsa/mailbox_maildir.c:239
+#: ../libbalsa/mailbox_maildir.c:214
+#: ../libbalsa/mailbox_maildir.c:223
+#: ../libbalsa/mailbox_maildir.c:234
 #, c-format
 msgid "Could not create a MailDir at %s (%s)"
 msgstr "Nie moÅ¼na utworzyÄ? skrzynki Maildir w %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:340
-#: ../libbalsa/mailbox_mh.c:277
+#: ../libbalsa/mailbox_maildir.c:341
+#: ../libbalsa/mailbox_mh.c:294
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -672,9 +1005,9 @@ msgstr ""
 "Nie moÅ¼na usunÄ?Ä? zawartoÅ?ci %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:346
-#: ../libbalsa/mailbox_mbox.c:300
-#: ../libbalsa/mailbox_mh.c:283
+#: ../libbalsa/mailbox_maildir.c:347
+#: ../libbalsa/mailbox_mbox.c:323
+#: ../libbalsa/mailbox_mh.c:300
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -683,116 +1016,121 @@ msgstr ""
 "Nie moÅ¼na usunÄ?Ä? %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:472
-#: ../libbalsa/mailbox_mbox.c:467
-#: ../libbalsa/mailbox_mh.c:499
+#: ../libbalsa/mailbox_maildir.c:490
+#: ../libbalsa/mailbox_mbox.c:688
+#: ../libbalsa/mailbox_mh.c:528
+#, c-format
 msgid "Mailbox does not exist."
 msgstr "Skrzynka nie istnieje."
 
-#: ../libbalsa/mailbox_maildir.c:901
-msgid "Cannot read message"
-msgstr "Nie moÅ¼na odczytaÄ? wiadomoÅ?ci"
-
-#: ../libbalsa/mailbox_maildir.c:923
-#: ../libbalsa/mailbox_mbox.c:1606
-#: ../libbalsa/mailbox_mh.c:1114
+#: ../libbalsa/mailbox_maildir.c:932
+#: ../libbalsa/mailbox_mbox.c:2004
+#: ../libbalsa/mailbox_mh.c:1110
+#, c-format
 msgid "Data copy error"
 msgstr "BÅ?Ä?d przy kopiowaniu informacji"
 
-#: ../libbalsa/mailbox_mbox.c:204
+#: ../libbalsa/mailbox_mbox.c:208
 #, c-format
 msgid "Mailbox %s does not appear to be an Mbox mailbox."
 msgstr "Skrzynka %s nie wydaje siÄ? byÄ? skrzynkÄ? typu Mbox."
 
-#: ../libbalsa/mailbox_mbox.c:475
+#: ../libbalsa/mailbox_mbox.c:426
+#, c-format
+msgid "Could not write file %s: %s"
+msgstr "Nie moÅ¼na pisaÄ? pliku %s: %s"
+
+#: ../libbalsa/mailbox_mbox.c:458
+#, c-format
+msgid "Could not unlink file %s: %s"
+msgstr "Nie moÅ¼na odÅ?Ä?czyÄ? pliku %s: %s"
+
+#: ../libbalsa/mailbox_mbox.c:696
+#, c-format
 msgid "Cannot open mailbox."
 msgstr "Nie moÅ¼na otworzyÄ? skrzynki."
 
-#: ../libbalsa/mailbox_mbox.c:487
+#: ../libbalsa/mailbox_mbox.c:708
+#, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "Skrzynka nie jest w formacie mbox."
 
-#: ../libbalsa/mailbox_mbox.c:495
+#: ../libbalsa/mailbox_mbox.c:716
+#, c-format
 msgid "Cannot lock mailbox."
 msgstr "Nie moÅ¼na zablokowaÄ? skrzynki."
 
-#: ../libbalsa/mailbox_mbox.c:1554
+#: ../libbalsa/mailbox_mbox.c:1961
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: nie moÅ¼na otworzyÄ? %s."
 
-#: ../libbalsa/mailbox_mbox.c:1564
+#: ../libbalsa/mailbox_mbox.c:1972
 #, c-format
 msgid "%s: could not get new mime stream."
 msgstr "%s: nie moÅ¼na pobraÄ? nowego strumienia mime."
 
-#: ../libbalsa/mailbox_mbox.c:1572
+#: ../libbalsa/mailbox_mbox.c:1980
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: %s nie jest w formacie mbox."
 
-#: ../libbalsa/mailbox_mbox.c:1584
-#, c-format
-msgid "%s: could not get message stream."
-msgstr "%s: nie moÅ¼na pobraÄ? strumienia listu."
-
-#: ../libbalsa/mailbox_mh.c:184
+#: ../libbalsa/mailbox_mh.c:175
 #, c-format
 msgid "Mailbox %s does not appear to be a Mh mailbox."
 msgstr "Skrzynka %s nie wydaje siÄ? byÄ? skrzynkÄ? typu MH."
 
-#: ../libbalsa/mailbox_mh.c:194
+#: ../libbalsa/mailbox_mh.c:185
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "Nie moÅ¼na utworzyÄ? katalogu MH w %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:201
+#: ../libbalsa/mailbox_mh.c:197
 #, c-format
 msgid "Could not create MH structure at %s (%s)"
 msgstr "Nie moÅ¼na utworzyÄ? struktury MH w %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:1090
+#: ../libbalsa/mailbox_mh.c:1091
+#, c-format
 msgid "Cannot create message"
 msgstr "Nie moÅ¼na utworzyÄ? wiadomoÅ?ci"
 
-#: ../libbalsa/mailbox_mh.c:1140
+#: ../libbalsa/mailbox_mh.c:1135
+#, c-format
 msgid "Message rename error"
 msgstr "BÅ?Ä?d przy zmianie nazwy wiadomoÅ?ci"
 
-#: ../libbalsa/mailbox_pop3.c:204
+#: ../libbalsa/mailbox_pop3.c:191
 #, c-format
-msgid "Error setting flags on messages in mailbox %s"
-msgstr "BÅ?Ä?d przy ustawianiu flag dla wiadomoÅ?ci w skrzynce %s!"
-
-#: ../libbalsa/mailbox_pop3.c:218
-#, fuzzy, c-format
 msgid "Error appending message %d from %s to %s: %s"
-msgstr ""
-"Przy przenoszeniu listÃ³w %s do %s wystÄ?piÅ? bÅ?Ä?d\n"
-"Listy pozostaÅ?y w %s\n"
+msgstr "BÅ?Ä?d przy doÅ?Ä?czaniu wiadomoÅ?ci %d od %s do %s: %s"
+
+#: ../libbalsa/mailbox_pop3.c:340
+#, c-format
+msgid "Saving POP message to %s failed"
+msgstr "Zapisywanie wiadomoÅ?ci POP do %s nie powiodÅ?o siÄ?"
 
-#: ../libbalsa/mailbox_pop3.c:380
+#: ../libbalsa/mailbox_pop3.c:347
 #, c-format
 msgid "Retrieving Message %d of %d"
 msgstr "Pobieranie listu %d z %d"
 
-#: ../libbalsa/mailbox_pop3.c:403
+#: ../libbalsa/mailbox_pop3.c:370
 #, c-format
 msgid "Received %ld kB of %ld"
 msgstr "Otrzymano %ld kB z %ld"
 
-#: ../libbalsa/mailbox_pop3.c:417
+#: ../libbalsa/mailbox_pop3.c:384
 #, c-format
 msgid "Saving POP message to %s failed."
-msgstr "Zapisanie wiadomoÅ?ci POP do %s nie powiodÅ?o siÄ?."
+msgstr "Zapisywanie wiadomoÅ?ci POP do %s nie powiodÅ?o siÄ?."
 
-#: ../libbalsa/mailbox_pop3.c:427
+#: ../libbalsa/mailbox_pop3.c:394
 #, c-format
-msgid "Transfering POP message to %s failed."
-msgstr "Przeniesienie wiadomoÅ?ci POP do %s nie powiodÅ?o siÄ?."
+msgid "Transferring POP message to %s failed."
+msgstr "Zapisanie wiadomoÅ?ci POP do %s nie powiodÅ?o siÄ?."
 
-#: ../libbalsa/mailbox_pop3.c:508
-#: ../libbalsa/mailbox_pop3.c:519
+#: ../libbalsa/mailbox_pop3.c:470
 #, c-format
 msgid ""
 "POP3 mailbox %s temp file error:\n"
@@ -801,139 +1139,147 @@ msgstr ""
 "Nie moÅ¼na utworzyÄ? pliku tymczasowego skrzynki POP3 %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_pop3.c:533
-#, c-format
-msgid "POP3 mailbox %s temp mailbox error:\n"
-msgstr "Nie moÅ¼na utworzyÄ? tymczasowej skrzynki POP3 %s:\n"
-
-#: ../libbalsa/mailbox_pop3.c:557
+#: ../libbalsa/mailbox_pop3.c:495
 #, c-format
 msgid "POP3 mailbox %s error: %s\n"
 msgstr "BÅ?Ä?d skrzynki POP3 %s: %s\n"
 
-# FIXME - numer listu czy jak?
-#: ../libbalsa/mailbox_pop3.c:591
+#: ../libbalsa/mailbox_pop3.c:532
 #, c-format
 msgid "POP3 message %d oversized: %d kB - skipped."
 msgstr "List POP3 %d przekroczyÅ? rozmiar: PominiÄ?to %d kB."
 
-#: ../libbalsa/mailbox_pop3.c:602
+#: ../libbalsa/mailbox_pop3.c:544
 #, c-format
 msgid "POP3 error: cannot open %s for writing."
 msgstr "BÅ?Ä?d POP3: nie moÅ¼na otworzyÄ? %s do zapisu."
 
-#: ../libbalsa/mailbox_pop3.c:610
+#: ../libbalsa/mailbox_pop3.c:552
 #, c-format
 msgid "POP3 error: cannot close %s."
 msgstr "BÅ?Ä?d POP3: nie moÅ¼na zamknÄ?Ä? %s."
 
-#: ../libbalsa/mailbox_pop3.c:639
+#: ../libbalsa/mailbox_pop3.c:585
 #, c-format
 msgid "POP3 error: %s."
 msgstr "BÅ?Ä?d POP3: %s."
 
-#: ../libbalsa/message.c:529
-#: ../libbalsa/message.c:569
+#: ../libbalsa/message.c:607
 #, c-format
 msgid "Mailbox (%s) is readonly: cannot change flags."
 msgstr "Skrzynka (%s) jest tylko do odczytu: nie moÅ¼na zmieniÄ? flag."
 
-#: ../libbalsa/misc.c:1237
+#: ../libbalsa/misc.c:600
 msgid "west european"
 msgstr "zachodnioeuropejski"
 
-#: ../libbalsa/misc.c:1239
-#: ../libbalsa/misc.c:1273
+#: ../libbalsa/misc.c:602
+#: ../libbalsa/misc.c:636
 msgid "east european"
 msgstr "wschodnioeuropejski"
 
-#: ../libbalsa/misc.c:1241
+#: ../libbalsa/misc.c:604
 msgid "south european"
 msgstr "poÅ?udniowoeuropejski"
 
-#: ../libbalsa/misc.c:1243
+#: ../libbalsa/misc.c:606
 msgid "north european"
 msgstr "pÃ³Å?nocnoeuropejski"
 
-#: ../libbalsa/misc.c:1245
-#: ../libbalsa/misc.c:1275
+#: ../libbalsa/misc.c:608
+#: ../libbalsa/misc.c:638
 msgid "cyrillic"
 msgstr "cyrylica"
 
-#: ../libbalsa/misc.c:1247
-#: ../libbalsa/misc.c:1281
+#: ../libbalsa/misc.c:610
+#: ../libbalsa/misc.c:644
 msgid "arabic"
 msgstr "arabski"
 
-#: ../libbalsa/misc.c:1249
-#: ../libbalsa/misc.c:1277
+#: ../libbalsa/misc.c:612
+#: ../libbalsa/misc.c:640
 msgid "greek"
 msgstr "grecki"
 
-#: ../libbalsa/misc.c:1251
-#: ../libbalsa/misc.c:1279
+#: ../libbalsa/misc.c:614
+#: ../libbalsa/misc.c:642
 msgid "hebrew"
 msgstr "hebrajski"
 
-#: ../libbalsa/misc.c:1253
+#: ../libbalsa/misc.c:616
 msgid "turkish"
 msgstr "turecki"
 
-#: ../libbalsa/misc.c:1255
+#: ../libbalsa/misc.c:618
 msgid "nordic"
 msgstr "nordycki"
 
-#: ../libbalsa/misc.c:1257
+#: ../libbalsa/misc.c:620
 msgid "thai"
 msgstr "tajski"
 
-#: ../libbalsa/misc.c:1259
-#: ../libbalsa/misc.c:1283
+#: ../libbalsa/misc.c:622
+#: ../libbalsa/misc.c:646
 msgid "baltic"
 msgstr "baÅ?tycki"
 
-#: ../libbalsa/misc.c:1261
+#: ../libbalsa/misc.c:624
 msgid "celtic"
 msgstr "celtycki"
 
-#: ../libbalsa/misc.c:1263
+#: ../libbalsa/misc.c:626
 msgid "west europe (euro)"
 msgstr "zachodnia Europa (euro)"
 
-#: ../libbalsa/misc.c:1265
+#: ../libbalsa/misc.c:628
 msgid "russian"
 msgstr "rosyjski"
 
-#: ../libbalsa/misc.c:1267
-msgid "ukranian"
+#: ../libbalsa/misc.c:630
+msgid "ukrainian"
 msgstr "UkraiÅ?ski"
 
-#: ../libbalsa/misc.c:1269
+#: ../libbalsa/misc.c:632
 msgid "japanese"
 msgstr "japoÅ?ski"
 
-#: ../libbalsa/misc.c:1271
+#: ../libbalsa/misc.c:634
 msgid "korean"
 msgstr "koreaÅ?ski"
 
-#: ../libbalsa/misc.c:1889
+#: ../libbalsa/misc.c:808
+#, c-format
+msgid "Cannot open %s: %s"
+msgstr "Nie moÅ¼na otworzyÄ? %s: %s"
+
+#: ../libbalsa/misc.c:817
+#, c-format
+msgid "Cannot open %s: is a symbolic link"
+msgstr "Nie moÅ¼na otworzyÄ? %s: jest dowiÄ?zaniem symbolicznym"
+
+#: ../libbalsa/misc.c:944
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "UpÅ?ynÄ?Å? czas przeznaczony na utworzenie blokady za pomocÄ? fcntl!"
 
-#: ../libbalsa/misc.c:1896
+#: ../libbalsa/misc.c:951
 #, c-format
 msgid "Waiting for fcntl lock... %d"
 msgstr "Oczekiwanie na utworzenie blokady za pomocÄ? fcntl... %d"
 
-#: ../libbalsa/misc.c:1924
+#: ../libbalsa/misc.c:979
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "UpÅ?ynÄ?Å? czas przeznaczony na utworzenie blokady za pomocÄ? flock!"
 
-#: ../libbalsa/misc.c:1931
+#: ../libbalsa/misc.c:986
 #, c-format
 msgid "Waiting for flock attempt... %d"
 msgstr "Oczekiwanie na utworzenie blokady za pomocÄ? flock... %d"
 
+#: ../libbalsa/misc.c:1284
+#, c-format
+msgid "LDAP Directory for %s"
+msgstr "Katalog LDAP dla %s"
+
 #: ../libbalsa/rfc3156.c:89
 #, c-format
 msgid "Gpgme has been compiled without support for protocol %s."
@@ -956,7 +1302,7 @@ msgstr "Nieznany problem z silnikiem dla protokoÅ?u %s."
 
 #: ../libbalsa/rfc3156.c:111
 #, c-format
-msgid "%s: could not retreive crypto engine information: %s."
+msgid "%s: could not retrieve crypto engine information: %s."
 msgstr "%s: nie moÅ¼na pobraÄ? informacji silnika szyfrowania: %s."
 
 #: ../libbalsa/rfc3156.c:115
@@ -968,166 +1314,115 @@ msgstr ""
 "\n"
 "WyÅ?Ä?czenie obsÅ?ugi protokoÅ?u %s."
 
-#: ../libbalsa/rfc3156.c:257
-#: ../libbalsa/rfc3156.c:262
-#: ../libbalsa/rfc3156.c:349
-#: ../libbalsa/rfc3156.c:354
-#: ../libbalsa/rfc3156.c:517
-#: ../libbalsa/rfc3156.c:522
-#: ../libbalsa/rfc3156.c:630
-#: ../libbalsa/rfc3156.c:635
-#: ../libbalsa/rfc3156.c:746
-#: ../libbalsa/rfc3156.c:751
-#: ../libbalsa/rfc3156.c:859
-#: ../libbalsa/rfc3156.c:864
-#: ../libbalsa/rfc3156.c:939
-#: ../libbalsa/rfc3156.c:944
-msgid "creating a gpgme context failed"
-msgstr "utworzenie kontekstu gpgme nie powiodÅ?o siÄ?"
-
-#: ../libbalsa/rfc3156.c:275
-#: ../libbalsa/rfc3156.c:764
+#: ../libbalsa/rfc3156.c:303
+#: ../libbalsa/rfc3156.c:754
 msgid "Enter passphrase to unlock the secret key for signing"
 msgstr "WprowadÅº hasÅ?o odblokowujÄ?ce tajny klucz podpisujÄ?cy"
 
-#: ../libbalsa/rfc3156.c:296
-#: ../libbalsa/rfc3156.c:300
-#: ../libbalsa/rfc3156.c:796
-msgid "signing failed"
-msgstr "podpisanie nie powiodÅ?o siÄ?"
-
-#: ../libbalsa/rfc3156.c:403
-#: ../libbalsa/rfc3156.c:408
-#: ../libbalsa/rfc3156.c:799
-msgid "encryption failed"
-msgstr "szyfrowanie nie powiodÅ?o siÄ?"
-
-#: ../libbalsa/rfc3156.c:552
-#: ../libbalsa/rfc3156.c:557
-#: ../libbalsa/rfc3156.c:875
-#: ../libbalsa/rfc3156.c:881
-msgid "signature verification failed"
-msgstr "weryfikacja podpisu nie powiodÅ?a siÄ?"
+#: ../libbalsa/rfc3156.c:521
+#: ../libbalsa/rfc3156.c:526
+#: ../libbalsa/rfc3156.c:631
+#: ../libbalsa/rfc3156.c:636
+#: ../libbalsa/rfc3156.c:820
+#: ../libbalsa/rfc3156.c:825
+#: ../libbalsa/rfc3156.c:900
+#: ../libbalsa/rfc3156.c:905
+msgid "creating a gpgme context failed"
+msgstr "utworzenie kontekstu gpgme nie powiodÅ?o siÄ?"
 
-#: ../libbalsa/rfc3156.c:647
-#: ../libbalsa/rfc3156.c:955
+#: ../libbalsa/rfc3156.c:648
+#: ../libbalsa/rfc3156.c:916
 msgid "Enter passphrase to decrypt message"
 msgstr "WprowadÅº hasÅ?o deszyfrujÄ?ce list"
 
-#: ../libbalsa/rfc3156.c:682
-#: ../libbalsa/rfc3156.c:687
-msgid "decryption failed"
-msgstr "odszyfrowanie nie powiodÅ?o siÄ?"
-
-#: ../libbalsa/rfc3156.c:792
-#: ../libbalsa/rfc3156.c:806
-msgid "signing and encryption failed"
-msgstr "podpisanie i szyfrowanie nie powiodÅ?o siÄ?"
-
-#: ../libbalsa/rfc3156.c:809
-#, c-format
-msgid "signing failed: %s"
-msgstr "podpisanie nie powiodÅ?o siÄ?: %s"
-
-#: ../libbalsa/rfc3156.c:812
-#, c-format
-msgid "encryption failed: %s"
-msgstr "szyfrowanie nie powiodÅ?o siÄ?: %s"
-
-#: ../libbalsa/rfc3156.c:964
-#: ../libbalsa/rfc3156.c:971
+#: ../libbalsa/rfc3156.c:925
+#: ../libbalsa/rfc3156.c:932
 msgid "decryption and signature verification failed"
 msgstr "odszyfrowanie i weryfikacja podpisu nie powiodÅ?o siÄ?"
 
-# valid to w sumie waÅ¼ny, ale to jakoÅ? mi nie pasuje
-#: ../libbalsa/rfc3156.c:1002
+#: ../libbalsa/rfc3156.c:963
 msgid "The signature is valid."
 msgstr "Podpis jest poprawny."
 
-#: ../libbalsa/rfc3156.c:1004
+#: ../libbalsa/rfc3156.c:965
 msgid "The signature is valid but expired."
 msgstr "Podpis jest poprawny lecz straciÅ? waÅ¼noÅ?Ä?."
 
-#: ../libbalsa/rfc3156.c:1007
+#: ../libbalsa/rfc3156.c:968
 msgid "The signature is valid but the key used to verify the signature has expired."
 msgstr "Podpis jest poprawny, ale klucz uÅ¼yty do jego weryfikacji straciÅ? waÅ¼noÅ?Ä?."
 
-#: ../libbalsa/rfc3156.c:1010
+#: ../libbalsa/rfc3156.c:971
 msgid "The signature is valid but the key used to verify the signature has been revoked."
 msgstr "Podpis jest poprawny, ale klucz uÅ¼yty do jego weryfikacji zostaÅ? uniewaÅ¼niony."
 
-# valid to w sumie waÅ¼ny, ale to jakoÅ? mi nie pasuje
-#: ../libbalsa/rfc3156.c:1013
+#: ../libbalsa/rfc3156.c:974
 msgid "The signature is invalid."
 msgstr "Podpis nie jest poprawny."
 
-#: ../libbalsa/rfc3156.c:1016
+#: ../libbalsa/rfc3156.c:977
 msgid "The signature could not be verified due to a missing key."
 msgstr "Nie moÅ¼na zweryfikowaÄ? podpisu z powodu braku klucza."
 
-#: ../libbalsa/rfc3156.c:1018
+#: ../libbalsa/rfc3156.c:979
 msgid "This part is not a real PGP signature."
 msgstr "Ten element nie jest prawdziwym podpisem PGP."
 
-#: ../libbalsa/rfc3156.c:1021
+#: ../libbalsa/rfc3156.c:982
 msgid "The signature could not be verified due to an invalid crypto engine."
 msgstr "Nie moÅ¼na zweryfikowaÄ? podpisu z powodu niepoprawnego silnika szyfrowania."
 
-# FIXME - a moÅ¼e zamiast depozytÃ³w to baza kluczy?
-#: ../libbalsa/rfc3156.c:1024
-#: ../libbalsa/rfc3156.c:1764
+#: ../libbalsa/rfc3156.c:985
+#: ../libbalsa/rfc3156.c:1737
 msgid "GnuPG is rebuilding the trust database and is currently unavailable."
 msgstr "Pogram GnuPG przebudowywuje bazÄ? depozytÃ³w i jest obecnie niedostepny."
 
-#: ../libbalsa/rfc3156.c:1027
+#: ../libbalsa/rfc3156.c:988
 msgid "An error prevented the signature verification."
 msgstr "Nie moÅ¼na zweryfikowaÄ? podpisu z powodu bÅ?Ä?du."
 
-#: ../libbalsa/rfc3156.c:1035
+#: ../libbalsa/rfc3156.c:996
 msgid "The user ID is of unknown validity."
 msgstr "Niepotwierdzona waÅ¼noÅ?Ä? identyfikatora uÅ¼ytkownika."
 
-#: ../libbalsa/rfc3156.c:1037
+#: ../libbalsa/rfc3156.c:998
 msgid "The validity of the user ID is undefined."
 msgstr "WaÅ¼noÅ?Ä? identyfikatora uÅ¼ytkownika nie jest okreÅ?lona."
 
-#: ../libbalsa/rfc3156.c:1039
+#: ../libbalsa/rfc3156.c:1000
 msgid "The user ID is never valid."
 msgstr "Identyfikator uÅ¼ytkownika jest niewaÅ¼ny."
 
-#: ../libbalsa/rfc3156.c:1041
+#: ../libbalsa/rfc3156.c:1002
 msgid "The user ID is marginally valid."
 msgstr "Identyfikator uÅ¼ytkownika jest czÄ?Å?ciowo potwierdzony."
 
-#: ../libbalsa/rfc3156.c:1043
+#: ../libbalsa/rfc3156.c:1004
 msgid "The user ID is fully valid."
 msgstr "Identyfikator uÅ¼ytkownika jest waÅ¼ny."
 
-# co za bezssens z tymi podpisami
-#: ../libbalsa/rfc3156.c:1045
+#: ../libbalsa/rfc3156.c:1006
 msgid "The user ID is ultimately valid."
 msgstr "Identyfikator uÅ¼ytkownika jest ostatecznie waÅ¼ny."
 
-# to jest naprawdÄ? pokrÄ?cone
-# terminologia kryptologiczna rodem z prokomu :/
-#: ../libbalsa/rfc3156.c:1047
-#: ../libbalsa/rfc3156.c:1292
+#: ../libbalsa/rfc3156.c:1008
+#: ../libbalsa/rfc3156.c:1265
 msgid "bad validity"
 msgstr "bÅ?Ä?d stwierdzenia waÅ¼noÅ?ci"
 
-#: ../libbalsa/rfc3156.c:1055
+#: ../libbalsa/rfc3156.c:1016
 msgid "PGP signature: "
 msgstr "Podpis PGP: "
 
-#: ../libbalsa/rfc3156.c:1057
+#: ../libbalsa/rfc3156.c:1018
 msgid "S/MIME signature: "
-msgstr "Podpis S/MIME: "
+msgstr "Podpis S/MIME:"
 
-#: ../libbalsa/rfc3156.c:1059
+#: ../libbalsa/rfc3156.c:1020
 msgid "(unknown protocol) "
 msgstr "(nieznany protokÃ³Å?) "
 
-#: ../libbalsa/rfc3156.c:1078
+#: ../libbalsa/rfc3156.c:1039
 #, c-format
 msgid ""
 "\n"
@@ -1136,7 +1431,7 @@ msgstr ""
 "\n"
 "ID urzytkownika: %s"
 
-#: ../libbalsa/rfc3156.c:1081
+#: ../libbalsa/rfc3156.c:1042
 #, c-format
 msgid ""
 "\n"
@@ -1145,9 +1440,7 @@ msgstr ""
 "\n"
 "Podpisane przez: %s"
 
-# Musze jeszcze sprawdziÄ? czy napewno idzie o adres e-mail
-# a nie pocztowy (tradycyjny)
-#: ../libbalsa/rfc3156.c:1085
+#: ../libbalsa/rfc3156.c:1046
 #, c-format
 msgid ""
 "\n"
@@ -1156,7 +1449,7 @@ msgstr ""
 "\n"
 "Adres: %s"
 
-#: ../libbalsa/rfc3156.c:1090
+#: ../libbalsa/rfc3156.c:1051
 #, c-format
 msgid ""
 "\n"
@@ -1165,25 +1458,25 @@ msgstr ""
 "\n"
 "Data podpisu: %s"
 
-#: ../libbalsa/rfc3156.c:1092
-#, fuzzy, c-format
+#: ../libbalsa/rfc3156.c:1053
+#, c-format
 msgid ""
 "\n"
 "User ID validity: %s"
 msgstr ""
 "\n"
-"ID urzytkownika: %s"
+"WiarygodnoÅ?Ä? uÅ¼ytkownika o ID: %s"
 
-#: ../libbalsa/rfc3156.c:1096
-#, fuzzy, c-format
+#: ../libbalsa/rfc3156.c:1057
+#, c-format
 msgid ""
 "\n"
 "Key owner trust: %s"
 msgstr ""
 "\n"
-"Zaufanie wÅ?aÅ?ciciela: %s"
+"Zaufanie do wÅ?aÅ?ciciela klucza: %s"
 
-#: ../libbalsa/rfc3156.c:1100
+#: ../libbalsa/rfc3156.c:1061
 #, c-format
 msgid ""
 "\n"
@@ -1192,61 +1485,58 @@ msgstr ""
 "\n"
 "Odcisk klucza: %s"
 
-#: ../libbalsa/rfc3156.c:1105
-#, fuzzy, c-format
+#: ../libbalsa/rfc3156.c:1066
+#, c-format
 msgid ""
 "\n"
 "Subkey created on: %s"
 msgstr ""
 "\n"
-"Data utworzenia klucza: %s"
+"Podklucz utworzono: %s"
 
-#: ../libbalsa/rfc3156.c:1110
-#, fuzzy, c-format
+#: ../libbalsa/rfc3156.c:1071
+#, c-format
 msgid ""
 "\n"
 "Subkey expires on: %s"
 msgstr ""
 "\n"
-"Data utworzenia klucza: %s"
+"Podklucz wygasa: %s"
 
-#: ../libbalsa/rfc3156.c:1119
+#: ../libbalsa/rfc3156.c:1080
 msgid " revoked"
 msgstr " uniewaÅ¼niony"
 
-#: ../libbalsa/rfc3156.c:1124
+#: ../libbalsa/rfc3156.c:1085
 msgid " expired"
 msgstr " straciÅ? waÅ¼noÅ?Ä?"
 
-#: ../libbalsa/rfc3156.c:1129
+#: ../libbalsa/rfc3156.c:1090
 msgid " disabled"
 msgstr " wyÅ?Ä?czony"
 
-#: ../libbalsa/rfc3156.c:1134
+#: ../libbalsa/rfc3156.c:1095
 msgid " invalid"
 msgstr " niepoprawny"
 
-# FIXME - albo kluczowe?
-#: ../libbalsa/rfc3156.c:1137
-#, fuzzy, c-format
+#. ngettext: string begins with a single space, so no space after
+#. * the colon is correct punctuation (in English).
+#: ../libbalsa/rfc3156.c:1099
+#, c-format
 msgid ""
 "\n"
-"Subkey attributes:%s"
-msgstr ""
+"Subkey attribute:%s"
+msgid_plural ""
 "\n"
-"Atrybuty klucza:%s"
-
-# FIXME - kluczowe?
-#: ../libbalsa/rfc3156.c:1139
-#, fuzzy, c-format
-msgid ""
+"Subkey attributes:%s"
+msgstr[0] ""
 "\n"
-"Subkey attribute:%s"
-msgstr ""
+"Atrybut podklucza:%s"
+msgstr[1] ""
 "\n"
-"Atrybut klucza:%s"
+"Atrybuty podklucza:%s"
 
-#: ../libbalsa/rfc3156.c:1145
+#: ../libbalsa/rfc3156.c:1108
 #, c-format
 msgid ""
 "\n"
@@ -1255,7 +1545,7 @@ msgstr ""
 "\n"
 "Nazwa wystawcy: %s"
 
-#: ../libbalsa/rfc3156.c:1149
+#: ../libbalsa/rfc3156.c:1112
 #, c-format
 msgid ""
 "\n"
@@ -1264,7 +1554,7 @@ msgstr ""
 "\n"
 "Numer seryjny wystawcy: %s"
 
-#: ../libbalsa/rfc3156.c:1152
+#: ../libbalsa/rfc3156.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -1273,114 +1563,114 @@ msgstr ""
 "\n"
 "ID Å?aÅ?cucha: %s"
 
-#: ../libbalsa/rfc3156.c:1199
+#: ../libbalsa/rfc3156.c:1172
 #, c-format
-msgid "Could not launch %s to get the public key %s."
+msgid "Could not launch %s to query the public key %s."
 msgstr "Nie moÅ¼na uruchomiÄ? %s by pobraÄ? klucz publiczny %s."
 
-#: ../libbalsa/rfc3156.c:1249
+#: ../libbalsa/rfc3156.c:1222
 #, c-format
 msgid ""
-"Running gpg failed with return value %d:\n"
+"Running %s failed with return value %d:\n"
 "%s"
 msgstr ""
-"Uruchomienie gpg nie powiodÅ?o siÄ?, zwrÃ³cona wartoÅ?Ä? %d:\n"
+"Uruchomienie %s nie powiodÅ?o siÄ?, zwrÃ³cona wartoÅ?Ä? %d:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1256
+#: ../libbalsa/rfc3156.c:1229
 #, c-format
 msgid ""
-"Running gpg successful:\n"
+"Running %s successful:\n"
 "%s"
 msgstr ""
-"Uruchomienie gpg powiodÅ?o siÄ?:\n"
+"Uruchomienie %s powiodÅ?o siÄ?:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1280
+#: ../libbalsa/rfc3156.c:1253
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../libbalsa/rfc3156.c:1282
+#: ../libbalsa/rfc3156.c:1255
 msgid "undefined"
 msgstr "niezdefiniowany"
 
-#: ../libbalsa/rfc3156.c:1284
+#: ../libbalsa/rfc3156.c:1257
+#: ../src/address-book-config.c:198
 msgid "never"
 msgstr "nigdy"
 
-#: ../libbalsa/rfc3156.c:1286
+#: ../libbalsa/rfc3156.c:1259
 msgid "marginal"
 msgstr "marginalny"
 
-#: ../libbalsa/rfc3156.c:1288
+#: ../libbalsa/rfc3156.c:1261
 msgid "full"
 msgstr "peÅ?ny"
 
-#: ../libbalsa/rfc3156.c:1290
+#: ../libbalsa/rfc3156.c:1263
 msgid "ultimate"
 msgstr "ostateczny"
 
-#: ../libbalsa/rfc3156.c:1353
+#: ../libbalsa/rfc3156.c:1326
 msgid "User ID"
 msgstr "ID uÅ¼ytkownika"
 
-#: ../libbalsa/rfc3156.c:1353
+#: ../libbalsa/rfc3156.c:1326
 msgid "Key ID"
 msgstr "ID Klucza"
 
-# Albo czas trwania, bo moÅ¼e to o certyfikat idzie
-#: ../libbalsa/rfc3156.c:1353
+#: ../libbalsa/rfc3156.c:1326
 msgid "Length"
 msgstr "DÅ?ugoÅ?Ä?"
 
-#: ../libbalsa/rfc3156.c:1353
+#: ../libbalsa/rfc3156.c:1326
 msgid "Validity"
 msgstr "WaÅ¼noÅ?Ä?"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/rfc3156.c:1397
+#: ../libbalsa/rfc3156.c:1370
 msgid "Select key"
 msgstr "WybÃ³r klucza"
 
-#: ../libbalsa/rfc3156.c:1408
+#: ../libbalsa/rfc3156.c:1381
 #, c-format
 msgid "Select the private key for the signer %s"
 msgstr "Wybierz klucz prywatny dla podpisujÄ?cego %s"
 
-#: ../libbalsa/rfc3156.c:1412
+#: ../libbalsa/rfc3156.c:1385
 #, c-format
 msgid "Select the public key for the recipient %s"
 msgstr "Wybierz klucz publiczny dla odbiorcy %s"
 
-#: ../libbalsa/rfc3156.c:1543
+#: ../libbalsa/rfc3156.c:1516
 #, c-format
 msgid "Insufficient trust for recipient %s"
-msgstr "NiewystarczajÄ?ce zaufanie dla odbiorcy %s"
+msgstr "Nie wystarczajÄ?ce zaufanie dla odbiorcy %s"
 
-#: ../libbalsa/rfc3156.c:1545
+#: ../libbalsa/rfc3156.c:1518
 #, c-format
 msgid "The validity of the key with user ID \"%s\" is \"%s\"."
 msgstr "WaÅ¼noÅ?Ä? identyfikatora uÅ¼ytkownika Z ID \"%s\" jest okreÅ?lona jako  \"%s\"."
 
-#: ../libbalsa/rfc3156.c:1556
+#: ../libbalsa/rfc3156.c:1529
 msgid "Use this key anyway?"
 msgstr "Czy mimo wszystko uÅ¼yÄ? tego klucza?"
 
-#: ../libbalsa/rfc3156.c:1765
+#: ../libbalsa/rfc3156.c:1738
 msgid "Try again later."
 msgstr "SprÃ³buj pÃ³Åºniej."
 
-#: ../libbalsa/send.c:244
-#: ../libbalsa/send.c:251
+#: ../libbalsa/send.c:248
+#: ../libbalsa/send.c:255
 msgid "Sending Mail..."
 msgstr "WysyÅ?anie listu..."
 
-#: ../libbalsa/send.c:247
-#: ../src/main-window.c:2685
+#: ../libbalsa/send.c:251
+#: ../src/main-window.c:2745
 msgid "_Hide"
-msgstr "U_kryj"
+msgstr "_Ukryj"
 
-#: ../libbalsa/send.c:838
+#: ../libbalsa/send.c:961
 #, c-format
 msgid ""
 "Could not send the message to %s:\n"
@@ -1391,12 +1681,13 @@ msgstr ""
 "%d: %s\n"
 "List pozostaÅ? w skrzynce poczty wychodzÄ?cej.\n"
 
-#: ../libbalsa/send.c:884
+#: ../libbalsa/send.c:1007
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Zapisanie wysÅ?anego listu do %s nie powiodÅ?o siÄ?: %s"
 
-#: ../libbalsa/send.c:903
+#: ../libbalsa/send.c:1036
+#: ../libbalsa/send.c:1048
 #, c-format
 msgid ""
 "Relaying refused:\n"
@@ -1407,7 +1698,7 @@ msgstr ""
 "%d: %s\n"
 "List pozostaÅ? w skrzynce poczty wychodzÄ?cej.\n"
 
-#: ../libbalsa/send.c:913
+#: ../libbalsa/send.c:1055
 msgid ""
 "Message submission problem, placing it into your outbox.\n"
 "System will attempt to resubmit the message until you delete it."
@@ -1416,42 +1707,39 @@ msgstr ""
 "w folderze \"Poczta wychodzÄ?ca\". System bÄ?dzie prÃ³bowaÅ? wysÅ?aÄ?\n"
 "list aÅ¼ do chwili jego usuniÄ?cia."
 
-#: ../libbalsa/send.c:943
+#: ../libbalsa/send.c:1085
 msgid "Connected to MTA"
 msgstr "NawiÄ?zano poÅ?Ä?czenie z MTA"
 
-#: ../libbalsa/send.c:950
-#: ../src/balsa-mime-widget-message.c:611
-#: ../src/print.c:361
-#: ../src/sendmsg-window.c:3172
-#: ../src/store-address.c:305
-msgid "From:"
-msgstr "Od:"
+#. status code, mailbox
+#: ../libbalsa/send.c:1094
+#, c-format
+msgid "From: %d <%s>"
+msgstr "Od: %d <%s>"
 
-#: ../libbalsa/send.c:953
-#: ../src/balsa-index.c:357
-msgid "From"
-msgstr "Od"
+#. mailbox, status code, status text
+#: ../libbalsa/send.c:1098
+#, c-format
+msgid "From %s: %d %s"
+msgstr "Od %s: %d %s"
 
-#: ../libbalsa/send.c:962
-#: ../src/balsa-mime-widget-message.c:621
-#: ../src/print.c:365
-#: ../src/sendmsg-window.c:997
-#: ../src/sendmsg-window.c:3180
-#: ../src/store-address.c:306
-msgid "To:"
-msgstr "Dla:"
+#. status code, mailbox
+#: ../libbalsa/send.c:1109
+#, c-format
+msgid "To: %d <%s>"
+msgstr "Dla: %d <%s>"
 
-#: ../libbalsa/send.c:965
-#: ../src/balsa-index.c:1021
-msgid "To"
-msgstr "Dla"
+#. mailbox, status code, status text
+#: ../libbalsa/send.c:1113
+#, c-format
+msgid "To %s: %d %s"
+msgstr "Dla %s: %d %s"
 
-#: ../libbalsa/send.c:1003
+#: ../libbalsa/send.c:1151
 msgid "Disconnected"
 msgstr "RozÅ?Ä?czony"
 
-#: ../libbalsa/send.c:1277
+#: ../libbalsa/send.c:1433
 msgid ""
 "SMTP server refused connection.\n"
 "Check your internet connection."
@@ -1459,7 +1747,7 @@ msgstr ""
 "Serwer SMTP odrzuciÅ? poÅ?Ä?czenie.\n"
 "SprwadÅº poÅ?Ä?czenie internetowe."
 
-#: ../libbalsa/send.c:1282
+#: ../libbalsa/send.c:1438
 msgid ""
 "SMTP server cannot be reached.\n"
 "Check your internet connection."
@@ -1467,11 +1755,11 @@ msgstr ""
 "Nie moÅ¼na skontaktowaÄ? siÄ? z serwerem SMTP.\n"
 "SprwadÅº poÅ?Ä?czenie internetowe."
 
-#: ../libbalsa/send.c:1291
+#: ../libbalsa/send.c:1447
 msgid "Message left in Outbox (try again later)"
 msgstr "WiadomoÅ?Ä? pozostaÅ?a w WychodzÄ?cych (sprÃ³buj pÃ³Åºniej)"
 
-#: ../libbalsa/send.c:1295
+#: ../libbalsa/send.c:1451
 #, c-format
 msgid ""
 "SMTP server problem (%d): %s\n"
@@ -1480,170 +1768,291 @@ msgstr ""
 "WystÄ?piÅ? problem przy komunikacji z serwerem SMTP (%d): %s\n"
 "List pozostaÅ? w skrzynce poczty wychodzÄ?cej."
 
-#: ../libbalsa/send.c:1572
+#: ../libbalsa/send.c:1736
+#: ../libbalsa/send.c:1805
+#, c-format
+msgid "Cannot read %s: %s"
+msgstr "Nie moÅ¼na czytaÄ? %s: %s"
+
+#: ../libbalsa/send.c:1739
+#: ../libbalsa/send.c:1808
+#, c-format
+msgid "Cannot read %s"
+msgstr "Nie moÅ¼na czytaÄ? %s"
+
+#: ../libbalsa/send.c:1769
 #, c-format
 msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
 msgstr "Nie moÅ¼na ustaliÄ? zestawu znakÃ³w dla pliku tekstowego \"%s\"; wysyÅ?anie jako typ mime \"%s\""
 
-#: ../libbalsa/send.c:1909
-#: ../libbalsa/send.c:1991
+#: ../libbalsa/send.c:2119
+#: ../libbalsa/send.c:2200
 msgid "This message will not be encrypted for the BCC: recipient(s)."
 msgstr "List nie zostanie zaszyfrowany dla odbiorcÃ³w z pola BCC:."
 
 #. host, authentication method
-#: ../libbalsa/server.c:374
+#: ../libbalsa/server.c:429
 #, c-format
 msgid "Logging in to %s using %s"
 msgstr "Logowanie do %s uÅ¼ywajÄ?c %s"
 
-#: ../libbalsa/smtp-server.c:348
-#: ../src/mailbox-conf.c:198
-#: ../src/mailbox-conf.c:1360
-#: ../src/pref-manager.c:356
-#: ../src/pref-manager.c:3090
+#: ../libbalsa/smtp-server.c:388
+#: ../src/mailbox-conf.c:209
+#: ../src/mailbox-conf.c:1422
+#: ../src/pref-manager.c:396
+#: ../src/pref-manager.c:3296
 msgid "Never"
 msgstr "Nigdy"
 
-#: ../libbalsa/smtp-server.c:349
-#: ../src/mailbox-conf.c:199
-#: ../src/mailbox-conf.c:1361
+#: ../libbalsa/smtp-server.c:389
+#: ../src/mailbox-conf.c:210
+#: ../src/mailbox-conf.c:1423
 msgid "If Possible"
 msgstr "JeÅ?li moÅ¼liwe"
 
-#: ../libbalsa/smtp-server.c:350
-#: ../src/mailbox-conf.c:200
+#: ../libbalsa/smtp-server.c:390
+#: ../src/mailbox-conf.c:211
 msgid "Required"
 msgstr "Wymagane"
 
-#: ../libbalsa/smtp-server.c:387
-#: ../src/folder-conf.c:104
+#: ../libbalsa/smtp-server.c:430
 #, c-format
-msgid "Error displaying %s: %s\n"
-msgstr "BÅ?Ä?d przy wyÅ?wietlaniu %s: %s\n"
+msgid "Error displaying server help: %s\n"
+msgstr "BÅ?Ä?d przy wyÅ?wietlaniu pomocy serwera: %s\n"
 
-#: ../libbalsa/smtp-server.c:484
+#: ../libbalsa/smtp-server.c:546
 msgid "SMTP Server"
 msgstr "Serwer SMTP"
 
-#: ../libbalsa/smtp-server.c:508
-msgid "_Descriptive Name"
+#: ../libbalsa/smtp-server.c:568
+msgid "_Descriptive Name:"
 msgstr "_Nazwa opisowa"
 
-#: ../libbalsa/smtp-server.c:515
-msgid "_Server"
+#. pop server
+#. imap server
+#: ../libbalsa/smtp-server.c:575
+#: ../src/folder-conf.c:381
+#: ../src/mailbox-conf.c:1166
+#: ../src/mailbox-conf.c:1277
+msgid "_Server:"
 msgstr "_Serwer"
 
-#: ../libbalsa/smtp-server.c:522
-msgid "_User Name"
+#: ../libbalsa/smtp-server.c:582
+msgid "_User Name:"
 msgstr "_Nazwa uÅ¼ytkownika"
 
-#: ../libbalsa/smtp-server.c:529
-msgid "_Pass Phrase"
+#: ../libbalsa/smtp-server.c:589
+msgid "_Pass Phrase:"
 msgstr "_HasÅ?o"
 
-#: ../libbalsa/smtp-server.c:537
-#: ../src/mailbox-conf.c:212
-msgid "Use _TLS"
+#: ../libbalsa/smtp-server.c:598
+#: ../src/mailbox-conf.c:230
+msgid "Use _TLS:"
 msgstr "UÅ¼ywanie _TLS"
 
-#: ../libbalsa/smtp-server.c:543
-#, fuzzy
-msgid "C_ertificate Pass Phrase"
-msgstr "DÅ?ugie hasÅ?o certyfikatu"
+#: ../libbalsa/smtp-server.c:603
+msgid "C_ertificate Pass Phrase:"
+msgstr "Fraza c_ertyfikatu hasÅ?a:"
+
+#: ../libbalsa/smtp-server.c:615
+msgid "Sp_lit message larger than"
+msgstr "Podziel wiadomoÅ?ci wiÄ?ksze niÅ¼"
+
+#: ../libbalsa/smtp-server.c:621
+#: ../src/pref-manager.c:1875
+msgid "MB"
+msgstr "MB"
+
+#. Top level
+#. Menus
+#: ../libbalsa/source-viewer.c:43
+#: ../src/ab-main.c:542
+#: ../src/main-window.c:322
+#: ../src/message-window.c:233
+#: ../src/sendmsg-window.c:322
+msgid "_File"
+msgstr "_Plik"
+
+#: ../libbalsa/source-viewer.c:44
+#: ../src/filter-edit-dialog.c:311
+#: ../src/main-window.c:323
+#: ../src/message-window.c:234
+#: ../src/sendmsg-window.c:323
+msgid "_Edit"
+msgstr "_Edycja"
+
+#: ../libbalsa/source-viewer.c:45
+#: ../src/main-window.c:324
+#: ../src/message-window.c:235
+msgid "_View"
+msgstr "_Widok"
 
 #. Items
-#: ../libbalsa/source-viewer.c:48
-#: ../src/mailbox-node.c:989
-#: ../src/main-window.c:752
-#: ../src/main-window.c:857
+#: ../libbalsa/source-viewer.c:47
+#: ../src/mailbox-node.c:1086
+#: ../src/main-window.c:475
+#: ../src/message-window.c:244
+#: ../src/sendmsg-window.c:351
 msgid "_Close"
-msgstr "Zam_knij"
+msgstr "_Zamknij"
 
-#: ../libbalsa/source-viewer.c:49
+#: ../libbalsa/source-viewer.c:48
 msgid "Close the window"
 msgstr "Zamyka okno"
 
-#: ../libbalsa/source-viewer.c:50
+#. Edit menu items
+#: ../libbalsa/source-viewer.c:49
+#: ../src/main-window.c:396
+#: ../src/main-window.c:538
+#: ../src/message-window.c:247
+#: ../src/sendmsg-window.c:359
 msgid "_Copy"
 msgstr "_Kopiuj"
 
-#: ../libbalsa/source-viewer.c:51
+#: ../libbalsa/source-viewer.c:50
 msgid "Copy text"
 msgstr "Kopiuj tekst"
 
-#: ../libbalsa/source-viewer.c:52
-#: ../src/main-window.c:661
+#: ../libbalsa/source-viewer.c:51
+#: ../src/main-window.c:540
 msgid "_Select Text"
-msgstr "Zaznacz _tekst"
+msgstr "_Zaznacz tekst"
 
-#: ../libbalsa/source-viewer.c:53
-#: ../src/main-window.c:662
+#: ../libbalsa/source-viewer.c:52
+#: ../src/main-window.c:541
 msgid "Select entire mail"
 msgstr "Zaznacza caÅ?y list"
 
-#: ../libbalsa/source-viewer.c:58
+#: ../libbalsa/source-viewer.c:57
 msgid "_Escape Special Characters"
 msgstr "_Zacytuj znaki specjalne"
 
-#: ../libbalsa/source-viewer.c:59
+#: ../libbalsa/source-viewer.c:58
 msgid "Escape special and non-ASCII characters"
 msgstr "Cytuje znaki specjalne i z poza zestawu ASCII"
 
-#: ../libbalsa/source-viewer.c:155
+#: ../libbalsa/source-viewer.c:156
 msgid "Mailbox closed"
 msgstr "Skrzynka zamkniÄ?ta"
 
-#: ../libbalsa/source-viewer.c:258
+#: ../libbalsa/source-viewer.c:276
 msgid "Message Source"
 msgstr "Å¹rÃ³dÅ?o listu"
 
+#: ../libinit_balsa/assistant_helper.c:66
+#: ../libinit_balsa/helper.c:66
+#, c-format
+msgid "Error loading %s: %s\n"
+msgstr "BÅ?Ä?d przy wczytywaniu %s: %s\n"
+
+#: ../libinit_balsa/assistant_helper.c:202
+#: ../libinit_balsa/helper.c:202
+#, c-format
+msgid "The path %s must be relative to the filesystem root (start with /)."
+msgstr "Å?cieÅ¼ka %s musi byÄ? okreÅ?lona wzglÄ?dem gÅ?Ã³wnego katalogu (rozpoczynaÄ? siÄ? od /)."
+
+#: ../libinit_balsa/assistant_helper.c:215
+#: ../libinit_balsa/assistant_helper.c:239
+#: ../libinit_balsa/helper.c:215
+#: ../libinit_balsa/helper.c:239
+#, c-format
+msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+msgstr "Nie moÅ¼na utworzyÄ? katalogu: wywoÅ?anie funkcji mkdir() zakoÅ?czyÅ?o siÄ? niepowodzeniem przy nazwie Å?cieÅ¼ki \"%s\"."
+
+#: ../libinit_balsa/assistant_helper.c:225
+#: ../libinit_balsa/assistant_helper.c:248
+#: ../libinit_balsa/helper.c:225
+#: ../libinit_balsa/helper.c:248
+#, c-format
+msgid "The file with pathname \"%s\" is not a directory."
+msgstr "Plik wskazywany przez Å?cieÅ¼kÄ? \"%s\" nie jest katalogiem."
+
+#: ../libinit_balsa/assistant_init.c:48
+#: ../libinit_balsa/balsa-initdruid.c:81
+msgid ""
+"This will exit Balsa.\n"
+"Do you really want to do this?"
+msgstr ""
+"Spowoduje to zakoÅ?czenie Balsy.\n"
+"Czy na pewno chcesz to zrobiÄ??"
+
+#: ../libinit_balsa/assistant_init.c:71
+#: ../libinit_balsa/balsa-druid-page-finish.c:77
+msgid "GnomeCard Address Book"
+msgstr "KsiÄ?Å¼ka adresowa GnomeCard"
+
+#: ../libinit_balsa/assistant_init.c:78
+#: ../libinit_balsa/assistant_init.c:86
+#: ../libinit_balsa/balsa-druid-page-finish.c:84
+#: ../libinit_balsa/balsa-druid-page-finish.c:92
+#: ../src/ab-window.c:229
+msgid "Address Book"
+msgstr "KsiÄ?Å¼ka adresowa"
+
+#: ../libinit_balsa/assistant_init.c:145
+#: ../libinit_balsa/init_balsa.c:48
+msgid "Configure Balsa"
+msgstr "Konfiguracja Balsy"
+
+#: ../libinit_balsa/assistant_page_defclient.c:52
 #: ../libinit_balsa/balsa-druid-page-defclient.c:58
 msgid "Use balsa as default email client?"
 msgstr "Czy uÅ¼yÄ? programu balsa jako domyÅ?lnego dla poczty e-mail?"
 
+#: ../libinit_balsa/assistant_page_defclient.c:56
 #: ../libinit_balsa/balsa-druid-page-defclient.c:62
 msgid "_Yes"
 msgstr "_Tak"
 
+#: ../libinit_balsa/assistant_page_defclient.c:58
 #: ../libinit_balsa/balsa-druid-page-defclient.c:64
 msgid "_No"
 msgstr "_Nie"
 
+#: ../libinit_balsa/assistant_page_defclient.c:95
 #: ../libinit_balsa/balsa-druid-page-defclient.c:100
 msgid "Default Client"
 msgstr "DomyÅ?lny klient"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:43
+#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/balsa-druid-page-directory.c:45
 msgid "_Inbox:"
 msgstr "_Poczta nadchodzÄ?ca:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:43
+#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/balsa-druid-page-directory.c:45
 msgid "_Outbox:"
-msgstr "P_oczta wychodzÄ?ca:"
+msgstr "_Poczta wychodzÄ?ca:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:43
+#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/balsa-druid-page-directory.c:45
 msgid "_Sentbox:"
-msgstr "Poczta wy_sÅ?ana:"
+msgstr "_Poczta wysÅ?ana:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:43
+#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/balsa-druid-page-directory.c:45
 msgid "_Draftbox:"
-msgstr "Poczta _robocza:"
+msgstr "_Poczta robocza:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:44
+#: ../libinit_balsa/assistant_page_directory.c:61
+#: ../libinit_balsa/balsa-druid-page-directory.c:46
 msgid "_Trash:"
-msgstr "Å?mie_tnik:"
+msgstr "_Å?mietnik:"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:71
+#: ../libinit_balsa/assistant_page_directory.c:95
+#: ../libinit_balsa/balsa-druid-page-directory.c:73
 #, c-format
 msgid "The pathname \"%s\" must be specified canonically -- it must start with a '/'."
 msgstr "Å?cieÅ¼ka %s musi byÄ? okreÅ?lona wzglÄ?dem gÅ?Ã³wnego katalogu (rozpoczynaÄ? siÄ? od /)."
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:135
+#: ../libinit_balsa/assistant_page_directory.c:159
+#: ../libinit_balsa/balsa-druid-page-directory.c:137
 #, c-format
 msgid "The mailbox \"%s\" does not appear to be valid."
 msgstr "Skrzynka \"%s\" wydaje siÄ? byÄ? niepoprawna."
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:185
+#: ../libinit_balsa/assistant_page_directory.c:202
+#: ../libinit_balsa/balsa-druid-page-directory.c:187
 msgid ""
 "Please verify the locations of your default mail files.\n"
 "These will be created if necessary."
@@ -1651,12 +2060,15 @@ msgstr ""
 "Zweryfikuj poÅ?oÅ¼enia domyÅ?lnych plikÃ³w z pocztÄ?.\n"
 "W razie potrzeby zostanÄ? one utworzone."
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:243
+#: ../libinit_balsa/assistant_page_directory.c:264
+#: ../libinit_balsa/balsa-druid-page-directory.c:242
 msgid "Mail Files"
 msgstr "Pliki z listami"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:346
-#: ../libinit_balsa/balsa-druid-page-directory.c:380
+#: ../libinit_balsa/assistant_page_directory.c:359
+#: ../libinit_balsa/assistant_page_directory.c:393
+#: ../libinit_balsa/balsa-druid-page-directory.c:345
+#: ../libinit_balsa/balsa-druid-page-directory.c:379
 #, c-format
 msgid ""
 "Problem Creating Mailboxes\n"
@@ -1665,6 +2077,7 @@ msgstr ""
 "WystÄ?piÅ? problem przy tworzeniu skrzynek\n"
 "%s"
 
+#: ../libinit_balsa/assistant_page_finish.c:42
 #: ../libinit_balsa/balsa-druid-page-finish.c:41
 msgid ""
 "You've successfully set up Balsa. Have fun!\n"
@@ -1673,86 +2086,94 @@ msgstr ""
 "Balsa zostaÅ?a pomyÅ?lnie skonfigurowana. Dobrej zabawy!\n"
 "   -- ZespÃ³Å? twÃ³rcÃ³w Balsy"
 
+#: ../libinit_balsa/assistant_page_finish.c:47
 #: ../libinit_balsa/balsa-druid-page-finish.c:47
 msgid "All Done!"
 msgstr "Gotowe!"
 
-#: ../libinit_balsa/balsa-druid-page-finish.c:77
-msgid "GnomeCard Address Book"
-msgstr "KsiÄ?Å¼ka adresowa GnomeCard"
-
-#: ../libinit_balsa/balsa-druid-page-finish.c:84
-#: ../libinit_balsa/balsa-druid-page-finish.c:92
-#: ../src/ab-window.c:226
-msgid "Address Book"
-msgstr "KsiÄ?Å¼ka adresowa"
-
-#: ../libinit_balsa/balsa-druid-page-user.c:71
+#: ../libinit_balsa/assistant_page_user.c:56
+#: ../libinit_balsa/balsa-druid-page-user.c:56
 msgid "The following settings are also needed (and you can find them later, if need be, in the Email application in the 'Preferences' and 'Identities' commands on the 'Tools' menu)"
 msgstr "Potrzebne sÄ? rÃ³wnieÅ¼ nastÄ?pujÄ?ce ustawienia (moÅ¼na je znaleÅºÄ? pÃ³Åºniej, jeÅ¼eli zajdzie taka potrzeba, w aplikacji w menu \"NarzÄ?dzia\" pod opcjami \"Preferencje\" i \"ToÅ¼samoÅ?ci\")"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:76
+#: ../libinit_balsa/assistant_page_user.c:62
+#: ../libinit_balsa/balsa-druid-page-user.c:61
 msgid " Whoever provides your email account should be able to give you the following information (if you have a Network Administrator, they may already have set this up for you):"
 msgstr " UdostÄ?pniajÄ?cy konto e-mail powinien dostarczyÄ? nastÄ?pujÄ?cych informacji (jeÅ¼eli masz Amdinistratora sieci, mÃ³gÅ? on juÅ¼ te dane ustawiÄ?):"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:82
+#: ../libinit_balsa/assistant_page_user.c:69
+#: ../libinit_balsa/balsa-druid-page-user.c:67
 msgid "Yes, remember it"
 msgstr "Tak, zapamiÄ?taj"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:82
+#: ../libinit_balsa/assistant_page_user.c:69
+#: ../libinit_balsa/balsa-druid-page-user.c:67
 msgid "No, type it in every time"
 msgstr "Nie, wpisywane za kaÅ¼dym razem"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:114
+#: ../libinit_balsa/assistant_page_user.c:102
+#: ../libinit_balsa/balsa-druid-page-user.c:100
 msgid "Name of mail server for incoming _mail:"
-msgstr "Nazwa serwera p_oczty przychodzÄ?cej:"
+msgstr "Nazwa serwera poczty przychodzÄ?cej:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:119
+#: ../libinit_balsa/assistant_page_user.c:107
+#: ../libinit_balsa/balsa-druid-page-user.c:105
 msgid "_Type of mail server:"
 msgstr "_Rodzaj serwera poczty:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:123
+#: ../libinit_balsa/assistant_page_user.c:111
+#: ../libinit_balsa/balsa-druid-page-user.c:109
 msgid "Connect using _SSL:"
 msgstr "PoÅ?Ä?czenie przy uÅ¼yciu _SSL:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:126
+#: ../libinit_balsa/assistant_page_user.c:114
+#: ../libinit_balsa/balsa-druid-page-user.c:112
 msgid "Your email _login name:"
 msgstr "Twoja nazwa uÅ¼ytkownika e-mail:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:129
+#: ../libinit_balsa/assistant_page_user.c:117
+#: ../libinit_balsa/balsa-druid-page-user.c:115
 msgid "Your _password:"
-msgstr "_HasÅ?o:"
+msgstr "Twoje hasÅ?o:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:137
+#: ../libinit_balsa/assistant_page_user.c:125
+#: ../libinit_balsa/balsa-druid-page-user.c:123
 msgid "_SMTP Server:"
 msgstr "_Serwer SMTP:"
 
 #. 2.1
-#: ../libinit_balsa/balsa-druid-page-user.c:142
+#: ../libinit_balsa/assistant_page_user.c:130
+#: ../libinit_balsa/balsa-druid-page-user.c:128
 msgid "Your real _name:"
-msgstr "ImiÄ? i nazw_isko:"
+msgstr "ImiÄ? i nazwisko:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:148
+#: ../libinit_balsa/assistant_page_user.c:136
+#: ../libinit_balsa/balsa-druid-page-user.c:134
 msgid "Your _Email Address, for this email account:"
-msgstr "Adres _e-mail dla tego konta:"
+msgstr "Adres e-mail dla tego konta:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:153
+#: ../libinit_balsa/assistant_page_user.c:141
+#: ../libinit_balsa/balsa-druid-page-user.c:139
 msgid "_Remember your password:"
 msgstr "_ZapamiÄ?tanie hasÅ?a:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:156
-msgid "_Refer to this account as:"
-msgstr "_Przekieruj do tego konta jako:"
-
-#: ../libinit_balsa/balsa-druid-page-user.c:164
+#: ../libinit_balsa/assistant_page_user.c:148
+#: ../libinit_balsa/balsa-druid-page-user.c:145
 msgid "_Local mail directory:"
-msgstr "Katalog _lokalnej poczty:"
+msgstr "_Katalog lokalnej poczty:"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:181
+#: ../libinit_balsa/assistant_page_user.c:168
+#: ../libinit_balsa/balsa-druid-page-user.c:162
 msgid "User Settings"
 msgstr "Ustawienia uÅ¼ytkownika"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:333
+#: ../libinit_balsa/assistant_page_user.c:288
+#: ../libinit_balsa/balsa-druid-page-user.c:273
+msgid "Default Identity"
+msgstr "DomyÅ?lna toÅ¼samoÅ?Ä?"
+
+#: ../libinit_balsa/assistant_page_user.c:332
+#: ../libinit_balsa/balsa-druid-page-user.c:317
 #, c-format
 msgid ""
 "Local Mail Problem\n"
@@ -1761,10 +2182,12 @@ msgstr ""
 "Problem z lokalnÄ? pocztÄ?\n"
 "%s"
 
+#: ../libinit_balsa/assistant_page_welcome.c:29
 #: ../libinit_balsa/balsa-druid-page-welcome.c:32
 msgid "Welcome to Balsa!"
 msgstr "Witaj w programie Balsa!"
 
+#: ../libinit_balsa/assistant_page_welcome.c:32
 #: ../libinit_balsa/balsa-druid-page-welcome.c:35
 msgid ""
 "Before you can send or receive email:\n"
@@ -1779,40 +2202,6 @@ msgstr ""
 "\n"
 "-- lub administrator sieci w miejscu pracy/uczelni musi ustawiÄ? poÅ?Ä?czenie sieciowe w komputerze."
 
-#: ../libinit_balsa/balsa-initdruid.c:81
-msgid ""
-"This will exit Balsa.\n"
-"Do you really want to do this?"
-msgstr ""
-"Spowoduje to zakoÅ?czenie Balsy.\n"
-"Czy na pewno chcesz to zrobiÄ??"
-
-#: ../libinit_balsa/helper.c:66
-#, c-format
-msgid "Error loading %s: %s\n"
-msgstr "BÅ?Ä?d przy wczytywaniu %s: %s\n"
-
-#: ../libinit_balsa/helper.c:202
-#, c-format
-msgid "The path %s must be relative to the filesystem root (start with /)."
-msgstr "Å?cieÅ¼ka %s musi byÄ? okreÅ?lona wzglÄ?dem gÅ?Ã³wnego katalogu (rozpoczynaÄ? siÄ? od /)."
-
-#: ../libinit_balsa/helper.c:215
-#: ../libinit_balsa/helper.c:239
-#, c-format
-msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
-msgstr "Nie moÅ¼na utworzyÄ? katalogu: wywoÅ?anie funkcji mkdir() zakoÅ?czyÅ?o siÄ? niepowodzeniem przy nazwie Å?cieÅ¼ki \"%s\"."
-
-#: ../libinit_balsa/helper.c:225
-#: ../libinit_balsa/helper.c:248
-#, c-format
-msgid "The file with pathname \"%s\" is not a directory."
-msgstr "Plik wskazywany przez Å?cieÅ¼kÄ? \"%s\" nie jest katalogiem."
-
-#: ../libinit_balsa/init_balsa.c:48
-msgid "Configure Balsa"
-msgstr "Konfiguracja Balsy"
-
 #: ../sounds/balsa.soundlist.in.h:1
 msgid "Balsa E-mail reader"
 msgstr "Klient poczty elektronicznej Balsa"
@@ -1825,506 +2214,681 @@ msgstr "Powiadomienie o nadejÅ?ciu nowego listu"
 msgid "Program startup"
 msgstr "Uruchomienie programu"
 
-#: ../src/ab-main.c:199
-#: ../src/ab-window.c:673
+#: ../src/ab-main.c:217
+#: ../src/ab-window.c:689
 msgid " address book: "
 msgstr "KsiÄ?Å¼ka adresowa:"
 
-#: ../src/ab-main.c:470
-#: ../src/address-book-config.c:903
+#: ../src/ab-main.c:543
+msgid "_Entry"
+msgstr "_Wpis"
+
+#: ../src/ab-main.c:544
+#: ../src/main-window.c:328
+msgid "_Help"
+msgstr "_Pomoc"
+
+#. new button
+#: ../src/ab-main.c:545
+#: ../src/filter-edit-dialog.c:216
+#: ../src/mailbox-node.c:1051
+#: ../src/main-window.c:330
+#: ../src/main-window.c:560
+#: ../src/main-window.c:569
+msgid "_New"
+msgstr "_Nowy"
+
+#: ../src/ab-main.c:546
+#: ../src/address-book-config.c:943
 msgid "VCard Address Book (GnomeCard)"
 msgstr "KsiÄ?Å¼ka adresowa VCard (GnomeCard)"
 
-#: ../src/ab-main.c:472
-#: ../src/address-book-config.c:909
+#: ../src/ab-main.c:548
+#: ../src/address-book-config.c:949
 msgid "External query (a program)"
 msgstr "ZewnÄ?trzne zapytanie (program wykonywalny)"
 
-#: ../src/ab-main.c:474
-#: ../src/address-book-config.c:914
+#: ../src/ab-main.c:550
+#: ../src/address-book-config.c:954
 msgid "LDIF Address Book"
 msgstr "KsiÄ?Å¼ka adresowa LDIF"
 
-#: ../src/ab-main.c:477
-#: ../src/address-book-config.c:920
+#: ../src/ab-main.c:553
+#: ../src/address-book-config.c:960
 msgid "LDAP Address Book"
 msgstr "KsiÄ?Å¼ka adresowa LDAP"
 
-#: ../src/ab-main.c:481
-#: ../src/address-book-config.c:521
-#: ../src/address-book-config.c:927
+#: ../src/ab-main.c:557
+#: ../src/address-book-config.c:518
+#: ../src/address-book-config.c:967
 msgid "GPE Address Book"
 msgstr "KsiÄ?Å¼ka adresowa GPE"
 
-#: ../src/ab-main.c:639
-#: ../src/ab-window.c:168
-#: ../src/filter-edit-dialog.c:200
+#: ../src/ab-main.c:561
+msgid "Rubrica Address Book"
+msgstr "KsiÄ?Å¼ka adresowa Rubrica"
+
+#: ../src/ab-main.c:564
+msgid "_Properties"
+msgstr "_WÅ?asciwoÅ?ci"
+
+#: ../src/ab-main.c:565
+msgid "Edit address book properties"
+msgstr "Edytuj wÅ?aÅ?ciwoÅ?ci ksiÄ?Å¼ki adresowej"
+
+#: ../src/ab-main.c:566
+#: ../src/balsa-index.c:1811
+#: ../src/filter-edit-dialog.c:222
+#: ../src/mailbox-node.c:1078
+#: ../src/mailbox-node.c:1094
+#: ../src/pref-manager.c:1655
+#: ../src/pref-manager.c:1746
+#: ../src/pref-manager.c:2839
+msgid "_Delete"
+msgstr "_UsuÅ?"
+
+#: ../src/ab-main.c:567
+msgid "Delete address book"
+msgstr "UsuÅ? ksiÄ?Å¼kÄ? adresowÄ?"
+
+#: ../src/ab-main.c:568
+#: ../src/main-window.c:364
+msgid "_Quit"
+msgstr "_WyjdÅº"
+
+#: ../src/ab-main.c:568
+msgid "Exit the program"
+msgstr "OpuÅ?Ä? program"
+
+#: ../src/ab-main.c:570
+msgid "_New Entry"
+msgstr "_Nowy wpis"
+
+#: ../src/ab-main.c:571
+msgid "Add new entry"
+msgstr "Dodaj nowÄ? pozycjÄ?"
+
+#: ../src/ab-main.c:572
+msgid "_Delete Entry"
+msgstr "_UsuÅ? pozycjÄ?"
+
+#: ../src/ab-main.c:573
+msgid "Delete entry"
+msgstr "UsuÅ? pozycjÄ?"
+
+#: ../src/ab-main.c:580
+#: ../src/main-window.c:435
+msgid "_About"
+msgstr "_O programie Balsa"
+
+#: ../src/ab-main.c:799
+msgid "_Name"
+msgstr "_Nazwa"
+
+#: ../src/ab-main.c:815
+msgid "_Address"
+msgstr "_Adres"
+
+#: ../src/ab-main.c:941
+msgid "F_ilter:"
+msgstr "Filtr:"
+
+#: ../src/ab-window.c:170
+#: ../src/filter-edit-dialog.c:199
 #: ../src/filter-export-dialog.c:90
 #: ../src/filter-run-dialog.c:221
 #: ../src/filter-run-dialog.c:295
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/ab-main.c:791
-msgid "F_ilter:"
-msgstr "F_iltr:"
-
-#: ../src/ab-window.c:176
+#: ../src/ab-window.c:178
 msgid "E-Mail Address"
 msgstr "Adres e-mail"
 
+#. -- table column 1 --
 #. Entry widget for finding an address
-#: ../src/ab-window.c:263
+#: ../src/ab-window.c:279
 msgid "_Search for Name:"
-msgstr "Wy_szukiwanie Nazwy:"
-
-#: ../src/ab-window.c:323
-msgid "Send-To"
-msgstr "WyÅ?lij-do"
+msgstr "_Wyszukiwanie Nazwy:"
 
-#: ../src/ab-window.c:343
+#: ../src/ab-window.c:314
 msgid "Run Editor"
 msgstr "Uruchom Edytor"
 
-#: ../src/ab-window.c:350
+#: ../src/ab-window.c:321
 msgid "_Re-Import"
-msgstr "Zaimport_uj ponownie"
+msgstr "_Zaimportuj ponownie"
+
+#. -- table column 3 --
+#. label for selected addresses in compose mode
+#: ../src/ab-window.c:353
+msgid "Send-To"
+msgstr "WyÅ?lij-do"
 
 #. mode switching stuff
-#: ../src/ab-window.c:360
+#: ../src/ab-window.c:368
 msgid "Treat multiple addresses as:"
 msgstr "SposÃ³b traktowania wielu adresÃ³w:"
 
-#: ../src/ab-window.c:364
+#: ../src/ab-window.c:372
 msgid "alternative addresses for the same person"
 msgstr "Alternatywny adres tej samej osoby"
 
-#: ../src/ab-window.c:369
+#: ../src/ab-window.c:377
 msgid "a distribution list"
 msgstr "Lista dystrybucyjna"
 
-#: ../src/ab-window.c:702
+#: ../src/ab-window.c:420
+#, c-format
+msgid "Could not launch %s: %s"
+msgstr "Nie moÅ¼na uruchomiÅ? %s: %s"
+
+#: ../src/ab-window.c:717
 #, c-format
 msgid ""
 "Error opening address book '%s':\n"
 "%s"
 msgstr ""
-"BÅ?Ä?d przy otwieraniu ksiÄ?Å¼ki adresowej \"%s\":\n"
+"BÅ?Ä?d przy otwieraniu ksiÄ?Å¼ki adresowej '%s':\n"
 "%s"
 
-#: ../src/address-book-config.c:235
-#: ../src/address-book-config.c:328
+#: ../src/address-book-config.c:175
+msgid "Suggest complete addresses:"
+msgstr "Sugeruj peÅ?ne adresy:"
+
+#: ../src/address-book-config.c:181
+msgid "as I type"
+msgstr "kiedy napiszÄ?"
+
+#: ../src/address-book-config.c:190
+msgid "when I hit the Escape key"
+msgstr "kiedy nacisnÄ? klawisz Escape"
+
+#: ../src/address-book-config.c:227
+#: ../src/address-book-config.c:325
 msgid "Modify Address Book"
 msgstr "Modyfikacja ksiÄ?Å¼ki adresowej"
 
-#: ../src/address-book-config.c:239
-#: ../src/address-book-config.c:332
+#: ../src/address-book-config.c:231
+#: ../src/address-book-config.c:329
 msgid "Add Address Book"
 msgstr "Nowa ksiÄ?Å¼ka adresowa"
 
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:254
-#: ../src/address-book-config.c:363
-#: ../src/address-book-config.c:453
-#: ../src/address-book-config.c:519
-msgid "A_ddress Book Name"
-msgstr "Nazwa ksiÄ?Å¼ki a_dresowej"
-
-#: ../src/address-book-config.c:258
-#: ../src/address-book-config.c:407
-#: ../src/address-book-config.c:489
-#: ../src/address-book-config.c:524
-msgid "_Expand aliases as you type"
-msgstr "_Rozwijanie aliasÃ³w w trakcie pisania"
-
-#: ../src/address-book-config.c:368
-msgid "Load program location"
-msgstr "PoÅ?oÅ¼enie programu odczytujÄ?cego"
-
-#: ../src/address-book-config.c:375
-#: ../src/address-book-config.c:380
+#: ../src/address-book-config.c:247
+#: ../src/address-book-config.c:364
+#: ../src/address-book-config.c:451
+#: ../src/address-book-config.c:516
+msgid "A_ddress Book Name:"
+msgstr "Nazwa ksiÄ?Å¼ki adresowej:"
+
+#: ../src/address-book-config.c:369
+msgid "Load program location:"
+msgstr "PoÅ?oÅ¼enie programu odczytujÄ?cego:"
+
+#: ../src/address-book-config.c:376
+#: ../src/address-book-config.c:381
 msgid "Select load program for address book"
 msgstr "WybÃ³r programu odczytujÄ?cego dane z ksiÄ?Å¼ki adresowej"
 
-#: ../src/address-book-config.c:387
-msgid "Save program location"
-msgstr "PoÅ?oÅ¼enie programu zapisujÄ?cego"
+#: ../src/address-book-config.c:388
+msgid "Save program location:"
+msgstr "PoÅ?oÅ¼enie programu zapisujÄ?cego:"
 
-#: ../src/address-book-config.c:394
-#: ../src/address-book-config.c:399
+#: ../src/address-book-config.c:395
+#: ../src/address-book-config.c:400
 msgid "Select save program for address book"
 msgstr "WybÃ³r programu zapisujÄ?cego dane w ksiÄ?Å¼ce adresowej"
 
-#: ../src/address-book-config.c:458
+#: ../src/address-book-config.c:456
 msgid "_Host Name"
-msgstr "Nazwa _komputera"
+msgstr "_Nazwa komputera"
 
-#: ../src/address-book-config.c:463
+#: ../src/address-book-config.c:461
 msgid "Base Domain _Name"
-msgstr "Nazwa domeny _bazowej"
+msgstr "Nazwa domeny bazowej"
 
-#: ../src/address-book-config.c:468
+#: ../src/address-book-config.c:466
 msgid "_User Name (Bind DN)"
-msgstr "Nazwa _uÅ¼ytkownika (w domenie)"
+msgstr "_Nazwa uÅ¼ytkownika (w domenie)"
 
-#: ../src/address-book-config.c:473
+#: ../src/address-book-config.c:471
 msgid "_Password"
 msgstr "_HasÅ?o"
 
-#: ../src/address-book-config.c:479
+#: ../src/address-book-config.c:477
 msgid "_User Address Book DN"
 msgstr "_WybÃ³r ksiÄ?Å¼ki adresowej"
 
-#: ../src/address-book-config.c:485
+#: ../src/address-book-config.c:483
 msgid "Enable _TLS"
 msgstr "ObsÅ?uga _TLS"
 
-#: ../src/address-book-config.c:542
-#: ../src/main-window.c:3949
+#: ../src/address-book-config.c:552
+#: ../src/main-window.c:2552
+#: ../src/main-window.c:4191
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "BÅ?Ä?d przy wyÅ?wietlaniu pomocy: %s\n"
 
-#: ../src/address-book-config.c:643
+#: ../src/address-book-config.c:654
 msgid "No path found.  Do you want to give one?"
 msgstr "Nie znaleziono Å?cieÅ¼ki. Czy chcesz podaÄ? nowÄ? Å?cieÅ¼kÄ??"
 
-#: ../src/address-book-config.c:649
+#: ../src/address-book-config.c:660
 #, c-format
 msgid "The address book file path \"%s\" is not correct. %s"
 msgstr "Niepoprawna Å?cieÅ¼ka \"%s\" do pliku ksiÄ?Å¼ki adresowej. %s"
 
-#: ../src/address-book-config.c:652
+#: ../src/address-book-config.c:663
 #, c-format
 msgid "The load program path \"%s\" is not correct. %s"
 msgstr "Niepoprawna Å?cieÅ¼ka \"%s\" programu Å?adujÄ?cego. %s"
 
-#: ../src/address-book-config.c:655
+#: ../src/address-book-config.c:666
 #, c-format
 msgid "The save program path \"%s\" is not correct. %s"
 msgstr "Niepoprawna Å?cieÅ¼ka \"%s\" programu zapisujÄ?cego. %s"
 
-#: ../src/address-book-config.c:658
+#: ../src/address-book-config.c:669
 #, c-format
 msgid "The path \"%s\" is not correct. %s"
 msgstr "Niepoprawna Å?cieÅ¼ka \"%s\". %s"
 
-#: ../src/address-book-config.c:661
+#: ../src/address-book-config.c:672
 msgid "Do you want to correct the path?"
 msgstr "Czy chcesz poprawiÄ? nazwÄ? Å?cieÅ¼ki?"
 
+#: ../src/address-book-config.c:974
+msgid "Rubrica2 Address Book"
+msgstr "KsiÄ?Å¼ka adresowa Rubrica2"
+
+#: ../src/balsa-app.c:73
+#: ../src/folder-conf.c:283
+#: ../src/mailbox-conf.c:1258
+msgid "_Remember password in keyring"
+msgstr "_PamiÄ?taj hasÅ?o w bazie"
+
 #: ../src/balsa-app.c:76
+#: ../src/folder-conf.c:286
+#: ../src/mailbox-conf.c:1261
+msgid "_Remember password"
+msgstr "_ZapamiÄ?tanie hasÅ?a"
+
+#: ../src/balsa-app.c:82
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
 "The _password for %s %s:"
 msgstr ""
-"Otwieranie zdalnej skrzynki %s.\n"
-"_HasÅ?o dla %s %s:"
+"Otwieranie odlegÅ?ej skrzynki pocztowej %s.\n"
+"Ha_sÅ?o dla %s %s:"
 
-#: ../src/balsa-app.c:81
+#: ../src/balsa-app.c:87
 #, c-format
-msgid "Mailbox _password for %s %s:"
-msgstr "_HasÅ?o dla skrzynki %s %s:"
+msgid "_Password for %s %s (%s):"
+msgstr "_HasÅ?o dla %s %s (%s):"
 
-#: ../src/balsa-app.c:84
+#: ../src/balsa-app.c:90
 msgid "Password needed"
-msgstr "Wymagane hasÅ?o"
+msgstr "Potrzebne hasÅ?o"
 
-#: ../src/balsa-app.c:98
-#: ../src/folder-conf.c:357
-msgid "_Remember password"
-msgstr "_ZapamiÄ?tanie hasÅ?a"
-
-#: ../src/balsa-app.c:538
+#: ../src/balsa-app.c:566
 #, c-format
 msgid "Couldn't open mailbox \"%s\""
 msgstr "Nie moÅ¼na otworzyÄ? skrzynki \"%s\""
 
-#: ../src/balsa-index.c:370
-#: ../src/pref-manager.c:368
+#: ../src/balsa-index.c:324
+msgid "From"
+msgstr "Od"
+
+#: ../src/balsa-index.c:337
+#: ../src/pref-manager.c:410
 msgid "Subject"
 msgstr "Temat"
 
-#: ../src/balsa-index.c:384
-#: ../src/pref-manager.c:369
+#: ../src/balsa-index.c:351
+#: ../src/pref-manager.c:411
 msgid "Date"
 msgstr "Data"
 
-#: ../src/balsa-index.c:396
-#: ../src/pref-manager.c:370
-#: ../src/sendmsg-window.c:2823
+#: ../src/balsa-index.c:363
+#: ../src/pref-manager.c:412
+#: ../src/sendmsg-window.c:3003
 msgid "Size"
 msgstr "Rozmiar"
 
-#: ../src/balsa-index.c:984
-#, c-format
-msgid "Opening mailbox %s. Please wait..."
-msgstr "Otwieranie skrzynki %s. Zaczekaj chwilÄ?..."
+#. FIXME: this is hack!
+#: ../src/balsa-index.c:977
+msgid "To"
+msgstr "Do"
 
-#: ../src/balsa-index.c:1616
+#: ../src/balsa-index.c:1626
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Wyrzucenie do Å?mietnika nie powiodÅ?o siÄ?: %s"
 
-#. R
-#: ../src/balsa-index.c:1770
-#: ../src/main-window.c:584
-#: ../src/main-window.c:1047
-#: ../src/message-window.c:148
+#. Message menu items
+#: ../src/balsa-index.c:1784
+#: ../src/main-window.c:491
+#: ../src/message-window.c:264
 msgid "_Reply..."
 msgstr "_Odpowiedz..."
 
-#: ../src/balsa-index.c:1772
+#: ../src/balsa-index.c:1786
 msgid "Reply To _All..."
-msgstr "Odpowiedz wszystki_m..."
+msgstr "Odpowiedz wszystkim..."
 
-#: ../src/balsa-index.c:1774
+#: ../src/balsa-index.c:1788
 msgid "Reply To _Group..."
-msgstr "Odpowiedz g_rupie..."
+msgstr "Odpowiedz grupie..."
 
-#: ../src/balsa-index.c:1776
+#: ../src/balsa-index.c:1790
 msgid "_Forward Attached..."
 msgstr "PrzeÅ?lij w _zaÅ?Ä?czniku..."
 
-#: ../src/balsa-index.c:1778
+#: ../src/balsa-index.c:1792
 msgid "Forward _Inline..."
-msgstr "PrzeÅ?lij w _treÅ?ci listu..."
+msgstr "PrzeÅ?lij w treÅ?ci listu..."
 
-#: ../src/balsa-index.c:1780
-#: ../src/main-window.c:623
+#: ../src/balsa-index.c:1794
+#: ../src/main-window.c:518
 msgid "_Pipe through..."
 msgstr "_Przefiltruj..."
 
-#: ../src/balsa-index.c:1782
-#: ../src/main-window.c:682
-#: ../src/main-window.c:1031
+#: ../src/balsa-index.c:1796
+#: ../src/main-window.c:498
 msgid "_Store Address..."
 msgstr "_Zapisz adres..."
 
-#: ../src/balsa-index.c:1797
-#: ../src/filter-edit-dialog.c:223
-#: ../src/mailbox-node.c:981
-#: ../src/mailbox-node.c:997
-#: ../src/pref-manager.c:1499
-#: ../src/pref-manager.c:1588
-#: ../src/pref-manager.c:2633
-msgid "_Delete"
-msgstr "_UsuÅ?"
-
-#: ../src/balsa-index.c:1802
+#: ../src/balsa-index.c:1816
 msgid "_Undelete"
-msgstr "O_dtwÃ³rz"
+msgstr "_OdtwÃ³rz"
 
-#: ../src/balsa-index.c:1807
+#: ../src/balsa-index.c:1821
 msgid "Move To _Trash"
-msgstr "WyrzuÄ? do Å?_mietnika"
+msgstr "WyrzuÄ? do Å?mietnika"
 
-#: ../src/balsa-index.c:1811
+#: ../src/balsa-index.c:1825
 msgid "T_oggle"
-msgstr "Prz_eÅ?Ä?cz"
+msgstr "PrzeÅ?Ä?cz"
 
-#: ../src/balsa-index.c:1815
-#: ../src/main-window.c:331
-#: ../src/main-window.c:360
+#. Message:toggle-flag submenu items
+#: ../src/balsa-index.c:1829
+#: ../src/main-window.c:565
+#: ../src/main-window.c:604
 msgid "_Flagged"
-msgstr "Ozn_akowany"
+msgstr "_Oznakowany"
 
-#: ../src/balsa-index.c:1818
+#: ../src/balsa-index.c:1832
 msgid "_Unread"
-msgstr "_NP"
+msgstr "_Nieprzeczytany"
 
-#: ../src/balsa-index.c:1826
+#: ../src/balsa-index.c:1840
 msgid "_Move to"
 msgstr "_PrzenieÅ? do"
 
-#: ../src/balsa-index.c:1834
+#: ../src/balsa-index.c:1848
 msgid "_View Source"
 msgstr "_WyÅ?wietl ÅºrÃ³dÅ?o"
 
-#: ../src/balsa-index.c:2116
-#, c-format
-msgid "Failed to copy messages to mailbox \"%s\": %s"
-msgstr "Nie moÅ¼na skopiowaÄ? listÃ³w do skrzynki \"%s\": %s"
-
-#: ../src/balsa-index.c:2117
+#: ../src/balsa-index.c:2085
 #, c-format
-msgid "Failed to copy message to mailbox \"%s\": %s"
-msgstr "Nie moÅ¼na skopiowaÄ? listu do skrzynki \"%s\": %s"
+msgid "Failed to copy %d message to mailbox \"%s\": %s"
+msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
+msgstr[0] "Failed to copy %d message to mailbox \"%s\": %s"
+msgstr[1] "Failed to copy %d messages to mailbox \"%s\": %s"
 
-#: ../src/balsa-index.c:2129
+#: ../src/balsa-index.c:2099
 #, c-format
 msgid "Copied to \"%s\"."
 msgstr "Przekopiowano do \"%s\"."
 
-#: ../src/balsa-index.c:2130
+#: ../src/balsa-index.c:2100
 #, c-format
 msgid "Moved to \"%s\"."
 msgstr "Przeniesiono do \"%s\"."
 
-#: ../src/balsa-index.c:2250
+#: ../src/balsa-index.c:2202
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Zapisanie zmian w skrzynce %s nie powiodÅ?o siÄ?."
 
+#: ../src/balsa-index.c:2300
+#, c-format
+msgid "Cannot process the message: %s"
+msgstr "Nie moÅ¼na przetworzyÄ? wiadomoÅ?ci: %s"
+
 #: ../src/balsa-index.c:2423
+#, c-format
+msgid "Cannot access message %u to pass to %s"
+msgstr "Nie moÅ¼na dotrzeÄ? do wiadomoÅ?ci %u aby przekazaÄ? do %s"
+
+#: ../src/balsa-index.c:2450
+#, c-format
+msgid "Cannot read message %u to pass to %s"
+msgstr "Nie moÅ¼na czytaÄ? wiadomoÅ?ci %u aby przekazaÄ? do %s"
+
+#: ../src/balsa-index.c:2620
 msgid "Pipe message through a program"
 msgstr "Filtrowanie listÃ³w za pomocÄ? procmaila"
 
-#: ../src/balsa-index.c:2426
+#: ../src/balsa-index.c:2623
 msgid "_Run"
 msgstr "_Uruchom"
 
-#: ../src/balsa-index.c:2435
+#: ../src/balsa-index.c:2632
 msgid "Specify the program to run:"
 msgstr "OkreÅ?l program, ktÃ³ry ma byÄ? uruchomiony:"
 
-#: ../src/balsa-mblist.c:278
+#: ../src/balsa-mblist.c:356
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: ../src/balsa-mblist.c:992
-#: ../src/balsa-mblist.c:1030
+#: ../src/balsa-mblist.c:1181
+#: ../src/balsa-mblist.c:1217
 msgid "Failed to find mailbox"
 msgstr "Nie moÅ¼na odnaleÅºÄ? skrzynki"
 
-#: ../src/balsa-mblist.c:1590
+#: ../src/balsa-mblist.c:1844
 msgid "_Other..."
 msgstr "_Inny..."
 
-#: ../src/balsa-mblist.c:1658
+#: ../src/balsa-mblist.c:1912
 msgid "Choose destination folder"
 msgstr "WybÃ³r folderu docelowego"
 
-#: ../src/balsa-mblist.c:1881
-#: ../src/balsa-mblist.c:1884
+#: ../src/balsa-mblist.c:2135
+#: ../src/balsa-mblist.c:2138
 msgid "Other..."
 msgstr "Inny..."
 
-#: ../src/balsa-mblist.c:2042
+#. xgettext: this is the first part of the message
+#. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
+#: ../src/balsa-mblist.c:2305
+#, c-format
+msgid "Shown mailbox: %s "
+msgstr "Widoczna skrzynka: %s"
+
+#: ../src/balsa-mblist.c:2310
 #, c-format
-msgid "Shown mailbox: %s with %d message, "
-msgid_plural "Shown mailbox: %s with %d messages, "
-msgstr[0] "Widoczna skrzynka: %s z %d listem, "
-msgstr[1] "Widoczna skrzynka: %s z %d listami, "
-msgstr[2] "Widoczna skrzynka: %s z %d listami, "
+msgid "with %d message"
+msgid_plural "with %d messages"
+msgstr[0] " z %d wiadomoÅ?ciÄ?"
+msgstr[1] " z %d wiadomoÅ?ciami"
 
-#. xgettext: this is the second part of the message
-#. * "Shown mailbox: %s with %d messages, %ld new".
-#: ../src/balsa-mblist.c:2048
+#: ../src/balsa-mblist.c:2317
 #, c-format
-msgid "%ld new"
-msgid_plural "%ld new"
-msgstr[0] "%ld nowy"
-msgstr[1] "%ld nowe"
-msgstr[2] "%ld nowych"
+msgid ", %d new"
+msgid_plural ", %d new"
+msgstr[0] ", %d nowa"
+msgstr[1] ", %d nowe"
 
-#: ../src/balsa-message.c:285
+#: ../src/balsa-mblist.c:2324
+#, c-format
+msgid ", %d hidden"
+msgid_plural ", %d hidden"
+msgstr[0] ", %d ukryta"
+msgstr[1] ", %d ukryte"
+
+#: ../src/balsa-message.c:301
+#: ../src/balsa-message.c:304
 msgid "Check cryptographic signature"
 msgstr "Sprawdzanie zaszyfrowania podpisu"
 
-#: ../src/balsa-message.c:306
+#: ../src/balsa-message.c:327
+#: ../src/balsa-message.c:330
 msgid "Select message part to display"
 msgstr "WybieÅ¼ czÄ?Å?Ä? listu, ktÃ³ra ma zostaÄ? wyÅ?wietlona"
 
-#: ../src/balsa-message.c:381
+#: ../src/balsa-message.c:414
+msgid "Wrapped"
+msgstr "Zapakowane"
+
+#: ../src/balsa-message.c:418
+msgid "Not found"
+msgstr "Nie znaleziono"
+
+#: ../src/balsa-message.c:551
+msgid "Find:"
+msgstr "ZnajdÅº:"
+
+#: ../src/balsa-message.c:564
+#: ../src/toolbar-factory.c:138
+msgid "Previous"
+msgstr "Poprzedni"
+
+#: ../src/balsa-message.c:572
+#: ../src/toolbar-factory.c:139
+msgid "Next"
+msgstr "NastÄ?pny"
+
+#: ../src/balsa-message.c:649
 msgid "Content"
 msgstr "ZawartoÅ?Ä?"
 
-#: ../src/balsa-message.c:460
+#: ../src/balsa-message.c:740
 msgid "Message parts"
 msgstr "Elementy listu"
 
-#: ../src/balsa-message.c:643
+#: ../src/balsa-message.c:924
 msgid "Save selected as..."
 msgstr "Zapisz zaznaczone jako..."
 
-#: ../src/balsa-message.c:650
+#: ../src/balsa-message.c:931
 msgid "Save selected to folder..."
 msgstr "Zapisz zaznaczone do katalogu..."
 
-#: ../src/balsa-message.c:788
+#: ../src/balsa-message.c:1022
 msgid "(No sender)"
 msgstr "(Brak nadawcy)"
 
-#: ../src/balsa-message.c:856
-#, fuzzy, c-format
-msgid "Could not access message %ld in mailbox \"%s\"."
-msgstr "Brak dostÄ?pu do listu; skrzynka \"%s\" zostaÅ?a zmieniona."
+#: ../src/balsa-message.c:1074
+#: ../src/balsa-message.c:1086
+#, c-format
+msgid "Could not access message %u in mailbox \"%s\"."
+msgstr "Brak dostÄ?pu do wiadomoÅ?ci %u w skrzynce \"%s\"."
 
-#: ../src/balsa-message.c:1038
+#: ../src/balsa-message.c:1260
 msgid "mixed parts"
 msgstr "wszystkie elementy"
 
-#: ../src/balsa-message.c:1040
+#: ../src/balsa-message.c:1262
 msgid "alternative parts"
 msgstr "elementy alternatywne"
 
-#: ../src/balsa-message.c:1042
+#: ../src/balsa-message.c:1264
 msgid "signed parts"
 msgstr "elementy podpisane"
 
-#: ../src/balsa-message.c:1044
+#: ../src/balsa-message.c:1266
 msgid "encrypted parts"
 msgstr "elementy zaszyfrowane"
 
-#: ../src/balsa-message.c:1046
+#: ../src/balsa-message.c:1268
 msgid "rfc822 message"
 msgstr "wiadomoÅ?Ä? rfc822"
 
-#: ../src/balsa-message.c:1048
+#: ../src/balsa-message.c:1270
 #, c-format
 msgid "\"%s\" parts"
 msgstr "\"%s\" elementÃ³w"
 
-#: ../src/balsa-message.c:1101
+#: ../src/balsa-message.c:1318
+msgid "force inline for all parts"
+msgstr "WymuÅ? treÅ?Ä? listu dla wszystkich czÄ?Å?ci"
+
+#: ../src/balsa-message.c:1361
 #, c-format
 msgid "rfc822 message (from %s, subject \"%s\")"
 msgstr "wiadomoÅ?Ä? rfc822 (od %s, temat \"%s\")"
 
-# FIXME - ???????
-#: ../src/balsa-message.c:1108
+#: ../src/balsa-message.c:1373
 msgid "complete message"
-msgstr "dokoÅ?czanie wiadomoÅ?ci"
+msgstr "dokoÅ?cz wiadomoÅ?Ä?"
 
-#: ../src/balsa-message.c:1125
+#: ../src/balsa-message.c:1390
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "czÄ?Å?Ä? %s: %s (plik %s)"
 
-#: ../src/balsa-message.c:1136
+#: ../src/balsa-message.c:1401
 #, c-format
 msgid "part %s: %s"
 msgstr "czÄ?Å?Ä? %s: %s"
 
-#: ../src/balsa-message.c:1151
+#: ../src/balsa-message.c:1416
 msgid "encrypted: "
 msgstr "zaszyfrowane: "
 
-#: ../src/balsa-message.c:1254
-#: ../src/balsa-mime-widget-text.c:344
-#: ../src/balsa-mime-widget-text.c:649
-msgid "Save..."
-msgstr "Zapisz..."
+#: ../src/balsa-message.c:1558
+#, c-format
+msgid "Reading embedded message failed: %s"
+msgstr "Odczytywanie osadzonej wiadomoÅ?ci nie powiodÅ?o siÄ?: %s"
+
+#: ../src/balsa-message.c:1566
+#, c-format
+msgid "Appending message to %s failed: %s"
+msgstr "DoÅ?Ä?czanie wiadomoÅ?ci do %s nie powiodÅ?o siÄ?: %s"
+
+#: ../src/balsa-message.c:1600
+msgid "_Save..."
+msgstr "_Zapisz..."
+
+#: ../src/balsa-message.c:1609
+#: ../src/balsa-mime-widget-message.c:474
+msgid "_Copy to folder..."
+msgstr "_kopiuj do folderu"
 
-#: ../src/balsa-message.c:1330
+#: ../src/balsa-message.c:1692
 msgid "Select folder for saving selected parts"
 msgstr "Wybierz katalog, w ktÃ³rym bÄ?dÄ? zapisywane zaznaczone czÄ?Å?ci"
 
-#: ../src/balsa-message.c:1368
+#: ../src/balsa-message.c:1713
+#, c-format
+msgid "Could not create URI for %s"
+msgstr "Nie moÅ¼na byÅ?o utworzyÄ? URI dla %s"
+
+#: ../src/balsa-message.c:1738
 #, c-format
 msgid "%s message part"
 msgstr "%s elementy listu"
 
-#: ../src/balsa-message.c:1395
-#: ../src/balsa-mime-widget-callbacks.c:201
+#: ../src/balsa-message.c:1771
+#: ../src/balsa-mime-widget-callbacks.c:152
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "Nie moÅ¼na zapisaÄ? pliku %s: %s"
 
-#: ../src/balsa-message.c:2099
+#: ../src/balsa-message.c:2410
+#: ../src/balsa-message.c:2541
+#, c-format
+msgid "Sending the disposition notification failed: %s"
+msgstr "WysyÅ?anie dyspozycji powiadomienia zawiodÅ?o: %s"
+
+#: ../src/balsa-message.c:2504
 #, c-format
 msgid ""
 "The sender of this mail, %s, requested \n"
@@ -2335,11 +2899,11 @@ msgstr ""
 "powiadomienie o otrzymaniu listu (MDN, Message Disposition Notification).\n"
 "Czy chcesz wysÅ?aÄ? to powiadomienie?"
 
-#: ../src/balsa-message.c:2106
+#: ../src/balsa-message.c:2511
 msgid "Reply to MDN?"
 msgstr "Czy odpowiedzieÄ? na MDN?"
 
-#: ../src/balsa-message.c:2301
+#: ../src/balsa-message.c:2713
 msgid ""
 "The decryption cannot be performed because this message is displayed more than once.\n"
 "Please close the other instances of this message and try again."
@@ -2347,70 +2911,71 @@ msgstr ""
 "Operacja odszyfrowania nie moÅ¼e zostaÄ? wykonana, poniewaÅ¼ ten list jest wyÅ?wietlony wiÄ?cej niÅ¼ jeden raz.\n"
 "Zamknij inne okna z tym listem i sprÃ³buj jeszcze raz."
 
-#: ../src/balsa-message.c:2322
-#: ../src/balsa-message.c:2404
-#: ../src/balsa-message.c:2519
+#: ../src/balsa-message.c:2734
+#: ../src/balsa-message.c:2819
+#: ../src/balsa-message.c:2941
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Zapisanie wysÅ?anego listu nie powiodÅ?o siÄ?: %s"
 
-#: ../src/balsa-message.c:2323
-#: ../src/balsa-message.c:2405
-#: ../src/balsa-message.c:2520
+#: ../src/balsa-message.c:2735
+#: ../src/balsa-message.c:2820
+#: ../src/balsa-message.c:2942
 msgid "Possible disk space problem."
-msgstr "MoÅ¼liwy problem z wolnym miejscem na dysku twardym"
+msgstr "MoÅ¼liwy problem z wolnym miejscem na dysku twardym."
 
-#: ../src/balsa-message.c:2335
+#: ../src/balsa-message.c:2749
 #, c-format
 msgid "The message sent by %s with subject \"%s\" contains an encrypted part, but it's structure is invalid."
 msgstr "List wysÅ?any przez %s o temacie \"%s\" zawiera zaszyfrowanÄ? czÄ?Å?Ä?, ale jej struktura jest niepoprawna."
 
-#: ../src/balsa-message.c:2343
+#: ../src/balsa-message.c:2757
 #, c-format
 msgid "The message sent by %s with subject \"%s\" contains a PGP encrypted part, but this crypto protocol is not available."
 msgstr "List wysÅ?any przez %s o temacie \"%s\" zawiera czÄ?Å?Ä? zaszyfrowanÄ? PGP, ale ten protokÃ³Å? szyfrowania nie jest dostÄ?pny."
 
-#: ../src/balsa-message.c:2356
+#: ../src/balsa-message.c:2770
 #, c-format
 msgid "The message sent by %s with subject \"%s\" contains a S/MIME encrypted part, but this crypto protocol is not available."
 msgstr "List wysÅ?any przez %s o temacie \"%s\" zawiera czÄ?Å?Ä? zaszyfrowanÄ? S/MIME, ale ten protokÃ³Å? szyfrowania nie jest dostÄ?pny."
 
-#: ../src/balsa-message.c:2420
+#: ../src/balsa-message.c:2837
 #, c-format
 msgid "The message sent by %s with subject \"%s\" contains a signed part, but its structure is invalid. The signature, if there is any, cannot be checked."
 msgstr "List wysÅ?any przez %s o temacie \"%s\" zawiera czÄ?Å?Ä? podpisanÄ?, ale jej struktura jest niepoprawna. Podpis, o ile takowy istnieje, nie moÅ¼e zostaÄ? sprawdzony."
 
-#: ../src/balsa-message.c:2433
+#: ../src/balsa-message.c:2850
 #, c-format
 msgid "The message sent by %s with subject \"%s\" contains a %s signed part, but this crypto protocol is not available."
 msgstr "List wysÅ?any przez %s o temacie \"%s\" zawiera czÄ?Å?Ä? zaszyfrowanÄ? %s, ale ten protokÃ³Å? szyfrowania nie jest dostÄ?pny."
 
-#: ../src/balsa-message.c:2436
+#: ../src/balsa-message.c:2853
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/balsa-message.c:2436
+#: ../src/balsa-message.c:2853
 #: ../src/balsa-mime-widget-crypto.c:72
-#: ../src/print.c:1302
+#: ../src/print-gtk.c:191
+#: ../src/print.c:1323
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: ../src/balsa-message.c:2455
-#: ../src/balsa-message.c:2577
+#: ../src/balsa-message.c:2877
+#: ../src/balsa-message.c:3004
 msgid "Detected a good signature"
 msgstr "Wykryto dobry podpis"
 
-#: ../src/balsa-message.c:2461
+#: ../src/balsa-message.c:2883
 msgid "Detected a good signature with insufficient validity"
 msgstr "Wykryto dobry podpis z niewystarczajÄ?cÄ? waÅ¼noÅ?ciÄ?"
 
-#: ../src/balsa-message.c:2466
-#: ../src/balsa-message.c:2581
+#: ../src/balsa-message.c:2888
+#: ../src/balsa-message.c:3008
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr "Wykryto dobry podpis z niewystarczajÄ?cÄ? waÅ¼noÅ?ciÄ?/zaufaniem"
 
-#: ../src/balsa-message.c:2473
-#: ../src/balsa-message.c:2587
+#: ../src/balsa-message.c:2895
+#: ../src/balsa-message.c:3014
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" returned:\n"
@@ -2419,351 +2984,637 @@ msgstr ""
 "Sprawdzenie podpisu listu wysÅ?anego przez %s z tematem \"%s\" daÅ?o w wyniku:\n"
 "%s"
 
-#: ../src/balsa-message.c:2485
+#: ../src/balsa-message.c:2907
 #, c-format
 msgid "Checking the signature of the message sent by %s with subject \"%s\" failed with an error!"
 msgstr "Sprawdzenie podpisu listu wysÅ?anego przez %s z tematem \"%s\" zakoÅ?czyÅ?o siÄ? bÅ?Ä?dem!"
 
-#: ../src/balsa-message.c:2541
+#: ../src/balsa-message.c:2966
 msgid "The decryption cannot be performed because this message is displayed more than once."
 msgstr ""
 "Operacja odszyfrowania nie moÅ¼e zostaÄ? wykonana, poniewaÅ¼ ten list jest wyÅ?wietlony wiÄ?cej niÅ¼ jeden raz.\n"
 "Zamknij inne okna z tym listem i sprÃ³buj jeszcze raz."
 
-#: ../src/balsa-message.c:2543
+#: ../src/balsa-message.c:2968
 msgid "The signature check and removal of the OpenPGP armor cannot be performed because this message is displayed more than once."
-msgstr "Sprawdzenie "
+msgstr "Sprawdzenie podpisu i usuniÄ?cie OpenPGP nie moÅ¼e byc przeprowadzone z powodu tego iz ta wiadomoÅ?Ä? zostaÅ?a wyÅ?wietlona wiÄ?cej niÅ¼ raz."
 
-#: ../src/balsa-message.c:2546
+#: ../src/balsa-message.c:2971
 msgid "Please close the other instances of this message and try again."
 msgstr "ProszÄ? zamknÄ?Ä? inne instancje tej wiadomoÅ?ci i sprÃ³bowaÄ? jeszcze raz."
 
-#: ../src/filter-edit-callbacks.c:311
+#: ../src/balsa-mime-widget-callbacks.c:47
+#: ../src/sendmsg-window.c:1800
+#, c-format
+msgid "Could not launch application: %s"
+msgstr "Nie moÅ¼na uruchomiÄ? aplikacji: %s"
+
+#: ../src/balsa-mime-widget-callbacks.c:74
+#, c-format
+msgid "Save %s MIME Part"
+msgstr "Zapis %s zaÅ?Ä?cznika MIME"
+
+#: ../src/balsa-mime-widget-callbacks.c:113
+#, c-format
+msgid "Could not construct uri from %s"
+msgstr "Nie moÅ¼na byÅ?o skonstruowaÄ? uri z %s"
+
+#: ../src/balsa-mime-widget-callbacks.c:132
+msgid "File already exists. Overwrite?"
+msgstr "Plik juÅ¼ istnieje. NadpisaÄ??"
+
+#: ../src/balsa-mime-widget-callbacks.c:139
+#, c-format
+msgid "Unlink %s: %s"
+msgstr "Odlinkuj %s: %s"
+
+#: ../src/balsa-mime-widget-crypto.c:70
+#, c-format
+msgid ""
+"This is an inline %s signed %s message part:\n"
+"%s"
+msgstr ""
+"To jest treÅ?Ä? %s podpisana %s w czÄ?Å?ci listu za pomocÄ? OpenPGP:\n"
+"%s"
+
+#: ../src/balsa-mime-widget-crypto.c:72
+#: ../src/print-gtk.c:191
+#: ../src/print.c:1323
+msgid "OpenPGP"
+msgstr "OtwÃ³rz klucz PGP"
+
+#: ../src/balsa-mime-widget-crypto.c:90
+msgid "_Run GnuPG to import this key"
+msgstr "_Uruchom gpg aby zaimportowaÄ? ten kluc"
+
+#: ../src/balsa-mime-widget-crypto.c:94
+msgid "_Run GnuPG to check for an update of this key"
+msgstr "_Uruchom GnuPG celem sprawdzenia aktualizacji tego klucza"
+
+#: ../src/balsa-mime-widget-image.c:51
+#: ../src/balsa-mime-widget-image.c:159
+#, c-format
+msgid "Error loading attached image: %s\n"
+msgstr "BÅ?Ä?d przy wczytywaniu zaÅ?Ä?czonego obrazu: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:163
+#: ../src/balsa-mime-widget-message.c:175
+#: ../src/balsa-mime-widget-message.c:203
+#: ../src/balsa-mime-widget-message.c:256
+msgid "Content Type: external-body\n"
+msgstr "Typ zawartoÅ?ci: external-body\n"
+
+#: ../src/balsa-mime-widget-message.c:164
+#, c-format
+msgid "Access type: local-file\n"
+msgstr "Typ dostÄ?pu: local-file\n"
+
+#: ../src/balsa-mime-widget-message.c:165
+#: ../src/balsa-mime-widget-message.c:211
+#: ../src/balsa-mime-widget.c:232
+#, c-format
+msgid "File name: %s"
+msgstr "Nazwa pliku: %s"
+
+#: ../src/balsa-mime-widget-message.c:176
+#, c-format
+msgid "Access type: URL\n"
+msgstr "Typ dostÄ?pu: URL\n"
+
+#: ../src/balsa-mime-widget-message.c:177
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: ../src/balsa-mime-widget-message.c:204
+#, c-format
+msgid "Access type: %s\n"
+msgstr "Typ dostÄ?pu: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:208
+#, c-format
+msgid "FTP site: %s\n"
+msgstr "OÅ?rodek FTP: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:210
+#, c-format
+msgid "Directory: %s\n"
+msgstr "Katalog: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:257
+msgid "Access type: mail-server\n"
+msgstr "Typ dostÄ?pu: mail-server\n"
+
+#: ../src/balsa-mime-widget-message.c:258
+#, c-format
+msgid "Mail server: %s\n"
+msgstr "Serwery pocztowy: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:260
+#, c-format
+msgid "Subject: %s\n"
+msgstr "Temat: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:277
+msgid "Se_nd message to obtain this part"
+msgstr "A_by uzyskaÄ? tÄ? czÄ?Å?Ä?, wyÅ?lij list"
+
+#: ../src/balsa-mime-widget-message.c:302
+#: ../src/balsa-mime-widget-text.c:938
+#: ../src/balsa-mime-widget-text.c:1213
+#: ../src/main-window.c:2576
+#: ../src/sendmsg-window.c:1825
+#, c-format
+msgid "Error showing %s: %s\n"
+msgstr "BÅ?Ä?d przy wyÅ?wietlaniu %s: %s\n"
+
+#: ../src/balsa-mime-widget-message.c:337
+#: ../src/print.c:679
+#, c-format
+msgid "Could not get a part: %s"
+msgstr "Nie moÅ¼na pobraÄ? czÄ?Å?ci danych: %s"
+
+#: ../src/balsa-mime-widget-message.c:369
+#, c-format
+msgid "Sending the external body request failed: %s"
+msgstr "WysyÅ?ania proÅ?by o zewnÄ?trznÄ? czÄ?Å?c gÅ?Ã³wnÄ? zawiodÅ?o: %s"
+
+#: ../src/balsa-mime-widget-message.c:466
+msgid "Reply..."
+msgstr "Odpowiedz"
+
+#: ../src/balsa-mime-widget-message.c:564
+msgid "... [truncated]"
+msgstr "... [Å?ciÄ?ty]"
+
+#: ../src/balsa-mime-widget-message.c:693
+#: ../src/balsa-print-object-header.c:152
+#: ../src/print.c:354
+#: ../src/sendmsg-window.c:1126
+#: ../src/sendmsg-window.c:1128
+#: ../src/sendmsg-window.c:1268
+#: ../src/sendmsg-window.c:3795
+#: ../src/sendmsg-window.c:5670
+msgid "Subject:"
+msgstr "Temat:"
+
+#: ../src/balsa-mime-widget-message.c:697
+#: ../src/balsa-print-object-header.c:160
+#: ../src/print.c:360
+#: ../src/sendmsg-window.c:3791
+msgid "Date:"
+msgstr "Data:"
+
+#. addresses
+#: ../src/balsa-mime-widget-message.c:703
+#: ../src/balsa-print-object-header.c:165
+#: ../src/print.c:365
+#: ../src/sendmsg-window.c:3802
+#: ../src/store-address.c:324
+msgid "From:"
+msgstr "Od:"
+
+#: ../src/balsa-mime-widget-message.c:710
+msgid "Reply-To:"
+msgstr "OdpowiedÅº do:"
+
+#: ../src/balsa-mime-widget-message.c:719
+#: ../src/balsa-print-object-header.c:173
+#: ../src/print.c:372
+msgid "Fcc:"
+msgstr "Fcc:"
+
+#: ../src/balsa-mime-widget-message.c:726
+#: ../src/balsa-print-object-header.c:176
+#: ../src/print.c:378
+msgid "Disposition-Notification-To:"
+msgstr "Powiadomienie-o-otrzymaniu:"
+
+#: ../src/balsa-mime-widget-text.c:154
+#, c-format
+msgid "Could not save a text part: %s"
+msgstr "Nie moÅ¼na zapisaÄ? czÄ?Å?ci tekstu: %s"
+
+#: ../src/balsa-mime-widget-text.c:202
+#, c-format
+msgid "The message sent by %s with subject \"%s\" contains 8-bit characters, but no header describing the used codeset (converted to %s)"
+msgstr "List wysÅ?any przez %s o temacie \"%s\" zawiera oÅ?miobitowe znaki, ale brak nagÅ?Ã³wka opisujÄ?cego uÅ¼yty zestaw znakÃ³w (zmieniono na %s)"
+
+#: ../src/balsa-mime-widget-text.c:646
+msgid "Copy link"
+msgstr "Kopiuj odnoÅ?nik"
+
+#: ../src/balsa-mime-widget-text.c:651
+msgid "Open link"
+msgstr "OtwÃ³rz  odnoÅ?nik"
+
+#: ../src/balsa-mime-widget-text.c:656
+msgid "Send link..."
+msgstr "WyÅ?lij  odnoÅ?nik"
+
+#: ../src/balsa-mime-widget-text.c:685
+#: ../src/balsa-mime-widget-text.c:1175
+msgid "Save..."
+msgstr "Zapisz..."
+
+#: ../src/balsa-mime-widget-text.c:695
+msgid "Highlight structured phrases"
+msgstr "WyrÃ³Å¼nienie cytowanego tekstu"
+
+#: ../src/balsa-mime-widget-text.c:922
+#, c-format
+msgid "Calling URL %s..."
+msgstr "WywoÅ?ywanie adresu URL %s..."
+
+#: ../src/balsa-mime-widget-text.c:1272
+msgid "Address"
+msgstr "Adres"
+
+#: ../src/balsa-mime-widget-text.c:1275
+msgid "S_tore"
+msgstr "P_rzechowuj"
+
+#: ../src/balsa-mime-widget-text.c:1283
+#: ../src/balsa-print-object-text.c:503
+msgid "Full Name"
+msgstr "PeÅ?na nazwa"
+
+#: ../src/balsa-mime-widget-text.c:1284
+#: ../src/balsa-print-object-text.c:505
+msgid "Nick Name"
+msgstr "Pseudonim"
+
+#: ../src/balsa-mime-widget-text.c:1285
+#: ../src/balsa-print-object-text.c:507
+msgid "First Name"
+msgstr "ImiÄ?"
+
+#: ../src/balsa-mime-widget-text.c:1286
+#: ../src/balsa-print-object-text.c:509
+msgid "Last Name"
+msgstr "Nazwisko"
+
+#: ../src/balsa-mime-widget-text.c:1287
+#: ../src/balsa-print-object-text.c:511
+msgid "Organization"
+msgstr "Organizacja"
+
+#: ../src/balsa-mime-widget-text.c:1289
+#: ../src/balsa-print-object-text.c:514
+msgid "Email Address"
+msgstr "Adres e-mail"
+
+#: ../src/balsa-mime-widget.c:251
+#, c-format
+msgid "Error reading message part: %s"
+msgstr "BÅ?Ä?d przy odczytywaniu czÄ?Å?ci wiadomoÅ?ci: %s"
+
+#: ../src/balsa-mime-widget.c:275
+#, c-format
+msgid "Type: %s (%s)"
+msgstr "Typ: %s (%s)"
+
+#: ../src/balsa-mime-widget.c:279
+#, c-format
+msgid "Content Type: %s"
+msgstr "Typ zawartoÅ?ci: %s"
+
+#: ../src/balsa-mime-widget.c:291
+msgid "No open or view action defined for this content type"
+msgstr "Brak akcji otwÃ³rz lub oglÄ?daj zdefiniowanych dla tego typu zawartoÅ?ci"
+
+#: ../src/balsa-mime-widget.c:296
+msgid "S_ave part"
+msgstr "Z_apisz czÄ?Å?Ä?"
+
+#. gather some info about this part
+#. four fields, one terminator
+#: ../src/balsa-print-object-default.c:150
+#: ../src/balsa-print-object-default.c:152
+#: ../src/balsa-print-object-default.c:155
+#: ../src/print.c:1002
+msgid "Type:"
+msgstr "Typ:"
+
+#: ../src/balsa-print-object-default.c:160
+#: ../src/balsa-print-object-default.c:164
+#: ../src/print.c:1005
+msgid "File name:"
+msgstr "Nazwa pliku:"
+
+#: ../src/filter-edit-callbacks.c:327
 msgid "One of the specified fields contains:"
 msgstr "Jedno z okreÅ?lonych pÃ³l zawiera:"
 
-#: ../src/filter-edit-callbacks.c:312
+#: ../src/filter-edit-callbacks.c:328
 msgid "None of the specified fields contains:"
 msgstr "Å»adne z okreÅ?lonych pÃ³l nie zawiera:"
 
-#: ../src/filter-edit-callbacks.c:314
+#: ../src/filter-edit-callbacks.c:330
 msgid "One of the regular expressions matches"
 msgstr "Pasuje jedno z wyraÅ¼eÅ? regularnych"
 
-#: ../src/filter-edit-callbacks.c:315
+#: ../src/filter-edit-callbacks.c:331
 msgid "None of the regular expressions matches"
 msgstr "Nie pasuje Å¼adne z wyraÅ¼eÅ? regularnych"
 
-#: ../src/filter-edit-callbacks.c:317
+#: ../src/filter-edit-callbacks.c:333
 msgid "Match when date is in the interval:"
 msgstr "Dopasowanie, jeÅ?li data jest w przedziale:"
 
-#: ../src/filter-edit-callbacks.c:318
+#: ../src/filter-edit-callbacks.c:334
 msgid "Match when date is outside the interval:"
 msgstr "Dopasowanie, jeÅ?li data jest poza przedziaÅ?em:"
 
-#: ../src/filter-edit-callbacks.c:320
-#: ../src/filter-edit-callbacks.c:1070
+#: ../src/filter-edit-callbacks.c:336
+#: ../src/filter-edit-callbacks.c:1131
 msgid "Match when one of these flags is set:"
 msgstr "Dopasowanie, jeÅ?li ustawiony jest jeden ze znacznikÃ³w:"
 
-#: ../src/filter-edit-callbacks.c:321
+#: ../src/filter-edit-callbacks.c:337
 msgid "Match when none of these flags is set:"
 msgstr "Dopasowanie, jeÅ?li nie jest ustawiony Å¼aden ze znacznikÃ³w:"
 
-#: ../src/filter-edit-callbacks.c:512
+#: ../src/filter-edit-callbacks.c:530
 msgid "You must specify the name of the user header to match on"
 msgstr "NaleÅ¼y podaÄ? nazwÄ? nagÅ?Ã³wka uÅ¼ytkownika podlegajÄ?cÄ? dopasowaniu"
 
-#: ../src/filter-edit-callbacks.c:523
+#: ../src/filter-edit-callbacks.c:541
 msgid "You must specify at least one field for matching"
 msgstr "NaleÅ¼y podaÄ? przynajmniej jedno pole do dopasowania"
 
-#: ../src/filter-edit-callbacks.c:533
+#: ../src/filter-edit-callbacks.c:551
 msgid "You must provide a string"
 msgstr "NaleÅ¼y podaÄ? napis"
 
-#: ../src/filter-edit-callbacks.c:540
+#: ../src/filter-edit-callbacks.c:559
 msgid "You must provide at least one regular expression"
 msgstr "NaleÅ¼y podaÄ? przynajmniej jedno wyraÅ¼enie regularne"
 
-#: ../src/filter-edit-callbacks.c:552
+#: ../src/filter-edit-callbacks.c:572
 msgid "Low date is incorrect"
 msgstr "Dolna data jest niepoprawna"
 
-#: ../src/filter-edit-callbacks.c:563
+#: ../src/filter-edit-callbacks.c:583
 msgid "High date is incorrect"
 msgstr "GÃ³rna data jest niepoprawna"
 
-#: ../src/filter-edit-callbacks.c:571
+#: ../src/filter-edit-callbacks.c:591
 msgid "Low date is greater than high date"
 msgstr "Dolna data jest pÃ³Åºniejsza od gÃ³rnej"
 
-#: ../src/filter-edit-callbacks.c:841
+#: ../src/filter-edit-callbacks.c:892
 #, c-format
 msgid "Error displaying condition help: %s\n"
 msgstr "BÅ?Ä?d przy wyÅ?wietlaniu pomocy warunku: %s\n"
 
-#: ../src/filter-edit-callbacks.c:882
+#: ../src/filter-edit-callbacks.c:934
 msgid "Match Fields"
 msgstr "Dopasuj pola"
 
-#: ../src/filter-edit-callbacks.c:892
+#: ../src/filter-edit-callbacks.c:944
 msgid "_All"
 msgstr "_Wszystkie"
 
-#: ../src/filter-edit-callbacks.c:893
+#: ../src/filter-edit-callbacks.c:945
 msgid "C_lear"
 msgstr "Wyc_zyÅ?Ä?"
 
-#: ../src/filter-edit-callbacks.c:895
-#: ../src/main-window.c:3828
+#: ../src/filter-edit-callbacks.c:947
+#: ../src/main-window.c:4062
 msgid "_Body"
-msgstr "Tr_eÅ?Ä?"
+msgstr "_TreÅ?Ä?"
 
-#. To:
-#: ../src/filter-edit-callbacks.c:896
-#: ../src/main-window.c:3829
-#: ../src/sendmsg-window.c:2710
+#: ../src/filter-edit-callbacks.c:948
+#: ../src/main-window.c:4063
 msgid "_To:"
-msgstr "D_la:"
+msgstr "_Dla:"
 
-#: ../src/filter-edit-callbacks.c:897
-#: ../src/main-window.c:3830
+#: ../src/filter-edit-callbacks.c:949
+#: ../src/main-window.c:4064
 msgid "_From:"
-msgstr "O_d:"
+msgstr "_Od:"
 
-#: ../src/filter-edit-callbacks.c:898
+#: ../src/filter-edit-callbacks.c:950
 msgid "_Subject"
 msgstr "_Temat"
 
-#: ../src/filter-edit-callbacks.c:899
-#: ../src/main-window.c:3832
+#: ../src/filter-edit-callbacks.c:951
+#: ../src/main-window.c:4066
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../src/filter-edit-callbacks.c:901
+#: ../src/filter-edit-callbacks.c:953
 msgid "_User header:"
-msgstr "NagÅ?Ã³wek _uÅ¼ytkownika:"
+msgstr "_NagÅ?Ã³wek uÅ¼ytkownika:"
 
-#: ../src/filter-edit-callbacks.c:931
+#: ../src/filter-edit-callbacks.c:987
 msgid "Unread"
-msgstr "NP"
+msgstr "Nieprzeczytany"
 
-#: ../src/filter-edit-callbacks.c:931
+#: ../src/filter-edit-callbacks.c:987
 msgid "Deleted"
-msgstr "UsuniÄ?ty"
+msgstr "Z odpowiedziÄ?"
 
-#: ../src/filter-edit-callbacks.c:931
+#: ../src/filter-edit-callbacks.c:987
 msgid "Replied"
 msgstr "Z odpowiedziÄ?"
 
-#: ../src/filter-edit-callbacks.c:931
+#: ../src/filter-edit-callbacks.c:987
 msgid "Flagged"
 msgstr "Oznakowany"
 
-#: ../src/filter-edit-callbacks.c:946
+#: ../src/filter-edit-callbacks.c:1002
 msgid "One of the specified f_ields contains"
-msgstr "Jedno z okreÅ?lonych pÃ³l zaw_iera"
+msgstr "Jedno z okreÅ?lonych pÃ³l zawiera"
 
-#: ../src/filter-edit-callbacks.c:961
+#: ../src/filter-edit-callbacks.c:1017
 msgid "Contain/Does _Not Contain"
 msgstr "Zawiera/_Nie zawiera"
 
-#: ../src/filter-edit-callbacks.c:980
+#: ../src/filter-edit-callbacks.c:1037
 msgid "_One of the regular expressions matches"
 msgstr "_Pasuje jedno z wyraÅ¼eÅ? regularnych"
 
-#. Right/Add button
-#: ../src/filter-edit-callbacks.c:1007
-#: ../src/filter-run-dialog.c:327
-msgid "A_dd"
-msgstr "_Dodaj"
-
 #. Left/Remove button
-#: ../src/filter-edit-callbacks.c:1011
-#: ../src/filter-edit-dialog.c:319
+#: ../src/filter-edit-callbacks.c:1068
+#: ../src/filter-edit-dialog.c:320
 #: ../src/filter-run-dialog.c:332
 msgid "_Remove"
 msgstr "_UsuÅ?"
 
-#: ../src/filter-edit-callbacks.c:1015
+#: ../src/filter-edit-callbacks.c:1072
 msgid "One _Matches/None Matches"
 msgstr "J_eden pasuje/Å¼aden nie pasuje"
 
-#: ../src/filter-edit-callbacks.c:1032
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1083
+msgid "Filtering using regular expressions is not yet implemented."
+msgstr "Filtrowanie z uÅ¼yciem wyraÅ¼eÅ? regularnych nie zostaÅ?o jeszcze zaimplementowane."
+
+#: ../src/filter-edit-callbacks.c:1093
 msgid "Match when message date is in the interval:"
 msgstr "Dopasowanie, jeÅ?li data jest w przedziale:"
 
-#: ../src/filter-edit-callbacks.c:1052
+#: ../src/filter-edit-callbacks.c:1113
 msgid "Inside/outside the date interval"
 msgstr "WewnÄ?trz/poza zakresem czasu"
 
-#: ../src/filter-edit-callbacks.c:1099
+#: ../src/filter-edit-callbacks.c:1160
 msgid "Match when one flag is set/when no flag is set"
 msgstr "Dopasowanie, jeÅ?li ustawiona jest jedna flaga/Å¼adna flaga"
 
-#: ../src/filter-edit-callbacks.c:1117
+#: ../src/filter-edit-callbacks.c:1178
 msgid "Search T_ype:"
 msgstr "_Rodzaj wyszukiwania:"
 
-#: ../src/filter-edit-callbacks.c:1191
+#: ../src/filter-edit-callbacks.c:1252
 msgid "Edit condition for filter: "
 msgstr "Modyfikacja warunku filtru: "
 
-#: ../src/filter-edit-callbacks.c:1431
+#: ../src/filter-edit-callbacks.c:1472
+#: ../src/save-restore.c:1999
+msgid "Filter with no condition was omitted"
+msgstr "Filtr bez warunku zostaÅ? pominiÄ?ty"
+
+#: ../src/filter-edit-callbacks.c:1504
 #, c-format
 msgid "Error displaying filter help: %s\n"
 msgstr "BÅ?Ä?d przy wyÅ?wietlaniu pomocy filtra: %s\n"
 
-#: ../src/filter-edit-callbacks.c:1621
+#: ../src/filter-edit-callbacks.c:1697
 msgid "New filter"
 msgstr "Nowy filtr"
 
-#: ../src/filter-edit-callbacks.c:1751
+#: ../src/filter-edit-callbacks.c:1829
 msgid "No filter name specified."
 msgstr "Nie podano nazwy filtru."
 
-#: ../src/filter-edit-callbacks.c:1756
+#: ../src/filter-edit-callbacks.c:1834
 #, c-format
 msgid "Filter \"%s\" already exists."
 msgstr "Filtr \"%s\" juÅ¼ istnieje."
 
-#: ../src/filter-edit-callbacks.c:1766
+#: ../src/filter-edit-callbacks.c:1844
 msgid "Filter must have conditions."
 msgstr "Filtr musi zawieraÄ? warunki."
 
-#: ../src/filter-edit-callbacks.c:1823
+#: ../src/filter-edit-callbacks.c:1901
 msgid "Filter has matched"
 msgstr "Filtr zostaÅ? dopasowany"
 
-#: ../src/filter-edit-callbacks.c:1848
+#: ../src/filter-edit-callbacks.c:1926
 msgid "You must provide a sound to play"
 msgstr "NaleÅ¼y podaÄ? odtwarzany dÅºwiÄ?k"
 
-#: ../src/filter-edit-callbacks.c:2002
+#: ../src/filter-edit-callbacks.c:2085
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(PrzykÅ?ad: zapisz 31 Grudnia 2000 roku jako %s)"
 
-#: ../src/filter-edit-dialog.c:89
-#: ../src/pref-manager.c:376
+#: ../src/filter-edit-dialog.c:88
+#: ../src/pref-manager.c:418
 msgid "Simple"
 msgstr "Proste"
 
-#: ../src/filter-edit-dialog.c:90
+#: ../src/filter-edit-dialog.c:89
 msgid "Regular Expression"
 msgstr "WyraÅ¼enie regularne"
 
-#: ../src/filter-edit-dialog.c:91
+#: ../src/filter-edit-dialog.c:90
 msgid "Date interval"
 msgstr "Zakres dat"
 
-#: ../src/filter-edit-dialog.c:92
+#: ../src/filter-edit-dialog.c:91
 msgid "Flag condition"
 msgstr "Warunek na znaczniku"
 
-#: ../src/filter-edit-dialog.c:96
+#: ../src/filter-edit-dialog.c:95
 msgid "Copy to folder:"
 msgstr "Skopiowanie do folderu:"
 
-#: ../src/filter-edit-dialog.c:97
+#: ../src/filter-edit-dialog.c:96
 msgid "Move to folder:"
 msgstr "Przeniesienie do folderu:"
 
-#: ../src/filter-edit-dialog.c:98
+#: ../src/filter-edit-dialog.c:97
 msgid "Print on printer:"
 msgstr "Wydrukiwanie na drukarce:"
 
-#: ../src/filter-edit-dialog.c:99
+#: ../src/filter-edit-dialog.c:98
 msgid "Run program:"
 msgstr "Wykonanie programu:"
 
-#: ../src/filter-edit-dialog.c:100
+#: ../src/filter-edit-dialog.c:99
 msgid "Send to Trash"
 msgstr "Wyrzucenie do Å?mietnika"
 
-#: ../src/filter-edit-dialog.c:104
+#: ../src/filter-edit-dialog.c:103
 msgid "OR"
 msgstr "LUB"
 
-#: ../src/filter-edit-dialog.c:105
+#: ../src/filter-edit-dialog.c:104
 msgid "AND"
 msgstr "I"
 
-#. new button
-#. #define MENU_FILE_NEW_POS 0
-#: ../src/filter-edit-dialog.c:217
-#: ../src/mailbox-node.c:954
-#: ../src/main-window.c:371
-#: ../src/main-window.c:430
-msgid "_New"
-msgstr "_Nowy"
-
 #. The name entry
-#: ../src/filter-edit-dialog.c:249
+#: ../src/filter-edit-dialog.c:248
 msgid "_Filter name:"
-msgstr "Nazwa fi_ltru:"
+msgstr "_Nazwa filtru:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:267
+#: ../src/filter-edit-dialog.c:266
 msgid "Operation between conditions"
 msgstr "Operacja pomiÄ?dzy warunkami"
 
-#: ../src/filter-edit-dialog.c:310
-msgid "_Edit"
-msgstr "_Edycja"
-
-#: ../src/filter-edit-dialog.c:315
+#: ../src/filter-edit-dialog.c:316
 msgid "Ne_w"
 msgstr "No_wy"
 
 #. The notification area
-#: ../src/filter-edit-dialog.c:348
+#: ../src/filter-edit-dialog.c:349
 msgid "Notification:"
 msgstr "Powiadomienie:"
 
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:358
+#: ../src/filter-edit-dialog.c:359
 msgid "Play sound:"
 msgstr "Odtworzenie dÅºwiÄ?ku:"
 
-#: ../src/filter-edit-dialog.c:365
-#: ../src/filter-edit-dialog.c:378
+#: ../src/filter-edit-dialog.c:366
+#: ../src/filter-edit-dialog.c:379
 msgid "Use Sound..."
 msgstr "WybÃ³r wykorzystywanego dÅºwiÄ?ku..."
 
-#: ../src/filter-edit-dialog.c:397
+#: ../src/filter-edit-dialog.c:398
 msgid "Popup text:"
 msgstr "WyskakujÄ?cy napis:"
 
 #. The action area
-#: ../src/filter-edit-dialog.c:418
+#: ../src/filter-edit-dialog.c:419
 msgid "Action to perform:"
 msgstr "Podejmowana akcja:"
 
-#: ../src/filter-edit-dialog.c:469
+#: ../src/filter-edit-dialog.c:470
 msgid "Match"
 msgstr "Przeszukiwanie"
 
-#: ../src/filter-edit-dialog.c:472
+#: ../src/filter-edit-dialog.c:473
 msgid "Action"
 msgstr "CzynnoÅ?Ä?"
 
-#: ../src/filter-edit-dialog.c:484
+#: ../src/filter-edit-dialog.c:485
 msgid "Revert"
 msgstr "PrzywrÃ³Ä?"
 
-#: ../src/filter-edit-dialog.c:533
+#: ../src/filter-edit-dialog.c:536
 msgid "A filter run dialog is open.Close it before you can modify filters."
 msgstr "Otwarte jest okno uruchamiania filtru. Przed modyfikacjÄ? filtrÃ³w musisz je zamknÄ?Ä?."
 
-#: ../src/filter-edit-dialog.c:546
+#: ../src/filter-edit-dialog.c:549
 msgid "Balsa Filters"
 msgstr "ZarzÄ?dzanie filtrami"
 
-#: ../src/filter-edit-dialog.c:612
+#: ../src/filter-edit-dialog.c:617
 #, c-format
 msgid "Filter \"%s\" has no condition."
 msgstr "Filtr \"%s\" nie zawiera warunku."
@@ -2781,23 +3632,23 @@ msgstr "Otwarte sÄ? okna uruchamiania filtru. Przed modyfikacjÄ? filtrÃ³w musisz
 msgid "Balsa Filters Export"
 msgstr "Eksport filtrÃ³w Balsy"
 
-#: ../src/filter-run-callbacks.c:182
+#: ../src/filter-run-callbacks.c:196
 #, c-format
 msgid "Error displaying run filters help: %s\n"
 msgstr "BÅ?Ä?d przy wyÅ?wietlaniu pomocy uruchamiania filtrÃ³w: %s\n"
 
-#: ../src/filter-run-callbacks.c:230
-#: ../src/filter-run-callbacks.c:252
+#: ../src/filter-run-callbacks.c:245
+#: ../src/filter-run-callbacks.c:267
 msgid "Error when applying filters"
 msgstr "BÅ?Ä?d przy uruchamianiu filtrÃ³w"
 
-#: ../src/filter-run-callbacks.c:233
-#: ../src/filter-run-callbacks.c:255
+#: ../src/filter-run-callbacks.c:248
+#: ../src/filter-run-callbacks.c:270
 #, c-format
 msgid "Filter applied to \"%s\"."
 msgstr "Zatwierdzono filtr do \"%s\"."
 
-#: ../src/filter-run-callbacks.c:292
+#: ../src/filter-run-callbacks.c:307
 #, c-format
 msgid ""
 "The destination mailbox of the filter \"%s\" is \"%s\".\n"
@@ -2806,8 +3657,7 @@ msgstr ""
 "SkrzynkÄ? docelowÄ? filtru \"%s\" jest \"%s\".\n"
 "Nie moÅ¼na powiÄ?zaÄ? go z tÄ? samÄ? skrzynkÄ? (spowodowaÅ?oby to rekurencjÄ?)."
 
-# podciÄ?g nie jest chyba najtrafniejszy
-#: ../src/filter-run-callbacks.c:300
+#: ../src/filter-run-callbacks.c:315
 #, c-format
 msgid ""
 "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
@@ -2835,16 +3685,12 @@ msgstr "ZatwierdÅº zaznaczone"
 #. up button
 #: ../src/filter-run-dialog.c:364
 msgid "_Up"
-msgstr "Do gÃ³_ry"
+msgstr "_Do gÃ³ry"
 
-# ktoÅ? ma pomysÅ? co z tym zrobiÄ??
-# bo koliduje z dodaj
-# chyba, Å¼e zrobiÄ? tu na dÃ³Å?, a wyÅ¼ej daÄ? do gÃ³ry
-# i wtedy bÄ?dzie moÅ¼na podkreÅ?lenie pod literkÄ? n podczepiÄ?
 #. down button
 #: ../src/filter-run-dialog.c:369
 msgid "Do_wn"
-msgstr "_Na dÃ³Å?"
+msgstr "W_dÃ³Å?"
 
 #: ../src/filter-run-dialog.c:375
 msgid "A_pply Now!"
@@ -2854,92 +3700,97 @@ msgstr "ZatwierdÅº teraz!"
 msgid "The filters dialog is opened, close it before you can run filters on any mailbox"
 msgstr "Otwarte jest okno z filtrami. Przed uruchomieniu filtrÃ³w na skrzynce musisz je zamknÄ?Ä?."
 
-#: ../src/folder-conf.c:275
+#: ../src/folder-conf.c:116
+#, c-format
+msgid "Error displaying config help: %s\n"
+msgstr "BÅ?Ä?d wyÅ?wietlania ustawieÅ? pomocy: %s\n"
+
+#: ../src/folder-conf.c:305
 msgid "Remote IMAP folder"
 msgstr "Zdalny folder IMAP"
 
 #. must NOT be modal
-#: ../src/folder-conf.c:278
-#: ../src/folder-conf.c:736
-#: ../src/mailbox-conf.c:522
+#: ../src/folder-conf.c:308
+#: ../src/folder-conf.c:778
+#: ../src/mailbox-conf.c:550
 msgid "_Update"
 msgstr "_OdÅ?wieÅ¼"
 
-#: ../src/folder-conf.c:278
-#, fuzzy
+#: ../src/folder-conf.c:308
 msgid "C_reate"
 msgstr "_UtwÃ³rz"
 
-#: ../src/folder-conf.c:300
-#: ../src/mailbox-conf.c:1102
-#: ../src/mailbox-conf.c:1197
+#: ../src/folder-conf.c:331
+#: ../src/mailbox-conf.c:1158
+#: ../src/mailbox-conf.c:1268
 msgid "_Basic"
 msgstr "_Podstawowe"
 
-#: ../src/folder-conf.c:305
-msgid "_Max number of connections"
+#: ../src/folder-conf.c:336
+msgid "_Max number of connections:"
 msgstr "_Maksymalna liczba poÅ?Ä?czeÅ?"
 
-#: ../src/folder-conf.c:312
-#: ../src/mailbox-conf.c:1254
+#: ../src/folder-conf.c:343
+#: ../src/mailbox-conf.c:1331
 msgid "Enable _persistent cache"
-msgstr "S_taÅ?y bufor"
+msgstr "StaÅ?y bufor"
 
-#: ../src/folder-conf.c:320
-#: ../src/mailbox-conf.c:1258
+#: ../src/folder-conf.c:351
+msgid "Use IDLE command"
+msgstr "UÅ¼yj komendÄ? IDLE"
+
+#: ../src/folder-conf.c:358
+#: ../src/mailbox-conf.c:1335
 msgid "Enable _bug workarounds"
 msgstr "ObejÅ?cia _bÅ?Ä?dÃ³w"
 
-#: ../src/folder-conf.c:327
+#: ../src/folder-conf.c:365
 msgid "Use STATUS for mailbox checking"
 msgstr "UÅ¼yj STATUS dla sprawdzania skrzynki pocztowej"
 
-#: ../src/folder-conf.c:333
-#: ../src/mailbox-conf.c:1156
-#: ../src/mailbox-conf.c:1260
+#: ../src/folder-conf.c:371
+#: ../src/mailbox-conf.c:1212
+#: ../src/mailbox-conf.c:1337
 msgid "_Advanced"
 msgstr "Z_aawansowane"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:336
-msgid "Descriptive _Name:"
+#: ../src/folder-conf.c:374
+msgid "Descriptive _name:"
 msgstr "_Nazwa opisowa:"
 
-#. pop server
-#. imap server
-#: ../src/folder-conf.c:343
-#: ../src/mailbox-conf.c:1110
-#: ../src/mailbox-conf.c:1206
-msgid "_Server:"
-msgstr "_Serwer:"
-
 #. username
-#: ../src/folder-conf.c:351
-#: ../src/mailbox-conf.c:1118
+#: ../src/folder-conf.c:389
+#: ../src/mailbox-conf.c:1174
 msgid "Use_r name:"
 msgstr "Nazwa _uÅ¼ytkownika:"
 
-#: ../src/folder-conf.c:362
+#: ../src/folder-conf.c:395
 msgid "_Password:"
 msgstr "_HasÅ?o:"
 
-#: ../src/folder-conf.c:367
+#: ../src/folder-conf.c:400
+#: ../src/mailbox-conf.c:1293
+msgid "_Anonymous access"
+msgstr "_Anonimowy dostÄ?p"
+
+#: ../src/folder-conf.c:409
 msgid "Subscribed _folders only"
 msgstr "Tyl_ko zasubskrybowane foldery"
 
-#: ../src/folder-conf.c:369
+#: ../src/folder-conf.c:411
 msgid "Always show _INBOX"
 msgstr "Zawsze wyÅ?wietlana Poczta nadchodzÄ?ca (_INBOX)"
 
-#: ../src/folder-conf.c:372
-msgid "Pr_efix"
+#: ../src/folder-conf.c:414
+msgid "Pr_efix:"
 msgstr "Prz_edrostek"
 
-#: ../src/folder-conf.c:518
+#: ../src/folder-conf.c:560
 msgid "Select parent folder"
 msgstr "WybÃ³r folderu nadrzÄ?dnego"
 
-#: ../src/folder-conf.c:592
+#: ../src/folder-conf.c:634
 #, c-format
 msgid ""
 "Renaming INBOX is special!\n"
@@ -2954,29 +3805,29 @@ msgstr ""
 "INBOX wraz z podfolderami pozostanie.\n"
 "Co chcesz zrobiÄ??"
 
-#: ../src/folder-conf.c:598
+#: ../src/folder-conf.c:640
 msgid "Question"
 msgstr "Pytanie"
 
-#: ../src/folder-conf.c:603
+#: ../src/folder-conf.c:645
 msgid "Rename INBOX"
 msgstr "ZmieÅ? nazwÄ?"
 
-#: ../src/folder-conf.c:605
+#: ../src/folder-conf.c:647
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../src/folder-conf.c:626
+#: ../src/folder-conf.c:668
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Zmiana nazwy folderu nie powiodÅ?a siÄ?. Przyczyna: %s"
 
-#: ../src/folder-conf.c:678
+#: ../src/folder-conf.c:720
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Utworzenie katalogu nie powiodÅ?o siÄ?. PowÃ³d: %s"
 
-#: ../src/folder-conf.c:718
+#: ../src/folder-conf.c:760
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -2984,44 +3835,44 @@ msgstr ""
 "Folder IMAP nie bÄ?dÄ?cy skrzynkÄ? pocztowÄ?\n"
 "nie ma Å¼adnych modyfikowalnych wÅ?aÅ?ciwoÅ?ci."
 
-#: ../src/folder-conf.c:733
+#: ../src/folder-conf.c:775
 msgid "Remote IMAP subfolder"
 msgstr "Zdalny folder podrzÄ?dny IMAP"
 
-#: ../src/folder-conf.c:736
+#: ../src/folder-conf.c:778
 msgid "_Create"
 msgstr "_UtwÃ³rz"
 
-#: ../src/folder-conf.c:757
+#: ../src/folder-conf.c:799
 msgid "Rename or move subfolder"
 msgstr "Zmiana nazwy lub przeniesienie folderu podrzÄ?dnego"
 
-#: ../src/folder-conf.c:758
+#: ../src/folder-conf.c:800
 msgid "Create subfolder"
 msgstr "Nowy folder podrzÄ?dny"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:765
+#: ../src/folder-conf.c:808
 msgid "_Folder name:"
 msgstr "Nazwa f_olderu:"
 
-#: ../src/folder-conf.c:771
+#: ../src/folder-conf.c:814
 msgid "Host:"
 msgstr "Adres gospodarza:"
 
-#: ../src/folder-conf.c:777
+#: ../src/folder-conf.c:820
 msgid "_Browse..."
 msgstr "_PrzeglÄ?daj..."
 
-#: ../src/folder-conf.c:785
+#: ../src/folder-conf.c:828
 msgid "_Subfolder of:"
 msgstr "Folder _nadrzÄ?dny:"
 
-#: ../src/folder-conf.c:814
+#: ../src/folder-conf.c:857
 msgid "This folder is not stored in configuration. I do not yet know how to remove it from remote server."
 msgstr "Ten folder nie jest zapisany w konfiguracji. Jeszcze nie wiadomo, jak go usunÄ?Ä? ze zdalnego serwera."
 
-#: ../src/folder-conf.c:823
+#: ../src/folder-conf.c:866
 #, c-format
 msgid ""
 "This will remove the folder \"%s\" from the list.\n"
@@ -3030,38 +3881,38 @@ msgstr ""
 "Spowoduje to usuniÄ?cie z listy folderu \"%s\".\n"
 "MoÅ¼esz pÃ³Åºniej uÅ¼yÄ? \"Nowy folder IMAP\", aby ponownie go dodaÄ?.\n"
 
-#: ../src/folder-conf.c:828
+#: ../src/folder-conf.c:871
 msgid "Confirm"
 msgstr "Potwierdzenie"
 
-#: ../src/information-dialog.c:222
+#: ../src/information-dialog.c:224
 msgid "Information - Balsa"
 msgstr "Balsa - Informacja"
 
-#: ../src/information-dialog.c:330
+#: ../src/information-dialog.c:346
 #, c-format
 msgid "WARNING: "
 msgstr "UWAGA: "
 
-#: ../src/information-dialog.c:333
+#: ../src/information-dialog.c:349
 #, c-format
 msgid "ERROR: "
 msgstr "BÅ?Ä?D: "
 
-#: ../src/information-dialog.c:336
+#: ../src/information-dialog.c:352
 #, c-format
 msgid "FATAL: "
 msgstr "POWAÅ»NY BÅ?Ä?D: "
 
-#: ../src/mailbox-conf.c:208
+#: ../src/mailbox-conf.c:226
 msgid "Use _SSL"
 msgstr "UÅ¼ywanie _SSL"
 
-#: ../src/mailbox-conf.c:352
+#: ../src/mailbox-conf.c:354
 msgid "No mailbox selected."
 msgstr "Nie wybrano skrzynki."
 
-#: ../src/mailbox-conf.c:379
+#: ../src/mailbox-conf.c:384
 #, c-format
 msgid ""
 "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
@@ -3072,7 +3923,7 @@ msgstr ""
 "JeÅ?li rzeczywiÅ?cie chcesz jÄ? usunÄ?Ä?, przypisz jej funkcjÄ?\n"
 "innej skrzynce."
 
-#: ../src/mailbox-conf.c:389
+#: ../src/mailbox-conf.c:394
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.  You may also delete the disk file or files associated with this mailbox.\n"
@@ -3084,15 +3935,15 @@ msgstr ""
 "JeÅ?li pliki nie zostanÄ? usuniÄ?te, moÅ¼esz uÅ¼yÄ? \"Dodaj skrzynkÄ?\", aby ponownie uzyskaÄ? do niej dostÄ?p.\n"
 "Co chcesz uczyniÄ??"
 
-#: ../src/mailbox-conf.c:401
+#: ../src/mailbox-conf.c:406
 msgid "Remove from _list"
 msgstr "UsuÅ? z _listy"
 
-#: ../src/mailbox-conf.c:402
+#: ../src/mailbox-conf.c:407
 msgid "Remove from list and _disk"
 msgstr "UsuÅ? z listy i z _dysku"
 
-#: ../src/mailbox-conf.c:410
+#: ../src/mailbox-conf.c:415
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" and all its messages from your IMAP server.  If %s has subfolders, it will still appear as a node in the folder tree.\n"
@@ -3104,11 +3955,11 @@ msgstr ""
 "MoÅ¼esz pÃ³Åºniej uÅ¼yÄ? \"Nowy folder podrzÄ?dny IMAP\", aby dodaÄ? skrzynkÄ? o tej nazwie.\n"
 "Co chcesz uczyniÄ??"
 
-#: ../src/mailbox-conf.c:423
+#: ../src/mailbox-conf.c:428
 msgid "_Remove from server"
 msgstr "_UsuÅ? z serwera"
 
-#: ../src/mailbox-conf.c:430
+#: ../src/mailbox-conf.c:435
 #, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
@@ -3119,28 +3970,28 @@ msgstr ""
 "MoÅ¼esz pÃ³Åºniej uÅ¼yÄ? \"Dodaj skrzynkÄ?\", aby ponownie uzyskaÄ? do niej dostÄ?p.\n"
 "Co chcesz uczyniÄ??"
 
-#: ../src/mailbox-conf.c:439
+#: ../src/mailbox-conf.c:444
 msgid "_Remove from list"
 msgstr "_UsuÅ? z listy"
 
-#: ../src/mailbox-conf.c:477
+#: ../src/mailbox-conf.c:485
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 msgstr "UsuniÄ?cie katalogu nie powiodÅ?o siÄ?. PowÃ³d: %s"
 
-#: ../src/mailbox-conf.c:526
-#: ../src/pref-manager.c:1497
-#: ../src/pref-manager.c:1582
-#: ../src/pref-manager.c:2629
+#: ../src/mailbox-conf.c:554
+#: ../src/pref-manager.c:1651
+#: ../src/pref-manager.c:1739
+#: ../src/pref-manager.c:2833
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/mailbox-conf.c:729
+#: ../src/mailbox-conf.c:774
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: ../src/mailbox-conf.c:867
+#: ../src/mailbox-conf.c:916
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -3149,96 +4000,94 @@ msgstr ""
 "Zmiana nazwy %s na %s nie powiodÅ?a siÄ?:\n"
 "%s"
 
-#. mailbox name
-#: ../src/mailbox-conf.c:1046
-#: ../src/mailbox-conf.c:1105
-#: ../src/mailbox-conf.c:1200
-msgid "Mailbox _Name:"
+#: ../src/mailbox-conf.c:1095
+msgid "_Mailbox Name:"
 msgstr "_Nazwa skrzynki:"
 
-#: ../src/mailbox-conf.c:1057
+#: ../src/mailbox-conf.c:1106
 msgid "Local Mailbox Configurator"
 msgstr "Konfiguracja skrzynki lokalnej"
 
-#: ../src/mailbox-conf.c:1084
+#: ../src/mailbox-conf.c:1139
 msgid "Remote Mailbox Configurator"
 msgstr "Konfiguracja skrzynki odlegÅ?ej"
 
+#. mailbox name
+#: ../src/mailbox-conf.c:1161
+#: ../src/mailbox-conf.c:1271
+msgid "Mailbox _name:"
+msgstr "Nazwa skrzynki:"
+
 #. password field
-#: ../src/mailbox-conf.c:1124
-#: ../src/mailbox-conf.c:1228
+#: ../src/mailbox-conf.c:1180
+#: ../src/mailbox-conf.c:1305
 msgid "Pass_word:"
 msgstr "_HasÅ?o:"
 
-#: ../src/mailbox-conf.c:1132
+#: ../src/mailbox-conf.c:1188
 msgid "_Delete messages from server after download"
 msgstr "_Usuwanie listÃ³w z serwera po pobraniu"
 
-#: ../src/mailbox-conf.c:1137
+#: ../src/mailbox-conf.c:1193
+msgid "_Enable check for new mail"
+msgstr "_Sprawdzanie nowej poczty"
+
+#: ../src/mailbox-conf.c:1198
 msgid "_Filter messages through procmail"
 msgstr "_Filtrowanie listÃ³w za pomocÄ? procmaila"
 
-#: ../src/mailbox-conf.c:1141
+#: ../src/mailbox-conf.c:1202
 msgid "Fi_lter Command:"
 msgstr "Polecenie fi_ltru:"
 
-#: ../src/mailbox-conf.c:1149
-msgid "_Enable check for new mail"
-msgstr "_Sprawdzanie nowej poczty"
-
-#: ../src/mailbox-conf.c:1160
+#: ../src/mailbox-conf.c:1216
 msgid "Disable _APOP"
 msgstr "WyÅ?Ä?czenie _APOP"
 
 #. username
-#: ../src/mailbox-conf.c:1214
+#: ../src/mailbox-conf.c:1285
 msgid "_Username:"
 msgstr "Nazwa _uÅ¼ytkownika:"
 
-#: ../src/mailbox-conf.c:1222
-msgid "_Remember Password"
-msgstr "_ZapamiÄ?tanie hasÅ?a"
-
-#: ../src/mailbox-conf.c:1233
-msgid "F_older Path:"
+#: ../src/mailbox-conf.c:1310
+msgid "F_older path:"
 msgstr "Å?cieÅ¼ka f_olderu:"
 
-#: ../src/mailbox-conf.c:1317
-msgid "Identity:"
+#: ../src/mailbox-conf.c:1396
+msgid "_Identity:"
 msgstr "ToÅ¼samoÅ?Ä?:"
 
-#: ../src/mailbox-conf.c:1338
-msgid "Show address:"
-msgstr "WyÅ?wietlany adres:"
-
-# Jest problem kolizji oznaczeÅ? przy podkreÅ?leniu
-# bo dubluje sie d, a O jest zajÄ?te przez klawisz odÅ?wieÅ¼
-#: ../src/mailbox-conf.c:1341
-msgid "_From"
-msgstr "O_d"
-
-#: ../src/mailbox-conf.c:1347
-msgid "_To"
-msgstr "_Do"
-
-#: ../src/mailbox-conf.c:1362
-#: ../src/pref-manager.c:3092
+#: ../src/mailbox-conf.c:1424
+#: ../src/pref-manager.c:3298
 msgid "Always"
 msgstr "Zawsze"
 
-#: ../src/mailbox-conf.c:1365
+#: ../src/mailbox-conf.c:1428
 msgid ""
-"Decrypt and check\n"
+"_Decrypt and check\n"
 "signatures automatically:"
 msgstr ""
 "Automatyczne odszyfrowanie\n"
 "sprawdzenie i podpisÃ³w"
 
-#: ../src/mailbox-node.c:265
+#: ../src/mailbox-conf.c:1449
+msgid "Show _Recipient column instead of Sender"
+msgstr "PokaÅ¼ kolumnÄ? _Odbiorcy zamiast Nadawcy"
+
+#: ../src/mailbox-conf.c:1456
+msgid "_Subscribe for new mail check"
+msgstr "_Subskrybuj nowe sprawdzenie poczty"
+
+#: ../src/mailbox-node.c:314
 msgid "The folder edition to be written."
 msgstr "Modyfikacja folderu nie zostaÅ?a jeszcze zaimplementowana."
 
-#: ../src/mailbox-node.c:431
+#: ../src/mailbox-node.c:489
+#, c-format
+msgid "Scanning %s. Please wait..."
+msgstr "Analizowanie skrzynki %s. Zaczekaj chwilÄ?..."
+
+#: ../src/mailbox-node.c:505
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -3247,827 +4096,862 @@ msgstr ""
 "Analizowanie %s nie powiodÅ?o siÄ?: %s\n"
 "SprawdÅº poÅ?Ä?czenie sieciowe."
 
-#: ../src/mailbox-node.c:433
+#: ../src/mailbox-node.c:507
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Analizowanie %s nie powiodÅ?o siÄ?: %s"
 
-#: ../src/mailbox-node.c:482
-#, c-format
-msgid "Scanning %s. Please wait..."
-msgstr "Analizowanie skrzynki %s. Zaczekaj chwilÄ?..."
-
-#: ../src/mailbox-node.c:939
+#: ../src/mailbox-node.c:1036
 msgid "Local _mbox mailbox..."
 msgstr "Lokalna skrzynka _Mbox..."
 
-#: ../src/mailbox-node.c:941
+#: ../src/mailbox-node.c:1038
 msgid "Local Mail_dir mailbox..."
 msgstr "Lokalna skrzynka Mail_dir..."
 
-#: ../src/mailbox-node.c:943
+#: ../src/mailbox-node.c:1040
 msgid "Local M_H mailbox..."
 msgstr "Lokalna skrzynka M_H..."
 
-#: ../src/mailbox-node.c:945
+#: ../src/mailbox-node.c:1042
 msgid "Remote _IMAP mailbox..."
 msgstr "Zdalna skrzynka _IMAP..."
 
-#: ../src/mailbox-node.c:948
+#: ../src/mailbox-node.c:1045
 msgid "Remote IMAP _folder..."
 msgstr "Zdalny f_older IMAP..."
 
-#: ../src/mailbox-node.c:950
+#: ../src/mailbox-node.c:1047
 msgid "Remote IMAP _subfolder..."
 msgstr "Zdalny fo_lder podrzÄ?dny IMAP..."
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:961
-#: ../src/mailbox-node.c:977
+#: ../src/mailbox-node.c:1058
+#: ../src/mailbox-node.c:1074
 msgid "_Rescan"
 msgstr "O_dÅ?wieÅ¼"
 
-#: ../src/mailbox-node.c:971
+#: ../src/mailbox-node.c:1068
 msgid "_Properties..."
 msgstr "_WÅ?aÅ?ciwoÅ?ci..."
 
-#: ../src/mailbox-node.c:987
+#: ../src/mailbox-node.c:1084
 msgid "_Open"
 msgstr "_OtwÃ³rz"
 
-#: ../src/mailbox-node.c:1001
+#: ../src/mailbox-node.c:1098
 msgid "_Subscribe"
 msgstr "_Zasubskrybuj"
 
-#: ../src/mailbox-node.c:1003
+#: ../src/mailbox-node.c:1100
 msgid "_Unsubscribe"
 msgstr "_Odsubskrybuj"
 
-#: ../src/mailbox-node.c:1009
+#: ../src/mailbox-node.c:1106
 msgid "Mark as _Inbox"
 msgstr "Oznacz jako Poczta _nadchodzÄ?ca"
 
-#: ../src/mailbox-node.c:1011
+#: ../src/mailbox-node.c:1108
 msgid "_Mark as Sentbox"
 msgstr "Oznacz jako Poczta _wychodzÄ?ca"
 
-#: ../src/mailbox-node.c:1013
+#: ../src/mailbox-node.c:1110
 msgid "Mark as _Trash"
 msgstr "Oznacz jako Å?_mietnik"
 
-#: ../src/mailbox-node.c:1015
+#: ../src/mailbox-node.c:1112
 msgid "Mark as D_raftbox"
 msgstr "Oznacz jako Poczta _robocza"
 
-#: ../src/mailbox-node.c:1018
+#: ../src/mailbox-node.c:1115
 msgid "_Empty trash"
 msgstr "_OprÃ³Å¼nij Å?mietnik"
 
-#: ../src/mailbox-node.c:1023
+#: ../src/mailbox-node.c:1120
 msgid "_Edit/Apply filters"
 msgstr "Z_modyfikuj lub uruchom filtry"
 
-#: ../src/mailbox-node.c:1103
+#: ../src/mailbox-node.c:1208
 #, c-format
 msgid "The path \"%s\" does not lead to a mailbox."
 msgstr "Å?cieÅ¼ka \"%s\" nie wskazuje na skrzynkÄ?."
 
-#: ../src/mailbox-node.c:1116
+#: ../src/mailbox-node.c:1221
 #, c-format
 msgid "Local mailbox %s loaded as: %s\n"
 msgstr "Wczytano lokalnÄ? skrzynkÄ? pocztowÄ? %s jako: %s\n"
 
-#: ../src/mailbox-node.c:1143
+#: ../src/mailbox-node.c:1252
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Loklany folder %s\n"
 
-#: ../src/main-window.c:280
+#: ../src/main-window.c:306
 msgid "Balsa closes files and connections. Please wait..."
 msgstr "Program zamyka pliki i poÅ?Ä?czenia. Czekaj..."
 
-#: ../src/main-window.c:319
-#: ../src/main-window.c:365
-msgid "_Deleted"
-msgstr "_UsuniÄ?ty"
+#: ../src/main-window.c:325
+msgid "Mail_box"
+msgstr "_Skrzynka"
 
-#: ../src/main-window.c:322
-msgid "Un_Deleted"
-msgstr "O_dzyskany"
+#: ../src/main-window.c:326
+#: ../src/message-window.c:237
+msgid "_Message"
+msgstr "_List"
 
-#: ../src/main-window.c:325
-msgid "_Read"
-msgstr "P_rzeczytany"
+#: ../src/main-window.c:327
+msgid "_Settings"
+msgstr "_Ustawienia"
 
-#: ../src/main-window.c:328
-msgid "Un_read"
-msgstr "_Nieprzeczytany"
+#: ../src/main-window.c:332
+msgid "Mail_boxes"
+msgstr "Skrzynki"
+
+#: ../src/main-window.c:333
+#: ../src/main-window.c:337
+#: ../src/sendmsg-window.c:329
+#: ../src/sendmsg-window.c:330
+#: ../src/sendmsg-window.c:331
+msgid "_More"
+msgstr "_WiÄ?cej"
 
 #: ../src/main-window.c:334
-msgid "Un_flagged"
-msgstr "Nieozn_akowany"
+msgid "_Headers"
+msgstr "_NagÅ?Ã³wki"
 
-#: ../src/main-window.c:337
-#: ../src/main-window.c:377
-msgid "_Answered"
-msgstr "Z _odpowiedziÄ?"
+#: ../src/main-window.c:335
+msgid "_Sort Mailbox"
+msgstr "_Sortuj skrzynkÄ?"
+
+#: ../src/main-window.c:336
+msgid "H_ide messages"
+msgstr "_Ukryj wiadomoÅ?ci"
+
+#: ../src/main-window.c:338
+#: ../src/sendmsg-window.c:328
+msgid "_Tools"
+msgstr "_NarzÄ?dzia"
+
+#: ../src/main-window.c:339
+msgid "_Filters"
+msgstr "_Filtry"
 
 #: ../src/main-window.c:340
-msgid "Un_answered"
-msgstr "Bez odpowiedz_i"
+msgid "F_ilters"
+msgstr "Filtry"
 
-#: ../src/main-window.c:346
-msgid "_No Headers"
-msgstr "_Bez nagÅ?Ã³wkÃ³w"
+#: ../src/main-window.c:341
+#: ../src/main-window.c:399
+msgid "Manage filters"
+msgstr "ZarzÄ?dzaj filtrami"
 
+#. File menu items
+#. Not in the touchpad menu, but still available as a toolbar
+#. * button:
 #: ../src/main-window.c:346
-msgid "Display no headers"
-msgstr "PrzeÅ?Ä?cza na wyÅ?wietlanie bez Å¼adnych nagÅ?Ã³wkÃ³w"
+msgid "_Continue"
+msgstr "K_ontynuuj"
 
-#: ../src/main-window.c:348
-msgid "S_elected Headers"
-msgstr "Wyb_rane nagÅ?Ã³wki"
+#: ../src/main-window.c:347
+msgid "Continue editing current message"
+msgstr "Kontynuuj edycjÄ? bieÅ¼Ä?cego listu"
 
 #: ../src/main-window.c:349
-msgid "Display selected headers"
-msgstr "PrzeÅ?Ä?cza na wyÅ?wietlanie z wybranymi nagÅ?Ã³wkami"
+msgid "_Get New Mail"
+msgstr "_Pobierz nowe listy"
 
-#: ../src/main-window.c:351
-#: ../src/message-window.c:90
-msgid "All _Headers"
-msgstr "W_szystkie nagÅ?Ã³wki"
+#: ../src/main-window.c:350
+msgid "Fetch new incoming mail"
+msgstr "Pobiera nowe listy"
 
 #: ../src/main-window.c:351
-msgid "Display all headers"
-msgstr "PrzeÅ?Ä?cza na wyÅ?wietlanie z wszystkimi nagÅ?Ã³wkami"
+msgid "_Send Queued Mail"
+msgstr "WyÅ?lij li_sty z kolejki"
+
+#: ../src/main-window.c:352
+msgid "Send messages from the outbox"
+msgstr "WysyÅ?a listy z folderu \"Poczta wychodzÄ?ca\""
+
+#: ../src/main-window.c:355
+msgid "Send and _Receive Mail"
+msgstr "WyÅ?lij i po_bierz listy"
+
+#: ../src/main-window.c:356
+msgid "Send and Receive messages"
+msgstr "WysyÅ?a i pobiera listy"
+
+#: ../src/main-window.c:359
+#: ../src/message-window.c:239
+#: ../src/sendmsg-window.c:345
+msgid "Page _Setup"
+msgstr "U_stawienia strony"
 
 #: ../src/main-window.c:360
-msgid "Toggle flagged"
-msgstr "PrzeÅ?Ä?cza oznakowanie bieÅ¼Ä?cego listu"
+#: ../src/message-window.c:240
+#: ../src/sendmsg-window.c:346
+msgid "Set up page for printing"
+msgstr "Ustawienia strony do wydruku"
 
-#: ../src/main-window.c:366
-msgid "Toggle deleted flag"
-msgstr "PrzeÅ?Ä?cza oznaczenie listu jako usuniÄ?ty"
+#: ../src/main-window.c:362
+msgid "_Address Book..."
+msgstr "KsiÄ?Å¼ka _adresowa..."
 
-#: ../src/main-window.c:371
-msgid "Toggle New"
-msgstr "PrzeÅ?Ä?cza oznaczenie listu jako nowy"
+#: ../src/main-window.c:363
+msgid "Open the address book"
+msgstr "Otwiera ksiÄ?Å¼kÄ? adresowÄ?"
 
-#: ../src/main-window.c:377
-msgid "Toggle Answered"
-msgstr "PrzeÅ?Ä?cza oznaczenie listu jako z odpowiedziÄ?"
+#: ../src/main-window.c:364
+msgid "Quit Balsa"
+msgstr "OpuÅ?Ä? BalsÄ?"
 
-#: ../src/main-window.c:392
+#. File:New submenu items
+#: ../src/main-window.c:367
 msgid "_Message..."
 msgstr "_List..."
 
-#: ../src/main-window.c:392
-#: ../src/main-window.c:1041
+#: ../src/main-window.c:368
 msgid "Compose a new message"
 msgstr "Tworzy nowy list"
 
-#. We could use GNOMEUIINFO_INCLUDE but it appends the menu instead
-#. of including at specified position
-#: ../src/main-window.c:399
+#: ../src/main-window.c:370
 msgid "Local mbox mailbox..."
 msgstr "Lokalna skrzynka Mbox..."
 
-#: ../src/main-window.c:400
-#: ../src/main-window.c:813
+#: ../src/main-window.c:371
+#: ../src/main-window.c:380
 msgid "Add a new mbox style mailbox"
 msgstr "Dodaje nowÄ? skrzynkÄ? Mbox"
 
-#: ../src/main-window.c:403
+#: ../src/main-window.c:373
 msgid "Local Maildir mailbox..."
 msgstr "Lokalna skrzynka Maildir..."
 
-#: ../src/main-window.c:404
-#: ../src/main-window.c:818
+#: ../src/main-window.c:374
+#: ../src/main-window.c:383
 msgid "Add a new Maildir style mailbox"
 msgstr "Dodaje nowÄ? skrzynkÄ? Maildir"
 
-#: ../src/main-window.c:407
+#: ../src/main-window.c:376
 msgid "Local MH mailbox..."
 msgstr "Lokalna skrzynka MH..."
 
-#: ../src/main-window.c:408
-#: ../src/main-window.c:822
+#: ../src/main-window.c:377
+#: ../src/main-window.c:386
 msgid "Add a new MH style mailbox"
 msgstr "Dodaje nowÄ? skrzynkÄ? MH"
 
-#: ../src/main-window.c:411
-#: ../src/main-window.c:825
-#: ../src/pref-manager.c:2954
+#: ../src/main-window.c:379
+msgid "New mailbox..."
+msgstr "Nowa skrzynka..."
+
+#: ../src/main-window.c:382
+msgid "New \"Maildir\" mailbox..."
+msgstr "Nowa skrzynka \"Maildir\"..."
+
+#: ../src/main-window.c:385
+msgid "New \"MH\" mailbox..."
+msgstr "Nowa skrzynka \"MH\"..."
+
+#: ../src/main-window.c:388
+#: ../src/pref-manager.c:3157
 msgid "Remote IMAP mailbox..."
 msgstr "Zdalna skrzynka IMAP..."
 
-#: ../src/main-window.c:412
-#: ../src/main-window.c:826
+#: ../src/main-window.c:389
 msgid "Add a new IMAP mailbox"
 msgstr "Dodaje nowÄ? skrzynkÄ? IMAP"
 
-#: ../src/main-window.c:416
-#: ../src/main-window.c:830
-#: ../src/pref-manager.c:2959
+#: ../src/main-window.c:390
+#: ../src/pref-manager.c:3162
 msgid "Remote IMAP folder..."
 msgstr "Zdalny folder IMAP..."
 
-#: ../src/main-window.c:417
-#: ../src/main-window.c:831
+#: ../src/main-window.c:391
 msgid "Add a new IMAP folder"
 msgstr "Dodaje nowy folder IMAP"
 
-#: ../src/main-window.c:420
-#: ../src/main-window.c:834
+#: ../src/main-window.c:392
 msgid "Remote IMAP subfolder..."
 msgstr "Zdalny folder podrzÄ?dny IMAP..."
 
-#: ../src/main-window.c:421
-#: ../src/main-window.c:835
+#: ../src/main-window.c:393
 msgid "Add a new IMAP subfolder"
 msgstr "Dodaje nowy folder podrzÄ?dny IMAP"
 
-#: ../src/main-window.c:434
-msgid "_Continue"
-msgstr "K_ontynuuj"
-
-#: ../src/main-window.c:435
-msgid "Continue editing current message"
-msgstr "Kontynuuje edycjÄ? bieÅ¼Ä?cego listu"
-
-#. Ctrl-M
-#: ../src/main-window.c:442
-#: ../src/main-window.c:877
-msgid "_Get New Mail"
-msgstr "_Pobierz nowe listy"
-
-#: ../src/main-window.c:442
-#: ../src/main-window.c:877
-msgid "Fetch new incoming mail"
-msgstr "Pobiera nowe listy"
-
-#. Ctrl-S
-#: ../src/main-window.c:448
-#: ../src/main-window.c:872
-msgid "_Send Queued Mail"
-msgstr "_WyÅ?lij listy z kolejki"
-
-#: ../src/main-window.c:449
-#: ../src/main-window.c:873
-msgid "Send messages from the outbox"
-msgstr "WysyÅ?a listy z folderu \"Poczta wychodzÄ?ca\""
-
-#. Ctrl-B
-#: ../src/main-window.c:455
-#: ../src/main-window.c:867
-msgid "Send and _Receive Mail"
-msgstr "WyÅ?lij i p_obierz listy"
-
-#: ../src/main-window.c:456
-#: ../src/main-window.c:868
-#: ../src/toolbar-factory.c:113
-msgid "Send and Receive messages"
-msgstr "WysyÅ?a i pobiera listy"
-
-#: ../src/main-window.c:461
-#: ../src/main-window.c:882
-#: ../src/sendmsg-window.c:331
-#: ../src/sendmsg-window.c:492
-msgid "_Print..."
-msgstr "Wy_drukuj..."
-
-#: ../src/main-window.c:462
-#: ../src/main-window.c:883
-#: ../src/toolbar-factory.c:109
-msgid "Print current message"
-msgstr "Drukuje bieÅ¼Ä?cy list"
-
-#: ../src/main-window.c:468
-#: ../src/main-window.c:1100
-msgid "_Address Book..."
-msgstr "KsiÄ?Å¼ka _adresowa..."
-
-#: ../src/main-window.c:469
-#: ../src/main-window.c:1101
-msgid "Open the address book"
-msgstr "Otwiera ksiÄ?Å¼kÄ? adresowÄ?"
-
-#: ../src/main-window.c:493
+#: ../src/main-window.c:398
 msgid "F_ilters..."
 msgstr "F_iltry..."
 
-#: ../src/main-window.c:493
-#: ../src/main-window.c:1087
-msgid "Manage filters"
-msgstr "ZarzÄ?dzanie filtrami"
-
-#: ../src/main-window.c:495
-#: ../src/main-window.c:1093
+#: ../src/main-window.c:400
 msgid "_Export Filters"
 msgstr "Wy_eksportuj filtry"
 
-#: ../src/main-window.c:495
-#: ../src/main-window.c:1094
+#: ../src/main-window.c:401
 msgid "Export filters as Sieve scripts"
 msgstr "Eksportuje filtry w postaci skryptÃ³w Sieve"
 
-#: ../src/main-window.c:503
-msgid "_Flat index"
-msgstr "_PÅ?aska lista"
-
-#: ../src/main-window.c:504
-msgid "No threading at all"
-msgstr "Bez grupowania wÄ?tkÃ³w"
-
-#: ../src/main-window.c:509
-msgid "Si_mple threading"
-msgstr "P_roste grupowanie wÄ?tkÃ³w"
-
-#: ../src/main-window.c:510
-msgid "Simple threading algorithm"
-msgstr "Stosuje prosty algorytm grupowania wÄ?tkÃ³w"
-
-#: ../src/main-window.c:515
-msgid "_JWZ threading"
-msgstr "WÄ?tki _JWZ"
+#: ../src/main-window.c:402
+msgid "Prefere_nces"
+msgstr "Preferencje"
 
-#: ../src/main-window.c:516
-msgid "Elaborate JWZ threading"
-msgstr "WÄ?tki JWZ"
-
-#: ../src/main-window.c:526
-msgid "_Show Mailbox Tree"
-msgstr "_Drzewo skrzynek"
-
-#: ../src/main-window.c:527
-msgid "Toggle display of mailbox and folder tree"
-msgstr "PrzeÅ?Ä?cza wyÅ?wietlanie drzewa skrzynek i folderÃ³w"
-
-#: ../src/main-window.c:531
-msgid "Show Mailbox _Tabs"
-msgstr "_ZakÅ?adki skrzynek"
-
-#: ../src/main-window.c:532
-msgid "Toggle display of mailbox notebook tabs"
-msgstr "PrzeÅ?Ä?cza wyÅ?wietlanie zakÅ?adek skrzynek"
-
-#: ../src/main-window.c:536
-#: ../src/main-window.c:952
-#: ../src/message-window.c:121
-msgid "_Wrap"
-msgstr "Z_awijanie"
-
-#: ../src/main-window.c:536
-#: ../src/main-window.c:952
-#: ../src/sendmsg-window.c:360
-#: ../src/sendmsg-window.c:517
-msgid "Wrap message lines"
-msgstr "Zawijanie wierszy listu"
-
-#: ../src/main-window.c:545
-#: ../src/main-window.c:958
+#. View menu items
+#: ../src/main-window.c:405
 msgid "E_xpand All"
 msgstr "_RozwiÅ? wszystkie"
 
-#: ../src/main-window.c:546
-#: ../src/main-window.c:959
+#: ../src/main-window.c:406
 msgid "Expand all threads"
 msgstr "Rozwija wszystkie wÄ?tki"
 
-#: ../src/main-window.c:550
-#: ../src/main-window.c:963
+#: ../src/main-window.c:407
 msgid "_Collapse All"
 msgstr "_ZwiÅ? wszystkie"
 
-#: ../src/main-window.c:551
-#: ../src/main-window.c:964
+#: ../src/main-window.c:408
 msgid "Collapse all expanded threads"
 msgstr "Zwija wszystkie rozwiniÄ?te wÄ?tki"
 
-#: ../src/main-window.c:557
-#: ../src/main-window.c:994
-#: ../src/message-window.c:127
+#: ../src/main-window.c:410
+#: ../src/message-window.c:255
 msgid "Zoom _In"
 msgstr "Pow_iÄ?kszenie"
 
-#: ../src/main-window.c:557
-#: ../src/main-window.c:994
-#: ../src/message-window.c:127
+#: ../src/main-window.c:411
+#: ../src/message-window.c:256
 msgid "Increase magnification"
 msgstr "PowiÄ?kszenie"
 
-#: ../src/main-window.c:561
-#: ../src/main-window.c:998
-#: ../src/message-window.c:131
+#: ../src/main-window.c:412
+#: ../src/message-window.c:257
 msgid "Zoom _Out"
 msgstr "P_omniejszenie"
 
-#: ../src/main-window.c:561
-#: ../src/main-window.c:998
-#: ../src/message-window.c:131
+#: ../src/main-window.c:413
+#: ../src/message-window.c:258
 msgid "Decrease magnification"
 msgstr "Pomniejszenie"
 
 #. To warn msgfmt that the % sign isn't a format specifier:
-#. To warn msgfmt that the % sign isn't a
-#. * format specifier:
-#: ../src/main-window.c:567
-#: ../src/main-window.c:1004
-#: ../src/message-window.c:138
+#: ../src/main-window.c:416
+#: ../src/message-window.c:261
 #, no-c-format
 msgid "Zoom _100%"
 msgstr "Rozmiar orygina_lny"
 
-#: ../src/main-window.c:567
-#: ../src/main-window.c:1004
-#: ../src/message-window.c:138
+#: ../src/main-window.c:417
+#: ../src/message-window.c:262
 msgid "No magnification"
 msgstr "Bez powiÄ?kszenia"
 
-#: ../src/main-window.c:585
-#: ../src/main-window.c:1048
-#: ../src/toolbar-factory.c:85
+#. Mailbox menu item that does not require a mailbox
+#: ../src/main-window.c:420
+#: ../src/main-window.c:421
+#: ../src/message-window.c:296
+#: ../src/message-window.c:297
+msgid "Next Unread Message"
+msgstr "NastÄ?pny nieprzeczytany list"
+
+#: ../src/main-window.c:423
+msgid "Empty _Trash"
+msgstr "_OprÃ³Å¼nij Å?mietnik"
+
+#: ../src/main-window.c:424
+msgid "Delete messages from the Trash mailbox"
+msgstr "Usuwa listy ze skrzynki Å?mietnika"
+
+#. Settings menu items
+#: ../src/main-window.c:427
+msgid "_Toolbars..."
+msgstr "_Paski narzÄ?dziowe..."
+
+#: ../src/main-window.c:428
+msgid "Customize toolbars"
+msgstr "Dopasowuje wyglÄ?d paskÃ³w narzÄ?dziowych"
+
+#: ../src/main-window.c:429
+msgid "_Identities..."
+msgstr "_ToÅ¼samoÅ?ci..."
+
+#: ../src/main-window.c:430
+msgid "Create and set current identities"
+msgstr "Pozwala na utworzenie nowych toÅ¼samoÅ?ci i modyfikacjÄ? istniejÄ?cych"
+
+#. Help menu items
+#: ../src/main-window.c:433
+msgid "_Contents"
+msgstr "ZawartoÅ?Ä?"
+
+#: ../src/main-window.c:434
+msgid "Table of Contents"
+msgstr "Spis treÅ?ci"
+
+#. license ?
+#: ../src/main-window.c:435
+#: ../src/main-window.c:2617
+msgid "About Balsa"
+msgstr "O Balsie"
+
+#. Edit menu items
+#: ../src/main-window.c:442
+#: ../src/message-window.c:249
+#: ../src/sendmsg-window.c:363
+msgid "Select _All"
+msgstr "Z_aznacz wszystko"
+
+#: ../src/main-window.c:444
+msgid "_Find"
+msgstr "_Szukaj"
+
+#: ../src/main-window.c:446
+msgid "Find Ne_xt"
+msgstr "ZnajdÅº nastÄ?pny"
+
+#. Mailbox menu items
+#: ../src/main-window.c:449
+#: ../src/main-window.c:450
+#: ../src/message-window.c:294
+#: ../src/message-window.c:295
+msgid "Next Message"
+msgstr "NastÄ?pny list"
+
+#: ../src/main-window.c:451
+#: ../src/main-window.c:452
+#: ../src/message-window.c:299
+#: ../src/message-window.c:300
+msgid "Previous Message"
+msgstr "Poprzedni list"
+
+#: ../src/main-window.c:453
+#: ../src/main-window.c:454
+#: ../src/message-window.c:301
+#: ../src/message-window.c:302
+msgid "Next Flagged Message"
+msgstr "NastÄ?pny oznakowany list"
+
+#: ../src/main-window.c:456
+msgid "_Hide Messages"
+msgstr "_Ukryj wiadomoÅ?ci"
+
+#: ../src/main-window.c:457
+msgid "_Reset Filter"
+msgstr "_WyczyÅ?Ä? filtr"
+
+#: ../src/main-window.c:458
+msgid "Reset mailbox filter"
+msgstr "WyczyÅ?Ä? filtr skrzynki"
+
+#: ../src/main-window.c:459
+msgid "_Select All"
+msgstr "_Zaznacz wszystko"
+
+#: ../src/main-window.c:460
+msgid "Select all messages in current mailbox"
+msgstr "Zaznacza wszystkie listy w bieÅ¼Ä?cej skrzynce"
+
+#: ../src/main-window.c:462
+msgid "_Edit..."
+msgstr "Z_modyfikuj..."
+
+#: ../src/main-window.c:463
+msgid "Edit the selected mailbox"
+msgstr "Modyfikuje skrzynkÄ?"
+
+#: ../src/main-window.c:464
+msgid "_Delete..."
+msgstr "_UsuÅ?..."
+
+#: ../src/main-window.c:465
+msgid "Delete the selected mailbox"
+msgstr "Usuwa skrzynkÄ?"
+
+#: ../src/main-window.c:468
+#: ../src/main-window.c:471
+msgid "E_xpunge Deleted Messages"
+msgstr "WyczyÅ?Ä? usuniÄ?_te listy"
+
+#: ../src/main-window.c:469
+#: ../src/main-window.c:472
+msgid "Expunge messages marked as deleted in the current mailbox"
+msgstr "CzyÅ?ci listy zaznaczone jako usuniÄ?te w otwartej skrzynce"
+
+#: ../src/main-window.c:475
+msgid "Close mailbox"
+msgstr "Zamyka skrzynkÄ?"
+
+#: ../src/main-window.c:477
+msgid "Select _Filters"
+msgstr "Wybierz f_iltry"
+
+#: ../src/main-window.c:478
+msgid "Select filters to be applied automatically to current mailbox"
+msgstr "WybÃ³r filtrÃ³w jakie majÄ? byÄ? zastosowane w bieÅ¼Ä?cej skrzynce"
+
+#: ../src/main-window.c:481
+msgid "_Remove Duplicates"
+msgstr "U_suniÄ?cie duplikatÃ³w"
+
+#: ../src/main-window.c:482
+msgid "Remove duplicated messages from the current mailbox"
+msgstr "Usuwa duplikaty listÃ³w z zaznaczonej skrzynki"
+
+#: ../src/main-window.c:492
+#: ../src/message-window.c:265
 msgid "Reply to the current message"
 msgstr "Odpowiada na bieÅ¼Ä?cy list"
 
-#. A
-#: ../src/main-window.c:592
-#: ../src/main-window.c:1054
-#: ../src/message-window.c:153
+#: ../src/main-window.c:493
+#: ../src/message-window.c:266
 msgid "Reply to _All..."
 msgstr "Do _wszystkich..."
 
-#: ../src/main-window.c:593
-#: ../src/main-window.c:1055
+#: ../src/main-window.c:494
+#: ../src/message-window.c:267
 msgid "Reply to all recipients of the current message"
 msgstr "Odpowiada wszystkim adresatom i autorowi listu"
 
-#: ../src/main-window.c:600
-#: ../src/message-window.c:159
+#: ../src/main-window.c:496
+#: ../src/message-window.c:269
 msgid "Reply to _Group..."
 msgstr "Do g_rupy..."
 
-#: ../src/main-window.c:601
-#: ../src/message-window.c:160
-#: ../src/toolbar-factory.c:89
+#: ../src/main-window.c:497
+#: ../src/message-window.c:270
 msgid "Reply to mailing list"
 msgstr "Odpowiada na listÄ? dyskusyjnÄ?"
 
-#: ../src/main-window.c:608
-#: ../src/message-window.c:165
+#: ../src/main-window.c:499
+msgid "Store address of sender in addressbook"
+msgstr "Przechowuj adres nadawcy w ksiÄ?Å¼ce adresowej"
+
+#: ../src/main-window.c:501
+#: ../src/message-window.c:274
+msgid "_View Source..."
+msgstr "_WyÅ?wietl ÅºrÃ³dÅ?o..."
+
+#: ../src/main-window.c:502
+#: ../src/message-window.c:275
+msgid "View source form of the message"
+msgstr "WyÅ?wietla list w postaci ÅºrÃ³dÅ?owej"
+
+#. All three "Forward" actions and the "Pipe" action have the same
+#. * stock_id; the first in this list defines the action tied to the
+#. * toolbar's Forward button, so "ForwardDefault" must come before
+#. * the others.
+#: ../src/main-window.c:508
+msgid "_Forward..."
+msgstr "_Dalej..."
+
+#: ../src/main-window.c:509
+#: ../src/message-window.c:281
+msgid "Forward the current message"
+msgstr "PrzesyÅ?a bieÅ¼Ä?cy list dalej"
+
+#: ../src/main-window.c:512
+#: ../src/message-window.c:283
 msgid "_Forward attached..."
 msgstr "_PrzeÅ?lij w zaÅ?Ä?czniku..."
 
-#: ../src/main-window.c:609
+#: ../src/main-window.c:513
+#: ../src/message-window.c:284
 msgid "Forward the current message as attachment"
 msgstr "PrzesyÅ?a list list dalej jako zaÅ?Ä?cznik"
 
-#: ../src/main-window.c:615
+#: ../src/main-window.c:515
+#: ../src/message-window.c:286
 msgid "Forward _inline..."
 msgstr "PrzeÅ?lij w _treÅ?ci listu..."
 
-#: ../src/main-window.c:616
+#: ../src/main-window.c:516
+#: ../src/message-window.c:287
 msgid "Forward the current message inline"
 msgstr "PrzesyÅ?a list dalej w treÅ?ci nowego listu"
 
-#: ../src/main-window.c:624
+#: ../src/main-window.c:519
 msgid "Pipe the message through another program"
 msgstr "Filtrowanie listÃ³w za pomocÄ? innego programu"
 
-#: ../src/main-window.c:631
+#. File menu item
+#: ../src/main-window.c:527
+#: ../src/message-window.c:242
+#: ../src/sendmsg-window.c:349
+msgid "_Print..."
+msgstr "Wy_drukuj..."
+
+#: ../src/main-window.c:528
+#: ../src/message-window.c:243
+msgid "Print current message"
+msgstr "Drukuje bieÅ¼Ä?cy list"
+
+#: ../src/main-window.c:529
+#: ../src/message-window.c:271
+msgid "Save Current Part..."
+msgstr "Zapisz bieÅ¼Ä?cÄ? czÄ?Å?Ä?..."
+
+#: ../src/main-window.c:530
+#: ../src/message-window.c:272
+msgid "Save currently displayed part of message"
+msgstr "Zapisuje obecnie wyÅ?wietlanÄ? czÄ?Å?Ä? listu"
+
+#: ../src/main-window.c:533
+#: ../src/message-window.c:289
 msgid "_Next Part"
 msgstr "_NastÄ?pna czÄ?Å?Ä?"
 
-#: ../src/main-window.c:631
-#: ../src/message-window.c:177
+#: ../src/main-window.c:534
+#: ../src/message-window.c:290
 msgid "Next part in message"
 msgstr "NastÄ?pna czÄ?Å?Ä? listu"
 
-#: ../src/main-window.c:637
+#: ../src/main-window.c:535
+#: ../src/message-window.c:291
 msgid "_Previous Part"
 msgstr "_Poprzednia czÄ?Å?Ä?"
 
-#: ../src/main-window.c:638
-#: ../src/message-window.c:183
+#: ../src/main-window.c:536
+#: ../src/message-window.c:292
 msgid "Previous part in message"
 msgstr "Poprzednia czÄ?Å?Ä? listu"
 
-#: ../src/main-window.c:644
-#: ../src/main-window.c:1068
-#: ../src/message-window.c:187
-msgid "Save Current Part..."
-msgstr "Zapisz bieÅ¼Ä?cÄ? czÄ?Å?Ä?..."
+#: ../src/main-window.c:539
+msgid "Copy message"
+msgstr "Kopiuj list"
 
-#: ../src/main-window.c:645
-#: ../src/main-window.c:1069
-msgid "Save currently displayed part of message"
-msgstr "Zapisuje obecnie wyÅ?wietlanÄ? czÄ?Å?Ä? listu"
+#: ../src/main-window.c:542
+#: ../src/message-window.c:251
+msgid "_Find in message"
+msgstr "_ZnajdÅº w liÅ?cie"
 
-#: ../src/main-window.c:651
-#: ../src/main-window.c:1021
-#: ../src/message-window.c:192
-msgid "_View Source..."
-msgstr "_WyÅ?wietl ÅºrÃ³dÅ?o..."
+#: ../src/main-window.c:543
+#: ../src/message-window.c:252
+msgid "Find a string in this message"
+msgstr "ZnajdÅº wÄ?tek w tej wiadomoÅ?ci"
 
-#: ../src/main-window.c:652
-#: ../src/main-window.c:1022
-#: ../src/message-window.c:193
-msgid "View source form of the message"
-msgstr "WyÅ?wietla list w postaci ÅºrÃ³dÅ?owej"
-
-#: ../src/main-window.c:670
-#: ../src/message-window.c:228
+#: ../src/main-window.c:553
+#: ../src/message-window.c:304
 msgid "_Move to Trash"
 msgstr "_WyrzuÄ? do Å?mietnika"
 
-#: ../src/main-window.c:671
-#: ../src/main-window.c:1076
+#: ../src/main-window.c:554
+#: ../src/main-window.c:558
 msgid "Move the current message to Trash mailbox"
 msgstr "Przenosi bieÅ¼Ä?cy list do skrzynki Å?mietnika"
 
-#. !
-#: ../src/main-window.c:677
-#: ../src/main-window.c:1027
-msgid "_Toggle flag"
+#: ../src/main-window.c:557
+msgid "_Delete to Trash"
+msgstr "WyrzuÄ? _do Å?mietnika"
+
+#: ../src/main-window.c:561
+#: ../src/main-window.c:570
+msgid "Toggle New"
+msgstr "PrzeÅ?Ä?cza oznaczenie listu jako nowy"
+
+#: ../src/main-window.c:563
+msgid "_Toggle Flag"
 msgstr "_PrzeÅ?Ä?cz flagÄ?"
 
-#: ../src/main-window.c:683
-#: ../src/main-window.c:1032
-msgid "Store address of sender in addressbook"
-msgstr "Zapisuje adres nadawcy w ksiÄ?Å¼ce adresowej"
+#: ../src/main-window.c:566
+msgid "Toggle flagged"
+msgstr "PrzeÅ?Ä?cza oznakowanie bieÅ¼Ä?cego listu"
 
-#: ../src/main-window.c:694
-#: ../src/main-window.c:985
-msgid "Next Message"
-msgstr "NastÄ?pny list"
+#. Hide messages menu items
+#: ../src/main-window.c:567
+#: ../src/main-window.c:596
+msgid "_Deleted"
+msgstr "_UsuniÄ?ty"
 
-#: ../src/main-window.c:700
-#: ../src/main-window.c:989
-#: ../src/message-window.c:207
-msgid "Previous Message"
-msgstr "Poprzedni list"
+#: ../src/main-window.c:568
+msgid "Toggle deleted flag"
+msgstr "PrzeÅ?Ä?cza oznaczenie listu jako usuniÄ?ty"
 
-#: ../src/main-window.c:706
-#: ../src/main-window.c:707
-#: ../src/main-window.c:979
-#: ../src/main-window.c:980
-#: ../src/message-window.c:213
-#: ../src/message-window.c:214
-msgid "Next Unread Message"
-msgstr "NastÄ?pny nieprzeczytany list"
+#: ../src/main-window.c:571
+#: ../src/main-window.c:608
+msgid "_Answered"
+msgstr "Z _odpowiedziÄ?"
 
-#: ../src/main-window.c:713
-#: ../src/main-window.c:714
-#: ../src/main-window.c:944
-#: ../src/main-window.c:945
-#: ../src/message-window.c:220
-#: ../src/message-window.c:221
-msgid "Next Flagged Message"
-msgstr "NastÄ?pny oznakowany list"
+#: ../src/main-window.c:572
+msgid "Toggle Answered"
+msgstr "PrzeÅ?Ä?cza oznaczenie listu jako z odpowiedziÄ?"
 
-#: ../src/main-window.c:721
-msgid "_Hide messages"
-msgstr "_Ukryj wiadomoÅ?ci"
+#: ../src/main-window.c:579
+msgid "_Show Mailbox Tree"
+msgstr "_Drzewo skrzynek"
 
-#: ../src/main-window.c:723
-msgid "_Reset Filter"
-msgstr "_WyczyÅ?Ä? filtr"
+#: ../src/main-window.c:580
+msgid "Toggle display of mailbox and folder tree"
+msgstr "PrzeÅ?Ä?cza wyÅ?wietlanie drzewa skrzynek i folderÃ³w"
 
-#: ../src/main-window.c:723
-msgid "Reset mailbox filter"
-msgstr "WyczyÅ?Ä? filtr skrzynki"
+#: ../src/main-window.c:582
+msgid "Show Mailbox _Tabs"
+msgstr "_ZakÅ?adki skrzynek"
 
-#: ../src/main-window.c:728
-msgid "_Select All"
-msgstr "_Zaznacz wszystko"
+#: ../src/main-window.c:583
+msgid "Toggle display of mailbox notebook tabs"
+msgstr "PrzeÅ?Ä?cza wyÅ?wietlanie zakÅ?adek skrzynek"
 
-#: ../src/main-window.c:729
-msgid "Select all messages in current mailbox"
-msgstr "Zaznacza wszystkie listy w bieÅ¼Ä?cej skrzynce"
+#: ../src/main-window.c:586
+msgid "_Descending"
+msgstr "_MalejÄ?co"
 
-#: ../src/main-window.c:735
-#: ../src/main-window.c:845
-msgid "_Edit..."
-msgstr "Z_modyfikuj..."
+#: ../src/main-window.c:587
+msgid "Sort in a descending order"
+msgstr "Sortowanie w kolejnoÅ?ci malejÄ?cej"
 
-#: ../src/main-window.c:735
-#: ../src/main-window.c:845
-msgid "Edit the selected mailbox"
-msgstr "Modyfikuje skrzynkÄ?"
+#: ../src/main-window.c:589
+msgid "_View filter"
+msgstr "Podg_lÄ?d filtru"
 
-#: ../src/main-window.c:739
-#: ../src/main-window.c:840
-msgid "_Delete..."
-msgstr "_UsuÅ?..."
+#: ../src/main-window.c:590
+msgid "Enable quick message index filter"
+msgstr "Filtr szybkiego indeksownaia listÃ³w"
 
-#: ../src/main-window.c:740
-#: ../src/main-window.c:841
-msgid "Delete the selected mailbox"
-msgstr "Usuwa skrzynkÄ?"
+#: ../src/main-window.c:593
+#: ../src/message-window.c:311
+msgid "_Wrap"
+msgstr "Z_awijanie"
 
-#: ../src/main-window.c:746
-msgid "E_xpunge Deleted Messages"
-msgstr "WyczyÅ?Ä? usuniÄ?_te listy"
+#: ../src/main-window.c:593
+#: ../src/message-window.c:311
+#: ../src/sendmsg-window.c:366
+msgid "Wrap message lines"
+msgstr "Zawijanie wierszy listu"
 
-#: ../src/main-window.c:747
-#: ../src/main-window.c:852
-msgid "Expunge messages marked as deleted in the currently opened mailbox"
-msgstr "CzyÅ?ci listy zaznaczone jako usuniÄ?te w otwartej skrzynce"
+#: ../src/main-window.c:598
+msgid "Un_Deleted"
+msgstr "O_dzyskany"
 
-#: ../src/main-window.c:752
-#: ../src/main-window.c:858
-msgid "Close mailbox"
-msgstr "Zamyka skrzynkÄ?"
+#: ../src/main-window.c:600
+msgid "_Read"
+msgstr "P_rzeczytany"
 
-#: ../src/main-window.c:756
-#: ../src/main-window.c:1105
-msgid "Empty _Trash"
-msgstr "_OprÃ³Å¼nij Å?mietnik"
+#: ../src/main-window.c:602
+msgid "Un_read"
+msgstr "_Nieprzeczytany"
 
-#: ../src/main-window.c:757
-#: ../src/main-window.c:1106
-#: ../src/toolbar-factory.c:131
-msgid "Delete messages from the Trash mailbox"
-msgstr "Usuwa listy ze skrzynki Å?mietnika"
+#: ../src/main-window.c:606
+msgid "Un_flagged"
+msgstr "Nieozn_akowany"
 
-#: ../src/main-window.c:761
-msgid "Select _Filters"
-msgstr "Wybierz f_iltry"
+#: ../src/main-window.c:610
+msgid "Un_answered"
+msgstr "Z _odpowiedziÄ?"
 
-#: ../src/main-window.c:762
-#: ../src/main-window.c:1091
-msgid "Select filters to be applied automatically to current mailbox"
-msgstr "WybÃ³r filtrÃ³w jakie majÄ? byÄ? zastosowane w bieÅ¼Ä?cej skrzynce"
+#. Toolbar items not on any menu
+#: ../src/main-window.c:613
+#: ../src/toolbar-factory.c:157
+msgid ""
+"All\n"
+"headers"
+msgstr ""
+"Wszystkie\n"
+"nagÅ?Ã³wki"
 
-#: ../src/main-window.c:767
-msgid "_Remove Duplicates"
-msgstr "U_suniÄ?cie duplikatÃ³w"
+#: ../src/main-window.c:614
+#: ../src/message-window.c:314
+msgid "Show all headers"
+msgstr "WyÅ?wietla wszystkie nagÅ?Ã³wki"
 
-#: ../src/main-window.c:768
-msgid "Remove duplicated messages from the selected mailbox"
-msgstr "Usuwa duplikaty listÃ³w z zaznaczonej skrzynki"
+#: ../src/main-window.c:616
+#: ../src/toolbar-factory.c:159
+msgid "Msg Preview"
+msgstr "PodglÄ?d listu"
 
-#: ../src/main-window.c:783
-msgid "_Toolbars..."
-msgstr "_Paski narzÄ?dziowe..."
+#: ../src/main-window.c:617
+msgid "Show preview pane"
+msgstr "PodglÄ?d listu wewnÄ?trz okna"
 
-#: ../src/main-window.c:784
-msgid "Customize toolbars"
-msgstr "Dopasowuje wyglÄ?d paskÃ³w narzÄ?dziowych"
+#: ../src/main-window.c:623
+msgid "_No Headers"
+msgstr "_Bez nagÅ?Ã³wkÃ³w"
 
-#: ../src/main-window.c:787
-#: ../src/main-window.c:1109
-msgid "_Identities..."
-msgstr "_ToÅ¼samoÅ?ci..."
+#: ../src/main-window.c:624
+#: ../src/message-window.c:321
+msgid "Display no headers"
+msgstr "PrzeÅ?Ä?cza na wyÅ?wietlanie bez Å¼adnych nagÅ?Ã³wkÃ³w"
 
-#: ../src/main-window.c:788
-#: ../src/main-window.c:1110
-msgid "Create and set current identities"
-msgstr "Pozwala na utworzenie nowych toÅ¼samoÅ?ci i modyfikacjÄ? istniejÄ?cych"
+#: ../src/main-window.c:625
+msgid "S_elected Headers"
+msgstr "Wyb_rane nagÅ?Ã³wki"
 
-#: ../src/main-window.c:799
-msgid "Mail_box"
-msgstr "_Skrzynka"
+#: ../src/main-window.c:626
+#: ../src/message-window.c:323
+msgid "Display selected headers"
+msgstr "PrzeÅ?Ä?cza na wyÅ?wietlanie z wybranymi nagÅ?Ã³wkami"
 
-#: ../src/main-window.c:800
-#: ../src/main-window.c:1123
-#: ../src/message-window.c:245
-msgid "_Message"
-msgstr "_List"
+#: ../src/main-window.c:627
+#: ../src/message-window.c:324
+msgid "All _Headers"
+msgstr "W_szystkie nagÅ?Ã³wki"
 
-#: ../src/main-window.c:812
-msgid "New mailbox..."
-msgstr "Nowa skrzynka..."
+#: ../src/main-window.c:628
+#: ../src/message-window.c:325
+msgid "Display all headers"
+msgstr "PrzeÅ?Ä?cza na wyÅ?wietlanie z wszystkimi nagÅ?Ã³wkami"
 
-#: ../src/main-window.c:817
-msgid "New \"Maildir\" mailbox..."
-msgstr "Nowa skrzynka \"Maildir\"..."
+#: ../src/main-window.c:632
+msgid "_Flat index"
+msgstr "_PÅ?aska lista"
 
-#: ../src/main-window.c:821
-msgid "New \"MH\" mailbox..."
-msgstr "Nowa skrzynka \"MH\"..."
+#: ../src/main-window.c:633
+msgid "No threading at all"
+msgstr "Bez grupowania wÄ?tkÃ³w"
 
-#: ../src/main-window.c:851
-msgid "_Compress Mailbox"
-msgstr "_Kompresuj skrzynkÄ?"
+#: ../src/main-window.c:634
+msgid "Si_mple threading"
+msgstr "P_roste grupowanie wÄ?tkÃ³w"
 
-#: ../src/main-window.c:881
-msgid "Mail_boxes"
-msgstr "Sk_rzynki"
+#: ../src/main-window.c:635
+msgid "Simple threading algorithm"
+msgstr "Stosuje prosty algorytm grupowania wÄ?tkÃ³w"
+
+#: ../src/main-window.c:636
+msgid "_JWZ threading"
+msgstr "WÄ?tki _JWZ"
 
-#: ../src/main-window.c:906
+#: ../src/main-window.c:637
+msgid "Elaborate JWZ threading"
+msgstr "ZÅ?oÅ¼one wÄ?tki JWZ"
+
+#: ../src/main-window.c:642
 msgid "By _Arrival"
 msgstr "WedÅ?ug n_adejÅ?cia"
 
-#: ../src/main-window.c:906
+#: ../src/main-window.c:643
 msgid "Arrival order"
 msgstr "KolejnoÅ?Ä? wedÅ?ug nadejÅ?cia"
 
-#: ../src/main-window.c:910
+#: ../src/main-window.c:644
 msgid "By _Sender"
 msgstr "WedÅ?ug nada_wcy"
 
-#: ../src/main-window.c:910
+#: ../src/main-window.c:645
 msgid "Sender order"
 msgstr "KolejnoÅ?Ä? wedÅ?ug nadawcy"
 
-#: ../src/main-window.c:914
+#: ../src/main-window.c:646
 msgid "By S_ubject"
 msgstr "WedÅ?ug T_ematu"
 
-#: ../src/main-window.c:914
+#: ../src/main-window.c:647
 msgid "Subject order"
 msgstr "KolejnoÅ?Ä? wedÅ?ug tematu"
 
-#: ../src/main-window.c:918
+#: ../src/main-window.c:648
 msgid "By Si_ze"
 msgstr "WedÅ?ug _rozmiaru"
 
-#: ../src/main-window.c:918
+#: ../src/main-window.c:649
 msgid "By message size"
 msgstr "KolejnoÅ?Ä? wedÅ?ug rozmiaru listu"
 
-#: ../src/main-window.c:922
+#: ../src/main-window.c:650
 msgid "_Threaded"
 msgstr "WÄ?_tkowanie"
 
-#: ../src/main-window.c:922
+#: ../src/main-window.c:651
 msgid "Use message threading"
 msgstr "Grupowanie wÄ?tkÃ³w listÃ³w"
 
-#: ../src/main-window.c:930
-msgid "_Descending"
-msgstr "_MalejÄ?co"
-
-#: ../src/main-window.c:930
-msgid "Sort in a descending order"
-msgstr "Sortowanie w kolejnoÅ?ci malejÄ?cej"
-
-#: ../src/main-window.c:951
-msgid "_Headers"
-msgstr "_NagÅ?Ã³wki"
-
-#: ../src/main-window.c:954
-msgid "_Sort Mailbox"
-msgstr "_Sortuj skrzynkÄ?"
-
-#: ../src/main-window.c:955
-msgid "H_ide messages"
-msgstr "_Ukryj wiadomoÅ?ci"
-
-#: ../src/main-window.c:969
-msgid "_View filter"
-msgstr "Podg_lÄ?d filtru"
-
-#: ../src/main-window.c:970
-msgid "Enable quick message index filter"
-msgstr "Filtr szybkiego indeksownaia listÃ³w"
-
-#: ../src/main-window.c:1008
-#: ../src/main-window.c:1082
-#: ../src/sendmsg-window.c:494
-#: ../src/sendmsg-window.c:552
-#: ../src/sendmsg-window.c:612
-msgid "_More"
-msgstr "WiÄ?_cej"
-
-#: ../src/main-window.c:1041
-msgid "_New..."
-msgstr "_Nowy..."
-
-#. F
-#: ../src/main-window.c:1061
-msgid "_Forward..."
-msgstr "_Dalej..."
-
-#: ../src/main-window.c:1062
-#: ../src/toolbar-factory.c:91
-msgid "Forward the current message"
-msgstr "PrzesyÅ?a bieÅ¼Ä?cy list dalej"
-
-#. D
-#: ../src/main-window.c:1075
-msgid "_Delete to Trash"
-msgstr "WyrzuÄ? _do Å?mietnika"
-
-#: ../src/main-window.c:1087
-msgid "_Manage..."
-msgstr "_ZarzÄ?dzaj..."
-
-#: ../src/main-window.c:1090
-msgid "_Select Filters"
-msgstr "Wybi_erz filtry"
-
-#: ../src/main-window.c:1108
-msgid "_Filters"
-msgstr "_Filtry"
-
-#: ../src/main-window.c:1124
-#: ../src/sendmsg-window.c:628
-msgid "_Tools"
-msgstr "_NarzÄ?dzia"
-
-#: ../src/main-window.c:1228
+#: ../src/main-window.c:988
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -4075,12 +4959,36 @@ msgstr ""
 "Balsa wysyÅ?a obecnie pocztÄ?.\n"
 "Czy przerwaÄ? wysyÅ?anie?"
 
-#: ../src/main-window.c:1398
-#: ../src/main-window.c:4941
-msgid "Subject or Sender _Contains:"
-msgstr "Temat lub nadawca _zawierajÄ?:"
+#: ../src/main-window.c:1158
+msgid "Subject or Sender Contains:"
+msgstr "Temat lub nadawca zawierajÄ?:"
+
+#: ../src/main-window.c:1159
+msgid "Subject or Recipient Contains:"
+msgstr "Temat albo odbioraca zawierajÄ?:"
+
+#: ../src/main-window.c:1160
+msgid "Subject Contains:"
+msgstr "Temat zawiera:"
 
-#: ../src/main-window.c:2227
+#: ../src/main-window.c:1161
+msgid "Body Contains:"
+msgstr "CzÄ?Å?Ä? gÅ?Ã³wna zawiera:"
+
+#: ../src/main-window.c:1162
+msgid "Older than (days):"
+msgstr "Starsze niÅ¼ (dni):"
+
+#: ../src/main-window.c:1163
+msgid "Old at most (days):"
+msgstr "Nie starsze niÅ¼ (dni):"
+
+#: ../src/main-window.c:2216
+#, c-format
+msgid "Opening %s"
+msgstr "Otwieranie %s"
+
+#: ../src/main-window.c:2235
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -4089,12 +4997,15 @@ msgstr ""
 "Nie moÅ¼na otworzyÄ? skrzynki!\n"
 "%s."
 
-#: ../src/main-window.c:2538
+#: ../src/main-window.c:2599
 msgid "translator-credits"
 msgstr "GNOME PL Team <translators gnome pl>Poprawki Dariusz Jakoniuk <pipaceliny gmail com>"
 
-#: ../src/main-window.c:2551
-#: ../src/main-window.c:2578
+#: ../src/main-window.c:2612
+msgid "The Balsa email client is part of the GNOME desktop environment."
+msgstr "Program pocztowy Balsa jest czÄ?Å?ciÄ? Å?rodowiska GNOME."
+
+#: ../src/main-window.c:2638
 msgid ""
 "The Balsa email client is part of the GNOME desktop environment.  Information on Balsa can be found at http://balsa.gnome.org/\n";
 "\n"
@@ -4106,1051 +5017,940 @@ msgstr ""
 "Aby zgÅ?osiÄ? bÅ?Ä?d w programie, odwiedÅº witrynÄ?\n"
 "http://bugzilla.gnome.org/";
 
-#: ../src/main-window.c:2682
-#: ../src/main-window.c:2695
+#: ../src/main-window.c:2742
+#: ../src/main-window.c:2755
 msgid "Checking Mail..."
 msgstr "Sprawdzanie poczty..."
 
-#: ../src/main-window.c:2870
+#: ../src/main-window.c:2950
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "Lokalna skrzynka IMAP: %s"
 
-#: ../src/main-window.c:2873
+#: ../src/main-window.c:2954
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Lokalna skrzynka: %s"
 
-#: ../src/main-window.c:3010
+#: ../src/main-window.c:3101
 msgid "Finished Checking."
 msgstr "ZakoÅ?czono sprawdzanie."
 
-#: ../src/main-window.c:3072
+#: ../src/main-window.c:3166
 #, c-format
 msgid "Sending error: %s"
 msgstr "BÅ?Ä?d przy wysyÅ?aniu: %s"
 
-#: ../src/main-window.c:3157
-msgid "Balsa: New mail"
-msgstr "Balsa: Nowa poczta"
-
-#: ../src/main-window.c:3169
+#: ../src/main-window.c:3231
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Odebrano %d nowy list."
 msgstr[1] "Odebrano %d nowe listy."
-msgstr[2] "Odebrano %d nowych listÃ³w."
 
-#: ../src/main-window.c:3172
+#: ../src/main-window.c:3234
 msgid "You have new mail."
 msgstr "Masz nowÄ? pocztÄ?."
 
-#: ../src/main-window.c:3790
+#: ../src/main-window.c:3293
+#, c-format
+msgid "Balsa: you have received %d new message."
+msgid_plural "Balsa: you have received %d new messages."
+msgstr[0] "Balsa: odebraÅ?eÅ? %d nowÄ? wiadomoÅ?Ä?"
+msgstr[1] "Balsa: odebraÅ?eÅ? %d nowe wiadomoÅ?ci"
+
+#: ../src/main-window.c:3297
+msgid "Balsa: you have new mail."
+msgstr "Balsa: masz nowÄ? pocztÄ?."
+
+#: ../src/main-window.c:3344
+msgid "Balsa: New mail"
+msgstr "Balsa: Nowa poczta"
+
+#: ../src/main-window.c:3517
+#, c-format
+msgid "The next unread message is in %s"
+msgstr "NastÄ?pna nie przeczytana wiadomoÅ?Ä? jest w %s"
+
+#: ../src/main-window.c:3521
+#, c-format
+msgid "Do you want to switch to %s?"
+msgstr "Czy chcesz przeÅ?Ä?czyÄ? siÄ? do %s?"
+
+#: ../src/main-window.c:4024
 msgid "Search mailbox"
 msgstr "Przeszukiwanie skrzynki"
 
-#: ../src/main-window.c:3807
+#: ../src/main-window.c:4041
 msgid "_Search for:"
 msgstr "Wyszukiwany _napis:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3820
+#: ../src/main-window.c:4054
 msgid "In:"
 msgstr "Zakres:"
 
-#: ../src/main-window.c:3831
+#: ../src/main-window.c:4065
 msgid "S_ubject"
 msgstr "T_emat:"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3836
+#: ../src/main-window.c:4070
 msgid "Show only matching messages"
 msgstr "WyÅ?wietlenie tylko pasujÄ?cych listÃ³w"
 
 #. Frame with OK button
-#: ../src/main-window.c:3857
+#: ../src/main-window.c:4091
 msgid "Open next matching message"
 msgstr "Otwarcie nastÄ?pnego pasujÄ?cego listu"
 
-#: ../src/main-window.c:3868
+#: ../src/main-window.c:4102
 msgid "_Reverse search"
 msgstr "Przeszukiwanie od _tyÅ?u"
 
-#: ../src/main-window.c:3873
+#: ../src/main-window.c:4107
 msgid "_Wrap around"
 msgstr "_Zawijanie treÅ?ci"
 
-#: ../src/main-window.c:4034
+#: ../src/main-window.c:4286
 msgid "You can apply filters only on mailbox\n"
 msgstr "MoÅ¼na stosowaÄ? filtry tylko na skrzynkach\n"
 
-#: ../src/main-window.c:4048
+#: ../src/main-window.c:4301
 #, c-format
 msgid "Removing duplicates failed: %s"
 msgstr "UsuniÄ?cie duplikatÃ³w plikÃ³w: %s"
 
-#: ../src/main-window.c:4249
+#: ../src/main-window.c:4307
+#, c-format
+msgid "Removed %d duplicates"
+msgstr "UsuniÄ?to %d duplikaty"
+
+#: ../src/main-window.c:4310
+msgid "No duplicates found"
+msgstr "Nie znaleziono duplikatÃ³w"
+
+#: ../src/main-window.c:4527
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Nie moÅ¼na otworzyÄ? Å?mietnika: %s"
 
-#: ../src/main-window.c:4378
+#: ../src/main-window.c:4681
 #, c-format
 msgid "Balsa: %s (readonly)"
 msgstr "Balsa: %s (tylko do odczytu)"
 
-#: ../src/main-window.c:4380
+#: ../src/main-window.c:4683
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
 
-#: ../src/main-window.c:4940
-msgid "Subject or Receiver _Contains:"
-msgstr "Temat lub Nadawca _zawierajÄ?:"
-
-#: ../src/main.c:214
+#: ../src/main.c:234
+#: ../src/main.c:283
 msgid "Get new mail on startup"
 msgstr "Pobranie nowej poczty przy uruchamianiu"
 
-#: ../src/main.c:216
+#: ../src/main.c:236
+#: ../src/main.c:285
 msgid "Compose a new email to EMAIL ADDRESS"
 msgstr "Tworzy nowy list do EMAIL ADRES"
 
-#: ../src/main.c:218
+#: ../src/main.c:238
 msgid "Attach file at PATH"
 msgstr "ZaÅ?Ä?cz plik pod Å?cieÅ¼kÄ? PATH"
 
-#: ../src/main.c:220
+#: ../src/main.c:240
+#: ../src/main.c:290
 msgid "Opens MAILBOXNAME"
 msgstr "Otwiera MAILBOXNAME"
 
-#: ../src/main.c:220
+#: ../src/main.c:240
+#: ../src/main.c:290
 msgid "MAILBOXNAME"
 msgstr "MAILBOXNAME"
 
-#: ../src/main.c:223
+#: ../src/main.c:243
+#: ../src/main.c:293
 msgid "Opens first unread mailbox"
 msgstr "Otwiera pierwszÄ? nie sprawdzonÄ? skrzynkÄ?"
 
-#: ../src/main.c:226
+#: ../src/main.c:246
+#: ../src/main.c:296
 msgid "Opens default Inbox on startup"
 msgstr "Otwiera przy uruchamianiu domyÅ?lnÄ? skrzynkÄ? z pocztÄ? nadchodzÄ?cÄ?"
 
-#: ../src/main.c:229
+#: ../src/main.c:249
+#: ../src/main.c:299
 msgid "Prints number unread and unsent messages"
 msgstr "Drukuje liczbÄ? nieprzeczytanych i niewysÅ?anych listÃ³w"
 
-#: ../src/main.c:231
+#: ../src/main.c:251
+#: ../src/main.c:301
 msgid "Debug POP3 connection"
 msgstr "Å?ledzenie poÅ?Ä?czenia POP3"
 
-#: ../src/main.c:233
+#: ../src/main.c:253
+#: ../src/main.c:303
 msgid "Debug IMAP connection"
 msgstr "Å?ledzenie poÅ?Ä?czenia IMAP"
 
-#: ../src/main.c:255
+#: ../src/main.c:275
 msgid "The Balsa E-Mail Client"
 msgstr "Klient poczty Balsa "
 
-#: ../src/main.c:272
-#: ../src/main.c:277
-#: ../src/main.c:283
-#: ../src/main.c:289
-#: ../src/main.c:295
+#: ../src/main.c:287
+msgid "Attach file at URI"
+msgstr "ZaÅ?Ä?cz plik w URI"
+
+#: ../src/main.c:357
+#: ../src/main.c:362
+#: ../src/main.c:368
+#: ../src/main.c:374
+#: ../src/main.c:380
 #, c-format
 msgid "Balsa cannot open your \"%s\" mailbox."
 msgstr "Nie moÅ¼na otworzyÄ? skrzynki \"%s\"."
 
-#: ../src/main.c:272
+#: ../src/main.c:357
 msgid "Inbox"
-msgstr "Poczta nadchodzÄ?ca"
+msgstr "Poczta nadchodzÄ?ca "
 
-#: ../src/main.c:278
+#: ../src/main.c:363
 msgid "Outbox"
 msgstr "Poczta wychodzÄ?ca"
 
-#: ../src/main.c:284
+#: ../src/main.c:369
 msgid "Sentbox"
-msgstr "Poczta wysÅ?ana"
+msgstr "Poczta wysÅ?ana "
 
-#: ../src/main.c:290
+#: ../src/main.c:375
 msgid "Draftbox"
 msgstr "Poczta robocza"
 
-#: ../src/main.c:295
+#: ../src/main.c:380
 msgid "Trash"
 msgstr "Å?mietnik"
 
-#: ../src/main.c:513
+#: ../src/main.c:597
 msgid "Compressing mail folders..."
 msgstr "Kompresowanie folderÃ³w listÃ³w..."
 
-#: ../src/message-window.c:86
+#: ../src/message-window.c:236
+msgid "M_ove"
+msgstr "P_przenieÅ?"
+
+#: ../src/message-window.c:245
+msgid "Close the message window"
+msgstr "Zamknij okno wiadomoÅ?ci"
+
+#: ../src/message-window.c:305
+msgid "Move the message to Trash mailbox"
+msgstr "PrzenieÅ? wiadomoÅ?Ä? do Kosza"
+
+#: ../src/message-window.c:320
 msgid "N_o Headers"
 msgstr "_Bez nagÅ?Ã³wkÃ³w"
 
-#: ../src/message-window.c:88
+#: ../src/message-window.c:322
 msgid "_Selected Headers"
 msgstr "Wyb_rane nagÅ?Ã³wki"
 
-#: ../src/message-window.c:148
-msgid "Reply to this message"
-msgstr "Odpowiada na list"
-
-#: ../src/message-window.c:154
-msgid "Reply to all recipients of this message"
-msgstr "Odpowiada wszystkim adresatom i autorowi listu"
-
-#: ../src/message-window.c:166
-msgid "Forward this message as attachment"
-msgstr "PrzesyÅ?a list dalej w zaÅ?Ä?czniku"
-
-#: ../src/message-window.c:170
-msgid "Forward inline..."
-msgstr "PrzeÅ?lij w treÅ?ci listu..."
-
-#: ../src/message-window.c:171
-msgid "Forward this message inline"
-msgstr "PrzesyÅ?a list dalej w treÅ?ci nowego listu"
-
-#: ../src/message-window.c:177
-msgid "Next Part"
-msgstr "NastÄ?pna czÄ?Å?Ä?"
-
-#: ../src/message-window.c:182
-msgid "Previous Part"
-msgstr "Poprzednia czÄ?Å?Ä?"
-
-#: ../src/message-window.c:188
-msgid "Save current part in message"
-msgstr "Zapisuje bieÅ¼Ä?cÄ? czÄ?Å?Ä? listu"
-
-#: ../src/message-window.c:200
-msgid "_Next Message"
-msgstr "_NastÄ?pny list"
-
-#: ../src/message-window.c:200
-msgid "Next message"
-msgstr "NastÄ?pna wiadomoÅ?Ä?"
-
-#: ../src/message-window.c:206
-msgid "_Previous Message"
-msgstr "_Poprzedni list"
-
-#: ../src/message-window.c:229
-msgid "Move the message to Trash mailbox"
-msgstr "Przenosi bieÅ¼Ä?cy list do skrzynki Å?mietnika"
-
-#: ../src/message-window.c:244
-msgid "M_ove"
-msgstr "P_rzenieÅ?"
-
-#: ../src/message-window.c:366
+#: ../src/message-window.c:1022
 #, c-format
 msgid "Message from %s: %s"
 msgstr "List od %s: %s"
 
-#: ../src/balsa-mime-widget-callbacks.c:50
-#, c-format
-msgid "Could not create temporary file %s: "
-msgstr "Nie moÅ¼na utworzyÄ? pliku tymczasowego %s:"
-
-#: ../src/balsa-mime-widget-callbacks.c:114
-#, c-format
-msgid "could not create temporary file %s: %s"
-msgstr "Nie moÅ¼na utworzyÄ? pliku tymczasowego %s: %s"
-
-#: ../src/balsa-mime-widget-callbacks.c:140
-#, c-format
-msgid "Save %s MIME Part"
-msgstr "Zapis %s zaÅ?Ä?cznika MIME"
-
-#: ../src/balsa-mime-widget-callbacks.c:187
-msgid "File already exists. Overwrite?"
-msgstr "Plik juÅ¼ istnieje. NadpisaÄ??"
-
-#: ../src/balsa-mime-widget-crypto.c:70
-#, fuzzy, c-format
-msgid ""
-"This is an inline %s signed %s message part:\n"
-"%s"
-msgstr ""
-"To jest czÄ?Å?Ä? listu podpisana %s w treÅ?ci za pomocÄ? OpenPGP:\n"
-"%s"
-
-#: ../src/balsa-mime-widget-crypto.c:72
-#: ../src/print.c:1302
-msgid "OpenPGP"
-msgstr "OtwÃ³rz klucz PGP"
-
-#: ../src/balsa-mime-widget-crypto.c:89
-msgid "_Run gpg to import this key"
-msgstr "_Uruchom gpg aby zaimportowaÄ? ten klucz"
-
-#: ../src/balsa-mime-widget-image.c:51
-#: ../src/balsa-mime-widget-image.c:156
-#, c-format
-msgid "Error loading attached image: %s\n"
-msgstr "BÅ?Ä?d przy wczytywaniu zaÅ?Ä?czonego obrazu: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:164
-#: ../src/balsa-mime-widget-message.c:177
-#: ../src/balsa-mime-widget-message.c:205
-#: ../src/balsa-mime-widget-message.c:258
-msgid "Content Type: external-body\n"
-msgstr "Typ zawartoÅ?ci: external-body\n"
-
-#: ../src/balsa-mime-widget-message.c:165
-msgid "Access type: local-file\n"
-msgstr "Typ dostÄ?pu: local-file\n"
-
-#: ../src/balsa-mime-widget-message.c:166
-#: ../src/balsa-mime-widget-message.c:213
-#: ../src/balsa-mime-widget.c:235
-#, c-format
-msgid "File name: %s"
-msgstr "Nazwa pliku: %s"
-
-#: ../src/balsa-mime-widget-message.c:178
-msgid "Access type: URL\n"
-msgstr "Typ dostÄ?pu: URL\n"
-
-#: ../src/balsa-mime-widget-message.c:179
-#, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: ../src/balsa-mime-widget-message.c:206
-#, c-format
-msgid "Access type: %s\n"
-msgstr "Typ dostÄ?pu: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:210
-#, c-format
-msgid "FTP site: %s\n"
-msgstr "OÅ?rodek FTP: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:212
-#, c-format
-msgid "Directory: %s\n"
-msgstr "Katalog: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:259
-msgid "Access type: mail-server\n"
-msgstr "Typ dostÄ?pu: mail-server\n"
-
-#: ../src/balsa-mime-widget-message.c:260
-#, c-format
-msgid "Mail server: %s\n"
-msgstr "Serwery pocztowy: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:262
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Temat: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:279
-msgid "Se_nd message to obtain this part"
-msgstr "A_by uzyskaÄ? tÄ? czÄ?Å?Ä?, wyÅ?lij list"
-
-#: ../src/balsa-mime-widget-message.c:300
-#: ../src/balsa-mime-widget-text.c:568
-#: ../src/balsa-mime-widget-text.c:693
-#: ../src/sendmsg-window.c:1653
-#, c-format
-msgid "Error showing %s: %s\n"
-msgstr "BÅ?Ä?d przy wyÅ?wietlaniu %s: %s\n"
-
-#: ../src/balsa-mime-widget-message.c:332
-#, c-format
-msgid "Could not get a part: %s"
-msgstr "Nie moÅ¼na pobraÄ? czÄ?Å?ci danych: %s"
-
-#: ../src/balsa-mime-widget-message.c:601
-#: ../src/print.c:350
-#: ../src/sendmsg-window.c:1003
-#: ../src/sendmsg-window.c:3165
-msgid "Subject:"
-msgstr "Temat:"
-
-#: ../src/balsa-mime-widget-message.c:605
-#: ../src/print.c:356
-#: ../src/sendmsg-window.c:3159
-msgid "Date:"
-msgstr "Data:"
-
-#. Cannot edit the new "From:" header.
-#. { N_("From:"),     G_STRUCT_OFFSET(BalsaSendmsg, from[1])},
-#: ../src/balsa-mime-widget-message.c:618
-#: ../src/sendmsg-window.c:1000
-msgid "Reply-To:"
-msgstr "OdpowiedÅº do:"
-
-#. cc:
-#: ../src/balsa-mime-widget-message.c:622
-#: ../src/print.c:366
-#: ../src/sendmsg-window.c:1002
-#: ../src/sendmsg-window.c:2721
-#: ../src/sendmsg-window.c:3188
-#: ../src/store-address.c:307
-msgid "Cc:"
-msgstr "Cc:"
-
-#. bcc:
-#: ../src/balsa-mime-widget-message.c:623
-#: ../src/print.c:367
-#: ../src/sendmsg-window.c:1001
-#: ../src/sendmsg-window.c:2726
-#: ../src/store-address.c:308
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: ../src/balsa-mime-widget-message.c:627
-#: ../src/print.c:368
-msgid "Fcc:"
-msgstr "Fcc:"
-
-#: ../src/balsa-mime-widget-message.c:634
-#: ../src/print.c:374
-msgid "Disposition-Notification-To:"
-msgstr "Powiadomienie-o-otrzymaniu:"
-
-#: ../src/balsa-mime-widget-text.c:100
-#, c-format
-msgid "Could not save a text part: %s"
-msgstr "Nie moÅ¼na zapisaÄ? czÄ?Å?ci tekstu: %s"
-
-#: ../src/balsa-mime-widget-text.c:135
-#, c-format
-msgid "The message sent by %s with subject \"%s\" contains 8-bit characters, but no header describing the used codeset (converted to %s)"
-msgstr "List wysÅ?any przez %s o temacie \"%s\" zawiera oÅ?miobitowe znaki, ale brak nagÅ?Ã³wka opisujÄ?cego uÅ¼yty zestaw znakÃ³w (zmieniono na %s)"
-
-#: ../src/balsa-mime-widget-text.c:558
-#, c-format
-msgid "Calling URL %s..."
-msgstr "WywoÅ?ywanie adresu URL %s..."
-
-#: ../src/balsa-mime-widget.c:254
-#, c-format
-msgid "Error reading message part: %s"
-msgstr "BÅ?Ä?d przy odczytywaniu czÄ?Å?ci listu: %s"
-
-#: ../src/balsa-mime-widget.c:276
-#, c-format
-msgid "Type: %s (%s)"
-msgstr "Typ: %s (%s)"
-
-#: ../src/balsa-mime-widget.c:279
-#, c-format
-msgid "Content Type: %s"
-msgstr "Typ zawartoÅ?ci: %s"
-
-#: ../src/balsa-mime-widget.c:293
-msgid "No open or view action defined in GNOME MIME for this content type"
-msgstr "W bazie GNOME MIME brak akcji podglÄ?du lub edycji dla zawartoÅ?ci tego typu"
-
-#: ../src/balsa-mime-widget.c:299
-msgid "S_ave part"
-msgstr "Z_apisz czÄ?Å?Ä?"
-
-#: ../src/balsa-mime-widget.c:321
-#: ../src/balsa-mime-widget.c:345
-#, c-format
-msgid "View _part with %s"
-msgstr "_WyÅ?wietl czÄ?Å?Ä? za pomocÄ? %s"
-
-#: ../src/pref-manager.c:354
-msgid "While Retrieving Messages"
+#: ../src/pref-manager.c:394
+msgid "While retrieving messages"
 msgstr "Podczas pobierania listÃ³w"
 
-#: ../src/pref-manager.c:355
-msgid "Until Closed"
+#: ../src/pref-manager.c:395
+msgid "Until closed"
 msgstr "Do zamkniÄ?cia"
 
-#: ../src/pref-manager.c:360
+#: ../src/pref-manager.c:401
 msgid "Fast"
 msgstr "Szybki"
 
-#: ../src/pref-manager.c:361
+#: ../src/pref-manager.c:402
 msgid "Normal"
 msgstr "ZwykÅ?y"
 
-#: ../src/pref-manager.c:362
-msgid "Bad Spellers"
+#: ../src/pref-manager.c:403
+msgid "Bad spellers"
 msgstr "DokÅ?adny"
 
-#: ../src/pref-manager.c:367
+#: ../src/pref-manager.c:409
 msgid "Message number"
 msgstr "Numer listu"
 
-#: ../src/pref-manager.c:371
+#: ../src/pref-manager.c:413
 msgid "Sender"
 msgstr "Nadawca"
 
-#: ../src/pref-manager.c:375
+#: ../src/pref-manager.c:417
 msgid "Flat"
 msgstr "PÅ?askie"
 
-#: ../src/pref-manager.c:377
+#: ../src/pref-manager.c:419
 msgid "JWZ"
 msgstr "JWZ"
 
 #. must NOT be modal
-#: ../src/pref-manager.c:428
+#: ../src/pref-manager.c:517
 msgid "Balsa Preferences"
 msgstr "Preferencje Balsy"
 
-#: ../src/pref-manager.c:451
-msgid "Mail Servers"
-msgstr "Serwery poczty"
-
-#: ../src/pref-manager.c:455
-#: ../src/pref-manager.c:2579
-msgid "Address Books"
-msgstr "KsiÄ?Å¼ki adresowe"
-
-#: ../src/pref-manager.c:459
-msgid "Mail Options"
+#: ../src/pref-manager.c:566
+msgid "Mail options"
 msgstr "WÅ?aÅ?ciwoÅ?ci listÃ³w"
 
-#: ../src/pref-manager.c:463
-#: ../src/pref-manager.c:1941
-msgid "Display"
-msgstr "WyÅ?wietlanie"
+#: ../src/pref-manager.c:568
+msgid "Display options"
+msgstr "Opcje wyÅ?wietlania"
+
+#: ../src/pref-manager.c:570
+#: ../src/pref-manager.c:2780
+msgid "Address books"
+msgstr "KsiÄ?Å¼ki adresowe"
 
-#: ../src/pref-manager.c:467
-#: ../src/toolbar-factory.c:120
+#: ../src/pref-manager.c:574
+#: ../src/toolbar-factory.c:153
 msgid "Spelling"
 msgstr "Pisownia"
 
-#: ../src/pref-manager.c:471
-msgid "Misc"
-msgstr "Inne"
-
-#: ../src/pref-manager.c:475
+#: ../src/pref-manager.c:578
 msgid "Startup"
 msgstr "Uruchamianie"
 
-#: ../src/pref-manager.c:1209
+#: ../src/pref-manager.c:580
+#: ../src/pref-manager.c:2568
+msgid "Miscellaneous"
+msgstr "RÃ³Å¼ne"
+
+#: ../src/pref-manager.c:1350
 #, c-format
 msgid "%s (default)"
 msgstr "%s (domyÅ?lna)"
 
-#: ../src/pref-manager.c:1456
-msgid "Remote Mailbox Servers"
+#: ../src/pref-manager.c:1610
+msgid "Remote mailbox servers"
 msgstr "Zdalne serwery skrzynek"
 
-#: ../src/pref-manager.c:1477
-#: ../src/pref-manager.c:2600
-#: ../src/sendmsg-window.c:2805
+#: ../src/pref-manager.c:1631
+#: ../src/pref-manager.c:2801
+#: ../src/sendmsg-window.c:2985
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/pref-manager.c:1485
-msgid "Mailbox Name"
+#: ../src/pref-manager.c:1639
+msgid "Mailbox name"
 msgstr "Nazwa skrzynki"
 
-#: ../src/pref-manager.c:1498
-#: ../src/pref-manager.c:1584
-#: ../src/pref-manager.c:2631
+#: ../src/pref-manager.c:1653
+#: ../src/pref-manager.c:1742
+#: ../src/pref-manager.c:2836
 msgid "_Modify"
-msgstr "Zmodyf_ikuj"
+msgstr "_Zmodyfikuj"
 
-#: ../src/pref-manager.c:1510
-msgid "Local Mail"
+#: ../src/pref-manager.c:1667
+msgid "Local mail directory"
 msgstr "Poczta lokalna"
 
-#: ../src/pref-manager.c:1513
-#: ../src/pref-manager.c:1521
+#: ../src/pref-manager.c:1670
+#: ../src/pref-manager.c:1678
 msgid "Select your local mail directory"
 msgstr "WybÃ³r katalogu z lokalnÄ? pocztÄ?"
 
-#: ../src/pref-manager.c:1549
-msgid "Outgoing Mail Servers"
+#: ../src/pref-manager.c:1706
+msgid "Outgoing mail servers"
 msgstr "Serwery wysyÅ?ajÄ?ce listy"
 
-#: ../src/pref-manager.c:1571
-msgid "Server Name"
+#: ../src/pref-manager.c:1728
+msgid "Server name"
 msgstr "Nazwa serwera"
 
-#: ../src/pref-manager.c:1608
+#: ../src/pref-manager.c:1768
+msgid "Mail servers"
+msgstr "Serwery poczty"
+
+#: ../src/pref-manager.c:1770
 msgid "Incoming"
 msgstr "NadchodzÄ?ce"
 
-#: ../src/pref-manager.c:1610
+#: ../src/pref-manager.c:1772
 msgid "Outgoing"
 msgstr "WychodzÄ?ce"
 
-#: ../src/pref-manager.c:1634
+#: ../src/pref-manager.c:1799
 msgid "Checking"
 msgstr "Sprawdzanie"
 
-#: ../src/pref-manager.c:1639
-msgid "_Check mail automatically every:"
+#: ../src/pref-manager.c:1805
+msgid "_Check mail automatically every"
 msgstr "Automatyczne _sprawdzanie poczty co:"
 
-#: ../src/pref-manager.c:1650
-#: ../src/pref-manager.c:2396
-#: ../src/pref-manager.c:2447
+#: ../src/pref-manager.c:1816
+#: ../src/pref-manager.c:2591
+#: ../src/pref-manager.c:2651
 msgid "minutes"
 msgstr "minut"
 
-#: ../src/pref-manager.c:1656
+#: ../src/pref-manager.c:1823
 msgid "Check _IMAP mailboxes"
 msgstr "Sprawdzanie skrzynek _IMAP"
 
-#: ../src/pref-manager.c:1662
+#: ../src/pref-manager.c:1829
 msgid "Check INBOX _only"
 msgstr "Sprawdzanie _tylko poczty nadchodzÄ?cej"
 
-#: ../src/pref-manager.c:1667
-msgid "Display message if new mail has arrived in an open mailbox"
-msgstr "WyÅ?wietlanie komunikatu po pojawieniu siÄ? poczty w otwartej skrzynce"
+#: ../src/pref-manager.c:1836
+msgid "When mail arrives:"
+msgstr "Kiedy nadejdzie wiadomoÅ?Ä?"
 
-#: ../src/pref-manager.c:1672
+#: ../src/pref-manager.c:1841
+msgid "Display message"
+msgstr "WyÅ?wietlanie komunikatu"
+
+#: ../src/pref-manager.c:1846
+msgid "Play sound"
+msgstr "Odtworzenie dÅºwiÄ?ku"
+
+#: ../src/pref-manager.c:1852
+msgid "Show icon"
+msgstr "PokaÅ¼ ikonÄ? w tacce systemowej"
+
+#: ../src/pref-manager.c:1862
 msgid "Do background check quietly (no messages in status bar)"
 msgstr "Ciche sprawdzanie w tle (bez komunikatÃ³w na pasku stanu)"
 
-#: ../src/pref-manager.c:1676
+#: ../src/pref-manager.c:1867
 msgid "_POP message size limit:"
 msgstr "Ograniczenie rozmiaru wiadomoÅ?ci _POP:"
 
-#: ../src/pref-manager.c:1683
-msgid "MB"
-msgstr "MB"
-
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:1702
-msgid "Quoted and Flowed Text"
+#: ../src/pref-manager.c:1894
+msgid "Quoted and flowed text"
 msgstr "Cytowanie i przeformatowywanie tekstu"
 
-#: ../src/pref-manager.c:1706
-#: ../src/sendmsg-window.c:4999
-msgid "Quoted Text Regular Expression"
-msgstr "WyraÅ¼enie regularne definiujÄ?ce cytowany tekst"
+#: ../src/pref-manager.c:1898
+msgid ""
+"Quoted text\n"
+"regular expression:"
+msgstr ""
+"Cytowany tekst\n"
+"definiuje wyraÅ¼enie regularne"
 
-#: ../src/pref-manager.c:1717
-msgid "Wrap Incoming Text at:"
-msgstr "Zawijanie nadchodzÄ?cego tekstu na pozycji:"
+#: ../src/pref-manager.c:1906
+msgid "Wrap text at"
+msgstr "Zawijanie tekstu na pozycji"
 
-#: ../src/pref-manager.c:1728
-#: ../src/pref-manager.c:1891
+#: ../src/pref-manager.c:1918
+#: ../src/pref-manager.c:2085
 msgid "characters"
 msgstr "znakÃ³w"
 
-# tu jest problem z dobrym tÅ?umaczeniem
-# ale narazie mam takÄ? koncepcjÄ? jakÄ? widaÄ?
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:1743
-msgid "Display of Multipart/Alternative Parts"
+#: ../src/pref-manager.c:1933
+msgid "Display of multipart/alternative parts"
 msgstr "WyÅ?wietlanie listÃ³w wieloczÄ?Å?ciowych"
 
-#: ../src/pref-manager.c:1746
-msgid "prefer text/plain over html"
+#: ../src/pref-manager.c:1936
+msgid "Prefer text/plain over html"
 msgstr "wybÃ³r czystego tekstu przed formatem HTML"
 
-#. treatment of messages with 8-bit chars, but without proper MIME encoding
-#: ../src/pref-manager.c:1762
+#: ../src/pref-manager.c:1952
 msgid "National (8-bit) characters in broken messages without codeset header"
 msgstr "Znaki narodowe (8-bit) w uszkodzonym liÅ?cie bez nagÅ?Ã³wka zestawu znakÃ³w"
 
-#: ../src/pref-manager.c:1768
+#: ../src/pref-manager.c:1959
 msgid "display as \"?\""
 msgstr "wyÅ?wietlanie jako \"?\""
 
-# sprawdziÄ? czy nie za dÅ?ugi tekst
-#: ../src/pref-manager.c:1777
-msgid "display using codeset"
+#: ../src/pref-manager.c:1968
+msgid "display in codeset"
 msgstr "wyÅ?wietlanie przy uÅ¼yciu zestawu znakÃ³w"
 
 #. How to handle received MDN requests
-#: ../src/pref-manager.c:1809
-msgid "Message Disposition Notification Requests"
+#: ../src/pref-manager.c:1998
+msgid "Message disposition notification requests"
 msgstr "Å»Ä?dania powiadomienia o otrzymaniu listu (MDN)"
 
-#: ../src/pref-manager.c:1811
-msgid ""
-"When I receive a message and its sender requested to return a\n"
-"Message Disposition Notification (MDN), send it in the following cases:"
-msgstr ""
-"Przy otrzymaniu listu, ktÃ³rego nadawca oczekuje powiadomienia o\n"
-"otrzymaniu listu (MDN), naleÅ¼y go powiadomiÄ? w nastÄ?pujÄ?cych przypadkach:"
+#: ../src/pref-manager.c:2000
+msgid "When I receive a message whose sender requested a Message Disposition Notification (MDN), send it if:"
+msgstr "Przy otrzymaniu listu, ktÃ³rego nadawca oczekuje powiadomienia o otrzymaniu listu (MDN), naleÅ¼y go powiadomiÄ? jeÅ¼eli:"
 
-#: ../src/pref-manager.c:1822
+#: ../src/pref-manager.c:2012
 msgid ""
 "The message header looks clean\n"
-"(the notify-to address is equal to the return path,\n"
-"I am in the \"To:\" or \"Cc:\" list)."
+"(the notify-to address is the return path,\n"
+"and I am in the \"To:\" or \"Cc:\" list)."
 msgstr ""
 "NagÅ?Ã³wek listu wyglÄ?da poprawnie\n"
 "(adres w notify-to odpowiada Å?cieÅ¼ce powrotnej,\n"
 "TwÃ³j adres jest na liÅ?cie \"To:\" lub \"Cc:\")"
 
-#: ../src/pref-manager.c:1837
+#: ../src/pref-manager.c:2029
 msgid "The message header looks suspicious."
 msgstr "NagÅ?Ã³wek listu wyglÄ?da podejrzanie."
 
-#: ../src/pref-manager.c:1872
-msgid "Word Wrap"
+#: ../src/pref-manager.c:2066
+msgid "Word wrap"
 msgstr "Zawijanie sÅ?Ã³w"
 
-#: ../src/pref-manager.c:1877
-msgid "Wrap Outgoing Text at:"
+#: ../src/pref-manager.c:2071
+msgid "Wrap outgoing text at"
 msgstr "Zawijanie wysyÅ?anego tekstu na pozycji:"
 
-#: ../src/pref-manager.c:1905
-msgid "Other Options"
+#: ../src/pref-manager.c:2099
+msgid "Other options"
 msgstr "Inne opcje"
 
-#: ../src/pref-manager.c:1910
-msgid "Reply Prefix:"
+#: ../src/pref-manager.c:2104
+msgid "Reply prefix:"
 msgstr "Przedrostek odpowiedzi:"
 
-#: ../src/pref-manager.c:1913
-msgid "Edit headers in external editor"
-msgstr "Redagowanie nagÅ?Ã³wkÃ³w w zewnÄ?trznym edytorze"
-
-#: ../src/pref-manager.c:1915
+#: ../src/pref-manager.c:2107
 msgid "Automatically quote original when replying"
 msgstr "Automatyczne cytowanie oryginaÅ?u przy odpowiadaniu"
 
-#: ../src/pref-manager.c:1918
-msgid "Don't include HTML parts as text when replying or forwarding mail"
-msgstr "Pomijanie czÄ?Å?ci w HTML-u przy odpowiadaniu na list lub jego przesyÅ?aniu"
-
-#: ../src/pref-manager.c:1921
+#: ../src/pref-manager.c:2110
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "PrzesyÅ?anie listu jako zaÅ?Ä?cznika zamiast cytowania"
 
-#: ../src/pref-manager.c:1924
+#: ../src/pref-manager.c:2113
+msgid "Copy outgoing messages to sentbox"
+msgstr "Kopiowanie wysyÅ?anych listÃ³w do folderu poczty wysyÅ?anej"
+
+#: ../src/pref-manager.c:2115
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "Przycisk wysyÅ?ania kolejkuje pocztÄ? wychodzÄ?cÄ? w skrzynce wychodzÄ?cej"
 
-#: ../src/pref-manager.c:1927
-msgid "Copy outgoing messages to sentbox"
-msgstr "Kopiowanie wysyÅ?anych listÃ³w do folderu poczty wysyÅ?anej"
+#: ../src/pref-manager.c:2118
+msgid "Edit headers in external editor"
+msgstr "Redagowanie nagÅ?Ã³wkÃ³w w zewnÄ?trznym edytorze"
 
-#: ../src/pref-manager.c:1944
-msgid "Status Messages"
-msgstr "Komunikaty dotyczÄ?ce stanu"
+#: ../src/pref-manager.c:2120
+msgid "Include HTML parts as text when replying or forwarding"
+msgstr "ZaÅ?Ä?cz czÄ?Å?ci wiadomoÅ?Ä? w HTML-u przy odpowiadaniu na list lub jego przesyÅ?aniu"
 
-#: ../src/pref-manager.c:1946
-msgid "Colors"
-msgstr "Kolory"
+#: ../src/pref-manager.c:2137
+msgid "Layout"
+msgstr "UkÅ?ad"
+
+#: ../src/pref-manager.c:2139
+msgid "Sort and thread"
+msgstr "Sortowanie i wÄ?tkowanie"
 
-#: ../src/pref-manager.c:1948
+#: ../src/pref-manager.c:2141
+#: ../src/print-gtk.c:483
 msgid "Message"
 msgstr "List"
 
-#: ../src/pref-manager.c:1950
-msgid "Sort and Thread"
-msgstr "Sortowanie i wÄ?tkowanie"
+#: ../src/pref-manager.c:2143
+msgid "Colors"
+msgstr "Kolory"
+
+#: ../src/pref-manager.c:2145
+#: ../src/pref-manager.c:2233
+msgid "Format"
+msgstr "Format"
+
+#: ../src/pref-manager.c:2147
+msgid "Status messages"
+msgstr "Wiadomosci statusu"
 
-#: ../src/pref-manager.c:1975
-msgid "Main Window"
+#: ../src/pref-manager.c:2172
+#: ../src/toolbar-prefs.c:163
+msgid "Main window"
 msgstr "GÅ?Ã³wne okno"
 
-#: ../src/pref-manager.c:1978
+#: ../src/pref-manager.c:2175
 msgid "Use preview pane"
 msgstr "PodglÄ?d listu wewnÄ?trz okna"
 
-#: ../src/pref-manager.c:1980
+#: ../src/pref-manager.c:2177
 msgid "Show mailbox statistics in left pane"
 msgstr "WyÅ?wietlanie statystyk skrzynki w lewym panelu"
 
-#: ../src/pref-manager.c:1982
+#: ../src/pref-manager.c:2179
 msgid "Use alternative main window layout"
 msgstr "Alternatywny ukÅ?ad okna gÅ?Ã³wnego"
 
-#: ../src/pref-manager.c:1984
+#: ../src/pref-manager.c:2181
 msgid "Automatically view message when mailbox opened"
 msgstr "Automatyczne wyÅ?wietlenie listu po otwarciu skrzynki"
 
-#: ../src/pref-manager.c:1990
-msgid "PageUp/PageDown keys scroll message by:"
-msgstr "Po przyciÅ?niÄ?ciu PageUp/PageDown przewiniÄ?cie o:"
+#: ../src/pref-manager.c:2187
+msgid "PageUp/PageDown keys scroll text by"
+msgstr "Po przyciÅ?niÄ?ciu PageUp/PageDown przewija o:"
 
-#: ../src/pref-manager.c:2001
+#: ../src/pref-manager.c:2198
 msgid "percent"
 msgstr "procent"
 
-#: ../src/pref-manager.c:2016
-msgid "Display Progress Dialog"
+#: ../src/pref-manager.c:2213
+msgid "Display progress dialog"
 msgstr "WyÅ?wietlanie okna postÄ?pu"
 
-#: ../src/pref-manager.c:2036
-msgid "Encoding"
-msgstr "Kodowanie"
-
-#: ../src/pref-manager.c:2041
+#: ../src/pref-manager.c:2238
 msgid "Date encoding (for strftime):"
 msgstr "Zapis daty (dla strftime):"
 
-#: ../src/pref-manager.c:2043
+#: ../src/pref-manager.c:2240
 msgid "Selected headers:"
 msgstr "Wybrane nagÅ?Ã³wki:"
 
-#: ../src/pref-manager.c:2064
-#: ../src/pref-manager.c:2069
-msgid "Information Messages"
+#: ../src/pref-manager.c:2262
+msgid "Information messages"
 msgstr "WyÅ?wietlanie komunikatÃ³w"
 
-#: ../src/pref-manager.c:2073
-msgid "Warning Messages"
-msgstr "Komunikaty ostrzegawcze"
+#: ../src/pref-manager.c:2267
+msgid "Information messages:"
+msgstr "WyÅ?wietlanie komunikatÃ³w:"
 
-#: ../src/pref-manager.c:2077
-msgid "Error Messages"
-msgstr "Komunikaty o bÅ?Ä?dach"
+#: ../src/pref-manager.c:2271
+msgid "Warning messages:"
+msgstr "Komunikaty ostrzegawcze:"
 
-#: ../src/pref-manager.c:2081
-msgid "Fatal Error Messages"
-msgstr "Komunikaty o powaÅ¼nych bÅ?Ä?dach"
+#: ../src/pref-manager.c:2275
+msgid "Error messages:"
+msgstr "Komunikaty o bÅ?Ä?dach:"
 
-#: ../src/pref-manager.c:2085
-msgid "Debug Messages"
-msgstr "Komunikaty Å?ledzenia"
+#: ../src/pref-manager.c:2279
+msgid "Fatal error messages:"
+msgstr "Komunikaty o powaÅ¼nych bÅ?Ä?dach:"
 
-#: ../src/pref-manager.c:2111
-msgid "Message Colors"
+#: ../src/pref-manager.c:2283
+msgid "Debug messages:"
+msgstr "Komunikaty Å?ledzenia:"
+
+#: ../src/pref-manager.c:2309
+msgid "Message colors"
 msgstr "Kolory listÃ³w"
 
-#: ../src/pref-manager.c:2116
+#: ../src/pref-manager.c:2314
 #, c-format
 msgid "Quote level %d color"
 msgstr "Kolor cytatu na %d. poziomie"
 
-#: ../src/pref-manager.c:2129
-msgid "Link Color"
+#: ../src/pref-manager.c:2327
+msgid "Link color"
 msgstr "Kolor odnoÅ?nikÃ³w"
 
-#: ../src/pref-manager.c:2131
+#: ../src/pref-manager.c:2329
 msgid "Hyperlink color"
 msgstr "Kolor odnoÅ?nikÃ³w"
 
-#: ../src/pref-manager.c:2142
-msgid "Composition Window"
+#: ../src/pref-manager.c:2340
+msgid "Composition window"
 msgstr "Okno tworzenia listu"
 
-#: ../src/pref-manager.c:2146
+#: ../src/pref-manager.c:2344
 msgid "Invalid or incomplete address label color"
 msgstr "Kolor etykiety z niepoprawnym lub niepeÅ?nym adresem"
 
-#: ../src/pref-manager.c:2171
+#: ../src/pref-manager.c:2367
+#: ../src/print-gtk.c:492
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: ../src/pref-manager.c:2175
-msgid "Message Font"
+#: ../src/pref-manager.c:2371
+msgid "Message font:"
 msgstr "Czcionka treÅ?ci listu"
 
-#: ../src/pref-manager.c:2187
-msgid "Message Subject Font"
-msgstr "Czcionka tematu listu"
+#: ../src/pref-manager.c:2379
+msgid "Subject font:"
+msgstr "Czcionka tematu"
 
-#: ../src/pref-manager.c:2218
-msgid "Sorting and Threading"
+#: ../src/pref-manager.c:2417
+msgid "Sorting and threading"
 msgstr "Sortowanie i wÄ?tkowanie"
 
-#: ../src/pref-manager.c:2222
-msgid "Default sort column"
+#: ../src/pref-manager.c:2421
+msgid "Default sort column:"
 msgstr "DomyÅ?lna kolumna sortowania"
 
-#: ../src/pref-manager.c:2226
-msgid "Default threading style"
+#: ../src/pref-manager.c:2425
+msgid "Default threading style:"
 msgstr "DomyÅ?lny styl grupowania wÄ?tkÃ³w"
 
-#: ../src/pref-manager.c:2231
+#: ../src/pref-manager.c:2430
 msgid "Expand threads on open"
 msgstr "Rozwijanie wÄ?tkÃ³w przy otwieraniu"
 
-#: ../src/pref-manager.c:2307
-msgid "Pspell Settings"
+#: ../src/pref-manager.c:2505
+msgid "Pspell settings"
 msgstr "Ustawienia pspell"
 
-#: ../src/pref-manager.c:2313
-msgid "Spell Check Module"
+#: ../src/pref-manager.c:2511
+msgid "Spell check module"
 msgstr "ModuÅ? sprawdzania pisowni"
 
-#: ../src/pref-manager.c:2319
-msgid "Suggestion Level"
+#: ../src/pref-manager.c:2517
+msgid "Suggestion level"
 msgstr "Poziom zgÅ?aszania propozycji"
 
 #. do the ignore length
-#: ../src/pref-manager.c:2324
+#: ../src/pref-manager.c:2522
 msgid "Ignore words shorter than"
 msgstr "Ignorowanie sÅ?Ã³w krÃ³tszych niÅ¼"
 
-#: ../src/pref-manager.c:2345
-msgid "Miscellaneous Spelling Settings"
+#: ../src/pref-manager.c:2540
+msgid "Miscellaneous spelling settings"
 msgstr "Dodatkowe opcje sprawdzania pisowni"
 
-#: ../src/pref-manager.c:2347
+#: ../src/pref-manager.c:2542
 msgid "Check signature"
 msgstr "Sprawdzanie podpisu"
 
-#: ../src/pref-manager.c:2348
+#: ../src/pref-manager.c:2543
 msgid "Check quoted"
 msgstr "Sprawdzanie cytowania"
 
-#: ../src/pref-manager.c:2373
-msgid "Miscellaneous"
-msgstr "RÃ³Å¼ne"
-
-#: ../src/pref-manager.c:2375
+#: ../src/pref-manager.c:2570
 msgid "Debug"
 msgstr "Informowanie o bÅ?Ä?dach"
 
-#: ../src/pref-manager.c:2376
-msgid "Empty Trash on exit"
+#: ../src/pref-manager.c:2571
+msgid "Empty trash on exit"
 msgstr "OprÃ³Å¼nianie Å?mietnika przed zakoÅ?czeniem"
 
-#: ../src/pref-manager.c:2382
-msgid "Automatically close mailbox if unused more than"
-msgstr "Automatyczne zamykanie skrzynki po okresie nieaktywnoÅ?ci"
+#: ../src/pref-manager.c:2578
+msgid "Close mailbox if unused more than"
+msgstr "Zamknij skrzynkÄ? pocztowÄ? jeÅ?li jest nie uÅ¼ywana dÅ?uÅ¼ej niÅ¼"
 
-#: ../src/pref-manager.c:2410
-msgid "Deleting Messages"
+#: ../src/pref-manager.c:2606
+msgid "Deleting messages"
 msgstr "Usuwanie listÃ³w"
 
-#: ../src/pref-manager.c:2412
-msgid ""
-"The following setting is global, but may be overridden\n"
-"for the selected mailbox using Mailbox -> Hide messages:"
-msgstr ""
-"NastÄ?pujÄ?ce ustawienie jest globalne, ale moÅ¼e zostaÄ?\n"
-"nadpisane dla wybranej skrzynki za pomocÄ? Skrzynka -> Ukryj listy:"
+#. Translators: this used to be "using Mailbox -> Hide messages";
+#. * the UTF-8 string for the right-arrow symbol is broken out to
+#. * avoid msgconv problems.
+#: ../src/pref-manager.c:2611
+#, c-format
+msgid "The following setting is global, but may be overridden for the selected mailbox using Mailbox %s Hide messages:"
+msgstr "NastÄ?pujÄ?ce ustawienie jest globalne, ale moÅ¼e zostaÄ? nadpisane dla wybranej skrzynki za pomocÄ? Skrzynka %s Ukryj listy:"
 
-#: ../src/pref-manager.c:2420
+#: ../src/pref-manager.c:2623
 msgid "Hide messages marked as deleted"
 msgstr "Ukrywanie wiadomoÅ?ci oznaczonych jako usuniÄ?te"
 
-#: ../src/pref-manager.c:2422
-msgid "The following settings are global."
-msgstr "NastÄ?pujÄ?ce ustawienia sÄ? globalne."
+#: ../src/pref-manager.c:2625
+msgid "The following settings are global:"
+msgstr "NastÄ?pujÄ?ce ustawienia sÄ? globalne:"
 
-#: ../src/pref-manager.c:2427
+#: ../src/pref-manager.c:2631
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Kasowanie usuniÄ?tych listÃ³w przy zamykaniu skrzynki"
 
-#: ../src/pref-manager.c:2434
-msgid " ...and if mailbox is unused more than"
+#: ../src/pref-manager.c:2638
+msgid "...and if unused more than"
 msgstr " ...oraz gdy skrzynka jest nieuÅ¼ywana dÅ?uÅ¼ej niÅ¼"
 
-#: ../src/pref-manager.c:2460
-msgid "Message Window"
+#: ../src/pref-manager.c:2663
+#: ../src/toolbar-prefs.c:177
+msgid "Message window"
 msgstr "Okno wiadomoÅ?ci"
 
-#: ../src/pref-manager.c:2462
-msgid "Action after moving/trashing a message"
-msgstr "Wykonaj akcjÄ? po przeniesieniu/usuniÄ?ciu wiadomoÅ?ci"
+#: ../src/pref-manager.c:2668
+msgid "After moving a message:"
+msgstr "Po przeniesieniu/usuniÄ?ciu wiadomoÅ?ci:"
 
-#: ../src/pref-manager.c:2497
-msgid "Options"
-msgstr "Opcje"
+#: ../src/pref-manager.c:2697
+msgid "Startup options"
+msgstr "Opcje uruchamiania"
 
-#: ../src/pref-manager.c:2500
+#: ../src/pref-manager.c:2700
 msgid "Open Inbox upon startup"
 msgstr "Otwieranie przy uruchamianiu skrzynki z pocztÄ? nadchodzÄ?cÄ?"
 
-#: ../src/pref-manager.c:2502
+#: ../src/pref-manager.c:2702
 msgid "Check mail upon startup"
 msgstr "Sprawdzanie poczty przy uruchamianiu"
 
-#: ../src/pref-manager.c:2504
+#: ../src/pref-manager.c:2704
 msgid "Remember open mailboxes between sessions"
 msgstr "ZapamiÄ?tywanie otwartych skrzynek pomiÄ?dzy sesjami"
 
-#: ../src/pref-manager.c:2518
-msgid "Folder Scanning"
+#: ../src/pref-manager.c:2718
+msgid "Folder scanning"
 msgstr "Analizowanie folderÃ³w"
 
-#: ../src/pref-manager.c:2520
-msgid ""
-"Choose depth 1 for fast startup; this defers scanning some folders.\n"
-"To see more of the tree at startup, choose a greater depth."
+#: ../src/pref-manager.c:2720
+msgid "Choose depth 1 for fast startup; this defers scanning some folders.  To see more of the tree at startup, choose a greater depth."
 msgstr ""
-"Aby uzyskaÄ? szybkie uruchamianie, wybierz gÅ?Ä?bokoÅ?Ä? 1, co odÅ?oÅ¼y w czasie.\n"
-"analizowanie pewnych folderÃ³w. Aby zobaczyÄ? po uruchomieniu wiÄ?kszÄ? czÄ?Å?Ä?\n"
-"drzewa, wybierz wiÄ?kszÄ? gÅ?Ä?bokoÅ?Ä?."
+"Aby uzyskaÄ? szybkie uruchamianie, wybierz gÅ?Ä?bokoÅ?Ä? 1, co odÅ?oÅ¼y w czasie.analizowanie pewnych folderÃ³w.\n"
+" Aby zobaczyÄ? po uruchomieniu wiÄ?kszÄ? czÄ?Å?Ä? drzewa, wybierz wiÄ?kszÄ? gÅ?Ä?bokoÅ?Ä?."
 
-#: ../src/pref-manager.c:2530
+#: ../src/pref-manager.c:2731
 msgid "Scan local folders to depth"
 msgstr "GÅ?Ä?bokoÅ?Ä? analizowania lokalnych folderÃ³w"
 
-#: ../src/pref-manager.c:2543
+#: ../src/pref-manager.c:2744
 msgid "Scan IMAP folders to depth"
 msgstr "GÅ?Ä?bokoÅ?Ä? analizowania folderÃ³w IMAP"
 
-#: ../src/pref-manager.c:2608
-msgid "Address Book Name"
+#: ../src/pref-manager.c:2809
+msgid "Address book name"
 msgstr "Nazwa ksiÄ?Å¼ki adresowej"
 
-#: ../src/pref-manager.c:2616
-msgid "Expand aliases"
-msgstr "Rozwijanie aliasÃ³w"
+#: ../src/pref-manager.c:2817
+msgid "Auto-complete"
+msgstr "Auto-uzupeÅ?nianie"
 
-#: ../src/pref-manager.c:2635
+#: ../src/pref-manager.c:2842
 msgid "_Set as default"
 msgstr "Ustaw jako domyÅ?_lnÄ?"
 
-#: ../src/pref-manager.c:2949
+#: ../src/pref-manager.c:3152
 msgid "Remote POP3 mailbox..."
 msgstr "Zdalna skrzynka POP3..."
 
-#: ../src/pref-manager.c:3072
+#: ../src/pref-manager.c:3278
 msgid "Show nothing"
 msgstr "Bez wyÅ?wietlania"
 
-#: ../src/pref-manager.c:3074
+#: ../src/pref-manager.c:3280
 msgid "Show dialog"
 msgstr "WyÅ?wietlanie w oknie"
 
-#: ../src/pref-manager.c:3076
+#: ../src/pref-manager.c:3282
 msgid "Show in list"
 msgstr "WyÅ?wietlanie na liÅ?cie"
 
-#: ../src/pref-manager.c:3078
+#: ../src/pref-manager.c:3284
 msgid "Show in status bar"
 msgstr "WyÅ?wietlanie na pasku stanu"
 
-#: ../src/pref-manager.c:3080
+#: ../src/pref-manager.c:3286
 msgid "Print to console"
 msgstr "Drukowanie na konsolÄ?"
 
-#: ../src/pref-manager.c:3091
+#: ../src/pref-manager.c:3297
 msgid "Ask me"
 msgstr "Zadanie pytania"
 
-#: ../src/pref-manager.c:3168
+#: ../src/pref-manager.c:3374
 msgid "Show next unread message"
 msgstr "PokaÅ¼ nastÄ?pny nieprzeczytany list"
 
-#: ../src/pref-manager.c:3169
+#: ../src/pref-manager.c:3375
 msgid "Show next message"
 msgstr "PokaÅ¼ nastÄ?pny list"
 
-#: ../src/pref-manager.c:3170
+#: ../src/pref-manager.c:3376
 msgid "Close message window"
 msgstr "Zamyka okno wiadomoÅ?ci"
 
-# nie wiem czy link_id zostawiÄ? niezmienione
-# czy tÅ?umaczyÄ? identyfikator_odnoÅ?nika
-#: ../src/pref-manager.c:3194
+#: ../src/pref-manager.c:3424
 #, c-format
 msgid "Error displaying link_id %s: %s\n"
 msgstr "BÅ?Ä?d przy wyÅ?wietlaniu link_id %s: %s\n"
 
-#: ../src/print.c:246
-#: ../src/print.c:727
+#: ../src/print-gtk.c:88
+#: ../src/print-gtk.c:239
+#, c-format
+msgid "Page %d of %d"
+msgstr "Strona: %i/%i"
+
+#: ../src/print-gtk.c:142
+#: ../src/print-gtk.c:161
+msgid "Signed and encrypted matter"
+msgstr "Podpisy i szyfry"
+
+#: ../src/print-gtk.c:146
+#: ../src/print-gtk.c:165
+msgid "Signed matter"
+msgstr "Podpisy"
+
+#: ../src/print-gtk.c:189
+#: ../src/print.c:1321
+#, c-format
+msgid "This is an inline %s signed %s message part:"
+msgstr "To jest czÄ?Å?Ä? listu %s podpisana %s w treÅ?ci za pomocÄ? OpenPGP:"
+
+#: ../src/print-gtk.c:344
+#, c-format
+msgid "Cannot print page %d because the document has only %d pages."
+msgstr "Nie moÅ¼na drukowaÄ? strony %d, poniewaÅ¼ dokument ma tylko %d stron."
+
+#. Translate to the default units to use for presenting
+#. * lengths to the user. Translate to default:inch if you
+#. * want inches, otherwise translate to default:mm.
+#. * Do *not* translate it to "predefinito:mm", if it
+#. * it isn't default:mm or default:inch it will not work
+#.
+#: ../src/print-gtk.c:378
+msgid "default:mm"
+msgstr "default:mm"
+
+#: ../src/print-gtk.c:435
+msgid "inch"
+msgstr "cal"
+
+#: ../src/print-gtk.c:442
+msgid "mm"
+msgstr "mm"
+
+#: ../src/print-gtk.c:513
+msgid "_Header Font:"
+msgstr "_Czcionka nagÅ?Ã³wka"
+
+#: ../src/print-gtk.c:516
+msgid "B_ody Font:"
+msgstr "Czcionka treÅ?ci"
+
+#: ../src/print-gtk.c:519
+msgid "_Footer Font:"
+msgstr "_Czcionka stopki"
+
+#: ../src/print-gtk.c:526
+msgid "Highlighting"
+msgstr "WyrÃ³Å¼nienie"
+
+#: ../src/print-gtk.c:541
+msgid "Highlight _cited text"
+msgstr "WyrÃ³Å¼nienie cytowanego tekstu"
+
+#: ../src/print-gtk.c:550
+msgid "Highlight _structured phrases"
+msgstr "WyrÃ³Å¼nienie cytowanego tek_stu"
+
+#: ../src/print-gtk.c:561
+msgid "Margins"
+msgstr "Marginesy"
+
+#: ../src/print-gtk.c:583
+msgid "_Top"
+msgstr "_GÃ³ra"
+
+#: ../src/print-gtk.c:589
+msgid "_Bottom"
+msgstr "_DÃ³Å?"
+
+#: ../src/print-gtk.c:601
+msgid "_Left"
+msgstr "_Lewo"
+
+#: ../src/print-gtk.c:607
+msgid "_Right"
+msgstr "_Prawo"
+
+#: ../src/print-gtk.c:731
+#, c-format
+msgid "Error printing message: %s"
+msgstr "BÅ?Ä?d przy drukowaniu wiadomoÅ?ci: %s"
+
+#: ../src/print.c:250
+#: ../src/print.c:731
 #, c-format
 msgid "Page: %i/%i"
 msgstr "Strona: %i/%i"
 
-#: ../src/print.c:662
+#: ../src/print.c:666
 msgid ""
 "Preparing an HTML part, which must start on a new page.\n"
 "Print this part?"
@@ -5158,75 +5958,54 @@ msgstr ""
 "Przetwarzanie czÄ?Å?ci HTML, ktÃ³ra musi siÄ? zaczÄ?Ä? na nowej stronie.\n"
 "WydrukowaÄ? tÄ? czÄ?Å?Ä??"
 
-#: ../src/print.c:675
-#, c-format
-msgid "Could not get part: %s"
-msgstr "Nie moÅ¼na pobraÄ? danych: %s"
-
-#. gather some info about this part
-#. four fields, one terminator
-#: ../src/print.c:981
-msgid "Type:"
-msgstr "Typ:"
-
-#: ../src/print.c:984
-msgid "File name:"
-msgstr "Nazwa pliku:"
-
-# FIXME!!!! Gdzie wstawiÄ? %s?
-#: ../src/print.c:1300
-#, fuzzy, c-format
-msgid "This is an inline %s signed %s message part:"
-msgstr "To jest czÄ?Å?Ä? listu podpisana %s w treÅ?ci za pomocÄ? OpenPGP:"
-
-#: ../src/print.c:1547
+#: ../src/print.c:1568
 msgid "Font available for printing"
 msgstr "Czcionka dostÄ?pna do drukowania"
 
-#: ../src/print.c:1553
+#: ../src/print.c:1574
 #, c-format
 msgid "Font <b>not</b> available for printing. Closest: %s"
 msgstr "Czcionka <b>niedostÄ?pna</b> do drukowania. NajbliÅ¼sza: %s"
 
-#: ../src/print.c:1566
+#: ../src/print.c:1587
 msgid "Select Font"
 msgstr "WybÃ³r czcionki"
 
-#: ../src/print.c:1599
+#: ../src/print.c:1620
 msgid "Change..."
 msgstr "Zmiana..."
 
-#: ../src/print.c:1634
+#: ../src/print.c:1655
 msgid "Print message"
 msgstr "Wydruk listu"
 
 #. create a 2nd notebook page for the fonts
-#: ../src/print.c:1645
+#: ../src/print.c:1666
 msgid "_Fonts"
 msgstr "Czc_ionki"
 
-#: ../src/print.c:1648
+#: ../src/print.c:1669
 msgid "Header font"
 msgstr "Czcionka nagÅ?Ã³wka"
 
-#: ../src/print.c:1650
+#: ../src/print.c:1671
 msgid "Body font"
 msgstr "Czcionka treÅ?ci"
 
-#: ../src/print.c:1652
+#: ../src/print.c:1673
 msgid "Footer font"
 msgstr "Czcionka stopki"
 
 #. highlight cited stuff
-#: ../src/print.c:1656
+#: ../src/print.c:1677
 msgid "Highlight cited text"
 msgstr "WyrÃ³Å¼nienie cytowanego tekstu"
 
-#: ../src/print.c:1660
+#: ../src/print.c:1681
 msgid "_Enable highlighting of cited text"
 msgstr "Wy_rÃ³Å¼nienie cytowanego tekstu"
 
-#: ../src/print.c:1686
+#: ../src/print.c:1707
 #, c-format
 msgid ""
 "Balsa could not find font \"%s\".\n"
@@ -5235,15 +6014,15 @@ msgstr ""
 "Balsa nie moÅ¼e odnaleÅºÄ? czcionki \"%s\".\n"
 "UÅ¼yj zakÅ?adki \"Czcionki\" w oknie \"Wydruk listu\" aby jÄ? zmieniÄ?."
 
-#: ../src/print.c:1787
+#: ../src/print.c:1808
 msgid "Balsa: message print preview"
 msgstr "Balsa: podglÄ?d wydruku listu"
 
-#: ../src/save-restore.c:631
+#: ../src/save-restore.c:599
 msgid "Error during filters loading: "
 msgstr "BÅ?Ä?d przy wczytywaniu filtrÃ³w: "
 
-#: ../src/save-restore.c:633
+#: ../src/save-restore.c:601
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -5252,385 +6031,451 @@ msgstr ""
 "BÅ?Ä?d przy wczytywaniu filtrÃ³w: %s\n"
 "Filtry mogÄ? byÄ? niepoprawne."
 
-#: ../src/save-restore.c:748
+#: ../src/save-restore.c:723
 msgid "The option not to recognize \"format=flowed\" text has been removed."
 msgstr "Opcja powodujÄ?ca nierozpoznawanie ustawienia \"format=flowed\" zostaÅ?a usuniÄ?ta."
 
-#: ../src/save-restore.c:1004
-msgid "The option not to send \"format=flowed\" is now on the Options menu of the compose window."
+#: ../src/save-restore.c:1016
+msgid "The option not to send \"format=flowed\" text is now on the Options menu of the compose window."
 msgstr "Opcja \"Przeformatowywanie\", dotyczÄ?ca ustawienia \"format=flowed\", znajduje siÄ? teraz w menu Opcje okna tworzenia listu."
 
-#: ../src/save-restore.c:1036
+#: ../src/save-restore.c:1048
 msgid "The option to request a MDN is now on the Options menu of the compose window."
 msgstr "Opcja Å¼Ä?dania powiadomienia o otrzymaniu listu (MDN) jest teraz dostÄ?pna w menu opcje okna tworzenia listu."
 
-#: ../src/save-restore.c:1843
-msgid "Filter with no condition was ignored"
-msgstr "Filtr nie zawierajÄ?cy warunku zostaÅ? pominiÄ?ty"
+#: ../src/save-restore.c:1128
+msgid "This version of Balsa uses a new user interface; if you have changed Balsa's keyboard accelerators, you will need to set them again."
+msgstr "Ta wersja balsy uÅ¼ywa nowego interfejsu uÅ¼ytkownika; jeÅ¼eli zmieniÅ?eÅ? klawisze klawiatury przypisane Balsie, bÄ?dziesz musiaÅ? ustawiÄ? je ponownie."
 
-#: ../src/save-restore.c:2040
+#: ../src/save-restore.c:2196
 msgid "Error opening GConf database\n"
 msgstr "BÅ?Ä?d przy otwieraniu bazy GConf\n"
 
-#: ../src/save-restore.c:2048
-#: ../src/save-restore.c:2059
+#: ../src/save-restore.c:2204
+#: ../src/save-restore.c:2215
 #, c-format
 msgid "Error setting GConf field: %s\n"
 msgstr "BÅ?Ä?d przy ustawianiu GConf: %s\n"
 
-#: ../src/sendmsg-window.c:211
-msgid "_Brazilian"
-msgstr "_Brazylijski"
+#. Translators: please use the initial letter of each language as
+#. * its accelerator; this is a long list, and unique accelerators
+#. * cannot be found.
+#: ../src/sendmsg-window.c:260
+msgid "_Brazilian Portuguese"
+msgstr "_Brazylijski portugalski"
 
-#: ../src/sendmsg-window.c:212
+#: ../src/sendmsg-window.c:261
 msgid "_Catalan"
 msgstr "_KataloÅ?ski"
 
-#: ../src/sendmsg-window.c:213
+#: ../src/sendmsg-window.c:262
 msgid "_Chinese Simplified"
 msgstr "_ChiÅ?ski uproszczony"
 
-#: ../src/sendmsg-window.c:214
+#: ../src/sendmsg-window.c:263
 msgid "_Chinese Traditional"
 msgstr "_ChiÅ?ski tradycyjny"
 
-#: ../src/sendmsg-window.c:215
+#: ../src/sendmsg-window.c:264
 msgid "_Czech"
 msgstr "_Czeski"
 
-#: ../src/sendmsg-window.c:216
+#: ../src/sendmsg-window.c:265
 msgid "_Danish"
 msgstr "_DuÅ?ski"
 
-#: ../src/sendmsg-window.c:217
+#: ../src/sendmsg-window.c:266
 msgid "_Dutch"
 msgstr "_Holenderski"
 
-#: ../src/sendmsg-window.c:218
+#: ../src/sendmsg-window.c:267
 msgid "_English (American)"
 msgstr "_Angielski (amerykaÅ?ski)"
 
-#: ../src/sendmsg-window.c:219
+#: ../src/sendmsg-window.c:268
 msgid "_English (British)"
 msgstr "_Angielski (brytyjski)"
 
-#: ../src/sendmsg-window.c:220
+#: ../src/sendmsg-window.c:269
 msgid "_Esperanto"
 msgstr "_Esperanto"
 
-#: ../src/sendmsg-window.c:221
+#: ../src/sendmsg-window.c:270
 msgid "_Estonian"
 msgstr "_EstoÅ?ski"
 
-#: ../src/sendmsg-window.c:222
+#: ../src/sendmsg-window.c:271
 msgid "_Finnish"
 msgstr "_FiÅ?ski"
 
-#: ../src/sendmsg-window.c:223
+#: ../src/sendmsg-window.c:272
 msgid "_French"
 msgstr "_Francuski"
 
-#: ../src/sendmsg-window.c:224
+#: ../src/sendmsg-window.c:273
 msgid "_German"
 msgstr "_Niemiecki"
 
-#: ../src/sendmsg-window.c:225
+#: ../src/sendmsg-window.c:274
+msgid "_German (Austrian)"
+msgstr "_Niemiecki (austrjacki)"
+
+#: ../src/sendmsg-window.c:275
+msgid "_German (Swiss)"
+msgstr "_Niemiecki (szwajcarski)"
+
+#: ../src/sendmsg-window.c:276
 msgid "_Greek"
 msgstr "_Grecki"
 
-#: ../src/sendmsg-window.c:226
+#: ../src/sendmsg-window.c:277
 msgid "_Hebrew"
 msgstr "_Hebrajski"
 
-#: ../src/sendmsg-window.c:227
+#: ../src/sendmsg-window.c:278
 msgid "_Hungarian"
 msgstr "_WÄ?gierski"
 
-#: ../src/sendmsg-window.c:228
+#: ../src/sendmsg-window.c:279
 msgid "_Italian"
 msgstr "_WÅ?oski"
 
-#: ../src/sendmsg-window.c:229
+#: ../src/sendmsg-window.c:280
 msgid "_Japanese (JIS)"
 msgstr "_JapoÅ?ski (JIS)"
 
-#: ../src/sendmsg-window.c:230
+#: ../src/sendmsg-window.c:281
+msgid "_Kazakh"
+msgstr "_Kazachski"
+
+#: ../src/sendmsg-window.c:282
 msgid "_Korean"
 msgstr "_KoreaÅ?ski"
 
-#: ../src/sendmsg-window.c:231
+#: ../src/sendmsg-window.c:283
 msgid "_Latvian"
 msgstr "_Å?otewski"
 
-#: ../src/sendmsg-window.c:232
+#: ../src/sendmsg-window.c:284
 msgid "_Lithuanian"
 msgstr "_Litewski"
 
-#: ../src/sendmsg-window.c:233
+#: ../src/sendmsg-window.c:285
 msgid "_Norwegian"
 msgstr "_Norweski"
 
-#: ../src/sendmsg-window.c:234
+#: ../src/sendmsg-window.c:286
 msgid "_Polish"
 msgstr "_Polski"
 
-#: ../src/sendmsg-window.c:235
+#: ../src/sendmsg-window.c:287
 msgid "_Portugese"
 msgstr "_Portugalski"
 
-#: ../src/sendmsg-window.c:236
+#: ../src/sendmsg-window.c:288
 msgid "_Romanian"
 msgstr "_RumuÅ?ski"
 
-#: ../src/sendmsg-window.c:237
-msgid "_Russian (ISO)"
-msgstr "_Rosyjski (ISO)"
-
-#: ../src/sendmsg-window.c:238
-msgid "_Russian (KOI)"
-msgstr "_Rosyjski (KOI)"
+#: ../src/sendmsg-window.c:289
+msgid "_Russian"
+msgstr "_Rosyjski"
 
-#: ../src/sendmsg-window.c:239
+#: ../src/sendmsg-window.c:290
 msgid "_Serbian"
 msgstr "_Serbski"
 
-#: ../src/sendmsg-window.c:240
+#: ../src/sendmsg-window.c:291
 msgid "_Serbian (Latin)"
 msgstr "_Serbski (Å?aciÅ?ski)"
 
-#: ../src/sendmsg-window.c:241
+#: ../src/sendmsg-window.c:292
 msgid "_Slovak"
 msgstr "_SÅ?owacki"
 
-#: ../src/sendmsg-window.c:242
+#: ../src/sendmsg-window.c:293
 msgid "_Spanish"
 msgstr "_HiszpaÅ?ski"
 
-#: ../src/sendmsg-window.c:243
+#: ../src/sendmsg-window.c:294
 msgid "_Swedish"
 msgstr "_Szwedzki"
 
-#: ../src/sendmsg-window.c:244
+#: ../src/sendmsg-window.c:295
+msgid "_Tatar"
+msgstr "_Tatarski"
+
+#: ../src/sendmsg-window.c:296
 msgid "_Turkish"
 msgstr "_Turecki"
 
-#: ../src/sendmsg-window.c:245
+#: ../src/sendmsg-window.c:297
 msgid "_Ukrainian"
 msgstr "_UkraiÅ?ski"
 
-#: ../src/sendmsg-window.c:246
+#: ../src/sendmsg-window.c:298
 msgid "_Generic UTF-8"
 msgstr "_OgÃ³lny UTF-8"
 
-# narazie nie tÅ?umaczone bo nie wiem gdzie to jest w menu
-#: ../src/sendmsg-window.c:270
-msgid "_GnuPG uses MIME mode"
-msgstr "_GnuPG uÅ¼ywa trybu MIME"
+#: ../src/sendmsg-window.c:324
+msgid "_Show"
+msgstr "_WyÅ?wietlanie"
 
-#: ../src/sendmsg-window.c:276
-msgid "_GnuPG uses old OpenPGP mode"
-msgstr "G_nuPG uÅ¼ywa starego trybu OpenPGP"
+#: ../src/sendmsg-window.c:325
+msgid "_Language"
+msgstr "_JÄ?zyk"
 
-#: ../src/sendmsg-window.c:283
-msgid "_S/MIME mode (GpgSM)"
-msgstr "Tryb _S/MIME (GpgSM)"
+#: ../src/sendmsg-window.c:326
+msgid "_Options"
+msgstr "_Opcje"
 
-#: ../src/sendmsg-window.c:298
-#: ../src/sendmsg-window.c:470
+#: ../src/sendmsg-window.c:333
 msgid "_Include File..."
 msgstr "_DoÅ?Ä?cz plik..."
 
-#: ../src/sendmsg-window.c:301
-#: ../src/sendmsg-window.c:483
+#: ../src/sendmsg-window.c:334
+msgid "Include a file"
+msgstr "DoÅ?Ä?cz plik"
+
+#: ../src/sendmsg-window.c:335
 msgid "_Attach File..."
 msgstr "_ZaÅ?Ä?cz plik..."
 
-#: ../src/sendmsg-window.c:304
-#: ../src/sendmsg-window.c:472
+#: ../src/sendmsg-window.c:336
+msgid "Attach a file"
+msgstr "ZaÅ?Ä?cz plik"
+
+#: ../src/sendmsg-window.c:337
 msgid "I_nclude Message(s)"
 msgstr "_DoÅ?Ä?cz list(y)"
 
-#: ../src/sendmsg-window.c:307
-#: ../src/sendmsg-window.c:475
+#: ../src/sendmsg-window.c:338
+msgid "Include selected message(s)"
+msgstr "DoÅ?Ä?cz zaznaczone list(y)"
+
+#: ../src/sendmsg-window.c:339
 msgid "Attach _Message(s)"
 msgstr "Z_aÅ?Ä?cz list(y)"
 
-#: ../src/sendmsg-window.c:313
-#: ../src/sendmsg-window.c:500
-msgid "Sen_d"
-msgstr "_WyÅ?lij"
+#: ../src/sendmsg-window.c:340
+msgid "Attach selected message(s)"
+msgstr "ZaÅ?Ä?cz zaznaczone list(y)"
 
-#: ../src/sendmsg-window.c:314
-#: ../src/sendmsg-window.c:501
-#: ../src/toolbar-factory.c:111
-msgid "Send this message"
-msgstr "WysyÅ?a list"
-
-#: ../src/sendmsg-window.c:318
-msgid "_Queue"
-msgstr "Zapisz w _kolejce"
-
-#: ../src/sendmsg-window.c:319
-#: ../src/sendmsg-window.c:506
-msgid "Queue this message in Outbox for sending"
-msgstr "Kolejkuje list w folderze \"Poczta wychodzÄ?ca\", przygotowujÄ?c go do wysÅ?ania"
-
-#: ../src/sendmsg-window.c:323
-msgid "_Postpone"
-msgstr "_OdÅ?Ã³Å¼"
-
-#: ../src/sendmsg-window.c:326
-#: ../src/sendmsg-window.c:487
+#: ../src/sendmsg-window.c:341
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ../src/sendmsg-window.c:327
-#: ../src/sendmsg-window.c:488
+#: ../src/sendmsg-window.c:342
 msgid "Save this message"
 msgstr "Zapisuje tworzony list"
 
-#: ../src/sendmsg-window.c:331
-#: ../src/sendmsg-window.c:492
+#: ../src/sendmsg-window.c:350
 msgid "Print the edited message"
 msgstr "Drukuje tworzony list"
 
+#: ../src/sendmsg-window.c:353
+msgid "_Undo"
+msgstr "Cofnij"
+
+#: ../src/sendmsg-window.c:354
+msgid "Undo most recent change"
+msgstr "CofniÄ?cie ostatniej zmiany"
+
+#: ../src/sendmsg-window.c:355
+msgid "_Redo"
+msgstr "_PonÃ³w"
+
+#: ../src/sendmsg-window.c:356
+msgid "Redo most recent change"
+msgstr "Ponowienie ostatniej zmiany"
+
+#: ../src/sendmsg-window.c:357
+msgid "Cu_t"
+msgstr "Wytnij"
+
+#: ../src/sendmsg-window.c:358
+msgid "Cut the selected text"
+msgstr "Wytnij zaznaczony tekst"
+
 #: ../src/sendmsg-window.c:360
-#: ../src/sendmsg-window.c:517
+msgid "Copy to the clipboard"
+msgstr "Skopiuj do schowka"
+
+#: ../src/sendmsg-window.c:361
+msgid "_Paste"
+msgstr "_Wklej"
+
+#: ../src/sendmsg-window.c:362
+msgid "Paste from the clipboard"
+msgstr "Wklej ze schowka"
+
+#: ../src/sendmsg-window.c:365
 msgid "_Wrap Body"
 msgstr "_Zawijanie treÅ?ci"
 
-#: ../src/sendmsg-window.c:364
-#: ../src/sendmsg-window.c:521
+#: ../src/sendmsg-window.c:367
 msgid "_Reflow Selected Text"
-msgstr "Przefo_rmatowanie zaznaczonego tekstu"
+msgstr "_Przeformatowanie zaznaczonego tekstu"
 
 #: ../src/sendmsg-window.c:369
-#: ../src/sendmsg-window.c:549
 msgid "Insert Si_gnature"
 msgstr "Wstaw p_odpis"
 
-#: ../src/sendmsg-window.c:373
-#: ../src/sendmsg-window.c:525
+#: ../src/sendmsg-window.c:371
 msgid "_Quote Message(s)"
 msgstr "_Zacytuj listy"
 
-#: ../src/sendmsg-window.c:378
-#: ../src/sendmsg-window.c:598
+#: ../src/sendmsg-window.c:374
+#: ../src/sendmsg-window.c:416
 msgid "C_heck Spelling"
 msgstr "_SprawdÅº pisowniÄ?"
 
-#: ../src/sendmsg-window.c:379
-#: ../src/sendmsg-window.c:599
+#: ../src/sendmsg-window.c:375
+#: ../src/sendmsg-window.c:417
 msgid "Check the spelling of the message"
 msgstr "Rozpoczyna sprawdzanie pisowni listu"
 
-#: ../src/sendmsg-window.c:384
-#: ../src/sendmsg-window.c:605
+#: ../src/sendmsg-window.c:378
 msgid "Select _Identity..."
 msgstr "Wybierz _toÅ¼samoÅ?Ä?..."
 
-#: ../src/sendmsg-window.c:385
-#: ../src/sendmsg-window.c:606
+#: ../src/sendmsg-window.c:379
 msgid "Select the Identity to use for the message"
 msgstr "Wybierz toÅ¼samoÅ?Ä? wykorzystanÄ? przy wysÅ?aniu listu"
 
-#: ../src/sendmsg-window.c:390
+#: ../src/sendmsg-window.c:382
 msgid "_Edit with Gnome-Editor"
-msgstr "Zr_edaguj przy uÅ¼yciu edytora GNOME"
+msgstr "_Zredaguj przy uÅ¼yciu edytora GNOME"
 
-#: ../src/sendmsg-window.c:391
+#: ../src/sendmsg-window.c:383
 msgid "Edit the current message with the default Gnome editor"
 msgstr "Redaguje bieÅ¼Ä?cy listy przy uÅ¼yciu domyÅ?lnego edytora GNOME"
 
+#. All three "Send" and "Queue" actions have the same
+#. * stock_id; the first in this list defines the action tied to the
+#. * toolbar's "Send" button, so "ToolbarSend" must come before
+#. * the others.
+#: ../src/sendmsg-window.c:394
+#: ../src/sendmsg-window.c:396
+msgid "Sen_d"
+msgstr "_WyÅ?lij"
+
+#: ../src/sendmsg-window.c:395
+#: ../src/sendmsg-window.c:397
+msgid "Send this message"
+msgstr "WysyÅ?a list"
+
+#: ../src/sendmsg-window.c:399
+msgid "_Queue"
+msgstr "Zapisz w _kolejce"
+
+#: ../src/sendmsg-window.c:400
+#: ../src/sendmsg-window.c:406
+msgid "Queue this message in Outbox for sending"
+msgstr "Kolejkuje list w folderze \"Poczta wychodzÄ?ca\", przygotowujÄ?c go do wysÅ?ania"
+
+#: ../src/sendmsg-window.c:402
+msgid "_Postpone"
+msgstr "_OdÅ?Ã³Å¼"
+
 #: ../src/sendmsg-window.c:403
-#: ../src/sendmsg-window.c:562
-msgid "Fr_om"
-msgstr "_Od"
+msgid "Save this message and close"
+msgstr "Zapisuje tworzony list i zamknij"
 
 #: ../src/sendmsg-window.c:405
-#: ../src/sendmsg-window.c:564
-msgid "_Cc"
-msgstr "_Cc"
+msgid "Send _Later"
+msgstr "WyÅ?lij pÃ³Åºni_ej"
 
-#: ../src/sendmsg-window.c:407
-#: ../src/sendmsg-window.c:566
-msgid "_Bcc"
-msgstr "_Bcc"
+#: ../src/sendmsg-window.c:408
+msgid "Sa_ve and Close"
+msgstr "Zapi_sz i zamknij"
 
-#: ../src/sendmsg-window.c:409
-#: ../src/sendmsg-window.c:568
-msgid "_Fcc"
-msgstr "_Fcc"
+#: ../src/sendmsg-window.c:420
+msgid "F_rom"
+msgstr "_Od:"
 
-#: ../src/sendmsg-window.c:411
-msgid "_Reply To"
-msgstr "Odpo_wiedz"
+#: ../src/sendmsg-window.c:422
+msgid "Rec_ipients"
+msgstr "Odbiorcy"
 
-#: ../src/sendmsg-window.c:417
-#: ../src/sendmsg-window.c:610
+#: ../src/sendmsg-window.c:424
+msgid "R_eply To"
+msgstr "O_dpowiedÅº do:"
+
+#: ../src/sendmsg-window.c:426
+msgid "F_cc"
+msgstr "F_cc:"
+
+#: ../src/sendmsg-window.c:429
 msgid "_Request Disposition Notification"
-msgstr "Å»Ä?_danie powiadomienia o otrzymaniu (MDM)"
+msgstr "_Å»Ä?danie powiadomienia o otrzymaniu (MDM)"
 
-#: ../src/sendmsg-window.c:420
-#: ../src/sendmsg-window.c:580
+#: ../src/sendmsg-window.c:430
+msgid "Request Message Disposition Notification"
+msgstr "Å»Ä?danie wiadomoÅ?ci powiadomienia o otrzymaniu (MDM)"
+
+#: ../src/sendmsg-window.c:432
 msgid "_Format = Flowed"
 msgstr "P_rzeformatowywanie"
 
-#: ../src/sendmsg-window.c:425
-#: ../src/sendmsg-window.c:585
+#: ../src/sendmsg-window.c:434
+msgid "Send as plain text and _HTML"
+msgstr "Wyslij jako text i html"
+
+#: ../src/sendmsg-window.c:438
+#: ../src/sendmsg-window.c:444
 msgid "_Sign Message"
 msgstr "_Podpisanie listu"
 
-#: ../src/sendmsg-window.c:426
-#: ../src/sendmsg-window.c:586
-msgid "signs the message using GnuPG"
+#: ../src/sendmsg-window.c:439
+msgid "Sign message using GPG"
 msgstr "podpisanie listu nie przy uÅ¼yciu GnuPG"
 
-#: ../src/sendmsg-window.c:429
-#: ../src/sendmsg-window.c:589
+#: ../src/sendmsg-window.c:440
+#: ../src/sendmsg-window.c:447
 msgid "_Encrypt Message"
 msgstr "Za_szyfrowanie listu"
 
-#: ../src/sendmsg-window.c:430
-#: ../src/sendmsg-window.c:590
-msgid "signs the message using GnuPG for all To: and CC: recipients"
-msgstr "podpisanie listu przy uÅ¼yciu GnuPG dla wszystkich odbiorcÃ³w z pÃ³l Dla: i CC:"
+#: ../src/sendmsg-window.c:441
+msgid "Encrypt message using GPG"
+msgstr "Zaszyfrowanie listu przy uÅ¼yciu GPG"
 
-#: ../src/sendmsg-window.c:450
-#: ../src/sendmsg-window.c:626
-msgid "_Show"
-msgstr "_WyÅ?wietlanie"
+#: ../src/sendmsg-window.c:445
+msgid "signs the message using GnuPG"
+msgstr "podpisanie listu przy uÅ¼yciu GnuPG"
 
-#: ../src/sendmsg-window.c:452
-#: ../src/sendmsg-window.c:603
-msgid "_Language"
-msgstr "_JÄ?zyk"
+#: ../src/sendmsg-window.c:449
+msgid "signs the message using GnuPG for all To: and CC: recipients"
+msgstr "podpisanie listu przy uÅ¼yciu GnuPG dla wszystkich odbiorcÃ³w z pÃ³l Dla: i CC:"
 
-#: ../src/sendmsg-window.c:454
-msgid "_Options"
-msgstr "_Opcje"
+#: ../src/sendmsg-window.c:459
+msgid "_GnuPG uses MIME mode"
+msgstr "_GnuPG uÅ¼ywa trybu MIME"
 
-#: ../src/sendmsg-window.c:496
-msgid "Sa_ve and Close"
-msgstr "Zapi_sz i zamknij"
+#: ../src/sendmsg-window.c:461
+msgid "_GnuPG uses old OpenPGP mode"
+msgstr "G_nuPG uÅ¼ywa starego trybu OpenPGP"
 
-#: ../src/sendmsg-window.c:505
-msgid "Send _Later"
-msgstr "WyÅ?lij pÃ³Åºni_ej"
+#: ../src/sendmsg-window.c:464
+msgid "_S/MIME mode (GpgSM)"
+msgstr "Tryb _S/MIME (GpgSM)"
 
-#: ../src/sendmsg-window.c:656
+#: ../src/sendmsg-window.c:676
 msgid "Attachment"
 msgstr "ZaÅ?Ä?cznik"
 
-#: ../src/sendmsg-window.c:656
+#: ../src/sendmsg-window.c:676
 msgid "Inline"
 msgstr "CzÄ?Å?Ä? listu"
 
-#: ../src/sendmsg-window.c:656
+#: ../src/sendmsg-window.c:676
 msgid "Reference"
 msgstr "OdwoÅ?anie"
 
-#: ../src/sendmsg-window.c:871
+#: ../src/sendmsg-window.c:906
+msgid "(No name)"
+msgstr "(brak nazwy)"
+
+#: ../src/sendmsg-window.c:920
 #, c-format
 msgid ""
 "The message to '%s' is modified.\n"
@@ -5639,15 +6484,15 @@ msgstr ""
 "List dla \"%s\" zostaÅ? zmieniony.\n"
 "Czy zapisaÄ? go w folderze Poczta robocza?"
 
-#: ../src/sendmsg-window.c:1140
+#: ../src/sendmsg-window.c:1257
 msgid "Gnome editor is not defined in your preferred applications."
 msgstr "Edytor GNOME nie jest zdefiniowany w preferowanych aplikacjach."
 
-#: ../src/sendmsg-window.c:1191
+#: ../src/sendmsg-window.c:1313
 msgid "Select Identity"
 msgstr "Wybierz toÅ¼samoÅ?Ä?"
 
-#: ../src/sendmsg-window.c:1568
+#: ../src/sendmsg-window.c:1757
 #, c-format
 msgid ""
 "Saying yes will not send the file `%s' itself, but just a MIME message/external-body reference.  Note that the recipient must have proper permissions to see the `real' file.\n"
@@ -5658,88 +6503,79 @@ msgstr ""
 "\n"
 "Czy rzeczywiÅ?cie chcesz zaÅ?Ä?czyÄ? ten plik jako odnoÅ?nik?"
 
-#: ../src/sendmsg-window.c:1579
+#: ../src/sendmsg-window.c:1767
 msgid "Attach as Reference?"
 msgstr "ZaÅ?Ä?czyÄ? jako odnoÅ?nik?"
 
-#: ../src/sendmsg-window.c:1692
+#: ../src/sendmsg-window.c:1864
 msgid "Choose charset"
 msgstr "WybÃ³r zestawu znakÃ³w"
 
-#: ../src/sendmsg-window.c:1699
-#, fuzzy, c-format
+#: ../src/sendmsg-window.c:1871
+#, c-format
 msgid ""
 "File\n"
 "%s\n"
 "is not encoded in US-ASCII or UTF-8.\n"
 "Please choose the charset used to encode the file."
 msgstr ""
-"Plik nie jest zakodowany przy uÅ¼yciu US-ASCII ani UTF-8.\n"
-"Wybierz zestaw znakÃ³w do zakodowania pliku.\n"
-"(w razie braku pewnoÅ?ci, wybierz zwykÅ?e UTF-8)."
+"Plik\n"
+"%s\n"
+"nie jest kodowany w US-ASCII albo UTF-8.\n"
+"ProszÄ? wybraÄ? kodowanie uÅ¼yte przy kodowaniu pliku."
 
-#: ../src/sendmsg-window.c:1715
+#: ../src/sendmsg-window.c:1887
 msgid "Attach as MIME type:"
 msgstr "ZaÅ?Ä?cz jako typ MIME:"
 
-#: ../src/sendmsg-window.c:1771
+#: ../src/sendmsg-window.c:1944
 #, c-format
 msgid "Character set for file %s changed from \"%s\" to \"%s\"."
 msgstr "Kodowanie dla pliku %s zmieniÅ?o siÄ? z \"%s\" na \"%s\"."
 
-#: ../src/sendmsg-window.c:1814
+#: ../src/sendmsg-window.c:1987
+#: ../src/sendmsg-window.c:5674
 msgid "(no subject)"
 msgstr "(brak tematu)"
 
-#: ../src/sendmsg-window.c:1900
+#: ../src/sendmsg-window.c:2030
+#, c-format
+msgid "Cannot create file URI object for %s"
+msgstr "Nie moÅ¼na byÅ?o utworzyÄ? pliku URI obiektu dla %s"
+
+#: ../src/sendmsg-window.c:2038
+msgid "unknown error"
+msgstr "Nieznany bÅ?Ä?d"
+
+#: ../src/sendmsg-window.c:2085
 msgid "forwarded message"
 msgstr "PrzeÅ?lij bieÅ¼Ä?cy list dalej"
 
-#: ../src/sendmsg-window.c:1905
+#: ../src/sendmsg-window.c:2090
 #, c-format
 msgid "Message from %s, subject: \"%s\""
 msgstr "WiadomoÅ?Ä? od %s, temat \"%s\")"
 
-#: ../src/sendmsg-window.c:1923
-#, c-format
-msgid "Error converting \"%s\" to UTF-8: %s\n"
-msgstr "BÅ?Ä?d przy przeksztaÅ?caniu \"%s\" do UTF-8: %s\n"
-
-#: ../src/sendmsg-window.c:1993
-#: ../src/sendmsg-window.c:2064
+#: ../src/sendmsg-window.c:2166
+#: ../src/sendmsg-window.c:2239
 msgid "Remove"
 msgstr "UsuÅ?"
 
-#: ../src/sendmsg-window.c:2076
+#: ../src/sendmsg-window.c:2251
 msgid "Open..."
 msgstr "OtwÃ³rz..."
 
-#: ../src/sendmsg-window.c:2088
+#: ../src/sendmsg-window.c:2263
 msgid "(URL)"
 msgstr "(URL)"
 
-#: ../src/sendmsg-window.c:2109
-#, c-format
-msgid "Cannot get info on file '%s': %s"
-msgstr "Nie moÅ¼na pobraÄ? informacji o pliku \"%s\" : %s"
-
-#: ../src/sendmsg-window.c:2114
-#, c-format
-msgid "Attachment %s is not a regular file."
-msgstr "ZaÅ?Ä?cznik %s nie jest zwykÅ?ym plikiem."
-
-#: ../src/sendmsg-window.c:2117
-#, c-format
-msgid "File %s cannot be read\n"
-msgstr "Nie moÅ¼na odczytaÄ? pliku %s\n"
-
-#: ../src/sendmsg-window.c:2166
+#: ../src/sendmsg-window.c:2321
 msgid "Attach file"
 msgstr "ZaÅ?Ä?cz plik"
 
-#: ../src/sendmsg-window.c:2253
-#: ../src/sendmsg-window.c:2362
-#: ../src/sendmsg-window.c:4024
+#: ../src/sendmsg-window.c:2419
+#: ../src/sendmsg-window.c:2528
+#: ../src/sendmsg-window.c:4960
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -5747,328 +6583,450 @@ msgstr ""
 "ZaÅ?Ä?czenie listu nie powiodÅ?o siÄ?.\n"
 "MoÅ¼liwa przyczyna: brak miejsca na pliki tymczasowe"
 
-#: ../src/sendmsg-window.c:2582
+#: ../src/sendmsg-window.c:2756
 msgid "F_rom:"
 msgstr "_Od:"
 
 #. Subject:
-#: ../src/sendmsg-window.c:2717
+#: ../src/sendmsg-window.c:2903
 msgid "S_ubject:"
 msgstr "_Temat:"
 
 #. fcc: mailbox folder where the message copy will be written to
-#: ../src/sendmsg-window.c:2731
+#: ../src/sendmsg-window.c:2914
 msgid "F_cc:"
 msgstr "F_cc:"
 
-#. Reply To:
-#: ../src/sendmsg-window.c:2762
-msgid "_Reply To:"
-msgstr "O_dpowiedÅº do:"
-
 #. Attachment list
-#: ../src/sendmsg-window.c:2767
+#: ../src/sendmsg-window.c:2943
 msgid "_Attachments:"
 msgstr "_ZaÅ?Ä?czniki:"
 
-#: ../src/sendmsg-window.c:2812
+#: ../src/sendmsg-window.c:2992
 msgid "Mode"
 msgstr "Tryb"
 
-#: ../src/sendmsg-window.c:2835
+#: ../src/sendmsg-window.c:3015
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/sendmsg-window.c:3108
+#: ../src/sendmsg-window.c:3334
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "Nie moÅ¼na zapisaÄ? zaÅ?Ä?czonego pliku: %s"
 
-#: ../src/sendmsg-window.c:3144
+#: ../src/sendmsg-window.c:3358
+msgid "No subject"
+msgstr "Brak tematu"
+
+#: ../src/sendmsg-window.c:3391
+#, c-format
+msgid "inlined file \"%s\" (%s)"
+msgstr "plik o treÅ?ci \"%s\" (%s)"
+
+#: ../src/sendmsg-window.c:3394
+#, c-format
+msgid "attached file \"%s\" (%s)"
+msgstr "zaÅ?Ä?czony plik \"%s\" (%s)"
+
+#: ../src/sendmsg-window.c:3398
+#, c-format
+msgid "inlined %s part"
+msgstr "dodano %s czÄ?Å?Ä?"
+
+#: ../src/sendmsg-window.c:3400
+#, c-format
+msgid "attached %s part"
+msgstr "zaÅ?Ä?czona %s czÄ?Å?Ä?"
+
+#: ../src/sendmsg-window.c:3468
+#, c-format
+msgid "message from %s, subject \"%s\""
+msgstr "wiadomoÅ?Ä? od %s, temat \"%s\""
+
+#: ../src/sendmsg-window.c:3595
+msgid "quoted"
+msgstr "cytowanie"
+
+#: ../src/sendmsg-window.c:3600
+#: ../src/sendmsg-window.c:3603
+msgid "quoted attachment"
+msgstr "cytowany zaÅ?Ä?cznik"
+
+#: ../src/sendmsg-window.c:3628
+msgid "Select parts for quotation"
+msgstr "Zaznacz czÄ?Å?ci do cytowania"
+
+#: ../src/sendmsg-window.c:3634
+msgid "Select the parts of the message which shall be quoted in the reply"
+msgstr "Zaznacz czÄ?Å?ci wiadomoÅ?ci, ktÃ³re powinny byc zacytowane w odpowiedzi"
+
+#: ../src/sendmsg-window.c:3776
 msgid "you"
 msgstr "ty"
 
-#: ../src/sendmsg-window.c:3153
+#: ../src/sendmsg-window.c:3785
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------przesÅ?any list od %s------\n"
 
-#: ../src/sendmsg-window.c:3192
+#: ../src/sendmsg-window.c:3822
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "ID-listu: %s\n"
 
-#: ../src/sendmsg-window.c:3198
+#: ../src/sendmsg-window.c:3828
 msgid "References:"
 msgstr "OdwoÅ?ania:"
 
-#: ../src/sendmsg-window.c:3209
+#: ../src/sendmsg-window.c:3839
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Dnia %s, %s napisaÅ?(a):\n"
 
-#: ../src/sendmsg-window.c:3211
+#: ../src/sendmsg-window.c:3841
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s napisaÅ?(a):\n"
 
-#: ../src/sendmsg-window.c:3309
+#: ../src/sendmsg-window.c:3951
 msgid "No signature found!"
 msgstr "Nie znaleziono podpisu PGP: "
 
-#: ../src/sendmsg-window.c:4142
-#, c-format
-msgid "Error executing signature generator %s"
-msgstr "BÅ?Ä?d przy uruchamianiu generatora podpisÃ³w %s"
+#: ../src/sendmsg-window.c:4133
+msgid "Could not save message."
+msgstr "Nie moÅ¼na zapisaÄ? wiadomoÅ?ci."
 
-#: ../src/sendmsg-window.c:4154
+#: ../src/sendmsg-window.c:4140
 #, c-format
-msgid "Cannot open signature file '%s' for reading"
-msgstr "Nie moÅ¼na otworzyÄ? pliku z podpisem %s."
+msgid "Could not open draftbox: %s"
+msgstr "Nie moÅ¼na otworzyÄ? szkicÃ³w: %s"
 
-#: ../src/sendmsg-window.c:4164
-#, c-format
-msgid "Error reading signature from %s"
-msgstr "BÅ?Ä?d przy odczycie zaÅ?Ä?czonego podpisu z %s"
+#: ../src/sendmsg-window.c:4161
+msgid "Message saved."
+msgstr "List zapisany."
 
-#: ../src/sendmsg-window.c:4168
+#: ../src/sendmsg-window.c:5128
+#: ../src/sendmsg-window.c:5136
+#: ../src/sendmsg-window.c:5143
+#: ../src/sendmsg-window.c:5150
+#: ../src/sendmsg-window.c:5174
 #, c-format
-msgid "Signature in %s is not a UTF-8 text."
-msgstr "Podpis w %s nie jest tekstem zakodowanym w UTF-8."
+msgid "Could not attach the file %s: %s."
+msgstr "Nie moÅ¼na zaÅ?Ä?czyÄ? pliku %s: %s."
+
+#: ../src/sendmsg-window.c:5129
+msgid "not an absolute path"
+msgstr "nie jest Å?cieÅ¼kÄ? absolutnÄ?"
+
+#: ../src/sendmsg-window.c:5137
+msgid "not in your directory"
+msgstr "brak w twoim katalogu"
+
+#: ../src/sendmsg-window.c:5144
+msgid "does not exist"
+msgstr "nie istnieje"
+
+#: ../src/sendmsg-window.c:5175
+msgid "not in current directory"
+msgstr "brak w bieÅ¼Ä?cym katalogu"
 
-#: ../src/sendmsg-window.c:4231
+#: ../src/sendmsg-window.c:5225
+msgid ""
+"The link that you selected created\n"
+"a \"Blind copy\" (Bcc) address.\n"
+"Please check that the address\n"
+"is appropriate."
+msgstr ""
+"Link ktÃ³ry wybrano stworzyÅ?\n"
+"\"Blind copy\" (Bcc) adres.\n"
+"SprawdÅº czy adres\n"
+"jest poprawny."
+
+#: ../src/sendmsg-window.c:5306
 #, c-format
 msgid "Could not open the file %s.\n"
 msgstr "Nie moÅ¼na otworzyÄ? pliku %s.\n"
 
-#: ../src/sendmsg-window.c:4288
+#: ../src/sendmsg-window.c:5354
 msgid "Include file"
 msgstr "DoÅ?Ä?cz plik"
 
-#: ../src/sendmsg-window.c:4640
-msgid "You selected OpenPGP mode for a message with attachments. In this mode, only the first part will be signed and/or encrypted. You should select MIME mode if the complete message shall be protected. Do you really want to proceed?"
-msgstr "Wybrano tryb OpenPGP dla listu z zaÅ?Ä?cznikami. W tym trybie, tylko pierwsza czÄ?Å?Ä? zostanie podpisana i/lub zaszyfrowana. JeÅ¼eli caÅ?y list ma byÄ? chroniony, naleÅ¼y wybraÄ? tryb MIME. Czy chcesz kontynuowaÄ??"
+#. Translators: please do not translate Face.
+#: ../src/sendmsg-window.c:5536
+#, c-format
+msgid "Could not load Face header file %s: %s"
+msgstr "Nie moÅ¼na byÅ?o zaÅ?adowaÄ? pliku nagÅ?Ã³wkowego Face %s: %s"
+
+#. Translators: please do not translate Face.
+#: ../src/sendmsg-window.c:5539
+#, c-format
+msgid "Could not load X-Face header file %s: %s"
+msgstr "Nie moÅ¼na byÅ?o zaÅ?adowaÄ? pliku nagÅ?Ã³wkowego X-face %s: %s"
+
+#: ../src/sendmsg-window.c:5658
+msgid "You did not specify a subject for this message"
+msgstr "Nie okreÅ?lono tematu tej wiadomoÅ?ci"
 
-# nie jestem pewien poprawnoÅ?ci
-#: ../src/sendmsg-window.c:4656
+#: ../src/sendmsg-window.c:5659
+msgid "If you would like to provide one, enter it below."
+msgstr "JeÅ?li chcesz dodaÄ? temat wiadomoÅ?ci, wpisz go poniÅ¼ej."
+
+#: ../src/sendmsg-window.c:5700
+msgid "_Send"
+msgstr "_WyÅ?lij"
+
+#: ../src/sendmsg-window.c:5772
+#, c-format
+msgid "You did not select encryption for this message, although %s public keys are available for all recipients. In order to protect your privacy, the message could be %s encrypted."
+msgstr "Nie wybraÅ?eÅ? szyfrowania tej wiadomoÅ?ci, chociaÅ¼ %s publiczne klucze sÄ? dostÄ?pne dla wszystkich odbiorcÃ³w. Aby chroniÄ? wÅ?asnÄ? prywatnoÅ?Ä?, wiadomoÅ?Ä? mogÅ?aby byÄ? %s zaszyfrowana."
+
+#: ../src/sendmsg-window.c:5792
+msgid "Send _encrypted"
+msgstr "WyÅ?lij _zaszyfrowane"
+
+#: ../src/sendmsg-window.c:5806
+msgid "Send _plain"
+msgstr "WyÅ?lij bez _szyfrowania"
+
+#: ../src/sendmsg-window.c:5865
+msgid "You selected OpenPGP security for this message.\n"
+msgstr "Wybrano tryb OpenPGP dla tego listu. \n"
+
+#: ../src/sendmsg-window.c:5870
+msgid "The message text will be sent as plain text and as HTML, but only the plain part can be signed.\n"
+msgstr "Tekst wiadomoÅ?ci bÄ?dzie wysÅ?any jako zwykÅ?y tekst i jako HTML, ale tylko czÄ?Å?Ä? zawierajÄ?ca zwykÅ?y tekst moÅ¼e zostaÄ? podpisana.\n"
+
+#: ../src/sendmsg-window.c:5875
+msgid ""
+"The message contains attachments, which cannot be signed or encrypted\n"
+"."
+msgstr ""
+"WiadomoÅ?Ä? zawiera zaÅ?Ä?czniki, ktÃ³rych nie moÅ¼na podpisaÄ? bÄ?dÅº zaszyfrowaÄ?\n"
+"."
+
+#: ../src/sendmsg-window.c:5879
+msgid "You should select MIME mode if the complete message shall be protected. Do you really want to proceed?"
+msgstr "JeÅ¼eli caÅ?y list ma byÄ? chroniony, naleÅ¼y wybraÄ? tryb MIME. Czy chcesz kontynuowaÄ??"
+
+#: ../src/sendmsg-window.c:5901
 #, c-format
 msgid "sending message with gpg mode %d"
 msgstr "wysyÅ?anie listu z uÅ¼yciem trybu gpg %d"
 
-#: ../src/sendmsg-window.c:4702
+#: ../src/sendmsg-window.c:5938
 msgid "Message could not be created"
 msgstr "Nie moÅ¼na utworzyÄ? listu"
 
-#: ../src/sendmsg-window.c:4704
+#: ../src/sendmsg-window.c:5940
 msgid "Message could not be queued in outbox"
 msgstr "Nie moÅ¼na skolejkowaÄ? listu w skrzynce wychodzÄ?cych"
 
-#: ../src/sendmsg-window.c:4706
+#: ../src/sendmsg-window.c:5942
 msgid "Message could not be saved in sentbox"
 msgstr "Nie moÅ¼na zapisaÄ? listu w skrzynce wysÅ?anych"
 
-#: ../src/sendmsg-window.c:4708
+#: ../src/sendmsg-window.c:5944
 msgid "Message could not be sent"
 msgstr "Nie moÅ¼na wysÅ?aÄ? listu"
 
-#: ../src/sendmsg-window.c:4712
+#: ../src/sendmsg-window.c:5947
+msgid "Message could not be signed"
+msgstr "Nie moÅ¼na podpisaÄ? listu"
+
+#: ../src/sendmsg-window.c:5949
+msgid "Message could not be encrypted"
+msgstr "Nie moÅ¼na zaszyfrowaÄ? wiadomoÅ?ci"
+
+#: ../src/sendmsg-window.c:5955
+#, c-format
+msgid ""
+"Send failed: %s\n"
+"%s"
+msgstr ""
+"WysÅ?anie nie powiodÅ?o siÄ?: %s\n"
+"%s"
+
+#: ../src/sendmsg-window.c:5960
 #, c-format
 msgid "Send failed: %s"
 msgstr "WysÅ?anie nie powiodÅ?o siÄ?: %s"
 
-#: ../src/sendmsg-window.c:4778
-msgid "Could not postpone message."
-msgstr "Nie moÅ¼na odÅ?oÅ¼yÄ? listu."
+#: ../src/sendmsg-window.c:6049
+#, c-format
+msgid "Could not postpone message: %s"
+msgstr "Nie moÅ¼na odÅ?oÅ¼yÄ? listu: %s"
 
-#: ../src/sendmsg-window.c:4792
+#: ../src/sendmsg-window.c:6066
 msgid "Message postponed."
 msgstr "List odÅ?oÅ¼ony."
 
-#: ../src/sendmsg-window.c:4808
-#, c-format
-msgid "Could not open draftbox: %s"
-msgstr "Nie moÅ¼na otworzyÄ? szkicÃ³w: %s"
+#: ../src/sendmsg-window.c:6071
+msgid "Could not postpone message."
+msgstr "Nie mozna odÅ?ozyÄ? listu."
 
-#: ../src/sendmsg-window.c:4830
-msgid "Message saved."
-msgstr "List zapisany."
+#: ../src/sendmsg-window.c:6226
+#, c-format
+msgid "Error starting spell checker: %s"
+msgstr "BÅ?Ä?d podczas sprawdzania pisowni: %s"
 
-#: ../src/sendmsg-window.c:4998
+#: ../src/sendmsg-window.c:6393
 #, c-format
 msgid "Could not compile %s"
 msgstr "Nie moÅ¼na skompilowaÄ? %s"
 
-#: ../src/sendmsg-window.c:5491
+#: ../src/sendmsg-window.c:6394
+msgid "Quoted Text Regular Expression"
+msgstr "Cytowany tekst staÅ?y zwrot"
+
+#: ../src/sendmsg-window.c:6884
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "OdpowiedÅº do %s: %s"
 
-#: ../src/sendmsg-window.c:5496
+#: ../src/sendmsg-window.c:6889
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "PrzesÅ?anie listu do %s: %s"
 
-#: ../src/sendmsg-window.c:5500
+#: ../src/sendmsg-window.c:6893
 #, c-format
 msgid "Continue message to %s: %s"
 msgstr "Kontynuacja listu do %s: %s"
 
-#: ../src/sendmsg-window.c:5504
+#: ../src/sendmsg-window.c:6897
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Nowy list do %s: %s"
 
-#: ../src/spell-check.c:511
+#: ../src/spell-check.c:513
+#: ../src/spell-check.c:517
 msgid "Replace the current word with the selected suggestion"
 msgstr "ZastÄ?puje bieÅ¼Ä?ce sÅ?owo zaznaczonÄ? propozycjÄ?"
 
-#: ../src/spell-check.c:519
-msgid "Replace all occurences of the current word with the selected suggestion"
+#: ../src/spell-check.c:527
+#: ../src/spell-check.c:531
+msgid "Replace all occurrences of the current word with the selected suggestion"
 msgstr "ZastÄ?puje wszystkie wystÄ?pienia sÅ?owa zaznaczonÄ? propozycjÄ?"
 
-#: ../src/spell-check.c:531
+#: ../src/spell-check.c:545
+#: ../src/spell-check.c:548
 msgid "Skip the current word"
 msgstr "Pomija bieÅ¼Ä?ce sÅ?owo"
 
-#: ../src/spell-check.c:537
+#: ../src/spell-check.c:556
+#: ../src/spell-check.c:559
 msgid "Skip all occurrences of the current word"
 msgstr "Pomija wszystkie wystÄ?pienia sÅ?owa"
 
-#: ../src/spell-check.c:547
+#: ../src/spell-check.c:571
+#: ../src/spell-check.c:574
 msgid "Add the current word to your personal dictionary"
 msgstr "Dodaje bieÅ¼Ä?ce sÅ?owo do osobistego sÅ?ownika"
 
-#: ../src/spell-check.c:556
+#: ../src/spell-check.c:584
+#: ../src/spell-check.c:587
 msgid "Finish spell checking"
 msgstr "ZakoÅ?cz sprawdzanie pisowni"
 
-#: ../src/spell-check.c:561
+#: ../src/spell-check.c:594
+#: ../src/spell-check.c:597
 msgid "Revert all changes and finish spell checking"
 msgstr "Wycofuje wszystkie zmiany i koÅ?czy sprawdzanie pisowni"
 
-#: ../src/spell-check.c:592
+#: ../src/spell-check.c:629
 msgid "Spell check"
 msgstr "Sprawdzanie pisowni"
 
-#: ../src/store-address.c:104
+#: ../src/store-address.c:105
 msgid "Store address: no addresses"
 msgstr "Zapis adresu: brak adresÃ³w"
 
-#: ../src/store-address.c:181
+#: ../src/store-address.c:200
 msgid "Store Address"
 msgstr "Zapis adresu"
 
-#: ../src/store-address.c:199
+#: ../src/store-address.c:218
 msgid "Save this address and close the dialog?"
 msgstr "Czy zapisaÄ? ten adres i zamknÄ?Ä? okno?"
 
-#: ../src/store-address.c:217
+#: ../src/store-address.c:236
 msgid "No address book selected...."
 msgstr "Nie wybrano ksiÄ?Å¼ki adresowej"
 
-#: ../src/store-address.c:230
+#: ../src/store-address.c:249
 msgid "Address could not be written to this address book."
 msgstr "Nie moÅ¼na zapisaÄ? adresu do tej ksiÄ?Å¼ki adresowej."
 
-#: ../src/store-address.c:233
+#: ../src/store-address.c:252
 msgid "Address book could not be accessed."
 msgstr "Brak dostÄ?pu do ksiÄ?Å¼ki adresowej."
 
-#: ../src/store-address.c:235
+#: ../src/store-address.c:254
 msgid "This mail address is already in this address book."
 msgstr "Ten adres e-mail jest juÅ¼ w ksiÄ?Å¼ce adresowej."
 
-#: ../src/store-address.c:238
+#: ../src/store-address.c:257
 msgid "Unexpected address book error. Report it."
 msgstr "Nieoczekiwany bÅ?Ä?d ksiÄ?Å¼ki adresowej. ZgÅ?oÅ? bÅ?Ä?d autorom programu."
 
-#: ../src/store-address.c:254
+#: ../src/store-address.c:273
 msgid "Choose Address Book"
 msgstr "WybÃ³r ksiÄ?Å¼ki adresowej"
 
-#: ../src/store-address.c:293
+#: ../src/store-address.c:312
 msgid "Choose Address"
 msgstr "WybÃ³r adresu"
 
-#: ../src/toolbar-factory.c:77
+#: ../src/toolbar-factory.c:129
 msgid "Separator"
 msgstr "Separator"
 
-#: ../src/toolbar-factory.c:78
+#: ../src/toolbar-factory.c:130
+msgid "Quit"
+msgstr "WyjdÅº"
+
+#: ../src/toolbar-factory.c:131
 msgid "Check"
 msgstr "SprawdÅº"
 
-#: ../src/toolbar-factory.c:79
-msgid "Check for new email"
-msgstr "Sprawdza nowÄ? pocztÄ?"
-
-#: ../src/toolbar-factory.c:80
+#: ../src/toolbar-factory.c:132
 msgid "Compose"
 msgstr "Nowy"
 
-#: ../src/toolbar-factory.c:81
-msgid "Compose message"
-msgstr "Tworzy nowy list"
-
-#: ../src/toolbar-factory.c:82
+#: ../src/toolbar-factory.c:133
 msgid "Continue"
 msgstr "Kontynuuj"
 
-#: ../src/toolbar-factory.c:83
-msgid "Continue message"
-msgstr "Kontynuacja listu"
-
-#: ../src/toolbar-factory.c:84
+#: ../src/toolbar-factory.c:134
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: ../src/toolbar-factory.c:86
+#: ../src/toolbar-factory.c:135
 msgid ""
 "Reply\n"
 "to all"
 msgstr "Wszystkim"
 
-#: ../src/toolbar-factory.c:87
-msgid "Reply to all recipients"
-msgstr "Odpowiada autorowi i wszystkim adresatom listu"
-
-#: ../src/toolbar-factory.c:88
+#: ../src/toolbar-factory.c:136
 msgid ""
 "Reply\n"
 "to group"
-msgstr "Do grupy"
+msgstr ""
+"Odpowiedz\n"
+"do grupy"
 
-#: ../src/toolbar-factory.c:90
+#: ../src/toolbar-factory.c:137
 msgid "Forward"
 msgstr "Dalej"
 
-#: ../src/toolbar-factory.c:92
-msgid "Previous"
-msgstr "Poprzedni"
-
-#: ../src/toolbar-factory.c:93
-msgid "Open previous"
-msgstr "Otwiera poprzedni list"
-
-#: ../src/toolbar-factory.c:94
-msgid "Next"
-msgstr "NastÄ?pny"
-
-#: ../src/toolbar-factory.c:95
-msgid "Open next"
-msgstr "Otwiera nastÄ?pny list"
-
-#: ../src/toolbar-factory.c:96
+#: ../src/toolbar-factory.c:140
 msgid ""
 "Next\n"
 "unread"
 msgstr "Nast. NP"
 
-#: ../src/toolbar-factory.c:97
-msgid "Open next unread message"
-msgstr "Otwiera nastÄ?pny nieprzeczytany list"
-
-#: ../src/toolbar-factory.c:98
+#: ../src/toolbar-factory.c:141
 msgid ""
 "Next\n"
 "flagged"
@@ -6076,100 +7034,69 @@ msgstr ""
 "NastÄ?pny\n"
 "oznakowany"
 
-#: ../src/toolbar-factory.c:99
-msgid "Open next flagged message"
-msgstr "Otwiera nastÄ?pny oznakowany list"
-
-#: ../src/toolbar-factory.c:100
-#, fuzzy
+#: ../src/toolbar-factory.c:142
 msgid ""
 "Previous\n"
 "part"
-msgstr "Poprzednia czÄ?Å?Ä?"
-
-#: ../src/toolbar-factory.c:101
-msgid "View previous part of message"
-msgstr "Zobacz poprzedniÄ? czÄ?Å?Ä? listu"
+msgstr ""
+"Poprzednia\n"
+"czÄ?Å?Ä?"
 
-#: ../src/toolbar-factory.c:102
-#, fuzzy
+#: ../src/toolbar-factory.c:143
 msgid ""
 "Next\n"
 "part"
-msgstr "NastÄ?pna czÄ?Å?Ä?"
-
-#: ../src/toolbar-factory.c:103
-msgid "View next part of message"
-msgstr "Zobacz nastÄ?pnÄ? czÄ?Å?Ä? listu"
+msgstr ""
+"NastÄ?pna\n"
+"czÄ?Å?Ä?"
 
-#: ../src/toolbar-factory.c:104
+#: ../src/toolbar-factory.c:144
 msgid ""
 "Trash /\n"
 "Delete"
 msgstr "UsuÅ?"
 
-#: ../src/toolbar-factory.c:105
-msgid "Move the current message to trash"
-msgstr "Przenosi bieÅ¼Ä?cy list do Å?mietnika"
-
-#: ../src/toolbar-factory.c:106
+#: ../src/toolbar-factory.c:145
 msgid "Postpone"
 msgstr "OdÅ?Ã³Å¼"
 
-#: ../src/toolbar-factory.c:107
-msgid "Postpone current message"
-msgstr "OdkÅ?ada bieÅ¼Ä?cy list"
-
-#: ../src/toolbar-factory.c:108
+#: ../src/toolbar-factory.c:146
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: ../src/toolbar-factory.c:110
+#: ../src/toolbar-factory.c:147
+msgid ""
+"Request\n"
+"MDN"
+msgstr ""
+"ProÅ?ba\n"
+"MDN"
+
+#: ../src/toolbar-factory.c:148
 msgid "Send"
 msgstr "WyÅ?lij"
 
-#: ../src/toolbar-factory.c:112
+#: ../src/toolbar-factory.c:149
 msgid "Exchange"
 msgstr "WymieÅ?"
 
-#: ../src/toolbar-factory.c:114
+#: ../src/toolbar-factory.c:150
 msgid "Attach"
 msgstr "ZaÅ?Ä?cz"
 
-#: ../src/toolbar-factory.c:115
-msgid "Add attachments to this message"
-msgstr "Dodaje do listu zaÅ?Ä?czniki"
-
-#: ../src/toolbar-factory.c:116
+#: ../src/toolbar-factory.c:151
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../src/toolbar-factory.c:117
-msgid "Save the current item"
-msgstr "Zapisuje bieÅ¼Ä?cy element"
-
-#: ../src/toolbar-factory.c:118
+#: ../src/toolbar-factory.c:152
 msgid "Identity"
 msgstr "ToÅ¼samoÅ?Ä?"
 
-#: ../src/toolbar-factory.c:119
-msgid "Set identity to use for this message"
-msgstr "Wybiera toÅ¼samoÅ?Ä? wykorzystanÄ? przy wysÅ?aniu listu"
-
-#: ../src/toolbar-factory.c:121
-msgid "Run a spell check"
-msgstr "Rozpoczyna sprawdzanie pisowni listu"
-
-#: ../src/toolbar-factory.c:122
-#: ../src/toolbar-factory.c:132
+#: ../src/toolbar-factory.c:154
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../src/toolbar-factory.c:123
-msgid "Close the compose window"
-msgstr "Zamyka okno tworzenia listu"
-
-#: ../src/toolbar-factory.c:124
+#: ../src/toolbar-factory.c:155
 msgid ""
 "Toggle\n"
 "new"
@@ -6177,308 +7104,136 @@ msgstr ""
 "PrzeÅ?Ä?cz\n"
 "nowy"
 
-#: ../src/toolbar-factory.c:125
-msgid "Toggle new message flag"
-msgstr "PrzeÅ?Ä?cza oznaczenie listu jako nowy"
-
-#: ../src/toolbar-factory.c:126
+#: ../src/toolbar-factory.c:156
 msgid "Mark all"
 msgstr "Zaznacz wszystkie"
 
-#: ../src/toolbar-factory.c:127
-msgid "Mark all messages in current mailbox"
-msgstr "Zaznacza wszystkie listy w bieÅ¼Ä?cej skrzynce"
-
-#: ../src/toolbar-factory.c:128
+#: ../src/toolbar-factory.c:158
 msgid ""
-"All\n"
-"headers"
+"Reset\n"
+"Filter"
 msgstr ""
-"Wszystkie\n"
-"nagÅ?Ã³wki"
-
-#: ../src/toolbar-factory.c:129
-msgid "Show all headers"
-msgstr "WyÅ?wietla wszystkie nagÅ?Ã³wki"
-
-#: ../src/toolbar-factory.c:130
-msgid "Empty Trash"
-msgstr "OprÃ³Å¼nij Å?mietnik"
-
-#: ../src/toolbar-factory.c:133
-msgid "Close current mailbox"
-msgstr "Zamyka bieÅ¼Ä?cÄ? skrzynkÄ?"
-
-#: ../src/toolbar-factory.c:134
-msgid "Msg Preview"
-msgstr "PodglÄ?d listu"
-
-#: ../src/toolbar-factory.c:135
-msgid "Show preview pane"
-msgstr "PodglÄ?d listu wewnÄ?trz okna"
+"Zresetuj\n"
+"filtr"
 
-#: ../src/toolbar-factory.c:137
+#: ../src/toolbar-factory.c:161
 msgid "Sign"
 msgstr "Podpisanie"
 
-#: ../src/toolbar-factory.c:138
-msgid "Sign message using GPG"
-msgstr "Podpisanie listu przy uÅ¼yciu GPG"
-
-#: ../src/toolbar-factory.c:139
+#: ../src/toolbar-factory.c:162
 msgid "Encrypt"
 msgstr "Szyfrowanie"
 
-#: ../src/toolbar-factory.c:140
-msgid "Encrypt message using GPG"
-msgstr "Zaszyfrowanie listu przy uÅ¼yciu GPG"
-
-#: ../src/toolbar-factory.c:142
+#: ../src/toolbar-factory.c:164
 msgid "Undo"
 msgstr "Cofnij"
 
-#: ../src/toolbar-factory.c:143
-msgid "Undo most recent change"
-msgstr "CofniÄ?cie ostatniej zmiany"
-
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:165
 msgid "Redo"
 msgstr "PonÃ³w"
 
-#: ../src/toolbar-factory.c:145
-msgid "Redo most recent change"
-msgstr "Ponowienie ostatniej zmiany"
+#: ../src/toolbar-factory.c:166
+msgid "Expunge"
+msgstr "UsuÅ?"
 
-#: ../src/toolbar-factory.c:233
-#, c-format
-msgid "Unknown toolbar icon \"%s\""
-msgstr "Nieznana ikona paska narzÄ?dziowego \"%s\""
+#: ../src/toolbar-factory.c:167
+msgid ""
+"Empty\n"
+"Trash"
+msgstr ""
+"OprÃ³Å¼nij\n"
+"Å?mietnik"
+
+#: ../src/toolbar-factory.c:168
+msgid "Edit"
+msgstr "Edytuj"
 
-#: ../src/toolbar-factory.c:315
+#: ../src/toolbar-factory.c:181
 msgid "Queue"
 msgstr "Zapisz w kolejce"
 
-#: ../src/toolbar-factory.c:352
+#: ../src/toolbar-factory.c:380
+#, c-format
+msgid "Unknown toolbar icon \"%s\""
+msgstr "Nieznana ikona paska narzÄ?dziowego \"%s\""
+
+#: ../src/toolbar-factory.c:451
 msgid "Queue this message for sending"
 msgstr "Dodaje list do kolejki w folderze \"Poczta wychodzÄ?ca\", przygotowujÄ?c go do wysÅ?ania"
 
-#: ../src/toolbar-prefs.c:123
+#: ../src/toolbar-factory.c:519
+msgid "Text Be_low Icons"
+msgstr "Tekst pod i_konami"
+
+#: ../src/toolbar-factory.c:520
+msgid "Text Be_side Icons"
+msgstr "Tek_st obok ikon"
+
+#: ../src/toolbar-factory.c:522
+msgid "_Icons Only"
+msgstr "Tylko _ikony"
+
+#: ../src/toolbar-factory.c:523
+msgid "_Text Only"
+msgstr "Tylko _tekst"
+
+#: ../src/toolbar-factory.c:731
+#, c-format
+msgid "Use Desktop _Default (%s)"
+msgstr "UÅ¼yj WartoÅ?ci _DomyÅ?lnych Biurka (%s)"
+
+#: ../src/toolbar-factory.c:757
+msgid "_Customize Toolbars..."
+msgstr "_Dopasuj paski narzÄ?dziowe..."
+
+#: ../src/toolbar-prefs.c:137
 msgid "Customize Toolbars"
 msgstr "Dopasowanie wyglÄ?du paskÃ³w narzÄ?dziowych"
 
-#: ../src/toolbar-prefs.c:144
-msgid "Main window"
-msgstr "GÅ?Ã³wne okno"
-
-#: ../src/toolbar-prefs.c:148
+#: ../src/toolbar-prefs.c:170
 msgid "Compose window"
 msgstr "Okno tworzenia listu"
 
-#: ../src/toolbar-prefs.c:152
-msgid "Message window"
-msgstr "Okno listu"
-
-#: ../src/toolbar-prefs.c:154
+#: ../src/toolbar-prefs.c:179
 msgid "Toolbar options"
 msgstr "Opcje paska narzÄ?dziowego"
 
-#: ../src/toolbar-prefs.c:164
+#: ../src/toolbar-prefs.c:189
 msgid "_Wrap button labels"
 msgstr "_Zawijanie etykiet przyciskÃ³w"
 
-#: ../src/toolbar-prefs.c:363
+#: ../src/toolbar-prefs.c:410
 #, c-format
 msgid "Error displaying toolbar help: %s\n"
 msgstr "BÅ?Ä?d przy wyÅ?wietlaniu pomocy paska narzÄ?dziowego: %s\n"
 
 #. Preview display
-#: ../src/toolbar-prefs.c:399
+#: ../src/toolbar-prefs.c:447
 msgid "Preview"
 msgstr "PodglÄ?d"
 
-#: ../src/toolbar-prefs.c:427
+#: ../src/toolbar-prefs.c:484
 msgid "_Restore toolbar to standard buttons"
 msgstr "_PrzywrÃ³Ä? standardowe przyciski"
 
-#: ../src/toolbar-prefs.c:446
+#. Style button
+#: ../src/toolbar-prefs.c:488
+msgid "Toolbar _style..."
+msgstr "Styl paska narzÄ?dziowego..."
+
+#: ../src/toolbar-prefs.c:505
 msgid "Available buttons"
 msgstr "DostÄ?pne przyciski"
 
-#: ../src/toolbar-prefs.c:462
+#: ../src/toolbar-prefs.c:521
 msgid "Current toolbar"
 msgstr "BieÅ¼Ä?cy pasek narzÄ?dziowy"
 
-#: ../src/toolbar-prefs.c:479
+#: ../src/toolbar-prefs.c:538
 msgid "Up"
 msgstr "GÃ³ra"
 
-#: ../src/toolbar-prefs.c:495
+#: ../src/toolbar-prefs.c:554
 msgid "Down"
 msgstr "DÃ³Å?"
 
-#~ msgid "_Middle Name:"
-#~ msgstr "_Drugie imiÄ?:"
-#~ msgid ""
-#~ "\n"
-#~ "--\n"
-#~ "This is an OpenPGP signed message part:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "--\n"
-#~ "CzÄ?Å?Ä? listu podpisana za pomocÄ? OpenPGP:\n"
-#~ msgid ""
-#~ "\n"
-#~ "Validity: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "WaÅ¼noÅ?Ä?: %s"
-#~ msgid "Owner trust"
-#~ msgstr "Zaufanie wÅ?aÅ?ciciela"
-#~ msgid "Run GnomeCard"
-#~ msgstr "Uruchom GnomeCard"
-#~ msgid "New Address Book type:"
-#~ msgstr "Typ nowej ksiÄ?Å¼ki adresowej:"
-#~ msgid "Balsa is not compiled with LDAP support"
-#~ msgstr "Balsa nie zostaÅ?a skompilowana z obsÅ?ugÄ? LDAP"
-#~ msgid "_File Name"
-#~ msgstr "Nazwa p_liku"
-#~ msgid "Select path for VCARD address book"
-#~ msgstr "WybÃ³r Å?cieÅ¼ki ksiÄ?Å¼ki adresowej VCard"
-#~ msgid "Select path for LDIF address book"
-#~ msgstr "WybÃ³r Å?cieÅ¼ki ksiÄ?Å¼ki adresowej LDIF"
-#~ msgid "Match In"
-#~ msgstr "Przeszukiwane czÄ?Å?ci"
-#~ msgid "Mailbox _Path:"
-#~ msgstr "Å?_cieÅ¼ka skrzynki:"
-#~ msgid "Mailbox Path"
-#~ msgstr "Å?cieÅ¼ka skrzynki"
-#~ msgid "(No identity set)"
-#~ msgstr "(Nie wybrano toÅ¼samoÅ?ci)"
-#~ msgid "C_hange..."
-#~ msgstr "_ZmieÅ?..."
-
-#, fuzzy
-#~ msgid "IMAP Server %s: %s"
-#~ msgstr "BÅ?Ä?d serwera IMAP %s: %s"
-#~ msgid "7 Bits"
-#~ msgstr "7 bitÃ³w"
-#~ msgid "8 Bits"
-#~ msgstr "8 bitÃ³w"
-#~ msgid "Quoted"
-#~ msgstr "Cytowanie"
-#~ msgid "Remote SMTP Server"
-#~ msgstr "Zdalny serwer SMTP"
-#~ msgid "User"
-#~ msgstr "UÅ¼ytkownik"
-#~ msgid "Use TLS"
-#~ msgstr "UÅ¼ywanie TLS"
-#~ msgid "Select a font to use"
-#~ msgstr "WybÃ³r wykorzystywanej czcionki"
-#~ msgid "Select..."
-#~ msgstr "Wybierz..."
-#~ msgid "attach as reference"
-#~ msgstr "zaÅ?Ä?cz jako odnoÅ?nik"
-#~ msgid "attach as file"
-#~ msgstr "zaÅ?Ä?cz jako plik"
-
-#, fuzzy
-#~ msgid ""
-#~ "This file is not encoded in US-ASCII or UTF-8.\n"
-#~ "Please choose the charset used to encode the file.\n"
-#~ msgstr ""
-#~ "Plik nie jest zakodowany przy uÅ¼yciu US-ASCII ani UTF-8.\n"
-#~ "Wybierz zestaw znakÃ³w do zakodowania pliku.\n"
-#~ "(w razie braku pewnoÅ?ci, wybierz zwykÅ?e UTF-8)."
-
-#, fuzzy
-#~ msgid "_Attach as %s type \"%s\""
-#~ msgstr "Typ dostÄ?pu: %s\n"
-#~ msgid ""
-#~ "The message cannot be encoded in charset %s.\n"
-#~ "Please choose a language for this message.\n"
-#~ "For multi-language messages, choose UTF-8."
-#~ msgstr ""
-#~ "Nie moÅ¼na zapisaÄ? listu przy uÅ¼yciu zestawu znakÃ³w %s.\n"
-#~ "Wybierz jÄ?zyk tego listu.\n"
-#~ "Dla listÃ³w wielojÄ?zycznych, wybierz UTF-8."
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-#~ msgid "west european (traditional)"
-#~ msgstr "zachodnioeuropejski (tradycyjny)"
-#~ msgid "cyrillic (iso/windows)"
-#~ msgstr "cyrlica (iso/windows)"
-#~ msgid "ukranian (koi)"
-#~ msgstr "ukraiÅ?ski (koi)"
-#~ msgid "POP3 temp mailbox %s was not removed (system error message: %s)"
-#~ msgstr ""
-#~ "Tymczasowa skrzynka POP3 %s nie zostaÅ?a usuniÄ?ta (komunikat bÅ?Ä?du "
-#~ "systemu: %s)"
-#~ msgid "Source mailbox (%s) is readonly. Cannot move messages"
-#~ msgstr ""
-#~ "Skrzynka ÅºrÃ³dÅ?owa (%s) jest tylko do odczytu. Nie moÅ¼na przenieÅ?Ä? listÃ³w."
-#~ msgid "IMAP SEARCH UNSEEN request failed for mailbox %s"
-#~ msgstr "Å»Ä?danie IMAP SEARCH UNSEEN dla skrzynki %s nie powiodÅ?o siÄ?"
-#~ msgid "The signature is invalid (Note: might be caused by gmime bug!)."
-#~ msgstr ""
-#~ "Podpis nie jest poprawny (Uwaga: moÅ¼e byÄ? spowodowany bÅ?Ä?dem gmime!)."
-#~ msgid ""
-#~ "Error copying message to mailbox %s!\n"
-#~ "Mailbox might have been corrupted!"
-#~ msgstr ""
-#~ "BÅ?Ä?d kopiowania wiadomoÅ?ci do skrzynki %s!\n"
-#~ "Skrzynka moÅ¼e byÄ? uszkodzona!"
-#~ msgid ""
-#~ "Error writing to temporary file %s.\n"
-#~ "Check the directory permissions."
-#~ msgstr ""
-#~ "BÅ?Ä?d przy zapisie do pliku tymczasowego %s.\n"
-#~ "SprawdÅº uprawnienia do katalogu."
-#~ msgid ""
-#~ "SMTP server refused connection.\n"
-#~ "Balsa by default uses submission service (587).\n"
-#~ "If you want to submit mail using relay service (25),specify it explicitly "
-#~ "via: \"host:smtp\".\n"
-#~ "Message is left in outbox."
-#~ msgstr ""
-#~ "Serwer SMTP odrzuciÅ? poÅ?Ä?czenie.\n"
-#~ "DomyÅ?lnie Balsa uÅ¼ywa usÅ?ugi dostarczajÄ?cej (587).\n"
-#~ "JeÅ?li chcesz wysÅ?aÄ? pocztÄ? korzystajÄ?c z usÅ?ugi przekazujÄ?cej (25), "
-#~ "okreÅ?l to jawnie poprzez \"host:smtp\".\n"
-#~ "List pozostaÅ? w skrzynce z pocztÄ? wychodzÄ?cÄ?."
-#~ msgid "This message will not be encrpyted for the BCC: recipient(s)."
-#~ msgstr "List nie zostanie zaszyfrowany dla odbiorcÃ³w z pola BCC:."
-#~ msgid "Cannot access the message's body\n"
-#~ msgstr "Nie moÅ¼na uzyskaÄ? dostÄ?pu do treÅ?ci listu\n"
-#~ msgid "Please enter information about yourself."
-#~ msgstr "WprowadÅº informacje o sobie."
-#~ msgid "_Name:"
-#~ msgstr "I_miÄ? i nazwisko:"
-#~ msgid ""
-#~ "You seem to be running Balsa for the first time. The following steps will "
-#~ "set up Balsa by asking a few simple questions. Once you have completed "
-#~ "these steps, you can always change them later in Balsa's preferences. If "
-#~ "any files or directories need to be created, it will be done so "
-#~ "automatically.\n"
-#~ "  Please check the about box in Balsa's main window for more information "
-#~ "about contacting the authors or reporting bugs."
-#~ msgstr ""
-#~ "WyglÄ?da na to, Å¼e Balsa zostaÅ?a przez Ciebie uruchomiona po raz pierwszy. "
-#~ "Zostanie teraz przeprowadzona konfiguracja programu poprzez zadanie Tobie "
-#~ "kilku pytaÅ?. Dowolne z ustawieÅ? moÅ¼esz pÃ³Åºniej zmieniÄ? uÅ¼ywajÄ?c menu "
-#~ "preferencji Balsy. JeÅ?li potrzebne bÄ?dÄ? nowe pliki lub katalogi, zostanÄ? "
-#~ "one utworzone automatycznie.\n"
-#~ "Aby uzyskaÄ? wiÄ?cej informacji o autorach lub o sposobie zgÅ?aszania "
-#~ "bÅ?Ä?dÃ³w, wybierz \"Informacje o...\" z menu w oknie gÅ?Ã³wnym programu."
-#~ msgid "Total"
-#~ msgstr "Razem"
-
-#, fuzzy
-#~ msgid "By _Date"
-#~ msgstr "Data"
-#~ msgid "Display message size as number of lines"
-#~ msgstr "Podawanie rozmiaru listu w liczbie wierszy"
-#~ msgid "invalid crypto engine for RFC2440"
-#~ msgstr "bÅ?Ä?dny silnik szyfrowania dla RFC2440"
-#~ msgid "Could not send \"%s\" to \"%s\""
-#~ msgstr "Nie moÅ¼na wysÅ?aÄ? \"%s\" do \"%s\""
-
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index eb9e2ac..a33cb24 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -1319,7 +1319,7 @@ replace_identity_signature(BalsaSendmsg* bsmsg, LibBalsaIdentity* new_ident,
             /* put it at the end of the message */
             gtk_text_buffer_get_end_iter(buffer, &ins);
         }
-        printf("Inserting new sig\n");
+
         gtk_text_buffer_place_cursor(buffer, &ins);
         gtk_text_buffer_insert_at_cursor(buffer, new_sig, -1);
     }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]