[evolution-data-server] Updated Serbian translation



commit 5aec86a41d958f7e2378284ac9491e8465bad59a
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Sat Jan 26 10:18:14 2013 +0100

    Updated Serbian translation

 po/sr.po       | 2847 ++++++++++++++++++++++++++++++--------------------------
 po/sr latin po | 2847 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 3004 insertions(+), 2690 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index e102d26..e906d01 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the evolution-data-server package.
 # Maintainer: ÐÐÐÐÐÐ ÐÐÐÐÐ <dsegan gmx net>
 # Reviewed on 2005-08-20 by: ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <igor prevod org>
-# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012.
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
 "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2012-08-28 13:07+0000\n"
-"PO-Revision-Date: 2012-09-06 10:36+0200\n"
+"POT-Creation-Date: 2013-01-25 16:48+0000\n"
+"PO-Revision-Date: 2013-01-26 10:15+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -21,125 +21,133 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:116
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1232
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4785
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:931
-#: ../addressbook/libebook/e-book-client.c:106
-#: ../addressbook/libedata-book/e-data-book.c:432
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:570
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
-#: ../calendar/libecal/e-cal.c:4033 ../calendar/libecal/e-cal-client.c:148
-#: ../camel/camel-imapx-command.c:594
-#: ../camel/providers/imap/camel-imap-command.c:524
-#: ../camel/providers/imap/camel-imap-store.c:468
-#: ../libedataserver/e-client.c:165
-msgid "Unknown error"
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#: ../addressbook/backends/file/e-book-backend-file.c:141
+#: ../addressbook/backends/file/e-book-backend-file.c:102
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑ â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:164
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:616
+#: ../addressbook/backends/file/e-book-backend-file.c:126
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:459
+#: ../addressbook/backends/file/e-book-backend-file.c:373
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÑÑ ÐÐÐÑ ÐÐ ÐÐÐÐÑ â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:561
-#: ../addressbook/backends/file/e-book-backend-file.c:1127
+#: ../addressbook/backends/file/e-book-backend-file.c:475
+#: ../addressbook/backends/file/e-book-backend-file.c:898
 msgid "No UID in the contact"
-msgstr "ÐÐÐÐ ÐÐÐ-Ð Ñ ÐÐÐÑÐÐÑÑ"
+msgstr "ÐÐÐÐ ÐÐÐ-Ð Ñ ÐÐÐÑÐÐÑÑ"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:761
+#, c-format
+msgid "Conflicting UIDs found in added contacts"
+msgstr "ÐÑÐÐÐÑÐÐÐ ÑÑ ÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐ-ÐÐÐ Ñ ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑÐÐÐ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1569
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508
+#: ../addressbook/backends/file/e-book-backend-file.c:1002
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2127
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "ÐÐÐÑÐÐÑ â%sâ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1182
 msgid "Loading..."
 msgstr "ÐÑÐÑÐÐÐÐ..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1572
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
+#: ../addressbook/backends/file/e-book-backend-file.c:1184
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4918
 msgid "Searching..."
 msgstr "ÐÑÐÑÑÐÐÑÑÐÐ..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2115
+#: ../addressbook/backends/file/e-book-backend-file.c:1340
 #, c-format
-msgid "Failed to build summary for an address book %s"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÑ â%sâ"
+#| msgid "Could not rename folder %s to %s: %s"
+msgid "Failed to rename old database from '%s' to '%s': %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÑÐÑÑ ÐÐÐÑ ÐÐÐÐÑÐÐÐ â%sâ Ñ â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:142
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1194
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4813
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1015
+#: ../addressbook/libebook/e-book-client.c:93
+#: ../addressbook/libebook/e-phone-number.c:65
+#: ../addressbook/libedata-book/e-data-book.c:557
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:561
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:591
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
+#: ../calendar/libecal/e-cal.c:2327 ../calendar/libecal/e-cal-client.c:127
+#: ../camel/camel-imapx-command.c:594 ../libedataserver/e-client.c:156
+msgid "Unknown error"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:645
+#: ../addressbook/backends/google/e-book-backend-google.c:649
 msgid "Querying for updated contactsâ"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐâ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:782
+#: ../addressbook/backends/google/e-book-backend-google.c:786
 msgid "Querying for updated groupsâ"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÑÑÐÐÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1202
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+#: ../addressbook/backends/google/e-book-backend-google.c:1235
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1625
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:375
 msgid "The backend does not support bulk additions"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐÑÐ"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1234
+#: ../addressbook/backends/google/e-book-backend-google.c:1267
 msgid "Creating new contactâ"
 msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1323
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+#: ../addressbook/backends/google/e-book-backend-google.c:1358
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:492
 msgid "The backend does not support bulk removals"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1351
+#: ../addressbook/backends/google/e-book-backend-google.c:1386
 msgid "Deleting contactâ"
 msgstr "ÐÑÐÑÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1601
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
+#: ../addressbook/backends/google/e-book-backend-google.c:1640
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2288
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:553
 msgid "The backend does not support bulk modifications"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1639
+#: ../addressbook/backends/google/e-book-backend-google.c:1678
 msgid "Modifying contactâ"
 msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1809
+#: ../addressbook/backends/google/e-book-backend-google.c:1849
 msgid "Loadingâ"
 msgstr "ÐÑÐÑÐÐÐÐâ"
 
-#: ../addressbook/backends/google/e-book-google-utils.c:1562
+#: ../addressbook/backends/google/e-book-google-utils.c:1601
+#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1
 msgid "Personal"
 msgstr "ÐÐÑÐÐ"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1563
+#: ../addressbook/backends/google/e-book-google-utils.c:1602
 msgid "Friends"
 msgstr "ÐÑÐÑÐÑÐÑÐ"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1564
+#: ../addressbook/backends/google/e-book-google-utils.c:1603
 msgid "Family"
 msgstr "ÐÐÑÐÐÐÑÐ"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1565
+#: ../addressbook/backends/google/e-book-google-utils.c:1604
 msgid "Coworkers"
 msgstr "ÐÐÑÐÐÐÐÑÐ"
 
@@ -148,163 +156,143 @@ msgstr "ÐÐÑÐÐÐÐÑÐ"
 msgid "Not connected"
 msgstr "ÐÐÑÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
-msgid "Using Distinguished Name (DN)"
-msgstr "ÐÐÑÐÑÑÐÐ ÐÑÑÐÐÐÑÑÐ ÐÐÐ (DN)"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
-msgid "Using Email Address"
-msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:922
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐ Ð3 ÐÐ Ð2 ÐÐÐÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1045
 msgid "Reconnecting to LDAP server..."
 msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1175
 msgid "Invalid DN syntax"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1231
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4784
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1191
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4812
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "ÐÑÐÑÐÐ ÐÐÐÐ-Ð 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1709
 msgid "Adding contact to LDAP server..."
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1847
 msgid "Removing contact from LDAP server..."
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2022
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2405
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1989
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2384
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: âNULLâ ÑÐ ÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐÐÐ (ldap_first_entry)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2265
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2456
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2241
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2441
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: ÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐÑÐ ÐÑÑÑÐ ÑÐÐÑÐÑÐÑÐ %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2310
 msgid "Modifying contact from LDAP server..."
 msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2673
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2886
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2670
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2890
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: ÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐÑÐ ÐÑÑÑÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4761
 msgid "Receiving LDAP search results..."
 msgstr "ÐÑÐÐÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4940
 msgid "Error performing search"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5063
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5526
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ â%sâ"
 
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:645
-#, c-format
-#| msgid "Failed to remove file '%s': %s"
-msgid "Failed to open addressbook at '%s': %s"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÑ ÐÐ â%sâ: %s"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:406
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐ â%sâ ÑÐ ÐÐÐÐ ÑÑÐÑÐÐ: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:508
 #, c-format
-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgid "DELETE failed with HTTP status %d"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÑÐÑÐ (DELETE) ÑÐ ÐÐÐÐ ÑÑÐÑÐÐ %d"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507
-#| msgid "_Listen for server change notifications"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:574
 msgid "Contact on server changed -> not modifying"
 msgstr "ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÑ ÐÐ ÑÐÑÐÐÑÑ â> ÐÐ ÐÐÑÐÐ"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:583
 #, c-format
-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgid "Modify contact failed with HTTP status: %d (%s)"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ ÑÐ ÐÐÐÐ ÑÑÐÑÐÐ: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912
-#| msgid "Error loading address book: %s"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:993
 msgid "Loading Addressbook summary..."
 msgstr "ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÐÐÑÐÑÐÑÐ..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1012
 #, c-format
-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr ""
 "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐ (PROPFIND) ÐÐ ÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐ ÑÑÐÑÐÐ %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1037
 msgid "No response body in webdav PROPFIND result"
 msgstr "ÐÐÐÐ ÑÐÐÐ ÐÐÐÐÐÐÑÐ Ñ ÑÐÐÑÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1069
 #, c-format
-#| msgid "Downloading contacts (%d)... "
 msgid "Loading Contacts (%d%%)"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐ (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402
 msgid "Cannot transform SoupURI to string"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÑÐÐ ÐÐÑÐ ÐÐÑÐÑÑ Ñ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-book-client.c:95
+#: ../addressbook/libebook/e-book-client.c:82
 msgid "No such book"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../addressbook/libebook/e-book-client.c:84
+#: ../addressbook/libedata-book/e-data-book.c:431
 msgid "Contact not found"
 msgstr "ÐÐÐÑÐÐÑ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:99
-#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../addressbook/libebook/e-book-client.c:86
+#: ../addressbook/libedata-book/e-data-book.c:432
 msgid "Contact ID already exists"
 msgstr "ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:101
+#: ../addressbook/libebook/e-book-client.c:88
 msgid "No such source"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libebook/e-book-client.c:90
+#: ../addressbook/libedata-book/e-data-book.c:448
 msgid "No space"
 msgstr "ÐÐÐÐ ÐÑÐÑÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:488
+#: ../addressbook/libebook/e-book-client.c:878
 msgid "Failed to run book factory"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:2244
-#: ../calendar/libecal/e-cal-client.c:4602
+#: ../addressbook/libebook/e-book-client.c:2520
+#: ../calendar/libecal/e-cal-client.c:4885
 msgid "Cannot get connection to view"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ"
 
@@ -498,7 +486,6 @@ msgstr "ÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:188
-#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
@@ -775,7 +762,7 @@ msgid "Birth Date"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:284
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:954
 msgid "Anniversary"
 msgstr "ÐÐÐÐÑÑÐÑÐ"
 
@@ -885,287 +872,340 @@ msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 msgid "Twitter Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐÑ ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:1623
-#: ../addressbook/libebook/e-destination.c:879
+#: ../addressbook/libebook/e-contact.c:1684
+#: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:17
-msgid "Cannot process, book backend is opening"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÑÐ"
+#: ../addressbook/libebook/e-phone-number.c:50
+msgid "The library was built without phone number support."
+msgstr "ÐÐÐÐÐÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÑÑÐÐ ÐÐ ÑÐÐÐÑÐÐÑÐÐ ÐÑÐÑÐÐÐ."
+
+#: ../addressbook/libebook/e-phone-number.c:52
+msgid "The phone number parser reported an yet unkown error code."
+msgstr "ÐÐÑÐÑÐÐÐÑ ÑÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐÐ ÑÐÑ ÑÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐÐ ÐÑÐÑÐÐ."
+
+#: ../addressbook/libebook/e-phone-number.c:54
+msgid "Not a phone number"
+msgstr "ÐÐÑÐ ÐÑÐÑ ÑÐÐÐÑÐÐÐ"
+
+#: ../addressbook/libebook/e-phone-number.c:56
+#| msgid "Invalid query: "
+msgid "Invalid country code"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:90
+#: ../addressbook/libebook/e-phone-number.c:58
+msgid "Remaining text after the country code is to short for a phone number"
+msgstr "ÐÑÐÐÑÑÐÐÐ ÑÐÐÑÑ ÐÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐ ÑÐ ÐÑÐÐÑÐÑÐÐ ÐÐ ÑÐÐÐÑÐÐÑÐÐ ÐÑÐÑ"
+
+#: ../addressbook/libebook/e-phone-number.c:60
+msgid "Text is too short for a phone number"
+msgstr "ÐÐÐÑÑ ÑÐ ÐÑÐÐÑÐÑÐÐ ÐÐ ÐÑÐÑ ÑÐÐÐÑÐÐÐ"
+
+#: ../addressbook/libebook/e-phone-number.c:62
+msgid "Text is too long for a phone number"
+msgstr "ÐÐÐÑÑ ÑÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÑ ÑÐÐÐÑÐÐÐ"
+
+#: ../addressbook/libedata-book/e-book-backend.c:89
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐ ÐÐÑÐÑÐÑÐ â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:107
+#: ../addressbook/libedata-book/e-book-backend.c:106
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÑÑÑÐÐ ÐÐÑÐÑÐÑÐ â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
-#: ../camel/camel-db.c:503
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:734
+#, c-format
+msgid "Error introspecting unknown summary field '%s'"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐ ÑÐÐÐÑÐÐ â%sâ"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:959
+#: ../camel/camel-db.c:510
 #, c-format
 msgid "Insufficient memory"
 msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1090
 #, c-format
-msgid "Contact '%s' not found"
-msgstr "ÐÐÐÑÐÐÑ â%sâ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
+msgid "Invalid contact field '%d' specified in summary"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÑÐ â%dâ ÐÐÐÐÐÐÐÐ Ñ ÑÐÐÐÑÐÑ"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1124
+#, c-format
+msgid ""
+"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"string and string list field types are supported"
+msgstr ""
+"ÐÐÑÐ ÐÐÐÑÐÐÑÐ â%sâ â%sâ ÐÑÑÑÐ ÑÐ ÐÐÐÐÐÐÐÐ Ñ ÑÐÐÐÑÐÑ. ÐÐÐ ÑÑ ÐÐÐÑÐÐÐÐ ÑÐÐÐ "
+"ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÐÑÑÐ, ÐÐÑÐÐ Ð ÑÐÐÑÐÐ ÐÐÑÐÐ"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2115
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2910
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. vcards cannot be returned."
+msgstr ""
+"ÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ_ÐÑÐÑÑÐÐÐ ÐÐÑÑ ÑÑÐÐÐÐÐÑÑÐÐÐ Ñ ÐÑÑÐÐÐ. Ð-ÐÐÑÑÐÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐ "
+"ÐÐÐÐÐÐÑ."
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3052
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. Hence only summary query is "
+"supported."
+msgstr ""
+"ÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ_ÐÑÐÑÑÐÐÐ ÐÐÑÑ ÑÑÐÐÐÐÐÑÑÐÐÐ Ñ ÐÑÑÐÐÐ. ÐÑÑÐÐ ÑÐ ÐÐÐÑÐÐÐ ÑÐÐÐ "
+"ÑÐÐÑ ÑÐÐÐÑÐÐ."
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3133
+#, c-format
+msgid ""
+"Full vcards are not stored in cache. Hence only summary query is supported."
+msgstr ""
+"ÐÐÑÐÐÐ Ð-ÐÐÑÑÐÑÐ ÐÐÑÑ ÑÑÐÐÐÐÐÑÑÐÐÐ Ñ ÐÑÑÐÐÐ. ÐÑÑÐÐ ÑÐ ÐÐÐÑÐÐÐ ÑÐÐÐ ÑÐÐÑ "
+"ÑÐÐÐÑÐÐ."
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3805
+#, c-format
+#| msgid "Failed to remove file '%s': %s"
+msgid "Unable to remove the db file: errno %d"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐ ÐÐÐÐÑÐÐÐ: ÐÑ. ÐÑÐÑÐÐ %d"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../addressbook/libedata-book/e-data-book.c:214
-#: ../addressbook/libedata-book/e-data-book.c:724
+#: ../addressbook/libedata-book/e-data-book.c:345
+#: ../addressbook/libedata-book/e-data-book.c:367
+#: ../addressbook/libedata-book/e-data-book.c:846
 msgid "Invalid query: "
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ: "
 
-#: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../addressbook/libedata-book/e-data-book.c:427
+#: ../calendar/libedata-cal/e-data-cal.c:584
 msgid "Success"
 msgstr "ÐÑÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:303
-#: ../calendar/libecal/e-cal.c:4001 ../calendar/libedata-cal/e-data-cal.c:416
-#: ../libedataserver/e-client.c:122
+#: ../addressbook/libedata-book/e-data-book.c:428
+#: ../calendar/libecal/e-cal.c:2295 ../calendar/libedata-cal/e-data-cal.c:585
+#: ../libedataserver/e-client.c:113
 msgid "Backend is busy"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÑÐ ÐÐÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:586 ../libedataserver/e-client.c:123
 msgid "Repository offline"
 msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4015 ../calendar/libedata-cal/e-data-cal.c:418
-#: ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:430
+#: ../calendar/libecal/e-cal.c:2309 ../calendar/libedata-cal/e-data-cal.c:587
+#: ../libedataserver/e-client.c:129
 msgid "Permission denied"
 msgstr "ÐÑÐÑÑÑÐ ÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../addressbook/libedata-book/e-data-book.c:433
+#: ../calendar/libedata-cal/e-data-cal.c:592
 msgid "Authentication Failed"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:434
+#: ../calendar/libedata-cal/e-data-cal.c:593
 msgid "Authentication Required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:310
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../addressbook/libedata-book/e-data-book.c:435
+#: ../calendar/libedata-cal/e-data-cal.c:594
 msgid "Unsupported field"
 msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:436
+#: ../calendar/libedata-cal/e-data-cal.c:596 ../libedataserver/e-client.c:137
 msgid "Unsupported authentication method"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:437
+#: ../calendar/libedata-cal/e-data-cal.c:597 ../libedataserver/e-client.c:139
 msgid "TLS not available"
 msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../addressbook/libedata-book/e-data-book.c:438
 msgid "Address book does not exist"
 msgstr "ÐÐÑÐÑÐÑ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../addressbook/libedata-book/e-data-book.c:439
 msgid "Book removed"
 msgstr "ÐÑÐÐÐ ÑÐ ÑÐÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../addressbook/libedata-book/e-data-book.c:440
+#: ../calendar/libedata-cal/e-data-cal.c:600
 msgid "Not available in offline mode"
 msgstr "ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/libedata-cal/e-data-cal.c:601 ../libedataserver/e-client.c:141
 msgid "Search size limit exceeded"
 msgstr "ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:442
+#: ../calendar/libedata-cal/e-data-cal.c:602 ../libedataserver/e-client.c:143
 msgid "Search time limit exceeded"
 msgstr "ÐÑÑÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-data-book.c:443
+#: ../calendar/libedata-cal/e-data-cal.c:603 ../libedataserver/e-client.c:145
 msgid "Invalid query"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../calendar/libedata-cal/e-data-cal.c:604 ../libedataserver/e-client.c:147
 msgid "Query refused"
 msgstr "ÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:445
+#: ../calendar/libedata-cal/e-data-cal.c:605 ../libedataserver/e-client.c:133
 msgid "Could not cancel"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../addressbook/libedata-book/e-data-book.c:447
+#: ../calendar/libedata-cal/e-data-cal.c:607
 msgid "Invalid server version"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libecal/e-cal.c:3999 ../calendar/libedata-cal/e-data-cal.c:439
-#: ../libedataserver/e-client.c:120
+#: ../addressbook/libedata-book/e-data-book.c:449
+#: ../calendar/libecal/e-cal.c:2293 ../calendar/libedata-cal/e-data-cal.c:608
+#: ../libedataserver/e-client.c:111
 msgid "Invalid argument"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4038 ../calendar/libedata-cal/e-data-cal.c:441
-#: ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:451
+#: ../calendar/libecal/e-cal.c:1055 ../calendar/libecal/e-cal.c:1423
+#: ../calendar/libecal/e-cal.c:1903 ../calendar/libecal/e-cal.c:2332
+#: ../calendar/libedata-cal/e-data-cal.c:610 ../libedataserver/e-client.c:135
+#, c-format
 msgid "Not supported"
 msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:452
+#: ../calendar/libedata-cal/e-data-cal.c:611 ../libedataserver/e-client.c:153
 msgid "Backend is not opened yet"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÐÑÐÐ ÑÐÑ ÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal-client.c:619
-#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:460
+#: ../calendar/libedata-cal/e-data-cal.c:619 ../libedataserver/e-client.c:151
 msgid "Other error"
 msgstr "ÐÑÑÐÐ ÐÑÐÑÐÐ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:542
-#: ../addressbook/libedata-book/e-data-book.c:909
+#: ../addressbook/libedata-book/e-data-book.c:654
+#: ../addressbook/libedata-book/e-data-book.c:1048
 msgid "Cannot get contact: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:567
-#: ../addressbook/libedata-book/e-data-book.c:592
+#: ../addressbook/libedata-book/e-data-book.c:680
+#: ../addressbook/libedata-book/e-data-book.c:706
 msgid "Empty query: "
 msgstr "ÐÑÐÐÐÐ ÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:617
-#: ../addressbook/libedata-book/e-data-book.c:1007
+#: ../addressbook/libedata-book/e-data-book.c:732
+#: ../addressbook/libedata-book/e-data-book.c:1152
 msgid "Cannot add contact: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:642
-#: ../addressbook/libedata-book/e-data-book.c:1041
+#: ../addressbook/libedata-book/e-data-book.c:758
+#: ../addressbook/libedata-book/e-data-book.c:1188
 msgid "Cannot modify contacts: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:796
+#: ../addressbook/libedata-book/e-data-book.c:928
 msgid "Cannot open book: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:812
-msgid "Cannot remove book: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑ: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:839
+#: ../addressbook/libedata-book/e-data-book.c:972
 msgid "Cannot refresh address book: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:865
+#: ../addressbook/libedata-book/e-data-book.c:1000
 msgid "Cannot get backend property: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:890
-#: ../calendar/libedata-cal/e-data-cal.c:1016
+#: ../addressbook/libedata-book/e-data-book.c:1027
+#: ../calendar/libedata-cal/e-data-cal.c:1183
 msgid "Cannot set backend property: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:927
+#: ../addressbook/libedata-book/e-data-book.c:1068
 msgid "Cannot get contact list: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:1104
 msgid "Cannot get contact list uids: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐ-ÐÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÐÑÐ: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐ-ÐÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1066
+#: ../addressbook/libedata-book/e-data-book.c:1215
 msgid "Cannot remove contacts: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:103
-#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#: ../addressbook/libedata-book/e-data-book-factory.c:94
+#: ../calendar/libedata-cal/e-data-cal-factory.c:97
 #, c-format
 msgid "No backend name in source '%s'"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑ â%sâ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:115
-#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#: ../addressbook/libedata-book/e-data-book-factory.c:106
+#: ../calendar/libedata-cal/e-data-cal-factory.c:110
 #, c-format
 msgid "Invalid backend name '%s' in source '%s'"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ Ñ ÐÐÐÐÑÑ â%sâ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:319
-#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+#: ../addressbook/libedata-book/e-data-book-factory.c:191
+#: ../calendar/libedata-cal/e-data-cal-factory.c:196
+#, c-format
 msgid "Missing source UID"
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#: ../addressbook/libedata-book/e-data-book-factory.c:202
+#: ../calendar/libedata-cal/e-data-cal-factory.c:206
 #, c-format
 msgid "No such source for UID '%s'"
-msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐ â%sâ"
+msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐ â%sâ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:559
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÑÑÐÐÐ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:598
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:589
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÐ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
-msgid ""
-"Failed to connect to a server using SSL. One possible reason is an invalid "
-"certificate being used by the server. If this is expected, like self-signed "
-"certificate being used on the server, then disable certificate validity "
-"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
-msgstr ""
-"ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÐ. ÐÐÐÐÐ ÐÐ ÐÐÐÑÑÐÑ ÑÐÐÐÐÐÐ "
-"ÑÐ ÑÐÑ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÑÐ. ÐÐÐ ÑÐ ÐÐÐ ÐÑÐÐÐÐÐÐÐ, ÐÐÐ ÑÑÐ "
-"ÑÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÐÑÐÐÑÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÑÐÑÐÐÑÑ, ÐÐÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÐÐÐ "
-"ÐÑÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÑÐ ÑÐÐÐ ÑÑÐ ÑÐÑÐ Ñ ÑÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐÑÑ âÐÐÐÐÐÐÑÐ "
-"ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÑÐÑÐâ"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐ â%dâ ÐÐÐÐ ÑÑÐÑÐ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
-#| msgid "Backend is not opened yet"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
 msgid "CalDAV backend is not loaded yet"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐ-Ð ÑÐÑ ÑÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017
-#| msgid "Invalid object"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1008
 msgid "Invalid Redirect URL"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÐÑÐÑÑÐÐÑÐÐÐÑÐ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2716
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2415
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2773
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1174,469 +1214,454 @@ msgstr ""
 "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÑÑÐÐÐ, ÐÐÐÐÐÐÐÑ ÑÐ ÐÑÐÐÑÐÐ Ñ ÑÐÐÐÐÑ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ.\n"
 "ÐÐÑÑÐÐ ÐÑÐÑÐÐ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2639
-#| msgid "Cannot create calendar object: "
-msgid "Cannot create local store"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑ ÐÑÑÐÐÑ"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2648
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2725
 #, c-format
-#| msgid "Cannot create folder '%s': %s"
 msgid "Cannot create local cache folder '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÐÑÐÐ ÐÑÑÐÐÐ â%sâ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2659
-#| msgid "Could not create cache file"
-msgid "Could not create synch slave thread"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÑ ÐÐÑ ÑÑÐÐÐÐÑÐÐÐÑÐ"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3671
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3734
 msgid "CalDAV does not support bulk additions"
 msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3773
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3837
 msgid "CalDAV does not support bulk modifications"
 msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3941
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4006
 msgid "CalDAV does not support bulk removals"
 msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÐÐÐÑÐÑÐ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4600
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4671
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ / ÐÐÑÐÐÑÐ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4608
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4680
 msgid "Schedule outbox url not found"
 msgstr "ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ ÐÐÑÐÑÐ ÐÑÐÑÐÐÐÐÐ ÑÐÐÐÑÑÐÑÐ ÑÐÑÐÐÑÐÐÐ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4707
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4779
 msgid "Unexpected result in schedule-response"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÑÐÐÑÐÑÐÑ Ñ ÑÐÑÐÐÑÐÐÑ-ÐÐÐÐÐÐÑÑ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:956
 msgid "Birthday"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:992
 #, c-format
 msgid "Birthday: %s"
 msgstr "ÐÐÑÐÐÐÐÐ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1023
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ÐÐÐÐÑÑÐÑÐ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:235
+#: ../calendar/backends/file/e-cal-backend-file.c:243
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ: ÐÐÑÐ ÐÐÑÐÑÐ."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:242
-#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:250
+#: ../calendar/backends/file/e-cal-backend-file.c:256
 msgid "Cannot save calendar data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:482
+#: ../calendar/backends/http/e-cal-backend-http.c:473
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "ÐÐÑÐ ÐÐÑÐÑÐ: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:543
+#: ../calendar/backends/http/e-cal-backend-http.c:564
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "ÐÑÐÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:580
+#: ../calendar/backends/http/e-cal-backend-http.c:601
 #, c-format
 msgid "Bad file format."
 msgstr "ÐÐÑ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:590
+#: ../calendar/backends/http/e-cal-backend-http.c:611
 #, c-format
 msgid "Not a calendar."
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÑ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:886
-#: ../calendar/backends/http/e-cal-backend-http.c:890
-#: ../calendar/backends/weather/e-cal-backend-weather.c:511
+#: ../calendar/backends/http/e-cal-backend-http.c:920
+#: ../calendar/backends/http/e-cal-backend-http.c:925
+#: ../calendar/backends/weather/e-cal-backend-weather.c:506
 msgid "Could not create cache file"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐ ÐÑÑÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:171
+#: ../calendar/backends/weather/e-cal-backend-weather.c:165
 msgid "Could not retrieve weather data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÑÐÐÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:276
+#: ../calendar/backends/weather/e-cal-backend-weather.c:270
 msgid "Weather: Fog"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:271
 msgid "Weather: Cloudy Night"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:272
 msgid "Weather: Cloudy"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:273
 msgid "Weather: Overcast"
 msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:274
 msgid "Weather: Showers"
 msgstr "ÐÑÐÐÐ: ÐÑÑÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:275
 msgid "Weather: Snow"
 msgstr "ÐÑÐÐÐ: ÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Clear Night"
 msgstr "ÐÑÐÐÐ: ÐÐÐÑÐ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Sunny"
 msgstr "ÐÑÐÐÐ: ÑÑÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Thunderstorms"
 msgstr "ÐÑÐÐÐ: ÐÑÐÑÐÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:408
+#: ../calendar/backends/weather/e-cal-backend-weather.c:402
 msgid "Forecast"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4003
+#: ../calendar/libecal/e-cal.c:2297
 msgid "Repository is offline"
 msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135
+#: ../calendar/libecal/e-cal.c:2299 ../calendar/libecal/e-cal-client.c:114
 msgid "No such calendar"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4007 ../calendar/libecal/e-cal-client.c:137
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:2301 ../calendar/libecal/e-cal-client.c:116
+#: ../calendar/libedata-cal/e-data-cal.c:589
 msgid "Object not found"
 msgstr "ÐÐÑÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4009 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libecal/e-cal.c:2303 ../calendar/libecal/e-cal-client.c:118
+#: ../calendar/libedata-cal/e-data-cal.c:590
 msgid "Invalid object"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4011
+#: ../calendar/libecal/e-cal.c:2305
 msgid "URI not loaded"
 msgstr "ÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4013
+#: ../calendar/libecal/e-cal.c:2307
 msgid "URI already loaded"
 msgstr "ÐÐÑÐÑÐ ÑÐ ÐÐÑ ÑÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libecal/e-cal.c:2311
 msgid "Unknown User"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4019 ../calendar/libecal/e-cal-client.c:143
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:591
 msgid "Object ID already exists"
 msgstr "ÐÐ ÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4021
+#: ../calendar/libecal/e-cal.c:2315
 msgid "Protocol not supported"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4023
+#: ../calendar/libecal/e-cal.c:2317
 msgid "Operation has been canceled"
 msgstr "ÐÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libecal/e-cal.c:2319
 msgid "Could not cancel operation"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÑÐÑÑ"
 
-#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:2321 ../libedataserver/e-client.c:119
 msgid "Authentication failed"
 msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4029
-#: ../camel/providers/smtp/camel-smtp-transport.c:857
-#: ../libedataserver/e-client.c:130
+#: ../calendar/libecal/e-cal.c:2323
+#: ../camel/providers/smtp/camel-smtp-transport.c:856
+#: ../libedataserver/e-client.c:121
 msgid "Authentication required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4031
+#: ../calendar/libecal/e-cal.c:2325
 msgid "A D-Bus exception has occurred"
 msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÐÑÐÐ Ð-ÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4035
+#: ../calendar/libecal/e-cal.c:2329
 msgid "No error"
 msgstr "ÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libecal/e-cal-client.c:120
+#: ../calendar/libedata-cal/e-data-cal.c:599
 msgid "Unknown user"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal-client.c:124
+#: ../calendar/libedata-cal/e-data-cal.c:588
 msgid "Invalid range"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:610
+#: ../calendar/libecal/e-cal-client.c:1135
 msgid "Failed to run calendar factory"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal-component.c:1339
+#: ../calendar/libecal/e-cal-component.c:1340
 msgid "Untitled appointment"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:4036
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4017
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
+#: ../calendar/libecal/e-cal-util.c:697 ../calendar/libecal/e-cal-util.c:724
 msgctxt "Priority"
 msgid "High"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
+#: ../calendar/libecal/e-cal-util.c:699 ../calendar/libecal/e-cal-util.c:726
 msgctxt "Priority"
 msgid "Normal"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
+#: ../calendar/libecal/e-cal-util.c:701 ../calendar/libecal/e-cal-util.c:728
 msgctxt "Priority"
 msgid "Low"
 msgstr "ÐÐÑÐÐ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:721
+#: ../calendar/libecal/e-cal-util.c:722
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:36
-msgid "Cannot process, calendar backend is opening"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÑÐ"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:135
+#: ../calendar/libedata-cal/e-cal-backend.c:155
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:152
+#: ../calendar/libedata-cal/e-cal-backend.c:172
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:844
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:867
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1019
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1226
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1257
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ÐÐ ÐÑÐÐÑÑÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:238
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:285
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:326
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1299
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:122
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:130
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:914
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:139
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ ÐÐÐ 8601 ÐÐÑÑÐÐ/ÐÑÐÐÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:559
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:907
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1055
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:189
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:245
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:504
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:566
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1062
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1306
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:198
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÑÐÐ ÐÑÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:408
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÐ ÐÐÐ ÑÑÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:424
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:512
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:576
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1071
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:434
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÑÑÐÑÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:496
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ"
 
 # bug: no need for two ", or"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1646,12 +1671,12 @@ msgstr ""
 "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ âanyâ, âsummaryâ, âdescriptionâ, "
 "âlocationâ, âattendeeâ, âorganizerâ, ÐÐÐ âclassificationâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1123
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÑ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1138
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1660,143 +1685,133 @@ msgstr ""
 "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐÑ ÐÐÑÐÐ ÐÐÐ ÑÐÐÐÐ Ð ÑÐÐÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ ÐÐ "
 "ÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐ (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-data-cal.c:595
 msgid "Unsupported method"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:598
 msgid "Calendar does not exist"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:909
+#: ../calendar/libedata-cal/e-data-cal.c:1080
 msgid "Cannot open calendar: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:934
-msgid "Cannot remove calendar: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:961
+#: ../calendar/libedata-cal/e-data-cal.c:1124
 msgid "Cannot refresh calendar: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
+#: ../calendar/libedata-cal/e-data-cal.c:1155
 msgid "Cannot retrieve backend property: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1045
+#: ../calendar/libedata-cal/e-data-cal.c:1214
 msgid "Cannot retrieve calendar object path: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÑÐÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1075
+#: ../calendar/libedata-cal/e-data-cal.c:1246
 msgid "Cannot retrieve calendar object list: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1104
+#: ../calendar/libedata-cal/e-data-cal.c:1277
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1142
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 msgid "Cannot create calendar object: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1177
+#: ../calendar/libedata-cal/e-data-cal.c:1354
 msgid "Cannot modify calendar object: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1217
+#: ../calendar/libedata-cal/e-data-cal.c:1396
 msgid "Cannot remove calendar object: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1435
 msgid "Cannot receive calendar objects: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1285
+#: ../calendar/libedata-cal/e-data-cal.c:1468
 msgid "Cannot send calendar objects: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1317
+#: ../calendar/libedata-cal/e-data-cal.c:1502
 msgid "Could not retrieve attachment uris: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÐÑÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1345
+#: ../calendar/libedata-cal/e-data-cal.c:1532
 msgid "Could not discard reminder: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1374
+#: ../calendar/libedata-cal/e-data-cal.c:1563
 msgid "Could not get calendar view path: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÑÑÐÑÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1404
+#: ../calendar/libedata-cal/e-data-cal.c:1595
 msgid "Could not retrieve calendar time zone: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1430
+#: ../calendar/libedata-cal/e-data-cal.c:1623
 msgid "Could not add calendar time zone: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:220
-#, c-format
-msgid "Invalid call"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ"
-
-#: ../camel/camel-cipher-context.c:206
+#: ../camel/camel-cipher-context.c:208
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:219
+#: ../camel/camel-cipher-context.c:221
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑÑ"
 
-#: ../camel/camel-cipher-context.c:235
+#: ../camel/camel-cipher-context.c:237
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:249
+#: ../camel/camel-cipher-context.c:251
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:262
+#: ../camel/camel-cipher-context.c:264
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:276
+#: ../camel/camel-cipher-context.c:278
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:817
+#: ../camel/camel-cipher-context.c:819
 msgid "Signing message"
 msgstr "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:1058
+#: ../camel/camel-cipher-context.c:1060
 msgid "Encrypting message"
 msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:1185
+#: ../camel/camel-cipher-context.c:1187
 msgid "Decrypting message"
 msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
@@ -1814,7 +1829,7 @@ msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÑÐÐÐ"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐ ÐÑÑÐÐÐ: %s: %s"
 
-#: ../camel/camel-disco-diary.c:201
+#: ../camel/camel-disco-diary.c:207
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1825,8 +1840,7 @@ msgstr ""
 "ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐ\n"
 "ÑÐ ÐÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑ."
 
-#: ../camel/camel-disco-diary.c:266
-#: ../camel/providers/imap/camel-imap-journal.c:309
+#: ../camel/camel-disco-diary.c:271
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1837,7 +1851,7 @@ msgstr ""
 "%s\n"
 "ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÐÑÐ ÑÑÐÐÐÑÐÐÐ."
 
-#: ../camel/camel-disco-diary.c:310
+#: ../camel/camel-disco-diary.c:315
 msgid "Resynchronizing with server"
 msgstr "ÐÑÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ"
 
@@ -1854,23 +1868,19 @@ msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐ
 msgid "Copy folder content locally for _offline operation"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐ ÑÐÐ _ÐÐÐ ÐÑÐÐÐ"
 
-#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413
-#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482
-#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:614
-#: ../camel/camel-imapx-folder.c:648 ../camel/camel-imapx-folder.c:688
-#: ../camel/camel-imapx-folder.c:724 ../camel/camel-imapx-store.c:275
-#: ../camel/camel-imapx-store.c:1383 ../camel/camel-imapx-store.c:1471
-#: ../camel/camel-imapx-store.c:1520
-#: ../camel/providers/imap/camel-imap-store.c:1268
-#: ../camel/providers/imap/camel-imap-store.c:2030
-#: ../camel/providers/imap/camel-imap-store.c:2502
-#: ../camel/providers/imap/camel-imap-store.c:3265
-#: ../camel/providers/pop3/camel-pop3-folder.c:524
-#: ../camel/providers/pop3/camel-pop3-folder.c:654
-#: ../camel/providers/pop3/camel-pop3-folder.c:844
-#: ../camel/providers/pop3/camel-pop3-folder.c:1046
-#: ../camel/providers/pop3/camel-pop3-store.c:408
-#: ../camel/providers/pop3/camel-pop3-store.c:831
+#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:478
+#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553
+#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748
+#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993
+#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:320
+#: ../camel/camel-imapx-store.c:1521 ../camel/camel-imapx-store.c:1610
+#: ../camel/camel-imapx-store.c:1659
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:677
+#: ../camel/providers/pop3/camel-pop3-folder.c:906
+#: ../camel/providers/pop3/camel-pop3-folder.c:1106
+#: ../camel/providers/pop3/camel-pop3-store.c:424
+#: ../camel/providers/pop3/camel-pop3-store.c:832
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐ ÐÐÑÑÐ ÐÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÑÐÑÑ"
@@ -1880,86 +1890,104 @@ msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐ ÐÐÑÑÐ ÐÐÐÑ
 msgid "Canceled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:897 ../camel/camel-filter-search.c:772
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÑÐÐÐÐ ÐÑÐÑÐÑ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:945
+#: ../camel/camel-filter-driver.c:964
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÑÐÐ ÐÐ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:1141 ../camel/camel-filter-driver.c:1148
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1242 ../camel/camel-filter-driver.c:1707
+#: ../camel/camel-filter-driver.c:1276
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÑÐÑÐ ÑÐÐÑÐÑÐ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1253 ../camel/camel-filter-driver.c:1718
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1349
+#: ../camel/camel-filter-driver.c:1383
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1361
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÑ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1386 ../camel/camel-filter-driver.c:1408
+#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
 #, c-format
 msgid "Failed on message %d"
 msgstr "ÐÑÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1423 ../camel/camel-filter-driver.c:1529
+#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
 msgid "Syncing folder"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1535
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
 msgid "Complete"
 msgstr "ÐÐÐÑÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1487
+#: ../camel/camel-filter-driver.c:1529
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÑ %d ÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1505
+#: ../camel/camel-filter-driver.c:1547
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ÐÑÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ %d ÐÐ %d"
 
+#: ../camel/camel-filter-driver.c:1741 ../camel/camel-filter-driver.c:1775
+#, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Execution of filter '%s' failed: "
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÑÐÐÑÑÐÐÐÐ â%sâ: "
+
+#: ../camel/camel-filter-driver.c:1765
+#, c-format
+#| msgid "Error parsing filter: %s: %s"
+msgid "Error parsing filter '%s': %s: %s"
+msgstr "ÐÑÐÑÐÐ ÐÐÑÐÐÐ ÐÑÐÐÑÑÐÐÐÐ â%sâ: %s: %s"
+
+#: ../camel/camel-filter-driver.c:1784
+#, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Error executing filter '%s': %s: %s"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÑÐÐÑÑÐÐÐÐ â%sâ: %s: %s"
+
 #: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÑ"
 
-#: ../camel/camel-filter-search.c:512
+#: ../camel/camel-filter-search.c:537
 msgid "Invalid arguments to (system-flag)"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ (ÑÐÑÑÐÐÑÐÐ-ÐÐÐÐÐÐ)"
 
-#: ../camel/camel-filter-search.c:530
+#: ../camel/camel-filter-search.c:555
 msgid "Invalid arguments to (user-tag)"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ (ÐÐÑÐÑÐÐÑÐÐ-ÐÐÐÐÐÐ)"
 
-#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
+#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÑÐÑÑÐÐÑ: %s: %s"
 
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:272
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -1968,7 +1996,7 @@ msgstr[1] "ÐÑÐÐ ÐÐÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[2] "ÐÑÐÐ ÐÐÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÑÐÐ ÐÐÐÑ ÑÐÐÐ ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:310
+#: ../camel/camel-folder.c:312
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -1977,7 +2005,7 @@ msgstr[1] "ÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[2] "ÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÑÐÐ ÐÐÐÑ ÑÐÐ ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:358
+#: ../camel/camel-folder.c:360
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -1986,100 +2014,100 @@ msgstr[1] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[2] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÑ ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:930
+#: ../camel/camel-folder.c:934
 #: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-folder.c:933
+#: ../camel/camel-folder.c:937
 msgid "Copying messages"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-folder.c:1253
+#: ../camel/camel-folder.c:1257
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-folder.c:3371
+#: ../camel/camel-folder.c:3477
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-folder.c:3603
+#: ../camel/camel-folder.c:3709
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÑÑÐÑ â%sâ Ñ %s"
 
-#: ../camel/camel-folder.c:3753
+#: ../camel/camel-folder.c:3860
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/camel-folder.c:3985
+#: ../camel/camel-folder.c:4092
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÐ ÐÑÐÑÑÐÐÐ: %s:\n"
-"%s"
-
-#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÐÐ ÐÑÐÑÑÐÐÐ: %s:\n"
-"%s"
-
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
+#: ../camel/camel-folder-search.c:824 ../camel/camel-folder-search.c:867
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÑÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑÐÑÐÑ"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:932
+#: ../camel/camel-folder-search.c:902
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ ÑÐÑÑÐÑ %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:909 ../camel/camel-folder-search.c:917
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÐÐÑÐÑ ÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:945
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ÐÑÐÐÑÑÐ ÐÐÐ ÐÐÐ ÑÐÐÑÐÑÐÑ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:985
+#: ../camel/camel-folder-search.c:955
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÑÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
-#: ../camel/camel-gpg-context.c:1327
+#: ../camel/camel-folder-search.c:1789 ../camel/camel-folder-search.c:1956
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÐ ÐÑÐÑÑÐÐÐ: %s:\n"
+"%s"
+
+#: ../camel/camel-folder-search.c:1801 ../camel/camel-folder-search.c:1968
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÐÐ ÐÑÐÑÑÐÐÐ: %s:\n"
+"%s"
+
+#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696
+#: ../camel/camel-gpg-context.c:1359
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÑÐ: %s"
 
-#: ../camel/camel-gpg-context.c:668
-#: ../camel/providers/smtp/camel-smtp-transport.c:860
+#: ../camel/camel-gpg-context.c:696
+#: ../camel/providers/smtp/camel-smtp-transport.c:859
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:733
+#: ../camel/camel-gpg-context.c:761
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2090,17 +2118,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:769
+#: ../camel/camel-gpg-context.c:797
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÐÑÐ ÐÐ-Ð ÐÐÑÐÑÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2109,7 +2137,7 @@ msgstr ""
 "ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÑÑ\n"
 "ÐÐÐÐÑÐÐ ÐÐÑÑÐÑÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:862
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2118,12 +2146,12 @@ msgstr ""
 "ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÑÑ\n"
 "ÐÐÑÐÑÐÐÐÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:840
+#: ../camel/camel-gpg-context.c:868
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ-Ð ÐÐ â%sâ"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:880
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
@@ -2131,202 +2159,216 @@ msgstr ""
 "ÐÐÐÑÑÐ ÐÐ ÑÐÑÑÐÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÑÐÐÐÐÑÑ, ÑÐÐÐ ÐÐ ÑÐ ÐÐÑÐ "
 "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑ ÐÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÐ ÐÑÑÑ."
 
-#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
 #: ../camel/providers/nntp/camel-nntp-summary.c:388
-#: ../libedataserver/e-client.c:140
+#: ../libedataserver/e-client.c:131
 #, c-format
 msgid "Cancelled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:900
+#: ../camel/camel-gpg-context.c:932
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÑÑÑÐÐ ÑÐÑÐÐ ÐÑÑÑ: ÑÐÐÑÐ ÑÑ 3 ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:913
+#: ../camel/camel-gpg-context.c:945
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÐ-Ð: %s"
 
-#: ../camel/camel-gpg-context.c:1044
+#: ../camel/camel-gpg-context.c:1076
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÑÑÐÐ: ÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑÐ."
 
-#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
+#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:832
 msgid "Could not generate signing data: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ: "
 
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
-#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
+#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879
+#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136
+#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284
 msgid "Failed to execute gpg."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÑÐ."
 
-#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
-#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
-#: ../camel/camel-smime-context.c:980
+#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790
+#: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973
+#: ../camel/camel-smime-context.c:982
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÑÑÐÐ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:1797
+#: ../camel/camel-gpg-context.c:1832
 msgid "Cannot verify message signature: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÑÑÐÐ: "
 
-#: ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1955
 msgid "Could not generate encrypting data: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ: "
 
-#: ../camel/camel-gpg-context.c:1973
+#: ../camel/camel-gpg-context.c:2008
 msgid "This is a digitally encrypted message part"
 msgstr "ÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
-#: ../camel/camel-gpg-context.c:2063
+#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075
+#: ../camel/camel-gpg-context.c:2098
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÑÑÑÐÐ ÐÐÑÑÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:2051
+#: ../camel/camel-gpg-context.c:2086
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÐ ÐÐÐ: ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ"
 
-#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
+#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1273
 msgid "Encrypted content"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐÐÑ"
 
-#: ../camel/camel-imapx-folder.c:104
+#: ../camel/camel-imapx-folder.c:710
 #, c-format
-msgid "Could not create folder summary for %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
+#| msgid "Quota information not supported for folder '%s'"
+msgid "No quota information available for folder '%s'"
+msgstr "ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-imapx-folder.c:112
+#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882
 #, c-format
-msgid "Could not create cache for %s: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐ â%sâ: "
+msgid "No destination folder specified"
+msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÐÐÑÑÐ"
+
+#: ../camel/camel-imapx-folder.c:828
+#| msgid "Unable to retrieve message: "
+msgid "Unable to move junk messages"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÐÐÐÐÑÐÐ ÐÐÑÑÐÐ"
+
+#: ../camel/camel-imapx-folder.c:901
+#| msgid "Unable to retrieve message: "
+msgid "Unable to move deleted messages"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-imapx-folder.c:794
-#: ../camel/providers/imap/camel-imap-folder.c:365
+#: ../camel/camel-imapx-folder.c:1115
 #: ../camel/providers/nntp/camel-nntp-folder.c:738
 msgid "Apply message _filters to this folder"
 msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:1020
+#: ../camel/camel-imapx-folder.c:1224
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
+
+#: ../camel/camel-imapx-folder.c:1232
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐ â%sâ: "
+
+#: ../camel/camel-imapx-server.c:1254
 msgid "Server disconnected"
 msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:1472
-msgid "Error writing to cache stream: "
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐ Ñ ÑÐÐ ÐÑÑÐÐÐ: "
+#: ../camel/camel-imapx-server.c:1727
+#| msgid "Error writing to cache stream: "
+msgid "Error writing to cache stream"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐ Ñ ÑÐÐ ÐÑÑÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:2404
+#: ../camel/camel-imapx-server.c:2893
 #, c-format
 msgid "Not authenticated"
 msgstr "ÐÐÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-imapx-server.c:2473
+#: ../camel/camel-imapx-server.c:2971
 msgid "Error performing IDLE"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐ-Ð"
 
-#: ../camel/camel-imapx-server.c:3325
-#: ../camel/providers/imap/camel-imap-store.c:413
-#: ../camel/providers/imap/camel-imap-store.c:467
+#: ../camel/camel-imapx-server.c:3875
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: %s"
 
-#: ../camel/camel-imapx-server.c:3326
-#: ../camel/providers/imap/camel-imap-store.c:414
+#: ../camel/camel-imapx-server.c:3876
 #: ../camel/providers/smtp/camel-smtp-transport.c:202
 msgid "STARTTLS not supported"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:3365
-#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/camel-imapx-server.c:3915
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: "
 
-#: ../camel/camel-imapx-server.c:3435
-#: ../camel/providers/imap/camel-imap-store.c:747
+#: ../camel/camel-imapx-server.c:3995
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ â%sâ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-imapx-server.c:3446 ../camel/camel-session.c:494
-#: ../camel/providers/imap/camel-imap-store.c:1172
-#: ../camel/providers/pop3/camel-pop3-store.c:259
-#: ../camel/providers/pop3/camel-pop3-store.c:587
+#: ../camel/camel-imapx-server.c:4006 ../camel/camel-session.c:494
+#: ../camel/providers/pop3/camel-pop3-store.c:266
+#: ../camel/providers/pop3/camel-pop3-store.c:604
 #: ../camel/providers/smtp/camel-smtp-transport.c:467
 #, c-format
 msgid "No support for %s authentication"
 msgstr "ÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ â%sâ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-imapx-server.c:3465
-#: ../camel/providers/imap/camel-imap-store.c:1140
-#: ../camel/providers/nntp/camel-nntp-store.c:502
+#: ../camel/camel-imapx-server.c:4025
+#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/nntp/camel-nntp-store.c:512
 msgid "Cannot authenticate without a username"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:3474
-#: ../camel/providers/imap/camel-imap-store.c:1148
-#: ../camel/providers/nntp/camel-nntp-store.c:511
-#: ../camel/providers/pop3/camel-pop3-store.c:512
-#: ../camel/providers/pop3/camel-pop3-store.c:532
+#: ../camel/camel-imapx-server.c:4034
+#: ../camel/providers/nntp/camel-nntp-store.c:521
+#: ../camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/providers/pop3/camel-pop3-store.c:549
 msgid "Authentication password not available"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:3667
+#: ../camel/camel-imapx-server.c:4241
 msgid "Error fetching message"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-imapx-server.c:3749
+#: ../camel/camel-imapx-server.c:4323
 msgid "Failed to copy the tmp file"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../camel/camel-imapx-server.c:3763
+#: ../camel/camel-imapx-server.c:4337
 msgid "Failed to close the tmp stream"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../camel/camel-imapx-server.c:3861
+#: ../camel/camel-imapx-server.c:4458
 msgid "Error copying messages"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-imapx-server.c:3996
+#: ../camel/camel-imapx-server.c:4624
 msgid "Error appending message"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÑÐÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-imapx-server.c:4186
+#: ../camel/camel-imapx-server.c:4823
 msgid "Error fetching message headers"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-imapx-server.c:4328
+#: ../camel/camel-imapx-server.c:4970
 msgid "Error retrieving message"
 msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-imapx-server.c:4450 ../camel/camel-imapx-server.c:4657
+#: ../camel/camel-imapx-server.c:5094 ../camel/camel-imapx-server.c:5322
 #, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/camel-imapx-server.c:4507
+#: ../camel/camel-imapx-server.c:5158
 #, c-format
 msgid "Scanning for changed messages in '%s'"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/camel-imapx-server.c:4550
+#: ../camel/camel-imapx-server.c:5211
 msgid "Error fetching new messages"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÑ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-imapx-server.c:4756
+#: ../camel/camel-imapx-server.c:5424
 msgid "Error while fetching messages"
 msgstr "ÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-imapx-server.c:4764 ../camel/camel-imapx-server.c:4800
+#: ../camel/camel-imapx-server.c:5432 ../camel/camel-imapx-server.c:5465
 #, c-format
 msgid "Fetching summary information for %d message in '%s'"
 msgid_plural "Fetching summary information for %d messages in '%s'"
@@ -2335,93 +2377,98 @@ msgstr[1] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐ
 msgstr[2] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-imapx-server.c:4931 ../camel/camel-imapx-server.c:4967
+#: ../camel/camel-imapx-server.c:5601 ../camel/camel-imapx-server.c:5631
 msgid "Error refreshing folder"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:5060
+#: ../camel/camel-imapx-server.c:5735
 msgid "Error expunging message"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-imapx-server.c:5157
+#: ../camel/camel-imapx-server.c:5846
 msgid "Error fetching folders"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:5236
+#: ../camel/camel-imapx-server.c:5928
 msgid "Error subscribing to folder"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/camel-imapx-server.c:5293
+#: ../camel/camel-imapx-server.c:5993
 msgid "Error creating folder"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:5342
+#: ../camel/camel-imapx-server.c:6047
 msgid "Error deleting folder"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:5396
+#: ../camel/camel-imapx-server.c:6121
 msgid "Error renaming folder"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:5451
+#: ../camel/camel-imapx-server.c:6196
+#| msgid "Retrieving quota information for '%s'"
+msgid "Error retrieving quota information"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:6261
+#| msgid "Decoder failed"
+msgid "Search failed"
+msgstr "ÐÑÐÑÑÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:6324
 msgid "Error performing NOOP"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐ-Ð"
 
-#: ../camel/camel-imapx-server.c:5553
+#: ../camel/camel-imapx-server.c:6433
 msgid "Error syncing changes"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../camel/camel-imapx-server.c:6183
-#: ../camel/providers/imap/camel-imap-folder.c:3517
+#: ../camel/camel-imapx-server.c:7242
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ ÑÐ ÐÐ â%sâ: %s"
 
-#: ../camel/camel-imapx-server.c:6184
-#: ../camel/providers/imap/camel-imap-folder.c:3518
+#: ../camel/camel-imapx-server.c:7243
 msgid "No such message available."
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../camel/camel-imapx-server.c:6339 ../camel/camel-imapx-server.c:6354
+#: ../camel/camel-imapx-server.c:7401 ../camel/camel-imapx-server.c:7416
 msgid "Cannot create spool file: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÑÐÐÐ: "
 
-#: ../camel/camel-imapx-store.c:157
-#: ../camel/providers/imap/camel-imap-store.c:825
+#: ../camel/camel-imapx-server.c:8158
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "IMAP server does not support quotas"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+
+#: ../camel/camel-imapx-store.c:201
 #, c-format
 msgid "IMAP server %s"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/camel-imapx-store.c:160
-#: ../camel/providers/imap/camel-imap-store.c:828
+#: ../camel/camel-imapx-store.c:204
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%s"
 
-#: ../camel/camel-imapx-store.c:251
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-imapx-store.c:295
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
 #: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid "Password"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-imapx-store.c:253
-#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/camel-imapx-store.c:297
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
 
-#: ../camel/camel-imapx-store.c:344
-#: ../camel/providers/imap/camel-imap-store.c:2061
-#: ../camel/providers/imap/camel-imap-store.c:2257
+#: ../camel/camel-imapx-store.c:405
 #, c-format
 msgid "No such folder %s"
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:369 ../camel/camel-imapx-store.c:851
-#: ../camel/providers/imap/camel-imap-store.c:274
-#: ../camel/providers/imap/camel-imap-store.c:2673
+#: ../camel/camel-imapx-store.c:430 ../camel/camel-imapx-store.c:920
 #: ../camel/providers/local/camel-maildir-folder.c:473
 #: ../camel/providers/local/camel-maildir-store.c:307
 #: ../camel/providers/local/camel-maildir-store.c:699
@@ -2431,44 +2478,33 @@ msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ"
 msgid "Inbox"
 msgstr "ÐÐÐÐÑÑÐ"
 
-#: ../camel/camel-imapx-store.c:1084
+#: ../camel/camel-imapx-store.c:1164
 #, c-format
 msgid "Retrieving folder list for %s"
 msgstr "ÐÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/camel-imapx-store.c:1188
-#: ../camel/providers/nntp/camel-nntp-store.c:1769
-#, c-format
-msgid "No such folder: %s"
-msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
-
-#: ../camel/camel-imapx-store.c:1404
-#: ../camel/providers/imap/camel-imap-store.c:2074
-#: ../camel/providers/imap/camel-imap-store.c:2517
+#: ../camel/camel-imapx-store.c:1543
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÑ ÑÐÐÑÐÐ ÐÐÐÐ â%câ"
 
-#: ../camel/camel-imapx-store.c:1415
-#: ../camel/providers/imap/camel-imap-store.c:2530
+#: ../camel/camel-imapx-store.c:1554
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
 
-#: ../camel/camel-imapx-store.c:1425
-#: ../camel/providers/imap/camel-imap-store.c:2137
-#: ../camel/providers/imap/camel-imap-store.c:2581
+#: ../camel/camel-imapx-store.c:1564
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-imapx-stream.c:72
+#: ../camel/camel-imapx-stream.c:98
 #, c-format
 msgid "Source stream returned no data"
 msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐÐÐ ÑÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-imapx-stream.c:81
+#: ../camel/camel-imapx-stream.c:107
 #, c-format
 msgid "Source stream unavailable"
 msgstr "ÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ"
@@ -2564,7 +2600,7 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÑÑ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÑÑ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ: %s"
 
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
+#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ: %s"
@@ -2595,26 +2631,41 @@ msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../camel/camel-net-utils.c:732
 #, c-format
-msgid "Host lookup failed: %s: %s"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ: %s: %s"
+msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgstr ""
+"ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ â%sâ. ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ "
+"ÐÑÐÑÐÐÐÐ Ñ ÐÐÑÐÑÑ."
+
+#: ../camel/camel-net-utils.c:736
+#, c-format
+#| msgid "Host lookup failed: %s: %s"
+msgid "Host lookup '%s' failed: %s"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ â%sâ: %s"
 
-#: ../camel/camel-net-utils.c:853
+#: ../camel/camel-net-utils.c:857
 msgid "Resolving address"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÑ"
 
-#: ../camel/camel-net-utils.c:874
+#: ../camel/camel-net-utils.c:878
 msgid "Name lookup failed"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐ"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../camel/camel-net-utils.c:880
+#: ../camel/camel-net-utils.c:885
+msgid "Name lookup failed. Check your host name for spelling errors."
+msgstr ""
+"ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ Ñ "
+"ÐÐÑÐÑÑ."
+
+#: ../camel/camel-net-utils.c:889
 #, c-format
 msgid "Name lookup failed: %s"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐ: %s"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐÐ: %s"
 
-#: ../camel/camel-network-service.c:114
+#: ../camel/camel-network-service.c:115
 #, c-format
-msgid "Could not connect to %s: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%sâ: "
+#| msgid "Could not connect to %s: "
+msgid "Could not connect to '%s:%s': "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%s:%sâ: "
 
 #: ../camel/camel-offline-folder.c:210
 #, c-format
@@ -2634,27 +2685,28 @@ msgstr "ÐÐÑÑÐÐÑÐÑ ÐÐÑÑÑÐÐÐÐ ÑÐÑÑÐÐÐÐ Ð-ÐÐÑÑÐ"
 msgid "For reading mail as a query of another set of folders"
 msgstr "ÐÐ ÑÐÑÐÑÐ ÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÑÐÐÐ ÑÐÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:258
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: ÐÐÐÑ ÑÐÑÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐ."
 
-#: ../camel/camel-provider.c:202
+#: ../camel/camel-provider.c:267
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: %s"
 
-#: ../camel/camel-provider.c:211
+#: ../camel/camel-provider.c:276
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: ÐÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ Ñ ÐÐÐÑÐÑ."
 
-#: ../camel/camel-provider.c:410 ../camel/camel-session.c:406
+#: ../camel/camel-provider.c:424 ../camel/camel-session.c:406
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÑÐÐÑÐÑÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
 
 #: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
@@ -2718,32 +2770,32 @@ msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÑÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ-ÐÐ5 ÐÐÐÐÐÐÐ, "
 "ÐÐÐ ÑÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:855
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÑÐÐÑÐ ÐÑÐ (>2048 ÐÐÑÐÑÐ)"
 
-#: ../camel/camel-sasl-digest-md5.c:864
+#: ../camel/camel-sasl-digest-md5.c:866
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:872
+#: ../camel/camel-sasl-digest-md5.c:874
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ âÐÐÐÐÐÑÐÑ ÐÐÑÑÐÑÐâ"
 
-#: ../camel/camel-sasl-digest-md5.c:905
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÑÑ"
 
-#: ../camel/camel-sasl-digest-md5.c:926
+#: ../camel/camel-sasl-digest-md5.c:928
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÑÑ"
 
-#: ../camel/camel-sasl-digest-md5.c:939
+#: ../camel/camel-sasl-digest-md5.c:941
 #, c-format
 msgid "Server response does not match"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÐ ÑÐÐÐÐ"
@@ -2819,13 +2871,13 @@ msgid "The referenced credentials have expired."
 msgstr "ÐÐÐÐÑÐ ÑÑÐÐÐÐÐÑ ÑÐÐÑÐÑÐ ÑÐ ÐÑÑÐÐÐÐ."
 
 #: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
-#: ../camel/camel-sasl-gssapi.c:384 ../camel/camel-sasl-gssapi.c:401
-#: ../camel/providers/smtp/camel-smtp-transport.c:575
+#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
+#: ../camel/providers/smtp/camel-smtp-transport.c:574
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:413
+#: ../camel/camel-sasl-gssapi.c:417
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ÐÐÐÐÐÑÐÐÐ ÑÐÐÑÑÐÐÑÐÐ ÑÐÐÑ."
@@ -2869,7 +2921,7 @@ msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÑ ÐÑÐ ÐÐÐ
 
 #: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
-msgstr "POP ÐÐÐÐÑÐÐ ÐÐÐ"
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ"
 
 #: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
@@ -2881,7 +2933,7 @@ msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐ
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÐÐÐÑÑÐÐÐ ÑÐ â%sâ ÑÑÐÑÐÐÐ"
 
-#: ../camel/camel-search-private.c:112
+#: ../camel/camel-search-private.c:116
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐÐÑÐÐÐ ÐÐÑÐÐÐ: %s: %s"
@@ -2900,12 +2952,12 @@ msgstr "ÐÐÑÐ ÑÑÐÐÐÐ %s ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 msgid "Forwarding messages is not supported"
 msgstr "ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/camel-session.c:1362
+#: ../camel/camel-session.c:1404
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ÐÐÐÑÐÑÐ â%sâ ÐÐÐÐÐÐÑ ÐÐ â%sâ ÐÐ ÐÐÐÐÑÐÐÑ â%sâ."
 
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÑÐÐÑÐÑÐ ÐÐ â%sâ"
@@ -3037,111 +3089,111 @@ msgstr "ÐÐÐÑÐÑÐ ÑÐ ÑÐÐÐÐÐ ÐÐÑÑÐÐ, ÑÐÐÑÐÑÐ ÑÑ ÑÐ
 msgid "Cannot find signature digests"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÑÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:661
+#: ../camel/camel-smime-context.c:662
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ÐÐÑÐÐÑÐÐÐ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
 msgid "Cannot create encoder context"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÑÑ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:848
+#: ../camel/camel-smime-context.c:850
 msgid "Failed to add data to CMS encoder"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÐÐÐ ÑÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
 msgid "Failed to encode data"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
+#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
 msgid "Decoder failed"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÑÑÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1073
+#: ../camel/camel-smime-context.c:1076
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÑÑÑÑ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1084
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot create CMS Message"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot create CMS Enveloped data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1096
+#: ../camel/camel-smime-context.c:1099
 msgid "Cannot attach CMS Enveloped data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1105
 msgid "Cannot attach CMS data object"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:1111
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot create CMS Recipient information"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1116
+#: ../camel/camel-smime-context.c:1119
 msgid "Cannot add CMS Recipient information"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1141
+#: ../camel/camel-smime-context.c:1145
 msgid "Failed to add data to encoder"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:1250
+#: ../camel/camel-smime-context.c:1255
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Ð/ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ: ÐÐÑÑ ÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../camel/camel-store.c:1838
+#: ../camel/camel-store.c:1827
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../camel/camel-store.c:1881
+#: ../camel/camel-store.c:1870
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-store.c:2066
+#: ../camel/camel-store.c:2055
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "ÐÑÐÑÑÐÐÑÑÐÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
+#: ../camel/camel-store.c:2067 ../camel/camel-store.c:2077
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ÐÐÐÑÐ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
+#: ../camel/camel-store.c:2070 ../camel/camel-store.c:2081
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÐÑÐÑÐ"
 
-#: ../camel/camel-store.c:2540
+#: ../camel/camel-store.c:2529
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ: %s: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../camel/camel-store.c:2554
+#: ../camel/camel-store.c:2543
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2661 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:306
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/camel-store.c:2804 ../camel/camel-vee-store.c:460
 #: ../camel/providers/local/camel-maildir-store.c:788
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3155,12 +3207,12 @@ msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐ
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÑÐ ÑÐÐÐÐ"
 
-#: ../camel/camel-stream-process.c:267
+#: ../camel/camel-stream-process.c:275
 #, c-format
 msgid "Connection cancelled"
 msgstr "ÐÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-stream-process.c:272
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÑÐ ÐÐÑÐÐÐÐÐ â%sâ: %s"
@@ -3180,168 +3232,85 @@ msgstr "ÐÐÑÐÐÑÑÑÐÐ ÑÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
 msgid "NSPR error code %d"
 msgstr "ÐÐÐ %d ÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658
+#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ4"
 
-#: ../camel/camel-tcp-stream-raw.c:669
+#: ../camel/camel-tcp-stream-raw.c:675
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÐ: ÐÃÐ â%dâ"
 
-#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
+#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ5"
 
-#: ../camel/camel-tcp-stream-raw.c:777
+#: ../camel/camel-tcp-stream-raw.c:789
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐÑÑÑÐ ÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ: ÐÐÐ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:801
 msgid "General SOCKS server failure"
 msgstr "ÐÐÑÑÐÐÑ ÐÐÑÑÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:802
 msgid "SOCKS server's rules do not allow connection"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:791
+#: ../camel/camel-tcp-stream-raw.c:803
 msgid "Network is unreachable from SOCKS server"
 msgstr "ÐÑÐÐÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:792
+#: ../camel/camel-tcp-stream-raw.c:804
 msgid "Host is unreachable from SOCKS server"
 msgstr "ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:793
+#: ../camel/camel-tcp-stream-raw.c:805
 msgid "Connection refused"
 msgstr "ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:794
+#: ../camel/camel-tcp-stream-raw.c:806
 msgid "Time-to-live expired"
 msgstr "ÐÑÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:795
+#: ../camel/camel-tcp-stream-raw.c:807
 msgid "Command not supported by SOCKS server"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:796
+#: ../camel/camel-tcp-stream-raw.c:808
 msgid "Address type not supported by SOCKS server"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÑÑ ÐÐÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:797
+#: ../camel/camel-tcp-stream-raw.c:809
 msgid "Unknown error from SOCKS server"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:830
+#: ../camel/camel-tcp-stream-raw.c:842
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÐÐÐÑÑ ÐÑÑÑÑ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:848
+#: ../camel/camel-tcp-stream-raw.c:860
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:868
+#: ../camel/camel-tcp-stream-raw.c:880
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐ (ÐÐÑÐÐÑÐ 255 ÐÐÐÐÐÐÐ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
+#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:502
-#, c-format
-msgid ""
-"   Issuer:       %s\n"
-"   Subject:      %s\n"
-"   Fingerprint:  %s\n"
-"   Signature:    %s"
-msgstr ""
-"   ÐÐÐÐÐÐÑ:      %s\n"
-"   ÐÐÑÐÐÐ:       %s\n"
-"   ÐÑÐÑÐÐ:       %s\n"
-"   ÐÐÑÐÐÑ:       %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:508
-msgid "GOOD"
-msgstr "ÐÐÐÐÐ"
-
-#: ../camel/camel-tcp-stream-ssl.c:508
-msgid "BAD"
-msgstr "ÐÐÐÐ"
-
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:512
-#, c-format
-msgid ""
-"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-"\n"
-"Detailed information about the certificate:\n"
-"%s"
-msgstr ""
-"ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ â%sâ ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?\n"
-"\n"
-"ÐÐÑÐÑÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÑÐÐÑÐÑÑ:\n"
-"%s"
-
-#: ../camel/camel-tcp-stream-ssl.c:516
-msgid "_Reject"
-msgstr "_ÐÐÐÐÑÐ"
-
-#: ../camel/camel-tcp-stream-ssl.c:517
-msgid "Accept _Temporarily"
-msgstr "ÐÑÐÑÐÐÑÐ _ÐÑÐÐÑÐÐÐÐÐ"
-
-#: ../camel/camel-tcp-stream-ssl.c:518
-msgid "_Accept Permanently"
-msgstr "ÐÑÐÑÐÐÑÐ _ÑÑÐÑÐÐ"
-
-#: ../camel/camel-tcp-stream-ssl.c:579
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÑÐÑÐÐ: %s\n"
-"ÐÐÐÐÐÐÑ: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:631
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"ÐÐÑ ÐÐÐÐÐ ÑÐÐÑÐÑÐ: %s\n"
-"ÐÐÐÐÐÐÑ: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:649
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"ÐÑÑÐÐÐÐ ÑÐÐÑÐÑÐ: %s\n"
-"ÐÐÐÐÐÐÑ: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:666
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"ÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÑ ÑÐÐÑÐÑÐ: %s\n"
-"ÐÐÐÐÐÐÑ: %s"
-
-#: ../camel/camel-url.c:330
+#: ../camel/camel-url.c:331
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÑ â%sâ"
@@ -3398,173 +3367,43 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ ÑÑÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:299
-#, c-format
-msgid "No output stream"
-msgstr "ÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:307
-#, c-format
-msgid "No input stream"
-msgstr "ÐÐÐ ÑÐÐÐÐÐÐ ÑÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-command.c:392
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:425
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s in folder %s:\n"
-"%s"
-msgstr ""
-"ÐÐÐÐÐÑÐÑÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ %s %s Ñ ÑÐÑÑÐÐÐÐ %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:429
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-"ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ %s %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:511
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:523
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÐÐÐÐ: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:606
-#, c-format
-msgid "Server response ended too soon."
-msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÐÑÑÐÐ."
-
-#: ../camel/providers/imap/camel-imap-command.c:821
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ â%sâ ÐÐÐÐÑÐÐ"
-
-#: ../camel/providers/imap/camel-imap-command.c:859
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:354
-msgid "Always check for _new mail in this folder"
-msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐ _ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:445
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:466
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐ â%sâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1135
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3480
-msgid "Unable to retrieve message: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÑ: "
-
-#: ../camel/providers/imap/camel-imap-folder.c:3594
-#: ../camel/providers/imap/camel-imap-folder.c:4485
-#: ../camel/providers/nntp/camel-nntp-folder.c:493
-#, c-format
-msgid "This message is not currently available"
-msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÑÑÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4059
-#: ../camel/providers/imap/camel-imap-folder.c:4140
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÑÑÐÐ Ñ â%sâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4272
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÑÑ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑ â%dâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4282
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÐ ÐÐÑÐ ÐÐÑ ÐÐ ÐÐÑÑÐÑ â%dâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4522
-#, c-format
-msgid "Could not find message body in FETCH response."
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ."
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:196
-#: ../camel/providers/imap/camel-imap-message-cache.c:253
-msgid "Could not open cache directory: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÑÐÐÐ: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:331
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÑÐÑ â%sâ: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:397
-#, c-format
-msgid "Failed to cache message %s: "
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÑÐÑ â%sâ: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:539
-#, c-format
-msgid "Failed to cache %s: "
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ â%sâ: "
-
-#: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:42
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "Ð_ÐÑÑÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ÐÑÐ_ÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÑÐÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr "ÐÐÑÐÑÑÐ _ÐÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr "_ÐÑÐÑÑÐÑÑ ÐÐ ÐÐÐÐÐÑÑÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ"
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:49
 #: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "ÐÑÐÐ_ÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:51
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "Ð_ÑÐÐÐÑÑÐ ÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÐÐÑ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:53
-msgid "Names_pace:"
-msgstr "ÐÐÐÐÐ _ÐÐÐÐÐ:"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "ÐÐÐÐÐ ÐÐÐÐÐ:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:55
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
 #: ../camel/providers/local/camel-local-provider.c:41
 #: ../camel/providers/local/camel-local-provider.c:77
@@ -3573,92 +3412,43 @@ msgstr "ÐÐÐÐÐ _ÐÐÐÐÐ:"
 msgid "Options"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Apply _filters to new messages in all folders"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐ _ÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:59
 #: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_ÐÑÐÐÐÐÐ ÐÑÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐÑÑÐÑÑ ÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:61
 #: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ _ÑÑÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:63
 #: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ_ÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:65
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ÐÐÐ ÑÑÐÐÐÐÐ ÑÐ_ÐÑÐÐÑ ÐÐÑÑÑ ÑÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:71
-msgid "IMAP default port"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑ ÐÐÐÐ-Ð"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "ÐÐÐÐ ÐÑÐÐÐ ÐÐÐ-Ð"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
-msgid "IMAP"
-msgstr "ÐÐÐÐ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
+msgid "IMAP+"
+msgstr "ÐÐÐÐ+"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
 #: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/providers/imap/camel-imap-store.c:2186
-#: ../camel/providers/local/camel-maildir-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:564
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ."
-
-#: ../camel/providers/imap/camel-imap-store.c:2961
-#, c-format
-msgid "Retrieving list of folders at '%s'"
-msgstr "ÐÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:3309
-#, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:3312
-msgid "Server unexpectedly disconnected: "
-msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use _Quick Resync if the server supports it"
-msgstr "ÐÐÑÐÑÑÐ _ÐÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "_Listen for server change notifications"
-msgstr "_ÐÑÐÑÑÐÑÑ ÐÐ ÐÐÐÐÐÑÑÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Namespace:"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÐ:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
-msgid "Default IMAP port"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑ ÐÐÐÐ-Ð"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:83
-msgid "IMAP+"
-msgstr "ÐÐÐÐ+"
-
 #: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
@@ -3801,7 +3591,7 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐ
 msgid "Could not rename '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:527
+#: ../camel/providers/local/camel-local-summary.c:543
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÑ ÐÑÐÐÐÐÐÑ: ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
@@ -3872,6 +3662,13 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑ
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÑÐ."
 
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:564
+#, c-format
+msgid "Cannot create folder '%s': folder exists."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ."
+
 #: ../camel/providers/local/camel-maildir-store.c:338
 #: ../camel/providers/local/camel-maildir-store.c:378
 #: ../camel/providers/local/camel-mh-store.c:682
@@ -3914,7 +3711,7 @@ msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 #: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
 #: ../camel/providers/local/camel-mbox-summary.c:650
-#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-mbox-summary.c:798
 #: ../camel/providers/local/camel-spool-summary.c:132
 msgid "Storing folder"
 msgstr "ÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ"
@@ -4023,7 +3820,7 @@ msgid "Cannot check folder: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:663
-#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-mbox-summary.c:807
 #: ../camel/providers/local/camel-spool-summary.c:139
 #, c-format
 msgid "Could not open file: %s: %s"
@@ -4036,29 +3833,29 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:694
-#: ../camel/providers/local/camel-mbox-summary.c:919
+#: ../camel/providers/local/camel-mbox-summary.c:924
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÑÐÑ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:707
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:817
-#: ../camel/providers/local/camel-mbox-summary.c:1085
+#: ../camel/providers/local/camel-mbox-summary.c:821
+#: ../camel/providers/local/camel-mbox-summary.c:1090
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÑÐÑÑÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:856
-#: ../camel/providers/local/camel-mbox-summary.c:1116
+#: ../camel/providers/local/camel-mbox-summary.c:860
+#: ../camel/providers/local/camel-mbox-summary.c:1127
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -4067,25 +3864,25 @@ msgstr ""
 "ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÑÐÑÐÐÐ, ÐÐÐÑÐÐÐÑÐ ÑÐ. (ÐÑÐÐÐÐÐÐÐ ÑÐ âÐÐ ÑÐÐÐâ, ÐÐÐ ÐÐÑÐÐ "
 "ÐÐÐÐÐ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:865
-#: ../camel/providers/local/camel-mbox-summary.c:1125
+#: ../camel/providers/local/camel-mbox-summary.c:870
+#: ../camel/providers/local/camel-mbox-summary.c:1140
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÐ, ÑÐÐ Ð ÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-mbox-summary.c:1035
 #: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1183
-#: ../camel/providers/local/camel-mbox-summary.c:1213
+#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1228
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1202
+#: ../camel/providers/local/camel-mbox-summary.c:1217
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s: %s"
@@ -4210,25 +4007,30 @@ msgstr ""
 #: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
-msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÑÐÐ: ÐÐÐ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ: %s"
+msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÑÐÐ: ÐÐÐ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:328
 #: ../camel/providers/nntp/camel-nntp-folder.c:332
-#: ../camel/providers/pop3/camel-pop3-folder.c:610
-#: ../camel/providers/pop3/camel-pop3-folder.c:1005
+#: ../camel/providers/pop3/camel-pop3-folder.c:633
+#: ../camel/providers/pop3/camel-pop3-folder.c:1065
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:339
 #: ../camel/providers/nntp/camel-nntp-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-folder.c:548
-#: ../camel/providers/pop3/camel-pop3-folder.c:600
-#: ../camel/providers/pop3/camel-pop3-folder.c:619
+#: ../camel/providers/pop3/camel-pop3-folder.c:558
+#: ../camel/providers/pop3/camel-pop3-folder.c:623
+#: ../camel/providers/pop3/camel-pop3-folder.c:642
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ: "
 
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
+#, c-format
+msgid "This message is not currently available"
+msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÑÑÐÐÐ"
+
 #: ../camel/providers/nntp/camel-nntp-folder.c:559
 #: ../camel/providers/nntp/camel-nntp-folder.c:565
 #: ../camel/providers/nntp/camel-nntp-folder.c:611
@@ -4277,28 +4079,37 @@ msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "ÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÑ ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÐ ÐÐ ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÑÑÐ."
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:87
+#| msgid ""
+#| "This option will connect to the server using Kerberos 5 authentication."
+msgid ""
+"This option will connect to the NNTP server anonymously, without "
+"authentication."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ, ÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:97
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:286
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÑÐÐ ÑÐ â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:298
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÑÐ ÐÑÐÑÐÐ ÐÐÐ ÐÑÐÑÐÐ â%dâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:463
+#: ../camel/providers/nntp/camel-nntp-store.c:472
 #, c-format
 msgid "USENET News via %s"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1058
+#: ../camel/providers/nntp/camel-nntp-store.c:1073
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4309,24 +4120,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1150
+#: ../camel/providers/nntp/camel-nntp-store.c:1167
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÑÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1166
+#: ../camel/providers/nntp/camel-nntp-store.c:1183
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1189
+#: ../camel/providers/nntp/camel-nntp-store.c:1206
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1388
+#: ../camel/providers/nntp/camel-nntp-store.c:1405
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4337,7 +4148,7 @@ msgstr ""
 "\n"
 "ÐÐÐÐ ÑÐÐÐÐ ÐÑÑÐÐ. ÐÐÐÐÑÐÐÐ ÑÑÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÑÐÑÑÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1436
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4348,15 +4159,20 @@ msgstr ""
 "\n"
 "ÐÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1626
+#: ../camel/providers/nntp/camel-nntp-store.c:1643
 msgid "NNTP Command failed: "
 msgstr "ÐÐÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1711
+#: ../camel/providers/nntp/camel-nntp-store.c:1728
 #, c-format
 msgid "Not connected."
 msgstr "ÐÐÑÐÐ ÐÐÐÐÐÐÐ."
 
+#: ../camel/providers/nntp/camel-nntp-store.c:1786
+#, c-format
+msgid "No such folder: %s"
+msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
+
 #: ../camel/providers/nntp/camel-nntp-summary.c:198
 #: ../camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
@@ -4378,34 +4194,38 @@ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ head-Ð: %s"
 msgid "Operation failed: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:443
-#: ../camel/providers/pop3/camel-pop3-folder.c:516
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:526
 #, c-format
 msgid "No message with UID %s"
-msgstr "ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐ %s"
+msgstr "ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐ-ÐÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:532
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÑ %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:611
+#: ../camel/providers/pop3/camel-pop3-folder.c:634
 msgid "Unknown reason"
 msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:659
+#: ../camel/providers/pop3/camel-pop3-folder.c:682
 msgid "Retrieving POP summary"
 msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:710
+#: ../camel/providers/pop3/camel-pop3-folder.c:741
+#: ../camel/providers/pop3/camel-pop3-folder.c:744
+#: ../camel/providers/pop3/camel-pop3-folder.c:757
+#: ../camel/providers/pop3/camel-pop3-folder.c:770
+#: ../camel/providers/pop3/camel-pop3-folder.c:784
 msgid "Cannot get POP summary: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:829
+#: ../camel/providers/pop3/camel-pop3-folder.c:891
 msgid "Expunging old messages"
 msgstr "ÐÐÐÐÑÑÑÐÐ ÑÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:849
+#: ../camel/providers/pop3/camel-pop3-folder.c:911
 msgid "Expunging deleted messages"
 msgstr "ÐÐÐÐÑÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
@@ -4471,53 +4291,53 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:139
+#: ../camel/providers/pop3/camel-pop3-store.c:144
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐÑÐ ÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐ ÑÐÑÐÐÑÐ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:154
+#: ../camel/providers/pop3/camel-pop3-store.c:159
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:155
+#: ../camel/providers/pop3/camel-pop3-store.c:160
 msgid "STLS not supported by server"
 msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐ"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:176
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:194
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:298
+#: ../camel/providers/pop3/camel-pop3-store.c:305
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:320
+#: ../camel/providers/pop3/camel-pop3-store.c:327
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐ ÑÐÑÐÐÑÑ â%sâ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:371
+#: ../camel/providers/pop3/camel-pop3-store.c:387
 #, c-format
 msgid "POP3 server %s"
 msgstr "ÐÐÐ3 ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
+#: ../camel/providers/pop3/camel-pop3-store.c:390
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "ÐÐÐ3 ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/providers/pop3/camel-pop3-store.c:563
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4526,7 +4346,7 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÐÑÐÐÐÑ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÐ. ÐÐÐÑÑ "
 "ÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÐÑ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:598
+#: ../camel/providers/pop3/camel-pop3-store.c:615
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4537,7 +4357,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:613
+#: ../camel/providers/pop3/camel-pop3-store.c:630
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4546,11 +4366,6 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ.\n"
 "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:673
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ"
-
 #: ../camel/providers/pop3/camel-pop3-store.c:701
 #, c-format
 msgid "No such folder '%s'."
@@ -4562,8 +4377,9 @@ msgid "POP3 stores have no folder hierarchy"
 msgstr "ÐÐÐ3 ÐÑÑÐÐÐ ÐÐÐÐ ÑÐÑÐÑÐÑÑÐÑÑ ÑÐÑÑÐÐÐÐ"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
-msgstr "Sendmail"
+msgstr "ÐÐÐÐÐÐÑÐ"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
@@ -4572,47 +4388,58 @@ msgid ""
 msgstr ""
 "ÐÐ ÐÐÑÑÐÐÑ ÐÐÑÑÐ ÐÑÐÑÐÐÑÐÐÐÑÐÐ âsendmailâ ÐÑÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
 msgid "sendmail"
-msgstr "sendmail"
+msgstr "ÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
 msgid "Mail delivery via the sendmail program"
 msgstr "ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ ÐÑÐÐÑÐÐÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:93
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:126
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
 #, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÑÐÑ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
+#| msgid "Could not parse recipient list"
+msgid "Could not parse arguments"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:148
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:213
 #, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐÑÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
+#| msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgid "Could not create pipe to '%s': %s: mail not sent"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÑÐÑ ÐÐ â%sâ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:238
+#, c-format
+#| msgid "Could not fork sendmail: %s: mail not sent"
+msgid "Could not fork '%s': %s: mail not sent"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ â%sâ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:287
 msgid "Could not send message: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:317
 #, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "ÑÐÐÐÐÐÑÐ ÑÐ ÐÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐ ââ%s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
+#| msgid "sendmail exited with signal %s: mail not sent."
+msgid "'%s' exited with signal %s: mail not sent."
+msgstr "â%sâ ÑÐ ÐÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐ â%sâ: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:327
 #, c-format
-msgid "Could not execute %s: mail not sent."
+#| msgid "Could not execute %s: mail not sent."
+msgid "Could not execute '%s': mail not sent."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ â%sâ: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:332
 #, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "ÑÐÐÐÐÐÑÐ ÑÐ ÐÐÐÑÑÐÐ ÑÐ ÑÑÐÑÑÑÐÐ â%dâ: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
+#| msgid "sendmail exited with status %d: mail not sent."
+msgid "'%s' exited with status %d: mail not sent."
+msgstr "â%sâ ÑÐ ÐÐÐÑÑÐÐ ÑÑÐÑÐÐ â%dâ: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Default SMTP port"
@@ -4682,177 +4509,177 @@ msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÐÐÐÐÐÐ"
 msgid "AUTH command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âAUTHâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:661
+#: ../camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:665
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
 msgid "Sending message"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:690
+#: ../camel/providers/smtp/camel-smtp-transport.c:689
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÐÐÑÑ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÑÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐÑ ÐÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:807
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Syntax error, command unrecognized"
 msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÐÑÐ, ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:809
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Syntax error in parameters or arguments"
 msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÐÑÐ Ñ ÐÐÑÐÐÐÑÑÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:811
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Command not implemented"
 msgstr "ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:813
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Command parameter not implemented"
 msgstr "ÐÐÑÐÐÐÑÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:815
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "System status, or system help reply"
 msgstr "ÐÑÐÑÑÑ ÑÐÑÑÐÐÐ, ÐÐÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:817
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "Help message"
 msgstr "ÐÐÑÑÐÐ Ð ÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:819
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Service ready"
 msgstr "ÐÐÑÐÐÑ ÑÐ ÑÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:821
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Service closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:823
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Service not available, closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ, ÐÐÑÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:825
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "Requested mail action okay, completed"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÑÐ Ñ ÑÐÐÑ, ÐÐÐÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:827
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "User not local; will forward to <forward-path>"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐ; ÐÐÑÐ ÐÑÐÑÐÐÑÐÐÐ ÐÐ <ÐÑÑÐÑÐ-ÐÑÐÑÐÐÑÐÐÐÑÐ>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:829
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐÐÑÑÑÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:831
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:833
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Requested action aborted: error in processing"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:835
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "User not local; please try <forward-path>"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐ; ÐÐÐÑÑÐÑÑÐ <ÐÑÑÐÑÐ-ÐÑÐÑÐÐÑÐÐÐÑÐ>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:837
+#: ../camel/providers/smtp/camel-smtp-transport.c:836
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑÐ ÐÐ ÑÐÑÑÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:839
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐ ÑÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ: ÐÑÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:841
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:843
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ÐÐÑÐÑÐ ÑÐÐÑ ÐÐÑÑÐ; ÐÐÐÑÑÐÐÐ ÑÐ <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Transaction failed"
 msgstr "ÐÐÑÑÐÐÐ ÐÑÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 msgid "A password transition is needed"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:851
+#: ../camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Authentication mechanism is too weak"
 msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:853
+#: ../camel/providers/smtp/camel-smtp-transport.c:852
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐ ÑÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:855
+#: ../camel/providers/smtp/camel-smtp-transport.c:854
 msgid "Temporary authentication failure"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../camel/providers/smtp/camel-smtp-transport.c:1111
 msgid "SMTP Greeting"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#: ../camel/providers/smtp/camel-smtp-transport.c:1165
+#: ../camel/providers/smtp/camel-smtp-transport.c:1138
+#: ../camel/providers/smtp/camel-smtp-transport.c:1156
+#: ../camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "HELO command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âHELOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1255
-#: ../camel/providers/smtp/camel-smtp-transport.c:1265
+#: ../camel/providers/smtp/camel-smtp-transport.c:1239
+#: ../camel/providers/smtp/camel-smtp-transport.c:1254
+#: ../camel/providers/smtp/camel-smtp-transport.c:1264
 msgid "MAIL FROM command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âMAIL FROMâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1292
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
 msgid "RCPT TO command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âRCPT TOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1309
-#: ../camel/providers/smtp/camel-smtp-transport.c:1319
+#: ../camel/providers/smtp/camel-smtp-transport.c:1308
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ÐÐÑÐ ÑÑÐÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1362
-#: ../camel/providers/smtp/camel-smtp-transport.c:1373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1384
-#: ../camel/providers/smtp/camel-smtp-transport.c:1443
-#: ../camel/providers/smtp/camel-smtp-transport.c:1463
-#: ../camel/providers/smtp/camel-smtp-transport.c:1477
-#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+#: ../camel/providers/smtp/camel-smtp-transport.c:1361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1372
+#: ../camel/providers/smtp/camel-smtp-transport.c:1383
+#: ../camel/providers/smtp/camel-smtp-transport.c:1442
+#: ../camel/providers/smtp/camel-smtp-transport.c:1462
+#: ../camel/providers/smtp/camel-smtp-transport.c:1476
+#: ../camel/providers/smtp/camel-smtp-transport.c:1485
 msgid "DATA command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âDATAâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-#: ../camel/providers/smtp/camel-smtp-transport.c:1526
-#: ../camel/providers/smtp/camel-smtp-transport.c:1535
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
+#: ../camel/providers/smtp/camel-smtp-transport.c:1525
+#: ../camel/providers/smtp/camel-smtp-transport.c:1534
 msgid "RSET command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âRSETâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1560
-#: ../camel/providers/smtp/camel-smtp-transport.c:1574
-#: ../camel/providers/smtp/camel-smtp-transport.c:1581
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
+#: ../camel/providers/smtp/camel-smtp-transport.c:1573
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
 msgid "QUIT command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âQUITâ: "
 
 #: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
 msgid "Contact UID of a user"
-msgstr "ÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐÐ"
+msgstr "ÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐÐ"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
 msgid "Birthday and anniversary reminder"
@@ -4883,8 +4710,8 @@ msgstr ""
 
 #: ../libebackend/e-authentication-mediator.c:205
 #: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:849
-#: ../libebackend/e-authentication-mediator.c:1179
+#: ../libebackend/e-authentication-mediator.c:852
+#: ../libebackend/e-authentication-mediator.c:1182
 msgid "Bus name vanished (client terminated?)"
 msgstr "ÐÐÐÐÐ ÑÐÐÐÑÐÐÑÐ ÑÐ ÐÐÑÑÐÐ (ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÐÐ?)"
 
@@ -4894,8 +4721,8 @@ msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../libebackend/e-authentication-mediator.c:334
 #: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:843
-#: ../libebackend/e-authentication-mediator.c:1173
+#: ../libebackend/e-authentication-mediator.c:846
+#: ../libebackend/e-authentication-mediator.c:1176
 msgid "Client cancelled the operation"
 msgstr "ÐÐÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐ ÑÑÐ ÐÐÐÑÐÑÐÑÑ"
 
@@ -4907,75 +4734,83 @@ msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ
 msgid "Add this password to your keyring"
 msgstr "ÐÐÐÐÑÑÐ ÐÐÑ ÐÐÐÐÐÐÑ Ñ ÐÐÑ ÐÑÐÐÐÐÐÐ"
 
-#: ../libebackend/e-authentication-session.c:595
+#: ../libebackend/e-authentication-session.c:622
 msgid "Password was incorrect"
 msgstr "ÐÐÐÐÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ"
 
-#: ../libebackend/e-authentication-session.c:1331
-#: ../libebackend/e-authentication-session.c:1507
-#: ../libebackend/e-authentication-session.c:1690
-msgid "Keyring operation was cancelled"
-msgstr "ÐÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÑÑÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ"
-
-#: ../libebackend/e-backend.c:190
+#: ../libebackend/e-backend.c:206
 #, c-format
 msgid "%s does not support authentication"
 msgstr "â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../libebackend/e-collection-backend.c:734
+#: ../libebackend/e-collection-backend.c:775
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÐÑÐÐÐÑ ÐÐÐÐÑÐÑÑÐ"
 
-#: ../libebackend/e-collection-backend.c:793
+#: ../libebackend/e-collection-backend.c:834
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐ ÑÐÐÑÐÐÐÑ ÐÐÐÐÑÐÑÑÐ"
 
-#: ../libebackend/e-server-side-source.c:128
+#: ../libebackend/e-server-side-source.c:132
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ [%s] ÐÑÑÐÐ"
 
-#: ../libebackend/e-server-side-source.c:945 ../libedataserver/e-source.c:1092
+#: ../libebackend/e-server-side-source.c:993 ../libedataserver/e-source.c:1110
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÐÐ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÐÑÐÐÐÑ ÐÐÐÐÑÐÑÑÐ"
 
-#: ../libebackend/e-server-side-source.c:959
+#: ../libebackend/e-server-side-source.c:1007
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr ""
 "ÐÐÐÐÑ ÐÐÐÐÑÐÐÐ â%sâ ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐ ÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÑÐ"
 
-#: ../libebackend/e-server-side-source.c:987 ../libedataserver/e-source.c:1201
+#: ../libebackend/e-server-side-source.c:1035
+#: ../libedataserver/e-source.c:1217
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÐÐ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐ ÑÐÐÑÐÐÐÑ ÐÐÐÐÑÐÑÑÐ"
 
-#: ../libebackend/e-server-side-source.c:1001
+#: ../libebackend/e-server-side-source.c:1049
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr ""
 "ÐÐÐÐÑ ÐÐÐÐÑÐÐÐ â%sâ ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐ ÐÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÑÐ"
 
-#: ../libebackend/e-server-side-source.c:1336
+#: ../libebackend/e-server-side-source.c:1080
+#: ../libedataserver/e-source.c:1307
+#, c-format
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "Data source '%s' does not support OAuth 2.0 authentication"
+msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÐÐ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÑ 2.0 ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
+
+#: ../libebackend/e-server-side-source.c:1406
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐ ÐÐÐ ÐÐÑÑÐÐÐÐ â.sourceâ"
 
-#: ../libebackend/e-source-registry-server.c:522
-#: ../libedataserver/e-source-registry.c:1512
+#: ../libebackend/e-source-registry-server.c:523
+#: ../libedataserver/e-source-registry.c:1594
 msgid "The user declined to authenticate"
 msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÑÐÑ"
 
 # ÐÐÑ Ñ ÑÐÐÑÑÐÐÐ?
-#: ../libebackend/e-source-registry-server.c:770
+#: ../libebackend/e-source-registry-server.c:792
 #, c-format
 msgid "UID '%s' is already in use"
-msgstr "ÐÐÐ â%sâ ÑÐ ÐÐÑ Ñ ÑÐÐÑÑÐÐÐ"
+msgstr "ÐÐÐ â%sâ ÑÐ ÐÐÑ Ñ ÑÐÐÑÑÐÐÐ"
+
+#: ../libebackend/e-user-prompter-server.c:279
+#, c-format
+#| msgid "Contact '%s' not found"
+msgid "Extension dialog '%s' not found."
+msgstr "ÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÑÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ â%sâ."
 
 #: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
@@ -5089,21 +4924,21 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-client.c:124
+#: ../libedataserver/e-client.c:115
 msgid "Source not loaded"
 msgstr "ÐÐÐÐÑ ÐÐÑÐ ÑÑÐÑÐÐ"
 
-#: ../libedataserver/e-client.c:126
+#: ../libedataserver/e-client.c:117
 msgid "Source already loaded"
 msgstr "ÐÐÐÐÑ ÑÐ ÐÐÑ ÑÑÐÑÐÐ"
 
 #. Translators: This means that the EClient does not support offline mode, or
 #. * it's not set to by a user, thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:136
+#: ../libedataserver/e-client.c:127
 msgid "Offline unavailable"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../libedataserver/e-client.c:158
+#: ../libedataserver/e-client.c:149
 msgid "D-Bus error"
 msgstr "ÐÑÐÑÐÐ Ñ Ð-ÐÐÐÐÑÑÑÐÐÐ"
 
@@ -5159,35 +4994,91 @@ msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐ â%s
 msgid "Please enter the password for account \"%s\"."
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐ â%sâ."
 
-#: ../libedataserver/e-source.c:621
+#: ../libedataserver/e-source.c:620
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "ÐÐÐÐÑÐÐÑ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ [%s] ÐÑÑÐÐ"
 
-#: ../libedataserver/e-source.c:919
+#: ../libedataserver/e-source.c:937
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÐÐ â%sâ ÑÐ ÐÐ ÐÐÐÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-source.c:1001
+#: ../libedataserver/e-source.c:1019
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "ÐÐÐÐÑ ÐÐÐÑÐÐÐ â%sâ ÐÐÑÐ ÑÐÐÑÐÐ"
 
-#: ../libedataserver/e-source.c:1382
+#: ../libedataserver/e-source.c:1513
 msgid "Unnamed"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ"
 
-#: ../libedataserver/e-source-mail-signature.c:485
+#: ../libedataserver/e-source-mail-signature.c:487
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "ÐÐÑÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
 
+#: ../libedataserver/e-source-webdav.c:1476
+#, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+"ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ â%sâ, ÐÐÑÐ ÐÐÑÐÑÑÐ ÐÐÑÐÑÐÑ â%sâ, ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ. "
+"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
+
+#: ../libedataserver/e-source-webdav.c:1485
+#, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
+"wish to accept it?"
+msgstr ""
+"ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ â%sâ, ÐÐÑÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÐÑ â%sâ, ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ. "
+"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
+
+#: ../libedataserver/e-source-webdav.c:1494
+#, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+"ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ â%sâ, ÐÐÑÐ ÐÐÑÐÑÑÐ ÐÐÐÐÑÐÐ â%sâ, ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ. "
+"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
+
+#: ../libedataserver/e-source-webdav.c:1503
+#, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+"ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ â%sâ, ÐÐÑÐ ÐÐÑÐÑÑÐ ÐÐÐÐÑÐ â%sâ, ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ. ÐÐ "
+"ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
+
 #. 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.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1949
+#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1946
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -5195,7 +5086,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1655 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1937
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -5203,7 +5094,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1660 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1942
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -5211,78 +5102,78 @@ msgstr "%a %d. %m. %Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1665 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1933
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d. %m. %Y. %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1667
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d. %m. %Y. %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1675
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1798
-#: ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1928
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1685
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d. %m. %Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1686
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d. %m. %Y. %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1691
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d. %m. %Y. %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1696
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d. %m. %Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1701
 msgid "%m/%d/%Y %I %p"
 msgstr "%d. %m. %Y. %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1709
+#: ../libedataserver/e-time-utils.c:1706
 msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1712 ../libedataserver/e-time-utils.c:1801
+#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1993
+#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1990
 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.
-#: ../libedataserver/e-time-utils.c:1876 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1982
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5290,25 +5181,25 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1990
+#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1987
 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.
-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:1982
+#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1979
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1886
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1890
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5425,217 +5316,454 @@ msgstr "ÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 msgid "Where to read automatic proxy configuration from."
 msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÐÑÐÑÐÑÐÐÐ ÑÐÐÐÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ."
 
-#: ../libedataserverui/e-categories-editor.c:230
-msgid "Currently _used categories:"
-msgstr "ÐÑÐÐÑÑÐÐ _ÐÐÑÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ:"
-
-#: ../libedataserverui/e-categories-editor.c:239
-msgid "_Available Categories:"
-msgstr "_ÐÐÑÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ:"
-
-#: ../libedataserverui/e-categories-selector.c:325
-msgid "Icon"
-msgstr "ÐÐÐÐÐÑÐ"
-
-#: ../libedataserverui/e-categories-selector.c:330
-msgid "Category"
-msgstr "ÐÐÑÐÐÐÑÐÑÐ"
-
-#: ../libedataserverui/e-category-completion.c:300
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:223
 #, c-format
-msgid "Create category \"%s\""
-msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ â%sâ"
-
-#: ../libedataserverui/e-category-editor.c:137
-msgid "Category Icon"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
-
-#: ../libedataserverui/e-category-editor.c:141
-msgid "_No Image"
-msgstr "_ÐÐÐ ÑÐÐÐÐ"
-
-#: ../libedataserverui/e-category-editor.c:178
-msgid "Category _Name"
-msgstr "_ÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
-
-#: ../libedataserverui/e-category-editor.c:186
-msgid "Category _Icon"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
-
-#: ../libedataserverui/e-category-editor.c:226
-msgid "Category Properties"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+msgid "Code: %u - Unexpected response from server"
+msgstr "ÐÐÐ: %u â ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-category-editor.c:287
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:244
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "Ð ÐÐÐÐÑÐÐÐÑÑ ÐÐÑ ÐÐÑÑÐÑÐ ÐÐÑÐÐÐÑÐÑÐ â%sâ. ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Show Contacts"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:300
-msgid "Address B_ook:"
-msgstr "Ð_ÐÑÐÑÐÑ:"
-
-#: ../libedataserverui/e-name-selector-dialog.c:310
-msgid "Cat_egory:"
-msgstr "ÐÐÑÐÐÐ_ÑÐÑÐ:"
-
-#: ../libedataserverui/e-name-selector-dialog.c:332
-msgid "_Search:"
-msgstr "_ÐÑÐÑÑÐÐÐ:"
-
-#: ../libedataserverui/e-name-selector-dialog.c:357
-#: ../libedataserverui/e-name-selector-dialog.c:1182
-msgid "Any Category"
-msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:359
-msgid "Co_ntacts"
-msgstr "ÐÐ_ÐÑÐÐÑÐ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:421
-msgid "Search"
-msgstr "ÐÑÐÑÑÐÐÐ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:424
-msgid "Address Book"
-msgstr "ÐÐÑÐÑÐÑ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:427
-#: ../modules/google-backend/module-google-backend.c:183
-msgid "Contacts"
-msgstr "ÐÐÐÑÐÐÑÐ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:545
-msgid "Select Contacts from Address Book"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:917
-msgid "_Add"
-msgstr "_ÐÐÐÐÑ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:921
-msgid "_Remove"
-msgstr "_ÐÐÐÐÐÐ"
+msgid "Failed to parse autodiscover response XML"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÐ ÑÐÐÐÐÑÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐÑ ÐÐÑÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:1097
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:253
 #, c-format
-msgid "Error loading address book: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÑÐ: %s"
+msgid "Failed to find Autodiscover element"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÑÐÐÐÐÑÐÑÐÐÐÑÐ"
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:3008
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:265
 #, c-format
-msgid "E_xpand %s Inline"
-msgstr "_ÐÐÑÐÑÐ %s ÑÐÑÑÐÑ"
+msgid "Failed to find Response element"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐ"
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3024
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:277
 #, c-format
-msgid "Cop_y %s"
-msgstr "Ð_ÐÐÐÐÐ %s"
+msgid "Failed to find Account element"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÐÐ"
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3035
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:291
 #, c-format
-msgid "C_ut %s"
-msgstr "Ð_ÑÐÑÐ %s"
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÑ Ð ÐÐÐÐÐÑÐÑÑ Ñ ÐÐÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑÐÐÐÑÐ"
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:3053
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1094
 #, c-format
-msgid "_Edit %s"
-msgstr "_ÐÑÐÐÐ %s"
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an access token for '%s'"
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐÑÑÑÐ ÐÐÐÐÐ ÐÐ ÑÑÐÑÐÐ âÐÑÐ.ÐÐÐÐ.ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐâ "
+"ÑÐ ÐÐÑÐ ÐÐÑ ÐÐÐÐÐ ÐÑÐÑÑÑÐ ÐÐ â%sâ."
 
-#: ../libedataserverui/e-name-selector-list.c:532
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1121
 #, c-format
-msgid "_Delete %s"
-msgstr "_ÐÐÐÐÐÐ â%sâ"
+#| msgid "Failed to open addressbook at '%s': %s"
+msgid "Failed to obtain an access token for '%s': "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÑÐ ÐÐ â%sâ: "
 
-#: ../libedataserverui/e-passwords.c:126
-msgid "Keyring key is unusable: no user or host name"
-msgstr "ÐÑÑÑ ÐÑÐÐÐÑÐÐ ÐÐÑÐ ÑÐÐÑÑÐÐÑÐÐ: ÐÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+#: ../modules/google-backend/module-google-backend.c:140
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "ÐÐÐÐÐÐÐÑ"
 
-#: ../libedataserverui/e-passwords.c:701
-#: ../libedataserverui/e-passwords-win32.c:614
-msgid "You have the Caps Lock key on."
-msgstr "ÐÐÑÑÑÐÐÐ ÑÑÐ ÐÐÐÐÐÐ ÑÐÐÐÐ."
+#: ../modules/google-backend/module-google-backend.c:217
+#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+msgid "Contacts"
+msgstr "ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-passwords.c:821
-#: ../libedataserverui/e-passwords-win32.c:737
-msgid "_Remember this passphrase"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ"
+#: ../modules/trust-prompt/certificate-viewer.c:292
+#| msgid "Cannot add encryption certificate"
+msgid "Not part of certificate"
+msgstr "ÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:600
+msgid "This certificate has been verified for the following uses:"
+msgstr "ÐÐÐ ÑÐÐÑÐÑÐ ÑÐ ÐÑÐÐÐÑÐÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÑÑÐÐÐ:"
+
+#: ../modules/trust-prompt/certificate-viewer.c:604
+#: ../modules/trust-prompt/e-asn1-object.c:387
+#| msgid "X.509 Certificate"
+msgid "SSL Client Certificate"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÑÐÐÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:609
+#: ../modules/trust-prompt/e-asn1-object.c:391
+#| msgid "X.509 Certificate"
+msgid "SSL Server Certificate"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐ ÑÐÑÐÐÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:614
+msgid "Email Signer Certificate"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐÐÐÐ ÐÐ. ÐÐÑÑÐÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:619
+#| msgid "Cannot add encryption certificate"
+msgid "Email Recipient Certificate"
+msgstr "ÐÐÐÑÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐ. ÐÐÑÑÐÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:634
+msgid "Issued To"
+msgstr "ÐÐÑÐÑÐÐÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:635
+#: ../modules/trust-prompt/certificate-viewer.c:641
+msgid "Common Name (CN)"
+msgstr "ÐÐÑÐÐÐÐÑÐÐ ÐÐÐ (CN)"
+
+#: ../modules/trust-prompt/certificate-viewer.c:636
+#: ../modules/trust-prompt/certificate-viewer.c:642
+#| msgid "Organization"
+msgid "Organization (O)"
+msgstr "ÐÑÐÐÐÐÐÐÑÐÑÐ (O)"
+
+#: ../modules/trust-prompt/certificate-viewer.c:637
+#: ../modules/trust-prompt/certificate-viewer.c:643
+#| msgid "Organizational Unit"
+msgid "Organizational Unit (OU)"
+msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐ (OU)"
+
+#: ../modules/trust-prompt/certificate-viewer.c:638
+#: ../modules/trust-prompt/e-asn1-object.c:134
+msgid "Serial Number"
+msgstr "ÐÐÑÐÑÑÐÐ ÐÑÐÑ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:640
+msgid "Issued By"
+msgstr "ÐÐÐÐÐÐÑ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:645
+msgid "Validity"
+msgstr "ÐÑÐÑÐÐÐÐÑÑ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:646
+msgid "Issued On"
+msgstr "ÐÐÐÐÑÐ ÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:647
+msgid "Expires On"
+msgstr "ÐÑÑÐÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:649
+msgid "Fingerprints"
+msgstr "ÐÑÐÑÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:650
+msgid "SHA1 Fingerprint"
+msgstr "ÐÐÐ1 ÐÑÐÑÐÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:651
+msgid "MD5 Fingerprint"
+msgstr "ÐÐ5 ÐÑÐÑÐÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:653
+msgid "General"
+msgstr "ÐÐÑÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:672
+#| msgid "Certificate import failed"
+msgid "Certificate Hierarchy"
+msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:676
+#| msgid "Certificate import failed"
+msgid "Certificate Fields"
+msgstr "ÐÐÑÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:680
+msgid "Field Value"
+msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÐ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:682
+msgid "Details"
+msgstr "ÐÐÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:95
+msgid "Version"
+msgstr "ÐÐÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:110
+msgid "Version 1"
+msgstr "ÐÐÐÐÑÐ 1"
+
+#: ../modules/trust-prompt/e-asn1-object.c:113
+msgid "Version 2"
+msgstr "ÐÐÐÐÑÐ 2"
+
+#: ../modules/trust-prompt/e-asn1-object.c:116
+msgid "Version 3"
+msgstr "ÐÐÐÐÑÐ 3"
+
+#: ../modules/trust-prompt/e-asn1-object.c:192
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "ÐÐÐÐ #1 ÐÐ2 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:195
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "ÐÐÐÐ #1 ÐÐ5 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:198
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "ÐÐÐÐ #1 ÐÐÐ-1 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:201
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "ÐÐÐÐ #1 ÐÐÐ-256 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:204
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "ÐÐÐÐ #1 ÐÐÐ-384 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:207
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "ÐÐÐÐ #1 ÐÐÐ-512 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:234
+msgid "PKCS #1 RSA Encryption"
+msgstr "ÐÐÐÐ #1 ÐÐÐ ÑÐÑÑÐÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:237
+#| msgid "Certificate import failed"
+msgid "Certificate Key Usage"
+msgstr "ÐÐÐÑÑÐÐÐ ÐÑÑÑÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:240
+msgid "Netscape Certificate Type"
+msgstr "ÐÑÑÑÐ ÐÐÑÑÐÐÑÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:243
+#| msgid "Certificate import failed"
+msgid "Certificate Authority Key Identifier"
+msgstr "ÐÐÑÐÑÐÐÐÑ ÐÑÑÑÐ ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:255
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr "ÐÐÑÐÑÐÐÐÑ ÐÑÐÐÐÐÑÐ (%s)"
+
+#: ../modules/trust-prompt/e-asn1-object.c:306
+msgid "Algorithm Identifier"
+msgstr "ÐÐÑÐÑÐÐÐÑ ÐÐÐÐÑÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:314
+msgid "Algorithm Parameters"
+msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:336
+msgid "Subject Public Key Info"
+msgstr "ÐÐÐÐÑÐ Ð ÑÐÐÐÐÐ ÐÑÑÑÑ ÑÑÐÑÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:341
+msgid "Subject Public Key Algorithm"
+msgstr "ÐÐÐÐÑÐÑÐÐ ÑÐÐÐÐÐ ÐÑÑÑÐ ÑÑÐÑÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:356
+msgid "Subject's Public Key"
+msgstr "ÐÐÐÐÐ ÐÑÑÑ ÑÑÐÑÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:378
+#: ../modules/trust-prompt/e-asn1-object.c:428
+#| msgid "Unable to process spool folder"
+msgid "Error: Unable to process extension"
+msgstr "ÐÑÐÑÐÐ: ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:395
+#| msgid "Email 1"
+msgid "Email"
+msgstr "ÐÐ. ÐÐÑÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:399
+#: ../modules/trust-prompt/e-asn1-object.c:411
+msgid "Object Signer"
+msgstr "ÐÐÑÐÐÑÐÐÐ ÐÑÐÐÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:403
+#| msgid "Certificate import failed"
+msgid "SSL Certificate Authority"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:407
+msgid "Email Certificate Authority"
+msgstr "ÐÐÐÐÐÐÑ ÑÐÐÑÐÑÐ ÐÐ. ÐÐÑÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:436
+#| msgid "Signing message"
+msgid "Signing"
+msgstr "ÐÐÑÐÐÑÐÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:440
+msgid "Non-repudiation"
+msgstr "ÐÐÐ ÐÐÑÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:444
+msgid "Key Encipherment"
+msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÑÑÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:448
+msgid "Data Encipherment"
+msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:452
+msgid "Key Agreement"
+msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÑÑÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:456
+#| msgid "Certificate import failed"
+msgid "Certificate Signer"
+msgstr "ÐÐÑÐÐÑÐÐÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:460
+msgid "CRL Signer"
+msgstr "ÐÐÐ ÐÐÑÐÐÑÐÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:509
+msgid "Critical"
+msgstr "ÐÑÐÑÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:511
+#: ../modules/trust-prompt/e-asn1-object.c:514
+msgid "Not Critical"
+msgstr "ÐÐÑÐ ÐÑÐÑÐÑÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:535
+msgid "Extensions"
+msgstr "ÐÑÐÑÐÑÐÑÐ"
+
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../modules/trust-prompt/e-asn1-object.c:615
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../modules/trust-prompt/e-asn1-object.c:658
+#| msgid "X.509 Certificate"
+msgid "Certificate"
+msgstr "ÐÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:674
+#: ../modules/trust-prompt/e-asn1-object.c:812
+#| msgid "Signature algorithm unknown"
+msgid "Certificate Signature Algorithm"
+msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:683
+msgid "Issuer"
+msgstr "ÐÐÐÐÐÐÑ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:714
+msgid "Subject"
+msgstr "ÐÐÑÐÐÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:738
+#| msgid "Unique ID"
+msgid "Issuer Unique ID"
+msgstr "ÐÐÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:757
+#| msgid "Unique ID"
+msgid "Subject Unique ID"
+msgstr "ÐÐÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐÑÐ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:818
+#| msgid "Certificate import failed"
+msgid "Certificate Signature Value"
+msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÐÐÑÐ ÑÐÐÑÐÑÐ"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:201
+#| msgid "Signing certificate not found"
+msgid "The signing certificate authority is not known."
+msgstr "ÐÐÐÐÐÐÑ ÐÐÑÐÐÑÑÑÑÑÐÐ ÑÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐÑ."
+
+#: ../modules/trust-prompt/module-trust-prompt.c:203
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "ÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÑÑ ÑÐÑÑÐ ÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÐÑÐ."
 
-#: ../libedataserverui/e-passwords.c:822
-#: ../libedataserverui/e-passwords-win32.c:738
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐ ÐÐÐ ÑÐÑÐÑÐ"
+#: ../modules/trust-prompt/module-trust-prompt.c:205
+msgid "The certificate's activation time is still in the future."
+msgstr "ÐÑÐÐÐ ÐÐÐÑÐÑÐÑÐ ÑÐÐÑÐÑÐ ÑÐ ÑÐÑ ÑÐÐÐ Ñ ÐÑÐÑÑÐÐÑÑÐ."
 
-#: ../libedataserverui/e-passwords.c:827
-#: ../libedataserverui/e-passwords-win32.c:743
-msgid "_Remember this password"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ"
+#: ../modules/trust-prompt/module-trust-prompt.c:207
+#| msgid "The referenced credentials have expired."
+msgid "The certificate has expired."
+msgstr "ÐÐÐÑÐÑÐ ÑÐ ÐÑÑÐÐÐÐ."
 
-#: ../libedataserverui/e-passwords.c:828
-#: ../libedataserverui/e-passwords-win32.c:744
-msgid "_Remember this password for the remainder of this session"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐ ÐÐÐ ÑÐÑÐÑÐ"
+#: ../modules/trust-prompt/module-trust-prompt.c:209
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
+msgstr "ÐÐÐÑÐÑÐ ÑÐ ÐÐÐÑÑÐÐÐ Ñ ÑÐÐÐÐÑ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÐÑÐ ÐÐÐÐ."
 
-#: ../libedataserverui/e-source-selector-dialog.c:224
-msgid "_Destination"
-msgstr "_ÐÐÑÐÐÐÑÑÐ"
+#: ../modules/trust-prompt/module-trust-prompt.c:211
+msgid "The certificate's algorithm is considered insecure."
+msgstr "ÐÐÐÐÑÐÑÐÐ ÑÐÐÑÐÑÐ ÑÐ ÑÐÐÑÑÐ ÐÐÑÐÐÑÑÐÐÐ."
 
-#: ../libedataserverui/e-source-selector-dialog.c:326
-msgid "Select destination"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:162
+#| msgid "Signing certificate not trusted"
+msgid "Certificate trust..."
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐÑÐÑÐ..."
 
-#: ../modules/google-backend/module-google-backend.c:118
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
-msgid "Calendar"
-msgstr "ÐÐÐÐÐÐÐÑ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:163
+#| msgid "X.509 Certificate"
+msgid "_View Certificate"
+msgstr "ÐÐÐÐÐÐÐÑ _ÑÐÐÑÐÑÐ"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:184
-#, c-format
-msgid "Code: %u - Unexpected response from server"
-msgstr "ÐÐÐ: %u â ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐ ÑÐÑÐÐÑÐ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+msgid "_Reject"
+msgstr "_ÐÐÐÐÑÐ"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:205
-#, c-format
-msgid "Failed to parse autodiscover response XML"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÐ ÑÐÐÐÐÑÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐÑ ÐÐÑÐÐ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+msgid "Accept _Temporarily"
+msgstr "ÐÑÐÑÐÐÑÐ _ÐÑÐÐÑÐÐÐÐÐ"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:214
-#, c-format
-msgid "Failed to find Autodiscover element"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÑÐÐÐÐÑÐÑÐÐÐÑÐ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+msgid "_Accept Permanently"
+msgstr "ÐÑÐÑÐÐÑÐ _ÑÑÐÑÐÐ"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:226
+#: ../modules/trust-prompt/trust-prompt-gtk.c:203
 #, c-format
-msgid "Failed to find Response element"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐ"
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr "ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ â%sâ ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:238
-#, c-format
-msgid "Failed to find Account element"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÐÐ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:209
+msgid "Detailed information about the certificate:"
+msgstr "ÐÐÑÐÐÐÐÐÑÑÐ Ð ÑÐÐÑÐÑÑ:"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:252
-#, c-format
-msgid "Failed to find ASUrl and OABUrl in autodiscover response"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÑ Ð ÐÐÐÐÐÑÐÑÑ Ñ ÐÐÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑÐÐÐÑÐ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:223
+msgid "Issuer:"
+msgstr "ÐÐÐÐÐÐÑ:"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:224
+msgid "Subject:"
+msgstr "ÐÐÐÐ:"
 
-#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+#: ../modules/trust-prompt/trust-prompt-gtk.c:225
+msgid "Fingerprint:"
+msgstr "ÐÑÐÑÐÐ:"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:226
+msgid "Reason:"
+msgstr "ÐÐÐÐÐÐ:"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:227
 msgid "Tasks"
 msgstr "ÐÐÐÑÐÐÑÐ"
 
@@ -5649,18 +5777,47 @@ msgstr "ÐÐÑÑÐÐÑÐ ÐÐ ÑÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÑÐÐ
 msgid "Wait running until at least one client is connected"
 msgstr "ÐÐÐÐ ÑÐ ÐÐÐÑÐÑÐÑÐÐ ÑÐÐ ÐÐÐ ÑÐ ÐÐÑÐÐ ÑÐÐÐÐ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:620
-msgid "Evolution Source Viewer"
-msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
-
-#: ../tests/libedataserverui/evolution-source-viewer.c:649
-msgid "Display Name"
-msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐÐ"
-
-#: ../tests/libedataserverui/evolution-source-viewer.c:658
-msgid "Flags"
-msgstr "ÐÐÑÐÑÐ"
-
-#: ../tests/libedataserverui/evolution-source-viewer.c:710
-msgid "Identity"
-msgstr "ÐÐÐÐÑÐÑÐÑ"
+#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1
+#| msgid "Birthday and anniversary reminder"
+msgid "Birthdays & Anniversaries"
+msgstr "ÐÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
+
+#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
+msgid "CalDAV"
+msgstr "ÐÐÐÐÐÐ"
+
+#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1
+msgid "Google"
+msgstr "ÐÑÐÐ"
+
+#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
+#| msgid "IMAP server %s"
+msgid "On LDAP Servers"
+msgstr "ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐÐÐ"
+
+#: ../services/evolution-source-registry/builtin/local.source.in.h:1
+#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1
+msgid "On This Computer"
+msgstr "ÐÐ ÐÐÐÐ ÑÐÑÑÐÐÑÑ"
+
+#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1
+#| msgid "Folders"
+msgid "Search Folders"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
+
+#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1
+#| msgid "Weather: Fog"
+msgid "Weather"
+msgstr "ÐÑÐÐÐ"
+
+#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
+msgid "On The Web"
+msgstr "ÐÐ ÐÐÐÑ"
+
+#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
+msgid "WebDAV"
+msgstr "ÐÐÐÐÐÐ"
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+msgid "_Dismiss"
+msgstr "_ÐÐÐÐÐÐÑÐ"
diff --git a/po/sr latin po b/po/sr latin po
index 0515aac..6f2cb53 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the evolution-data-server package.
 # Maintainer: Danilo Åegan <dsegan gmx net>
 # Reviewed on 2005-08-20 by: Igor NestoroviÄ <igor prevod org>
-# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2012.
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
 "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2012-08-28 13:07+0000\n"
-"PO-Revision-Date: 2012-09-06 10:36+0200\n"
+"POT-Creation-Date: 2013-01-25 16:48+0000\n"
+"PO-Revision-Date: 2013-01-26 10:15+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -21,125 +21,133 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:116
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1232
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4785
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:931
-#: ../addressbook/libebook/e-book-client.c:106
-#: ../addressbook/libedata-book/e-data-book.c:432
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:570
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
-#: ../calendar/libecal/e-cal.c:4033 ../calendar/libecal/e-cal-client.c:148
-#: ../camel/camel-imapx-command.c:594
-#: ../camel/providers/imap/camel-imap-command.c:524
-#: ../camel/providers/imap/camel-imap-store.c:468
-#: ../libedataserver/e-client.c:165
-msgid "Unknown error"
-msgstr "Nepoznata greÅka"
-
-#: ../addressbook/backends/file/e-book-backend-file.c:141
+#: ../addressbook/backends/file/e-book-backend-file.c:102
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "Nisam uspeo da uklonim datoteku â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:164
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:616
+#: ../addressbook/backends/file/e-book-backend-file.c:126
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Nisam uspeo da napravim direktorijum â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:459
+#: ../addressbook/backends/file/e-book-backend-file.c:373
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Nisam uspeo da napravim Ävrstu vezu za izvor â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:561
-#: ../addressbook/backends/file/e-book-backend-file.c:1127
+#: ../addressbook/backends/file/e-book-backend-file.c:475
+#: ../addressbook/backends/file/e-book-backend-file.c:898
 msgid "No UID in the contact"
-msgstr "Nema JIB-a u kontaktu"
+msgstr "Nema KIB-a u kontaktu"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:761
+#, c-format
+msgid "Conflicting UIDs found in added contacts"
+msgstr "PronaÄeni su sukobljavajuÄi KIB-ovi u dodatim kontaktima"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1569
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508
+#: ../addressbook/backends/file/e-book-backend-file.c:1002
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2127
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "Kontakt â%sâ nije pronaÄen"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1182
 msgid "Loading..."
 msgstr "UÄitavam..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1572
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
+#: ../addressbook/backends/file/e-book-backend-file.c:1184
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4918
 msgid "Searching..."
 msgstr "PretraÅujem..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2115
+#: ../addressbook/backends/file/e-book-backend-file.c:1340
 #, c-format
-msgid "Failed to build summary for an address book %s"
-msgstr "Nisam uspeo da izgradim saÅetak za adresar â%sâ"
+#| msgid "Could not rename folder %s to %s: %s"
+msgid "Failed to rename old database from '%s' to '%s': %s"
+msgstr "Nisam uspeo da preimenujem staru bazu podataka â%sâ u â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:142
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1194
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4813
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1015
+#: ../addressbook/libebook/e-book-client.c:93
+#: ../addressbook/libebook/e-phone-number.c:65
+#: ../addressbook/libedata-book/e-data-book.c:557
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:561
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:591
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
+#: ../calendar/libecal/e-cal.c:2327 ../calendar/libecal/e-cal-client.c:127
+#: ../camel/camel-imapx-command.c:594 ../libedataserver/e-client.c:156
+msgid "Unknown error"
+msgstr "Nepoznata greÅka"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:645
+#: ../addressbook/backends/google/e-book-backend-google.c:649
 msgid "Querying for updated contactsâ"
 msgstr "Propitujem za aÅuriranim kontaktimaâ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:782
+#: ../addressbook/backends/google/e-book-backend-google.c:786
 msgid "Querying for updated groupsâ"
 msgstr "Propitujem za aÅuriranim grupamaâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1202
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+#: ../addressbook/backends/google/e-book-backend-google.c:1235
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1625
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:375
 msgid "The backend does not support bulk additions"
 msgstr "Pozadinac ne podrÅava grupno dodavanje"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1234
+#: ../addressbook/backends/google/e-book-backend-google.c:1267
 msgid "Creating new contactâ"
 msgstr "Stvaram novi kontaktâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1323
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+#: ../addressbook/backends/google/e-book-backend-google.c:1358
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:492
 msgid "The backend does not support bulk removals"
 msgstr "Pozadinac ne podrÅava grupno uklanjanje"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1351
+#: ../addressbook/backends/google/e-book-backend-google.c:1386
 msgid "Deleting contactâ"
 msgstr "BriÅem kontaktâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1601
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
+#: ../addressbook/backends/google/e-book-backend-google.c:1640
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2288
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:553
 msgid "The backend does not support bulk modifications"
 msgstr "Pozadinac ne podrÅava grupno ureÄivanje"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1639
+#: ../addressbook/backends/google/e-book-backend-google.c:1678
 msgid "Modifying contactâ"
 msgstr "Menjam kontaktâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1809
+#: ../addressbook/backends/google/e-book-backend-google.c:1849
 msgid "Loadingâ"
 msgstr "UÄitavamâ"
 
-#: ../addressbook/backends/google/e-book-google-utils.c:1562
+#: ../addressbook/backends/google/e-book-google-utils.c:1601
+#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1
 msgid "Personal"
 msgstr "LiÄno"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1563
+#: ../addressbook/backends/google/e-book-google-utils.c:1602
 msgid "Friends"
 msgstr "Prijatelji"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1564
+#: ../addressbook/backends/google/e-book-google-utils.c:1603
 msgid "Family"
 msgstr "Porodica"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1565
+#: ../addressbook/backends/google/e-book-google-utils.c:1604
 msgid "Coworkers"
 msgstr "Saradnici"
 
@@ -148,163 +156,143 @@ msgstr "Saradnici"
 msgid "Not connected"
 msgstr "Nisam povezan"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
-msgid "Using Distinguished Name (DN)"
-msgstr "Koristim istaknuto ime (DN)"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
-msgid "Using Email Address"
-msgstr "KoriÅÄenje elektronske adrese"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:922
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "Nisam uspeo da poveÅem koristeÄi ni v3 ni v2 vezice"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1045
 msgid "Reconnecting to LDAP server..."
 msgstr "Ponovo se povezujem na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1175
 msgid "Invalid DN syntax"
 msgstr "Neispravna DN sintaksa"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1231
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4784
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1191
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4812
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "GreÅka LDAP-a 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1709
 msgid "Adding contact to LDAP server..."
 msgstr "Dodajem kontakt na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1847
 msgid "Removing contact from LDAP server..."
 msgstr "Uklanjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2022
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2405
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1989
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2384
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: âNULLâ je vraÄeno sa prvog unosa ldapa (ldap_first_entry)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2265
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2456
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2241
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2441
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: VraÄena je nepoznata vrsta rezultata %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2310
 msgid "Modifying contact from LDAP server..."
 msgstr "Menjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2673
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2886
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2670
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2890
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: VraÄena je nepoznata vrsta rezultata pretrage %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4761
 msgid "Receiving LDAP search results..."
 msgstr "Primam rezultate pretrage sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4940
 msgid "Error performing search"
 msgstr "GreÅka tokom pretrage"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5063
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Preuzimam kontakte (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5526
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "Nisam uspeo da dobavim DN za korisnika â%sâ"
 
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:645
-#, c-format
-#| msgid "Failed to remove file '%s': %s"
-msgid "Failed to open addressbook at '%s': %s"
-msgstr "Nisam uspeo da otvorim adresar na â%sâ: %s"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:406
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "Nije uspelo stvaranje resursa â%sâ sa HTTP stanjem: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:508
 #, c-format
-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgid "DELETE failed with HTTP status %d"
 msgstr "Nije uspelo brisanje (DELETE) sa HTTP stanjem %d"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507
-#| msgid "_Listen for server change notifications"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:574
 msgid "Contact on server changed -> not modifying"
 msgstr "Izmenjen je kontakt na serveru â> ne menjam"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:583
 #, c-format
-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgid "Modify contact failed with HTTP status: %d (%s)"
 msgstr "Izmena kontakta nije uspela sa HTTP stanjem: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912
-#| msgid "Error loading address book: %s"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:993
 msgid "Loading Addressbook summary..."
 msgstr "UÄitavam saÅetak adresara..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1012
 #, c-format
-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr ""
 "Nije uspelo nalaÅenje svojstva (PROPFIND) na vebdavu sa HTTP stanjem %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1037
 msgid "No response body in webdav PROPFIND result"
 msgstr "Nema tela odgovora u rezultatima nalaÅenja svojstava vebdava"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1069
 #, c-format
-#| msgid "Downloading contacts (%d)... "
 msgid "Loading Contacts (%d%%)"
 msgstr "UÄitavam kontakte (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402
 msgid "Cannot transform SoupURI to string"
 msgstr "Ne mogu da preobratim Soup adresu u nisku"
 
-#: ../addressbook/libebook/e-book-client.c:95
+#: ../addressbook/libebook/e-book-client.c:82
 msgid "No such book"
 msgstr "Nema takvog adresara"
 
-#: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../addressbook/libebook/e-book-client.c:84
+#: ../addressbook/libedata-book/e-data-book.c:431
 msgid "Contact not found"
 msgstr "Kontakt nije pronaÄen"
 
-#: ../addressbook/libebook/e-book-client.c:99
-#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../addressbook/libebook/e-book-client.c:86
+#: ../addressbook/libedata-book/e-data-book.c:432
 msgid "Contact ID already exists"
 msgstr "IB kontakta veÄ postoji"
 
-#: ../addressbook/libebook/e-book-client.c:101
+#: ../addressbook/libebook/e-book-client.c:88
 msgid "No such source"
 msgstr "Nema takvog izvora"
 
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libebook/e-book-client.c:90
+#: ../addressbook/libedata-book/e-data-book.c:448
 msgid "No space"
 msgstr "Nema prostora"
 
-#: ../addressbook/libebook/e-book-client.c:488
+#: ../addressbook/libebook/e-book-client.c:878
 msgid "Failed to run book factory"
 msgstr "Nisam uspeo da pokrenem pogon adresara"
 
-#: ../addressbook/libebook/e-book-client.c:2244
-#: ../calendar/libecal/e-cal-client.c:4602
+#: ../addressbook/libebook/e-book-client.c:2520
+#: ../calendar/libecal/e-cal-client.c:4885
 msgid "Cannot get connection to view"
 msgstr "Ne mogu da dobijem vezu za pregled"
 
@@ -498,7 +486,6 @@ msgstr "Adresa veb dnevnika"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:188
-#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "Kategorije"
 
@@ -775,7 +762,7 @@ msgid "Birth Date"
 msgstr "RoÄendan"
 
 #: ../addressbook/libebook/e-contact.c:284
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:954
 msgid "Anniversary"
 msgstr "GodiÅnjica"
 
@@ -885,287 +872,340 @@ msgstr "Spisak imena Gugl razgovora"
 msgid "Twitter Name List"
 msgstr "Spisak Tviter imena"
 
-#: ../addressbook/libebook/e-contact.c:1623
-#: ../addressbook/libebook/e-destination.c:879
+#: ../addressbook/libebook/e-contact.c:1684
+#: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "Neimenovani spisak"
 
-#: ../addressbook/libedata-book/e-book-backend.c:17
-msgid "Cannot process, book backend is opening"
-msgstr "Ne mogu da obradim, pozadinac adresara se otvara"
+#: ../addressbook/libebook/e-phone-number.c:50
+msgid "The library was built without phone number support."
+msgstr "Biblioteka je izgraÄena bez podrÅke za telefonske brojeve."
+
+#: ../addressbook/libebook/e-phone-number.c:52
+msgid "The phone number parser reported an yet unkown error code."
+msgstr "ObraÄivaÄ telefonskog broja je prijavio joÅ uvek nepoznat kod greÅke."
+
+#: ../addressbook/libebook/e-phone-number.c:54
+msgid "Not a phone number"
+msgstr "Nije broj telefona"
+
+#: ../addressbook/libebook/e-phone-number.c:56
+#| msgid "Invalid query: "
+msgid "Invalid country code"
+msgstr "Neispravan kod drÅave"
 
-#: ../addressbook/libedata-book/e-book-backend.c:90
+#: ../addressbook/libebook/e-phone-number.c:58
+msgid "Remaining text after the country code is to short for a phone number"
+msgstr "Preostali tekst nakon koda drÅave je prekratak za telefonski broj"
+
+#: ../addressbook/libebook/e-phone-number.c:60
+msgid "Text is too short for a phone number"
+msgstr "Tekst je prekratak za broj telefona"
+
+#: ../addressbook/libebook/e-phone-number.c:62
+msgid "Text is too long for a phone number"
+msgstr "Tekst je predug za broj telefona"
+
+#: ../addressbook/libedata-book/e-book-backend.c:89
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "Nepoznato svojstvo adresara â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:107
+#: ../addressbook/libedata-book/e-book-backend.c:106
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "Ne mogu da izmenim vrednost svojstva adresara â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
-#: ../camel/camel-db.c:503
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:734
+#, c-format
+msgid "Error introspecting unknown summary field '%s'"
+msgstr "GreÅka sagledavanja nepoznatog polja saÅetka â%sâ"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:959
+#: ../camel/camel-db.c:510
 #, c-format
 msgid "Insufficient memory"
 msgstr "Nedovoljno memorije"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1090
 #, c-format
-msgid "Contact '%s' not found"
-msgstr "Kontakt â%sâ nije pronaÄen"
+msgid "Invalid contact field '%d' specified in summary"
+msgstr "Neispravno polje kontakta â%dâ navedeno u saÅetku"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1124
+#, c-format
+msgid ""
+"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"string and string list field types are supported"
+msgstr ""
+"Polje kontakta â%sâ â%sâ vrste je navedeno u saÅetku. ali su podrÅane samo "
+"vrste polja logiÄke vrednosti, niske i spiska niske"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2115
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2910
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. vcards cannot be returned."
+msgstr ""
+"Äitavi kontakti_pretrage nisu uskladiÅteni u ostavi. v-kartice ne mogu dati "
+"odgovor."
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3052
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. Hence only summary query is "
+"supported."
+msgstr ""
+"Äitavi kontakti_pretrage nisu uskladiÅteni u ostavi. Otuda je podrÅan samo "
+"upit saÅetka."
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3133
+#, c-format
+msgid ""
+"Full vcards are not stored in cache. Hence only summary query is supported."
+msgstr ""
+"Äitave v-kartice nisu uskladiÅtene u ostavi. Otuda je podrÅan samo upit "
+"saÅetka."
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3805
+#, c-format
+#| msgid "Failed to remove file '%s': %s"
+msgid "Unable to remove the db file: errno %d"
+msgstr "Ne mogu da uklonim datoteku baze podataka: br. greÅke %d"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../addressbook/libedata-book/e-data-book.c:214
-#: ../addressbook/libedata-book/e-data-book.c:724
+#: ../addressbook/libedata-book/e-data-book.c:345
+#: ../addressbook/libedata-book/e-data-book.c:367
+#: ../addressbook/libedata-book/e-data-book.c:846
 msgid "Invalid query: "
 msgstr "Neispravan upit: "
 
-#: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../addressbook/libedata-book/e-data-book.c:427
+#: ../calendar/libedata-cal/e-data-cal.c:584
 msgid "Success"
 msgstr "UspeÅno"
 
-#: ../addressbook/libedata-book/e-data-book.c:303
-#: ../calendar/libecal/e-cal.c:4001 ../calendar/libedata-cal/e-data-cal.c:416
-#: ../libedataserver/e-client.c:122
+#: ../addressbook/libedata-book/e-data-book.c:428
+#: ../calendar/libecal/e-cal.c:2295 ../calendar/libedata-cal/e-data-cal.c:585
+#: ../libedataserver/e-client.c:113
 msgid "Backend is busy"
 msgstr "Pozadinac je zauzet"
 
-#: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:586 ../libedataserver/e-client.c:123
 msgid "Repository offline"
 msgstr "SkladiÅte nije na mreÅi"
 
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4015 ../calendar/libedata-cal/e-data-cal.c:418
-#: ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:430
+#: ../calendar/libecal/e-cal.c:2309 ../calendar/libedata-cal/e-data-cal.c:587
+#: ../libedataserver/e-client.c:129
 msgid "Permission denied"
 msgstr "Pristup je odbijen"
 
-#: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../addressbook/libedata-book/e-data-book.c:433
+#: ../calendar/libedata-cal/e-data-cal.c:592
 msgid "Authentication Failed"
 msgstr "Neuspela autentifikacija"
 
-#: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:434
+#: ../calendar/libedata-cal/e-data-cal.c:593
 msgid "Authentication Required"
 msgstr "Potrebna je prijava"
 
-#: ../addressbook/libedata-book/e-data-book.c:310
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../addressbook/libedata-book/e-data-book.c:435
+#: ../calendar/libedata-cal/e-data-cal.c:594
 msgid "Unsupported field"
 msgstr "NepodrÅano polje"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:436
+#: ../calendar/libedata-cal/e-data-cal.c:596 ../libedataserver/e-client.c:137
 msgid "Unsupported authentication method"
 msgstr "NepodrÅan naÄin autentifikacije"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:437
+#: ../calendar/libedata-cal/e-data-cal.c:597 ../libedataserver/e-client.c:139
 msgid "TLS not available"
 msgstr "TLS nije dostupan"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../addressbook/libedata-book/e-data-book.c:438
 msgid "Address book does not exist"
 msgstr "Adresar ne postoji"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../addressbook/libedata-book/e-data-book.c:439
 msgid "Book removed"
 msgstr "Knjiga je uklonjena"
 
-#: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../addressbook/libedata-book/e-data-book.c:440
+#: ../calendar/libedata-cal/e-data-cal.c:600
 msgid "Not available in offline mode"
 msgstr "Nije dostupno u reÅimu van mreÅe"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/libedata-cal/e-data-cal.c:601 ../libedataserver/e-client.c:141
 msgid "Search size limit exceeded"
 msgstr "PremaÅena veliÄina pretrage"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:442
+#: ../calendar/libedata-cal/e-data-cal.c:602 ../libedataserver/e-client.c:143
 msgid "Search time limit exceeded"
 msgstr "Isteklo vreme za pretragu"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-data-book.c:443
+#: ../calendar/libedata-cal/e-data-cal.c:603 ../libedataserver/e-client.c:145
 msgid "Invalid query"
 msgstr "Neispravan upit"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../calendar/libedata-cal/e-data-cal.c:604 ../libedataserver/e-client.c:147
 msgid "Query refused"
 msgstr "Upit je odbijen"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:445
+#: ../calendar/libedata-cal/e-data-cal.c:605 ../libedataserver/e-client.c:133
 msgid "Could not cancel"
 msgstr "Ne mogu da otkaÅem"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../addressbook/libedata-book/e-data-book.c:447
+#: ../calendar/libedata-cal/e-data-cal.c:607
 msgid "Invalid server version"
 msgstr "Neispravna verzija servera"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libecal/e-cal.c:3999 ../calendar/libedata-cal/e-data-cal.c:439
-#: ../libedataserver/e-client.c:120
+#: ../addressbook/libedata-book/e-data-book.c:449
+#: ../calendar/libecal/e-cal.c:2293 ../calendar/libedata-cal/e-data-cal.c:608
+#: ../libedataserver/e-client.c:111
 msgid "Invalid argument"
 msgstr "Neispravan argument"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4038 ../calendar/libedata-cal/e-data-cal.c:441
-#: ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:451
+#: ../calendar/libecal/e-cal.c:1055 ../calendar/libecal/e-cal.c:1423
+#: ../calendar/libecal/e-cal.c:1903 ../calendar/libecal/e-cal.c:2332
+#: ../calendar/libedata-cal/e-data-cal.c:610 ../libedataserver/e-client.c:135
+#, c-format
 msgid "Not supported"
 msgstr "Nije podrÅan"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:452
+#: ../calendar/libedata-cal/e-data-cal.c:611 ../libedataserver/e-client.c:153
 msgid "Backend is not opened yet"
 msgstr "Pozadinac nije otvoren joÅ uvek"
 
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal-client.c:619
-#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:460
+#: ../calendar/libedata-cal/e-data-cal.c:619 ../libedataserver/e-client.c:151
 msgid "Other error"
 msgstr "Druga greÅka"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:542
-#: ../addressbook/libedata-book/e-data-book.c:909
+#: ../addressbook/libedata-book/e-data-book.c:654
+#: ../addressbook/libedata-book/e-data-book.c:1048
 msgid "Cannot get contact: "
 msgstr "Ne mogu da dobijem kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:567
-#: ../addressbook/libedata-book/e-data-book.c:592
+#: ../addressbook/libedata-book/e-data-book.c:680
+#: ../addressbook/libedata-book/e-data-book.c:706
 msgid "Empty query: "
 msgstr "Prazan upit: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:617
-#: ../addressbook/libedata-book/e-data-book.c:1007
+#: ../addressbook/libedata-book/e-data-book.c:732
+#: ../addressbook/libedata-book/e-data-book.c:1152
 msgid "Cannot add contact: "
 msgstr "Ne mogu da dodam kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:642
-#: ../addressbook/libedata-book/e-data-book.c:1041
+#: ../addressbook/libedata-book/e-data-book.c:758
+#: ../addressbook/libedata-book/e-data-book.c:1188
 msgid "Cannot modify contacts: "
 msgstr "Ne mogu da izmenim kontakte: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:796
+#: ../addressbook/libedata-book/e-data-book.c:928
 msgid "Cannot open book: "
 msgstr "Ne mogu da otvorim adresar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:812
-msgid "Cannot remove book: "
-msgstr "Ne mogu da uklonim adresar: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:839
+#: ../addressbook/libedata-book/e-data-book.c:972
 msgid "Cannot refresh address book: "
 msgstr "Ne mogu da osveÅim adresar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:865
+#: ../addressbook/libedata-book/e-data-book.c:1000
 msgid "Cannot get backend property: "
 msgstr "Ne mogu da dobavim svojstvo pozadinca: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:890
-#: ../calendar/libedata-cal/e-data-cal.c:1016
+#: ../addressbook/libedata-book/e-data-book.c:1027
+#: ../calendar/libedata-cal/e-data-cal.c:1183
 msgid "Cannot set backend property: "
 msgstr "Ne mogu da postavim svojstvo pozadinca: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:927
+#: ../addressbook/libedata-book/e-data-book.c:1068
 msgid "Cannot get contact list: "
 msgstr "Ne mogu da dobavim spisak kontakta: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:1104
 msgid "Cannot get contact list uids: "
-msgstr "Ne mogu da dobavim jib-ove spiska kontakata: "
+msgstr "Ne mogu da dobavim kib-ove spiska kontakata: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1066
+#: ../addressbook/libedata-book/e-data-book.c:1215
 msgid "Cannot remove contacts: "
 msgstr "Ne mogu da uklonim kontakte: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:103
-#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#: ../addressbook/libedata-book/e-data-book-factory.c:94
+#: ../calendar/libedata-cal/e-data-cal-factory.c:97
 #, c-format
 msgid "No backend name in source '%s'"
 msgstr "Nema naziva pozadinca u izvoru â%sâ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:115
-#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#: ../addressbook/libedata-book/e-data-book-factory.c:106
+#: ../calendar/libedata-cal/e-data-cal-factory.c:110
 #, c-format
 msgid "Invalid backend name '%s' in source '%s'"
 msgstr "Neispravan naziv pozadinca â%sâ u izvoru â%sâ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:319
-#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+#: ../addressbook/libedata-book/e-data-book-factory.c:191
+#: ../calendar/libedata-cal/e-data-cal-factory.c:196
+#, c-format
 msgid "Missing source UID"
-msgstr "Nedostaje UIB izvora"
+msgstr "Nedostaje KIB izvora"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#: ../addressbook/libedata-book/e-data-book-factory.c:202
+#: ../calendar/libedata-cal/e-data-cal-factory.c:206
 #, c-format
 msgid "No such source for UID '%s'"
-msgstr "Nema takvog izvora za UIB â%sâ"
+msgstr "Nema takvog izvora za KIB â%sâ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:559
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Server je nedostupan (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:598
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:589
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "Nisam uspeo da se poveÅem na server koristeÄi SSL: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
-msgid ""
-"Failed to connect to a server using SSL. One possible reason is an invalid "
-"certificate being used by the server. If this is expected, like self-signed "
-"certificate being used on the server, then disable certificate validity "
-"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
-msgstr ""
-"Nisam uspeo da se poveÅem na server koristeÄi SSL. Jedan od moguÄih razloga "
-"je taj da server koristi neispravno uverenje. Ako je ovo oÄekivano, kao Åto "
-"je koriÅÄenje samopotpisanog uverenja na serveru, onda iskljuÄite probe "
-"ispravnosti uverenja tako Åto Äete u svojstvima izabrati opciju âZanemari "
-"neispravno SSL uverenjeâ"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "VraÄen je neoÄekivani kod â%dâ HTTP stanja (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
-#| msgid "Backend is not opened yet"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
 msgid "CalDAV backend is not loaded yet"
 msgstr "Pozadinac KolDAV-a joÅ uvek nije uÄitan"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017
-#| msgid "Invalid object"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1008
 msgid "Invalid Redirect URL"
 msgstr "Neispravna adresa preusmeravanja"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2716
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2415
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2773
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1174,469 +1214,454 @@ msgstr ""
 "Server je nedostupan, kalendar je otvoren u reÅimu samo za Äitanje.\n"
 "Poruka greÅke: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2639
-#| msgid "Cannot create calendar object: "
-msgid "Cannot create local store"
-msgstr "Ne mogu da napravim mesnu ostavu"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2648
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2725
 #, c-format
-#| msgid "Cannot create folder '%s': %s"
 msgid "Cannot create local cache folder '%s'"
 msgstr "Ne mogu da napravim fasciklu mesne ostave â%sâ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2659
-#| msgid "Could not create cache file"
-msgid "Could not create synch slave thread"
-msgstr "Ne mogu da napravim pomoÄnu nit usaglaÅavanja"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3671
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3734
 msgid "CalDAV does not support bulk additions"
 msgstr "KolDAV ne podrÅava grupno dodavanje"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3773
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3837
 msgid "CalDAV does not support bulk modifications"
 msgstr "KolDAV ne podrÅava grupno ureÄivanje"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3941
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4006
 msgid "CalDAV does not support bulk removals"
 msgstr "KolDAV ne podrÅava grupno uklanjanje"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4600
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4671
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalendar ne podrÅava Slobodno / Zauzeto"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4608
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4680
 msgid "Schedule outbox url not found"
 msgstr "Nije pronaÄena adresa otpremnog sanduÄeta rasporeda"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4707
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4779
 msgid "Unexpected result in schedule-response"
 msgstr "NeoÄekivan rezultat u rasporedu-odgovoru"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:956
 msgid "Birthday"
 msgstr "RoÄendan"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:992
 #, c-format
 msgid "Birthday: %s"
 msgstr "RoÄendan: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1023
 #, c-format
 msgid "Anniversary: %s"
 msgstr "GodiÅnjica: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:235
+#: ../calendar/backends/file/e-cal-backend-file.c:243
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Ne mogu da saÄuvam podatak iz kalendara: loÅa adresa."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:242
-#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:250
+#: ../calendar/backends/file/e-cal-backend-file.c:256
 msgid "Cannot save calendar data"
 msgstr "Ne mogu da saÄuvam podatke kalendara"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:482
+#: ../calendar/backends/http/e-cal-backend-http.c:473
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "LoÅa adresa: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:543
+#: ../calendar/backends/http/e-cal-backend-http.c:564
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Preusmereno na neispravnu adresu"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:580
+#: ../calendar/backends/http/e-cal-backend-http.c:601
 #, c-format
 msgid "Bad file format."
 msgstr "LoÅ oblik datoteke."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:590
+#: ../calendar/backends/http/e-cal-backend-http.c:611
 #, c-format
 msgid "Not a calendar."
 msgstr "Nije kalendar."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:886
-#: ../calendar/backends/http/e-cal-backend-http.c:890
-#: ../calendar/backends/weather/e-cal-backend-weather.c:511
+#: ../calendar/backends/http/e-cal-backend-http.c:920
+#: ../calendar/backends/http/e-cal-backend-http.c:925
+#: ../calendar/backends/weather/e-cal-backend-weather.c:506
 msgid "Could not create cache file"
 msgstr "Ne mogu da napravim datoteku za ostavu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:171
+#: ../calendar/backends/weather/e-cal-backend-weather.c:165
 msgid "Could not retrieve weather data"
 msgstr "Ne mogu da dobijem podatke o vremenu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:276
+#: ../calendar/backends/weather/e-cal-backend-weather.c:270
 msgid "Weather: Fog"
 msgstr "Vreme: magla"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:271
 msgid "Weather: Cloudy Night"
 msgstr "Vreme: oblaÄna noÄ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:272
 msgid "Weather: Cloudy"
 msgstr "Vreme: oblaÄno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:273
 msgid "Weather: Overcast"
 msgstr "Vreme: mestimiÄno oblaÄno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:274
 msgid "Weather: Showers"
 msgstr "Vreme: pljusak"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:275
 msgid "Weather: Snow"
 msgstr "Vreme: sneg"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Clear Night"
 msgstr "Vreme: vedra noÄ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Sunny"
 msgstr "Vreme: sunÄano"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Thunderstorms"
 msgstr "Vreme: grmljavine"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:408
+#: ../calendar/backends/weather/e-cal-backend-weather.c:402
 msgid "Forecast"
 msgstr "Prognoza"
 
-#: ../calendar/libecal/e-cal.c:4003
+#: ../calendar/libecal/e-cal.c:2297
 msgid "Repository is offline"
 msgstr "SkladiÅte nije na mreÅi"
 
-#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135
+#: ../calendar/libecal/e-cal.c:2299 ../calendar/libecal/e-cal-client.c:114
 msgid "No such calendar"
 msgstr "Nema takvog kalendara"
 
-#: ../calendar/libecal/e-cal.c:4007 ../calendar/libecal/e-cal-client.c:137
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:2301 ../calendar/libecal/e-cal-client.c:116
+#: ../calendar/libedata-cal/e-data-cal.c:589
 msgid "Object not found"
 msgstr "Objekat nije naÄen"
 
-#: ../calendar/libecal/e-cal.c:4009 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libecal/e-cal.c:2303 ../calendar/libecal/e-cal-client.c:118
+#: ../calendar/libedata-cal/e-data-cal.c:590
 msgid "Invalid object"
 msgstr "Neispravan objekat"
 
-#: ../calendar/libecal/e-cal.c:4011
+#: ../calendar/libecal/e-cal.c:2305
 msgid "URI not loaded"
 msgstr "Adresa nije uÄitana"
 
-#: ../calendar/libecal/e-cal.c:4013
+#: ../calendar/libecal/e-cal.c:2307
 msgid "URI already loaded"
 msgstr "Adresa je veÄ uÄitana"
 
-#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libecal/e-cal.c:2311
 msgid "Unknown User"
 msgstr "Nepoznat korisnik"
 
-#: ../calendar/libecal/e-cal.c:4019 ../calendar/libecal/e-cal-client.c:143
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:591
 msgid "Object ID already exists"
 msgstr "IB objekta veÄ postoji"
 
-#: ../calendar/libecal/e-cal.c:4021
+#: ../calendar/libecal/e-cal.c:2315
 msgid "Protocol not supported"
 msgstr "Protokol nije podrÅan"
 
-#: ../calendar/libecal/e-cal.c:4023
+#: ../calendar/libecal/e-cal.c:2317
 msgid "Operation has been canceled"
 msgstr "Operacija je otkazana"
 
-#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libecal/e-cal.c:2319
 msgid "Could not cancel operation"
 msgstr "Ne mogu da otkaÅem operaciju"
 
-#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:2321 ../libedataserver/e-client.c:119
 msgid "Authentication failed"
 msgstr "PotvrÄivanje identiteta nije uspelo"
 
-#: ../calendar/libecal/e-cal.c:4029
-#: ../camel/providers/smtp/camel-smtp-transport.c:857
-#: ../libedataserver/e-client.c:130
+#: ../calendar/libecal/e-cal.c:2323
+#: ../camel/providers/smtp/camel-smtp-transport.c:856
+#: ../libedataserver/e-client.c:121
 msgid "Authentication required"
 msgstr "Potrebno je potvrÄivanje identiteta"
 
-#: ../calendar/libecal/e-cal.c:4031
+#: ../calendar/libecal/e-cal.c:2325
 msgid "A D-Bus exception has occurred"
 msgstr "DoÅlo je do izuzetka D-basa"
 
-#: ../calendar/libecal/e-cal.c:4035
+#: ../calendar/libecal/e-cal.c:2329
 msgid "No error"
 msgstr "Nema greÅke"
 
-#: ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libecal/e-cal-client.c:120
+#: ../calendar/libedata-cal/e-data-cal.c:599
 msgid "Unknown user"
 msgstr "Nepoznat korisnik"
 
-#: ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal-client.c:124
+#: ../calendar/libedata-cal/e-data-cal.c:588
 msgid "Invalid range"
 msgstr "Neispravan opseg"
 
-#: ../calendar/libecal/e-cal-client.c:610
+#: ../calendar/libecal/e-cal-client.c:1135
 msgid "Failed to run calendar factory"
 msgstr "Nisam uspeo da pokrenem pogon kalendara"
 
-#: ../calendar/libecal/e-cal-component.c:1339
+#: ../calendar/libecal/e-cal-component.c:1340
 msgid "Untitled appointment"
 msgstr "Neimenovani zakazani sastanak"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:4036
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4017
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
+#: ../calendar/libecal/e-cal-util.c:697 ../calendar/libecal/e-cal-util.c:724
 msgctxt "Priority"
 msgid "High"
 msgstr "Visoko"
 
-#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
+#: ../calendar/libecal/e-cal-util.c:699 ../calendar/libecal/e-cal-util.c:726
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
+#: ../calendar/libecal/e-cal-util.c:701 ../calendar/libecal/e-cal-util.c:728
 msgctxt "Priority"
 msgid "Low"
 msgstr "Nisko"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:721
+#: ../calendar/libecal/e-cal-util.c:722
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "NeodreÄeno"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:36
-msgid "Cannot process, calendar backend is opening"
-msgstr "Ne mogu da obradim, pozadinac kalendara se otvara"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:135
+#: ../calendar/libedata-cal/e-cal-backend.c:155
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Nepoznato svojstvo kalendara â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:152
+#: ../calendar/libedata-cal/e-cal-backend.c:172
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Ne mogu da izmenim vrednost svojstva kalendara â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:844
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:867
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1019
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1226
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1257
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ne oÄekuje argumente"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:238
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:285
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:326
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1299
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ oÄekuje jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:122
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:130
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:914
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ oÄekuje da prvi argument bude niska"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:139
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "â%sâ oÄekuje da prvi argument bude niska ISO 8601 datuma/vremena"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:559
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:907
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1055
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ oÄekuje dva argumenta"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:189
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:245
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:504
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:566
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1062
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1306
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ oÄekuje da prvi argument bude time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:198
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â%sâ oÄekuje da drugi argument bude ceo broj"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:408
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "â%sâ oÄekuje dva ili tri argumenta"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:424
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:512
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:576
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1071
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ oÄekuje da drugi argument bude time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:434
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "â%sâ oÄekuje da treÄi argument bude niska"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:496
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "â%sâ oÄekuje nijedan ili dva argumenta"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â%sâ oÄekuje da drugi argument bude niska"
 
 # bug: no need for two ", or"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1646,12 +1671,12 @@ msgstr ""
 "â%sâ oÄekuje da prvi argument bude âanyâ, âsummaryâ, âdescriptionâ, "
 "âlocationâ, âattendeeâ, âorganizerâ, ili âclassificationâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1123
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ oÄekuje bar jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1138
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1660,143 +1685,133 @@ msgstr ""
 "â%sâ oÄekuje da svi argumenti budu niske ili jedan i samo jedan argument da "
 "bude logiÄki netaÄan (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-data-cal.c:595
 msgid "Unsupported method"
 msgstr "NepodrÅan metod"
 
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:598
 msgid "Calendar does not exist"
 msgstr "Kalendar ne postoji"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:909
+#: ../calendar/libedata-cal/e-data-cal.c:1080
 msgid "Cannot open calendar: "
 msgstr "Ne mogu da otvorim kalendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:934
-msgid "Cannot remove calendar: "
-msgstr "Ne mogu da uklonim kalendar: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:961
+#: ../calendar/libedata-cal/e-data-cal.c:1124
 msgid "Cannot refresh calendar: "
 msgstr "Ne mogu da osveÅim kalendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
+#: ../calendar/libedata-cal/e-data-cal.c:1155
 msgid "Cannot retrieve backend property: "
 msgstr "Ne mogu da preuzmem svojstvo pozadinca: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1045
+#: ../calendar/libedata-cal/e-data-cal.c:1214
 msgid "Cannot retrieve calendar object path: "
 msgstr "Ne mogu da preuzmem putanju objekta kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1075
+#: ../calendar/libedata-cal/e-data-cal.c:1246
 msgid "Cannot retrieve calendar object list: "
 msgstr "Ne mogu da preuzmem spisak objekta kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1104
+#: ../calendar/libedata-cal/e-data-cal.c:1277
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Ne mogu da preuzmem spisak slobodnog/zauzetog kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1142
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 msgid "Cannot create calendar object: "
 msgstr "Ne mogu da napravim objekat kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1177
+#: ../calendar/libedata-cal/e-data-cal.c:1354
 msgid "Cannot modify calendar object: "
 msgstr "Ne mogu da izmenim objekat kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1217
+#: ../calendar/libedata-cal/e-data-cal.c:1396
 msgid "Cannot remove calendar object: "
 msgstr "Ne mogu da uklonim objekat kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1435
 msgid "Cannot receive calendar objects: "
 msgstr "Ne mogu da primim objekte kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1285
+#: ../calendar/libedata-cal/e-data-cal.c:1468
 msgid "Cannot send calendar objects: "
 msgstr "Ne mogu da poÅaljem objekte kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1317
+#: ../calendar/libedata-cal/e-data-cal.c:1502
 msgid "Could not retrieve attachment uris: "
 msgstr "Ne mogu da preuzmem adrese priloga: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1345
+#: ../calendar/libedata-cal/e-data-cal.c:1532
 msgid "Could not discard reminder: "
 msgstr "Ne mogu da odbacim podsetnik: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1374
+#: ../calendar/libedata-cal/e-data-cal.c:1563
 msgid "Could not get calendar view path: "
 msgstr "Ne mogu da dobavim putanju pregleda kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1404
+#: ../calendar/libedata-cal/e-data-cal.c:1595
 msgid "Could not retrieve calendar time zone: "
 msgstr "Ne mogu da preuzmem vremensku zonu kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1430
+#: ../calendar/libedata-cal/e-data-cal.c:1623
 msgid "Could not add calendar time zone: "
 msgstr "Ne mogu da dodam vremensku zonu kalendara: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:220
-#, c-format
-msgid "Invalid call"
-msgstr "Neispravan poziv"
-
-#: ../camel/camel-cipher-context.c:206
+#: ../camel/camel-cipher-context.c:208
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava potpisivanje"
 
-#: ../camel/camel-cipher-context.c:219
+#: ../camel/camel-cipher-context.c:221
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava proveru"
 
-#: ../camel/camel-cipher-context.c:235
+#: ../camel/camel-cipher-context.c:237
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava Åifrovanje"
 
-#: ../camel/camel-cipher-context.c:249
+#: ../camel/camel-cipher-context.c:251
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava deÅifrovanje"
 
-#: ../camel/camel-cipher-context.c:262
+#: ../camel/camel-cipher-context.c:264
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "MoÅda neÄete moÄi da uvezete kljuÄeve sa ovim algoritmom"
 
-#: ../camel/camel-cipher-context.c:276
+#: ../camel/camel-cipher-context.c:278
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "MoÅda neÄete moÄi da izvezete kljuÄeve sa ovim algoritmom"
 
-#: ../camel/camel-cipher-context.c:817
+#: ../camel/camel-cipher-context.c:819
 msgid "Signing message"
 msgstr "Potpisivanje poruke"
 
-#: ../camel/camel-cipher-context.c:1058
+#: ../camel/camel-cipher-context.c:1060
 msgid "Encrypting message"
 msgstr "Åifrovanje poruke"
 
-#: ../camel/camel-cipher-context.c:1185
+#: ../camel/camel-cipher-context.c:1187
 msgid "Decrypting message"
 msgstr "DeÅifrovanje poruke"
 
@@ -1814,7 +1829,7 @@ msgstr "Prazna datoteka ostave"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nije moguÄe ukloniti unos iz ostave: %s: %s"
 
-#: ../camel/camel-disco-diary.c:201
+#: ../camel/camel-disco-diary.c:207
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1825,8 +1840,7 @@ msgstr ""
 "Dalje operacije na ovom serveru neÄe biti izvrÅene kada\n"
 "se budete ponovo povezali na mreÅu."
 
-#: ../camel/camel-disco-diary.c:266
-#: ../camel/providers/imap/camel-imap-journal.c:309
+#: ../camel/camel-disco-diary.c:271
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1837,7 +1851,7 @@ msgstr ""
 "%s\n"
 "Promene na ovoj fascikli neÄe biti usklaÄene."
 
-#: ../camel/camel-disco-diary.c:310
+#: ../camel/camel-disco-diary.c:315
 msgid "Resynchronizing with server"
 msgstr "VrÅim ponovno usklaÄivanje sa serverom"
 
@@ -1854,23 +1868,19 @@ msgstr "Pripremam fasciklu â%sâ za rad van mreÅe"
 msgid "Copy folder content locally for _offline operation"
 msgstr "Lokalno umnoÅi sadrÅaj fascikle za rad _van mreÅe"
 
-#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413
-#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482
-#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:614
-#: ../camel/camel-imapx-folder.c:648 ../camel/camel-imapx-folder.c:688
-#: ../camel/camel-imapx-folder.c:724 ../camel/camel-imapx-store.c:275
-#: ../camel/camel-imapx-store.c:1383 ../camel/camel-imapx-store.c:1471
-#: ../camel/camel-imapx-store.c:1520
-#: ../camel/providers/imap/camel-imap-store.c:1268
-#: ../camel/providers/imap/camel-imap-store.c:2030
-#: ../camel/providers/imap/camel-imap-store.c:2502
-#: ../camel/providers/imap/camel-imap-store.c:3265
-#: ../camel/providers/pop3/camel-pop3-folder.c:524
-#: ../camel/providers/pop3/camel-pop3-folder.c:654
-#: ../camel/providers/pop3/camel-pop3-folder.c:844
-#: ../camel/providers/pop3/camel-pop3-folder.c:1046
-#: ../camel/providers/pop3/camel-pop3-store.c:408
-#: ../camel/providers/pop3/camel-pop3-store.c:831
+#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:478
+#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553
+#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748
+#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993
+#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:320
+#: ../camel/camel-imapx-store.c:1521 ../camel/camel-imapx-store.c:1610
+#: ../camel/camel-imapx-store.c:1659
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:677
+#: ../camel/providers/pop3/camel-pop3-folder.c:906
+#: ../camel/providers/pop3/camel-pop3-folder.c:1106
+#: ../camel/providers/pop3/camel-pop3-store.c:424
+#: ../camel/providers/pop3/camel-pop3-store.c:832
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Morate da budete na mreÅi da biste zavrÅili ovu operaciju"
@@ -1880,86 +1890,104 @@ msgstr "Morate da budete na mreÅi da biste zavrÅili ovu operaciju"
 msgid "Canceled"
 msgstr "Otkazano"
 
-#: ../camel/camel-filter-driver.c:897 ../camel/camel-filter-search.c:772
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Nisam uspeo da napravim sadrÅani proces â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:945
+#: ../camel/camel-filter-driver.c:964
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:1141 ../camel/camel-filter-driver.c:1148
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "UsklaÄujem fascikle"
 
-#: ../camel/camel-filter-driver.c:1242 ../camel/camel-filter-driver.c:1707
+#: ../camel/camel-filter-driver.c:1276
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "GreÅka prilikom Äitanja filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1253 ../camel/camel-filter-driver.c:1718
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "GreÅka prilikom primene filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1349
+#: ../camel/camel-filter-driver.c:1383
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Ne mogu da otvorim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1361
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Ne mogu da obradim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primam poruku %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1386 ../camel/camel-filter-driver.c:1408
+#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
 #, c-format
 msgid "Failed on message %d"
 msgstr "GreÅka kod poruke %d"
 
-#: ../camel/camel-filter-driver.c:1423 ../camel/camel-filter-driver.c:1529
+#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
 msgid "Syncing folder"
 msgstr "UsklaÄujem fasciklu"
 
-#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1535
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
 msgid "Complete"
 msgstr "ZavrÅeno"
 
-#: ../camel/camel-filter-driver.c:1487
+#: ../camel/camel-filter-driver.c:1529
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primam poruku %d od %d"
 
-#: ../camel/camel-filter-driver.c:1505
+#: ../camel/camel-filter-driver.c:1547
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "GreÅka kod poruke %d od %d"
 
+#: ../camel/camel-filter-driver.c:1741 ../camel/camel-filter-driver.c:1775
+#, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Execution of filter '%s' failed: "
+msgstr "Nije uspelo izvrÅavanje propusnika â%sâ: "
+
+#: ../camel/camel-filter-driver.c:1765
+#, c-format
+#| msgid "Error parsing filter: %s: %s"
+msgid "Error parsing filter '%s': %s: %s"
+msgstr "GreÅka obrade propusnika â%sâ: %s: %s"
+
+#: ../camel/camel-filter-driver.c:1784
+#, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Error executing filter '%s': %s: %s"
+msgstr "GreÅka izvrÅavanja propusnika â%sâ: %s: %s"
+
 #: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "Nisam uspeo da dovuÄem poruku"
 
-#: ../camel/camel-filter-search.c:512
+#: ../camel/camel-filter-search.c:537
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neispravni argumenti za (sistemska-oznaka)"
 
-#: ../camel/camel-filter-search.c:530
+#: ../camel/camel-filter-search.c:555
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neispravni argumenti za (korisniÄka-oznaka)"
 
-#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
+#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "GreÅka u primeni filtera za pretragu: %s: %s"
 
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:272
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -1968,7 +1996,7 @@ msgstr[1] "UÄim nove spam poruke u â%sâ"
 msgstr[2] "UÄim nove spam poruke u â%sâ"
 msgstr[3] "UÄim novu spam poruku u â%sâ"
 
-#: ../camel/camel-folder.c:310
+#: ../camel/camel-folder.c:312
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -1977,7 +2005,7 @@ msgstr[1] "UÄim nove ham poruke u â%sâ"
 msgstr[2] "UÄim nove ham poruke u â%sâ"
 msgstr[3] "UÄim novu ham poruku u â%sâ"
 
-#: ../camel/camel-folder.c:358
+#: ../camel/camel-folder.c:360
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -1986,100 +2014,100 @@ msgstr[1] "Filtriram nove poruke u â%sâ"
 msgstr[2] "Filtriram nove poruke u â%sâ"
 msgstr[3] "Filtriram novu poruku u â%sâ"
 
-#: ../camel/camel-folder.c:930
+#: ../camel/camel-folder.c:934
 #: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "PremeÅtam poruke"
 
-#: ../camel/camel-folder.c:933
+#: ../camel/camel-folder.c:937
 msgid "Copying messages"
 msgstr "UmnoÅavam poruke"
 
-#: ../camel/camel-folder.c:1253
+#: ../camel/camel-folder.c:1257
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ObaveÅtenje o koliÄini nije podrÅano za fasciklu â%sâ"
 
-#: ../camel/camel-folder.c:3371
+#: ../camel/camel-folder.c:3477
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Praznim fasciklu â%sâ"
 
-#: ../camel/camel-folder.c:3603
+#: ../camel/camel-folder.c:3709
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "DovlaÄim poruku â%sâ u %s"
 
-#: ../camel/camel-folder.c:3753
+#: ../camel/camel-folder.c:3860
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "DovlaÄim obaveÅtenje o koliÄini za â%sâ"
 
-#: ../camel/camel-folder.c:3985
+#: ../camel/camel-folder.c:4092
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "OsveÅavam fasciklu â%sâ"
 
-#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Ne mogu da analiziram izraz pretrage: %s:\n"
-"%s"
-
-#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"GreÅka prilikom izvrÅavanja izraza pretrage: %s:\n"
-"%s"
-
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
+#: ../camel/camel-folder-search.c:824 ../camel/camel-folder-search.c:867
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) zahteva samo jedan logiÄki rezultat"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:932
+#: ../camel/camel-folder-search.c:902
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nije dozvoljeno unutar %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:909 ../camel/camel-folder-search.c:917
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) zahteva nisku sa tipom poklapanja"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:945
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) oÄekuje niz kao rezultat"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:985
+#: ../camel/camel-folder-search.c:955
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) zahteva skup fascikli"
 
-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
-#: ../camel/camel-gpg-context.c:1327
+#: ../camel/camel-folder-search.c:1789 ../camel/camel-folder-search.c:1956
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Ne mogu da analiziram izraz pretrage: %s:\n"
+"%s"
+
+#: ../camel/camel-folder-search.c:1801 ../camel/camel-folder-search.c:1968
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"GreÅka prilikom izvrÅavanja izraza pretrage: %s:\n"
+"%s"
+
+#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696
+#: ../camel/camel-gpg-context.c:1359
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam uspeo da izvrÅim gÄp: %s"
 
-#: ../camel/camel-gpg-context.c:668
-#: ../camel/providers/smtp/camel-smtp-transport.c:860
+#: ../camel/camel-gpg-context.c:696
+#: ../camel/providers/smtp/camel-smtp-transport.c:859
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../camel/camel-gpg-context.c:733
+#: ../camel/camel-gpg-context.c:761
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2090,17 +2118,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:769
+#: ../camel/camel-gpg-context.c:797
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam uspeo da analiziram podsetnik gÄp ib-a korisnika."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam uspeo da analiziram zahtev za gÄp lozinkom."
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2109,7 +2137,7 @@ msgstr ""
 "Potreban vam je PIN da otkljuÄate kljuÄ\n"
 "Pametne kartice: â%sâ"
 
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:862
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2118,12 +2146,12 @@ msgstr ""
 "Potrebna vam je lozinka da otkljuÄate kljuÄ\n"
 "korisnika: â%sâ"
 
-#: ../camel/camel-gpg-context.c:840
+#: ../camel/camel-gpg-context.c:868
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "NeoÄekivan zahtev GnuÄP-a za â%sâ"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:880
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
@@ -2131,202 +2159,216 @@ msgstr ""
 "Znajte da Åifrovani sadrÅaj ne sadrÅi podatke o primaocu, tako da Äe biti "
 "postavljen upit za lozinku za svaki saÄuvani liÄni kljuÄ."
 
-#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
 #: ../camel/providers/nntp/camel-nntp-summary.c:388
-#: ../libedataserver/e-client.c:140
+#: ../libedataserver/e-client.c:131
 #, c-format
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: ../camel/camel-gpg-context.c:900
+#: ../camel/camel-gpg-context.c:932
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam uspeo da otkljuÄam tajni kljuÄ: unete su 3 pogreÅne lozinke."
 
-#: ../camel/camel-gpg-context.c:913
+#: ../camel/camel-gpg-context.c:945
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "NeoÄekivan odgovor GnuÄP-a: %s"
 
-#: ../camel/camel-gpg-context.c:1044
+#: ../camel/camel-gpg-context.c:1076
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam uspeo da Åifrujem: nisu oznaÄeni ispravni primaoci."
 
-#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
+#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:832
 msgid "Could not generate signing data: "
 msgstr "Ne mogu da napravim podatke za potpisivanje: "
 
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
-#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
+#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879
+#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136
+#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284
 msgid "Failed to execute gpg."
 msgstr "Nisam uspeo da izvrÅim gÄp."
 
-#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
-#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
-#: ../camel/camel-smime-context.c:980
+#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790
+#: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973
+#: ../camel/camel-smime-context.c:982
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1797
+#: ../camel/camel-gpg-context.c:1832
 msgid "Cannot verify message signature: "
 msgstr "Ne mogu da proverim potpis poruke: "
 
-#: ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1955
 msgid "Could not generate encrypting data: "
 msgstr "Ne mogu da napravim podatke za Åifrovanje: "
 
-#: ../camel/camel-gpg-context.c:1973
+#: ../camel/camel-gpg-context.c:2008
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno Åifrovan deo poruke"
 
-#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
-#: ../camel/camel-gpg-context.c:2063
+#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075
+#: ../camel/camel-gpg-context.c:2098
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ne mogu da deÅifrujem poruku: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:2051
+#: ../camel/camel-gpg-context.c:2086
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Nisam uspeo da deÅifrujem MIME deo: greÅka u protokolu"
 
-#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
+#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1273
 msgid "Encrypted content"
 msgstr "Åifrovan sadrÅaj"
 
-#: ../camel/camel-imapx-folder.c:104
+#: ../camel/camel-imapx-folder.c:710
 #, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Ne mogu da napravim saÅetak fascikle za â%sâ"
+#| msgid "Quota information not supported for folder '%s'"
+msgid "No quota information available for folder '%s'"
+msgstr "ObaveÅtenje o koliÄini nije dostupno za fasciklu â%sâ"
 
-#: ../camel/camel-imapx-folder.c:112
+#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882
 #, c-format
-msgid "Could not create cache for %s: "
-msgstr "Ne mogu da napravim ostavu za â%sâ: "
+msgid "No destination folder specified"
+msgstr "Nije navedena fascikla odrediÅta"
+
+#: ../camel/camel-imapx-folder.c:828
+#| msgid "Unable to retrieve message: "
+msgid "Unable to move junk messages"
+msgstr "Ne mogu da premestim nepoÅeljne poruke"
+
+#: ../camel/camel-imapx-folder.c:901
+#| msgid "Unable to retrieve message: "
+msgid "Unable to move deleted messages"
+msgstr "Ne mogu da premestim obrisane poruke"
 
-#: ../camel/camel-imapx-folder.c:794
-#: ../camel/providers/imap/camel-imap-folder.c:365
+#: ../camel/camel-imapx-folder.c:1115
 #: ../camel/providers/nntp/camel-nntp-folder.c:738
 msgid "Apply message _filters to this folder"
 msgstr "Primeni _filtere poruke nad ovom fasciklom"
 
-#: ../camel/camel-imapx-server.c:1020
+#: ../camel/camel-imapx-folder.c:1224
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "Ne mogu da napravim saÅetak fascikle za â%sâ"
+
+#: ../camel/camel-imapx-folder.c:1232
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "Ne mogu da napravim ostavu za â%sâ: "
+
+#: ../camel/camel-imapx-server.c:1254
 msgid "Server disconnected"
 msgstr "Veza sa serverom je iskljuÄena"
 
-#: ../camel/camel-imapx-server.c:1472
-msgid "Error writing to cache stream: "
-msgstr "GreÅka prilikom upisa u tok ostave: "
+#: ../camel/camel-imapx-server.c:1727
+#| msgid "Error writing to cache stream: "
+msgid "Error writing to cache stream"
+msgstr "GreÅka prilikom upisa u tok ostave"
 
-#: ../camel/camel-imapx-server.c:2404
+#: ../camel/camel-imapx-server.c:2893
 #, c-format
 msgid "Not authenticated"
 msgstr "NepotvrÄenog identiteta"
 
-#: ../camel/camel-imapx-server.c:2473
+#: ../camel/camel-imapx-server.c:2971
 msgid "Error performing IDLE"
 msgstr "GreÅka prilikom izvrÅavanja IDLE-a"
 
-#: ../camel/camel-imapx-server.c:3325
-#: ../camel/providers/imap/camel-imap-store.c:413
-#: ../camel/providers/imap/camel-imap-store.c:467
+#: ../camel/camel-imapx-server.c:3875
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nisam uspeo da se poveÅem na IMAP server â%sâ u bezbednom reÅimu: %s"
 
-#: ../camel/camel-imapx-server.c:3326
-#: ../camel/providers/imap/camel-imap-store.c:414
+#: ../camel/camel-imapx-server.c:3876
 #: ../camel/providers/smtp/camel-smtp-transport.c:202
 msgid "STARTTLS not supported"
 msgstr "STARTTLS nije podrÅano"
 
-#: ../camel/camel-imapx-server.c:3365
-#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/camel-imapx-server.c:3915
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Nisam uspeo da se poveÅem na IMAP server â%sâ u bezbednom reÅimu: "
 
-#: ../camel/camel-imapx-server.c:3435
-#: ../camel/providers/imap/camel-imap-store.c:747
+#: ../camel/camel-imapx-server.c:3995
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP server â%sâ ne podrÅava â%sâ prijavljivanje identiteta"
 
-#: ../camel/camel-imapx-server.c:3446 ../camel/camel-session.c:494
-#: ../camel/providers/imap/camel-imap-store.c:1172
-#: ../camel/providers/pop3/camel-pop3-store.c:259
-#: ../camel/providers/pop3/camel-pop3-store.c:587
+#: ../camel/camel-imapx-server.c:4006 ../camel/camel-session.c:494
+#: ../camel/providers/pop3/camel-pop3-store.c:266
+#: ../camel/providers/pop3/camel-pop3-store.c:604
 #: ../camel/providers/smtp/camel-smtp-transport.c:467
 #, c-format
 msgid "No support for %s authentication"
 msgstr "Nema podrÅke za â%sâ potvrÄivanja identiteta"
 
-#: ../camel/camel-imapx-server.c:3465
-#: ../camel/providers/imap/camel-imap-store.c:1140
-#: ../camel/providers/nntp/camel-nntp-store.c:502
+#: ../camel/camel-imapx-server.c:4025
+#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/nntp/camel-nntp-store.c:512
 msgid "Cannot authenticate without a username"
 msgstr "Ne mogu da potvrdim identitet bez korisniÄkog imena"
 
-#: ../camel/camel-imapx-server.c:3474
-#: ../camel/providers/imap/camel-imap-store.c:1148
-#: ../camel/providers/nntp/camel-nntp-store.c:511
-#: ../camel/providers/pop3/camel-pop3-store.c:512
-#: ../camel/providers/pop3/camel-pop3-store.c:532
+#: ../camel/camel-imapx-server.c:4034
+#: ../camel/providers/nntp/camel-nntp-store.c:521
+#: ../camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/providers/pop3/camel-pop3-store.c:549
 msgid "Authentication password not available"
 msgstr "Lozinka potvrÄivanja identiteta nije dostupna"
 
-#: ../camel/camel-imapx-server.c:3667
+#: ../camel/camel-imapx-server.c:4241
 msgid "Error fetching message"
 msgstr "GreÅka prilikom preuzimanja poruke"
 
-#: ../camel/camel-imapx-server.c:3749
+#: ../camel/camel-imapx-server.c:4323
 msgid "Failed to copy the tmp file"
 msgstr "Nisam uspeo da umnoÅim privremenu datoteku"
 
-#: ../camel/camel-imapx-server.c:3763
+#: ../camel/camel-imapx-server.c:4337
 msgid "Failed to close the tmp stream"
 msgstr "Nisam uspeo da zatvorim privremenu datoteku"
 
-#: ../camel/camel-imapx-server.c:3861
+#: ../camel/camel-imapx-server.c:4458
 msgid "Error copying messages"
 msgstr "GreÅka umnoÅavanja poruka"
 
-#: ../camel/camel-imapx-server.c:3996
+#: ../camel/camel-imapx-server.c:4624
 msgid "Error appending message"
 msgstr "GreÅka prikaÄinjanja poruka"
 
-#: ../camel/camel-imapx-server.c:4186
+#: ../camel/camel-imapx-server.c:4823
 msgid "Error fetching message headers"
 msgstr "GreÅka preuzimanja zaglavlja poruke"
 
-#: ../camel/camel-imapx-server.c:4328
+#: ../camel/camel-imapx-server.c:4970
 msgid "Error retrieving message"
 msgstr "GreÅka dovlaÄenja poruke"
 
-#: ../camel/camel-imapx-server.c:4450 ../camel/camel-imapx-server.c:4657
+#: ../camel/camel-imapx-server.c:5094 ../camel/camel-imapx-server.c:5322
 #, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "Prikupljam pregled podataka novih poruka u â%sâ"
 
-#: ../camel/camel-imapx-server.c:4507
+#: ../camel/camel-imapx-server.c:5158
 #, c-format
 msgid "Scanning for changed messages in '%s'"
 msgstr "Pregledam izmenjene poruke u â%sâ"
 
-#: ../camel/camel-imapx-server.c:4550
+#: ../camel/camel-imapx-server.c:5211
 msgid "Error fetching new messages"
 msgstr "GreÅka prilikom preuzimanja novih poruka"
 
-#: ../camel/camel-imapx-server.c:4756
+#: ../camel/camel-imapx-server.c:5424
 msgid "Error while fetching messages"
 msgstr "GreÅka za vreme preuzimanja poruka"
 
-#: ../camel/camel-imapx-server.c:4764 ../camel/camel-imapx-server.c:4800
+#: ../camel/camel-imapx-server.c:5432 ../camel/camel-imapx-server.c:5465
 #, c-format
 msgid "Fetching summary information for %d message in '%s'"
 msgid_plural "Fetching summary information for %d messages in '%s'"
@@ -2335,93 +2377,98 @@ msgstr[1] "Prikupljam pregled podataka za %d poruke u â%sâ"
 msgstr[2] "Prikupljam pregled podataka za %d poruka u â%sâ"
 msgstr[3] "Prikupljam pregled podataka za %d poruku u â%sâ"
 
-#: ../camel/camel-imapx-server.c:4931 ../camel/camel-imapx-server.c:4967
+#: ../camel/camel-imapx-server.c:5601 ../camel/camel-imapx-server.c:5631
 msgid "Error refreshing folder"
 msgstr "GreÅka tokom pretrage"
 
-#: ../camel/camel-imapx-server.c:5060
+#: ../camel/camel-imapx-server.c:5735
 msgid "Error expunging message"
 msgstr "GreÅka prilikom izbacivanja poruke"
 
-#: ../camel/camel-imapx-server.c:5157
+#: ../camel/camel-imapx-server.c:5846
 msgid "Error fetching folders"
 msgstr "GreÅka prilikom preuzimanja fascikle"
 
-#: ../camel/camel-imapx-server.c:5236
+#: ../camel/camel-imapx-server.c:5928
 msgid "Error subscribing to folder"
 msgstr "GreÅka prilikom prijavljivanja na fasciklu"
 
-#: ../camel/camel-imapx-server.c:5293
+#: ../camel/camel-imapx-server.c:5993
 msgid "Error creating folder"
 msgstr "GreÅka prilikom stvaranja fascikle"
 
-#: ../camel/camel-imapx-server.c:5342
+#: ../camel/camel-imapx-server.c:6047
 msgid "Error deleting folder"
 msgstr "GreÅka prilikom brisanja fascikle"
 
-#: ../camel/camel-imapx-server.c:5396
+#: ../camel/camel-imapx-server.c:6121
 msgid "Error renaming folder"
 msgstr "GreÅka prilikom preimenovanja fascikle"
 
-#: ../camel/camel-imapx-server.c:5451
+#: ../camel/camel-imapx-server.c:6196
+#| msgid "Retrieving quota information for '%s'"
+msgid "Error retrieving quota information"
+msgstr "GreÅka dovlaÄenja obaveÅtenja o koliÄini"
+
+#: ../camel/camel-imapx-server.c:6261
+#| msgid "Decoder failed"
+msgid "Search failed"
+msgstr "Pretraga nije uspela"
+
+#: ../camel/camel-imapx-server.c:6324
 msgid "Error performing NOOP"
 msgstr "GreÅka prilikom obavljanja NOOP-a"
 
-#: ../camel/camel-imapx-server.c:5553
+#: ../camel/camel-imapx-server.c:6433
 msgid "Error syncing changes"
 msgstr "GreÅka prilikom usklaÄivanja izmena"
 
-#: ../camel/camel-imapx-server.c:6183
-#: ../camel/providers/imap/camel-imap-folder.c:3517
+#: ../camel/camel-imapx-server.c:7242
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Ne mogu da nabavim poruku sa IB â%sâ: %s"
 
-#: ../camel/camel-imapx-server.c:6184
-#: ../camel/providers/imap/camel-imap-folder.c:3518
+#: ../camel/camel-imapx-server.c:7243
 msgid "No such message available."
 msgstr "Nema takve poruke."
 
-#: ../camel/camel-imapx-server.c:6339 ../camel/camel-imapx-server.c:6354
+#: ../camel/camel-imapx-server.c:7401 ../camel/camel-imapx-server.c:7416
 msgid "Cannot create spool file: "
 msgstr "Ne mogu da napravim datoteku pripreme: "
 
-#: ../camel/camel-imapx-store.c:157
-#: ../camel/providers/imap/camel-imap-store.c:825
+#: ../camel/camel-imapx-server.c:8158
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "IMAP server does not support quotas"
+msgstr "IMAP server ne podrÅava koliÄine"
+
+#: ../camel/camel-imapx-store.c:201
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server â%sâ"
 
-#: ../camel/camel-imapx-store.c:160
-#: ../camel/providers/imap/camel-imap-store.c:828
+#: ../camel/camel-imapx-store.c:204
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP servis za â%sâ na â%s"
 
-#: ../camel/camel-imapx-store.c:251
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-imapx-store.c:295
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
 #: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../camel/camel-imapx-store.c:253
-#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/camel-imapx-store.c:297
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Ova opcija Äe povezati na IMAP server koriÅÄenjem lozinke u obiÄnom tekstu."
 
-#: ../camel/camel-imapx-store.c:344
-#: ../camel/providers/imap/camel-imap-store.c:2061
-#: ../camel/providers/imap/camel-imap-store.c:2257
+#: ../camel/camel-imapx-store.c:405
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takve fascikle â%sâ"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:369 ../camel/camel-imapx-store.c:851
-#: ../camel/providers/imap/camel-imap-store.c:274
-#: ../camel/providers/imap/camel-imap-store.c:2673
+#: ../camel/camel-imapx-store.c:430 ../camel/camel-imapx-store.c:920
 #: ../camel/providers/local/camel-maildir-folder.c:473
 #: ../camel/providers/local/camel-maildir-store.c:307
 #: ../camel/providers/local/camel-maildir-store.c:699
@@ -2431,44 +2478,33 @@ msgstr "Nema takve fascikle â%sâ"
 msgid "Inbox"
 msgstr "SanduÄe"
 
-#: ../camel/camel-imapx-store.c:1084
+#: ../camel/camel-imapx-store.c:1164
 #, c-format
 msgid "Retrieving folder list for %s"
 msgstr "DovlaÄim spisak fascikle za â%sâ"
 
-#: ../camel/camel-imapx-store.c:1188
-#: ../camel/providers/nntp/camel-nntp-store.c:1769
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nema takve fascikle: %s"
-
-#: ../camel/camel-imapx-store.c:1404
-#: ../camel/providers/imap/camel-imap-store.c:2074
-#: ../camel/providers/imap/camel-imap-store.c:2517
+#: ../camel/camel-imapx-store.c:1543
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Ime fascikle â%sâ nije ispravno jer sadrÅi znak â%câ"
 
-#: ../camel/camel-imapx-store.c:1415
-#: ../camel/providers/imap/camel-imap-store.c:2530
+#: ../camel/camel-imapx-store.c:1554
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna fascikla: %s"
 
-#: ../camel/camel-imapx-store.c:1425
-#: ../camel/providers/imap/camel-imap-store.c:2137
-#: ../camel/providers/imap/camel-imap-store.c:2581
+#: ../camel/camel-imapx-store.c:1564
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavna fascikla ne moÅe da sadrÅi druge fascikle"
 
-#: ../camel/camel-imapx-stream.c:72
+#: ../camel/camel-imapx-stream.c:98
 #, c-format
 msgid "Source stream returned no data"
 msgstr "Odgovor izvornog toka je bez podataka"
 
-#: ../camel/camel-imapx-stream.c:81
+#: ../camel/camel-imapx-stream.c:107
 #, c-format
 msgid "Source stream unavailable"
 msgstr "Tok izvora je nedostupan"
@@ -2564,7 +2600,7 @@ msgstr "GreÅka pri Äitanju datoteke poÅte: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "GreÅka pri pisanju privremene datoteke poÅte: %s"
 
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
+#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "GreÅka pri umnoÅavanju privremene datoteke: %s"
@@ -2595,26 +2631,41 @@ msgstr "Nije uspelo traÅenje domaÄina"
 
 #: ../camel/camel-net-utils.c:732
 #, c-format
-msgid "Host lookup failed: %s: %s"
-msgstr "Nije uspelo traÅenje domaÄina: %s: %s"
+msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgstr ""
+"Nije uspelo traÅenje domaÄina â%sâ. Proverite naziv vaÅeg domaÄina za "
+"greÅkama u pisanju."
+
+#: ../camel/camel-net-utils.c:736
+#, c-format
+#| msgid "Host lookup failed: %s: %s"
+msgid "Host lookup '%s' failed: %s"
+msgstr "Nije uspelo traÅenje domaÄina â%sâ: %s"
 
-#: ../camel/camel-net-utils.c:853
+#: ../camel/camel-net-utils.c:857
 msgid "Resolving address"
 msgstr "Nalazim adresu"
 
-#: ../camel/camel-net-utils.c:874
+#: ../camel/camel-net-utils.c:878
 msgid "Name lookup failed"
-msgstr "Nije uspelo traÅenje imena"
+msgstr "Nije uspelo traÅenje naziva"
 
-#: ../camel/camel-net-utils.c:880
+#: ../camel/camel-net-utils.c:885
+msgid "Name lookup failed. Check your host name for spelling errors."
+msgstr ""
+"Nije uspelo traÅenje naziva. Proverite naziv vaÅeg domaÄina za greÅkama u "
+"pisanju."
+
+#: ../camel/camel-net-utils.c:889
 #, c-format
 msgid "Name lookup failed: %s"
-msgstr "Nije uspelo traÅenje imena: %s"
+msgstr "Nije uspelo traÅenje naziva: %s"
 
-#: ../camel/camel-network-service.c:114
+#: ../camel/camel-network-service.c:115
 #, c-format
-msgid "Could not connect to %s: "
-msgstr "Ne mogu da se poveÅem na â%sâ: "
+#| msgid "Could not connect to %s: "
+msgid "Could not connect to '%s:%s': "
+msgstr "Ne mogu da se poveÅem na â%s:%sâ: "
 
 #: ../camel/camel-offline-folder.c:210
 #, c-format
@@ -2634,27 +2685,28 @@ msgstr "DostavljaÄ virtuelne fascikle e-poÅte"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za Äitanje poÅte kao upita drugog skupa fascikli"
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:258
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Ne mogu da uÄitam â%sâ: ovaj sistem ne podrÅava uÄitavanje modula."
 
-#: ../camel/camel-provider.c:202
+#: ../camel/camel-provider.c:267
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ne mogu da uÄitam â%sâ: %s"
 
-#: ../camel/camel-provider.c:211
+#: ../camel/camel-provider.c:276
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne mogu da uÄitam â%sâ: nema koda za pokretanje u modulu."
 
-#: ../camel/camel-provider.c:410 ../camel/camel-session.c:406
+#: ../camel/camel-provider.c:424 ../camel/camel-session.c:406
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Nema dostupnog dostavljaÄa za protokol â%sâ"
 
 #: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "Anonimno"
 
@@ -2718,32 +2770,32 @@ msgstr ""
 "Ova opcija Äe povezati na server koriÅÄenjem sigurnosne DIGEST-MD5 lozinke, "
 "ako je server podrÅava."
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:855
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Upit servera je suviÅe dug (>2048 okteta)"
 
-#: ../camel/camel-sasl-digest-md5.c:864
+#: ../camel/camel-sasl-digest-md5.c:866
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Upit servera je neispravan\n"
 
-#: ../camel/camel-sasl-digest-md5.c:872
+#: ../camel/camel-sasl-digest-md5.c:874
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Upit servera je sadrÅao neispravan unos âKvalitet zaÅtiteâ"
 
-#: ../camel/camel-sasl-digest-md5.c:905
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Odgovor servera nije sadrÅao podatke o ovlaÅÄenju"
 
-#: ../camel/camel-sasl-digest-md5.c:926
+#: ../camel/camel-sasl-digest-md5.c:928
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Odgovor servera je sadrÅao nekompletne podatke o ovlaÅÄenju"
 
-#: ../camel/camel-sasl-digest-md5.c:939
+#: ../camel/camel-sasl-digest-md5.c:941
 #, c-format
 msgid "Server response does not match"
 msgstr "Odgovor servera se ne slaÅe"
@@ -2819,13 +2871,13 @@ msgid "The referenced credentials have expired."
 msgstr "VaÅenje traÅenih uverenja je isteklo."
 
 #: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
-#: ../camel/camel-sasl-gssapi.c:384 ../camel/camel-sasl-gssapi.c:401
-#: ../camel/providers/smtp/camel-smtp-transport.c:575
+#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
+#: ../camel/providers/smtp/camel-smtp-transport.c:574
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "LoÅ odgovor potvrÄivanja identiteta sa servera."
 
-#: ../camel/camel-sasl-gssapi.c:413
+#: ../camel/camel-sasl-gssapi.c:417
 #, c-format
 msgid "Unsupported security layer."
 msgstr "NepodrÅan sigurnosni sloj."
@@ -2869,7 +2921,7 @@ msgstr "Ova opcija Äe odobriti POP vezu pre pokuÅaja SMTP"
 
 #: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
-msgstr "POP izvorni JIB"
+msgstr "POP izvorni KIB"
 
 #: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
@@ -2881,7 +2933,7 @@ msgstr "POP pre SMTP provere koriÅÄenjem nepoznatog transporta"
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP pre SMTP potvrÄivanje identiteta je pokuÅano sa â%sâ uslugom"
 
-#: ../camel/camel-search-private.c:112
+#: ../camel/camel-search-private.c:116
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nije uspelo prevoÄenje regularnog izraza: %s: %s"
@@ -2900,12 +2952,12 @@ msgstr "Nije uspelo %s potvrÄivanje identiteta"
 msgid "Forwarding messages is not supported"
 msgstr "ProsleÄivanje poruka nije podrÅano"
 
-#: ../camel/camel-session.c:1362
+#: ../camel/camel-session.c:1404
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Unesite â%sâ lozinku za â%sâ na domaÄinu â%sâ."
 
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Ne mogu da naÄem uverenje za â%sâ"
@@ -3037,111 +3089,111 @@ msgstr "Uverenje je jedina poruka, uverenja su uveÅena i proverena"
 msgid "Cannot find signature digests"
 msgstr "Ne mogu da naÄem zbirke potpisa"
 
-#: ../camel/camel-smime-context.c:661
+#: ../camel/camel-smime-context.c:662
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisnik: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
 msgid "Cannot create encoder context"
 msgstr "Ne mogu da napravim kontekst Åifrovanja"
 
-#: ../camel/camel-smime-context.c:848
+#: ../camel/camel-smime-context.c:850
 msgid "Failed to add data to CMS encoder"
 msgstr "Nisam uspeo da dodam podatak u CMS Åifrer"
 
-#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
 msgid "Failed to encode data"
 msgstr "Nisam uspeo da Åifrujem podatke"
 
-#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
+#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
 msgid "Decoder failed"
 msgstr "Nisam uspeo da deÅifrujem"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Ne mogu da naÄem opÅti algoritam za Åifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1073
+#: ../camel/camel-smime-context.c:1076
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Ne mogu da dodelim mesto kljuÄu za Åifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1084
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot create CMS Message"
 msgstr "Ne mogu da napravim CMS poruku"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot create CMS Enveloped data"
 msgstr "Ne mogu da napravim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1096
+#: ../camel/camel-smime-context.c:1099
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Ne mogu da priloÅim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1105
 msgid "Cannot attach CMS data object"
 msgstr "Ne mogu da priloÅim objekat CMS podataka"
 
-#: ../camel/camel-smime-context.c:1111
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot create CMS Recipient information"
 msgstr "Ne mogu da napravim podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1116
+#: ../camel/camel-smime-context.c:1119
 msgid "Cannot add CMS Recipient information"
 msgstr "Ne mogu da dodam podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1141
+#: ../camel/camel-smime-context.c:1145
 msgid "Failed to add data to encoder"
 msgstr "Nisam uspeo da dodam podatke u Åifrer"
 
-#: ../camel/camel-smime-context.c:1250
+#: ../camel/camel-smime-context.c:1255
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME deÅifrovanje: nisu naÄeni Åifrovani podaci"
 
-#: ../camel/camel-store.c:1838
+#: ../camel/camel-store.c:1827
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Ne mogu da napravim fasciklu â%sâ: fascikla postoji"
 
-#: ../camel/camel-store.c:1881
+#: ../camel/camel-store.c:1870
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Otvaram fasciklu â%sâ"
 
-#: ../camel/camel-store.c:2066
+#: ../camel/camel-store.c:2055
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "PretraÅujem fascikle u â%sâ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
+#: ../camel/camel-store.c:2067 ../camel/camel-store.c:2077
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "SmeÄe"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
+#: ../camel/camel-store.c:2070 ../camel/camel-store.c:2081
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Äubre"
 
-#: ../camel/camel-store.c:2540
+#: ../camel/camel-store.c:2529
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ne mogu da napravim fasciklu: %s: fascikla postoji"
 
-#: ../camel/camel-store.c:2554
+#: ../camel/camel-store.c:2543
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Stvaram fasciklu â%sâ"
 
-#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2661 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:306
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obriÅem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/camel-store.c:2804 ../camel/camel-vee-store.c:460
 #: ../camel/providers/local/camel-maildir-store.c:788
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3155,12 +3207,12 @@ msgstr "Samo vraÄanje na poÄetak je podrÅano Kamelovim filterom toka"
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Samo vraÄanje na poÄetak je podrÅano Kamelovim Http tokom"
 
-#: ../camel/camel-stream-process.c:267
+#: ../camel/camel-stream-process.c:275
 #, c-format
 msgid "Connection cancelled"
 msgstr "Povezivanje je otkazano"
 
-#: ../camel/camel-stream-process.c:272
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ne mogu da se poveÅem sa naredbom â%sâ: %s"
@@ -3180,168 +3232,85 @@ msgstr "Odjavljujem se sa fascikle â%sâ"
 msgid "NSPR error code %d"
 msgstr "Kod %d NSPR greÅke"
 
-#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658
+#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "DomaÄin posrednik ne podrÅava SOCKS4"
 
-#: ../camel/camel-tcp-stream-raw.c:669
+#: ../camel/camel-tcp-stream-raw.c:675
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "DomaÄin posrednik je odbio naÅ zahtev: kÃd â%dâ"
 
-#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
+#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "DomaÄin posrednik ne podrÅava SOCKS5"
 
-#: ../camel/camel-tcp-stream-raw.c:777
+#: ../camel/camel-tcp-stream-raw.c:789
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "Ne mogu da pronaÄem odgovarajuÄi tip potvrÄivanja identiteta: kod 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:801
 msgid "General SOCKS server failure"
 msgstr "Neuspeh opÅteg SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:802
 msgid "SOCKS server's rules do not allow connection"
 msgstr "Pravila SOCKS servera ne dozvoljavaju vezu"
 
-#: ../camel/camel-tcp-stream-raw.c:791
+#: ../camel/camel-tcp-stream-raw.c:803
 msgid "Network is unreachable from SOCKS server"
 msgstr "MreÅa je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:792
+#: ../camel/camel-tcp-stream-raw.c:804
 msgid "Host is unreachable from SOCKS server"
 msgstr "DomaÄin je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:793
+#: ../camel/camel-tcp-stream-raw.c:805
 msgid "Connection refused"
 msgstr "Veza je odbijena"
 
-#: ../camel/camel-tcp-stream-raw.c:794
+#: ../camel/camel-tcp-stream-raw.c:806
 msgid "Time-to-live expired"
 msgstr "Vreme Åivota je isteklo"
 
-#: ../camel/camel-tcp-stream-raw.c:795
+#: ../camel/camel-tcp-stream-raw.c:807
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS server ne podrÅava naredbu"
 
-#: ../camel/camel-tcp-stream-raw.c:796
+#: ../camel/camel-tcp-stream-raw.c:808
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS server ne podrÅava vrstu adrese"
 
-#: ../camel/camel-tcp-stream-raw.c:797
+#: ../camel/camel-tcp-stream-raw.c:809
 msgid "Unknown error from SOCKS server"
 msgstr "Nepoznata greÅka sa SOKCS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:830
+#: ../camel/camel-tcp-stream-raw.c:842
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "Dobih nepoznatu vrstu adrese sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:848
+#: ../camel/camel-tcp-stream-raw.c:860
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "Nepotpun odgovor sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:868
+#: ../camel/camel-tcp-stream-raw.c:880
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "Ime domaÄina je predugo (najviÅe 255 znakova)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
+#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "Neispravan odgovor servera posrednika"
 
-#: ../camel/camel-tcp-stream-ssl.c:502
-#, c-format
-msgid ""
-"   Issuer:       %s\n"
-"   Subject:      %s\n"
-"   Fingerprint:  %s\n"
-"   Signature:    %s"
-msgstr ""
-"   IzdavaÄ:      %s\n"
-"   Naslov:       %s\n"
-"   Otisak:       %s\n"
-"   Potpis:       %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:508
-msgid "GOOD"
-msgstr "DOBRO"
-
-#: ../camel/camel-tcp-stream-ssl.c:508
-msgid "BAD"
-msgstr "LOÅE"
-
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:512
-#, c-format
-msgid ""
-"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-"\n"
-"Detailed information about the certificate:\n"
-"%s"
-msgstr ""
-"SSL uverenje za â%sâ nije od poverenja. Da li Åelite da ga prihvatite?\n"
-"\n"
-"OpÅirnije obaveÅtenje o uverenju:\n"
-"%s"
-
-#: ../camel/camel-tcp-stream-ssl.c:516
-msgid "_Reject"
-msgstr "_Odbaci"
-
-#: ../camel/camel-tcp-stream-ssl.c:517
-msgid "Accept _Temporarily"
-msgstr "Prihvati _privremeno"
-
-#: ../camel/camel-tcp-stream-ssl.c:518
-msgid "_Accept Permanently"
-msgstr "Prihvati _trajno"
-
-#: ../camel/camel-tcp-stream-ssl.c:579
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"Problem sa uverenjem: %s\n"
-"IzdavaÄ: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:631
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"LoÅ domen uverenja: %s\n"
-"IzdavaÄ: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:649
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Isteklo uverenje: %s\n"
-"IzdavaÄ: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:666
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Istekao je spisak povuÄenih uverenja: %s\n"
-"IzdavaÄ: %s"
-
-#: ../camel/camel-url.c:330
+#: ../camel/camel-url.c:331
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Ne mogu da analiziram adresu â%sâ"
@@ -3398,173 +3367,43 @@ msgstr "Ne mogu da umnoÅim poruke u fasciklu za smeÄe"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Ne mogu da umnoÅim poruke u fasciklu za Äubre"
 
-#: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:299
-#, c-format
-msgid "No output stream"
-msgstr "Bez izlaznog toka"
-
-#: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:307
-#, c-format
-msgid "No input stream"
-msgstr "Bez ulaznog toka"
-
-#: ../camel/providers/imap/camel-imap-command.c:392
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Veza sa serverom je neoÄekivano iskljuÄena: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:425
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s in folder %s:\n"
-"%s"
-msgstr ""
-"Upozorenje sa IMAP servera %s %s u fascikli %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:429
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-"Upozorenje od IMAP servera %s %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:511
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "NeoÄekivan odgovor IMAP servera: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:523
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "Neuspela IMAP naredba: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:606
-#, c-format
-msgid "Server response ended too soon."
-msgstr "Odgovor servera je prerano zavrÅen."
-
-#: ../camel/providers/imap/camel-imap-command.c:821
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "Odgovor IMAP servera nije sadrÅao â%sâ podatak"
-
-#: ../camel/providers/imap/camel-imap-command.c:859
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "NeoÄekivan potvrdan odgovor IMAP servera: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:354
-msgid "Always check for _new mail in this folder"
-msgstr "Uvek proveri _nove poruke u ovoj fascikli"
-
-#: ../camel/providers/imap/camel-imap-folder.c:445
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Ne mogu da napravim direktorijum â%sâ: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:466
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Ne mogu da uÄitam pregled za â%sâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1135
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "Pregledam izmenjene poruke u â%sâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3480
-msgid "Unable to retrieve message: "
-msgstr "Ne mogu da dovuÄem poruku: "
-
-#: ../camel/providers/imap/camel-imap-folder.c:3594
-#: ../camel/providers/imap/camel-imap-folder.c:4485
-#: ../camel/providers/nntp/camel-nntp-folder.c:493
-#, c-format
-msgid "This message is not currently available"
-msgstr "Ova poruka nije trenutno dostupna"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4059
-#: ../camel/providers/imap/camel-imap-folder.c:4140
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "Prikupljam pregled podataka novih poruka u â%sâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4272
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "Nepotpun odgovor servera: nisu dati podaci za poruku â%dâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4282
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Nepotpun odgovor servera: JIB nije dat za poruku â%dâ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4522
-#, c-format
-msgid "Could not find message body in FETCH response."
-msgstr "Ne mogu da pronaÄem telo poruke u DOVUCI odgovoru."
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:196
-#: ../camel/providers/imap/camel-imap-message-cache.c:253
-msgid "Could not open cache directory: "
-msgstr "Ne mogu da otvorim direktorijum ostave: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:331
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "Nisam uspeo privremeno da saÄuvam poruku â%sâ: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:397
-#, c-format
-msgid "Failed to cache message %s: "
-msgstr "Nisam uspeo privremeno da saÄuvam poruku â%sâ: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:539
-#, c-format
-msgid "Failed to cache %s: "
-msgstr "Nisam uspeo privremeno da saÄuvam â%sâ: "
-
-#: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "VrÅim proveru za novom poÅtom"
 
-#: ../camel/providers/imap/camel-imap-provider.c:42
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "P_otraÅi nove poruke u svim fasciklama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Pro_veri za nove poruke u prijavljenim fasciklama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Koristi _Brzo ponovno usaglaÅavanje ako ga server podrÅava"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr "_OsluÅkuj za obaveÅtenjima o izmenama servera"
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "Fascikle"
 
-#: ../camel/providers/imap/camel-imap-provider.c:49
 #: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "Prik_aÅi samo prijavljene fascikle"
 
-#: ../camel/providers/imap/camel-imap-provider.c:51
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "P_remosti oblik imena fascikle koje daje server"
 
-#: ../camel/providers/imap/camel-imap-provider.c:53
-msgid "Names_pace:"
-msgstr "Oblik _imena:"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "Oblik imena:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:55
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
 #: ../camel/providers/local/camel-local-provider.c:41
 #: ../camel/providers/local/camel-local-provider.c:77
@@ -3573,92 +3412,43 @@ msgstr "Oblik _imena:"
 msgid "Options"
 msgstr "Opcije"
 
-#: ../camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Apply _filters to new messages in all folders"
 msgstr "Primeni filtere na nove poruke u svim _fasciklama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:59
 #: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Primeni propusnike na nove poruke u sanduÄetu ovog servera"
 
-#: ../camel/providers/imap/camel-imap-provider.c:61
 #: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "Proveri da nema _Äubreta meÄu novim porukama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:63
 #: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Proveri da nema Äubreta samo u fascikli SAN_DUÄE"
 
-#: ../camel/providers/imap/camel-imap-provider.c:65
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Sam uskladi ud_aljenu poÅtu sa lokalnom"
 
-#: ../camel/providers/imap/camel-imap-provider.c:71
-msgid "IMAP default port"
-msgstr "Osnovni IMAP port"
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
+msgstr "Osnovni port IMAP-a"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "IMAP preko SSL-a"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
-msgid "IMAP"
-msgstr "IMAP"
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
 #: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za Äitanje i smeÅtanje poÅte na IMAP servere."
 
-#: ../camel/providers/imap/camel-imap-store.c:2186
-#: ../camel/providers/local/camel-maildir-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:564
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Ne mogu da napravim fasciklu â%sâ: fascikla postoji."
-
-#: ../camel/providers/imap/camel-imap-store.c:2961
-#, c-format
-msgid "Retrieving list of folders at '%s'"
-msgstr "DovlaÄim spisak fascikli na â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:3309
-#, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "Veza sa serverom je neoÄekivano iskljuÄena"
-
-#: ../camel/providers/imap/camel-imap-store.c:3312
-msgid "Server unexpectedly disconnected: "
-msgstr "Veza sa serverom je neoÄekivano iskljuÄena: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use _Quick Resync if the server supports it"
-msgstr "Koristi _Brzo ponovno usaglaÅavanje ako ga server podrÅava"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "_Listen for server change notifications"
-msgstr "_OsluÅkuj za obaveÅtenjima o izmenama servera"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Namespace:"
-msgstr "Oblik imena:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
-msgid "Default IMAP port"
-msgstr "Osnovni port IMAP-a"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:83
-msgid "IMAP+"
-msgstr "IMAP+"
-
 #: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
@@ -3801,7 +3591,7 @@ msgstr "Ne mogu da obriÅem meta datoteku fascikle â%sâ: %s"
 msgid "Could not rename '%s': %s"
 msgstr "Ne mogu da preimenujem â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:527
+#: ../camel/providers/local/camel-local-summary.c:543
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne mogu da dodam poruku pregledu: nepoznat razlog"
@@ -3872,6 +3662,13 @@ msgstr "Ne mogu da preuzmem fasciklu â%sâ: fascikla ne postoji."
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Ne mogu da preuzmem fasciklu â%sâ: nije direktorijum poÅte."
 
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:564
+#, c-format
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Ne mogu da napravim fasciklu â%sâ: fascikla postoji."
+
 #: ../camel/providers/local/camel-maildir-store.c:338
 #: ../camel/providers/local/camel-maildir-store.c:378
 #: ../camel/providers/local/camel-mh-store.c:682
@@ -3914,7 +3711,7 @@ msgstr "VrÅim proveru za novim porukama"
 #: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
 #: ../camel/providers/local/camel-mbox-summary.c:650
-#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-mbox-summary.c:798
 #: ../camel/providers/local/camel-spool-summary.c:132
 msgid "Storing folder"
 msgstr "SmeÅtam fasciklu"
@@ -4023,7 +3820,7 @@ msgid "Cannot check folder: %s: %s"
 msgstr "Ne mogu da proverim fasciklu: %s: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:663
-#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-mbox-summary.c:807
 #: ../camel/providers/local/camel-spool-summary.c:139
 #, c-format
 msgid "Could not open file: %s: %s"
@@ -4036,29 +3833,29 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne mogu da otvorim privremeno poÅtansko sanduÄe: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:694
-#: ../camel/providers/local/camel-mbox-summary.c:919
+#: ../camel/providers/local/camel-mbox-summary.c:924
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ne mogu da zatvorim izvornu fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:707
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Ne mogu da zatvorim privremenu fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ne mogu da preimenujem fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:817
-#: ../camel/providers/local/camel-mbox-summary.c:1085
+#: ../camel/providers/local/camel-mbox-summary.c:821
+#: ../camel/providers/local/camel-mbox-summary.c:1090
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ne mogu da saÄuvam fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:856
-#: ../camel/providers/local/camel-mbox-summary.c:1116
+#: ../camel/providers/local/camel-mbox-summary.c:860
+#: ../camel/providers/local/camel-mbox-summary.c:1127
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -4067,25 +3864,25 @@ msgstr ""
 "MBOKS datoteka je oÅteÄena, popravite je. (OÄekivano je âIz redaâ, ali nisam "
 "dobio.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:865
-#: ../camel/providers/local/camel-mbox-summary.c:1125
+#: ../camel/providers/local/camel-mbox-summary.c:870
+#: ../camel/providers/local/camel-mbox-summary.c:1140
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Neslaganje pregleda i fascikle, Äak i nakon usklaÄivanja"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-mbox-summary.c:1035
 #: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nepoznata greÅka: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1183
-#: ../camel/providers/local/camel-mbox-summary.c:1213
+#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1228
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Nisam uspeo da zapiÅem u privremeno poÅtansko sanduÄe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1202
+#: ../camel/providers/local/camel-mbox-summary.c:1217
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Nisam uspeo da zapiÅem u privremeno poÅtansko sanduÄe: %s: %s"
@@ -4210,25 +4007,30 @@ msgstr ""
 #: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
-msgstr "UnutraÅnja greÅka: JIB u neispravnom obliku: %s"
+msgstr "UnutraÅnja greÅka: KIB u neispravnom obliku: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:328
 #: ../camel/providers/nntp/camel-nntp-folder.c:332
-#: ../camel/providers/pop3/camel-pop3-folder.c:610
-#: ../camel/providers/pop3/camel-pop3-folder.c:1005
+#: ../camel/providers/pop3/camel-pop3-folder.c:633
+#: ../camel/providers/pop3/camel-pop3-folder.c:1065
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu da dobavim poruku â%sâ: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:339
 #: ../camel/providers/nntp/camel-nntp-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-folder.c:548
-#: ../camel/providers/pop3/camel-pop3-folder.c:600
-#: ../camel/providers/pop3/camel-pop3-folder.c:619
+#: ../camel/providers/pop3/camel-pop3-folder.c:558
+#: ../camel/providers/pop3/camel-pop3-folder.c:623
+#: ../camel/providers/pop3/camel-pop3-folder.c:642
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Ne mogu da dobavim poruku â%sâ: "
 
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
+#, c-format
+msgid "This message is not currently available"
+msgstr "Ova poruka nije trenutno dostupna"
+
 #: ../camel/providers/nntp/camel-nntp-folder.c:559
 #: ../camel/providers/nntp/camel-nntp-folder.c:565
 #: ../camel/providers/nntp/camel-nntp-folder.c:611
@@ -4277,28 +4079,37 @@ msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "Ovo je dostavljaÄ za Äitanje i slanje na JUZNET grupe vesti."
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:87
+#| msgid ""
+#| "This option will connect to the server using Kerberos 5 authentication."
+msgid ""
+"This option will connect to the NNTP server anonymously, without "
+"authentication."
+msgstr ""
+"Ova opcija Äe bezimeno povezati na NNTP server, bez potvrÄivanja identiteta."
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:97
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Ova opcija Äe prijaviti na NNTP server koriÅÄenjem lozinke u obiÄnom tekstu."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:286
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Ne mogu da proÄitam pozdrav sa â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:298
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server â%sâ je vratio kod greÅke â%dâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:463
+#: ../camel/providers/nntp/camel-nntp-store.c:472
 #, c-format
 msgid "USENET News via %s"
 msgstr "JUZNET vesti preko â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1058
+#: ../camel/providers/nntp/camel-nntp-store.c:1073
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4309,24 +4120,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1150
+#: ../camel/providers/nntp/camel-nntp-store.c:1167
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Ne moÅete da napravite fasciklu u ostavi vesti: prijavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1166
+#: ../camel/providers/nntp/camel-nntp-store.c:1183
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Ne moÅete da preimenujete fasciklu u ostavi vesti."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1189
+#: ../camel/providers/nntp/camel-nntp-store.c:1206
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Ne moÅete da uklonite fasciklu u ostavi vesti: odjavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1388
+#: ../camel/providers/nntp/camel-nntp-store.c:1405
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4337,7 +4148,7 @@ msgstr ""
 "\n"
 "Nema takve grupe. Izabrana stavka je verovatno nadreÄena fascikla."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1436
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4348,15 +4159,20 @@ msgstr ""
 "\n"
 "grupa ne postoji!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1626
+#: ../camel/providers/nntp/camel-nntp-store.c:1643
 msgid "NNTP Command failed: "
 msgstr "NNTP naredba nije uspela: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1711
+#: ../camel/providers/nntp/camel-nntp-store.c:1728
 #, c-format
 msgid "Not connected."
 msgstr "Nisam povezan."
 
+#: ../camel/providers/nntp/camel-nntp-store.c:1786
+#, c-format
+msgid "No such folder: %s"
+msgstr "Nema takve fascikle: %s"
+
 #: ../camel/providers/nntp/camel-nntp-summary.c:198
 #: ../camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
@@ -4378,34 +4194,38 @@ msgstr "NeoÄekivan odgovor head-a: %s"
 msgid "Operation failed: %s"
 msgstr "Neuspela operacija: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:443
-#: ../camel/providers/pop3/camel-pop3-folder.c:516
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:526
 #, c-format
 msgid "No message with UID %s"
-msgstr "Nema poruke sa JIB %s"
+msgstr "Nema poruke sa KIB-om %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:532
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "DovlaÄim POP poruku %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:611
+#: ../camel/providers/pop3/camel-pop3-folder.c:634
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:659
+#: ../camel/providers/pop3/camel-pop3-folder.c:682
 msgid "Retrieving POP summary"
 msgstr "Preuzimam POP pregled"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:710
+#: ../camel/providers/pop3/camel-pop3-folder.c:741
+#: ../camel/providers/pop3/camel-pop3-folder.c:744
+#: ../camel/providers/pop3/camel-pop3-folder.c:757
+#: ../camel/providers/pop3/camel-pop3-folder.c:770
+#: ../camel/providers/pop3/camel-pop3-folder.c:784
 msgid "Cannot get POP summary: "
 msgstr "Ne mogu da dobavim POP pregled: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:829
+#: ../camel/providers/pop3/camel-pop3-folder.c:891
 msgid "Expunging old messages"
 msgstr "Izbacujem stare poruke"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:849
+#: ../camel/providers/pop3/camel-pop3-folder.c:911
 msgid "Expunging deleted messages"
 msgstr "Izbacujem obrisane poruke"
 
@@ -4471,53 +4291,53 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:139
+#: ../camel/providers/pop3/camel-pop3-store.c:144
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Neuspelo Äitanje ispravnog pozdrava POP servera â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:154
+#: ../camel/providers/pop3/camel-pop3-store.c:159
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nisam uspeo da se poveÅem na POP server â%sâ u bezbednom reÅimu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:155
+#: ../camel/providers/pop3/camel-pop3-store.c:160
 msgid "STLS not supported by server"
 msgstr "Server ne podrÅava STLS"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:176
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Nisam uspeo da se poveÅem na POP server â%sâ u bezbednom reÅimu%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:194
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Nisam uspeo da se poveÅem na POP server â%sâ u bezbednom reÅimu: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:298
+#: ../camel/providers/pop3/camel-pop3-store.c:305
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ne mogu da se prijavim na POP server â%sâ: greÅka SASL protokola"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:320
+#: ../camel/providers/pop3/camel-pop3-store.c:327
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Nisam uspeo da potvrdim identitet na POP serveru â%sâ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:371
+#: ../camel/providers/pop3/camel-pop3-store.c:387
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 server â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
+#: ../camel/providers/pop3/camel-pop3-store.c:390
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3 server za â%sâ na â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/providers/pop3/camel-pop3-store.c:563
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4526,7 +4346,7 @@ msgstr ""
 "Ne mogu da se poveÅem na POP server â%sâ: Primih neispravan APOP IB. MoguÄ "
 "je napad zamenom identiteta. Obratite se adminu."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:598
+#: ../camel/providers/pop3/camel-pop3-store.c:615
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4537,7 +4357,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:613
+#: ../camel/providers/pop3/camel-pop3-store.c:630
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4546,11 +4366,6 @@ msgstr ""
 "Ne mogu da se poveÅem na POP server â%sâ.\n"
 "GreÅka pri slanju korisniÄkog imena%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:673
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Ne mogu da se poveÅem na POP server â%sâ"
-
 #: ../camel/providers/pop3/camel-pop3-store.c:701
 #, c-format
 msgid "No such folder '%s'."
@@ -4562,8 +4377,9 @@ msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ostava nema hijerarhiju fascikli"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
-msgstr "Sendmail"
+msgstr "Sendmejl"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
@@ -4572,47 +4388,58 @@ msgid ""
 msgstr ""
 "Za dostavu poÅte prosleÄivanjem âsendmailâ programu na lokalnom sistemu."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
 msgid "sendmail"
-msgstr "sendmail"
+msgstr "sendmejl"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava poÅte preko programa sendmejl"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:93
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Ne mogu da analiziram spisak primalaca"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:126
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
 #, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Ne mogu da napravim vezu ka sendmejlu: %s: poÅta nije poslata"
+#| msgid "Could not parse recipient list"
+msgid "Could not parse arguments"
+msgstr "Ne mogu da obradim argumente"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:148
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:213
 #, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Ne mogu da podelim sendmejl: %s: poÅta nije poslata"
+#| msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgid "Could not create pipe to '%s': %s: mail not sent"
+msgstr "Ne mogu da napravim spojku ka â%sâ: %s: poÅta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:238
+#, c-format
+#| msgid "Could not fork sendmail: %s: mail not sent"
+msgid "Could not fork '%s': %s: mail not sent"
+msgstr "Ne mogu da podelim â%sâ: %s: poÅta nije poslata"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:287
 msgid "Could not send message: "
 msgstr "Ne mogu da poÅaljem poruku: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:317
 #, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmejl je zavrÅio signalom ââ%s: poÅta nije poslata."
+#| msgid "sendmail exited with signal %s: mail not sent."
+msgid "'%s' exited with signal %s: mail not sent."
+msgstr "â%sâ je zavrÅio signalom â%sâ: poÅta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:327
 #, c-format
-msgid "Could not execute %s: mail not sent."
+#| msgid "Could not execute %s: mail not sent."
+msgid "Could not execute '%s': mail not sent."
 msgstr "Ne mogu da izvrÅim â%sâ: poÅta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:332
 #, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmejl je zavrÅio sa statusom â%dâ: poÅta nije poslata."
+#| msgid "sendmail exited with status %d: mail not sent."
+msgid "'%s' exited with status %d: mail not sent."
+msgstr "â%sâ je zavrÅio stanjem â%dâ: poÅta nije poslata."
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Default SMTP port"
@@ -4682,177 +4509,177 @@ msgstr "Nije naveden SASL mehanizam"
 msgid "AUTH command failed: "
 msgstr "Neuspela naredba âAUTHâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Ne mogu da poÅaljem poruku: servis nije povezan."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:661
+#: ../camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne mogu da poÅaljem poruku: adresa poÅiljaoca nije ispravna."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:665
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:690
+#: ../camel/providers/smtp/camel-smtp-transport.c:689
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne mogu da poÅaljem poruku: nisu odreÄeni primaoci."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne mogu da poÅaljem poruku: jedan ili viÅe neispravnih primalaca"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:807
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Syntax error, command unrecognized"
 msgstr "GreÅka u sintaksi, naredba nije prepoznata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:809
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Syntax error in parameters or arguments"
 msgstr "GreÅka u sintaksi u parametrima ili argumentima"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:811
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Command not implemented"
 msgstr "Naredba nije podrÅana"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:813
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Command parameter not implemented"
 msgstr "Parametar naredbe nije podrÅan"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:815
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "System status, or system help reply"
 msgstr "Status sistema, ili odgovor na pomoÄ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:817
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "Help message"
 msgstr "Poruka o pomoÄi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:819
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Service ready"
 msgstr "Servis je spreman"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:821
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Service closing transmission channel"
 msgstr "Servis zatvara kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:823
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Service not available, closing transmission channel"
 msgstr "Servis nije dostupan, zatvaram kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:825
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "Requested mail action okay, completed"
 msgstr "TraÅena radnja za poÅtu je u redu, zavrÅeno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:827
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "User not local; will forward to <forward-path>"
 msgstr "Korisnik nije lokalan; biÄe prosleÄeno na <putanja-prosleÄivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:829
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "TraÅena radnja za poÅtu nije preduzeta: nedostupno poÅtansko sanduÄe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:831
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "TraÅena radnja nije preduzeta: poÅtansko sanduÄe je nedostupno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:833
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Requested action aborted: error in processing"
 msgstr "TraÅena radnja nije preduzeta: greÅka pri obradi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:835
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "User not local; please try <forward-path>"
 msgstr "Korisnik nije lokalan; pokuÅajte <putanja-prosleÄivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:837
+#: ../camel/providers/smtp/camel-smtp-transport.c:836
 msgid "Requested action not taken: insufficient system storage"
 msgstr "TraÅena radnja nije preduzeta: nedovoljno prostora na sistemu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:839
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Prekinuta je traÅena radnja za poÅtu: premaÅen je dodeljen prostor"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:841
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "TraÅena radnja nije preduzeta: ime poÅtanskog sanduÄeta nije dozvoljeno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:843
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "PoÄinje unos poÅte; zavrÅava sa <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Transaction failed"
 msgstr "Neuspeo prenos"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 msgid "A password transition is needed"
 msgstr "Potrebno je slanje lozinke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:851
+#: ../camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizam potvrÄivanja identiteta je preslab"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:853
+#: ../camel/providers/smtp/camel-smtp-transport.c:852
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Neophodno je Åifrovanje za traÅeni mehanizam potvrÄivanja identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:855
+#: ../camel/providers/smtp/camel-smtp-transport.c:854
 msgid "Temporary authentication failure"
 msgstr "Nije uspelo privremeno potvrÄivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../camel/providers/smtp/camel-smtp-transport.c:1111
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#: ../camel/providers/smtp/camel-smtp-transport.c:1165
+#: ../camel/providers/smtp/camel-smtp-transport.c:1138
+#: ../camel/providers/smtp/camel-smtp-transport.c:1156
+#: ../camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "HELO command failed: "
 msgstr "Neuspela naredba âHELOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1255
-#: ../camel/providers/smtp/camel-smtp-transport.c:1265
+#: ../camel/providers/smtp/camel-smtp-transport.c:1239
+#: ../camel/providers/smtp/camel-smtp-transport.c:1254
+#: ../camel/providers/smtp/camel-smtp-transport.c:1264
 msgid "MAIL FROM command failed: "
 msgstr "Neuspela naredba âMAIL FROMâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1292
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
 msgid "RCPT TO command failed: "
 msgstr "Neuspela naredba âRCPT TOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1309
-#: ../camel/providers/smtp/camel-smtp-transport.c:1319
+#: ../camel/providers/smtp/camel-smtp-transport.c:1308
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> nije uspelo: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1362
-#: ../camel/providers/smtp/camel-smtp-transport.c:1373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1384
-#: ../camel/providers/smtp/camel-smtp-transport.c:1443
-#: ../camel/providers/smtp/camel-smtp-transport.c:1463
-#: ../camel/providers/smtp/camel-smtp-transport.c:1477
-#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+#: ../camel/providers/smtp/camel-smtp-transport.c:1361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1372
+#: ../camel/providers/smtp/camel-smtp-transport.c:1383
+#: ../camel/providers/smtp/camel-smtp-transport.c:1442
+#: ../camel/providers/smtp/camel-smtp-transport.c:1462
+#: ../camel/providers/smtp/camel-smtp-transport.c:1476
+#: ../camel/providers/smtp/camel-smtp-transport.c:1485
 msgid "DATA command failed: "
 msgstr "Neuspela naredba âDATAâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-#: ../camel/providers/smtp/camel-smtp-transport.c:1526
-#: ../camel/providers/smtp/camel-smtp-transport.c:1535
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
+#: ../camel/providers/smtp/camel-smtp-transport.c:1525
+#: ../camel/providers/smtp/camel-smtp-transport.c:1534
 msgid "RSET command failed: "
 msgstr "Neuspela naredba âRSETâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1560
-#: ../camel/providers/smtp/camel-smtp-transport.c:1574
-#: ../camel/providers/smtp/camel-smtp-transport.c:1581
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
+#: ../camel/providers/smtp/camel-smtp-transport.c:1573
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
 msgid "QUIT command failed: "
 msgstr "Neuspela naredba âQUITâ: "
 
 #: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
 msgid "Contact UID of a user"
-msgstr "UIB kontakta korisnika"
+msgstr "KIB kontakta korisnika"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
 msgid "Birthday and anniversary reminder"
@@ -4883,8 +4710,8 @@ msgstr ""
 
 #: ../libebackend/e-authentication-mediator.c:205
 #: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:849
-#: ../libebackend/e-authentication-mediator.c:1179
+#: ../libebackend/e-authentication-mediator.c:852
+#: ../libebackend/e-authentication-mediator.c:1182
 msgid "Bus name vanished (client terminated?)"
 msgstr "Naziv sabirnice je nestao (klijent je okonÄan?)"
 
@@ -4894,8 +4721,8 @@ msgstr "Nema odgovora sa klijenta"
 
 #: ../libebackend/e-authentication-mediator.c:334
 #: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:843
-#: ../libebackend/e-authentication-mediator.c:1173
+#: ../libebackend/e-authentication-mediator.c:846
+#: ../libebackend/e-authentication-mediator.c:1176
 msgid "Client cancelled the operation"
 msgstr "Klijent je otkazao ste operaciju"
 
@@ -4907,75 +4734,83 @@ msgstr "Lozinka izveÅtaja klijenta je odbijena"
 msgid "Add this password to your keyring"
 msgstr "Dodajte ovu lozinku u vaÅ privezak"
 
-#: ../libebackend/e-authentication-session.c:595
+#: ../libebackend/e-authentication-session.c:622
 msgid "Password was incorrect"
 msgstr "Lozinka je neispravna"
 
-#: ../libebackend/e-authentication-session.c:1331
-#: ../libebackend/e-authentication-session.c:1507
-#: ../libebackend/e-authentication-session.c:1690
-msgid "Keyring operation was cancelled"
-msgstr "Radnja priveska kljuÄeva je otkazana"
-
-#: ../libebackend/e-backend.c:190
+#: ../libebackend/e-backend.c:206
 #, c-format
 msgid "%s does not support authentication"
 msgstr "â%sâ ne podrÅava potvrÄivanje identiteta"
 
-#: ../libebackend/e-collection-backend.c:734
+#: ../libebackend/e-collection-backend.c:775
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "â%sâ ne podrÅava stvaranje udaljenih izvoriÅta"
 
-#: ../libebackend/e-collection-backend.c:793
+#: ../libebackend/e-collection-backend.c:834
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "â%sâ ne podrÅava brisanje udaljenih izvoriÅta"
 
-#: ../libebackend/e-server-side-source.c:128
+#: ../libebackend/e-server-side-source.c:132
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "Izvoru podataka nedostaje [%s] grupa"
 
-#: ../libebackend/e-server-side-source.c:945 ../libedataserver/e-source.c:1092
+#: ../libebackend/e-server-side-source.c:993 ../libedataserver/e-source.c:1110
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "Izvor podataka â%sâ ne podrÅava stvaranje udaljenih izvoriÅta"
 
-#: ../libebackend/e-server-side-source.c:959
+#: ../libebackend/e-server-side-source.c:1007
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr ""
 "Izvor podataka â%sâ nema pozadinca zbirke da bi napravio udaljeno izvoriÅte"
 
-#: ../libebackend/e-server-side-source.c:987 ../libedataserver/e-source.c:1201
+#: ../libebackend/e-server-side-source.c:1035
+#: ../libedataserver/e-source.c:1217
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "Izvor podataka â%sâ ne podrÅava brisanje udaljenih izvoriÅta"
 
-#: ../libebackend/e-server-side-source.c:1001
+#: ../libebackend/e-server-side-source.c:1049
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr ""
 "Izvor podataka â%sâ nema pozadinca zbirke da bi obrisao udaljeno izvoriÅte"
 
-#: ../libebackend/e-server-side-source.c:1336
+#: ../libebackend/e-server-side-source.c:1080
+#: ../libedataserver/e-source.c:1307
+#, c-format
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "Data source '%s' does not support OAuth 2.0 authentication"
+msgstr "Izvor podataka â%sâ ne podrÅava OAut 2.0 potvrÄivanje identiteta"
+
+#: ../libebackend/e-server-side-source.c:1406
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "Datoteka mora da ima nastavak â.sourceâ"
 
-#: ../libebackend/e-source-registry-server.c:522
-#: ../libedataserver/e-source-registry.c:1512
+#: ../libebackend/e-source-registry-server.c:523
+#: ../libedataserver/e-source-registry.c:1594
 msgid "The user declined to authenticate"
 msgstr "Korisnik je odbio da potvrdi identitet"
 
 # veÄ u upotrebi?
-#: ../libebackend/e-source-registry-server.c:770
+#: ../libebackend/e-source-registry-server.c:792
 #, c-format
 msgid "UID '%s' is already in use"
-msgstr "UIB â%sâ je veÄ u upotrebi"
+msgstr "KIB â%sâ je veÄ u upotrebi"
+
+#: ../libebackend/e-user-prompter-server.c:279
+#, c-format
+#| msgid "Contact '%s' not found"
+msgid "Extension dialog '%s' not found."
+msgstr "Nisam pronaÅao prozorÄe proÅirenja â%sâ."
 
 #: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
@@ -5089,21 +4924,21 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Äekanje"
 
-#: ../libedataserver/e-client.c:124
+#: ../libedataserver/e-client.c:115
 msgid "Source not loaded"
 msgstr "Izvor nije uÄitan"
 
-#: ../libedataserver/e-client.c:126
+#: ../libedataserver/e-client.c:117
 msgid "Source already loaded"
 msgstr "Izvor je veÄ uÄitan"
 
 #. Translators: This means that the EClient does not support offline mode, or
 #. * it's not set to by a user, thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:136
+#: ../libedataserver/e-client.c:127
 msgid "Offline unavailable"
 msgstr "Rad van mreÅe nije dostupan"
 
-#: ../libedataserver/e-client.c:158
+#: ../libedataserver/e-client.c:149
 msgid "D-Bus error"
 msgstr "GreÅka u D-magistrali"
 
@@ -5159,35 +4994,91 @@ msgstr "Unesite lozinku za spisak zaduÅenja â%sâ."
 msgid "Please enter the password for account \"%s\"."
 msgstr "Unesite lozinku za nalog â%sâ."
 
-#: ../libedataserver/e-source.c:621
+#: ../libedataserver/e-source.c:620
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "Izvornoj datoteci nedostaje [%s] grupa"
 
-#: ../libedataserver/e-source.c:919
+#: ../libedataserver/e-source.c:937
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "Izvor podataka â%sâ se ne moÅe ukloniti"
 
-#: ../libedataserver/e-source.c:1001
+#: ../libedataserver/e-source.c:1019
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "Izvor podtaka â%sâ nije upisiv"
 
-#: ../libedataserver/e-source.c:1382
+#: ../libedataserver/e-source.c:1513
 msgid "Unnamed"
 msgstr "Neimenovan"
 
-#: ../libedataserver/e-source-mail-signature.c:485
+#: ../libedataserver/e-source-mail-signature.c:487
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "Skripta potpisa mora da bude mesna datoteka"
 
+#: ../libedataserver/e-source-webdav.c:1476
+#, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+"SSL uverenje za domaÄina â%sâ, koje koristi adresar â%sâ, nije od poverenja. "
+"Da li Åelite da ga prihvatite?"
+
+#: ../libedataserver/e-source-webdav.c:1485
+#, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
+"wish to accept it?"
+msgstr ""
+"SSL uverenje za domaÄina â%sâ, koje koristi kalendar â%sâ, nije od poverenja. "
+"Da li Åelite da ga prihvatite?"
+
+#: ../libedataserver/e-source-webdav.c:1494
+#, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+"SSL uverenje za domaÄina â%sâ, koje koriste beleÅke â%sâ, nije od poverenja. "
+"Da li Åelite da ga prihvatite?"
+
+#: ../libedataserver/e-source-webdav.c:1503
+#, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+"SSL uverenje za domaÄina â%sâ, koje koriste zadaci â%sâ, nije od poverenja. Da "
+"li Åelite da ga prihvatite?"
+
 #. 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.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1949
+#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1946
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -5195,7 +5086,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1655 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1937
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -5203,7 +5094,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1660 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1942
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -5211,78 +5102,78 @@ msgstr "%a %d. %m. %Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1665 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1933
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d. %m. %Y. %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1667
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d. %m. %Y. %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1675
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1798
-#: ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1928
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1685
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d. %m. %Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1686
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d. %m. %Y. %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1691
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d. %m. %Y. %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1696
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d. %m. %Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1701
 msgid "%m/%d/%Y %I %p"
 msgstr "%d. %m. %Y. %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1709
+#: ../libedataserver/e-time-utils.c:1706
 msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1712 ../libedataserver/e-time-utils.c:1801
+#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1993
+#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1990
 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.
-#: ../libedataserver/e-time-utils.c:1876 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1982
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5290,25 +5181,25 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1990
+#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1987
 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.
-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:1982
+#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1979
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1886
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1890
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5425,217 +5316,454 @@ msgstr "Adresa za samopodeÅavanje posrednika"
 msgid "Where to read automatic proxy configuration from."
 msgstr "Odakle Äe biti proÄitana samopodeÅavanja posrdenika."
 
-#: ../libedataserverui/e-categories-editor.c:230
-msgid "Currently _used categories:"
-msgstr "Trenutno _koriÅÄene kategorije:"
-
-#: ../libedataserverui/e-categories-editor.c:239
-msgid "_Available Categories:"
-msgstr "_Dostupne kategorije:"
-
-#: ../libedataserverui/e-categories-selector.c:325
-msgid "Icon"
-msgstr "Ikonica"
-
-#: ../libedataserverui/e-categories-selector.c:330
-msgid "Category"
-msgstr "Kategorija"
-
-#: ../libedataserverui/e-category-completion.c:300
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:223
 #, c-format
-msgid "Create category \"%s\""
-msgstr "Izrada kategorije â%sâ"
-
-#: ../libedataserverui/e-category-editor.c:137
-msgid "Category Icon"
-msgstr "Ikonica kategorije"
-
-#: ../libedataserverui/e-category-editor.c:141
-msgid "_No Image"
-msgstr "_Bez slike"
-
-#: ../libedataserverui/e-category-editor.c:178
-msgid "Category _Name"
-msgstr "_Naziv kategorije"
-
-#: ../libedataserverui/e-category-editor.c:186
-msgid "Category _Icon"
-msgstr "_Ikonica kategorije"
-
-#: ../libedataserverui/e-category-editor.c:226
-msgid "Category Properties"
-msgstr "Osobine kategorije"
+msgid "Code: %u - Unexpected response from server"
+msgstr "Kod: %u â NeoÄekivani odgovor sa servera"
 
-#: ../libedataserverui/e-category-editor.c:287
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:244
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "U podeÅavanju veÄ postoji kategorija â%sâ. Izaberite drugo ime"
-
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Show Contacts"
-msgstr "PrikaÅi kontakte"
-
-#: ../libedataserverui/e-name-selector-dialog.c:300
-msgid "Address B_ook:"
-msgstr "A_dresar:"
-
-#: ../libedataserverui/e-name-selector-dialog.c:310
-msgid "Cat_egory:"
-msgstr "Katego_rija:"
-
-#: ../libedataserverui/e-name-selector-dialog.c:332
-msgid "_Search:"
-msgstr "_PretraÅi:"
-
-#: ../libedataserverui/e-name-selector-dialog.c:357
-#: ../libedataserverui/e-name-selector-dialog.c:1182
-msgid "Any Category"
-msgstr "Bilo koja kategorija"
-
-#: ../libedataserverui/e-name-selector-dialog.c:359
-msgid "Co_ntacts"
-msgstr "Ko_ntakti"
-
-#: ../libedataserverui/e-name-selector-dialog.c:421
-msgid "Search"
-msgstr "Pretraga"
-
-#: ../libedataserverui/e-name-selector-dialog.c:424
-msgid "Address Book"
-msgstr "Adresar"
-
-#: ../libedataserverui/e-name-selector-dialog.c:427
-#: ../modules/google-backend/module-google-backend.c:183
-msgid "Contacts"
-msgstr "Kontakti"
-
-#: ../libedataserverui/e-name-selector-dialog.c:545
-msgid "Select Contacts from Address Book"
-msgstr "Izaberite kontakte iz adresara"
-
-#: ../libedataserverui/e-name-selector-dialog.c:917
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: ../libedataserverui/e-name-selector-dialog.c:921
-msgid "_Remove"
-msgstr "_Ukloni"
+msgid "Failed to parse autodiscover response XML"
+msgstr "Nisam uspeo da obradim samootkrivajuÄi odgovor IksML"
 
-#: ../libedataserverui/e-name-selector-dialog.c:1097
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:253
 #, c-format
-msgid "Error loading address book: %s"
-msgstr "GreÅka prilikom uÄitavanja adresara: %s"
+msgid "Failed to find Autodiscover element"
+msgstr "Nisam uspeo da pronaÄem element samootkrivanja"
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:3008
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:265
 #, c-format
-msgid "E_xpand %s Inline"
-msgstr "_RaÅiri %s unutar"
+msgid "Failed to find Response element"
+msgstr "Nisam uspeo da pronaÄem element odgovora"
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3024
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:277
 #, c-format
-msgid "Cop_y %s"
-msgstr "U_mnoÅi %s"
+msgid "Failed to find Account element"
+msgstr "Nisam uspeo da pronaÄem element naloga"
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3035
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:291
 #, c-format
-msgid "C_ut %s"
-msgstr "I_seci %s"
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "Nisam uspeo da pronaÄem ASadresu i OABadresu u odgovoru samootkrivanja"
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:3053
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1094
 #, c-format
-msgid "_Edit %s"
-msgstr "_Uredi %s"
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an access token for '%s'"
+msgstr ""
+"Ne mogu da pronaÄem odgovarajuÄi nalog na usluzi âorg.gnom.Nalozi na mreÅiâ "
+"sa koje bih dobio pristup za â%sâ."
 
-#: ../libedataserverui/e-name-selector-list.c:532
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1121
 #, c-format
-msgid "_Delete %s"
-msgstr "_Ukloni â%sâ"
+#| msgid "Failed to open addressbook at '%s': %s"
+msgid "Failed to obtain an access token for '%s': "
+msgstr "Nisam uspeo da dobijem pristup za â%sâ: "
 
-#: ../libedataserverui/e-passwords.c:126
-msgid "Keyring key is unusable: no user or host name"
-msgstr "KljuÄ priveska nije upotrebljiv: nema korisnika niti domaÄina"
+#: ../modules/google-backend/module-google-backend.c:140
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "Kalendar"
 
-#: ../libedataserverui/e-passwords.c:701
-#: ../libedataserverui/e-passwords-win32.c:614
-msgid "You have the Caps Lock key on."
-msgstr "UkljuÄili ste velika slova."
+#: ../modules/google-backend/module-google-backend.c:217
+#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+msgid "Contacts"
+msgstr "Kontakti"
 
-#: ../libedataserverui/e-passwords.c:821
-#: ../libedataserverui/e-passwords-win32.c:737
-msgid "_Remember this passphrase"
-msgstr "_Zapamti ovu lozinku"
+#: ../modules/trust-prompt/certificate-viewer.c:292
+#| msgid "Cannot add encryption certificate"
+msgid "Not part of certificate"
+msgstr "Nije deo uverenja"
+
+#: ../modules/trust-prompt/certificate-viewer.c:600
+msgid "This certificate has been verified for the following uses:"
+msgstr "Ovo uverenje je provereno za sledeÄe potrebe:"
+
+#: ../modules/trust-prompt/certificate-viewer.c:604
+#: ../modules/trust-prompt/e-asn1-object.c:387
+#| msgid "X.509 Certificate"
+msgid "SSL Client Certificate"
+msgstr "Uverenje SSL klijenta"
+
+#: ../modules/trust-prompt/certificate-viewer.c:609
+#: ../modules/trust-prompt/e-asn1-object.c:391
+#| msgid "X.509 Certificate"
+msgid "SSL Server Certificate"
+msgstr "Uverenje SSL servera"
+
+#: ../modules/trust-prompt/certificate-viewer.c:614
+msgid "Email Signer Certificate"
+msgstr "Uverenje potpisnika el. poruke"
+
+#: ../modules/trust-prompt/certificate-viewer.c:619
+#| msgid "Cannot add encryption certificate"
+msgid "Email Recipient Certificate"
+msgstr "Uverenje primaoca el. poruke"
+
+#: ../modules/trust-prompt/certificate-viewer.c:634
+msgid "Issued To"
+msgstr "Korisnik"
+
+#: ../modules/trust-prompt/certificate-viewer.c:635
+#: ../modules/trust-prompt/certificate-viewer.c:641
+msgid "Common Name (CN)"
+msgstr "ZajedniÄko ime (CN)"
+
+#: ../modules/trust-prompt/certificate-viewer.c:636
+#: ../modules/trust-prompt/certificate-viewer.c:642
+#| msgid "Organization"
+msgid "Organization (O)"
+msgstr "Organizacija (O)"
+
+#: ../modules/trust-prompt/certificate-viewer.c:637
+#: ../modules/trust-prompt/certificate-viewer.c:643
+#| msgid "Organizational Unit"
+msgid "Organizational Unit (OU)"
+msgstr "Organizaciona jedinica (OU)"
+
+#: ../modules/trust-prompt/certificate-viewer.c:638
+#: ../modules/trust-prompt/e-asn1-object.c:134
+msgid "Serial Number"
+msgstr "Serijski broj"
+
+#: ../modules/trust-prompt/certificate-viewer.c:640
+msgid "Issued By"
+msgstr "IzdavaÄ"
+
+#: ../modules/trust-prompt/certificate-viewer.c:645
+msgid "Validity"
+msgstr "Ispravnost"
+
+#: ../modules/trust-prompt/certificate-viewer.c:646
+msgid "Issued On"
+msgstr "Izdato je"
+
+#: ../modules/trust-prompt/certificate-viewer.c:647
+msgid "Expires On"
+msgstr "IstiÄe"
+
+#: ../modules/trust-prompt/certificate-viewer.c:649
+msgid "Fingerprints"
+msgstr "Otisci"
+
+#: ../modules/trust-prompt/certificate-viewer.c:650
+msgid "SHA1 Fingerprint"
+msgstr "SHA1 otisak"
+
+#: ../modules/trust-prompt/certificate-viewer.c:651
+msgid "MD5 Fingerprint"
+msgstr "MD5 Otisak"
+
+#: ../modules/trust-prompt/certificate-viewer.c:653
+msgid "General"
+msgstr "OpÅte"
+
+#: ../modules/trust-prompt/certificate-viewer.c:672
+#| msgid "Certificate import failed"
+msgid "Certificate Hierarchy"
+msgstr "Redosled uverenja"
+
+#: ../modules/trust-prompt/certificate-viewer.c:676
+#| msgid "Certificate import failed"
+msgid "Certificate Fields"
+msgstr "Polja uverenja"
+
+#: ../modules/trust-prompt/certificate-viewer.c:680
+msgid "Field Value"
+msgstr "Vrednost polja"
+
+#: ../modules/trust-prompt/certificate-viewer.c:682
+msgid "Details"
+msgstr "Podaci"
+
+#: ../modules/trust-prompt/e-asn1-object.c:95
+msgid "Version"
+msgstr "Izdanje"
+
+#: ../modules/trust-prompt/e-asn1-object.c:110
+msgid "Version 1"
+msgstr "Izdanje 1"
+
+#: ../modules/trust-prompt/e-asn1-object.c:113
+msgid "Version 2"
+msgstr "Izdanje 2"
+
+#: ../modules/trust-prompt/e-asn1-object.c:116
+msgid "Version 3"
+msgstr "Izdanje 3"
+
+#: ../modules/trust-prompt/e-asn1-object.c:192
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "PKCS #1 MD2 sa RSA Åifrovanjem"
+
+#: ../modules/trust-prompt/e-asn1-object.c:195
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "PKCS #1 MD5 sa RSA Åifrovanjem"
+
+#: ../modules/trust-prompt/e-asn1-object.c:198
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 sa RSA Åifrovanjem"
+
+#: ../modules/trust-prompt/e-asn1-object.c:201
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 sa RSA Åifrovanjem"
+
+#: ../modules/trust-prompt/e-asn1-object.c:204
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 sa RSA Åifrovanjem"
+
+#: ../modules/trust-prompt/e-asn1-object.c:207
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 sa RSA Åifrovanjem"
+
+#: ../modules/trust-prompt/e-asn1-object.c:234
+msgid "PKCS #1 RSA Encryption"
+msgstr "PKCS #1 RSA Åifrovanje"
+
+#: ../modules/trust-prompt/e-asn1-object.c:237
+#| msgid "Certificate import failed"
+msgid "Certificate Key Usage"
+msgstr "Upotreba kljuÄa uverenja"
+
+#: ../modules/trust-prompt/e-asn1-object.c:240
+msgid "Netscape Certificate Type"
+msgstr "Vrsta Netskejp uverenja"
+
+#: ../modules/trust-prompt/e-asn1-object.c:243
+#| msgid "Certificate import failed"
+msgid "Certificate Authority Key Identifier"
+msgstr "OdreÄivaÄ kljuÄa izdavaoca uverenja"
+
+#: ../modules/trust-prompt/e-asn1-object.c:255
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr "OdreÄivaÄ predmeta (%s)"
+
+#: ../modules/trust-prompt/e-asn1-object.c:306
+msgid "Algorithm Identifier"
+msgstr "OdreÄivaÄ algoritma"
+
+#: ../modules/trust-prompt/e-asn1-object.c:314
+msgid "Algorithm Parameters"
+msgstr "Parametri algoritma"
+
+#: ../modules/trust-prompt/e-asn1-object.c:336
+msgid "Subject Public Key Info"
+msgstr "Podaci o javnom kljuÄu subjekta"
+
+#: ../modules/trust-prompt/e-asn1-object.c:341
+msgid "Subject Public Key Algorithm"
+msgstr "Algoritam javnog kljuÄa subjekta"
+
+#: ../modules/trust-prompt/e-asn1-object.c:356
+msgid "Subject's Public Key"
+msgstr "Javni kljuÄ subjekta"
+
+#: ../modules/trust-prompt/e-asn1-object.c:378
+#: ../modules/trust-prompt/e-asn1-object.c:428
+#| msgid "Unable to process spool folder"
+msgid "Error: Unable to process extension"
+msgstr "GreÅka: ne mogu da obradim proÅirenje"
+
+#: ../modules/trust-prompt/e-asn1-object.c:395
+#| msgid "Email 1"
+msgid "Email"
+msgstr "El. poÅta"
+
+#: ../modules/trust-prompt/e-asn1-object.c:399
+#: ../modules/trust-prompt/e-asn1-object.c:411
+msgid "Object Signer"
+msgstr "Potpisnik predmeta"
+
+#: ../modules/trust-prompt/e-asn1-object.c:403
+#| msgid "Certificate import failed"
+msgid "SSL Certificate Authority"
+msgstr "IzdavaÄ SSL uverenja"
+
+#: ../modules/trust-prompt/e-asn1-object.c:407
+msgid "Email Certificate Authority"
+msgstr "IzdavaÄ uverenja el. poÅte"
+
+#: ../modules/trust-prompt/e-asn1-object.c:436
+#| msgid "Signing message"
+msgid "Signing"
+msgstr "Potpisivanje"
+
+#: ../modules/trust-prompt/e-asn1-object.c:440
+msgid "Non-repudiation"
+msgstr "Bez odricanja"
+
+#: ../modules/trust-prompt/e-asn1-object.c:444
+msgid "Key Encipherment"
+msgstr "ZamuÄivanje kljuÄa"
+
+#: ../modules/trust-prompt/e-asn1-object.c:448
+msgid "Data Encipherment"
+msgstr "ZamuÄivanje podataka"
+
+#: ../modules/trust-prompt/e-asn1-object.c:452
+msgid "Key Agreement"
+msgstr "Saglasnost kljuÄa"
+
+#: ../modules/trust-prompt/e-asn1-object.c:456
+#| msgid "Certificate import failed"
+msgid "Certificate Signer"
+msgstr "Potpisnik uverenja"
+
+#: ../modules/trust-prompt/e-asn1-object.c:460
+msgid "CRL Signer"
+msgstr "CRL potpisnik"
+
+#: ../modules/trust-prompt/e-asn1-object.c:509
+msgid "Critical"
+msgstr "KritiÄno"
+
+#: ../modules/trust-prompt/e-asn1-object.c:511
+#: ../modules/trust-prompt/e-asn1-object.c:514
+msgid "Not Critical"
+msgstr "Nije kritiÄno"
+
+#: ../modules/trust-prompt/e-asn1-object.c:535
+msgid "Extensions"
+msgstr "ProÅirenja"
+
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../modules/trust-prompt/e-asn1-object.c:615
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../modules/trust-prompt/e-asn1-object.c:658
+#| msgid "X.509 Certificate"
+msgid "Certificate"
+msgstr "Uverenje"
+
+#: ../modules/trust-prompt/e-asn1-object.c:674
+#: ../modules/trust-prompt/e-asn1-object.c:812
+#| msgid "Signature algorithm unknown"
+msgid "Certificate Signature Algorithm"
+msgstr "Algoritam potpisa uverenja"
+
+#: ../modules/trust-prompt/e-asn1-object.c:683
+msgid "Issuer"
+msgstr "IzdavaÄ"
+
+#: ../modules/trust-prompt/e-asn1-object.c:714
+msgid "Subject"
+msgstr "Naslov"
+
+#: ../modules/trust-prompt/e-asn1-object.c:738
+#| msgid "Unique ID"
+msgid "Issuer Unique ID"
+msgstr "Jedinstveni IB izdavaÄa"
+
+#: ../modules/trust-prompt/e-asn1-object.c:757
+#| msgid "Unique ID"
+msgid "Subject Unique ID"
+msgstr "Jedinstveni IB subjekta"
+
+#: ../modules/trust-prompt/e-asn1-object.c:818
+#| msgid "Certificate import failed"
+msgid "Certificate Signature Value"
+msgstr "Vrednost potpisa uverenja"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:201
+#| msgid "Signing certificate not found"
+msgid "The signing certificate authority is not known."
+msgstr "IzdavaÄ potpisujuÄeg uverenja nije poznat."
+
+#: ../modules/trust-prompt/module-trust-prompt.c:203
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "Uverenje ne odgovara oÄekivanom identittetu sajta sa koga je preuzeto."
 
-#: ../libedataserverui/e-passwords.c:822
-#: ../libedataserverui/e-passwords-win32.c:738
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "_Zapamti ovu lozinku do kraja ove sesije"
+#: ../modules/trust-prompt/module-trust-prompt.c:205
+msgid "The certificate's activation time is still in the future."
+msgstr "Vreme pokretanja uverenja je joÅ uvek u buduÄnosti."
 
-#: ../libedataserverui/e-passwords.c:827
-#: ../libedataserverui/e-passwords-win32.c:743
-msgid "_Remember this password"
-msgstr "_Zapamti ovu lozinku"
+#: ../modules/trust-prompt/module-trust-prompt.c:207
+#| msgid "The referenced credentials have expired."
+msgid "The certificate has expired."
+msgstr "Uverenje je isteklo."
 
-#: ../libedataserverui/e-passwords.c:828
-#: ../libedataserverui/e-passwords-win32.c:744
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Zapamti ovu lozinku do kraja ove sesije"
+#: ../modules/trust-prompt/module-trust-prompt.c:209
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
+msgstr "Uverenje je povuÄeno u skladu sa spiskom povlaÄenja uverenja veze."
 
-#: ../libedataserverui/e-source-selector-dialog.c:224
-msgid "_Destination"
-msgstr "_OdrediÅte"
+#: ../modules/trust-prompt/module-trust-prompt.c:211
+msgid "The certificate's algorithm is considered insecure."
+msgstr "Algoritam uverenja se smatra nesigurnim."
 
-#: ../libedataserverui/e-source-selector-dialog.c:326
-msgid "Select destination"
-msgstr "Izaberite odrediÅte"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:162
+#| msgid "Signing certificate not trusted"
+msgid "Certificate trust..."
+msgstr "Poverenje uverenja..."
 
-#: ../modules/google-backend/module-google-backend.c:118
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
-msgid "Calendar"
-msgstr "Kalendar"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:163
+#| msgid "X.509 Certificate"
+msgid "_View Certificate"
+msgstr "Pogledaj _uverenje"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:184
-#, c-format
-msgid "Code: %u - Unexpected response from server"
-msgstr "Kod: %u â NeoÄekivani odgovor sa servera"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+msgid "_Reject"
+msgstr "_Odbaci"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:205
-#, c-format
-msgid "Failed to parse autodiscover response XML"
-msgstr "Nisam uspeo da obradim samootkrivajuÄi odgovor IksML"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+msgid "Accept _Temporarily"
+msgstr "Prihvati _privremeno"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:214
-#, c-format
-msgid "Failed to find Autodiscover element"
-msgstr "Nisam uspeo da pronaÄem element samootkrivanja"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+msgid "_Accept Permanently"
+msgstr "Prihvati _trajno"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:226
+#: ../modules/trust-prompt/trust-prompt-gtk.c:203
 #, c-format
-msgid "Failed to find Response element"
-msgstr "Nisam uspeo da pronaÄem element odgovora"
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr "SSL uverenje za â%sâ nije od poverenja. Da li Åelite da ga prihvatite?"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:238
-#, c-format
-msgid "Failed to find Account element"
-msgstr "Nisam uspeo da pronaÄem element naloga"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:209
+msgid "Detailed information about the certificate:"
+msgstr "Pojedinosti o uverenju:"
 
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:252
-#, c-format
-msgid "Failed to find ASUrl and OABUrl in autodiscover response"
-msgstr "Nisam uspeo da pronaÄem ASadresu i OABadresu u odgovoru samootkrivanja"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:223
+msgid "Issuer:"
+msgstr "IzdavaÄ:"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:224
+msgid "Subject:"
+msgstr "Tema:"
 
-#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+#: ../modules/trust-prompt/trust-prompt-gtk.c:225
+msgid "Fingerprint:"
+msgstr "Otisak:"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:226
+msgid "Reason:"
+msgstr "Razlog:"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:227
 msgid "Tasks"
 msgstr "ZaduÅenja"
 
@@ -5649,18 +5777,47 @@ msgstr "Nastavlja da radi nakon zatvaranja poslednjeg klijenta"
 msgid "Wait running until at least one client is connected"
 msgstr "Äeka sa pokretanjem sve dok se barem jedan klijent ne poveÅe"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:620
-msgid "Evolution Source Viewer"
-msgstr "Prikazivanje izvora Evolucije"
-
-#: ../tests/libedataserverui/evolution-source-viewer.c:649
-msgid "Display Name"
-msgstr "Naziv prikaza"
-
-#: ../tests/libedataserverui/evolution-source-viewer.c:658
-msgid "Flags"
-msgstr "Opcije"
-
-#: ../tests/libedataserverui/evolution-source-viewer.c:710
-msgid "Identity"
-msgstr "Identitet"
+#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1
+#| msgid "Birthday and anniversary reminder"
+msgid "Birthdays & Anniversaries"
+msgstr "RoÄendani i godiÅnjice"
+
+#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
+msgid "CalDAV"
+msgstr "KolDAV"
+
+#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1
+msgid "Google"
+msgstr "Gugl"
+
+#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
+#| msgid "IMAP server %s"
+msgid "On LDAP Servers"
+msgstr "Na LDAP serverima"
+
+#: ../services/evolution-source-registry/builtin/local.source.in.h:1
+#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1
+msgid "On This Computer"
+msgstr "Na ovom raÄunaru"
+
+#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1
+#| msgid "Folders"
+msgid "Search Folders"
+msgstr "Fascikle pretrage"
+
+#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1
+#| msgid "Weather: Fog"
+msgid "Weather"
+msgstr "Vreme"
+
+#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
+msgid "On The Web"
+msgstr "Na vebu"
+
+#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
+msgid "WebDAV"
+msgstr "VebDAV"
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+msgid "_Dismiss"
+msgstr "_Zanemari"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]