bump version, requirements

2004-07-02 JP Rosevear <jpr@novell.com> * configure.in: bump version, requirements 2004-07-02 JP Rosevaer <jpr@novell.com> * Makefile.am (SUBDIRS): Revert previous error change svn path=/trunk/; revision=26583
author: JP Rosevear <jpr@novell.com> 2004-07-05 23:08:43 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2004-07-05 23:08:43 +0800
commit: 8893f5137dd77a76ce1fbaa8e8793a40a750f3fb (patch)
tree: 6ba22cb0aebe343b8c1b9d0980449957e391f989 /po/pl.po
parent: 44ede0596eeb155117703e54c7a3a5b2c891bced (diff)
download: gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.gz
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.bz2
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.lz
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.xz
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.zst
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.zip
1 files changed, 3594 insertions, 2994 deletions
diff --git a/po/pl.po b/po/pl.po
index bd7c67abb3..3c9749388f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,14 +11,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 10:38+0200\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-01-28 14:18+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\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-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
@@ -28,15 +28,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "książka adresowa evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "nagłówek kontaktu: "
-
-# FIXME - albo jakoś inaczej?
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "minikarta evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "bieżący folder książki adresowej "
@@ -57,34 +48,258 @@ msgstr " kart"
 msgid " card"
 msgstr " kartę"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "nagłówek kontaktu: "
+
+# FIXME - albo jakoś inaczej?
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "minikarta evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Nie można wysłać elementu!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Nie można dokonać uwierzytelnienia na serwerze LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Sprawdź czy hasło zostało prawidłowo napisane. Pamiętaj, że wiele haseł jest "
+"wrażliwych na wielkość liter; może być włączony \"caps lock\"."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+"Serwer nie przekazał w odpowiedzi żadnych obsługiwanych podstaw wyszukiwania"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Serwer nie obsługuje informacji schematu LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Nie można pobrać artykułu %s z serwera NNTP"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Odpowiedź serwera nie zawiera poprawnych informacji o schemacie"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nie można wczytać książki adresowej"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Edytor kategorii nie jest dostępny."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+msgid "Unable to open addressbook"
+msgstr "Nie można otworzyć książki adresowej"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Błąd przy odczycie domyślnej książki adresowej."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Nie można przetworzyć folderu kolejki"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Czy chcesz zapisać zmiany?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Porzuć"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "oraz jeden inny kontakt."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Kontakt jest przenoszony z jednej książki adresowej do drugiej, ale nie "
+"można go usunąć ze źródła. Czy zamiast przenoszenia zapisać kopię?"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Nie można przeanalizować zawartości listu"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Błąd przy dodawaniu kontaktu"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Przeglądarka adresów książki adresowej Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego "
+"uruchomienia programu Evolution."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Domyślny adres do synchronizacji:"
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Nie można wczytać książki adresowej"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Nie można odczytać bloku aplikacji adresowej Pilota"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimowy dostęp do serwera LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Nie można dokonać uwierzytelnienia.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autouzupełnianie"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sWprowadź hasło dla %s (użytkownik %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "K_ontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certyfikaty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Konfiguracja automatycznego uzupełniania"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Książka adresowa Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Wyskakujące okno zawierające adres z książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Przeglądarka adresów książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Przeglądarka kart książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Komponent książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Sterowanie zarządzaniem certyfikatami S/Mime Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Kontrola konfiguracji ustawień folderu Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Zarządzanie certyfikatami S/Mime"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -115,7 +330,8 @@ msgid "New Contacts Group"
 msgstr "Nowa grupa kontaktów"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "_Grupa kontaktów"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -138,23 +354,19 @@ msgid "Migrating `%s':"
 msgstr "Migrowanie \"%s\":"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Na tym komputerze"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Osobiste"
 
@@ -214,18 +426,18 @@ msgstr ""
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował dane "
 "synchronizacji Pilota..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Książka adresowa \"%s\" zostanie usunięta. Czy na pewno chcesz kontynuować?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
@@ -235,17 +447,25 @@ msgstr "Nowa książka adresowa"
 msgid "Delete"
 msgstr "Usuń"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Właściwości..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakty"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonimowy dostęp do serwera LDAP"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Nie można dokonać uwierzytelnienia.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sWprowadź hasło dla %s (użytkownik %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -267,58 +487,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adres URI folderu ostatnio używanego w oknie wyboru nazw"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autouzupełnianie"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "K_ontakty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certyfikaty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Konfiguracja automatycznego uzupełniania"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Książka adresowa Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Wyskakujące okno zawierające adres z książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Przeglądarka adresów książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Przeglądarka kart książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Komponent książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Sterowanie zarządzaniem certyfikatami S/Mime Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Kontrola konfiguracji ustawień folderu Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Zarządzanie certyfikatami S/Mime"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -326,7 +494,7 @@ msgstr "Zarządzanie certyfikatami S/Mime"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -335,7 +503,7 @@ msgstr "Zarządzanie certyfikatami S/Mime"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -361,6 +529,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Uwierzytelnianie</b>"
 
@@ -393,7 +562,7 @@ msgid "Address Book Properties"
 msgstr "Właściwości książki adresowej"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Zawsze"
 
@@ -402,13 +571,11 @@ msgid "Anonymously"
 msgstr "Anonimowo"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "Proste"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Szczegóły"
 
@@ -436,12 +603,12 @@ msgstr "Znajdź możliwe podstawy wyszukiwania"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:87 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ogólne"
 
 #: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nigdy"
 
@@ -581,7 +748,7 @@ msgid "Using email address"
 msgstr "Użycie adresu e-mail"
 
 #: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kiedy możliwe"
 
@@ -610,7 +777,7 @@ msgid "_Log in:"
 msgstr "_Użytkownik:"
 
 #: addressbook/gui/component/ldap-config.glade.h:53
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:172
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nazwa:"
 
@@ -639,33 +806,26 @@ msgid "cards"
 msgstr "karty"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Wybór kontaktów z książki adresowej"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interfejs wyboru nazwy książki adresowej Evolution"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Usuń wszystko"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Usuń"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nazwa"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Usuń wszystko"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Przejrzyj listę kontaktów"
@@ -680,7 +840,7 @@ msgid "Send HTML Mail?"
 msgstr "Wysłanie listu w formacie HTML"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Dodaj do kontaktów"
 
@@ -688,15 +848,22 @@ msgstr "Dodaj do kontaktów"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez nazwy"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nazwa"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Źródło"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interfejs wyboru nazwy książki adresowej Evolution"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Wybór kontaktów z książki adresowej"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -718,6 +885,11 @@ msgstr "K_ategoria:"
 msgid "_Find"
 msgstr "Z_najdź"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Znajdź"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-mail</b>"
@@ -755,7 +927,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Praca</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
@@ -777,7 +949,6 @@ msgid "Birthday:"
 msgstr "Urodziny:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendarz:"
 
@@ -790,7 +961,7 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -798,7 +969,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Edytor kontaktów"
 
@@ -890,10 +1061,10 @@ msgstr "Dziennik WWW:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Praca"
 
@@ -916,22 +1087,6 @@ msgstr "W_idoczny jako:"
 msgid "_Where:"
 msgstr "_Gdzie:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Czy na pewno chcesz\n"
-"usunąć te kontakty?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Czy na pewno chcesz\n"
-"usunąć ten kontakt?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:350
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -939,16 +1094,16 @@ msgid "Address"
 msgstr "Adres"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Modyfikowalny"
 
@@ -1920,78 +2075,100 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "Komunikator internetowy AOL"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Komunikator Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Usługa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Położenie"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Nazwa użytkownika"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Dom"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Inne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Książka źródłowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Książka docelowa"
 
 # FIXME - trzeba zobaczyć czy jest dobrze
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Jest nowym kontaktem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Pola do zapisu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Zmienione"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2356
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Ten kontakt przynależy do następujących kategorii:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Wybierz obraz dla tego kontaktu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "Brak obrazu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2640
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1999,11 +2176,11 @@ msgstr ""
 "Dane kontaktu są niepoprawne:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "Nieprawidłowy kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -2011,12 +2188,7 @@ msgstr ""
 "Nie można zapisać kontaktu do wybranej książki adresowej. Czy porzucić "
 "zmiany?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2731
-#: addressbook/gui/contact-editor/e-contact-editor.c:2755
-msgid "_Discard"
-msgstr "_Porzuć"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2750
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2024,28 +2196,6 @@ msgstr ""
 "Kontakt jest przenoszony z jednej książki adresowej do drugiej, ale nie "
 "można go usunąć ze źródła. Czy zamiast przenoszenia zapisać kopię?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "Komunikator internetowy AOL"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Komunikator Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Usługa"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "Położenie"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Szybkie dodanie kontaktu"
@@ -2055,7 +2205,7 @@ msgid "_Edit Full"
 msgstr "_Pełna edycja"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Peł_na nazwa:"
 
@@ -2063,6 +2213,22 @@ msgstr "Peł_na nazwa:"
 msgid "E-_mail:"
 msgstr "_E-mail"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Czy na pewno chcesz\n"
+"usunąć te kontakty?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Czy na pewno chcesz\n"
+"usunąć ten kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adres _2:"
@@ -2219,16 +2385,16 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Wprowadź adres e-mail lub przeciągnij kontakt do poniższej listy:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Książka"
 
@@ -2289,6 +2455,399 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Brak kontaktów"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontakt"
+msgstr[1] "%d kontakty"
+msgstr[2] "%d kontaktów"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "Zapytanie"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Błąd przy pobieraniu widoku książki adresowej"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Model"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Błąd przy modyfikacji karty"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "Nazwa rozpoczyna się od"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "E-mail rozpoczyna się od"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Kategorią jest"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Jakiekolwiek pole zawiera"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Zaawansowane..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Rodzaj"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+msgid "Address Book"
+msgstr "Książka adresowa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "Zapisz jako VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Nowy kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Nowa lista kontaktów..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Przejdź do folderu..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Zaimportuj..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Szukaj kontaktów..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+msgid "Address Book Sources..."
+msgstr "Źródła książki adresowej..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Ustawienia Pilota..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Prześlij kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Wyślij list do kontaktu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Wydrukuj"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "Wydrukuj kopertę"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+msgid "Copy to Address Book..."
+msgstr "Skopiuj do książki adresowej..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+msgid "Move to Address Book..."
+msgstr "Przenieś do książki adresowej..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Wytnij"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Skopiuj"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Wklej"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Bieżący widok"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Dowolna kategoria"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Asystent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Telefon asystenta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Faks służbowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Telefon służbowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Telefon służbowy 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Telefon callbacka"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Telefon samochodowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Categories"
+msgstr "Kategorie"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Telefon firmowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Nazwisko"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "Plik jako"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "Imię"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Faks w domu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Telefon domowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Telefon domowy 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "Telefon ISDN"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Dziennik"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Menedżer"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Telefon komórkowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Pseudonim"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Notatka"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Biuro"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizacja"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Inny faks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Inny telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Telefon główny"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rola"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Małżonek"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Tytuł"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "Jednostka"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Witryna sieci web"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Szerokość"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Wysokość"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Posiada skupienie"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Pole"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Nazwa pola"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Model tekstowy"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Maks. długość nazwy pola"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Szerokość kolumny"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Brak elementów do wyświetlenia w tym widoku.\n"
+"\n"
+"Dwukrotne kliknięcie spowoduje utworzenie nowego kontaktu."
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Brak elementów do wyświetlenia w tym widoku."
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "Łącznik"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Wybrano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Posiada kursor"
+
 # FIXME - dobrze czy nie?
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
@@ -2311,11 +2870,6 @@ msgstr "Członkowie listy"
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizacja"
-
 #: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "Position"
 msgstr "Pozycja"
@@ -2346,127 +2900,111 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Telefon komórkowy"
-
 #: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "personal"
 msgstr "osobiste"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Notatka"
-
 #: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Job Title"
 msgstr "Tytuł służbowy"
 
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-mail"
-
 #: addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Home page"
 msgstr "Witryna domowa"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Sukces"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr "Wsparcie zajęte"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Repozytorium rozłączone"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Address Book does not exist"
 msgstr "Książka adresowa nie istnieje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
 msgstr "Nie zdefiniowano własnego kontaktu"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Brak uprawnień"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "Nie odnaleziono kontaktu"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "Kontakt z tym ID już istnieje"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protokół nie jest obsługiwany"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "Anulowano"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Could not cancel"
 msgstr "Nie można anulować"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "Uwierzytelnienie nie powiodło się"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Wymagane uwierzytelnienie"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS nie jest dostępny"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "Brak takiego źródła"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Inny błąd"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:91
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2474,7 +3012,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Upewnij się, że ścieżka istnieje "
 "oraz że ma ustawione odpowiednie uprawnienia dostępu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2482,7 +3020,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
 "niepoprawnego adresu URI lub niedostępnością serwera LDAP."
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -2491,7 +3029,7 @@ msgstr ""
 "Używana kopia Evolution została skompilowana bez obsługi LDAP. Aby móc "
 "wykorzystać LDAP, należy pobrać Evolution z obsługą LDAP."
 
-#: addressbook/gui/widgets/eab-gui-util.c:109
+#: addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2499,7 +3037,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
 "niepoprawnego adresu URI lub niedostępnością serwera."
 
-#: addressbook/gui/widgets/eab-gui-util.c:129
+#: addressbook/gui/widgets/eab-gui-util.c:130
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2512,7 +3050,7 @@ msgstr ""
 "Spróbuj doprecyzować zapytanie lub zwiększ limit w ustawieniach serwera "
 "katalogowego, powiązanego z tą książką adresową."
 
-#: addressbook/gui/widgets/eab-gui-util.c:135
+#: addressbook/gui/widgets/eab-gui-util.c:136
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2524,48 +3062,48 @@ msgstr ""
 "swoje zapytanie lub zwiększ limit czasowy w preferencjach\n"
 "serwera katalogowego obsługującego tą książkę adresową."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
+#: addressbook/gui/widgets/eab-gui-util.c:142
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Podprogram obsługujący tę książkę adresową nie może przeanalizować tego "
 "zapytania."
 
-#: addressbook/gui/widgets/eab-gui-util.c:144
+#: addressbook/gui/widgets/eab-gui-util.c:145
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Program obsługujący tę książkę adresową odrzucił wykonanie tego zapytania."
 
-#: addressbook/gui/widgets/eab-gui-util.c:147
+#: addressbook/gui/widgets/eab-gui-util.c:148
 msgid "This query did not complete successfully."
 msgstr "Zapytanie nie zakończyło się pomyślnie."
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "Błąd przy dodawaniu listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Error adding contact"
 msgstr "Błąd przy dodawaniu kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "Błąd przy modyfikacji listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying contact"
 msgstr "Błąd przy modyfikacji kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "Błąd przy usuwaniu listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 msgid "Error removing contact"
 msgstr "Błąd przy usuwaniu kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:274
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2574,7 +3112,7 @@ msgstr ""
 "Otwarcie %d kontakwó spowoduje jednoczesne otwarcie %d nowych okien.\n"
 "Czy na pewno chcesz wyświetlić te wszystkie kontakty?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:300
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2583,45 +3121,45 @@ msgstr ""
 "%s istnieje.\n"
 "Czy chcesz go nadpisać?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "Nadpisz"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:499
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:634
+#: addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Move contact to"
 msgstr "Przeniesienie kontaktu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:636
+#: addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Copy contact to"
 msgstr "Skopiowanie kontaktu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:639
+#: addressbook/gui/widgets/eab-gui-util.c:640
 msgid "Move contacts to"
 msgstr "Przeniesienie kontaktów do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:641
+#: addressbook/gui/widgets/eab-gui-util.c:642
 msgid "Copy contacts to"
 msgstr "Skopiowanie kontaktów do"
 
 # FIXME - albo wybierz 
-#: addressbook/gui/widgets/eab-gui-util.c:644
+#: addressbook/gui/widgets/eab-gui-util.c:645
 msgid "Select target addressbook."
 msgstr "Wybór docelowej książki adresowej."
 
-#: addressbook/gui/widgets/eab-gui-util.c:867
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "Plik VCard z wieloma pozycjami"
 
-#: addressbook/gui/widgets/eab-gui-util.c:870
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "Plik VCard z pozycją %s"
@@ -2631,47 +3169,37 @@ msgstr "Plik VCard z pozycją %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(brak)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Główny e-mail"
 
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Wybór czynności"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Utwórz nowy kontakt \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adres do istniejącego kontaktu \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Odpytywanie książki adresowej..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Zmień informacje o kontakcie"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Dołączenie adresu e-mail"
 
@@ -2696,369 +3224,6 @@ msgstr "Wyświetlenie okrojonej wizytówki VCard"
 msgid "Save in addressbook"
 msgstr "Zapisz w książce adresowej"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "Brak kontaktów"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d kontakt"
-msgstr[1] "%d kontakty"
-msgstr[2] "%d kontaktów"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Zapytanie"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Błąd przy pobieraniu widoku książki adresowej"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Model"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Błąd przy modyfikacji karty"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Nazwa rozpoczyna się od"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "E-mail rozpoczyna się od"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Kategorią jest"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Jakiekolwiek pole zawiera"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "Zaawansowane..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Rodzaj"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:535
-msgid "Address Book"
-msgstr "Książka adresowa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "Zapisz jako VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-msgid "New Contact..."
-msgstr "Nowy kontakt..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-msgid "New Contact List..."
-msgstr "Nowa lista kontaktów..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-msgid "Go to Folder..."
-msgstr "Przejdź do folderu..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
-msgid "Import..."
-msgstr "Zaimportuj..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
-msgid "Search for Contacts..."
-msgstr "Szukaj kontaktów..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
-msgid "Address Book Sources..."
-msgstr "Źródła książki adresowej..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
-msgid "Pilot Settings..."
-msgstr "Ustawienia Pilota..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Prześlij kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
-msgid "Send Message to Contact"
-msgstr "Wyślij list do kontaktu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Wydrukuj"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
-msgid "Print Envelope"
-msgstr "Wydrukuj kopertę"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-msgid "Copy to Address Book..."
-msgstr "Skopiuj do książki adresowej..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
-msgid "Move to Address Book..."
-msgstr "Przenieś do książki adresowej..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Wytnij"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Skopiuj"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Wklej"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
-#: calendar/gui/e-calendar-view.c:1327
-msgid "Current View"
-msgstr "Bieżący widok"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Dowolna kategoria"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Asystent"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Telefon asystenta"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Faks służbowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Telefon służbowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Telefon służbowy 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Telefon callbacka"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Telefon samochodowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "Categories"
-msgstr "Kategorie"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Telefon firmowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "Nazwisko"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "Plik jako"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "Imię"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Faks w domu"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Telefon domowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Telefon domowy 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "Telefon ISDN"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Dziennik"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Menedżer"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Pseudonim"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Biuro"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Inny faks"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Inny telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Telefon główny"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rola"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Małżonek"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Tytuł"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "Jednostka"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Witryna sieci web"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Szerokość"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Wysokość"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Posiada skupienie"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Wybrano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Posiada kursor"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Pole"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nazwa pola"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Model tekstowy"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Maks. długość nazwy pola"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Brak elementów do wyświetlenia w tym widoku.\n"
-"\n"
-"Dwukrotne kliknięcie spowoduje utworzenie nowego kontaktu."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Brak elementów do wyświetlenia w tym widoku."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Łącznik"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Szerokość kolumny"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Widok karty"
@@ -3067,17 +3232,17 @@ msgstr "Widok karty"
 msgid "GTK Tree View"
 msgstr "Widok drzewiasty GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test przeformatowania"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Powinno to przetestować element przeformatowania"
 
@@ -3101,6 +3266,11 @@ msgstr "Importer VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Wydrukuj kopertę"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Wydrukuj kontakty"
@@ -3110,11 +3280,6 @@ msgstr "Wydrukuj kontakty"
 msgid "Print contact"
 msgstr "Wydrukuj kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Wydrukuj kopertę"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktowa Tahoma"
@@ -3299,6 +3464,20 @@ msgstr "Test drukowania kontaktów"
 msgid "This should test the contact print code"
 msgstr "Powinno to przetestować kod drukowania kontaktu"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Nie można otworzyć pliku"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Nie można pobrać listy książek adresowych"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "nie można otworzyć książki"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Podaj plik wyjściowy zamiast standardowego wyjścia"
@@ -3358,20 +3537,6 @@ msgstr "W trybie zwykłym, nie potrzeba opcji rozmiaru."
 msgid "Impossible internal error."
 msgstr "Nieprawdopodobny błąd wewnętrzny."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Nie można otworzyć pliku"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Nie można pobrać listy książek adresowych"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "nie można otworzyć książki"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Błąd przy odczycie domyślnej książki adresowej."
@@ -3388,6 +3553,269 @@ msgstr "Nie podano nazwy pliku."
 msgid "Unnamed List"
 msgstr "Lista kontaktów bez nazwy"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Nie usuwaj"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Adresat:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Czy na pewno chcesz anulować i usunąć to spotkanie?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Czy na pewno chcesz usunąć %d zadanie?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Czy na pewno chcesz anulować i usunąć ten wpis dziennika?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Czy na pewno chcesz usunąć %d wpis dziennika?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Czy na pewno chcesz usunąć termin \"%s\"?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Czy na pewno chcesz usunąć %d termin?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Czy na pewno chcesz usunąć zadanie \"%s\"?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Czy na pewno chcesz usunąć wpis dziennika zatytułowany \"%s\"?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Czy na pewno chcesz usunąć termin \"%s\"?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Czy na pewno chcesz usunąć zadanie \"%s\"?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Czy na pewno chcesz usunąć wpis dziennika zatytułowany \"%s\"?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Termin"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Czy chcesz zapisać zmiany?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i uaktualnić edytor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Porzuć zmiany"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Zapisz wiadomość"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Wyślij"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego "
+"uruchomienia programu Evolution."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Druid importu plików vCalendar dla Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego "
+"uruchomienia programu Evolution."
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -3398,29 +3826,93 @@ msgid "Split Multi-Day Events:"
 msgstr "Dzielenie zdarzeń wielodniowych:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "Nie można uruchomić serwera wombat"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nie można uruchomić wombata"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "Nie można uruchomić serwera wombat"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie można odczytać bloku aplikacji kalendarza Pilota"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Domyślny priorytet:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie można odczytać bloku aplikacji \"do zrobienia\" Pilota"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendarz i zadania"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendarze"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfiguracja strefy czasowej, kalendarza i listy zadań."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendarz i zadania Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrola konfiguracji kalendarza Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Przeglądarka wiadomości terminarza dla kalendarza Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Edytor kalendarza/zadań Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Komponent kalendarza Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Komponent zadań Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zadania"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Kalendarze"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zadania"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Usługa przypominania za pomocą alarmu dla kalendarza Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Rozpoczęcie:"
@@ -3518,10 +4010,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Bez pytania o ten program w przyszłości."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Usługa przypominania za pomocą alarmu dla kalendarza Evolution"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Nie można zainicjować Bonobo"
@@ -3664,8 +4152,28 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Określa, czy wyświetlać numery tygodni w przeglądarce dat"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Zestawienie zawiera"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Opis zawiera"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentarz zawiera"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Położenie zawiera"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Niedopasowane"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3687,7 +4195,7 @@ msgid "Purge events older than"
 msgstr "Usunięcie zdarzeń starszych niż"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dni"
@@ -3698,12 +4206,8 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3752,64 +4256,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Brak dostępnego kalendarza do utworzenia zdarzeń i spotkań"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Wybrany kalendarz jest tylko do odczytu, nie można tworzyć zdarzeń. Wybierz "
-"kalendarz z możliwością zapisu."
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendarze"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "Spot_kanie"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Tworzy nową prośbę o spotkanie"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Nowy termin całodniowy"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Nowy t_ermin całodniowy"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Tworzy nowy termin całodniowy"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Nowy kalendarz"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "K_alendarz"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalendarz"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Tworzy nowy kalendarz"
 
@@ -3839,26 +4331,6 @@ msgstr "Widok tygodnia"
 msgid "Month View"
 msgstr "Widok miesiąca"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Zestawienie zawiera"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Opis zawiera"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentarz zawiera"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Położenie zawiera"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Niedopasowane"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Błąd podczas otwierania kalendarza"
@@ -3876,215 +4348,135 @@ msgstr "Brak uprawnień do otwarcia kalendarza"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Ustawienia alarmu dźwiękowego"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Ustawienia alarmu z komunikatem"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Ustawienia alarmu z wysłaniem listu"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Ustawienia alarmu z uruchomieniem programu"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Ustawienia nieznanego alarmu"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Powtórzenia alarmu"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Wyświetlany komunikat:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Treść wysyłanego listu"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Odtworzenie dźwięku:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Powtarzanie alarmu"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Uruchamiany program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Adresat:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Argumenty programu:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Alarmy</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "dodatkowych razy co"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Opcje listy zadań</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
-msgid "hours"
-msgstr "godzin"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Główne</b>"
 
-# FIXME - nie mam koncepci na trigger/spust?
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "Akcja/Uaktywnienie"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Dodawanie kalendarza"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Dodaj"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Tworzenie listu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Proste"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/Czas:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Wiadomości"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Odtworzenie dźwięku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Wyświetlenie alarmu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Przypomnienia"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Uruchomienie programu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Adresat:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Wysłanie listu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Zestawienie:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Konto:"
+
+# FIXME - sprawdzić formę
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Uruchamiany program"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Powtarzanie alarmu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opcje..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Wyś_lij"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "przed"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "koniec terminu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "dodatkowych razy co"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "godzin"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "początek terminu"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Należy podać położenie kalendarza."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Położenie źródła \"%s\" nie jest poprawne."
-
-# FIXME - webcal - ma ktoś pomysł?
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Położenie źródła \"%s\" nie jest źródłem kalendarza sieciowego."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Źródło o nazwie \"%s\" już istnieje w wybranej grupie"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Grupa \"%s\" jest zdalna. Należy podać położenie z którego można pobrać "
-"kalendarz"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Dodawanie kalendarza"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Dodawanie grupy zadań"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "K_olor:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:111
-msgid "Pick a color"
-msgstr "Wybór koloru"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Dodaj kalendarz"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Dodaj grupę"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Odświeżanie:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Rodzaj:"
+# FIXME - nie mam koncepci na trigger/spust?
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Akcja/Uaktywnienie"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "Adr_es URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "tygodni"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarm o %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4184,7 +4576,7 @@ msgid "Display"
 msgstr "Wyświetlanie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "U_aktywnij"
 
@@ -4193,7 +4585,7 @@ msgid "Free/Busy Publishing"
 msgstr "Publikowanie informacji o zajętości"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Piątek"
@@ -4207,7 +4599,7 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Poniedziałek"
@@ -4217,7 +4609,7 @@ msgid "S_un"
 msgstr "_Nie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sobota"
@@ -4231,7 +4623,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Wyświetlanie _numerów tygodni w przeglądarce dat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Niedziela"
@@ -4245,7 +4637,7 @@ msgid "T_hu"
 msgstr "_Czw"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Czwartek"
@@ -4259,7 +4651,7 @@ msgid "Time format:"
 msgstr "Format czasu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Środa"
@@ -4269,7 +4661,7 @@ msgid "W_eek starts:"
 msgstr "Początek _tygodnia:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Środa"
@@ -4302,8 +4694,9 @@ msgstr "_Kompresowanie weekendów na widoku miesięcznym"
 msgid "_Day begins:"
 msgstr "Początek _dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:163 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4353,6 +4746,75 @@ msgstr "Ś_ro"
 msgid "before every appointment"
 msgstr "przed każdym terminem"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Należy podać położenie kalendarza."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Położenie źródła \"%s\" nie jest poprawne."
+
+# FIXME - webcal - ma ktoś pomysł?
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Położenie źródła \"%s\" nie jest źródłem kalendarza sieciowego."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Źródło o nazwie \"%s\" już istnieje w wybranej grupie"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Grupa \"%s\" jest zdalna. Należy podać położenie z którego można pobrać "
+"kalendarz"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Dodawanie kalendarza"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Dodawanie grupy zadań"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "K_olor:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Wybór koloru"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Dodaj kalendarz"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Dodaj grupę"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Odświeżanie:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Rodzaj:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "Adr_es URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "tygodni"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Zdarzenie zostało usunięte."
@@ -4397,81 +4859,75 @@ msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i uaktualnić edytor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nie wprowadzono żadnych zmian, uaktualnić edytor?"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Wykryto błąd przy weryfikacji poprawności: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Zakończone "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Zakończone"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Należne "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Należne "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Nie można uaktualnić obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Zapisz jako..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Zmiany dokonane w tym elemencie mogą zostać porzucone, jeśli nadejdzie "
 "aktualizacja"
 
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Nie można użyć bieżącej wersji!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Wykryto błąd przy weryfikacji poprawności: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Zakończone "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Zakończone"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Należne "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Należne "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Nie można otworzyć źródła"
@@ -4533,8 +4989,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Nie można usunąć elementu na skutek błędu"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Książka adresowa..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontakty"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4544,165 +5001,223 @@ msgstr "Oddelegowanie do:"
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "Przypomnienie"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Rekurencja"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Planowanie"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Ułożenie"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Spotkanie"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Zdarzenie bez daty rozpoczęcia"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Zdarzenie bez daty zakończenia"
 
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Data początkowa jest niepoprawna"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Data końcowa jest niepoprawna"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Czas początkowy jest niepoprawny"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Czas końcowy jest niepoprawny"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nie można otworzyć kalendarza \"%s\"."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "przed każdym terminem"
+msgstr[1] "przed każdym terminem"
+msgstr[2] "przed każdym terminem"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "koniec terminu"
+msgstr[1] "koniec terminu"
+msgstr[2] "koniec terminu"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "przed każdym terminem"
+msgstr[1] "przed każdym terminem"
+msgstr[2] "przed każdym terminem"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Wydarzenie całodni_owe"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "przed każdym terminem"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Z_ajęty"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "przed każdym terminem"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegorie..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "przed każdym terminem"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Lista zadań</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klasyfikacja"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Czas</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Po_ufny"
+msgid "A_ll day event"
+msgstr "Wydarzenie całodni_owe"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Data i czas"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Zapisz dostosowany widok..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Wolny"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegorie..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "P_ołożenie:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Kalendarz:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "P_rywatny"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klasyfikacja"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pu_bliczny"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Tajny"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Forma wyświetlania czasu"
+msgid "L_ocation:"
+msgstr "P_ołożenie:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Prywatny"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Publiczny"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Forma wyświetlania czasu"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Z_estawienie:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Wy_czyść"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Opis:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Czas zakończenia:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Cza_s rozpoczęcia:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
 #: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
 #: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Wybrany organizator nie posiada już konta."
 
-#: calendar/gui/dialogs/meeting-page.c:428
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Wymagany jest organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: calendar/gui/dialogs/meeting-page.c:677
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:681
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2584 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
 msgstr "_Usuń"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -4748,6 +5263,7 @@ msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/dialogs/task-editor.c:158
 #: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
@@ -4756,21 +5272,30 @@ msgid "Status"
 msgstr "Stan"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Dodaj uczes_tnika"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Alarmy</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "Dodaj uczestników z książki adresowej."
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Inne</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Zmień organizatora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontakty"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Zmień organizatora"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizator:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4837,150 +5362,140 @@ msgstr "Ta i przyszłe instancje"
 msgid "All Instances"
 msgstr "Wszystkie instancje"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Termin zawiera powtórzenia, których nie można zmieniać za pomocą Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Okresowa data jest niepoprawna"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "pierwszy"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "drugi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "trzeci"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "czwarty"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "ostatni"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Inna data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dzień"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "wystąpienia"
 
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Data/Czas"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "Wyjątki"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Podgląd</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Rekurencja"
+
 # FIXME - sprawdzić formę
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Każde"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Wyjątki"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Podgląd"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Reguła powtarzalności"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "D_owolna powtarzalność"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "Z_mień"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Brak powtarzalności"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Usuń"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "P_rosta powtarzalność"
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "dla"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "zawsze"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "miesięcy"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "aż do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "tygodni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "lat"
 
 # FIXME - A może Wybór miejsca docelowego?
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Wybierz miejsce docelowe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "Miejsce _docelowe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Lista zadań"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Data zakończenia jest niepoprawna"
 
-# FIXME - sprawdzić formę!!!!
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Czcinki wiadomości</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Ukończenia"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alarmy</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -4994,8 +5509,8 @@ msgstr "Wysoki"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "W trakcie"
@@ -5007,22 +5522,22 @@ msgid "Low"
 msgstr "Niski"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Zwykły"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nie uruchomiony"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Postęp"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Procent zakończenia: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5045,36 +5560,42 @@ msgstr "_Stan:"
 msgid "_Web Page:"
 msgstr "Witryna _web:"
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Zadanie"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Przyporządkowanie"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Data docelowa jest niepoprawna"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie można otworzyć zadań w \"%s\"."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Taj_ny"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Opcje</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Usuwanie poczty</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:72
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Folder:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Data _rozpoczęcia:"
@@ -5083,52 +5604,58 @@ msgstr "Data _rozpoczęcia:"
 msgid "_Due date:"
 msgstr "_Czas zakończenia:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Dane uwierzytelniania serwera HTTP"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupa"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Kalendarze wybrane do publikacji"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Opcje kalendarza</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Codziennie"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Częstotliwość publikacji"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Edytor zajętości"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Położenie publikacji informacji o zajętości"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Położenie publikacji informacji o zajętości"
+msgid "Free/Busy Editor"
+msgstr "Edytor zajętości"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Nazwa użytkownika:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Codziennie"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Hasło:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Poczta"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Częstotliwość publikacji"
+#, fuzzy
+msgid "_Password:"
+msgstr "Hasło:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Zapamiętanie hasła"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "Adres URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Nazwa _użytkownika:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Publikacja ręczna"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Co tydzień"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5215,7 +5742,7 @@ msgstr "%s o %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s z nieznanym typem warunku"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknij, aby otworzyć %s"
@@ -5224,6 +5751,11 @@ msgstr "Kliknij, aby otworzyć %s"
 msgid "Untitled"
 msgstr "Bez nazwy"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Zestawienie:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5247,20 +5779,93 @@ msgstr "Priorytet:"
 msgid "Web Page:"
 msgstr "Witryna WWW:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Publiczny"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Data zakończenia"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Prywatny"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Data rozpoczęcia"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Tajny"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Zestawienie"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Wolny"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Zajęty"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Położenie geograficzne musi być podane w formacie: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Tak"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nie"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Powtarzanie"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Przyporządkowano"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5306,15 +5911,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Wolny"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:401
-msgid "Busy"
-msgstr "Zajęty"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiektów"
@@ -5325,7 +5921,7 @@ msgstr "Aktualizowanie obiektów"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otwórz"
 
@@ -5335,7 +5931,7 @@ msgstr "_Otwórz stronę WWW"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Z_apisz jako..."
@@ -5358,7 +5954,7 @@ msgstr "_Wytnij"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5389,10 +5985,25 @@ msgstr "_Oznacz jako zakończone"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Oznacz zadania jako zakończone"
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Usuń"
+
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Usuń zaznaczone zadania"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Zapisz jako..."
+
 #: calendar/gui/e-calendar-table.c:1350
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
@@ -5424,11 +6035,6 @@ msgstr "Priorytet"
 msgid "Start date"
 msgstr "Data rozpoczęcia"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Zestawienie"
-
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Porządek zadań"
@@ -5505,95 +6111,13 @@ msgstr "_Przejdź do daty..."
 msgid "_Settings..."
 msgstr "_Ustawienia..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Data zakończenia"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "Data rozpoczęcia"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1705 camel/camel-gpg-context.c:1756
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1173
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1117
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Powtarzanie"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Przyporządkowano"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Tak"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nie"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Położenie geograficzne musi być podane w formacie: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5610,43 +6134,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i-minutowe przedziały czasu"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i-minutowe przedziały czasu"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5786,7 +6303,7 @@ msgstr "Aktualizacja"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6003,55 +6520,39 @@ msgstr "Załącznik nie zawiera dających się wyświetlić elementów kalendarz
 msgid "Update complete\n"
 msgstr "Aktualizacja zakończona\n"
 
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Nie można uaktualnić stanu uczestnika, ponieważ element już nie istnieje"
-
-#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Obiekt jest niepoprawny i nie można go zaktualizować\n"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Odpowiedź nie pochodzi od aktualnego uczestnika. Czy dodać nadawcę jako "
 "uczestnika?"
 
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Nie można uaktualnić stanu uczestnika, ponieważ jest on nieprawidłowy!\n"
 
-#: calendar/gui/e-itip-control.c:1862
-msgid "There was an error on the CORBA system\n"
-msgstr "Wystąpił błąd w podsystemie CORBA\n"
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "Nie można odnaleźć obiektu\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Brak uprawnień potrzebnych do aktualizacji kalendarza\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika został uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "Nie można uaktualnić stanu uczestnika!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Nie można uaktualnić stanu uczestnika, ponieważ element już nie istnieje"
 
-#: calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Usunięcie zakończone"
 
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Element został wysłany!\n"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Nie można wysłać elementu!\n"
 
@@ -6080,6 +6581,10 @@ msgstr "Wczytywanie kalendarza"
 msgid "Loading calendar..."
 msgstr "Wczytywanie kalendarza..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Komunikat serwera:"
@@ -6150,7 +6655,7 @@ msgid "Needs Action"
 msgstr "Wymaga działania"
 
 #: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Próbne"
 
@@ -6163,100 +6668,81 @@ msgstr "Oddelegowane"
 msgid "In Process"
 msgstr "W toku"
 
-#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: calendar/gui/e-meeting-time-sel.c:419
-msgid "Add attendees from addressbook"
-msgstr "Dodaj uczestników z książki adresowej"
-
-#: calendar/gui/e-meeting-time-sel.c:442
-msgid "_Options"
-msgstr "Opcj_e"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Opcje"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "Wyświetlanie _tylko godzin roboczych"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "Wyświetlanie w pomniejs_zeniu"
 
-#: calendar/gui/e-meeting-time-sel.c:484
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "_Uaktualnij informację o zajętości"
 
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Automatyczny wybór"
 
-#: calendar/gui/e-meeting-time-sel.c:532
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "Wszyscy _ludzie i jeden zasób"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "Wy_magani ludzie"
 
-#: calendar/gui/e-meeting-time-sel.c:576
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "Wymagani ludzie i j_eden zasób"
 
-#: calendar/gui/e-meeting-time-sel.c:595
-msgid "Meeting _start time:"
-msgstr "Czas p_oczątku spotkania:"
-
-#: calendar/gui/e-meeting-time-sel.c:615
-msgid "Meeting _end time:"
-msgstr "Czas _końca spotkania:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2077
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2110
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6275,9 +6761,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "Wczytywanie zadań"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zadań z %s"
@@ -6294,15 +6778,6 @@ msgstr "Usuwanie zaznaczonych obiektów..."
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zadania"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "Aktualizowanie zapytania"
@@ -6328,55 +6803,6 @@ msgstr "Otwieranie %s"
 msgid "Purging"
 msgstr "Czyszczenie"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalendarz i zadania"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfiguracja strefy czasowej, kalendarza i listy zadań."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendarz i zadania Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola konfiguracji kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Przeglądarka wiadomości terminarza dla kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Edytor kalendarza/zadań Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Komponent kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Komponent zadań Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Kalendarze"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zadania"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Kwiecień"
@@ -6722,10 +7148,6 @@ msgstr "Wybrany miesiąc (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Wybrany rok (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Zadanie"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6756,7 +7178,7 @@ msgid "Contacts: "
 msgstr "Kontakty: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Podgląd wydruku"
 
@@ -6807,35 +7229,28 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Brak dostępnego kalendarza do utworzenia zadań"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Wybrana lista zadań jest tylko do odczytu, nie można tworzyć zdarzeń. "
-"Wybierz kalendarz z możliwością zapisu."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Nowa grupa zadań"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "_Grupa zadań"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Tworzy nową grupę zadań"
 
@@ -8600,41 +9015,6 @@ msgstr "Niepoprawne argumenty funkcji (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Błąd przy wykonywaniu wyszukiwania przez filtr: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nieobsługiwana operacja: dołączenie listu: typ %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nieobsługiwana operacja: wyszukiwanie według wyrażenia: typ %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nieobsługiwana operacja: wyszukiwanie według uid: dla %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Przenoszenie listów"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopiowanie listów"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Nauka rozpoznawania śmieci"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Nauka rozpoznawania nie-śmieci"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtrowanie nowych wiadomości"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8678,6 +9058,41 @@ msgstr "(match-threads) wymaga folderu"
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nagłówku: %s"
 
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nieobsługiwana operacja: dołączenie listu: typ %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nieobsługiwana operacja: wyszukiwanie według wyrażenia: typ %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nieobsługiwana operacja: wyszukiwanie według uid: dla %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Przenoszenie listów"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopiowanie listów"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Nauka rozpoznawania śmieci"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Nauka rozpoznawania nie-śmieci"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtrowanie nowych wiadomości"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8797,6 +9212,27 @@ msgstr "Zaszyfrowana zawartość"
 msgid "Unable to parse message content"
 msgstr "Nie można przeanalizować zawartości listu"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nie można utworzyć potoku do pomocniczego programu blokującego: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nie można utworzyć procesu dla pomocniczego programu blokującego: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+"Nie można zablokować \"%s\": błąd przy komunikacji z programem blokującym"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nie można zablokować \"%s\""
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8819,27 +9255,6 @@ msgstr "Uzyskanie blokady za pomocą fcntl(2) nie powiodło się: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Uzyskanie blokady za pomocą flock(2) nie powiodło się: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nie można utworzyć potoku do pomocniczego programu blokującego: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nie można utworzyć procesu dla pomocniczego programu blokującego: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-"Nie można zablokować \"%s\": błąd przy komunikacji z programem blokującym"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nie można zablokować \"%s\""
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9097,7 +9512,7 @@ msgstr "Wskazane dane uwierzytelniania są przeterminowane."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowiedź serwera na uwierzytelnienie."
 
@@ -9185,59 +9600,59 @@ msgstr "POP przed SMTP przy użyciu źródła nie będącego typu pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nie powiodła się kompilacja wyrażenia regularnego: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "W adresie URL \"%s\" wymagana jest nazwa użytkownika"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "W adresie URL \"%s\" wymagana jest nazwa komputera"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "W adresie URL \"%s\" wymagana jest ścieżka"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nie można ustalić adresu odpowiadającego nazwie: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 "Nie można ustalić adresu odpowiadającego nazwie: nie można utworzyć  wątku: %"
 "s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 "Nie można ustalić adresu odpowiadającego nazwie: %s: nazwa nie istnieje"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 "Nie można ustalić adresu odpowiadającego nazwie: %s: przyczyna nieznana"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Wyszukiwanie adresu"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Nie można ustalić adresu odpowiadającego nazwie: nazwa nie istnieje"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Nie można ustalić adresu odpowiadającego nazwie: przyczyna nieznana"
 
@@ -9309,7 +9724,7 @@ msgstr "Nie można dodać certyfikatu szyfrującego"
 msgid "Cannot add CMS SignerInfo"
 msgstr "Nie można dodać pola CMS SignerInfo"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Nie można utworzyć kontekstu szyfratora"
 
@@ -9393,7 +9808,8 @@ msgstr ""
 "Certyfikacja samej wiadomości, certyfikaty zaimportowane i zweryfikowane"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "Nie można odnaleźć deklaracji podpisu"
 
 #: camel/camel-smime-context.c:651
@@ -9406,47 +9822,51 @@ msgid "Decoder failed"
 msgstr "Dekoder zakończył pracę z błędem"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
 msgstr "Nie można odnaleźć certyfikatu dla \"%s\""
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Nie można odnaleźć wspólnego algorytmu szyfrowania całości"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Nie można przydzielić miejsca dla klucza szyfrowania całości"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
 msgstr "Nie można utworzyć wiadomości CMS"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "Nie można utworzyć pola CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "Nie można dołączyć pola CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "Nie można dołączyć obiektu danych CMS"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "Nie można utworzyć pola CMS RecipientInfo"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "Nie można dodać pola CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Nie można utworzyć kontekstu szyfratora"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Nie można dodać danych do szyfratora"
@@ -9494,7 +9914,8 @@ msgstr "Nie można utworzyć folderu: %s: folder istnieje"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie można usunąć folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie można zmienić nazwy folderu: %s: Niepoprawna operacja"
@@ -9504,7 +9925,7 @@ msgid "Trash"
 msgstr "Śmietnik"
 
 #: camel/camel-store.c:779 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:96 ui/evolution-mail-message.xml.h:48
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Śmieć"
 
@@ -9740,7 +10161,7 @@ msgstr "Nie można skopiować lub przenieść listów do folderu wirtualnego"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie można usunąć folderu: %s: Folder nie istnieje"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie można zmienić nazwy folderu %s: Folder nie istnieje"
@@ -9759,8 +10180,8 @@ msgid "Checking for new mail"
 msgstr "Sprawdzanie nowej poczty"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Sprawdzanie nowych listów we wszystkich folderach"
 
@@ -9791,11 +10212,11 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Dla dostępu do serwerów Novell GroupWise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:109
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Hasło"
 
@@ -9812,343 +10233,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lista sprawdzania"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Nie powiodło się wysłanie polecenia do serwera IMAP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Nieoczekiwana odpowiedź od serwera IMAP4 %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Nieoczekiwane przywitanie od serwera IMAP %s."
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Nie można wybrać folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Nie można wybrać folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Serwer IMAP4 %s nieoczekiwanie przerwał połączenie: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Otrzymano odpowiedź BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:424
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Nie można zsynchronizować flag folderu \"%s\": Nieznane"
-
-#: camel/providers/imap4/camel-imap4-folder.c:430
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Nie można zsynchronizować flag folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:567
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Nie można opróżnić folderu \"%s\": Nieznane"
-
-#: camel/providers/imap4/camel-imap4-folder.c:572
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Nie można opróżnić folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:762
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Nie można pobrać listu %s z folderu %s: Nie ma takiej wiadomości"
-
-#: camel/providers/imap4/camel-imap4-folder.c:767
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Nie można pobrać listu %s z folderu %s: Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:892
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Nie można dołączyć listu do folderu \"%s\": Nieznany błąd"
-
-#: camel/providers/imap4/camel-imap4-folder.c:921
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Nie można dołączyć listu do folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1000
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Nie można przenieść listu z folderu \"%s\" do folderu \"%s\": Nieznany"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1004
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Nie można skopiować listu z folderu \"%s\" do folderu \"%s\": Nieznany"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1012
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nie można przenieść listu z folderu \"%s\" do folderu \"%s\": Błędne "
-"polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1016
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nie można skopiować listu z folderu \"%s\" do folderu \"%s\": Błędne "
-"polecenie"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Foldery"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Wyświetlanie tylko zasubskrybowanych folderów"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Przestrzeń nazw"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-"Przeglądanie i przechowywanie poczty na serwerach IMAPv4rev1. "
-"EKSPERYMENTALNE!!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Przy tej opcji połączenie z serwerem IMAPv4rev1 nastąpi przy użyciu hasła w "
-"postaci czystego tekstu."
-
-#: camel/providers/imap4/camel-imap4-store.c:173
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Serwer IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "usługa IMAP dla %s na %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/imap4/camel-imap4-store.c:233
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Nie można nawiązać połączenia z %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nie jest dostępny"
-
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Anulowano połączenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:269
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: "
-"Serwer nie obsługuje STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Nieznany błąd"
-
-#: camel/providers/imap4/camel-imap4-store.c:381
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nie można uwierzytelnić w serwerze IMAP %s przy użyciu mechanizmu "
-"uwierzytelniania %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:426
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPodaj hasło IMAP dla %s na serwerze %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:500
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nie można uwierzytelnić na serwerze IMAP %s przy użyciu %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:731
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Nie można pobrać folderu \"%s\" na serwerze IMAP %s: Nieznany"
-
-#: camel/providers/imap4/camel-imap4-store.c:793
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Nazwa folderu \"%s\" jest niepoprawna, ponieważ zawiera znak \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:837
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Nie można utworzyć folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:842
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Nie można utworzyć folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:870
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Nie można usunąć folderu \"%s\": Folder specjalny"
-
-#: camel/providers/imap4/camel-imap4-store.c:903
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Nie można usunąć folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:908
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Nie można usunąć folderu \"%s\": Niepoprawne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:928
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Nie można zmienić nazwy folderu \"%s\" na \"%s\": Folder specjalny"
-
-#: camel/providers/imap4/camel-imap4-store.c:960
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr ""
-"Nie można zmienić nazwy folderu \"%s\" na \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:965
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Nie można zmienić nazwy folderu \"%s\" na \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:1171
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-"Nie można pobrać informacji %s dla wzorca \"%s\" na serwerze IMAP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1173
-msgid "Bad command"
-msgstr "Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:1235
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Nie można zasubskrybować folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:1240
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Nie można zasubskrybować folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:1285
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Nie można odsubskrybować folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:1290
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Nie można odsubskrybować folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Nieoczekiwan odpowiedź od serwera IMAP %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "Brak danych"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Serwer IMAP %s nieoczekiwanie przerwał połączenie: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serwer nieoczekiwanie przerwał połączenie: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Nieznany błąd"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10217,7 +10323,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10288,6 +10394,27 @@ msgstr "Użycie własnego polecenie do połączenia z serwerem"
 msgid "Command:"
 msgstr "Polecenie:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Foldery"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Wyświetlanie tylko zasubskrybowanych folderów"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Przestrzeń nazw"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10309,43 +10436,93 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Przeglądanie i przechowywanie poczty na serwerach IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Serwer IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "usługa IMAP dla %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Nie można nawiązać połączenia z %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL nie jest dostępny"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Anulowano połączenie"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Rozszerzenie SSL/TLS nie jest obsługiwane."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Negocjacja SSL nie powiodła się"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nie można nawiązać połączenia poleceniem \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serwer IMAP-a %s nie obsługuje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Brak obsługi typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPodaj hasło IMAP dla %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono hasła."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10356,30 +10533,275 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Nazwa folderu \"%s\" jest niepoprawna, ponieważ zawiera znak \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrzędny nie może zawierać folderów podrzędnych"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nie można utworzyć folderu \"%s\": folder istnieje."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nieznany folder nadrzędny: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Nie powiodło się wysłanie polecenia do serwera IMAP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Nieoczekiwana odpowiedź od serwera IMAP4 %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Nieoczekiwane przywitanie od serwera IMAP %s."
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nie można wybrać folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nie można wybrać folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Serwer IMAP4 %s nieoczekiwanie przerwał połączenie: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Otrzymano odpowiedź BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Nie można zsynchronizować flag folderu \"%s\": Nieznane"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nie można zsynchronizować flag folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nie można opróżnić folderu \"%s\": Nieznane"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nie można opróżnić folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Nie można pobrać listu %s z folderu %s: Nie ma takiej wiadomości"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Nie można pobrać listu %s z folderu %s: Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nie można dołączyć listu do folderu \"%s\": Nieznany błąd"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nie można dołączyć listu do folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Nie można przenieść listu z folderu \"%s\" do folderu \"%s\": Nieznany"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Nie można skopiować listu z folderu \"%s\" do folderu \"%s\": Nieznany"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nie można przenieść listu z folderu \"%s\" do folderu \"%s\": Błędne "
+"polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nie można skopiować listu z folderu \"%s\" do folderu \"%s\": Błędne "
+"polecenie"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+"Przeglądanie i przechowywanie poczty na serwerach IMAPv4rev1. "
+"EKSPERYMENTALNE!!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Przy tej opcji połączenie z serwerem IMAPv4rev1 nastąpi przy użyciu hasła w "
+"postaci czystego tekstu."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: "
+"Serwer nie obsługuje STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nie można uwierzytelnić w serwerze IMAP %s przy użyciu mechanizmu "
+"uwierzytelniania %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPodaj hasło IMAP dla %s na serwerze %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nie można uwierzytelnić na serwerze IMAP %s przy użyciu %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Nie można pobrać folderu \"%s\" na serwerze IMAP %s: Nieznany"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nie można utworzyć folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nie można utworzyć folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nie można usunąć folderu \"%s\": Folder specjalny"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nie można usunąć folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nie można usunąć folderu \"%s\": Niepoprawne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Nie można zmienić nazwy folderu \"%s\" na \"%s\": Folder specjalny"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr ""
+"Nie można zmienić nazwy folderu \"%s\" na \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Nie można zmienić nazwy folderu \"%s\" na \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+"Nie można pobrać informacji %s dla wzorca \"%s\" na serwerze IMAP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nie można zasubskrybować folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nie można zasubskrybować folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nie można odsubskrybować folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nie można odsubskrybować folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Nieoczekiwan odpowiedź od serwera IMAP %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Brak danych"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Serwer IMAP %s nieoczekiwanie przerwał połączenie: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10554,18 +10976,26 @@ msgstr "Nie można zapisać zestawienia: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie można dodać listu do zestawienia: przyczyna nieznana"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Nadchodzące"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Anulowano dołączenie listu do katalogu Maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie można dołączyć listu do folderu w formacie maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10581,50 +11011,50 @@ msgstr ""
 "Nie można pobrać listu: %s z folderu %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Niepoprawna zawartość listu"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Nie można pobrać folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Nie można pobrać folderu \"%s\": folder nie istnieje."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Nie można utworzyć folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 "Nie można pobrać folderu \"%s\": nie jest katalogiem z listami w formacie "
 "maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie można usunąć folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11189,7 +11619,7 @@ msgstr "Usuwanie po %s dniach"
 msgid "Disable support for all POP3 extensions"
 msgstr "Bez obsługi jakichkolwiek rozszerzeń POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:108
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11221,21 +11651,26 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nie można nawiązać połączenia z serwerem POP %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Nie można przeprowadzić uwierzytelnienia na serwerze POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Nie można nawiązać połączenia z serwerem POP %s w trybie bezpiecznym: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nie można nawiązać połączenia z serwerem POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11244,29 +11679,29 @@ msgstr ""
 "Nie można nawiązać połączenia z serwerem POP %s: Brak obsługi wymaganego "
 "mechanizmu uwierzytelniania."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Nie powiodło się logowanie SASL \"%s\" na serwerze POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 "Nie można zalogować się na serwerze POP %s: błąd na poziomie protokołu SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nie można przeprowadzić uwierzytelnienia na serwerze POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPodaj hasło POP dla %s na serwerze %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11275,13 +11710,22 @@ msgstr ""
 "Nie można nawiązać połączenia z serwerem POP %s.\n"
 "Wystąpił błąd przy wysyłaniu hasła: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem POP %s.\n"
+"Wystąpił błąd przy wysyłaniu hasła: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11337,7 +11781,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Wysyłanie listów za pomocą programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:123
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11670,74 +12114,6 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wyświetlenia załącznika"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Nie można podpisać wiadomości wychodzącej: Nie ustawiono certyfikatu "
-"podpisującego dla tego konta"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Nie można zaszyfrować wiadomości wychodzącej: Nie ustawiono certyfikatu "
-"szyfrującego dla tego konta"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Nie można otworzyć pliku"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Nie można pobrać listu z edytora"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "List bez tytułu"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Otwarcie pliku"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Wygenerowany automatycznie"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Podpis:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> załączony plik"
-msgstr[1] "<b>%d</b> załączone pliki"
-msgstr[2] "<b>%d</b> załączonych plików"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Ukrycie p_aska załączników (upuść tutaj załączniki)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3212
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Wyświetlenie p_aska załączników (upuść tutaj załączniki)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3104
-#: composer/e-msg-composer.c:3105
-msgid "Compose a message"
-msgstr "Tworzenie listu"
-
-#: composer/e-msg-composer.c:4258
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Edytor listów zawiera treść nie będącą tekstem, która nie może podlegać "
-"modyfikacjom.)</b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Cel wysyłania"
@@ -11817,17 +12193,93 @@ msgstr "Kliknij aby wybrać foldery do których wysłać"
 msgid "Attach file(s)"
 msgstr "Załączenie plików"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Nie można podpisać wiadomości wychodzącej: Nie ustawiono certyfikatu "
+"podpisującego dla tego konta"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Nie można zaszyfrować wiadomości wychodzącej: Nie ustawiono certyfikatu "
+"szyfrującego dla tego konta"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Nie można otworzyć pliku"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nie można pobrać listu z edytora"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "List bez tytułu"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otwarcie pliku"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Wygenerowany automatycznie"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Podpis:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> załączony plik"
+msgstr[1] "<b>%d</b> załączone pliki"
+msgstr[2] "<b>%d</b> załączonych plików"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Ukrycie p_aska załączników (upuść tutaj załączniki)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Wyświetlenie p_aska załączników (upuść tutaj załączniki)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Tworzenie listu"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Przesłany list - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Załączenie oryginalnego listu"
+msgstr[1] "Załączenie oryginalnego listu"
+msgstr[2] "Załączenie oryginalnego listu"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Edytor listów zawiera treść nie będącą tekstem, która nie może podlegać "
+"modyfikacjom.)</b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Nie można załączyć do tego listu pliku \"{0}\"."
 
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11849,18 +12301,32 @@ msgstr ""
 "pliki z tego katalogu osobno, albo utworzyć archiwum z tym katalogiem i "
 "załączyć je."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nie można utworzyć wiadomości."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Ponieważ \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Znaleziono niedokończone listy"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Czy chcesz odtworzyć niedokończony list?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11868,38 +12334,38 @@ msgstr ""
 "Program Evolution niespodziewanie zakończył pracę podczas tworzenia nowego "
 "listu. Odtworzenie listu pozwoli na kontynuację pracy w tym samym miejscu."
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Nie odtwarzaj"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Odtwórz"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nie można zapisać do pliku autozapisu \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Błąd zapisu do pliku autozapisu z powodu \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Uwaga: Zmodyfikowany list"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "Czy na pewno chcesz porzucić pisany właśnie list o tytule \"{0}\"?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11909,64 +12375,48 @@ msgstr ""
 "chyba, że zostanie wybrany zapis wiadomości w folderze szkiców. Pozwoli to "
 "na późniejsze kontynuowanie wiadomości."
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Porzuć zmiany"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Zapisz wiadomość"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Nie można utworzyć wiadomości."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Ponieważ \"{0}\", możesz potrzebować wybrać inne opcje poczty."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nie można odczytać pliku z podpisem \"{0}\"."
 
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Ponieważ \"{1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Wszystkie konta zostały usunięte."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Przed wysłaniem listu należy skonfigurować konto."
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:44
 #: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Nie można utworzyć okna tworzenia listu."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Nie można uaktywnić formantu wyboru adresu."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -12132,16 +12582,12 @@ msgstr "Kategorie synchronizacji:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12193,31 +12639,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12317,7 +12755,6 @@ msgid "Missing file name."
 msgstr "Brakująca nazwa pliku."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Należy podać nazwę pliku."
@@ -12338,7 +12775,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Nie można skompilować wyrażenia regularnego \"{1}\"."
 
 #. filter:no-name primary
-#. mail:no-name-vfolder primary
 #: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Brakująca nazwa."
@@ -12362,6 +12798,72 @@ msgstr "Wybierz inną nazwę."
 msgid "Choose a file"
 msgstr "Wybór pliku"
 
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
+msgstr "Ważne"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
+msgstr "Do zrobienia"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
+msgstr "Później"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Nazwa reguły:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Jeżeli</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "przy spełnieniu wszystkich kryteriów"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "przy spełnieniu któregokolwiek z kryteriów"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Wykonywanie czynności"
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr "Wszystkie powiązane"
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr "Odpowiedzi"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr "Odpowiedzi i nadrzędne"
+
+# FIXME - czy też załącza
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr "Wątki"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "przychodzące"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "wychodzące"
+
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>R_eguły filtrów</b>"
@@ -12410,7 +12912,7 @@ msgstr "temu"
 msgid "months"
 msgstr "miesięcy"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekund"
 
@@ -12426,83 +12928,83 @@ msgstr "podanym czasem"
 msgid "years"
 msgstr "lat"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:94
-msgid "Important"
-msgstr "Ważne"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Dodaj regułę"
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:149
-msgid "To Do"
-msgstr "Do zrobienia"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Zmodyfikuj regułę"
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:98
-msgid "Later"
-msgstr "Później"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "Nazwa reguły"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
 
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "Nazwa reguły:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Preferencje edytora listów"
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>Jeżeli</b>"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfiguracja preferencji dotyczących listów, m.in. bezpieczeństwa i "
+"wyświetlania"
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "przy spełnieniu wszystkich kryteriów"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfiguracja dotycząca sprawdzania pisowni, podpisów i edytora listów"
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "przy spełnieniu któregokolwiek z kryteriów"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfiguracja kont pocztowych"
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "Wykonywanie czynności"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Poczta Evolution"
 
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "Wszystkie powiązane"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola konfiguracji kont pocztowych Evolution"
 
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "Odpowiedzi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponent poczty programu Evolution"
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
-msgstr "Odpowiedzi i nadrzędne"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Edytor listów programu Evolution"
 
-# FIXME - czy też załącza
-#: filter/filter-rule.c:879
-msgid "Include threads"
-msgstr "Wątki"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola konfiguracji programu do tworzenia listów Evolution"
 
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "przychodzące"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola preferencji poczty Evolution"
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "wychodzące"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Poczta"
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
-msgstr "Dodaj regułę"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Konta pocztowe"
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
-msgstr "Zmodyfikuj regułę"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Ustawienia poczty"
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
-msgstr "Nazwa reguły"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Poczta"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12557,7 +13059,7 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "R_eguły filtrów"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:492
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
 #: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Wybór folderu"
@@ -12691,7 +13193,7 @@ msgstr "nie jest oznaczony"
 msgid "Junk Test"
 msgstr "Test śmieci"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:927
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etykieta"
@@ -12797,8 +13299,8 @@ msgstr "rozpoczyna się od"
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: mail/em-filter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -12844,7 +13346,7 @@ msgstr "<kliknij, aby wybrać folder> "
 msgid "Create New Folder"
 msgstr "Tworzenie nowego folderu"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2310
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
 #: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Określ miejsce utworzenia folderu:"
@@ -12857,440 +13359,279 @@ msgstr "Utwórz"
 msgid "Folder _name:"
 msgstr "_Nazwa folderu:"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFoldery"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "NIEPASUJĄCE"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Wczytywanie..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Przenoszenie folderu %s"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiowanie folderu %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Przenoszenie listów do folderu %s"
 
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiowanie listów do folderu %s"
 
 # FIXME - ma ktoś coś lepszego?
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nie można upuścić listu w głównym folderze"
 
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "P_rzenieś do folderu"
 
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Przenieś"
 
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Anuluj p_rzeciąganie"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Wybór folderu"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "Sk_opiuj"
 
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Tworzenie folderu \"%s\""
 
-#: mail/em-folder-tree.c:2310 mail/mail-component.c:709
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Tworzenie folderu"
 
-#: mail/em-folder-tree.c:2499
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmiana nazwy folderu \"%s\" na:"
 
-#: mail/em-folder-tree.c:2501
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Zmień nazwę folderu"
 
-#: mail/em-folder-tree.c:2572 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Widok"
 
-#: mail/em-folder-tree.c:2573
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Otwórz w nowym _oknie"
 
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "_Przenieś..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2582
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Nowy folder..."
 
-#: mail/em-folder-tree.c:2585
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "_Zmień nazwę..."
 
-#: mail/em-folder-tree.c:2588 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Właściwości"
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:869
-msgid "VFolders"
-msgstr "VFoldery"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "NIEPASUJĄCE"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Nadchodzące"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Wczytywanie..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:559
-msgid "Mail"
-msgstr "Poczta"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odpowiedz na _listę"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Prześlij"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Po_dążaj..."
 
 # FIXME - upewnić się, że tak a nie inaczej :)
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "_Oznacz jako zakończone"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Wy_czyść flagę"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Ozn_acz jako nieważne"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Oznacz jako ś_mieci"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Cofnij usunięcie"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenieś do folderu..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawcę do _książki adresowej"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Zastosuj fi_ltry"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_iltruj śmieci"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "_Utwórz regułę na podstawie listu"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawcę"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorców"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _listę dyskusyjną"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawcę"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorców"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_stę dyskusyjną"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:69
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Domyślne"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Wydrukuj list"
 
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "Skopiuj położ_enie odnośnika"
 
 # FIXME - Nie mam pewności , że to o to idzie
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknij aby wysłać %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Odpowiedź do"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Dla"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Grupy nowin"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "Załącznik: %s"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nie można przetworzyć widomości S/MIME: Nieznany błąd"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-"Nieobsługiwany rodzaj szyfrowania dla wiadomości wieloczęściowych/"
-"szyfrowanych"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-"Nie można przetworzyć jako list MIME. Wyświetlanie w postaci źródłowej."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Nieobsługiwany format podpisu"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Błąd weryfikacji podpisu"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Nieznany błąd weryfikacji podpisu"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Pobieranie \"%s\""
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Niepodpisana"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Podpis prawidłowy"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Nieprawidłowy podpis"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Poprawny podpis ale nie można zweryfikować nadawcy"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Niezaszyfrowana"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Zaszyfrowana, słabo"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Zaszyfrowana"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Zaszyfrowana, silnie"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Niepoprawna forma części external-body."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Wskaźnik do witryny FTP (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Wskaźnik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Wskaźnik do lokalnego pliku (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Wskaźnik na zdalne dane (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Wskaźnik na nieznane zewnętrzne dane (typu \"%s\")"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formatowanie listu"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:939
-msgid "Mailer"
-msgstr "Program pocztowy"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Dopasowania: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Niepodpisana"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13298,7 +13639,11 @@ msgstr ""
 "Wiadomość nie jest podpisana. Nie ma gwarancji, że ta wiadomość jest "
 "autentyczna."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Podpis prawidłowy"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13306,7 +13651,11 @@ msgstr ""
 "Wiadomość jest podpisana i poprawna, jest bardzo prawdopodbne, że list jest "
 "autentyczny."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Nieprawidłowy podpis"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13314,11 +13663,11 @@ msgstr ""
 "Nie można zweryfikować podpisu wiadomości, list mógł być naruszony podczas "
 "transmisji."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Poprawny podpis, nie można zweryfikować nadawcy"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13326,7 +13675,11 @@ msgstr ""
 "Wiadomość ta jest podpisana poprawnym podpisem, ale nadawca tego listu nie "
 "może być zweryfikowany."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Niezaszyfrowana"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13334,7 +13687,11 @@ msgstr ""
 "Ta wiadomość nie jest zaszyfrowana. Jej zawartość może być podglądnięta "
 "podczas transmisji przez Internet."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Zaszyfrowana, słabo"
+
+#: mail/em-format-html-display.c:651
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -13344,7 +13701,11 @@ msgstr ""
 "obcej będzie trudno, ale nie niemożliwie podejrzeć w konkretnym czasie "
 "zawartość tego listu."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Zaszyfrowana"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13352,7 +13713,11 @@ msgstr ""
 "Ta wiadomość jest zaszyfrowana. Osobie obcej będzie trudno podejrzeć "
 "zawartość tego listu."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Zaszyfrowana, silnie"
+
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -13361,40 +13726,165 @@ msgstr ""
 "Ta wiadomość jest zaszyfrowana silnym algorytmem szyfrującym. Osobie obcej "
 "będzie bardzo trudno w konkretnym czasie podejrzeć zawartość tego listu."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Wyświetl certyfikat"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Tego certyfikatu nie można wyświetlić"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ukończone %d %B, %Y, %k:%M"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Zaległe:"
 
 # FIXME - sprawdzić czy ma być na pawno "od"
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "od %d %B, %Y, %k:%M"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Wyświetlenie w treści listu"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Ukryj"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strona %d z %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Pobieranie \"%s\""
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Poprawny podpis ale nie można zweryfikować nadawcy"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Niepoprawna forma części external-body."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Wskaźnik do witryny FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Wskaźnik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Wskaźnik do lokalnego pliku (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Wskaźnik na zdalne dane (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Wskaźnik na nieznane zewnętrzne dane (typu \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatowanie listu"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Od"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Odpowiedź do"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Dla"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Program pocztowy"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
+msgstr "<I> (%a, %R %Z)</I>"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Grupy nowin"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "Załącznik: %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nie można przetworzyć widomości S/MIME: Nieznany błąd"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+"Nieobsługiwany rodzaj szyfrowania dla wiadomości wieloczęściowych/"
+"szyfrowanych"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+"Nie można przetworzyć jako list MIME. Wyświetlanie w postaci źródłowej."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nieobsługiwany format podpisu"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Błąd weryfikacji podpisu"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nieznany błąd weryfikacji podpisu"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (wbudowany)"
@@ -13507,7 +13997,7 @@ msgstr "Wyślij _list do..."
 msgid "_Add to Addressbook"
 msgstr "Dodaj d_o książki adresowej"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Otwórz za pomocą programu %s..."
@@ -13555,7 +14045,7 @@ msgstr "Dodanie adresu"
 
 # FIXME - upewnić się co to jest
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Listów z %s"
@@ -13564,11 +14054,11 @@ msgstr "Listów z %s"
 msgid "Virtual _Folders"
 msgstr "W_irtualne foldery"
 
-#: mail/em-vfolder-rule.c:492
+#: mail/em-vfolder-rule.c:494
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: mail/em-vfolder-rule.c:572
+#: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "Źródło VFolderów"
 
@@ -14047,64 +14537,33 @@ msgstr "portu uruchamianego przez użytkownika spamd"
 msgid "spamd port"
 msgstr "port spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Preferencje edytora listów"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfiguracja preferencji dotyczących listów, m.in. bezpieczeństwa i "
-"wyświetlania"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfiguracja dotycząca sprawdzania pisowni, podpisów i edytora listów"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Konfiguracja kont pocztowych"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Poczta Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola konfiguracji kont pocztowych Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Komponent poczty programu Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importer Elm Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Edytor listów programu Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Druid importu poczty Netscape dla Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola konfiguracji programu do tworzenia listów Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Druid importu poczty Outlook Express 4 dla Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola preferencji poczty Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Druid importu poczty Pine dla Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Konta pocztowe"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importer mbox Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:100
-msgid "Mail Preferences"
-msgstr "Ustawienia poczty"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Poczta"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbox)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14162,34 +14621,6 @@ msgstr "Importowanie \"%s\""
 msgid "Importing mailbox"
 msgstr "Importowanie szkrzynki pocztowej"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importer Elm Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Druid importu poczty Netscape dla Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Druid importu poczty Outlook Express 4 dla Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Druid importu poczty Pine dla Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Importer mbox Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbox)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14323,15 +14754,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Umowa licencyjna %s"
 
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "Nazwa ser_wera:"
 
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:152
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Nazwa _użytkownika:"
 
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:174
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "Ś_cieżka:"
 
@@ -14444,15 +14875,7 @@ msgstr "Tworzy nowy folder poczty"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nie powiodło się zaktualizowanie ustawień poczty lub folderów."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Sprawdzanie usługi"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Nawiązywanie połączenia z serwerem..."
-
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:93
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Tożsamość"
 
@@ -14467,7 +14890,7 @@ msgstr ""
 "znajdujące się w nich informacje były zawarte w wysyłanych listach."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Odbieranie poczty"
 
@@ -14484,7 +14907,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Wybierz spośród poniższych opcji"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:132
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Wysyłanie listów"
 
@@ -14497,7 +14920,7 @@ msgstr ""
 "pewności co do tych informacji, zapytaj administratora lub dostawcę "
 "Internetu (ISP)."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:38
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Zarządzanie kontami"
 
@@ -14515,7 +14938,15 @@ msgstr ""
 "tego konta. Nazwa będzie używana tylko przy wyświetlaniu celem odróżnienia "
 "go od innych kont."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Sprawdzanie usługi"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Nawiązywanie połączenia z serwerem..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
 
@@ -14523,10 +14954,6 @@ msgstr "    "
 msgid " Ch_eck for Supported Types "
 msgstr " _Sprawdź obsługiwane typy "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Podgląd</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>Ta kopia Evolution nie obsługuje protokołu SSL</b>"
@@ -14540,216 +14967,212 @@ msgid "<b>_Languages</b>"
 msgstr "<b>Języ_ki</b>"
 
 #: mail/mail-config.glade.h:8
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>Źródła vFolderów</b>"
-
-#: mail/mail-config.glade.h:9
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 "<small>Spowoduje to pewniejsze, ale również wolniejsze działanie filtru</"
 "small>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Informacje o koncie</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alarmy</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Rodzaj uwierzytelniania</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Uwierzytelnianie</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Sprawdzanie nowej poczty</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Tworzenie wiadomości</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfiguracja</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Domyślne zachowanie</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Usuwanie poczty</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Wyświetlane _nagłówki listów</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opcje filtrów</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Główne</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etykiety i kolory</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Wczytywanie obrazów</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Wyświetlanie wiadomości</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Czcinki wiadomości</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Powiadamianie o nowej poczcie</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Informacje dodatkowe</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opcje</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Czcionki drukowane</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informacje wymagane</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Bezpieczne MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Bezpieczeństwo</span>"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Listy wysłane i szkice</span>"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Konfiguracja serwera</span>"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Przy wysyłaniu zaszyfrowanych listów s_zyfrowanie także do siebie"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Edytor kont"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_wy podpis..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "_Dodaj treść"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysyłaniu zaszyfrowanych listów _szyfrowanie zawsze do siebie"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Wy_syłanie kopii (cc) do:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Wysyłanie niewidocznych kopii listów (_bcc) do:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "P_odpisywanie wszystkich listów wychodzących przy użyciu tego konta"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Ufanie kluczom we własnej bazie kluczy podczas szyfrowania"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Załączenie oryginalnego listu"
 
-#: mail/mail-config.glade.h:48 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Załącznik"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "Automatyczne wstaw_ianie obrazów z buźkami"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "Automatyczne sprawdzanie _nowych listów co"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Bałtycki (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Bałtycki (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "_Brzęczyk po otrzymaniu nowej poczty"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Zestaw znaków:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "_Sprawdź obsługiwane typy "
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Check _incoming mail for junk"
 msgstr "_Wyszukiwanie śmieci w nadchodzącej poczcie"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Sp_rawdzanie pisowni podczas pisania"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Wyszukuje śmieci w nadchodzącej poczcie"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Kolor _błędnie napisanych słów:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Kolory"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "P_otwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14765,243 +15188,243 @@ msgstr ""
 "\n"
 "Kliknij \"Zastosuj\", aby zapisać ustawienia."
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "D_omyślne"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Domyślne kodowanie z_naków:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Domyślne"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Bez cytowania oryginalnego listu"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Bez podpisywania próśb o _spotkanie (dla zgodności z programem Outlook)"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "Adres _e-mail:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "_Opróżnianie folderów śmietnika przy zakończeniu"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "C_ertyfikat szyfrujący:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Wykonanie polecenia..."
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "_Stała szerokość:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Ustawienia czcionek"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Zapis listów w formacie _HTML"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Listy HTML"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Nagłówki"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Wyróżnianie cytatów za pomocą koloru"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 msgid "I_nclude remote tests"
 msgstr "_Dołączenie zewnętrznych testów"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "W treści listu"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Położenie skrzynki"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Edytor listów"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Uwaga: zapytanie o hasło pojawi się dopiero przy pierwszej próbie połączenia"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP/GPG:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Odtwarzanie dźwięku po otrzymaniu nowej poczty"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Potwierdzanie przy wysyłaniu listu tylko z _ukrytymi adresatami (Bcc)"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Cytowanie oryginalnego listu"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Zapa_miętanie hasła"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "O_dpowiedź do:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Zapamiętanie _hasła"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "_Zwykła czcionka:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Wybór czcionki o stałej szerokości używanej w HTML-u"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Wybór czcionki o stałej szerokości używanej na wydruku"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Wybór czcionki o zmiennej szerokości używanej w HTML-u"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Wybór czcionki o zmiennej szerokości używanej na wydruku"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Wybierz..."
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Wysyłanie listów"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Folder z _wysłanymi listami:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Certyfikat szyfr_ujący:"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "_Podpis:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Podpisy"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Nazwa p_liku:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Sprawdzanie pisowni"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "_Czcionka terminala:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "R_odzaj: "
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15011,7 +15434,7 @@ msgstr ""
 "podpis. Wpisana nazwa będzie używana tylko przy\n"
 "wyświetlaniu."
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15021,7 +15444,7 @@ msgstr ""
 "język. Lista dostępnych języków odnosi się tylko do języków, dla których "
 "zostały zainstalowane słowniki."
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15029,11 +15452,11 @@ msgstr ""
 "Wpisz nazwę, przy użyciu której chcesz się odnosić do tego konta.\n"
 "Na przykład: \"Służbowe\" lub \"Prywatne\""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Zmienna szerokość:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15043,101 +15466,202 @@ msgstr ""
 "\n"
 "Aby rozpocząć, kliknij \"Naprzód\"."
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Dodaj podpis"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "Pobieranie obrazów z sieci w _każdym przypadku"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Podpisyw_anie cyfrowe wszystkich wychodzących listów (domyślnie)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Bez powiadamiania o nadejściu nowej poczty"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Uaktywnij"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Szyfrowanie wychodzących listów (domyślnie)"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Sposób p_rzesyłania:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Pobieranie obrazów, jeśli nadawca jest w książce adresowej"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Ustawienie jako konto _domyślne"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie listów jako \"przeczytane\" po upływie"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Bez pobierania jakichkolwiek obrazów z sieci"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Potwierdzanie przy wysyłaniu listów w formacie HTML do osób, które ich nie "
 "chcą"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysyłaniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Sposób odpo_wiadania:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skrypt:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Wyświetlanie _animowanych obrazów"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "Wykorzystanie bezpiecznego połączenia (_SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Używanie tych samych czcionek co inne aplikacje"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "kolor"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Przeczytaj uważnie umowę licencyjną\n"
+"wyświetloną poniżej dla %s\n"
+"i zaznacz pole wyboru aby ją zaakceptować\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>Źródła vFolderów</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Podpis cyfrowy</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Szyfrowanie</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Zaakceptowane"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "Za_kończone"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Z rozróżnianiem małych i wielkich liter"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Wyszukiwanie w liście"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Znajdź:"
+
+# FIXME - Albo Zaznacz by kontynuować
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Znacznik kontynuacji"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Subskrypcje folderów"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Umowa licencyjna %s"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Niczego nie wybrano"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erwer:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Informacje o zabezpieczeniach"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Wiadomości wybrane do kontynuacji są wyświetlone pod spodem.\n"
+"Wybierz kontynuuj z menu \"Znacznik\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Lista zaakceptowanych licencji"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Wykonianie do:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Znacznik:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Zasubskrybuj"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "O_dsubskrybuj"
+
+#: mail/mail-dialogs.glade.h:30
 msgid "specific folders only"
 msgstr "tylko określone foldery"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-dialogs.glade.h:31
 msgid "with all active remote folders"
 msgstr "ze wszystkimi aktywnymi zdalnymi folderami"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-dialogs.glade.h:32
 msgid "with all local and active remote folders"
 msgstr "ze wszystkimi lokalnymi i aktywnymi zdalnymi folderami"
 
-#: mail/mail-config.glade.h:189
+#: mail/mail-dialogs.glade.h:33
 msgid "with all local folders"
 msgstr "ze wszystkimi lokalnymi folderami"
 
@@ -15162,6 +15686,7 @@ msgstr "Logowanie do serwera \"{0}\" jako \"{0}\" nie powiodło się."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -15189,8 +15714,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "Wyś_lij"
+msgstr "Wyślij"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15207,7 +15733,6 @@ msgstr ""
 "zawartości listu."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Czy na pewno chcesz wysłać list tylko z ukrytymi adresatami (BCC)?"
@@ -15287,7 +15812,6 @@ msgstr ""
 "\"{0}\"?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "W przypadku kontynuacji, nie będzie możliwości odtworzenia tego listu."
@@ -15316,6 +15840,7 @@ msgstr "Zostały niewysłane listy, czy mimo to chcesz zakończyć program?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15361,21 +15886,6 @@ msgstr "Błąd przy wykonywaniu operacji."
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15392,8 +15902,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Nie można zapisać do katalogu \"{0}\"."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15430,7 +15938,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Nie można usunąć folderu systemowego \"{0}\"."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15464,13 +15971,11 @@ msgstr ""
 "zostanie trwale skasowana."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Nie można zmienić nazwy \"{0}\" to \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Folder o nazwie \"{1}\" już istnieje. Użyj innej nazwy."
@@ -15481,25 +15986,21 @@ msgid "Because \"{2}\"."
 msgstr "Ponieważ \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Nie można przenieść folderu \"{0}\" do \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Nie można otworzyć źródła \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Nie można otworzyć celu \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Nie można skopiować folderu \"{0}\" do \"{1}\"."
@@ -15515,7 +16016,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Nie można otworzyć źródła \"{1}\""
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Nie można zapisać zmian do konta."
@@ -15546,8 +16046,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "W przypadku kontynuacji, informacje o koncie będą trwale usunięte."
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Nie usuwaj"
+msgstr "_Cofnij usunięcie"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15576,6 +16077,7 @@ msgstr "Porzucić zmiany?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Czy chcesz zapisać zmiany?"
 
@@ -15894,30 +16396,6 @@ msgstr "Odłączanie od %s"
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawiązywanie połączenia z %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Z rozróżnianiem małych i wielkich liter"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Wyszukiwanie w liście"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Znajdź:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Podpis cyfrowy</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Szyfrowanie</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Informacje o zabezpieczeniach"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Anulowanie..."
@@ -16027,15 +16505,15 @@ msgstr "Aktualizowanie vFolderów dla \"%s:%s\""
 msgid "Updating vFolders for '%s'"
 msgstr "Aktualizowanie vFolderów dla \"%s\""
 
-#: mail/mail-vfolder.c:939
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFoldery"
 
-#: mail/mail-vfolder.c:978
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFolderu"
 
-#: mail/mail-vfolder.c:1062
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
@@ -16169,50 +16647,49 @@ msgstr "Wszystkim"
 msgid "Review"
 msgstr "Recenzja"
 
-# FIXME - Albo Zaznacz by kontynuować
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Znacznik kontynuacji"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Treść zawiera"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "Za_kończone"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Treść nie zawiera"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Wiadomości wybrane do kontynuacji są wyświetlone pod spodem.\n"
-"Wybierz kontynuuj z menu \"Znacznik\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Treść lub temat zawiera"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Wykonianie do:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "List zawiera"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Znacznik:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Lista odbiorców zawiera"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Subskrypcje folderów"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Nadawca zawiera"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Niczego nie wybrano"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Temat zawiera"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erwer:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Temat nie zawiera"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Zasubskrybuj"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Powłoka Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "O_dsubskrybuj"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Test Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Testowy składnik Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16282,30 +16759,19 @@ msgstr "Określa, czy opuścić ostrzegawcze okno o rozwojowej wersji"
 msgid "mail"
 msgstr "poczta"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Nieznany błąd systemowy."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Niepoprawny argumenty"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Nie można dokonać rejestracji na serwerze OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Aktywne połączenia</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Nie odnaleziono bazy danych konfiguracji"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktywne połączenia"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Błąd ogólny"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+"Kliknij OK, aby zamknąć powyższe połączenia i przejść w tryb bez podłączenia "
+"do sieci"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16491,28 +16957,6 @@ msgstr "Nazwa folderu nie może zawierać znaku \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" oraz \"..\" są zarezerwowanymi nazwami folderów."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Program Evolution jest obecnie podłączony do sieci. Kliknij na tym przycisku "
-"aby pracować w trybie odłączenia od sieci."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Program Evolution jest w trakcie rozłączania z siecią."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Program Evolution jest obecnie rozłączony. Kliknij na tym przycisku aby "
-"pracować w trybie podłączenia do sieci."
-
-# FIXME - sprawdzić formę!!
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Przełącz do %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "W systemie nie jest zainstalowany GNOME Pilot tools."
@@ -16546,10 +16990,99 @@ msgstr "Praca _bez podłączenia"
 msgid "Work Offline"
 msgstr "Praca bez podłączenia"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Program Evolution jest obecnie podłączony do sieci. Kliknij na tym przycisku "
+"aby pracować w trybie odłączenia od sieci."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Program Evolution jest w trakcie rozłączania z siecią."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Program Evolution jest obecnie rozłączony. Kliknij na tym przycisku aby "
+"pracować w trybie podłączenia do sieci."
+
+# FIXME - sprawdzić formę!!
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Przełącz do %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Nieznany błąd systemowy."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Niepoprawny argumenty"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Nie można dokonać rejestracji na serwerze OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Nie odnaleziono bazy danych konfiguracji"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Błąd ogólny"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Nowy"
 
+#: shell/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Druid ustawień Evolution"
+
+#: shell/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
+msgstr "Importowanie plików"
+
+#: shell/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
+msgstr "Strefa czasowa"
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Witaj"
+
+#: shell/evolution-startup-wizard.glade.h:6
+msgid ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Witaj w Evolution. Na kolejnych kilku ekranach możesz podać\n"
+"informacje, które pozwolą na łączenie się z twoimi kontami\n"
+"e-mail oraz na importowanie plików z innych aplikacji.\n"
+"\n"
+"Aby kontynuować, kliknij \"Naprzód\"."
+
+#: shell/evolution-startup-wizard.glade.h:11
+msgid ""
+"You have successfully entered all of the information\n"
+"needed to set up Evolution. \n"
+"\n"
+"Click the \"Apply\" button to save your settings. "
+msgstr ""
+"Zostały wprowadzone wszystkie informacje, potrzebne do\n"
+"ustawienia Evolution.\n"
+"\n"
+"Aby zapisać ustawienia, kliknij przycisk \"Zastosuj\"."
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Nowy test"
@@ -16562,18 +17095,6 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Tworzy nowy element testowy"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Powłoka Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Test Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Testowy składnik Evolution"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16635,7 +17156,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Można zaimportować do Evolution dane z następujących plików:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16670,7 +17191,7 @@ msgstr ""
 "Mamy nadzieję, że spodobają ci się wyniki naszej ciężkiej pracy,\n"
 "my zaś będziemy oczekiwać z niecierpliwością na na twoje wsparcie!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16678,40 +17199,40 @@ msgstr ""
 "Dzięki\n"
 "Zespół Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Nie informuj mnie ponownie"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Rozpoczyna Evolution aktywując podany komponent"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Rozpoczyna w trybie bez podłączenia"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Rozpoczyna w trybie z podłączeniem"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Wymusza zamknięcie wszystkich komponentów Evolution"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Wymusza ponowną migrację z Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Zapisuje do pliku informacje dotyczące przebiegu wykonania komponentów."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16720,6 +17241,110 @@ msgstr ""
 "%s: Nie można jednocześnie użyć opcji --online i --offline.\n"
 "  Aby uzyskać więcej informacji, uruchom %s --help.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr "Zbyt mało miejsca na dysku do aktualizacji."
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+"Aktualizacja danych i ustawień będzie wymagała do {0} miejsca na dysku, ale "
+"dostępne jest tylko {1}.\n"
+"\n"
+"Należy udostępnić więcej wolnego miejsca w katalogu domowym przed dalszą "
+"kontynuacją."
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+"Aktualizacja z poprzedniej wersji nie powiodła się:\n"
+"{0}"
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{1}\n"
+"\n"
+"Jeżeli wybrana zostanie kontynuacja, część starych danych może nie być "
+"dostępna.\n"
+
+#: shell/shell-errors.xml.h:15
+msgid "Continue"
+msgstr "Kontynuuj"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+msgid "Cannot start Evolution"
+msgstr "Nie można uruchomić Evolution"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+msgid "Evolution can not start."
+msgstr "Nie można uruchomić Evolution."
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+"Konfiguracja systemu nie pokrywa się z konfiguracją programu Evolution.\n"
+"\n"
+"Kliknij pomoc aby dowiedzieć się szczegółów"
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+"Konfiguracja systemu nie pokrywa się z konfiguracją programu Evolution:\n"
+"\n"
+"{0}\n"
+"\n"
+"Kliknij pomoc aby dowiedzieć się szczegółów."
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16970,6 +17595,11 @@ msgstr "Dostępne certyfikaty"
 msgid "_Edit CA Trust"
 msgstr "_Modyfikuj zaufanie CA"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certyfikat już istnieje"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17179,11 +17809,6 @@ msgstr "Unikalne ID tematu"
 msgid "Certificate Signature Value"
 msgstr "Wartość podpis certyfikatu"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Certyfikat już istnieje"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Hasło pliku PKCS12"
@@ -17323,8 +17948,8 @@ msgstr "Wyświetla bieżący kontakt"
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "Ak_cje"
@@ -17801,16 +18426,6 @@ msgstr "_Odwróć zaznaczenie"
 msgid "_Threaded Message List"
 msgstr "Grupowanie listów w wąt_ki"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Zamyka bieżące okno"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Zam_knij"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Dodaj _nadawcę do książki adresowej"
@@ -18213,6 +18828,16 @@ msgstr "_Narzędzia"
 msgid "_Undelete"
 msgstr "_Cofnij usunięcie"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Zamyka bieżące okno"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "Zam_knij"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Załącz"
@@ -18295,10 +18920,6 @@ msgstr "Zapisuje bieżący plik pod inną nazwą"
 msgid "Save the message in a specified folder"
 msgstr "Zapisuje list w podanym folderze"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Wyślij"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19002,35 +19623,185 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (zakończono %d%%)"
 
-#~ msgid "Groupwise"
-#~ msgstr "Groupwise"
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Dane uwierzytelniania serwera HTTP"
 
-#~ msgid "_Score Rules"
-#~ msgstr "Reg_uły punktacji"
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Kalendarze wybrane do publikacji"
+
+#~ msgid "Login name:"
+#~ msgstr "Nazwa użytkownika:"
+
+#~ msgid "URL:"
+#~ msgstr "Adres URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "Publikacja ręczna"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nie można uruchomić wombata"
+
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+#~ msgstr ""
+#~ "Wybrany kalendarz jest tylko do odczytu, nie można tworzyć zdarzeń. "
+#~ "Wybierz kalendarz z możliwością zapisu."
+
+#~ msgid "C_alendar"
+#~ msgstr "K_alendarz"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Ustawienia alarmu dźwiękowego"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Ustawienia alarmu z komunikatem"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Ustawienia alarmu z wysłaniem listu"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Ustawienia alarmu z uruchomieniem programu"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Ustawienia nieznanego alarmu"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Powtórzenia alarmu"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Wyświetlany komunikat:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Treść wysyłanego listu"
+
+#~ msgid "Play sound:"
+#~ msgstr "Odtworzenie dźwięku:"
+
+#~ msgid "Run program:"
+#~ msgstr "Uruchamiany program:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Argumenty programu:"
+
+#~ msgid "Basics"
+#~ msgstr "Proste"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Data/Czas:"
 
-#~ msgid "Body contains"
-#~ msgstr "Treść zawiera"
+#~ msgid "Reminders"
+#~ msgstr "Przypomnienia"
 
-#~ msgid "Body does not contain"
-#~ msgstr "Treść nie zawiera"
+#~ msgid "_Options..."
+#~ msgstr "_Opcje..."
 
-#~ msgid "Body or subject contains"
-#~ msgstr "Treść lub temat zawiera"
+#~ msgid "Addressbook..."
+#~ msgstr "Książka adresowa..."
 
-#~ msgid "Message contains"
-#~ msgstr "List zawiera"
+#~ msgid "Reminder"
+#~ msgstr "Przypomnienie"
 
-#~ msgid "Recipients contain"
-#~ msgstr "Lista odbiorców zawiera"
+#~ msgid "B_usy"
+#~ msgstr "Z_ajęty"
 
-#~ msgid "Sender contains"
-#~ msgstr "Nadawca zawiera"
+#~ msgid "Co_nfidential"
+#~ msgstr "Po_ufny"
 
-#~ msgid "Subject contains"
-#~ msgstr "Temat zawiera"
+#~ msgid "Date & Time"
+#~ msgstr "Data i czas"
 
-#~ msgid "Subject does not contain"
-#~ msgstr "Temat nie zawiera"
+#~ msgid "F_ree"
+#~ msgstr "_Wolny"
+
+#~ msgid "Pri_vate"
+#~ msgstr "P_rywatny"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_bliczny"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Dodaj uczes_tnika"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Dodaj uczestników z książki adresowej."
+
+#~ msgid "Preview"
+#~ msgstr "Podgląd"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Reguła powtarzalności"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "D_owolna powtarzalność"
+
+#~ msgid "_Modify"
+#~ msgstr "Z_mień"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Brak powtarzalności"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "P_rosta powtarzalność"
+
+# FIXME - sprawdzić formę!!!!
+#~ msgid "% _Complete"
+#~ msgstr "% _Ukończenia"
+
+#~ msgid "Progress"
+#~ msgstr "Postęp"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Taj_ny"
+
+#~ msgid "Folder:"
+#~ msgstr "Folder:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Wystąpił błąd w podsystemie CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Nie można odnaleźć obiektu\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Brak uprawnień potrzebnych do aktualizacji kalendarza\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Nie można uaktualnić stanu uczestnika!\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Dodaj uczestników z książki adresowej"
+
+#~ msgid "_Options"
+#~ msgstr "Opcj_e"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Czas p_oczątku spotkania:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Czas _końca spotkania:"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "Wybrana lista zadań jest tylko do odczytu, nie można tworzyć zdarzeń. "
+#~ "Wybierz kalendarz z możliwością zapisu."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Nie można odnaleźć certyfikatu dla \"%s\""
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Nie można utworzyć wiadomości CMS"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Nie można utworzyć kontekstu szyfratora"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid "_Score Rules"
+#~ msgstr "Reg_uły punktacji"
 
 #~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 #~ msgstr "W liście z %a, %d-%m-%Y, godz. %H:%M %%+05d, %%s napisał(a):"
@@ -19082,17 +19853,6 @@ msgstr "%s (zakończono %d%%)"
 #~ msgid "Checkbox"
 #~ msgstr "Pole wyboru"
 
-#~ msgid "<b>Active Connections</b>"
-#~ msgstr "<b>Aktywne połączenia</b>"
-
-#~ msgid "Active Connections"
-#~ msgstr "Aktywne połączenia"
-
-#~ msgid "Click OK to close these connections and go offline"
-#~ msgstr ""
-#~ "Kliknij OK, aby zamknąć powyższe połączenia i przejść w tryb bez "
-#~ "podłączenia do sieci"
-
 #~ msgid "C_alendar:"
 #~ msgstr "K_alendarz:"
 
@@ -19111,139 +19871,21 @@ msgstr "%s (zakończono %d%%)"
 #~ msgid "Open Other User's Folder"
 #~ msgstr "Otwarcie innego folderu użytkownika"
 
-#~ msgid "_Account:"
-#~ msgstr "_Konto:"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "_Nazwa folderu:"
 
 #~ msgid "_User:"
 #~ msgstr "_Użytkownik:"
 
-#~ msgid "Evolution Setup Assistant"
-#~ msgstr "Druid ustawień Evolution"
-
-#~ msgid "Importing Files"
-#~ msgstr "Importowanie plików"
-
-#~ msgid "Timezone "
-#~ msgstr "Strefa czasowa"
-
-#~ msgid "Welcome"
-#~ msgstr "Witaj"
-
-#~ msgid ""
-#~ "Welcome to Evolution. The next few screens will allow\n"
-#~ "Evolution to connect to your email accounts, and to import\n"
-#~ "files from other applications. \n"
-#~ "\n"
-#~ "Please click the \"Forward\" button to continue. "
-#~ msgstr ""
-#~ "Witaj w Evolution. Na kolejnych kilku ekranach możesz podać\n"
-#~ "informacje, które pozwolą na łączenie się z twoimi kontami\n"
-#~ "e-mail oraz na importowanie plików z innych aplikacji.\n"
-#~ "\n"
-#~ "Aby kontynuować, kliknij \"Naprzód\"."
-
-#~ msgid ""
-#~ "You have successfully entered all of the information\n"
-#~ "needed to set up Evolution. \n"
-#~ "\n"
-#~ "Click the \"Apply\" button to save your settings. "
-#~ msgstr ""
-#~ "Zostały wprowadzone wszystkie informacje, potrzebne do\n"
-#~ "ustawienia Evolution.\n"
-#~ "\n"
-#~ "Aby zapisać ustawienia, kliknij przycisk \"Zastosuj\"."
-
-#~ msgid "Insufficient disk space for upgrade."
-#~ msgstr "Zbyt mało miejsca na dysku do aktualizacji."
-
-#~ msgid ""
-#~ "Upgrading your data and settings will require upto {0} of disk space, but "
-#~ "you only have {1} available.\n"
-#~ "\n"
-#~ "You will need to make more space available in your home directory before "
-#~ "you can continue."
-#~ msgstr ""
-#~ "Aktualizacja danych i ustawień będzie wymagała do {0} miejsca na dysku, "
-#~ "ale dostępne jest tylko {1}.\n"
-#~ "\n"
-#~ "Należy udostępnić więcej wolnego miejsca w katalogu domowym przed dalszą "
-#~ "kontynuacją."
-
-#~ msgid ""
-#~ "Upgrade from previous version failed:\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Aktualizacja z poprzedniej wersji nie powiodła się:\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "{1}\n"
-#~ "\n"
-#~ "If you choose to continue, you may not have access to some of your old "
-#~ "data.\n"
-#~ msgstr ""
-#~ "{1}\n"
-#~ "\n"
-#~ "Jeżeli wybrana zostanie kontynuacja, część starych danych może nie być "
-#~ "dostępna.\n"
-
-#~ msgid "Continue"
-#~ msgstr "Kontynuuj"
-
-#~ msgid "Cannot start Evolution"
-#~ msgstr "Nie można uruchomić Evolution"
-
-#~ msgid "Evolution can not start."
-#~ msgstr "Nie można uruchomić Evolution."
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration.\n"
-#~ "\n"
-#~ "Click help for details"
-#~ msgstr ""
-#~ "Konfiguracja systemu nie pokrywa się z konfiguracją programu Evolution.\n"
-#~ "\n"
-#~ "Kliknij pomoc aby dowiedzieć się szczegółów"
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Click help for details."
-#~ msgstr ""
-#~ "Konfiguracja systemu nie pokrywa się z konfiguracją programu Evolution:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Kliknij pomoc aby dowiedzieć się szczegółów."
-
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Nie można nawiązać połączenia z serwerem LDAP"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Nie można dokonać uwierzytelnienia na serwerze LDAP"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Nie można wykonać zapytania na głównym DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr ""
-#~ "Serwer nie przekazał w odpowiedzi żadnych obsługiwanych podstaw "
-#~ "wyszukiwania"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Serwer nie obsługuje informacji schematu LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Błąd przy pobieraniu informacji o schemacie"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Odpowiedź serwera nie zawiera poprawnych informacji o schemacie"
-
 #~ msgid ""
 #~ "Some fields are no longer representable in the contact editor. Please "
 #~ "wait while Evolution copies those fields to the 'Notes' field..."
@@ -19325,12 +19967,6 @@ msgstr "%s (zakończono %d%%)"
 #~ msgid "item8"
 #~ msgstr "element8"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Edytor kategorii nie jest dostępny."
-
-#~ msgid "Unable to open addressbook"
-#~ msgstr "Nie można otworzyć książki adresowej"
-
 #~ msgid "Do you want to save changes?"
 #~ msgstr "Czy chcesz zapisać zmiany?"
 
@@ -19370,9 +20006,6 @@ msgstr "%s (zakończono %d%%)"
 #~ "Usuwane zdarzenie jest spotkaniem. Czy chcesz wysłać powiadomienie o "
 #~ "anulowaniu?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Czy na pewno chcesz anulować i usunąć to spotkanie?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19390,45 +20023,15 @@ msgstr "%s (zakończono %d%%)"
 #~ "Usuwany wpis dziennika jest opublikowany. Czy chcesz wysłać powiadomienie "
 #~ "o anulowaniu?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "Czy na pewno chcesz anulować i usunąć ten wpis dziennika?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Czy na pewno chcesz usunąć termin \"%s\"?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Czy na pewno chcesz usunąć ten pozbawiony nazwy termin?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Czy na pewno chcesz usunąć zadanie \"%s\"?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Czy na pewno chcesz usunąć to pozbawione nazwy zadanie?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Czy na pewno chcesz usunąć wpis dziennika zatytułowany \"%s\"?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Czy na pewno chcesz usunąć ten niezatytułowany wpis dziennika?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Czy na pewno chcesz usunąć %d termin?"
-#~ msgstr[1] "Czy na pewno chcesz usunąć %d terminy?"
-#~ msgstr[2] "Czy na pewno chcesz usunąć %d terminów?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Czy na pewno chcesz usunąć %d zadanie?"
-#~ msgstr[1] "Czy na pewno chcesz usunąć %d zadania?"
-#~ msgstr[2] "Czy na pewno chcesz usunąć %d zadań?"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Czy na pewno chcesz usunąć %d wpis dziennika?"
-#~ msgstr[1] "Czy na pewno chcesz usunąć %d wpisy dziennika?"
-#~ msgstr[2] "Czy na pewno chcesz usunąć %d wpisów dziennika?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Zaproś innych..."
 
@@ -19466,9 +20069,6 @@ msgstr "%s (zakończono %d%%)"
 #~ msgid "The calendar backend for '%s' has crashed."
 #~ msgstr "Obsługa kalendarza dla \"%s\" spowodowała błąd."
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Nie można pobrać artykułu %s z serwera NNTP"
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Pozycjonowanie nie jest dozwolone przez serwer wiadomości"
author	JP Rosevear <jpr@novell.com>	2004-07-05 23:08:43 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2004-07-05 23:08:43 +0800
commit	8893f5137dd77a76ce1fbaa8e8793a40a750f3fb (patch)
tree	6ba22cb0aebe343b8c1b9d0980449957e391f989 /po/pl.po
parent	44ede0596eeb155117703e54c7a3a5b2c891bced (diff)
download	gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.gz gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.bz2 gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.lz gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.xz gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.zst gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.zip