diff -Nru evolution-data-server-3.22.0/calendar/backends/caldav/e-cal-backend-caldav.c evolution-data-server-3.22.1/calendar/backends/caldav/e-cal-backend-caldav.c --- evolution-data-server-3.22.0/calendar/backends/caldav/e-cal-backend-caldav.c 2016-09-05 21:11:53.000000000 +0000 +++ evolution-data-server-3.22.1/calendar/backends/caldav/e-cal-backend-caldav.c 2016-10-06 15:53:09.000000000 +0000 @@ -697,7 +697,7 @@ gchar *body = g_strndup (message->response_body->data, message->response_body->length); /* Do not localize this string, it is returned by the server. */ - if (body && (e_util_strstrcase (body, "Daily Limit Exceeded") || + if (body && (e_util_strstrcase (body, "Daily Limit") || e_util_strstrcase (body, "https://console.developers.google.com/"))) { /* Special-case this condition and provide this error up to the UI. */ g_propagate_error (perror, @@ -1148,9 +1148,10 @@ auth_extension = e_source_get_extension (source, extension_name); if (E_IS_SOUP_AUTH_BEARER (auth)) { + g_object_ref (auth); g_warn_if_fail ((gpointer) cbdav->priv->using_bearer_auth == (gpointer) auth); g_clear_object (&cbdav->priv->using_bearer_auth); - cbdav->priv->using_bearer_auth = g_object_ref (auth); + cbdav->priv->using_bearer_auth = E_SOUP_AUTH_BEARER (auth); } if (retrying) diff -Nru evolution-data-server-3.22.0/camel/camel-vee-folder.c evolution-data-server-3.22.1/camel/camel-vee-folder.c --- evolution-data-server-3.22.0/camel/camel-vee-folder.c 2016-08-19 06:36:59.000000000 +0000 +++ evolution-data-server-3.22.1/camel/camel-vee-folder.c 2016-10-06 17:38:27.000000000 +0000 @@ -269,6 +269,10 @@ g_return_if_fail (vsummary != NULL); data_cache = vee_folder_get_data_cache (vfolder); + /* It can be NULL on dispose of the CamelVeeStore */ + if (!data_cache) + return; + for (ii = 0; ii < match->len; ii++) { const gchar *uid = match->pdata[ii]; @@ -385,8 +389,12 @@ } g_rec_mutex_unlock (&vfolder->priv->subfolder_lock); - changes = camel_folder_change_info_new (); data_cache = vee_folder_get_data_cache (vfolder); + /* It can be NULL on dispose of the CamelVeeStore */ + if (!data_cache) + return; + + changes = camel_folder_change_info_new (); v_folder = CAMEL_FOLDER (vfolder); vsummary = CAMEL_VEE_SUMMARY (v_folder->summary); @@ -663,8 +671,15 @@ CamelFolder *v_folder; CamelVeeDataCache *data_cache; - changes = camel_folder_change_info_new (); data_cache = vee_folder_get_data_cache (vf); + + /* It can be NULL on dispose of the CamelVeeStore */ + if (!data_cache) { + g_rec_mutex_unlock (&vf->priv->changed_lock); + return; + } + + changes = camel_folder_change_info_new (); v_folder = CAMEL_FOLDER (vf); vsummary = CAMEL_VEE_SUMMARY (v_folder->summary); @@ -1079,6 +1094,14 @@ rud.changes = changes; rud.is_orig_message_uid = FALSE; + /* It can be NULL on dispose of the CamelVeeStore */ + if (!rud.data_cache) { + camel_folder_thaw (v_folder); + camel_folder_change_info_free (changes); + g_hash_table_destroy (uids); + return; + } + g_hash_table_foreach (uids, vee_folder_remove_unmatched_cb, &rud); if (vee_folder_is_unmatched (vfolder) && @@ -1609,7 +1632,10 @@ vsummary = CAMEL_VEE_SUMMARY (CAMEL_FOLDER (vfolder)->summary); data_cache = vee_folder_get_data_cache (vfolder); - vee_folder_note_unmatch_uid (vfolder, vsummary, subfolder, data_cache, mi_data, changes); + + /* It can be NULL on dispose of the CamelVeeStore */ + if (data_cache) + vee_folder_note_unmatch_uid (vfolder, vsummary, subfolder, data_cache, mi_data, changes); } /** diff -Nru evolution-data-server-3.22.0/camel/camel-vee-store.c evolution-data-server-3.22.1/camel/camel-vee-store.c --- evolution-data-server-3.22.0/camel/camel-vee-store.c 2016-01-13 14:44:03.000000000 +0000 +++ evolution-data-server-3.22.1/camel/camel-vee-store.c 2016-10-06 17:38:27.000000000 +0000 @@ -149,14 +149,26 @@ } static void +vee_store_dispose (GObject *object) +{ + CamelVeeStorePrivate *priv; + + priv = CAMEL_VEE_STORE_GET_PRIVATE (object); + + g_clear_object (&priv->vee_data_cache); + g_clear_object (&priv->unmatched_folder); + + /* Chain up to parent's method. */ + G_OBJECT_CLASS (camel_vee_store_parent_class)->dispose (object); +} + +static void vee_store_finalize (GObject *object) { CamelVeeStorePrivate *priv; priv = CAMEL_VEE_STORE_GET_PRIVATE (object); - g_object_unref (priv->unmatched_folder); - g_object_unref (priv->vee_data_cache); g_hash_table_destroy (priv->subfolder_usage_counts); g_hash_table_destroy (priv->vuid_usage_counts); g_mutex_clear (&priv->sf_counts_mutex); @@ -510,6 +522,7 @@ object_class = G_OBJECT_CLASS (class); object_class->set_property = vee_store_set_property; object_class->get_property = vee_store_get_property; + object_class->dispose = vee_store_dispose; object_class->finalize = vee_store_finalize; object_class->constructed = vee_store_constructed; diff -Nru evolution-data-server-3.22.0/configure evolution-data-server-3.22.1/configure --- evolution-data-server-3.22.0/configure 2016-09-19 07:46:43.000000000 +0000 +++ evolution-data-server-3.22.1/configure 2016-10-10 08:08:30.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for evolution-data-server 3.22.0. +# Generated by GNU Autoconf 2.69 for evolution-data-server 3.22.1. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='evolution-data-server' PACKAGE_TARNAME='evolution-data-server' -PACKAGE_VERSION='3.22.0' -PACKAGE_STRING='evolution-data-server 3.22.0' +PACKAGE_VERSION='3.22.1' +PACKAGE_STRING='evolution-data-server 3.22.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server' PACKAGE_URL='' @@ -1787,7 +1787,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures evolution-data-server 3.22.0 to adapt to many kinds of systems. +\`configure' configures evolution-data-server 3.22.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1858,7 +1858,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of evolution-data-server 3.22.0:";; + short | recursive ) echo "Configuration of evolution-data-server 3.22.1:";; esac cat <<\_ACEOF @@ -2137,7 +2137,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -evolution-data-server configure 3.22.0 +evolution-data-server configure 3.22.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2723,7 +2723,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by evolution-data-server $as_me 3.22.0, which was +It was created by evolution-data-server $as_me 3.22.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3586,7 +3586,7 @@ # Define the identity of the package. PACKAGE='evolution-data-server' - VERSION='3.22.0' + VERSION='3.22.1' cat >>confdefs.h <<_ACEOF @@ -3887,7 +3887,7 @@ EDS_MAJOR_VERSION=3 EDS_MINOR_VERSION=22 -EDS_MICRO_VERSION=0 +EDS_MICRO_VERSION=1 @@ -27954,7 +27954,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by evolution-data-server $as_me 3.22.0, which was +This file was extended by evolution-data-server $as_me 3.22.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28020,7 +28020,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -evolution-data-server config.status 3.22.0 +evolution-data-server config.status 3.22.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru evolution-data-server-3.22.0/configure.ac evolution-data-server-3.22.1/configure.ac --- evolution-data-server-3.22.0/configure.ac 2016-09-12 11:25:16.000000000 +0000 +++ evolution-data-server-3.22.1/configure.ac 2016-09-19 08:01:10.000000000 +0000 @@ -2,7 +2,7 @@ dnl Evolution-Data-Server version m4_define([eds_major_version], [3]) m4_define([eds_minor_version], [22]) -m4_define([eds_micro_version], [0]) +m4_define([eds_micro_version], [1]) m4_define([eds_version], [eds_major_version.eds_minor_version.eds_micro_version]) diff -Nru evolution-data-server-3.22.0/debian/changelog evolution-data-server-3.22.1/debian/changelog --- evolution-data-server-3.22.0/debian/changelog 2016-09-29 14:52:11.000000000 +0000 +++ evolution-data-server-3.22.1/debian/changelog 2016-10-10 14:37:07.000000000 +0000 @@ -1,3 +1,18 @@ +evolution-data-server (3.22.1-0ubuntu2) yakkety; urgency=medium + + * debian/libedataserver-1.2-22.symbols: + - Add new symbol + + -- Jeremy Bicha Mon, 10 Oct 2016 10:37:07 -0400 + +evolution-data-server (3.22.1-0ubuntu1) yakkety; urgency=medium + + * New upstream bugfix release (LP: #1631955) + - Fix Google authentication failure with expired tokens. + The fix may still be incomplete. + + -- Jeremy Bicha Mon, 10 Oct 2016 09:42:08 -0400 + evolution-data-server (3.22.0-1ubuntu1) yakkety; urgency=medium * Merge with Debian (LP: #1584978). Remaining Ubuntu changes: diff -Nru evolution-data-server-3.22.0/debian/libedataserver-1.2-22.symbols evolution-data-server-3.22.1/debian/libedataserver-1.2-22.symbols --- evolution-data-server-3.22.0/debian/libedataserver-1.2-22.symbols 2016-09-29 14:52:11.000000000 +0000 +++ evolution-data-server-3.22.1/debian/libedataserver-1.2-22.symbols 2016-10-10 14:37:07.000000000 +0000 @@ -939,6 +939,7 @@ e_source_contacts_get_include_me@Base 3.17.90 e_source_contacts_get_type@Base 3.17.90 e_source_contacts_set_include_me@Base 3.17.90 + e_source_credentials_google_get_access_token_sync@Base 3.22.1 e_source_credentials_google_is_supported@Base 3.19.92 e_source_credentials_google_util_decode_from_secret@Base 3.19.92 e_source_credentials_google_util_encode_to_secret@Base 3.19.92 diff -Nru evolution-data-server-3.22.0/docs/reference/camel/html/camel-camel-object-bag.html evolution-data-server-3.22.1/docs/reference/camel/html/camel-camel-object-bag.html --- evolution-data-server-3.22.0/docs/reference/camel/html/camel-camel-object-bag.html 2016-09-19 07:53:03.000000000 +0000 +++ evolution-data-server-3.22.1/docs/reference/camel/html/camel-camel-object-bag.html 2016-10-10 08:14:34.000000000 +0000 @@ -456,10 +456,8 @@ - - + + 
1
-2
g_ptr_array_foreach (array, g_object_unref, NULL);
-g_ptr_array_free (array, TRUE);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/camel/html/CamelIMAPXNamespaceResponse.html evolution-data-server-3.22.1/docs/reference/camel/html/CamelIMAPXNamespaceResponse.html
--- evolution-data-server-3.22.0/docs/reference/camel/html/CamelIMAPXNamespaceResponse.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/camel/html/CamelIMAPXNamespaceResponse.html	2016-10-10 08:14:34.000000000 +0000
@@ -226,7 +226,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
diff -Nru evolution-data-server-3.22.0/docs/reference/camel/html/CamelIMAPXStore.html evolution-data-server-3.22.1/docs/reference/camel/html/CamelIMAPXStore.html
--- evolution-data-server-3.22.0/docs/reference/camel/html/CamelIMAPXStore.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/camel/html/CamelIMAPXStore.html	2016-10-10 08:14:34.000000000 +0000
@@ -339,7 +339,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
diff -Nru evolution-data-server-3.22.0/docs/reference/camel/html/CamelSession.html evolution-data-server-3.22.1/docs/reference/camel/html/CamelSession.html
--- evolution-data-server-3.22.0/docs/reference/camel/html/CamelSession.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/camel/html/CamelSession.html	2016-10-10 08:14:34.000000000 +0000
@@ -790,7 +790,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/api-index-full.html evolution-data-server-3.22.1/docs/reference/eds/html/api-index-full.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/api-index-full.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/api-index-full.html	2016-10-10 08:14:34.000000000 +0000
@@ -7775,6 +7775,10 @@
 
 

 

+e_source_credentials_google_get_access_token_sync, function in ESourceCredentialsProviderImplGoogle
+

+

+

 e_source_credentials_google_is_supported, function in ESourceCredentialsProviderImplGoogle
 

 

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/EBookBackend.html evolution-data-server-3.22.1/docs/reference/eds/html/EBookBackend.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/EBookBackend.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/EBookBackend.html	2016-10-10 08:14:34.000000000 +0000
@@ -2357,7 +2357,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/EBookClientCursor.html evolution-data-server-3.22.1/docs/reference/eds/html/EBookClientCursor.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/EBookClientCursor.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/EBookClientCursor.html	2016-10-10 08:14:34.000000000 +0000
@@ -301,36 +301,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
EBookClientCursor *cursor = NULL;
-EContactField sort_fields[] = { E_CONTACT_FAMILY_NAME, E_CONTACT_GIVEN_NAME };
-EBookCursorSortType sort_types[] = { E_BOOK_CURSOR_SORT_ASCENDING, E_BOOK_CURSOR_SORT_ASCENDING };
-GError *error = NULL;
-
-if (e_book_client_get_cursor_sync (book_client, // EBookClient
-                                   NULL,        // Search Expression
-                                   sort_fields, // Sort Keys
-                                   sort_types,  // Ascending / Descending
-                                   2,           // Number of keys
-                                   &cursor,     // Return location for cursor
-                                   NULL,        // GCancellable
-                                   &error)) {
-        // Now we have a cursor ...
-}
1

       

     
   

@@ -460,42 +432,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
gint position, total;
-gdouble percent;
-
-// Fetch the position & total
-position = e_book_client_cursor_get_position (cursor);
-total    = e_book_client_cursor_get_total (cursor);
-
-// The position can be total + 1 if we're at the end of the
-// list, let's ignore that for this calculation.
-position = CLAMP (position, 0, total);
-
-// Calculate the percentage.
-percent = position * 1.0F / (total - N_DISPLAY_CONTACTS);
-
-// Let the user know the percentage of contacts in the list
-// which are positioned before the view position (the
-// percentage of the addressbook which the user has seen so far).
-update_percentage_of_list_browsed (user_interface, percent);
1

       

     
   

@@ -555,108 +493,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
GError *error = NULL;
-GSList *results = NULL;
-gint n_results;
-
-// Move the cursor forward by 10 contacts and fetch the results.
-n_results = e_book_client_cursor_step_sync (cursor,
-                                            E_BOOK_CURSOR_STEP_MOVE |
-                                            E_BOOK_CURSOR_STEP_FETCH,
-                                            E_BOOK_CURSOR_ORIGIN_CURRENT,
-                                            10,
-                                            &results,
-                                            NULL,
-                                            &error);
-
-if (n_results < 0)
-  {
-    if (g_error_matches (error,
-                         E_CLIENT_ERROR,
-                         E_CLIENT_ERROR_OUT_OF_SYNC))
-      {
-        // The addressbook has been modified at the same time as
-        // we asked to step. The appropriate thing to do is wait
-        // for the "refresh" signal before trying again.
-        handle_out_of_sync_condition (cursor);
-      }
-    else if (g_error_matches (error,
-                              E_CLIENT_ERROR,
-                              E_CLIENT_ERROR_QUERY_REFUSED))
-      {
-        // We asked for 10 contacts but were already positioned
-        // at the end of the list (or we asked for -10 contacts
-        // and were positioned at the beginning).
-        handle_end_of_list_condition (cursor);
-      }
-    else
-      {
-        // Some error actually occurred
-        handle_error_condition (cursor, error);
-      }
-
-    g_clear_error (&error);
-  }
-else if (n_results < 10)
-  {
-    // Cursor did not traverse as many contacts as requested.
-    //
-    // This is not an error but rather an indication that
-    // the end of the list was reached. The next attempt to
-    // move the cursor in the same direction will result in
-    // an E_CLIENT_ERROR_QUERY_REFUSED error.
-  }
1

       

     
   

@@ -730,60 +568,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
GError *error = NULL;
-gint index = currently_selected_index (user_interface);
-
-// At this point 'index' must be a numeric value corresponding
-// to one of the positions in the array returned by
-// e_book_client_cursor_get_alphabet().
-if (!e_book_client_cursor_set_alphabetic_index_sync (cursor,
-                                                     index,
-                                                     NULL,
-                                                     &error))
-  {
-    if (g_error_matches (error,
-                         E_CLIENT_ERROR,
-                         E_CLIENT_ERROR_OUT_OF_SYNC))
-      {
-        // The system locale has changed at the same time
-        // as we were setting an alphabetic cursor position.
-        handle_out_of_sync_condition (cursor);
-      }
-    else
-      {
-        // Some error actually occurred
-        handle_error_condition (cursor, error);
-      }
-
-    g_clear_error (&error);
-  }
1

       

     
   

@@ -818,38 +604,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
EContact *contact;
-const gchar * const *alphabet;
-gint index;
-
-// Fetch the first displayed EContact in the view
-contact = first_contact_in_the_list (user_interface);
-
-// Calculate the position in the alphabet for this contact
-index = e_book_client_cursor_get_contact_alphabetic_index (cursor, contact);
-
-// Fetch the alphabet labels
-alphabet = e_book_client_cursor_get_alphabet (cursor, &n_labels,
-                                              NULL, NULL, NULL);
-
-// Update label in user interface
-set_alphabetic_position_feedback_text (user_interface, alphabet[index]);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ECalBackend.html evolution-data-server-3.22.1/docs/reference/eds/html/ECalBackend.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ECalBackend.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ECalBackend.html	2016-10-10 08:14:34.000000000 +0000
@@ -1150,7 +1150,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ECollectionBackend.html evolution-data-server-3.22.1/docs/reference/eds/html/ECollectionBackend.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ECollectionBackend.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ECollectionBackend.html	2016-10-10 08:14:34.000000000 +0000
@@ -421,7 +421,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
@@ -467,7 +467,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
@@ -513,7 +513,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
@@ -559,7 +559,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/EDataBookCursor.html evolution-data-server-3.22.1/docs/reference/eds/html/EDataBookCursor.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/EDataBookCursor.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/EDataBookCursor.html	2016-10-10 08:14:34.000000000 +0000
@@ -283,60 +283,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
static void
-update_state_from_contact (EBookBackendSmth        *smth,
-                           EBookBackendSmthCursor  *cursor,
-                           EContact                *contact)
-{
-     gint i;
-
-     clear_state (smth, cursor);
-
-     // For each sort key the cursor was created for
-     for (i = 0; i < cursor->n_sort_fields; i++) {
-
-             // Using an ECollator created for the locale
-             // set on your EBookBackend...
-             const gchar *string = e_contact_get_const (contact, cursor->sort_fields[i]);
-
-             // Generate a sort key for each value
-             if (string)
-                     cursor->state->values[i] =
-                             e_collator_generate_key (smth->collator,
-                                                      string, NULL);
-             else
-                     cursor->state->values[i] = g_strdup ("");
-     }
-
-     state->last_uid = e_contact_get (contact, E_CONTACT_UID);
-}
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/eds-cursor-example.html evolution-data-server-3.22.1/docs/reference/eds/html/eds-cursor-example.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/eds-cursor-example.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/eds-cursor-example.html	2016-10-10 08:14:34.000000000 +0000
@@ -85,1402 +85,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
-246
-247
-248
-249
-250
-251
-252
-253
-254
-255
-256
-257
-258
-259
-260
-261
-262
-263
-264
-265
-266
-267
-268
-269
-270
-271
-272
-273
-274
-275
-276
-277
-278
-279
-280
-281
-282
-283
-284
-285
-286
-287
-288
-289
-290
-291
-292
-293
-294
-295
-296
-297
-298
-299
-300
-301
-302
-303
-304
-305
-306
-307
-308
-309
-310
-311
-312
-313
-314
-315
-316
-317
-318
-319
-320
-321
-322
-323
-324
-325
-326
-327
-328
-329
-330
-331
-332
-333
-334
-335
-336
-337
-338
-339
-340
-341
-342
-343
-344
-345
-346
-347
-348
-349
-350
-351
-352
-353
-354
-355
-356
-357
-358
-359
-360
-361
-362
-363
-364
-365
-366
-367
-368
-369
-370
-371
-372
-373
-374
-375
-376
-377
-378
-379
-380
-381
-382
-383
-384
-385
-386
-387
-388
-389
-390
-391
-392
-393
-394
-395
-396
-397
-398
-399
-400
-401
-402
-403
-404
-405
-406
-407
-408
-409
-410
-411
-412
-413
-414
-415
-416
-417
-418
-419
-420
-421
-422
-423
-424
-425
-426
-427
-428
-429
-430
-431
-432
-433
-434
-435
-436
-437
-438
-439
-440
-441
-442
-443
-444
-445
-446
-447
-448
-449
-450
-451
-452
-453
-454
-455
-456
-457
-458
-459
-460
-461
-462
-463
-464
-465
-466
-467
-468
-469
-470
-471
-472
-473
-474
-475
-476
-477
-478
-479
-480
-481
-482
-483
-484
-485
-486
-487
-488
-489
-490
-491
-492
-493
-494
-495
-496
-497
-498
-499
-500
-501
-502
-503
-504
-505
-506
-507
-508
-509
-510
-511
-512
-513
-514
-515
-516
-517
-518
-519
-520
-521
-522
-523
-524
-525
-526
-527
-528
-529
-530
-531
-532
-533
-534
-535
-536
-537
-538
-539
-540
-541
-542
-543
-544
-545
-546
-547
-548
-549
-550
-551
-552
-553
-554
-555
-556
-557
-558
-559
-560
-561
-562
-563
-564
-565
-566
-567
-568
-569
-570
-571
-572
-573
-574
-575
-576
-577
-578
-579
-580
-581
-582
-583
-584
-585
-586
-587
-588
-589
-590
-591
-592
-593
-594
-595
-596
-597
-598
-599
-600
-601
-602
-603
-604
-605
-606
-607
-608
-609
-610
-611
-612
-613
-614
-615
-616
-617
-618
-619
-620
-621
-622
-623
-624
-625
-626
-627
-628
-629
-630
-631
-632
-633
-634
-635
-636
-637
-638
-639
-640
-641
-642
-643
-644
-645
-646
-647
-648
-649
-650
-651
-652
-653
-654
-655
-656
-657
-658
-659
-660
-661
-662
-663
-664
-665
-666
-667
-668
-669
-670
-671
-672
-673
-674
-675
-676
-677
-678
-679
-680
-681
-682
-683
-684
-685
-686
-687
-688
-689
-690
-691
-692
-693
-694
-695
-696
-697
-698
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2013 Intel Corporation
- *
- * This library is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Tristan Van Berkom <tristanvb@openismus.com>
- */
-
-#include <libebook/libebook.h>
-
-#include "cursor-example.h"
-#include "cursor-navigator.h"
-#include "cursor-search.h"
-#include "cursor-slot.h"
-#include "cursor-data.h"
-#include "cursor-slot.h"
-
-#define N_SLOTS         10
-
-#define INITIAL_TIMEOUT 600
-#define TICK_TIMEOUT    100
-
-#define d(x)
-
-typedef enum _TimeoutActivity TimeoutActivity;
-
-/* GObjectClass */
-static void            cursor_example_dispose                 (GObject            *object);
-
-/* UI Callbacks */
-static gboolean        cursor_example_up_button_press         (CursorExample      *example,
-                               GdkEvent           *event,
-                               GtkButton          *button);
-static gboolean        cursor_example_up_button_release       (CursorExample      *example,
-                               GdkEvent           *event,
-                               GtkButton          *button);
-static gboolean        cursor_example_down_button_press       (CursorExample      *example,
-                               GdkEvent           *event,
-                               GtkButton          *button);
-static gboolean        cursor_example_down_button_release     (CursorExample      *example,
-                               GdkEvent           *event,
-                               GtkButton          *button);
-static void            cursor_example_navigator_changed       (CursorExample      *example,
-                               CursorNavigator    *navigator);
-static void            cursor_example_sexp_changed            (CursorExample      *example,
-                               GParamSpec         *pspec,
-                               CursorSearch       *search);
-
-/* EDS Callbacks */
-static void            cursor_example_refresh                 (EBookClientCursor  *cursor,
-                               CursorExample      *example);
-static void            cursor_example_alphabet_changed        (EBookClientCursor  *cursor,
-                               GParamSpec         *pspec,
-                               CursorExample      *example);
-static void            cursor_example_status_changed          (EBookClientCursor  *cursor,
-                               GParamSpec         *spec,
-                               CursorExample      *example);
-
-/* Utilities */
-static void            cursor_example_load_alphabet           (CursorExample      *example);
-static gboolean        cursor_example_move_cursor             (CursorExample      *example,
-                               EBookCursorOrigin   origin,
-                               gint                count);
-static gboolean        cursor_example_load_page               (CursorExample      *example,
-                               gboolean           *full_results);
-static void            cursor_example_update_status           (CursorExample      *example);
-static void            cursor_example_update_current_index    (CursorExample      *example,
-                               EContact           *contact);
-static void            cursor_example_ensure_timeout          (CursorExample      *example,
-                               TimeoutActivity     activity);
-static void            cursor_example_cancel_timeout          (CursorExample      *example);
-
-enum _TimeoutActivity {
-TIMEOUT_NONE = 0,
-TIMEOUT_UP_INITIAL,
-TIMEOUT_UP_TICK,
-TIMEOUT_DOWN_INITIAL,
-TIMEOUT_DOWN_TICK,
-};
-
-struct _CursorExamplePrivate {
-/* Screen widgets */
-GtkWidget *browse_up_button;
-GtkWidget *browse_down_button;
-GtkWidget *progressbar;
-GtkWidget *alphabet_label;
-GtkWidget *slots[N_SLOTS];
-CursorNavigator *navigator;
-
-/* EDS Resources */
-EBookClient          *client;
-EBookClientCursor    *cursor;
-
-/* Manage the automatic scrolling with button pressed */
-guint                 timeout_id;
-TimeoutActivity       activity;
-};
-
-G_DEFINE_TYPE_WITH_PRIVATE (CursorExample, cursor_example, GTK_TYPE_WINDOW);
-
-/************************************************************************
- *                          GObjectClass                                *
- ************************************************************************/
-static void
-cursor_example_class_init (CursorExampleClass *klass)
-{
-GObjectClass *object_class;
-GtkWidgetClass *widget_class;
-gint i;
-
-object_class = G_OBJECT_CLASS (klass);
-object_class->dispose = cursor_example_dispose;
-
-/* Bind to template */
-widget_class = GTK_WIDGET_CLASS (klass);
-gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/evolution/cursor-example/cursor-example.ui");
-gtk_widget_class_bind_template_child_private (widget_class, CursorExample, navigator);
-gtk_widget_class_bind_template_child_private (widget_class, CursorExample, browse_up_button);
-gtk_widget_class_bind_template_child_private (widget_class, CursorExample, browse_down_button);
-gtk_widget_class_bind_template_child_private (widget_class, CursorExample, alphabet_label);
-gtk_widget_class_bind_template_child_private (widget_class, CursorExample, progressbar);
-
-for (i = 0; i < N_SLOTS; i++) {
-    gchar *name = g_strdup_printf ("contact_slot_%d", i + 1);
-
-    gtk_widget_class_bind_template_child_full (widget_class, name, FALSE, 0);
-    g_free (name);
-}
-
-gtk_widget_class_bind_template_callback (widget_class, cursor_example_navigator_changed);
-gtk_widget_class_bind_template_callback (widget_class, cursor_example_up_button_press);
-gtk_widget_class_bind_template_callback (widget_class, cursor_example_up_button_release);
-gtk_widget_class_bind_template_callback (widget_class, cursor_example_down_button_press);
-gtk_widget_class_bind_template_callback (widget_class, cursor_example_down_button_release);
-gtk_widget_class_bind_template_callback (widget_class, cursor_example_sexp_changed);
-}
-
-static void
-cursor_example_init (CursorExample *example)
-{
-CursorExamplePrivate *priv;
-gint i;
-
-example->priv = priv =
-    cursor_example_get_instance_private (example);
-
-g_type_ensure (CURSOR_TYPE_NAVIGATOR);
-g_type_ensure (CURSOR_TYPE_SEARCH);
-
-gtk_widget_init_template (GTK_WIDGET (example));
-
-for (i = 0; i < N_SLOTS; i++) {
-
-    gchar *name = g_strdup_printf ("contact_slot_%d", i + 1);
-    priv->slots[i] = (GtkWidget *) gtk_widget_get_template_child (GTK_WIDGET (example),
-                                     CURSOR_TYPE_EXAMPLE,
-                                     name);
-    g_free (name);
-}
-}
-
-static void
-cursor_example_dispose (GObject *object)
-{
-CursorExample        *example = CURSOR_EXAMPLE (object);
-CursorExamplePrivate *priv = example->priv;
-
-cursor_example_cancel_timeout (example);
-
-if (priv->client) {
-    g_object_unref (priv->client);
-    priv->client = NULL;
-}
-
-if (priv->cursor) {
-    g_object_unref (priv->cursor);
-    priv->cursor = NULL;
-}
-
-G_OBJECT_CLASS (cursor_example_parent_class)->dispose (object);
-}
-
-/************************************************************************
- *                           UI Callbacks                               *
- ************************************************************************/
-static gboolean
-cursor_example_up_button_press (CursorExample *example,
-                                GdkEvent *event,
-                                GtkButton *button)
-{
-d (g_print ("Browse up press\n"));
-
-/* Move the cursor backwards by 1 and then refresh the page */
-if (cursor_example_move_cursor (example, E_BOOK_CURSOR_ORIGIN_CURRENT, 0 - 1))
-    cursor_example_load_page (example, NULL);
-
-cursor_example_ensure_timeout (example, TIMEOUT_UP_INITIAL);
-
-return FALSE;
-}
-
-static gboolean
-cursor_example_up_button_release (CursorExample *example,
-                                  GdkEvent *event,
-                                  GtkButton *button)
-{
-d (g_print ("Browse up release\n"));
-
-cursor_example_cancel_timeout (example);
-
-return FALSE;
-}
-
-static gboolean
-cursor_example_down_button_press (CursorExample *example,
-                                  GdkEvent *event,
-                                  GtkButton *button)
-{
-d (g_print ("Browse down press\n"));
-
-/* Move the cursor forward by 1 and then refresh the page */
-if (cursor_example_move_cursor (example, E_BOOK_CURSOR_ORIGIN_CURRENT, 1))
-    cursor_example_load_page (example, NULL);
-
-cursor_example_ensure_timeout (example, TIMEOUT_DOWN_INITIAL);
-
-return FALSE;
-}
-
-static gboolean
-cursor_example_down_button_release (CursorExample *example,
-                                    GdkEvent *event,
-                                    GtkButton *button)
-{
-d (g_print ("Browse down released\n"));
-
-cursor_example_cancel_timeout (example);
-
-return FALSE;
-}
-
-static void
-cursor_example_navigator_changed (CursorExample *example,
-                                  CursorNavigator *navigator)
-{
-CursorExamplePrivate *priv = example->priv;
-GError               *error = NULL;
-gint                  index;
-gboolean              full_results = FALSE;
-
-index = cursor_navigator_get_index (priv->navigator);
-
-d (g_print ("Alphabet index changed to: %d\n", index));
-
-/* Move to this index */
-if (!e_book_client_cursor_set_alphabetic_index_sync (priv->cursor, index, NULL, &error)) {
-
-    if (g_error_matches (error,
-                 E_CLIENT_ERROR,
-                 E_CLIENT_ERROR_OUT_OF_SYNC)) {
-
-        /* Just ignore the error.
-         *
-         * The addressbook locale has recently changed, very
-         * soon we will receive an alphabet change notification
-         * where we will reset the cursor position and reload
-         * the alphabet.
-         */
-        d (g_print ("Cursor was temporarily out of sync while setting the alphabetic target\n"));
-    } else
-        g_warning ("Failed to move the cursor: %s", error->message);
-
-    g_clear_error (&error);
-}
-
-/* And load one page full of results starting with this index */
-if (!cursor_example_load_page (example, &full_results))
-    return;
-
-/* If we hit the end of the results (less than a full page) then load the last page of results */
-if (!full_results) {
-    if (cursor_example_move_cursor (example,
-                    E_BOOK_CURSOR_ORIGIN_END,
-                    0 - (N_SLOTS + 1))) {
-        cursor_example_load_page (example, NULL);
-    }
-}
-}
-
-static void
-cursor_example_sexp_changed (CursorExample *example,
-                             GParamSpec *pspec,
-                             CursorSearch *search)
-{
-CursorExamplePrivate *priv = example->priv;
-gboolean              full_results = FALSE;
-GError               *error = NULL;
-const gchar          *sexp;
-
-sexp = cursor_search_get_sexp (search);
-
-d (g_print ("Search expression changed to: '%s'\n", sexp));
-
-/* Set the search expression */
-if (!e_book_client_cursor_set_sexp_sync (priv->cursor, sexp, NULL, &error)) {
-    g_warning ("Failed to move the cursor: %s", error->message);
-    g_clear_error (&error);
-}
-
-/* And load one page full of results */
-if (!cursor_example_load_page (example, &full_results))
-    return;
-
-/* If we hit the end of the results (less than a full page) then load the last page of results */
-if (!full_results)
-    if (cursor_example_move_cursor (example,
-                    E_BOOK_CURSOR_ORIGIN_END,
-                    0 - (N_SLOTS + 1))) {
-        cursor_example_load_page (example, NULL);
-}
-}
-
-/************************************************************************
- *                           EDS Callbacks                              *
- ************************************************************************/
-static void
-cursor_example_refresh (EBookClientCursor *cursor,
-                        CursorExample *example)
-{
-d (g_print ("Cursor refreshed\n"));
-
-/* Refresh the page */
-if (cursor_example_load_page (example, NULL))
-    cursor_example_update_status (example);
-}
-
-static void
-cursor_example_alphabet_changed (EBookClientCursor *cursor,
-                                 GParamSpec *spec,
-                                 CursorExample *example)
-{
-d (g_print ("Alphabet Changed\n"));
-
-cursor_example_load_alphabet (example);
-
-/* Get the first page of contacts in the addressbook */
-if (cursor_example_move_cursor (example, E_BOOK_CURSOR_ORIGIN_BEGIN, 0))
-    cursor_example_load_page (example, NULL);
-}
-
-static void
-cursor_example_status_changed (EBookClientCursor *cursor,
-                               GParamSpec *spec,
-                               CursorExample *example)
-{
-d (g_print ("Status changed\n"));
-
-cursor_example_update_status (example);
-}
-
-/************************************************************************
- *                             Utilities                                *
- ************************************************************************/
-static void
-cursor_example_load_alphabet (CursorExample *example)
-{
-CursorExamplePrivate *priv = example->priv;
-const gchar *const   *alphabet;
-
-/* Update the alphabet on the navigator */
-alphabet = e_book_client_cursor_get_alphabet (priv->cursor, NULL, NULL, NULL, NULL);
-cursor_navigator_set_alphabet (priv->navigator, alphabet);
-
-/* Reset navigator to the beginning */
-g_signal_handlers_block_by_func (priv->navigator, cursor_example_navigator_changed, example);
-cursor_navigator_set_index (priv->navigator, 0);
-g_signal_handlers_unblock_by_func (priv->navigator, cursor_example_navigator_changed, example);
-}
-
-static gboolean
-cursor_example_move_cursor (CursorExample *example,
-                            EBookCursorOrigin origin,
-                            gint count)
-{
-CursorExamplePrivate *priv = example->priv;
-GError               *error = NULL;
-gint                  n_results;
-
-n_results = e_book_client_cursor_step_sync (
-    priv->cursor,
-    E_BOOK_CURSOR_STEP_MOVE,
-    origin,
-    count,
-    NULL, /* Result list */
-    NULL, /* GCancellable */
-    &error);
-
-if (n_results < 0) {
-
-    if (g_error_matches (error,
-                 E_CLIENT_ERROR,
-                 E_CLIENT_ERROR_OUT_OF_SYNC)) {
-
-        /* The addressbook has very recently been modified,
-         * very soon we will receive a "refresh" signal and
-         * automatically reload the current page position.
-         */
-        d (g_print ("Cursor was temporarily out of sync while moving\n"));
-
-    } else if (g_error_matches (error,
-                    E_CLIENT_ERROR,
-                    E_CLIENT_ERROR_QUERY_REFUSED)) {
-
-        d (g_print ("End of list was reached\n"));
-
-    } else
-        g_warning ("Failed to move the cursor: %s", error->message);
-
-    g_clear_error (&error);
-
-}
-
-return n_results >= 0;
-}
-
-/* Loads a page at the current cursor position, returns
- * FALSE if there was an error.
- */
-static gboolean
-cursor_example_load_page (CursorExample *example,
-                          gboolean *full_results)
-{
-CursorExamplePrivate *priv = example->priv;
-GError               *error = NULL;
-GSList               *results = NULL;
-gint                  n_results;
-
-/* Fetch N_SLOTS contacts after the current cursor position,
- * without modifying the current cursor position
- */
-n_results = e_book_client_cursor_step_sync (
-    priv->cursor,
-    E_BOOK_CURSOR_STEP_FETCH,
-    E_BOOK_CURSOR_ORIGIN_CURRENT,
-    N_SLOTS,
-    &results,
-    NULL, /* GCancellable */
-    &error);
-
-if (n_results < 0) {
-    if (g_error_matches (error,
-                 E_CLIENT_ERROR,
-                 E_CLIENT_ERROR_OUT_OF_SYNC)) {
-
-        /* The addressbook has very recently been modified,
-         * very soon we will receive a "refresh" signal and
-         * automatically reload the current page position.
-         */
-        d (g_print ("Cursor was temporarily out of sync while loading page\n"));
-
-    } else if (g_error_matches (error,
-                    E_CLIENT_ERROR,
-                    E_CLIENT_ERROR_QUERY_REFUSED)) {
-
-        d (g_print ("End of list was reached\n"));
-
-    } else
-        g_warning ("Failed to move the cursor: %s", error->message);
-
-    g_clear_error (&error);
-
-} else {
-    /* Display the results */
-    EContact             *contact;
-    gint                  i;
-
-    /* Fill the page with results for the current cursor position
-     */
-    for (i = 0; i < N_SLOTS; i++) {
-        contact = g_slist_nth_data (results, i);
-
-        /* For the first contact, give some visual feedback about where we
-         * are in the list, which alphabet character we're browsing right now.
-         */
-        if (i == 0 && contact)
-            cursor_example_update_current_index (example, contact);
-
-        cursor_slot_set_from_contact (CURSOR_SLOT (priv->slots[i]), contact);
-    }
-}
-
-if (full_results)
-    *full_results = (n_results == N_SLOTS);
-
-g_slist_free_full (results, (GDestroyNotify) g_object_unref);
-
-return n_results >= 0;
-}
-
-static void
-cursor_example_update_status (CursorExample *example)
-{
-CursorExamplePrivate *priv = example->priv;
-gint                  total, position;
-gchar                *txt;
-gboolean              up_sensitive;
-gboolean              down_sensitive;
-gdouble               fraction;
-
-total = e_book_client_cursor_get_total (priv->cursor);
-position = e_book_client_cursor_get_position (priv->cursor);
-
-/* Set the label showing the cursor position and total contacts */
-txt = g_strdup_printf ("Position %d / Total %d", position, total);
-gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progressbar), txt);
-g_free (txt);
-
-/* Give visual feedback on how far we are into the contact list */
-fraction = position * 1.0F / (total - N_SLOTS);
-gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progressbar), fraction);
-
-/* Update sensitivity of buttons */
-if (total <= N_SLOTS) {
-    /* If the amount of contacts is less than the amount of visual slots,
-     * then we cannot browse up and down
-     */
-    up_sensitive = FALSE;
-    down_sensitive = FALSE;
-} else {
-    /* The cursor is always pointing directly before
-     * the first contact visible in the view, so if the
-     * cursor is passed the first contact we can rewind.
-     */
-    up_sensitive = position > 0;
-
-    /* If more than N_SLOTS contacts remain, then
-     * we can still scroll down */
-    down_sensitive = position < total - N_SLOTS;
-}
-
-gtk_widget_set_sensitive (priv->browse_up_button, up_sensitive);
-gtk_widget_set_sensitive (priv->browse_down_button, down_sensitive);
-}
-
-/* This is called when refreshing the window contents with
- * the first contact shown in the window.
- */
-static void
-cursor_example_update_current_index (CursorExample *example,
-                                     EContact *contact)
-{
-CursorExamplePrivate *priv = example->priv;
-const gchar *const   *labels;
-gint                  index;
-
-/* Fetch the alphabetic index for this contact */
-index = e_book_client_cursor_get_contact_alphabetic_index (priv->cursor, contact);
-
-/* Refresh the current alphabet index indicator.
- *
- * The index returned by e_book_client_cursor_get_contact_alphabetic_index() is
- * a valid position into the array returned by e_book_client_cursor_get_alphabet().
- */
-labels = e_book_client_cursor_get_alphabet (priv->cursor, NULL, NULL, NULL, NULL);
-gtk_label_set_text (GTK_LABEL (priv->alphabet_label), labels[index]);
-
-/* Update the current scroll position (and avoid reacting to the value change)
- */
-if (contact) {
-    g_signal_handlers_block_by_func (priv->navigator, cursor_example_navigator_changed, example);
-    cursor_navigator_set_index (priv->navigator, index);
-    g_signal_handlers_unblock_by_func (priv->navigator, cursor_example_navigator_changed, example);
-}
-}
-
-static gboolean
-cursor_example_timeout (CursorExample *example)
-{
-CursorExamplePrivate *priv = example->priv;
-gboolean can_move;
-
-switch (priv->activity) {
-case TIMEOUT_NONE:
-    break;
-
-case TIMEOUT_UP_INITIAL:
-case TIMEOUT_UP_TICK:
-
-    /* Move the cursor backwards by 1 and then refresh the page */
-    if (cursor_example_move_cursor (example, E_BOOK_CURSOR_ORIGIN_CURRENT, 0 - 1)) {
-        cursor_example_load_page (example, NULL);
-        cursor_example_ensure_timeout (example, TIMEOUT_UP_TICK);
-    } else
-        cursor_example_cancel_timeout (example);
-
-    break;
-
-case TIMEOUT_DOWN_INITIAL:
-case TIMEOUT_DOWN_TICK:
-
-    /* Avoid scrolling past the end of the list - N_SLOTS */
-    can_move = (e_book_client_cursor_get_position (priv->cursor) <
-            e_book_client_cursor_get_total (priv->cursor) - N_SLOTS);
-
-    /* Move the cursor forwards by 1 and then refresh the page */
-    if (can_move &&
-        cursor_example_move_cursor (example, E_BOOK_CURSOR_ORIGIN_CURRENT, 1)) {
-        cursor_example_load_page (example, NULL);
-        cursor_example_ensure_timeout (example, TIMEOUT_DOWN_TICK);
-    } else
-        cursor_example_cancel_timeout (example);
-
-    break;
-}
-
-return FALSE;
-}
-
-static void
-cursor_example_ensure_timeout (CursorExample *example,
-                               TimeoutActivity activity)
-{
-CursorExamplePrivate *priv = example->priv;
-guint                 timeout = 0;
-
-cursor_example_cancel_timeout (example);
-
-if (activity == TIMEOUT_UP_INITIAL ||
-    activity == TIMEOUT_DOWN_INITIAL)
-    timeout = INITIAL_TIMEOUT;
-else
-    timeout = TICK_TIMEOUT;
-
-priv->activity = activity;
-
-priv->timeout_id =
-    g_timeout_add (
-        timeout,
-        (GSourceFunc) cursor_example_timeout,
-        example);
-}
-
-static void
-cursor_example_cancel_timeout (CursorExample *example)
-{
-CursorExamplePrivate *priv = example->priv;
-
-if (priv->timeout_id) {
-    g_source_remove (priv->timeout_id);
-    priv->timeout_id = 0;
-}
-}
-
-/************************************************************************
- *                                API                                   *
- ************************************************************************/
-GtkWidget *
-cursor_example_new (const gchar *vcard_path)
-{
-  CursorExample *example;
-  CursorExamplePrivate *priv;
-
-  example = g_object_new (CURSOR_TYPE_EXAMPLE, NULL);
-  priv = example->priv;
-
-  priv->client = cursor_load_data (vcard_path, &priv->cursor);
-
-  cursor_example_load_alphabet (example);
-
-  /* Load the first page of results */
-  cursor_example_load_page (example, NULL);
-  cursor_example_update_status (example);
-
-  g_signal_connect (priv->cursor, "refresh",
-        G_CALLBACK (cursor_example_refresh), example);
-  g_signal_connect (priv->cursor, "notify::alphabet",
-        G_CALLBACK (cursor_example_alphabet_changed), example);
-  g_signal_connect (priv->cursor, "notify::total",
-        G_CALLBACK (cursor_example_status_changed), example);
-  g_signal_connect (priv->cursor, "notify::position",
-        G_CALLBACK (cursor_example_status_changed), example);
-
-  g_message ("Cursor example started in locale: %s",
-     e_book_client_get_locale (priv->client));
-
-  return (GtkWidget *) example;
-}
1

       

     
   

@@ -1499,520 +105,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
-246
-247
-248
-249
-250
-251
-252
-253
-254
-255
-256
-257
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2013 Intel Corporation
- *
- * This library is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Tristan Van Berkom <tristanvb@openismus.com>
- */
-
-#include "cursor-navigator.h"
-
-/* GObjectClass */
-static void            cursor_navigator_constructed     (GObject              *object);
-static void            cursor_navigator_finalize        (GObject              *object);
-
-/* GtkScaleClass */
-static gchar          *cursor_navigator_format_value    (GtkScale             *scale,
-                         gdouble               value);
-
-static void            cursor_navigator_changed         (GtkAdjustment        *adj,
-                         GParamSpec           *pspec,
-                         CursorNavigator      *navigator);
-
-struct _CursorNavigatorPrivate {
-gchar **alphabet;
-gint    letters;
-gint    index;
-};
-
-enum {
-INDEX_CHANGED,
-LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-enum {
-PROP_0,
-PROP_INDEX,
-};
-
-G_DEFINE_TYPE (CursorNavigator, cursor_navigator, GTK_TYPE_SCALE);
-
-/************************************************************************
- *                          GObjectClass                                *
- ************************************************************************/
-static void
-cursor_navigator_class_init (CursorNavigatorClass *klass)
-{
-GObjectClass       *object_class;
-GtkScaleClass      *scale_class;
-
-object_class = G_OBJECT_CLASS (klass);
-object_class->constructed = cursor_navigator_constructed;
-object_class->finalize = cursor_navigator_finalize;
-
-scale_class = GTK_SCALE_CLASS (klass);
-scale_class->format_value = cursor_navigator_format_value;
-
-signals[INDEX_CHANGED] = g_signal_new (
-    "index-changed",
-    G_OBJECT_CLASS_TYPE (object_class),
-    G_SIGNAL_RUN_LAST,
-    0, NULL, NULL, NULL,
-    G_TYPE_NONE, 0);
-
-g_type_class_add_private (object_class, sizeof (CursorNavigatorPrivate));
-}
-
-static void
-cursor_navigator_init (CursorNavigator *navigator)
-{
-CursorNavigatorPrivate *priv;
-
-navigator->priv = priv =
-    G_TYPE_INSTANCE_GET_PRIVATE (
-        navigator,
-        CURSOR_TYPE_NAVIGATOR,
-        CursorNavigatorPrivate);
-
-priv->letters = -1;
-}
-
-static void
-cursor_navigator_constructed (GObject *object)
-{
-CursorNavigator        *navigator = CURSOR_NAVIGATOR (object);
-GtkAdjustment          *adj = NULL;
-
-G_OBJECT_CLASS (cursor_navigator_parent_class)->constructed (object);
-
-adj = gtk_adjustment_new (0.0F, 0.0F, 1.0F, 1.0F, 1.0F, 0.0F);
-gtk_range_set_adjustment (GTK_RANGE (navigator), adj);
-
-g_signal_connect (
-    adj, "notify::value",
-    G_CALLBACK (cursor_navigator_changed), navigator);
-}
-
-static void
-cursor_navigator_finalize (GObject *object)
-{
-CursorNavigator        *navigator = CURSOR_NAVIGATOR (object);
-CursorNavigatorPrivate *priv = navigator->priv;
-
-g_strfreev (priv->alphabet);
-
-G_OBJECT_CLASS (cursor_navigator_parent_class)->finalize (object);
-}
-
-/************************************************************************
- *                          GtkScaleClass                               *
- ************************************************************************/
-static gchar *
-cursor_navigator_format_value (GtkScale *scale,
-                               gdouble value)
-{
-CursorNavigator        *navigator = CURSOR_NAVIGATOR (scale);
-CursorNavigatorPrivate *priv = navigator->priv;
-gint                    index;
-
-if (priv->letters < 0)
-    return NULL;
-
-index = CLAMP ((gint) value, 0, priv->letters - 1);
-
-/* Return the letter for the gvoidiven value
- */
-return g_strdup (priv->alphabet[index]);
-}
-
-static void
-cursor_navigator_changed (GtkAdjustment *adj,
-                          GParamSpec *pspec,
-                          CursorNavigator *navigator)
-{
-gint index = gtk_adjustment_get_value (adj);
-
-cursor_navigator_set_index (navigator, index);
-}
-
-/************************************************************************
- *                                API                                   *
- ************************************************************************/
-CursorNavigator *
-cursor_navigator_new (void)
-{
-return g_object_new (CURSOR_TYPE_NAVIGATOR, NULL);
-}
-
-static void
-cursor_navigator_update_parameters (CursorNavigator *navigator)
-{
-CursorNavigatorPrivate *priv = navigator->priv;
-GtkScale               *scale = GTK_SCALE (navigator);
-GtkAdjustment          *adj;
-gint                    i;
-
-gtk_scale_clear_marks (scale);
-for (i = 0; i < priv->letters; i++) {
-    gchar *letter;
-
-    letter = g_strdup_printf ("<span size=\"x-small\">%s</span>", priv->alphabet[i]);
-
-    gtk_scale_add_mark (scale, i, GTK_POS_LEFT, letter);
-    g_free (letter);
-}
-
-adj = gtk_range_get_adjustment (GTK_RANGE (navigator));
-
-gtk_adjustment_set_upper (adj, priv->letters - 1);
-}
-
-void
-cursor_navigator_set_alphabet (CursorNavigator *navigator,
-                               const gchar * const *alphabet)
-{
-CursorNavigatorPrivate *priv;
-
-g_return_if_fail (CURSOR_IS_NAVIGATOR (navigator));
-g_return_if_fail (alphabet == NULL ||
-          g_strv_length ((gchar **) alphabet) > 0);
-
-priv = navigator->priv;
-
-g_free (priv->alphabet);
-if (alphabet) {
-    priv->alphabet = g_strdupv ((gchar **) alphabet);
-    priv->letters = g_strv_length ((gchar **) alphabet);
-} else {
-    priv->alphabet = NULL;
-    priv->letters = -1;
-}
-
-cursor_navigator_update_parameters (navigator);
-cursor_navigator_set_index (navigator, 0);
-}
-
-const gchar * const *
-cursor_navigator_get_alphabet (CursorNavigator *navigator)
-{
-CursorNavigatorPrivate *priv;
-
-g_return_val_if_fail (CURSOR_IS_NAVIGATOR (navigator), NULL);
-
-priv = navigator->priv;
-
-return (const gchar * const *) priv->alphabet;
-}
-
-void
-cursor_navigator_set_index (CursorNavigator *navigator,
-                            gint index)
-{
-CursorNavigatorPrivate *priv;
-GtkAdjustment          *adj;
-
-g_return_if_fail (CURSOR_IS_NAVIGATOR (navigator));
-
-priv = navigator->priv;
-adj = gtk_range_get_adjustment (GTK_RANGE (navigator));
-
-index = CLAMP (index, 0, priv->letters);
-
-if (priv->index != index) {
-
-    priv->index = index;
-
-    g_signal_emit (navigator, signals[INDEX_CHANGED], 0);
-
-    g_signal_handlers_block_by_func (adj, cursor_navigator_changed, navigator);
-    gtk_adjustment_set_value (adj, priv->index);
-    g_signal_handlers_unblock_by_func (adj, cursor_navigator_changed, navigator);
-}
-}
-
-gint
-cursor_navigator_get_index (CursorNavigator *navigator)
-{
-CursorNavigatorPrivate *priv;
-
-g_return_val_if_fail (CURSOR_IS_NAVIGATOR (navigator), 0);
-
-priv = navigator->priv;
-
-return priv->index;
-}
1

       

     
   

@@ -2031,512 +125,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
-246
-247
-248
-249
-250
-251
-252
-253
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2013 Intel Corporation
- *
- * This library is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Tristan Van Berkom <tristanvb@openismus.com>
- */
-
-#include <libebook/libebook.h>
-
-#include "cursor-search.h"
-
-/* GObjectClass */
-static void  cursor_search_finalize       (GObject           *object);
-static void  cursor_search_get_property   (GObject           *object,
-                   guint              property_id,
-                   GValue            *value,
-                   GParamSpec        *pspec);
-
-/* UI Callbacks */
-static void  cursor_search_option_toggled (CursorSearch         *search,
-                   GtkWidget            *item);
-static void  cursor_search_entry_changed  (CursorSearch         *search,
-                   GtkEditable          *entry);
-static void  cursor_search_icon_press     (CursorSearch         *search,
-                   GtkEntryIconPosition  icon_pos,
-                   GdkEvent             *event,
-                   GtkEntry             *entry);
-
-typedef enum {
-SEARCH_NAME,
-SEARCH_PHONE,
-SEARCH_EMAIL
-} SearchType;
-
-struct _CursorSearchPrivate {
-GtkWidget   *popup;
-GtkWidget   *name_radio;
-GtkWidget   *phone_radio;
-GtkWidget   *email_radio;
-
-SearchType   type;
-gchar       *sexp;
-};
-
-enum {
-PROP_0,
-PROP_SEXP,
-};
-
-G_DEFINE_TYPE_WITH_PRIVATE (CursorSearch, cursor_search, GTK_TYPE_SEARCH_ENTRY);
-
-/************************************************************************
- *                          GObjectClass                                *
- ************************************************************************/
-static void
-cursor_search_class_init (CursorSearchClass *klass)
-{
-GObjectClass *object_class;
-GtkWidgetClass *widget_class;
-
-object_class = G_OBJECT_CLASS (klass);
-object_class->finalize = cursor_search_finalize;
-object_class->get_property = cursor_search_get_property;
-
-g_object_class_install_property (
-    object_class,
-    PROP_SEXP,
-    g_param_spec_string (
-        "sexp",
-        "Search Expression",
-        "The active search expression",
-        NULL,
-        G_PARAM_READABLE |
-        G_PARAM_STATIC_STRINGS));
-
-/* Bind to template */
-widget_class = GTK_WIDGET_CLASS (klass);
-gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/evolution/cursor-example/cursor-search.ui");
-gtk_widget_class_bind_template_child_private (widget_class, CursorSearch, popup);
-gtk_widget_class_bind_template_child_private (widget_class, CursorSearch, name_radio);
-gtk_widget_class_bind_template_child_private (widget_class, CursorSearch, phone_radio);
-gtk_widget_class_bind_template_child_private (widget_class, CursorSearch, email_radio);
-gtk_widget_class_bind_template_callback (widget_class, cursor_search_option_toggled);
-gtk_widget_class_bind_template_callback (widget_class, cursor_search_entry_changed);
-gtk_widget_class_bind_template_callback (widget_class, cursor_search_icon_press);
-}
-
-static void
-cursor_search_init (CursorSearch *search)
-{
-search->priv = cursor_search_get_instance_private (search);
-
-gtk_widget_init_template (GTK_WIDGET (search));
-
-g_object_set (
-    search,
-    "primary-icon-activatable", TRUE,
-    "primary-icon-sensitive", TRUE,
-    NULL);
-}
-
-static void
-cursor_search_finalize (GObject *object)
-{
-CursorSearch        *search = CURSOR_SEARCH (object);
-CursorSearchPrivate *priv = search->priv;
-
-g_free (priv->sexp);
-
-G_OBJECT_CLASS (cursor_search_parent_class)->finalize (object);
-}
-
-static void
-cursor_search_get_property (GObject *object,
-                            guint property_id,
-                            GValue *value,
-                            GParamSpec *pspec)
-{
-CursorSearch        *search = CURSOR_SEARCH (object);
-CursorSearchPrivate *priv = search->priv;
-
-switch (property_id) {
-case PROP_SEXP:
-    g_value_set_string (value, priv->sexp);
-    break;
-
-default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    break;
-
-}
-}
-
-/************************************************************************
- *                              UI Callbacks                            *
- ************************************************************************/
-static void
-cursor_search_option_toggled (CursorSearch *search,
-                              GtkWidget *item)
-{
-CursorSearchPrivate *priv = search->priv;
-
-if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item))) {
-
-    if (item == priv->name_radio)
-        priv->type = SEARCH_NAME;
-    else if (item == priv->phone_radio)
-        priv->type = SEARCH_PHONE;
-    else if (item == priv->email_radio)
-        priv->type = SEARCH_EMAIL;
-
-    /* Refresh the search */
-    cursor_search_entry_changed (search, NULL);
-}
-}
-
-static void
-cursor_search_entry_changed (CursorSearch *search,
-                             GtkEditable *entry)
-{
-CursorSearchPrivate *priv = search->priv;
-EBookQuery  *query = NULL;
-const gchar *text;
-
-text = gtk_entry_get_text (GTK_ENTRY (search));
-
-if (text && text[0]) {
-    switch (priv->type) {
-    case SEARCH_NAME:
-        query = e_book_query_orv (
-            e_book_query_field_test (E_CONTACT_FAMILY_NAME,
-            E_BOOK_QUERY_CONTAINS,
-            text),
-            e_book_query_field_test (E_CONTACT_GIVEN_NAME,
-            E_BOOK_QUERY_CONTAINS,
-            text),
-            NULL);
-        break;
-    case SEARCH_PHONE:
-        query = e_book_query_field_test (
-            E_CONTACT_TEL,
-            E_BOOK_QUERY_CONTAINS,
-            text);
-        break;
-    case SEARCH_EMAIL:
-        query = e_book_query_field_test (
-            E_CONTACT_EMAIL,
-            E_BOOK_QUERY_CONTAINS,
-            text);
-        break;
-    }
-}
-
-g_free (priv->sexp);
-
-if (query) {
-    priv->sexp = e_book_query_to_string (query);
-    e_book_query_unref (query);
-} else
-    priv->sexp = g_strdup ("");
-
-g_object_notify (G_OBJECT (search), "sexp");
-}
-
-static void
-cursor_search_icon_press (CursorSearch *search,
-                          GtkEntryIconPosition icon_pos,
-                          GdkEvent *event,
-                          GtkEntry *entry)
-{
-CursorSearchPrivate *priv = search->priv;
-GdkEventButton *button_event = (GdkEventButton *) event;
-
-if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup (
-        GTK_MENU (priv->popup),
-            NULL, NULL, NULL, NULL,
-            button_event->button,
-            button_event->time);
-}
-
-/************************************************************************
- *                                API                                   *
- ************************************************************************/
-GtkWidget *
-cursor_search_new (void)
-{
-  return (GtkWidget *) g_object_new (CURSOR_TYPE_SEARCH, NULL);
-}
-
-const gchar *
-cursor_search_get_sexp (CursorSearch *search)
-{
-CursorSearchPrivate *priv;
-
-g_return_val_if_fail (CURSOR_IS_SEARCH (search), NULL);
-
-priv = search->priv;
-
-return priv->sexp;
-}
1

       

     
   

@@ -2553,278 +143,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2013 Intel Corporation
- *
- * This library is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Tristan Van Berkom <tristanvb@openismus.com>
- */
-
-#include <libebook/libebook.h>
-
-#include "cursor-slot.h"
-
-struct _CursorSlotPrivate {
-/* Screen widgets */
-GtkWidget *area;
-GtkLabel  *name_label;
-GtkLabel  *emails_label;
-GtkLabel  *telephones_label;
-};
-
-G_DEFINE_TYPE_WITH_PRIVATE (CursorSlot, cursor_slot, GTK_TYPE_GRID);
-
-/************************************************************************
- *                          GObjectClass                                *
- ************************************************************************/
-static void
-cursor_slot_class_init (CursorSlotClass *klass)
-{
-GtkWidgetClass *widget_class;
-
-/* Bind to template */
-widget_class = GTK_WIDGET_CLASS (klass);
-gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/evolution/cursor-example/cursor-slot.ui");
-gtk_widget_class_bind_template_child_private (widget_class, CursorSlot, area);
-gtk_widget_class_bind_template_child_private (widget_class, CursorSlot, name_label);
-gtk_widget_class_bind_template_child_private (widget_class, CursorSlot, emails_label);
-gtk_widget_class_bind_template_child_private (widget_class, CursorSlot, telephones_label);
-}
-
-static void
-cursor_slot_init (CursorSlot *slot)
-{
-slot->priv = cursor_slot_get_instance_private (slot);
-
-gtk_widget_init_template (GTK_WIDGET (slot));
-}
-
-/************************************************************************
- *                                API                                   *
- ************************************************************************/
-GtkWidget *
-cursor_slot_new (EContact *contact)
-{
-  CursorSlot *slot;
-
-  slot = g_object_new (CURSOR_TYPE_SLOT, NULL);
-
-  cursor_slot_set_from_contact (slot, contact);
-
-  return (GtkWidget *) slot;
-}
-
-static gchar *
-make_string_from_list (EContact *contact,
-                       EContactField field)
-{
-GList *values, *l;
-GString *string;
-
-string = g_string_new ("<span size=\"x-small\">");
-values = e_contact_get (contact, field);
-
-for (l = values; l; l = l->next) {
-    gchar *value = (gchar *) l->data;
-
-    if (l->prev != NULL)
-        g_string_append (string, ", ");
-
-    g_string_append (string, value);
-}
-
-if (!values)
-    g_string_append (string, " - none - ");
-
-e_contact_attr_list_free (values);
-g_string_append (string, "</span>");
-
-return g_string_free (string, FALSE);
-}
-
-void
-cursor_slot_set_from_contact (CursorSlot *slot,
-                              EContact *contact)
-{
-CursorSlotPrivate *priv;
-const gchar *family_name, *given_name;
-gchar *str;
-
-g_return_if_fail (CURSOR_IS_SLOT (slot));
-g_return_if_fail (contact == NULL || E_IS_CONTACT (contact));
-
-priv = slot->priv;
-
-if (!contact) {
-    gtk_widget_hide (priv->area);
-    return;
-}
-
-family_name = (const gchar *) e_contact_get_const (contact, E_CONTACT_FAMILY_NAME);
-given_name = (const gchar *) e_contact_get_const (contact, E_CONTACT_GIVEN_NAME);
-
-str = g_strdup_printf ("%s, %s", family_name, given_name);
-gtk_label_set_text (priv->name_label, str);
-g_free (str);
-
-str = make_string_from_list (contact, E_CONTACT_EMAIL);
-gtk_label_set_markup (priv->emails_label, str);
-g_free (str);
-
-str = make_string_from_list (contact, E_CONTACT_TEL);
-gtk_label_set_markup (priv->telephones_label, str);
-g_free (str);
-
-gtk_widget_show (priv->area);
-}
1

       

     
   

@@ -2842,508 +162,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
-246
-247
-248
-249
-250
-251
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2013 Intel Corporation
- *
- * This library is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Tristan Van Berkom <tristanvb@openismus.com>
- */
-
-#include "cursor-data.h"
-
-#define CURSOR_DATA_SOURCE_ID "cursor-example-book"
-
-/* We need to spin the main loop a bit to wait for the ESource
- * to be created. This particular API is admittedly cumbersome,
- * hopefully this will be fixed in a later version so that
- * the ESource can be synchronously created.
- *
- * Just an example so lets just use some global variables here...
- */
-static EBookClient *address_book = NULL;
-static ESource     *address_book_source = NULL;
-
-static void
-cursor_data_source_added (ESourceRegistry *registry,
-                          ESource *source,
-                          gpointer data)
-{
-GError    *error = NULL;
-GMainLoop *loop = (GMainLoop *) data;
-
-if (g_strcmp0 (e_source_get_uid (source), CURSOR_DATA_SOURCE_ID) != 0)
-    return;
-
-/* Open the address book */
-address_book = (EBookClient *) e_book_client_connect_sync (source, 30, NULL, &error);
-if (!address_book)
-    g_error ("Unable to create the test book: %s", error->message);
-
-address_book_source = g_object_ref (source);
-
-if (loop)
-    g_main_loop_quit (loop);
-}
-
-static gboolean
-cursor_data_source_timeout (gpointer user_data)
-{
-g_error ("Timed out while waiting for ESource creation from the registry");
-
-return FALSE;
-}
-
-/*
- * Helper function to load a contact from a vcard file.
- */
-static EContact *
-contact_from_file (const gchar *vcard_file)
-{
-EContact *contact;
-GError *error;
-gchar *vcard = NULL;
-
-if (!g_file_get_contents (vcard_file, &vcard, NULL, &error))
-    g_error ("Failed to load vcard: %s", error->message);
-
-contact = e_contact_new_from_vcard (vcard);
-g_free (vcard);
-
-return contact;
-}
-
-/*
- * Load all the contacts from 'vcard_directory', and add them to 'client'.
- */
-static void
-load_contacts (EBookClient *client,
-               const gchar *vcard_directory)
-{
-GDir *dir;
-GError *error = NULL;
-const gchar *filename;
-GSList *contacts = NULL;
-
-dir = g_dir_open (vcard_directory, 0, &error);
-if (!dir)
-    g_error ("Failed to open vcard directory '%s': %s", vcard_directory, error->message);
-
-while ((filename = g_dir_read_name (dir)) != NULL) {
-
-    if (g_str_has_suffix (filename, ".vcf")) {
-        gchar *fullpath = g_build_filename (vcard_directory, filename, NULL);
-        EContact *contact;
-
-        contact = contact_from_file (fullpath);
-        contacts = g_slist_prepend (contacts, contact);
-
-        g_free (fullpath);
-    }
-}
-
-g_dir_close (dir);
-
-if (contacts != NULL) {
-
-    if (!e_book_client_add_contacts_sync (client, contacts, NULL, NULL, &error)) {
-
-        /* If they were already added, ignore the error */
-        if (g_error_matches (error, E_BOOK_CLIENT_ERROR,
-                     E_BOOK_CLIENT_ERROR_CONTACT_ID_ALREADY_EXISTS))
-            g_clear_error (&error);
-        else
-            g_error ("Failed to add test contacts: %s", error->message);
-    }
-}
-}
-
-/*
- * Create an EBookClient cursor sorted by family name, and then by given name as
- * the secondary sort key.
- */
-static EBookClientCursor *
-get_cursor (EBookClient *book_client)
-{
-  EContactField sort_fields[] = { E_CONTACT_FAMILY_NAME, E_CONTACT_GIVEN_NAME };
-  EBookCursorSortType sort_types[] = { E_BOOK_CURSOR_SORT_ASCENDING, E_BOOK_CURSOR_SORT_ASCENDING };
-  EBookClientCursor *cursor = NULL;
-  GError *error = NULL;
-
-  if (!e_book_client_get_cursor_sync (book_client,
-                  NULL,
-                  sort_fields,
-                  sort_types,
-                  2,
-                  &cursor,
-                  NULL,
-                  &error)) {
-  g_warning ("Unable to create cursor");
-  g_clear_error (&error);
-  }
-
-  return cursor;
-}
-
-/* Entry point for this file, here we take care of
- * creating the addressbook if it doesnt exist,
- * getting an EBookClient, and creating our EBookClientCursor.
- */
-EBookClient *
-cursor_load_data (const gchar *vcard_path,
-                  EBookClientCursor **ret_cursor)
-{
-ESourceRegistry *registry;
-ESource *scratch;
-ESourceBackend *backend = NULL;
-GMainLoop *loop;
-GError  *error = NULL;
-EBookClient *ret_book;
-
-g_return_val_if_fail (vcard_path != NULL, NULL);
-g_return_val_if_fail (ret_cursor != NULL, NULL);
-
-g_print ("Cursor loading data from %s\n", vcard_path);
-
-loop = g_main_loop_new (NULL, FALSE);
-
-registry = e_source_registry_new_sync (NULL, &error);
-if (!registry)
-    g_error ("Unable to create the registry: %s", error->message);
-
-/* Listen to the registry for our added source */
-g_signal_connect (
-    registry, "source-added",
-    G_CALLBACK (cursor_data_source_added), loop);
-
-/* Now create a scratch source for our addressbook */
-scratch = e_source_new_with_uid (CURSOR_DATA_SOURCE_ID, NULL, &error);
-
-/* Ensure the new ESource will be a local addressbook source */
-backend = e_source_get_extension (scratch, E_SOURCE_EXTENSION_ADDRESS_BOOK);
-e_source_backend_set_backend_name (backend, "local");
-
-/* Now is the right time to use the ESourceBackendSummarySetup to configure
- * your newly created addressbook. This configuration should happen on the
- * scratch source before calling e_source_registry_commit_source_sync().
- */
-
-/* Commit the source to the registry */
-if (!e_source_registry_commit_source_sync (registry, scratch, NULL, &error)) {
-
-    /* It's possible the source already exists if we already ran the example with this data server */
-    if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
-        /* If so... then just call our callback early */
-        ESource *source = e_source_registry_ref_source (registry, CURSOR_DATA_SOURCE_ID);
-
-        g_clear_error (&error);
-        g_return_val_if_fail (E_IS_SOURCE (source), NULL);
-
-        /* Run the callback which creates the addressbook client connection */
-        cursor_data_source_added (registry, source, NULL);
-        g_object_unref (source);
-    } else
-        g_error ("Unable to add new addressbook source to the registry: %s", error->message);
-}
-
-g_object_unref (scratch);
-
-/* Give EDS a little time to actually create the ESource remotely and
- * also have a copy if it cached locally, wait for the "source-added"
- * signal.
- */
-if (address_book == NULL) {
-    g_timeout_add_seconds (20, cursor_data_source_timeout, NULL);
-    g_main_loop_run (loop);
-
-    /* By now we aborted or we have an addressbook created */
-    g_return_val_if_fail (address_book != NULL, NULL);
-}
-
-/**********************************************************
- * Ok, done with creating an addressbook, let's add data  *
- **********************************************************/
-load_contacts (address_book, vcard_path);
-
-/* Addressbook should have contacts now, let's create the cursor */
-*ret_cursor = get_cursor (address_book);
-
-/* Cleanup some resources we used to populate the addressbook */
-g_main_loop_unref (loop);
-g_object_unref (address_book_source);
-g_object_unref (registry);
-
-/* Give the ref through the return value*/
-ret_book = address_book;
-
-address_book_source = NULL;
-address_book = NULL;
-
-/* Return the addressbook */
-return ret_book;
-}
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/eds.devhelp2 evolution-data-server-3.22.1/docs/reference/eds/html/eds.devhelp2
--- evolution-data-server-3.22.0/docs/reference/eds/html/eds.devhelp2	2016-09-19 07:53:02.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/eds.devhelp2	2016-10-10 08:14:33.000000000 +0000
@@ -2477,6 +2477,7 @@
     
     
     
+    
     
     
     
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/eds-e-data-server-util.html evolution-data-server-3.22.1/docs/reference/eds/html/eds-e-data-server-util.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/eds-e-data-server-util.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/eds-e-data-server-util.html	2016-10-10 08:14:34.000000000 +0000
@@ -1166,28 +1166,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
const gchar *trusted_utf8;
-gchar *allocated = NULL;
-
-trusted_utf8 = e_util_ensure_gdbus_string (untrusted_utf8, &allocated);
-
-Do stuff with trusted_utf8, then clear it.
-
-trusted_utf8 = NULL;
-
-g_free (allocated);
-allocated = NULL;
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/eds-eds-version.html evolution-data-server-3.22.1/docs/reference/eds/html/eds-eds-version.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/eds-eds-version.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/eds-eds-version.html	2016-10-10 08:14:34.000000000 +0000
@@ -204,7 +204,7 @@
 

 

 
EDS_MICRO_VERSION

-
#define EDS_MICRO_VERSION 0
+
#define EDS_MICRO_VERSION 1
 

 
The micro version number of the Evolution-Data-Server library.  Like
 eds_micro_version(), but from the headers used at application compile
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/eds-e-test-server-utils.html evolution-data-server-3.22.1/docs/reference/eds/html/eds-e-test-server-utils.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/eds-e-test-server-utils.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/eds-e-test-server-utils.html	2016-10-10 08:14:34.000000000 +0000
@@ -140,7 +140,7 @@
     
       
         
1

-        
EBookClient *book = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);

+        

       
     
   
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/EExtensible.html evolution-data-server-3.22.1/docs/reference/eds/html/EExtensible.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/EExtensible.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/EExtensible.html	2016-10-10 08:14:34.000000000 +0000
@@ -81,16 +81,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-G_DEFINE_TYPE_WITH_CODE (
-        ECustomWidget, e_custom_widget, GTK_TYPE_WIDGET,
-        G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL))
1

       

     
   

@@ -104,20 +96,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
static void
-e_custom_widget_constructed (ECustomWidget *widget)
-{
-        Construction code goes here, same as call to parent's 'constructed'...
-
-        e_extensible_load_extensions (E_EXTENSIBLE (widget));
-}
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceAddressBook.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceAddressBook.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceAddressBook.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceAddressBook.html	2016-10-10 08:14:34.000000000 +0000
@@ -73,16 +73,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceAddressBook *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_ADDRESS_BOOK);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceAlarms.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceAlarms.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceAlarms.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceAlarms.html	2016-10-10 08:14:34.000000000 +0000
@@ -121,16 +121,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceAlarms *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_ALARMS);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceAuthentication.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceAuthentication.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceAuthentication.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceAuthentication.html	2016-10-10 08:14:34.000000000 +0000
@@ -246,16 +246,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceAuthentication *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_AUTHENTICATION);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceAutocomplete.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceAutocomplete.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceAutocomplete.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceAutocomplete.html	2016-10-10 08:14:34.000000000 +0000
@@ -99,16 +99,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceAutocomplete *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_AUTOCOMPLETE);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceBackendSummarySetup.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceBackendSummarySetup.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceBackendSummarySetup.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceBackendSummarySetup.html	2016-10-10 08:14:34.000000000 +0000
@@ -132,16 +132,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libebook-contacts/libebook-contacts.h>
-
-ESourceBackendSummarySetup *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_BACKEND_SUMMARY_SETUP);
1

       

     
   

@@ -251,20 +243,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
#include <libebook/libebook.h>
-
-ESourceBackendSummarySetup *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_BACKEND_SUMMARY_SETUP);
-
-e_source_backend_summary_setup_set_summary_fields (extension, E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, 0);
1

       

     
   

@@ -408,26 +388,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
#include <libebook/libebook.h>
-
-ESourceBackendSummarySetup *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_BACKEND_SUMMARY_SETUP);
-
-e_source_backend_summary_setup_set_indexed_fields (extension,
-                                                   E_CONTACT_FULL_NAME, E_BOOK_INDEX_PREFIX,
-                                                   E_CONTACT_FULL_NAME, E_BOOK_INDEX_SUFFIX,
-                                                   0);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceCollection.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceCollection.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceCollection.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceCollection.html	2016-10-10 08:14:34.000000000 +0000
@@ -155,16 +155,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceCollection *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_COLLECTION);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceCredentialsProviderImplGoogle.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceCredentialsProviderImplGoogle.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceCredentialsProviderImplGoogle.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceCredentialsProviderImplGoogle.html	2016-10-10 08:14:34.000000000 +0000
@@ -53,6 +53,14 @@
 gboolean
 
 
+e_source_credentials_google_get_access_token_sync ()
+
+
+
+
+gboolean
+
+
 e_source_credentials_google_util_generate_secret_uid ()
 
 
@@ -135,6 +143,18 @@
 

 

 

+
e_source_credentials_google_get_access_token_sync ()

+
gboolean
+e_source_credentials_google_get_access_token_sync
+                               (ESource *source,
+                                const ENamedParameters *credentials,
+                                gchar **out_access_token,
+                                gint *out_expires_in_seconds,
+                                GCancellable *cancellable,
+                                GError **error);

+

+

+

 
e_source_credentials_google_util_generate_secret_uid ()

 
gboolean
 e_source_credentials_google_util_generate_secret_uid
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceGoa.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceGoa.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceGoa.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceGoa.html	2016-10-10 08:14:34.000000000 +0000
@@ -153,16 +153,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceGoa *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_GOA);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailAccount.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailAccount.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailAccount.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailAccount.html	2016-10-10 08:14:34.000000000 +0000
@@ -147,16 +147,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceMailAccount *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_MAIL_ACCOUNT);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailComposition.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailComposition.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailComposition.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailComposition.html	2016-10-10 08:14:34.000000000 +0000
@@ -193,16 +193,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceMailComposition *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_MAIL_COMPOSITION);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailIdentity.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailIdentity.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailIdentity.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailIdentity.html	2016-10-10 08:14:34.000000000 +0000
@@ -199,16 +199,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceMailIdentity *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_MAIL_IDENTITY);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailSignature.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailSignature.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailSignature.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailSignature.html	2016-10-10 08:14:34.000000000 +0000
@@ -186,16 +186,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceMailSignature *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_MAIL_SIGNATURE);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailSubmission.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailSubmission.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailSubmission.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailSubmission.html	2016-10-10 08:14:34.000000000 +0000
@@ -145,16 +145,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceMailSubmission *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_MAIL_SUBMISSION);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailTransport.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailTransport.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMailTransport.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMailTransport.html	2016-10-10 08:14:34.000000000 +0000
@@ -73,16 +73,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceMailTransport *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_MAIL_TRANSPORT);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMDN.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMDN.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceMDN.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceMDN.html	2016-10-10 08:14:34.000000000 +0000
@@ -100,16 +100,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceMDN *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_MDN);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceOffline.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceOffline.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceOffline.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceOffline.html	2016-10-10 08:14:34.000000000 +0000
@@ -99,16 +99,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceOffline *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_OFFLINE);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceOpenPGP.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceOpenPGP.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceOpenPGP.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceOpenPGP.html	2016-10-10 08:14:34.000000000 +0000
@@ -209,16 +209,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceOpenPGP *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_OPENPGP);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceProxy.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceProxy.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceProxy.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceProxy.html	2016-10-10 08:14:34.000000000 +0000
@@ -387,16 +387,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceProxy *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_PROXY);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceRefresh.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceRefresh.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceRefresh.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceRefresh.html	2016-10-10 08:14:34.000000000 +0000
@@ -155,16 +155,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceRefresh *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_REFRESH);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceRegistry.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceRegistry.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceRegistry.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceRegistry.html	2016-10-10 08:14:34.000000000 +0000
@@ -894,7 +894,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
@@ -947,7 +947,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceRegistryServer.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceRegistryServer.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceRegistryServer.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceRegistryServer.html	2016-10-10 08:14:34.000000000 +0000
@@ -592,7 +592,7 @@
     
       
         
1

-        
g_list_free_full (list, g_object_unref);

+        

       
     
   
diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceResource.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceResource.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceResource.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceResource.html	2016-10-10 08:14:34.000000000 +0000
@@ -111,16 +111,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceResource *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_RESOURCE);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceRevisionGuards.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceRevisionGuards.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceRevisionGuards.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceRevisionGuards.html	2016-10-10 08:14:34.000000000 +0000
@@ -102,16 +102,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceRevisionGuards *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_REVISION_GUARDS);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceSecurity.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceSecurity.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceSecurity.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceSecurity.html	2016-10-10 08:14:34.000000000 +0000
@@ -122,16 +122,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceSecurity *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_SECURITY);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceSMIME.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceSMIME.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceSMIME.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceSMIME.html	2016-10-10 08:14:34.000000000 +0000
@@ -200,16 +200,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceSMIME *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_SMIME);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceTaskList.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceTaskList.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceTaskList.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceTaskList.html	2016-10-10 08:14:34.000000000 +0000
@@ -91,16 +91,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceCalendar *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_CALENDAR);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceUoa.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceUoa.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceUoa.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceUoa.html	2016-10-10 08:14:34.000000000 +0000
@@ -100,16 +100,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceUoa *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_UOA);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/ESourceWebdav.html evolution-data-server-3.22.1/docs/reference/eds/html/ESourceWebdav.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/ESourceWebdav.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/ESourceWebdav.html	2016-10-10 08:14:34.000000000 +0000
@@ -277,16 +277,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
#include <libedataserver/libedataserver.h>
-
-ESourceWebdav *extension;
-
-extension = e_source_get_extension (source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/EVCard.html evolution-data-server-3.22.1/docs/reference/eds/html/EVCard.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/EVCard.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/EVCard.html	2016-10-10 08:14:34.000000000 +0000
@@ -808,7 +808,7 @@
     
       
         
1

-        
ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America

+        

       
     
   
@@ -825,58 +825,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
EVCard *vcard;
-EVCardAttribute *attr;
-GList *param_values, *values;
-
-vcard = e_vcard_new_from_string (
-   "BEGIN:VCARD\n"
-   "VERSION:3.0\n"
-   "ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America\n"
-   "END:VCARD\n");
-attr = e_vcard_get_attribute (vcard, "ADR");
-
-g_assert_cmpstr (e_vcard_attribute_get_name (attr), ==, "ADR");
-g_assert (e_vcard_attribute_is_single_valued (attr) == FALSE);
-
-param_values = e_vcard_attribute_get_param (attr, "TYPE");
-g_assert_cmpuint (g_list_length (param_values), ==, 1);
-g_assert_cmpstr (param_values->data, ==, "WORK");
-
-values = e_vcard_attribute_get_values (attr);
-g_assert_cmpuint (g_list_length (values), ==, 6);
-g_assert_cmpstr (values->data, ==, "");
-g_assert_cmpstr (values->next->data, ==, "100 Waters Edge");
-g_assert_cmpstr (values->next->next->data, ==, "Baytown");
-/* etc. */
-
-g_object_unref (vcard);
1

       

     
   

@@ -2554,7 +2504,7 @@
     
       
         
1

-        
TEL;TYPE=WORK,VOICE:(111) 555-1212

+        

       
     
   
@@ -2598,7 +2548,7 @@
     
       
         
1

-        
TEL;TYPE=WORK,VOICE:(111) 555-1212

+        

       
     
   
@@ -2644,7 +2594,7 @@
     
       
         
1

-        
TEL;TYPE=WORK,VOICE:(111) 555-1212

+        

       
     
   
@@ -2656,12 +2606,8 @@
   
-        
-        
+        
+        

     
       
1
-2
-3
g_assert (e_vcard_attribute_has_type (attr, "WORK") == TRUE);
-g_assert (e_vcard_attribute_has_type (attr, "voice") == TRUE);
-g_assert (e_vcard_attribute_has_type (attr, "HOME") == FALSE);
1

       

     
   

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/html/index.html evolution-data-server-3.22.1/docs/reference/eds/html/index.html
--- evolution-data-server-3.22.0/docs/reference/eds/html/index.html	2016-09-19 07:53:03.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/html/index.html	2016-10-10 08:14:34.000000000 +0000
@@ -15,7 +15,7 @@
 

 

 

-
Reference Manual for evolution-data-server 3.22.0
+
Reference Manual for evolution-data-server 3.22.1
 

 

 
Abstract

diff -Nru evolution-data-server-3.22.0/docs/reference/eds/version.xml evolution-data-server-3.22.1/docs/reference/eds/version.xml
--- evolution-data-server-3.22.0/docs/reference/eds/version.xml	2016-09-19 07:47:07.000000000 +0000
+++ evolution-data-server-3.22.1/docs/reference/eds/version.xml	2016-10-10 08:08:52.000000000 +0000
@@ -1 +1 @@
-evolution-data-server 3.22.0
+evolution-data-server 3.22.1
diff -Nru evolution-data-server-3.22.0/libedataserver/e-data-server-util.c evolution-data-server-3.22.1/libedataserver/e-data-server-util.c
--- evolution-data-server-3.22.0/libedataserver/e-data-server-util.c	2016-08-02 07:42:15.000000000 +0000
+++ evolution-data-server-3.22.1/libedataserver/e-data-server-util.c	2016-10-06 15:53:09.000000000 +0000
@@ -2915,10 +2915,8 @@
 			source, cancellable, out_access_token,
 			out_expires_in_seconds, error);
 	} else if (g_strcmp0 (auth_method, "Google") == 0) {
-		success = TRUE;
-
-		e_source_credentials_google_util_extract_from_credentials (
-			credentials, out_access_token, out_expires_in_seconds);
+		success = e_source_credentials_google_get_access_token_sync (
+			source, credentials, out_access_token, out_expires_in_seconds, cancellable, error);
 	}
 
 	g_free (auth_method);
diff -Nru evolution-data-server-3.22.0/libedataserver/eds-version.h evolution-data-server-3.22.1/libedataserver/eds-version.h
--- evolution-data-server-3.22.0/libedataserver/eds-version.h	2016-09-19 07:47:06.000000000 +0000
+++ evolution-data-server-3.22.1/libedataserver/eds-version.h	2016-10-10 08:08:51.000000000 +0000
@@ -49,7 +49,7 @@
  * time, rather than from the library linked against at application run
  * time.
  **/
-#define EDS_MICRO_VERSION 0
+#define EDS_MICRO_VERSION 1
 
 /**
  * EDS_CHECK_VERSION:
diff -Nru evolution-data-server-3.22.0/libedataserver/e-soup-auth-bearer.c evolution-data-server-3.22.1/libedataserver/e-soup-auth-bearer.c
--- evolution-data-server-3.22.0/libedataserver/e-soup-auth-bearer.c	2016-09-05 21:11:55.000000000 +0000
+++ evolution-data-server-3.22.1/libedataserver/e-soup-auth-bearer.c	2016-10-06 15:53:09.000000000 +0000
@@ -174,7 +174,7 @@
 	bearer->priv->access_token = g_strdup (access_token);
 
 	if (expires_in_seconds > 0)
-		bearer->priv->expiry = time (NULL) + expires_in_seconds;
+		bearer->priv->expiry = time (NULL) + expires_in_seconds - 1;
 	else
 		bearer->priv->expiry = EXPIRY_INVALID;
 
@@ -203,7 +203,7 @@
 	g_return_val_if_fail (E_IS_SOUP_AUTH_BEARER (bearer), TRUE);
 
 	if (bearer->priv->expiry != EXPIRY_INVALID)
-		expired = (bearer->priv->expiry < time (NULL));
+		expired = (bearer->priv->expiry <= time (NULL));
 
 	return expired;
 }
diff -Nru evolution-data-server-3.22.0/libedataserver/e-source-credentials-provider-impl-google.c evolution-data-server-3.22.1/libedataserver/e-source-credentials-provider-impl-google.c
--- evolution-data-server-3.22.0/libedataserver/e-source-credentials-provider-impl-google.c	2015-09-21 13:24:06.000000000 +0000
+++ evolution-data-server-3.22.1/libedataserver/e-source-credentials-provider-impl-google.c	2016-10-10 08:04:28.000000000 +0000
@@ -63,6 +63,38 @@
 }
 
 static gboolean
+e_source_credentials_google_util_store_secret_for_source_sync (ESource *source,
+							       const gchar *secret,
+							       gboolean permanently,
+							       GCancellable *cancellable,
+							       GError **error)
+{
+	gchar *uid = NULL, *label;
+	gboolean success;
+
+	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
+	g_return_val_if_fail (secret != NULL, FALSE);
+
+	if (!e_source_credentials_google_util_generate_secret_uid (source, &uid)) {
+		g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+			/* Translators: The first %s is a display name of the source, the second is its UID. */
+			_("Source '%s' (%s) is not a valid Google source"),
+			e_source_get_display_name (source),
+			e_source_get_uid (source));
+		return FALSE;
+	}
+
+	label = g_strdup_printf ("Evolution Data Source - %s", strstr (uid, "::") + 2);
+
+	success = e_secret_store_store_sync (uid, secret, label, permanently, cancellable, error);
+
+	g_free (label);
+	g_free (uid);
+
+	return success;
+}
+
+static gboolean
 e_source_credentials_google_util_get_access_token_from_secret (const gchar *secret,
 							       gchar **out_access_token)
 {
@@ -95,26 +127,18 @@
 }
 
 static gboolean
-e_source_credentials_provider_impl_google_lookup_sync (ESourceCredentialsProviderImpl *provider_impl,
-						       ESource *source,
-						       GCancellable *cancellable,
-						       ENamedParameters **out_credentials,
-						       GError **error)
+e_source_credentials_google_util_lookup_secret_for_source_sync (ESource *source,
+								GCancellable *cancellable,
+								ENamedParameters **out_credentials,
+								GError **error)
 {
 	gchar *uid = NULL, *secret = NULL, *access_token = NULL;
 
-	g_return_val_if_fail (E_IS_SOURCE_CREDENTIALS_PROVIDER_IMPL_GOOGLE (provider_impl), FALSE);
 	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
 	g_return_val_if_fail (out_credentials != NULL, FALSE);
 
 	*out_credentials = NULL;
 
-	if (!e_source_credentials_google_is_supported ()) {
-		g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-			_("Google authentication is not supported"));
-		return FALSE;
-	}
-
 	if (!e_source_credentials_google_util_generate_secret_uid (source, &uid)) {
 		g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
 			/* Translators: The first %s is a display name of the source, the second is its UID. */
@@ -149,6 +173,28 @@
 }
 
 static gboolean
+e_source_credentials_provider_impl_google_lookup_sync (ESourceCredentialsProviderImpl *provider_impl,
+						       ESource *source,
+						       GCancellable *cancellable,
+						       ENamedParameters **out_credentials,
+						       GError **error)
+{
+	g_return_val_if_fail (E_IS_SOURCE_CREDENTIALS_PROVIDER_IMPL_GOOGLE (provider_impl), FALSE);
+	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
+	g_return_val_if_fail (out_credentials != NULL, FALSE);
+
+	*out_credentials = NULL;
+
+	if (!e_source_credentials_google_is_supported ()) {
+		g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+			_("Google authentication is not supported"));
+		return FALSE;
+	}
+
+	return e_source_credentials_google_util_lookup_secret_for_source_sync (source, cancellable, out_credentials, error);
+}
+
+static gboolean
 e_source_credentials_provider_impl_google_store_sync (ESourceCredentialsProviderImpl *provider_impl,
 						      ESource *source,
 						      const ENamedParameters *credentials,
@@ -156,9 +202,6 @@
 						      GCancellable *cancellable,
 						      GError **error)
 {
-	gchar *uid = NULL, *label;
-	gboolean success;
-
 	g_return_val_if_fail (E_IS_SOURCE_CREDENTIALS_PROVIDER_IMPL_GOOGLE (provider_impl), FALSE);
 	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
 	g_return_val_if_fail (credentials != NULL, FALSE);
@@ -170,25 +213,9 @@
 		return FALSE;
 	}
 
-	if (!e_source_credentials_google_util_generate_secret_uid (source, &uid)) {
-		g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-			/* Translators: The first %s is a display name of the source, the second is its UID. */
-			_("Source '%s' (%s) is not a valid Google source"),
-			e_source_get_display_name (source),
-			e_source_get_uid (source));
-		return FALSE;
-	}
-
-	label = g_strdup_printf ("Evolution Data Source - %s", strstr (uid, "::") + 2);
-
-	success = e_secret_store_store_sync (uid,
+	return e_source_credentials_google_util_store_secret_for_source_sync (source,
 		e_named_parameters_get (credentials, E_SOURCE_CREDENTIAL_GOOGLE_SECRET),
-		label, permanently, cancellable, error);
-
-	g_free (label);
-	g_free (uid);
-
-	return success;
+		permanently, cancellable, error);
 }
 
 static gboolean
@@ -258,6 +285,268 @@
 #endif
 }
 
+/* The "refresh token" code is mostly copied from e-credentials-prompter-impl-google.c,
+   which cannot be linked here, because the build dependency is opposite. */
+
+#define GOOGLE_TOKEN_URI "https://www.googleapis.com/oauth2/v3/token"
+
+static gchar *
+cpi_google_create_refresh_token_post_data (const gchar *refresh_token)
+{
+#ifdef ENABLE_GOOGLE_AUTH
+	g_return_val_if_fail (refresh_token != NULL, NULL);
+
+	return soup_form_encode (
+		"refresh_token", refresh_token,
+		"client_id", GOOGLE_CLIENT_ID,
+		"client_secret", GOOGLE_CLIENT_SECRET,
+		"grant_type", "refresh_token",
+		NULL);
+#else
+        return NULL;
+#endif /* ENABLE_GOOGLE_AUTH */
+}
+
+static void
+cpi_google_abort_session_cb (GCancellable *cancellable,
+			     SoupSession *session)
+{
+	soup_session_abort (session);
+}
+
+static guint
+cpi_google_post_data_sync (const gchar *uri,
+			   const gchar *post_data,
+			   /* ESourceRegistry *registry, */
+			   ESource *cred_source,
+			   GCancellable *cancellable,
+			   gchar **out_response_data)
+{
+	SoupSession *session;
+	SoupMessage *message;
+	guint status_code = SOUP_STATUS_CANCELLED;
+
+	g_return_val_if_fail (uri != NULL, SOUP_STATUS_MALFORMED);
+	g_return_val_if_fail (post_data != NULL, SOUP_STATUS_MALFORMED);
+	/* g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), SOUP_STATUS_MALFORMED); */
+	g_return_val_if_fail (E_IS_SOURCE (cred_source), SOUP_STATUS_MALFORMED);
+	g_return_val_if_fail (out_response_data != NULL, SOUP_STATUS_MALFORMED);
+
+	*out_response_data = NULL;
+
+	message = soup_message_new (SOUP_METHOD_POST, uri);
+	g_return_val_if_fail (message != NULL, SOUP_STATUS_MALFORMED);
+
+	soup_message_set_request (message, "application/x-www-form-urlencoded",
+		SOUP_MEMORY_TEMPORARY, post_data, strlen (post_data));
+
+	e_soup_ssl_trust_connect (message, cred_source);
+
+	session = soup_session_new ();
+	g_object_set (
+		session,
+		SOUP_SESSION_TIMEOUT, 90,
+		SOUP_SESSION_SSL_STRICT, TRUE,
+		SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
+		SOUP_SESSION_ACCEPT_LANGUAGE_AUTO, TRUE,
+		NULL);
+
+	/* Oops, doesn't honor proxy settings (neither EWebDAVDiscover) */
+	/* cpi_google_setup_proxy_resolver (session, registry, cred_source); */
+
+	soup_message_headers_append (message->request_headers, "Connection", "close");
+
+	if (!g_cancellable_is_cancelled (cancellable)) {
+		gulong cancel_handler_id = 0;
+
+		if (cancellable)
+			cancel_handler_id = g_cancellable_connect (cancellable, G_CALLBACK (cpi_google_abort_session_cb), session, NULL);
+
+		status_code = soup_session_send_message (session, message);
+
+		if (cancel_handler_id)
+			g_cancellable_disconnect (cancellable, cancel_handler_id);
+	}
+
+	if (SOUP_STATUS_IS_SUCCESSFUL (status_code)) {
+		if (message->response_body) {
+			*out_response_data = g_strndup (message->response_body->data, message->response_body->length);
+		} else {
+			status_code = SOUP_STATUS_MALFORMED;
+		}
+	}
+
+	g_object_unref (message);
+	g_object_unref (session);
+
+	return status_code;
+}
+
+static gboolean
+e_source_credentials_google_refresh_token_sync (ESource *source,
+						const ENamedParameters *credentials,
+						gchar **out_access_token,
+						gint *out_expires_in_seconds,
+						GCancellable *cancellable,
+						GError **error)
+{
+	const gchar *secret;
+	gchar *refresh_token = NULL;
+	gchar *post_data, *response_json = NULL;
+	guint soup_status;
+	gboolean success = FALSE;
+
+	secret = e_named_parameters_get (credentials, E_SOURCE_CREDENTIAL_GOOGLE_SECRET);
+	if (!secret) {
+		g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Failed to get Google secret from credentials"));
+		return FALSE;
+	}
+
+	if (!e_source_credentials_google_util_decode_from_secret (secret, E_GOOGLE_SECRET_REFRESH_TOKEN, &refresh_token, NULL) ||
+	    !refresh_token || !*refresh_token) {
+		g_free (refresh_token);
+		g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Refresh token not found in Google secret"));
+		return FALSE;
+	}
+
+	post_data = cpi_google_create_refresh_token_post_data (refresh_token);
+	g_warn_if_fail (post_data != NULL);
+	if (!post_data) {
+		g_free (refresh_token);
+		g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Failed to construct refresh_token request"));
+		return FALSE;
+	}
+
+	soup_status = cpi_google_post_data_sync (GOOGLE_TOKEN_URI, post_data, source, cancellable, &response_json);
+
+	if (SOUP_STATUS_IS_SUCCESSFUL (soup_status) && response_json) {
+		gchar *access_token = NULL, *expires_in = NULL;
+
+		if (e_source_credentials_google_util_decode_from_secret (response_json,
+			"access_token", &access_token,
+			"expires_in", &expires_in,
+			NULL) && access_token && expires_in) {
+			gint64 expires_after_tm, expires_in_tm;
+			gchar *expires_after;
+			gchar *new_secret = NULL;
+
+			expires_in_tm = g_ascii_strtoll (expires_in, NULL, 10) - 1;
+			expires_after_tm = g_get_real_time () / G_USEC_PER_SEC;
+			expires_after_tm += expires_in_tm;
+			expires_after = g_strdup_printf ("%" G_GINT64_FORMAT, expires_after_tm);
+
+			if (e_source_credentials_google_util_encode_to_secret (&new_secret,
+				E_GOOGLE_SECRET_REFRESH_TOKEN, refresh_token,
+				E_GOOGLE_SECRET_ACCESS_TOKEN, access_token,
+				E_GOOGLE_SECRET_EXPIRES_AFTER, expires_after, NULL)) {
+				/* Oops, always storing permanently, though it makes more sense here.
+				   Otherwise can read RememberPassword from [Authentication] and use
+				   it here. */
+				success = e_source_credentials_google_util_store_secret_for_source_sync (source,
+					new_secret, TRUE, cancellable, error);
+				g_free (new_secret);
+			} else {
+				g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Failed to encode new access token to Google secret"));
+			}
+
+			if (success) {
+				if (out_access_token)
+					*out_access_token = g_strdup (access_token);
+				if (out_expires_in_seconds)
+					*out_expires_in_seconds = expires_in_tm;
+			}
+		} else {
+			g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Failed to get access token from refresh_token server response"));
+		}
+
+		g_free (access_token);
+		g_free (expires_in);
+	} else {
+		g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Failed to refresh token"));
+	}
+
+	g_free (refresh_token);
+	g_free (response_json);
+	g_free (post_data);
+
+	return success;
+}
+
+static gboolean
+e_source_credentials_google_extract_from_credentials_valid_only (const ENamedParameters *credentials,
+								 gchar **out_access_token,
+								 gint *out_expires_in_seconds)
+{
+	gchar *access_token = NULL;
+	gint expires_in_seconds = -1;
+
+	if (!credentials)
+		return FALSE;
+
+	if (e_source_credentials_google_util_extract_from_credentials (credentials, &access_token, &expires_in_seconds)) {
+		if (expires_in_seconds <= 0) {
+			g_free (access_token);
+			access_token = NULL;
+		}
+	} else {
+		access_token = NULL;
+	}
+
+	/* The token exists and is valid, just use it. */
+	if (access_token) {
+		if (out_access_token)
+			*out_access_token = access_token;
+		else
+			g_free (access_token);
+
+		if (out_expires_in_seconds)
+			*out_expires_in_seconds = expires_in_seconds;
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+gboolean
+e_source_credentials_google_get_access_token_sync (ESource *source,
+						   const ENamedParameters *credentials,
+						   gchar **out_access_token,
+						   gint *out_expires_in_seconds,
+						   GCancellable *cancellable,
+						   GError **error)
+{
+	ENamedParameters *tmp_credentials = NULL;
+
+	g_return_val_if_fail (credentials != NULL, FALSE);
+
+	if (!e_source_credentials_google_is_supported ()) {
+		g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+			_("Google authentication is not supported"));
+		return FALSE;
+	}
+
+	/* The token exists and is valid, just use it. */
+	if (e_source_credentials_google_extract_from_credentials_valid_only (credentials, out_access_token, out_expires_in_seconds)) {
+		return TRUE;
+	}
+
+	/* Maybe some other part refreshed the token already and stored it into the secret store,
+	   thus try to read it and use it, if it contains proper data.
+	*/
+	if (e_source_credentials_google_util_lookup_secret_for_source_sync (source, cancellable, &tmp_credentials, error) &&
+	    e_source_credentials_google_extract_from_credentials_valid_only (tmp_credentials, out_access_token, out_expires_in_seconds)) {
+		e_named_parameters_free (tmp_credentials);
+
+		return TRUE;
+	}
+
+	e_named_parameters_free (tmp_credentials);
+
+	/* Try to refresh the token */
+	return e_source_credentials_google_refresh_token_sync (source, credentials, out_access_token, out_expires_in_seconds, cancellable, error);
+}
+
 gboolean
 e_source_credentials_google_util_generate_secret_uid (ESource *source,
 						      gchar **out_uid)
@@ -465,10 +754,12 @@
 
 	if (out_expires_in_seconds) {
 		now = g_get_real_time () / G_USEC_PER_SEC;
-		if (now < expires_after_tm)
-			now = expires_after_tm;
+		if (expires_after_tm <= now)
+			expires_after_tm = now;
 
 		*out_expires_in_seconds = (gint) (expires_after_tm - now);
+		if (*out_expires_in_seconds > 0)
+			*out_expires_in_seconds = (*out_expires_in_seconds) - 1;
 	}
 
 	return TRUE;
diff -Nru evolution-data-server-3.22.0/libedataserver/e-source-credentials-provider-impl-google.h evolution-data-server-3.22.1/libedataserver/e-source-credentials-provider-impl-google.h
--- evolution-data-server-3.22.0/libedataserver/e-source-credentials-provider-impl-google.h	2015-09-21 13:24:06.000000000 +0000
+++ evolution-data-server-3.22.1/libedataserver/e-source-credentials-provider-impl-google.h	2016-10-06 15:53:09.000000000 +0000
@@ -80,6 +80,12 @@
 GType		e_source_credentials_provider_impl_google_get_type	(void);
 
 gboolean	e_source_credentials_google_is_supported		(void);
+gboolean	e_source_credentials_google_get_access_token_sync	(ESource *source,
+									 const ENamedParameters *credentials,
+									 gchar **out_access_token,
+									 gint *out_expires_in_seconds,
+									 GCancellable *cancellable,
+									 GError **error);
 gboolean	e_source_credentials_google_util_generate_secret_uid	(ESource *source,
 									 gchar **out_uid);
 gboolean	e_source_credentials_google_util_encode_to_secret	(gchar **out_secret,
diff -Nru evolution-data-server-3.22.0/libedataserverui/e-credentials-prompter.c evolution-data-server-3.22.1/libedataserverui/e-credentials-prompter.c
--- evolution-data-server-3.22.0/libedataserverui/e-credentials-prompter.c	2015-09-21 13:24:06.000000000 +0000
+++ evolution-data-server-3.22.1/libedataserverui/e-credentials-prompter.c	2016-09-20 10:30:59.000000000 +0000
@@ -152,7 +152,7 @@
 	provider = e_credentials_prompter_get_provider (prompter);
 	cred_source = e_source_credentials_provider_ref_credentials_source (provider, source);
 
-	e_source_credentials_provider_lookup_sync (prompter->priv->provider, cred_source ? cred_source : source, cancellable, &credentials, &local_error);
+	e_source_credentials_provider_lookup_sync (provider, cred_source ? cred_source : source, cancellable, &credentials, &local_error);
 
 	/* Interested only in the cancelled error, which means the prompter is freed. */
 	if (local_error != NULL && g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
@@ -760,19 +760,29 @@
 					      const GError *op_error,
 					      ECredentialsPrompter *prompter)
 {
+	ESource *cred_source;
+
 	g_return_if_fail (E_IS_SOURCE_REGISTRY (registry));
 	g_return_if_fail (E_IS_SOURCE (source));
 	g_return_if_fail (E_IS_CREDENTIALS_PROMPTER (prompter));
 
 	/* Only these two reasons are meant to be used to prompt the user for credentials. */
 	if (reason != E_SOURCE_CREDENTIALS_REASON_REQUIRED &&
-	    reason != E_SOURCE_CREDENTIALS_REASON_REJECTED)
+	    reason != E_SOURCE_CREDENTIALS_REASON_REJECTED) {
 		return;
+	}
+
+	cred_source = e_source_credentials_provider_ref_credentials_source (e_credentials_prompter_get_provider (prompter), source);
 
 	/* Global auto-prompt or the source's auto-prompt is disabled. */
 	if (!e_credentials_prompter_get_auto_prompt (prompter) ||
-	    e_credentials_prompter_get_auto_prompt_disabled_for (prompter, source))
+	    (e_credentials_prompter_get_auto_prompt_disabled_for (prompter, source) &&
+	    (!cred_source || e_credentials_prompter_get_auto_prompt_disabled_for (prompter, cred_source)))) {
+		g_clear_object (&cred_source);
 		return;
+	}
+
+	g_clear_object (&cred_source);
 
 	/* This is a re-prompt, but the source cannot be prompted for credentials. */
 	if (reason == E_SOURCE_CREDENTIALS_REASON_REJECTED &&
diff -Nru evolution-data-server-3.22.0/libedataserverui/e-credentials-prompter-impl-google.c evolution-data-server-3.22.1/libedataserverui/e-credentials-prompter-impl-google.c
--- evolution-data-server-3.22.0/libedataserverui/e-credentials-prompter-impl-google.c	2016-08-11 05:15:31.000000000 +0000
+++ evolution-data-server-3.22.1/libedataserverui/e-credentials-prompter-impl-google.c	2016-10-06 15:53:09.000000000 +0000
@@ -291,9 +291,9 @@
 			success = TRUE;
 		}
 
-		g_object_unref (prompter_google);
 		g_free (secret);
 	}
+	g_clear_object (&prompter_google);
 
 	g_free (expires_after);
 
@@ -332,8 +332,10 @@
 
 	g_return_val_if_fail (E_IS_CREDENTIALS_PROMPTER_IMPL_GOOGLE (prompter_google), FALSE);
 
+	g_mutex_lock (&prompter_google->priv->property_lock);
 	if (g_source_get_id (g_main_current_source ()) == prompter_google->priv->show_dialog_idle_id) {
 		prompter_google->priv->show_dialog_idle_id = 0;
+		g_mutex_unlock (&prompter_google->priv->property_lock);
 
 		g_warn_if_fail (prompter_google->priv->dialog != NULL);
 
@@ -343,6 +345,9 @@
 			e_credentials_prompter_impl_google_show_html (prompter_google->priv->web_view,
 				"Finished with error", prompter_google->priv->error_text);
 		}
+	} else {
+		g_warning ("%s: Source was cancelled? current:%d expected:%d", G_STRFUNC, (gint) g_source_get_id (g_main_current_source ()), (gint) prompter_google->priv->show_dialog_idle_id);
+		g_mutex_unlock (&prompter_google->priv->property_lock);
 	}
 
 	return FALSE;
@@ -442,9 +447,11 @@
 				GOOGLE_TOKEN_URI, soup_status, soup_status_get_phrase (soup_status));
 		}
 
+		g_mutex_lock (&prompter_google->priv->property_lock);
 		prompter_google->priv->show_dialog_idle_id = g_idle_add (
 			e_credentials_prompter_impl_google_finish_dialog_idle_cb,
 			prompter_google);
+		g_mutex_unlock (&prompter_google->priv->property_lock);
 	}
 
 	g_clear_object (&prompter_google);
@@ -843,10 +850,12 @@
 
 	g_return_val_if_fail (E_IS_CREDENTIALS_PROMPTER_IMPL_GOOGLE (prompter_google), FALSE);
 
+	g_mutex_lock (&prompter_google->priv->property_lock);
 	if (g_source_get_id (g_main_current_source ()) == prompter_google->priv->show_dialog_idle_id) {
 		gboolean success;
 
 		prompter_google->priv->show_dialog_idle_id = 0;
+		g_mutex_unlock (&prompter_google->priv->property_lock);
 
 		g_warn_if_fail (prompter_google->priv->dialog == NULL);
 
@@ -861,6 +870,18 @@
 			success ? prompter_google->priv->credentials : NULL);
 
 		e_credentials_prompter_impl_google_free_prompt_data (prompter_google);
+	} else {
+		gpointer prompt_id = prompter_google->priv->prompt_id;
+
+		g_warning ("%s: Prompt's %p source cancelled? current:%d expected:%d", G_STRFUNC, prompt_id, (gint) g_source_get_id (g_main_current_source ()), (gint) prompter_google->priv->show_dialog_idle_id);
+
+		if (!prompter_google->priv->show_dialog_idle_id)
+			e_credentials_prompter_impl_google_free_prompt_data (prompter_google);
+
+		g_mutex_unlock (&prompter_google->priv->property_lock);
+
+		if (prompt_id)
+			e_credentials_prompter_impl_prompt_finish (E_CREDENTIALS_PROMPTER_IMPL (prompter_google), prompt_id, NULL);
 	}
 
 	return FALSE;
@@ -942,9 +963,11 @@
  exit:
 	prompter_google = g_weak_ref_get (td->prompter_google);
 	if (prompter_google && !g_cancellable_is_cancelled (cancellable)) {
+		g_mutex_lock (&prompter_google->priv->property_lock);
 		prompter_google->priv->show_dialog_idle_id = g_idle_add (
 			e_credentials_prompter_impl_google_manage_dialog_idle_cb,
 			prompter_google);
+		g_mutex_unlock (&prompter_google->priv->property_lock);
 	}
 
 	g_clear_object (&prompter_google);
@@ -970,7 +993,14 @@
 
 	prompter_google = E_CREDENTIALS_PROMPTER_IMPL_GOOGLE (prompter_impl);
 	g_return_if_fail (prompter_google->priv->prompt_id == NULL);
-	g_return_if_fail (prompter_google->priv->show_dialog_idle_id == 0);
+
+	g_mutex_lock (&prompter_google->priv->property_lock);
+	if (prompter_google->priv->show_dialog_idle_id != 0) {
+		g_mutex_unlock (&prompter_google->priv->property_lock);
+		g_warning ("%s: Already processing other prompt", G_STRFUNC);
+		return;
+	}
+	g_mutex_unlock (&prompter_google->priv->property_lock);
 
 	prompter_google->priv->prompt_id = prompt_id;
 	prompter_google->priv->auth_source = g_object_ref (auth_source);
@@ -1021,9 +1051,11 @@
 		g_thread_unref (thread);
 	} else {
 #endif /* ENABLE_GOOGLE_AUTH */
+		g_mutex_lock (&prompter_google->priv->property_lock);
 		prompter_google->priv->show_dialog_idle_id = g_idle_add (
 			e_credentials_prompter_impl_google_manage_dialog_idle_cb,
 			prompter_google);
+		g_mutex_unlock (&prompter_google->priv->property_lock);
 #ifdef ENABLE_GOOGLE_AUTH
 	}
 #endif /* ENABLE_GOOGLE_AUTH */
@@ -1053,10 +1085,12 @@
 {
 	ECredentialsPrompterImplGoogle *prompter_google = E_CREDENTIALS_PROMPTER_IMPL_GOOGLE (object);
 
+	g_mutex_lock (&prompter_google->priv->property_lock);
 	if (prompter_google->priv->show_dialog_idle_id) {
 		g_source_remove (prompter_google->priv->show_dialog_idle_id);
 		prompter_google->priv->show_dialog_idle_id = 0;
 	}
+	g_mutex_unlock (&prompter_google->priv->property_lock);
 
 	if (prompter_google->priv->cancellable) {
 		g_cancellable_cancel (prompter_google->priv->cancellable);
diff -Nru evolution-data-server-3.22.0/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop evolution-data-server-3.22.1/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop
--- evolution-data-server-3.22.0/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop	2016-09-19 07:53:01.000000000 +0000
+++ evolution-data-server-3.22.1/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop	2016-10-10 08:14:32.000000000 +0000
@@ -19,6 +19,7 @@
 Name[fr]=Serveur de données Evolution
 Name[gl]=Servidor de datos de Evolution
 Name[hi]=एवोल्यूशन डाटा सर्वर
+Name[hr]=Evolution poslužitelj podataka
 Name[hu]=Evolution adatkiszolgáló
 Name[id]=Server Data Evolution
 Name[it]=Evolution Data Server
@@ -93,4 +94,4 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=evolution-data-server
 X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=3.22.0
+X-GNOME-Bugzilla-Version=3.22.1
diff -Nru evolution-data-server-3.22.0/NEWS evolution-data-server-3.22.1/NEWS
--- evolution-data-server-3.22.0/NEWS	2016-09-19 07:45:22.000000000 +0000
+++ evolution-data-server-3.22.1/NEWS	2016-10-10 08:07:39.000000000 +0000
@@ -1,3 +1,23 @@
+Evolution-Data-Server 3.22.1 2016-10-10
+---------------------------------------
+
+Bug Fixes:
+	Bug 771547 - Internal Google OAuth2 authentication fails with expired token (Milan Crha)
+
+Miscellaneous:
+	Fix console runtime warnings from vFolder/vStore code on application quit (Milan Crha)
+	Fix build with --disable-google-auth (Owen W. Taylor)
+
+Translations:
+	Peter Mráz (sk)
+	Gianvito Cavasoli (it)
+	gogo (hr)
+	Rafael Fontenelle (pt_BR)
+	Marek Černocký (cs)
+	Balázs Meskó (hu)
+	Rūdolfs Mazurs (lv)
+	Ask Hjorth Larsen (da)
+
 Evolution-Data-Server 3.22.0 2016-09-19
 ---------------------------------------
 
diff -Nru evolution-data-server-3.22.0/po/cs.po evolution-data-server-3.22.1/po/cs.po
--- evolution-data-server-3.22.0/po/cs.po	2016-09-12 06:01:38.000000000 +0000
+++ evolution-data-server-3.22.1/po/cs.po	2016-10-10 08:03:54.000000000 +0000
@@ -12,12 +12,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server\n"
+"Project-Id-Version: evolution-data-server gnome-3.22\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution-data-server&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-08-24 15:50+0000\n"
-"PO-Revision-Date: 2016-08-26 12:06+0200\n"
-"Last-Translator: Jiří Eischmann \n"
+"POT-Creation-Date: 2016-10-06 15:55+0000\n"
+"PO-Revision-Date: 2016-10-07 00:16+0200\n"
+"Last-Translator: Marek Černocký \n"
 "Language-Team: čeština <>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -1352,17 +1352,17 @@
 msgid "CalDAV backend is not loaded yet"
 msgstr "Obslužná vrstva CalDAV není ještě načtená"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1200
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1205
 #: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "Neplatná URL přesměrování"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2899
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2919
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Nelze vytvořit místní složku pro mezipaměť „%s“"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2985
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3005
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1371,27 +1371,27 @@
 "Server je nedostupný, kalendář je otevřený pouze pro čtení.\n"
 "Chybová hláška: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4090
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4110
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV nepodporuje hromadné přidávání"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4193
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4213
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV nepodporuje hromadné změny"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4474
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4494
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV nepodporuje hromadná odstranění"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5221
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5241
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalendář nepodporuje volné/obsazené termíny"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5230
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5250
 msgid "Schedule outbox url not found"
 msgstr "URL naplánovaného odesílání nebylo nalezeno"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5327
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5347
 msgid "Unexpected result in schedule-response"
 msgstr "Neočekávaný výsledek v odpovědi plánování"
 
@@ -2159,36 +2159,36 @@
 msgstr "Aktualizuje se složka „%s : %s“"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:845 ../camel/camel-folder-search.c:887
+#: ../camel/camel-folder-search.c:865 ../camel/camel-folder-search.c:907
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) vyžaduje jeden výsledek pravdivostního typu"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:922
+#: ../camel/camel-folder-search.c:942
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) není povoleno uvnitř %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:929 ../camel/camel-folder-search.c:937
+#: ../camel/camel-folder-search.c:949 ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) vyžaduje řetězec s typem porovnávání"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:965
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) očekává jako výsledek pole"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:995
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) vyžaduje nastavenou složku"
 
-#: ../camel/camel-folder-search.c:1887 ../camel/camel-folder-search.c:2056
+#: ../camel/camel-folder-search.c:1918 ../camel/camel-folder-search.c:2090
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2197,7 +2197,7 @@
 "Nelze zpracovat vyhledávací výraz: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1899 ../camel/camel-folder-search.c:2068
+#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2102
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2209,7 +2209,7 @@
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2171
+#: ../camel/camel-folder-summary.c:2196
 #, c-format
 msgid "Release unused memory for folder '%s : %s'"
 msgstr "Uvolňuje se nepoužitá paměť pro složku „%s : %s“"
@@ -2217,7 +2217,7 @@
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2390
+#: ../camel/camel-folder-summary.c:2420
 #, c-format
 msgid "Update preview data for folder '%s : %s'"
 msgstr "Aktualizuje se náhled dat pro složku „%s : %s“"
@@ -5274,24 +5274,49 @@
 msgid "Credentials delete is not supported"
 msgstr "Mazání pověření není podporováno"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
-msgid "Google authentication is not supported"
-msgstr "Ověření u Googlu není podporováno"
-
 #. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:81
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:145
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:242
 #, c-format
 msgid "Source '%s' (%s) is not a valid Google source"
 msgstr "Zdroj „%s“ (%s) není platný zdroj Google"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:159
 msgid "Google secret not found"
 msgstr "Přihlašovací data pro Google nebyla nalezena"
 
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:190
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:212
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:235
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:521
+msgid "Google authentication is not supported"
+msgstr "Ověření u Googlu není podporováno"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:397
+msgid "Failed to get Google secret from credentials"
+msgstr "Selhalo získání tajemství Googlu z pověření"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:404
+msgid "Refresh token not found in Google secret"
+msgstr "Aktualizační tiket nebyl v tajemství Googlu nalezen"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:412
+msgid "Failed to construct refresh_token request"
+msgstr "Selhalo sestavení požadavku refresh_token"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:445
+msgid "Failed to encode new access token to Google secret"
+msgstr "Selhalo zakódování nového přistupového tiketu k tajemství Googlu"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:455
+msgid "Failed to get access token from refresh_token server response"
+msgstr "Selhalo získání přístupového tiketu z odpovědi serveru refresh_token"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:461
+msgid "Failed to refresh token"
+msgstr "Selhala aktualizace tiketu"
+
 #: ../libedataserver/e-source-credentials-provider-impl-password.c:81
 msgid "Password not found"
 msgstr "Heslo nebylo nalezeno"
@@ -5454,8 +5479,8 @@
 msgstr "Neočekávaná odpověď ze serveru"
 
 #: ../libedataserverui/e-credentials-prompter.c:260
-#: ../libedataserverui/e-credentials-prompter.c:1563
-#: ../libedataserverui/e-credentials-prompter.c:1607
+#: ../libedataserverui/e-credentials-prompter.c:1573
+#: ../libedataserverui/e-credentials-prompter.c:1617
 msgid "Credentials prompt was cancelled"
 msgstr "Výzva k zadání pověření byla zrušena"
 
@@ -5464,42 +5489,42 @@
 msgid "Source '%s' doesn't support prompt for credentials"
 msgstr "Zdroj dat „%s“ nepodporuje výzvy k zadání pověření"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:441
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:446
 #, c-format
 msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
 msgstr ""
 "Selhalo získání přístupového tiketu z adresy „%s“. Chybový kód je %d (%s)"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:487
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:494
 msgid "Requesting access token, please wait..."
 msgstr "Žádá se o přístupový tiket, čekejte prosím…"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:589
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:596
 msgid "Google Address book authentication request"
 msgstr "Požadavek na ověření totožnosti od adresáře Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:592
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:599
 msgid "Google Calendar authentication request"
 msgstr "Požadavek na ověření totožnosti od kalendáře Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:595
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
 msgid "Google Memo List authentication request"
 msgstr "Požadavek na ověření totožnosti od seznamu poznámek Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:598
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
 msgid "Google Task List authentication request"
 msgstr "Požadavek na ověření totožnosti od seznamu úkolů Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:609
 msgid "Google Mail authentication request"
 msgstr "Požadavek na ověření totožnosti od pošty Google"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:612
 msgid "Google account authentication request"
 msgstr "Požadavek na ověření totožnosti od účtu Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:616
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5508,7 +5533,7 @@
 "Přihlaste se ke svému účtu Google a přijměte podmínky, abyste měli přístup "
 "ke svému adresáři „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:620
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5517,7 +5542,7 @@
 "Přihlaste se ke svému účtu Google a přijměte podmínky, abyste měli přístup "
 "ke svému kalendáři „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:624
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5526,7 +5551,7 @@
 "Přihlaste se ke svému účtu Google a přijměte podmínky, abyste měli přístup "
 "ke svému poštovnímu účtu „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:628
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5535,7 +5560,7 @@
 "Přihlaste se ke svému účtu Google a přijměte podmínky, abyste měli přístup "
 "ke svému přenosu pošty „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:632
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5544,7 +5569,7 @@
 "Přihlaste se ke svému účtu Google a přijměte podmínky, abyste měli přístup "
 "ke svému seznamu poznámek „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:636
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:643
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5553,7 +5578,7 @@
 "Přihlaste se ke svému účtu Google a přijměte podmínky, abyste měli přístup "
 "ke svému seznamu úkolů „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:640
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:647
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5562,7 +5587,7 @@
 "Přihlaste se ke svému účtu Google a přijměte podmínky, abyste měli přístup "
 "ke svému účtu „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:684
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:691
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:232
 #: ../libedataserverui/e-trust-prompt.c:114
 #: ../libedataserverui/e-webdav-discover-widget.c:1063
@@ -5977,7 +6002,7 @@
 msgstr "_Zahodit"
 
 #: ../tools/addressbook-export/addressbook-export.c:70
-#: ../tools/addressbook-export/addressbook-export.c:767
+#: ../tools/addressbook-export/addressbook-export.c:784
 msgid "Can not open file"
 msgstr "Soubor nelze otevřít"
 
@@ -5986,37 +6011,37 @@
 msgid "Failed to open client '%s': %s"
 msgstr "Selhalo otevření klienta „%s“: %s"
 
-#: ../tools/addressbook-export/addressbook-export.c:877
+#: ../tools/addressbook-export/addressbook-export.c:894
 msgid "Unhandled error"
 msgstr "Neošetřená chyba"
 
-#: ../tools/addressbook-export/addressbook-export.c:910
+#: ../tools/addressbook-export/addressbook-export.c:927
 msgid "Specify the output file instead of standard output"
 msgstr "Určit výstupní soubor, který nahradí standardní výstup"
 
-#: ../tools/addressbook-export/addressbook-export.c:911
+#: ../tools/addressbook-export/addressbook-export.c:928
 msgid "OUTPUTFILE"
 msgstr "VÝSTUPNÍ_SOUBOR"
 
-#: ../tools/addressbook-export/addressbook-export.c:914
+#: ../tools/addressbook-export/addressbook-export.c:931
 msgid "List local address book folders"
 msgstr "Zobrazit seznam místních složek s adresáři"
 
-#: ../tools/addressbook-export/addressbook-export.c:917
+#: ../tools/addressbook-export/addressbook-export.c:934
 msgid "Show cards as vcard or csv file"
 msgstr "Zobrazit karty jako soubory vcard nebo csv"
 
-#: ../tools/addressbook-export/addressbook-export.c:918
+#: ../tools/addressbook-export/addressbook-export.c:935
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../tools/addressbook-export/addressbook-export.c:966
+#: ../tools/addressbook-export/addressbook-export.c:983
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Chyba argumentů pro příkazovou řádku, použijte prosím volbu --help, abyste "
 "zjistili, jak se používají."
 
-#: ../tools/addressbook-export/addressbook-export.c:980
+#: ../tools/addressbook-export/addressbook-export.c:997
 msgid "Only support csv or vcard format."
 msgstr "Podporuje pouze formáty csv nebo vcard."
diff -Nru evolution-data-server-3.22.0/po/da.po evolution-data-server-3.22.1/po/da.po
--- evolution-data-server-3.22.0/po/da.po	2016-09-12 06:01:38.000000000 +0000
+++ evolution-data-server-3.22.1/po/da.po	2016-10-10 08:03:54.000000000 +0000
@@ -14,6 +14,7 @@
 #
 # message -> brev
 # trash, trash folder -> papirkurv
+# access token -> adgangssymbol
 #
 # Eftersom oversættelsen af evolution bruger "id" som oversættelsen af Id/ID, bør det samme gøres her
 #
@@ -30,9 +31,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-11 17:07+0200\n"
-"PO-Revision-Date: 2016-09-11 16:50+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution-data-server&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-10-06 15:55+0000\n"
+"PO-Revision-Date: 2016-10-08 00:41+0200\n"
 "Last-Translator: Ask Hjorth Larsen \n"
 "Language-Team: Danish \n"
 "Language: da\n"
@@ -1367,17 +1369,17 @@
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV-motoren er endnu ikke indlæst"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1204
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1205
 #: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "Ugyldig omdirigerings-URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2918
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2919
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Kan ikke oprette lokal mellemlager-mappe \"%s\""
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3004
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3005
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1386,27 +1388,27 @@
 "Server kan ikke nås, kalender er åbnet i skrivebeskyttet tilstand.\n"
 "Fejlbesked: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4109
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4110
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV understøtter ikke massetilføjelser"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4212
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4213
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV understøtter ikke masseredigeringer"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4493
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4494
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV understøtter ikke massesfjernelser"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5240
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5241
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalender understøtter ikke ledig/optaget"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5249
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5250
 msgid "Schedule outbox url not found"
 msgstr "URL for skema-udbakke ikke fundet"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5346
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5347
 msgid "Unexpected result in schedule-response"
 msgstr "Uventet resultat i skema-svar"
 
@@ -2653,9 +2655,7 @@
 #: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr ""
-"Udfordring fra server indeholdt ugyldigt tegn for \"Kvalitet for beskyttelse"
-"\"-symbol"
+msgstr "Udfordring fra server indeholdt ugyldigt symbol (token) for \"Kvalitet for beskyttelse\"-symbol"
 
 #: ../camel/camel-sasl-digest-md5.c:906
 #, c-format
@@ -5083,8 +5083,7 @@
 msgid "Failed to lookup credentials: "
 msgstr "Fejl under låsning ved akkreditiver: "
 
-#: ../libebackend/e-server-side-source.c:1391
-#: ../libedataserver/e-source.c:1595
+#: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "Datakilden \"%s\" understøtter ikke oprettelsen af eksterne ressourcer"
@@ -5097,8 +5096,7 @@
 "Datakilde \"%s\" har ingen indsamlings-motor til oprettelse af den eksterne "
 "ressource"
 
-#: ../libebackend/e-server-side-source.c:1433
-#: ../libedataserver/e-source.c:1708
+#: ../libebackend/e-server-side-source.c:1433 ../libedataserver/e-source.c:1708
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "Datakilden \"%s\" understøtter ikke sletning af eksterne ressourcer"
@@ -5111,8 +5109,7 @@
 "Datakilde \"%s\" har ingen indsamlings-motor til sletning af den eksterne "
 "ressource"
 
-#: ../libebackend/e-server-side-source.c:1478
-#: ../libedataserver/e-source.c:1804
+#: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
 #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
@@ -5314,24 +5311,50 @@
 msgid "Credentials delete is not supported"
 msgstr "Akkreditivsletning er ikke understøttet"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
-msgid "Google authentication is not supported"
-msgstr "Googlegodkendelse er ikke understøttet"
-
 #. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:81
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:145
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:242
 #, c-format
 msgid "Source '%s' (%s) is not a valid Google source"
 msgstr "Kilden \"%s\" (%s) er ikke en gyldig Googlekilde"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:159
 msgid "Google secret not found"
 msgstr "Google-hemmelighed blev ikke fundet"
 
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:190
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:212
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:235
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:521
+msgid "Google authentication is not supported"
+msgstr "Googlegodkendelse er ikke understøttet"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:397
+msgid "Failed to get Google secret from credentials"
+msgstr "Kunne ikke hente Google-hemmelighed fra akkreditiver"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:404
+msgid "Refresh token not found in Google secret"
+msgstr "Opdateringssymbol ikke fundet i Google-hemmelighed"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:412
+msgid "Failed to construct refresh_token request"
+msgstr "Kunne ikke oprette refresh_token-forespørgsel"
+
+# Mystisk!
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:445
+msgid "Failed to encode new access token to Google secret"
+msgstr "Kunne ikke kode nyt adgangssymbol til Google-hemmelighed"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:455
+msgid "Failed to get access token from refresh_token server response"
+msgstr "Kunne ikke indhente noget adgangssymbol fra refresh_token-serversvar"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:461
+msgid "Failed to refresh token"
+msgstr "Kunne ikke opdatere symbol (token)"
+
 #: ../libedataserver/e-source-credentials-provider-impl-password.c:81
 msgid "Password not found"
 msgstr "Adgangskode ikke fundet"
@@ -5494,8 +5517,8 @@
 msgstr "Uventet serversvar"
 
 #: ../libedataserverui/e-credentials-prompter.c:260
-#: ../libedataserverui/e-credentials-prompter.c:1563
-#: ../libedataserverui/e-credentials-prompter.c:1607
+#: ../libedataserverui/e-credentials-prompter.c:1573
+#: ../libedataserverui/e-credentials-prompter.c:1617
 msgid "Credentials prompt was cancelled"
 msgstr "Forespørgsel om akkreditiver annulleret"
 
@@ -5504,42 +5527,42 @@
 msgid "Source '%s' doesn't support prompt for credentials"
 msgstr "Datakilden \"%s\" understøtter ikke forespørgsel om akkreditiver"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:441
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:446
 #, c-format
 msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
 msgstr ""
 "Kunne ikke indhente noget adgangssymbol fra adressen \"%s\". Fejlkode %d (%s)"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:487
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:494
 msgid "Requesting access token, please wait..."
 msgstr "Forespørger om adgangssymbol; vent venligst..."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:589
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:596
 msgid "Google Address book authentication request"
 msgstr "Anmodning om godkendelse af Google-adressebog"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:592
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:599
 msgid "Google Calendar authentication request"
 msgstr "Anmodning om godkendelse af Google-kalender"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:595
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
 msgid "Google Memo List authentication request"
 msgstr "Anmodning om godkendelse af Google-memoliste"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:598
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
 msgid "Google Task List authentication request"
 msgstr "Anmodning om godkendelse af Google-opgaveliste"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:609
 msgid "Google Mail authentication request"
 msgstr "Anmodning om godkendelse af Google-mail"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:612
 msgid "Google account authentication request"
 msgstr "Anmodning om Google-konto-godkendelse"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:616
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5548,7 +5571,7 @@
 "Log ind med din Googlekonto og acceptér betingelserne for at kunne tilgå din "
 "adressebog \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:620
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5557,7 +5580,7 @@
 "Log ind med din Googlekonto og acceptér betingelserne for at kunne tilgå din "
 "kalender \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:624
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5566,7 +5589,7 @@
 "Log ind med din Googlekonto og acceptér betingelserne for at kunne tilgå din "
 "mailkonto \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:628
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5575,7 +5598,7 @@
 "Log ind med din Googlekonto og acceptér betingelserne for at kunne tilgå din "
 "mailtransport \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:632
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5584,7 +5607,7 @@
 "Log ind med din Googlekonto og acceptér betingelserne for at kunne tilgå din "
 "memoliste \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:636
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:643
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5593,7 +5616,7 @@
 "Log ind med din Googlekonto og acceptér betingelserne for at kunne tilgå din "
 "opgaveliste \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:640
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:647
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5602,7 +5625,7 @@
 "Log ind med din Googlekonto og acceptér betingelserne for at kunne tilgå din "
 "konto \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:684
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:691
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:232
 #: ../libedataserverui/e-trust-prompt.c:114
 #: ../libedataserverui/e-webdav-discover-widget.c:1063
@@ -5851,14 +5874,12 @@
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an access token for '%s'"
-msgstr ""
-"Kan ikke finde nogen tilsvarende konto i org.gnome.OnlineAccounts-tjenesten, "
-"hvorfra man kan få et adgangstegn til \"%s\""
+msgstr "Kan ikke finde nogen tilsvarende konto i org.gnome.OnlineAccounts-tjenesten, hvorfra man kan få et adgangssymbol til \"%s\""
 
 #: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
-msgstr "Kunne ikke få noget adgangstegn til \"%s\": "
+msgstr "Kunne ikke få noget adgangssymbol til \"%s\": "
 
 #: ../modules/google-backend/module-google-backend.c:602
 #: ../modules/yahoo-backend/module-yahoo-backend.c:226
@@ -5921,9 +5942,7 @@
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
 "which to obtain an access token for '%s'"
-msgstr ""
-"Kan ikke finde en tilsvarende kontotjeneste i kontodatabasen, hvorfra man "
-"kan få et adgangstegn til \"%s\""
+msgstr "Kan ikke finde en tilsvarende kontotjeneste i kontodatabasen, hvorfra man kan få et adgangssymbol til \"%s\""
 
 #: ../modules/ubuntu-online-accounts/uoa-utils.c:84
 #: ../modules/ubuntu-online-accounts/uoa-utils.c:281
diff -Nru evolution-data-server-3.22.0/po/hr.po evolution-data-server-3.22.1/po/hr.po
--- evolution-data-server-3.22.0/po/hr.po	2016-08-02 07:42:15.000000000 +0000
+++ evolution-data-server-3.22.1/po/hr.po	2016-10-06 14:50:19.000000000 +0000
@@ -5,1310 +5,1800 @@
 msgstr ""
 "Project-Id-Version: evolution-data-server 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-07 22:56+0200\n"
-"PO-Revision-Date: 2008-05-20 05:05+0000\n"
-"Last-Translator: Launchpad Translations Administrators \n"
+"POT-Creation-Date: 2016-05-25 13:19+0000\n"
+"PO-Revision-Date: 2016-05-08 12:32+0000\n"
+"Last-Translator: gogo \n"
 "Language-Team: Croatian \n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-05-27 23:59+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#: ../addressbook/backends/file/e-book-backend-file.c:555
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2016-09-15 10:57+0000\n"
+"X-Generator: Launchpad (build 18186)\n"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:120
+#, c-format
+msgid "Failed to remove file '%s': %s"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:148
+#, c-format
+msgid "Failed to make directory %s: %s"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:419
+#, c-format
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:524
+#: ../addressbook/backends/file/e-book-backend-file.c:1256
+msgid "No UID in the contact"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:851
+#, c-format
+msgid "Conflicting UIDs found in added contacts"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:990
 msgid "Loading..."
-msgstr "Učitavam..."
+msgstr "Učitavanje…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:558
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4286
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/file/e-book-backend-file.c:992
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4357
 msgid "Searching..."
-msgstr "Tražim..."
+msgstr "Traženje…"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4450
+#: ../addressbook/backends/file/e-book-backend-file.c:1284
 #, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "Preuzimanje kontakata (%d)... "
+msgid "Tried to modify contact '%s' with out of sync revision"
+msgstr ""
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "Obnavljanje preuzetih kontakata (%d)... "
+#: ../addressbook/backends/file/e-book-backend-file.c:1475
+#: ../addressbook/backends/file/e-book-backend-file.c:1560
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
+#: ../addressbook/libedata-book/e-book-sqlite.c:7332
+#: ../addressbook/libedata-book/e-book-sqlite.c:7401
+#, c-format
+msgid "Contact '%s' not found"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1620
+#: ../addressbook/backends/file/e-book-backend-file.c:1701
+#, c-format
+msgid "Query '%s' not supported"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1629
+#: ../addressbook/backends/file/e-book-backend-file.c:1710
+#, c-format
+msgid "Invalid Query '%s'"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1975
+msgid "Requested to delete an unrelated cursor"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:2046
+#, c-format
+msgid "Failed to rename old database from '%s' to '%s': %s"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:867
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51
+#: ../addressbook/libebook-contacts/e-phone-number.c:56
+#: ../addressbook/libebook/e-book.c:1078
+#: ../addressbook/libebook/e-book-client.c:2131
+#: ../addressbook/libebook/e-book-client.c:2303
+#: ../addressbook/libebook/e-book-client.c:2516
+#: ../addressbook/libebook/e-book-client.c:2647
+#: ../addressbook/libebook/e-book-client.c:2806
+#: ../addressbook/libebook/e-book-client.c:2940
+#: ../addressbook/libebook/e-book-client.c:3071
+#: ../addressbook/libebook/e-book-client.c:3229
+#: ../addressbook/libebook/e-book-client.c:3424
+#: ../addressbook/libebook/e-book-client.c:3642
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:585
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:633
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
+#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
+#: ../calendar/libecal/e-cal-client.c:3492
+#: ../calendar/libecal/e-cal-client.c:3665
+#: ../calendar/libecal/e-cal-client.c:3929
+#: ../calendar/libecal/e-cal-client.c:4170
+#: ../calendar/libecal/e-cal-client.c:4360
+#: ../calendar/libecal/e-cal-client.c:4553
+#: ../calendar/libecal/e-cal-client.c:4762
+#: ../calendar/libecal/e-cal-client.c:4931
+#: ../calendar/libecal/e-cal-client.c:5134
+#: ../calendar/libecal/e-cal-client.c:5284
+#: ../calendar/libecal/e-cal-client.c:5478
+#: ../calendar/libecal/e-cal-client.c:5631
+#: ../calendar/libecal/e-cal-client.c:5848
+#: ../calendar/libecal/e-cal-client.c:6002
+#: ../calendar/libecal/e-cal-client.c:6228
+#: ../calendar/libecal/e-cal-client.c:6424
+#: ../calendar/libecal/e-cal-client.c:6787
+#: ../calendar/libecal/e-cal-client.c:7009
+#: ../camel/providers/imapx/camel-imapx-server.c:2975
+#: ../camel/providers/imapx/camel-imapx-server.c:2985
+#: ../camel/providers/imapx/camel-imapx-server.c:2997
+#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:814
+msgid "Querying for updated contacts…"
+msgstr "Slanje upita za ažuriranim kontaktima..."
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:998
+msgid "Querying for updated groups…"
+msgstr "Slanje upita za ažuriranim grupama..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1792
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1503
+msgid "The backend does not support bulk additions"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1949
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1625
+msgid "The backend does not support bulk modifications"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2158
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1725
+msgid "The backend does not support bulk removals"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2280
+msgid "Loading…"
+msgstr "Učitavanje..."
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1653
+#: ../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 "Osobno"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
-msgid "Using Distinguished Name (DN)"
-msgstr "Koristim poseban naziv (DN)"
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1655
+msgid "Friends"
+msgstr "Prijatelji"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1657
+msgid "Family"
+msgstr "Obitelj"
+
+#. System Group: Coworkers
+#: ../addressbook/backends/google/e-book-google-utils.c:1659
+msgid "Coworkers"
+msgstr "Suradnici"
+
+#. Translators: An error message shown to a user when trying to do an
+#. * operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:114
+msgid "Not connected"
+msgstr "Nije spojeno"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
-msgid "Using Email Address"
-msgstr "Koristim  adresu elektronske pošte"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:892
+msgid "Failed to bind using either v3 or v2 binds"
+msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1016
 msgid "Reconnecting to LDAP server..."
-msgstr "Ponovo uspostavljam vezu sa LDAP poslužiteljem"
+msgstr "Ponovno povezivanje s LDAP poslužiteljem..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1615
-msgid "Adding contact to LDAP server..."
-msgstr "Dodajem kontakt u LDAP poslužitelj..."
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+msgid "Invalid DN syntax"
+msgstr "Neispravna DN sintaksa"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1750
-msgid "Removing contact from LDAP server..."
-msgstr "Uklanjam kontakt sa LDAP poslužitelja..."
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
+#, c-format
+msgid "LDAP error 0x%x (%s)"
+msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2062
-msgid "Modifying contact from LDAP server..."
-msgstr "Promjena kontakta na LDAP poslužitelju..."
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1775
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
+#, c-format
+msgid "%s: NULL returned from ldap_first_entry"
+msgstr ""
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
+#, c-format
+msgid "%s: Unhandled result type %d returned"
+msgstr ""
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2289
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
+#, c-format
+msgid "%s: Unhandled search result type %d returned"
+msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4146
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4195
 msgid "Receiving LDAP search results..."
-msgstr "Primam rezultate pretrage sa LDAP poslužitelja"
+msgstr "Primanje rezultata pretrage sa LDAP poslužitelja"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4308
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4379
 msgid "Error performing search"
 msgstr "Greška kod izvršavanja pretrage"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:252 ../addressbook/libebook/e-book.c:256
-#: ../addressbook/libebook/e-book.c:461 ../addressbook/libebook/e-book.c:465
-#: ../addressbook/libebook/e-book.c:604 ../addressbook/libebook/e-book.c:608
-#: ../addressbook/libebook/e-book.c:695 ../addressbook/libebook/e-book.c:699
-#: ../addressbook/libebook/e-book.c:995 ../addressbook/libebook/e-book.c:1000
-#: ../addressbook/libebook/e-book.c:1179 ../addressbook/libebook/e-book.c:1183
-#: ../addressbook/libebook/e-book.c:1338 ../addressbook/libebook/e-book.c:1342
-#: ../addressbook/libebook/e-book.c:1544 ../addressbook/libebook/e-book.c:1548
-#: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791
-#: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029
-#: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238
-#: ../addressbook/libebook/e-book.c:3364
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4512
 #, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" na knjizi prije \"%s\""
+msgid "Downloading contacts (%d)..."
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:265 ../addressbook/libebook/e-book.c:474
-#: ../addressbook/libebook/e-book.c:617 ../addressbook/libebook/e-book.c:708
-#: ../addressbook/libebook/e-book.c:1010 ../addressbook/libebook/e-book.c:1193
-#: ../addressbook/libebook/e-book.c:1352 ../addressbook/libebook/e-book.c:1557
-#: ../addressbook/libebook/e-book.c:1800 ../addressbook/libebook/e-book.c:2039
-#: ../addressbook/libebook/e-book.c:2247 ../addressbook/libebook/e-book.c:2593
-#: ../addressbook/libebook/e-book.c:2792
-msgid "book busy"
-msgstr "knjiga zaposlena"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5082
+msgid "Adding contact to LDAP server..."
+msgstr "Dodavanje kontakta na LDAP poslužitelj..."
 
-#: ../addressbook/libebook/e-book.c:296 ../addressbook/libebook/e-book.c:300
-#: ../addressbook/libebook/e-book.c:505 ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:644 ../addressbook/libebook/e-book.c:648
-#: ../addressbook/libebook/e-book.c:735 ../addressbook/libebook/e-book.c:739
-#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1040
-#: ../addressbook/libebook/e-book.c:1223 ../addressbook/libebook/e-book.c:1226
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1383
-#: ../addressbook/libebook/e-book.c:1593 ../addressbook/libebook/e-book.c:1597
-#: ../addressbook/libebook/e-book.c:1847 ../addressbook/libebook/e-book.c:1851
-#: ../addressbook/libebook/e-book.c:2069 ../addressbook/libebook/e-book.c:2073
-#: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277
-#: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619
-#: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818
-#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3373
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "Došlo je do CORBA iznimke pri pozivu \"%s\""
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5157
+msgid "Modifying contact from LDAP server..."
+msgstr "Promjena kontakta na LDAP poslužitelju..."
 
-#: ../addressbook/libebook/e-book.c:2523
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: nema trenutne aktivnosti"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5223
+msgid "Removing contact from LDAP server..."
+msgstr "Uklanjanje kontakta s LDAP poslužitelja..."
 
-#: ../addressbook/libebook/e-book.c:2552
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
 #, c-format
-msgid "%s: could not cancel"
+msgid "Failed to get the DN for user '%s'"
 msgstr ""
 
-#: ../addressbook/libebook/e-book.c:2579 ../addressbook/libebook/e-book.c:2583
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
+#: ../calendar/backends/http/e-cal-backend-http.c:512
 #, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" u knjizi nakon \"%s\""
+msgid "Malformed URI: %s"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:2647
-#, c-format
-msgid "%s: canceled"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
+msgid "Loading Addressbook summary..."
 msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3228
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
 #, c-format
-msgid "%s: Invalid source."
-msgstr "%s: neispravan izvor."
+msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+msgstr ""
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:883
+msgid "No response body in webdav PROPFIND result"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3236 ../addressbook/libebook/e-book.c:3302
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:944
 #, c-format
-msgid "%s: no factories available for URI `%s'"
+msgid "Loading Contacts (%d%%)"
+msgstr ""
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1358
+msgid "Cannot transform SoupURI to string"
 msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3248
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1554
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: Nisam mogao kreirati EBookListener"
+msgid "Create resource '%s' failed with HTTP status %d (%s)"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3515
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1656
+msgid "Contact on server changed -> not modifying"
+msgstr ""
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1664
 #, c-format
-msgid "%s: there was no self contact UID stored in gconf"
+msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3648
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1757
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1773
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: u gconfu nije bio spremljen izvor uida `%s'"
+msgid "DELETE failed with HTTP status %d"
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
+msgid "No such book"
+msgstr "Nema takve knjige"
+
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../addressbook/libedata-book/e-data-book.c:384
+msgid "Contact not found"
+msgstr "Kontakt nije pronađen"
+
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
+#: ../addressbook/libedata-book/e-data-book.c:385
+msgid "Contact ID already exists"
+msgstr "ID kontakta već postoji"
+
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
+msgid "No such source"
+msgstr "Nema takvog izvora"
+
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:48
+#: ../addressbook/libedata-book/e-data-book.c:401
+msgid "No space"
+msgstr "Nema prostora"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook-contacts/e-contact.c:130
 msgid "Unique ID"
 msgstr "Jedinstveni ID"
 
-#: ../addressbook/libebook/e-contact.c:114
+#. FILE_AS is not really a structured field - we use a getter/setter
+#. * so we can generate its value if necessary in the getter
+#. Translators: This is an EContact field description, in this case it's a
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#: ../addressbook/libebook-contacts/e-contact.c:135
 msgid "File Under"
 msgstr "Datoteka pod"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
-msgid "Book URI"
-msgstr "Adresa knjige"
+#: ../addressbook/libebook-contacts/e-contact.c:137
+msgid "Book UID"
+msgstr ""
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
-#. so we can set the N property (since evo 1.4 works fine with
-#. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#. * so we can set the N property (since evo 1.4 works fine with
+#. * vcards that don't even have a N attribute.  *sigh*)
+#: ../addressbook/libebook-contacts/e-contact.c:143
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Given Name"
 msgstr "Dano ime"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Family Name"
 msgstr "Obiteljsko ime"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook-contacts/e-contact.c:146
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 1"
 msgstr "E-pošta 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 2"
-msgstr "Email 2"
+msgstr "E-pošta 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 3"
-msgstr "Email 3"
+msgstr "E-pošta 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 4"
-msgstr "Email 4"
+msgstr "E-pošta 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Mailer"
 msgstr "Program e-pošte"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Home Address Label"
-msgstr "Kućna adresa"
+msgstr "Natpis kućne adrese"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Work Address Label"
-msgstr "Oznaka adrese na poslu"
+msgstr "Natpis poslovne adrese"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Other Address Label"
-msgstr "Oznaka ostalih adresa"
+msgstr "Natpis ostalih adresa"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook-contacts/e-contact.c:162
 msgid "Assistant Phone"
 msgstr "Telefon pomoćnika"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Business Phone"
 msgstr "Poslovni telefon"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone 2"
 msgstr "Poslovni telefon 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Fax"
-msgstr "Faks na poslu"
+msgstr "Poslovni faks"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Callback Phone"
 msgstr "Telefon povratnog poziva"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Car Phone"
 msgstr "Telefon (u autu)"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Company Phone"
 msgstr "Telefon poduzeća"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Home Phone"
-msgstr "Telefon (kućni)"
+msgstr "Kućni telefon"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone 2"
 msgstr "Kućni telefon 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Fax"
-msgstr "Faks kod kuće"
+msgstr "Kućni faks"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:173
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Other Phone"
 msgstr "Drugi telefon"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Pager"
 msgstr "Dojavljivač"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Primary Phone"
-msgstr "Primarni telefon"
+msgstr "Glavni telefon"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:181
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:184
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:185
 msgid "Organizational Unit"
 msgstr "Organizacijska jedinica"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Office"
 msgstr "Ured"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Title"
-msgstr "Naslov"
+msgstr "Titula"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Role"
 msgstr "Uloga"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:189
 msgid "Manager"
 msgstr "Upravitelj"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Assistant"
 msgstr "Pomoćnik"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Homepage URL"
 msgstr "Adresa početne stranice"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Weblog URL"
 msgstr "Weblog URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:426
+#: ../addressbook/libebook-contacts/e-contact.c:197
 msgid "Categories"
 msgstr "Kategorije"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "Calendar URI"
 msgstr "Adresa kalendara"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Free/Busy URL"
 msgstr "Slobodna/zauzeta adresa"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "ICS Calendar"
-msgstr "ICS Kalendar"
+msgstr "ICS kalendar"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "Video Conferencing URL"
-msgstr "Video Konferencijski URL"
+msgstr "URL video konferencije"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook-contacts/e-contact.c:206
 msgid "Spouse's Name"
-msgstr "&Supružnik:"
+msgstr "Ime supružnika"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "Note"
 msgstr "Bilješka"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook-contacts/e-contact.c:210
 msgid "AIM Home Screen Name 1"
-msgstr "AIM Home Ime Ekrana 1"
+msgstr "AIM kućno ekransko ime 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Home Screen Name 2"
-msgstr "AIM Home Ime Ekrana 2"
+msgstr "AIM kućno ekransko ime 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Home Screen Name 3"
-msgstr "AIM Doma Ime Ekrana 3"
+msgstr "AIM kućno ekransko ime 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Work Screen Name 1"
-msgstr "AIM Posao Ime Ekrana 1"
+msgstr "AIM poslovno ekransko ime 3"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "AIM Work Screen Name 2"
-msgstr "AIM Posao Ime Ekrana 2"
+msgstr "AIM poslovno ekransko ime 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "AIM Work Screen Name 3"
-msgstr "AIM Posao Ime Ekrana 3"
+msgstr "AIM poslovno ekransko ime 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "GroupWise Home Screen Name 1"
-msgstr "GroupWise kućno ime zaslona 1"
+msgstr "GroupWise kućno ekransko ime 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Home Screen Name 2"
-msgstr "GroupWise kućno ime zaslona 2"
+msgstr "GroupWise kućno ekransko ime 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Home Screen Name 3"
-msgstr "GroupWise kućno ime zaslona 3"
+msgstr "GroupWise kućno ekransko ime 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Work Screen Name 1"
-msgstr "GroupWise poslovno ime zaslona 1"
+msgstr "GroupWise poslovno ekransko ime 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "GroupWise Work Screen Name 2"
-msgstr "GroupWise poslovno ime zaslona 2"
+msgstr "GroupWise poslovno ekransko ime 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "GroupWise Work Screen Name 3"
-msgstr "GroupWise poslovno ime zaslona 3"
+msgstr "GroupWise poslovno ekransko ime 3"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "Jabber kućni Id 1"
+#: ../addressbook/libebook-contacts/e-contact.c:222
+msgid "Jabber Home ID 1"
+msgstr "Jabber kućni ID 1"
 
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "Jabber kućni Id 2"
+#: ../addressbook/libebook-contacts/e-contact.c:223
+msgid "Jabber Home ID 2"
+msgstr "Jabber kućno ime ID 2"
 
-#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "Jabber kućni Id 3"
+#: ../addressbook/libebook-contacts/e-contact.c:224
+msgid "Jabber Home ID 3"
+msgstr "Jabber kućno ime ID 3"
 
-#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "Jabber posao Id 1"
+#: ../addressbook/libebook-contacts/e-contact.c:225
+msgid "Jabber Work ID 1"
+msgstr "Jabber poslovno ime ID 1"
 
-#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "Jabber posao Id 2"
+#: ../addressbook/libebook-contacts/e-contact.c:226
+msgid "Jabber Work ID 2"
+msgstr "Jabber poslovno ime ID 2"
 
-#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "Jabber posao Id 3"
+#: ../addressbook/libebook-contacts/e-contact.c:227
+msgid "Jabber Work ID 3"
+msgstr "Jabber poslovno ime ID 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "Yahoo! Home Screen Name 1"
-msgstr "Yahoo! kućno zaslonsko ime 1"
+msgstr "Yahoo! kućno ekransko ime 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Home Screen Name 2"
-msgstr "Yahoo! kućno zaslonsko ime 2"
+msgstr "Yahoo! kućno ekransko ime 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Home Screen Name 3"
-msgstr "Yahoo! kućno zaslonsko ime 3"
+msgstr "Yahoo! kućno ekransko ime 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Work Screen Name 1"
-msgstr "Yahoo!  zaslonsko ime na poslu 1"
+msgstr "Yahoo!  ekransko ime na poslu 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "Yahoo! Work Screen Name 2"
-msgstr "Yahoo!  zaslonsko ime na poslu 2"
+msgstr "Yahoo!  ekransko ime na poslu 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "Yahoo! Work Screen Name 3"
-msgstr "Yahoo!  zaslonsko ime na poslu 3"
+msgstr "Yahoo!  ekransko ime na poslu 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "MSN Home Screen Name 1"
-msgstr "MSN kućni zaslonsko ime 1"
+msgstr "MSN kućno ekransko ime 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Home Screen Name 2"
-msgstr "MSN kućni zaslonsko ime 2"
+msgstr "MSN kućno ekransko ime 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Home Screen Name 3"
-msgstr "MSN kućni zaslonsko ime 3"
+msgstr "MSN kućno ekransko ime 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Work Screen Name 1"
-msgstr "MSN  zaslonsko ime na poslu 1"
+msgstr "MSN  ekransko ime na poslu 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "MSN Work Screen Name 2"
-msgstr "MSN  zaslonsko ime na poslu 2"
+msgstr "MSN  ekransko ime na poslu 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:239
 msgid "MSN Work Screen Name 3"
-msgstr "MSN  zaslonsko ime na poslu 3"
+msgstr "MSN  ekransko ime na poslu 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "ICQ kućni Id 1"
-
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ kućni Id 2"
-
-#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ kućni Id 3"
-
-#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "ICQ posao Id 1"
-
-#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "ICQ posao Id 2"
-
-#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "ICQ posao Id 3"
+#: ../addressbook/libebook-contacts/e-contact.c:240
+msgid "ICQ Home ID 1"
+msgstr "ICQ kućni ID 1"
+
+#: ../addressbook/libebook-contacts/e-contact.c:241
+msgid "ICQ Home ID 2"
+msgstr "ICQ kućni ID 2"
+
+#: ../addressbook/libebook-contacts/e-contact.c:242
+msgid "ICQ Home ID 3"
+msgstr "ICQ kućni ID 3"
+
+#: ../addressbook/libebook-contacts/e-contact.c:243
+msgid "ICQ Work ID 1"
+msgstr "ICQ poslovni ID 1"
+
+#: ../addressbook/libebook-contacts/e-contact.c:244
+msgid "ICQ Work ID 2"
+msgstr "ICQ poslovni ID 2"
+
+#: ../addressbook/libebook-contacts/e-contact.c:245
+msgid "ICQ Work ID 3"
+msgstr "ICQ poslovni ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:248
 msgid "Last Revision"
 msgstr "Zadnja revizija"
 
-#: ../addressbook/libebook/e-contact.c:228
+#. Translators: This is an EContact field description, in this case it's a
+#. * virtual field, which returns either name of the contact or the organization
+#. * name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook-contacts/e-contact.c:252
 msgid "Name or Org"
 msgstr "Ime ili organizacija"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:255
 msgid "Address List"
 msgstr "Popis adresa"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:256
 msgid "Home Address"
 msgstr "Kućna adresa"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Work Address"
 msgstr "Poslovna adresa"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:258
 msgid "Other Address"
 msgstr "Druga adresa"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:261
 msgid "Category List"
 msgstr "Popis kategorija"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook-contacts/e-contact.c:264
 msgid "Photo"
-msgstr "Slika"
+msgstr "Fotografija"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Logo"
 msgstr "Logotip"
 
-#: ../addressbook/libebook/e-contact.c:243
+#. Translators: This is an EContact field description, in this case it's a name
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook-contacts/e-contact.c:269
+#: ../libedataserverui/e-webdav-discover-widget.c:153
 msgid "Name"
 msgstr "Ime"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Email List"
 msgstr "Popis e-pošte"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook-contacts/e-contact.c:273
 msgid "AIM Screen Name List"
-msgstr "AIM Lista Imena Ekrana"
+msgstr "AIM popis ekranskih imena"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "GroupWise Id Lista"
+#: ../addressbook/libebook-contacts/e-contact.c:274
+msgid "GroupWise ID List"
+msgstr "GroupWise ID popis"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Jabber Id popis"
+#: ../addressbook/libebook-contacts/e-contact.c:275
+msgid "Jabber ID List"
+msgstr "Jabber ID popis"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook-contacts/e-contact.c:276
 msgid "Yahoo! Screen Name List"
-msgstr "Yahoo! popis zaslonskih imena"
+msgstr "Yahoo! popis ekranskih imena"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook-contacts/e-contact.c:277
 msgid "MSN Screen Name List"
-msgstr "MSN popis zaslonskih imena"
+msgstr "MSN popis ekranskih imena"
 
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "ICQ Id popis"
+#: ../addressbook/libebook-contacts/e-contact.c:278
+msgid "ICQ ID List"
+msgstr "ICQ ID popis"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook-contacts/e-contact.c:280
 msgid "Wants HTML Mail"
 msgstr "Želi HTML poštu"
 
-#: ../addressbook/libebook/e-contact.c:256
+#. Translators: This is an EContact field description, in this case it's a
+#. * field describing whether it's a Contact list (list of email addresses) or a
+#. * regular contact for one person/organization/...
+#: ../addressbook/libebook-contacts/e-contact.c:285
 msgid "List"
 msgstr "Popis"
 
-#: ../addressbook/libebook/e-contact.c:257
-msgid "List Show Addresses"
-msgstr "Lista prikazanih adresa"
+#. Translators: This is an EContact field description, in this case it's a flag
+#. * used to determine whether when sending to Contact lists the addresses should be
+#. * shown or not to other recipients - basically whether to use BCC field or CC
+#. * message header when sending messages to this Contact list.
+#: ../addressbook/libebook-contacts/e-contact.c:290
+msgid "List Shows Addresses"
+msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook-contacts/e-contact.c:292
 msgid "Birth Date"
 msgstr "Datum rođenja"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:948
 msgid "Anniversary"
 msgstr "Obljetnica"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook-contacts/e-contact.c:296
 msgid "X.509 Certificate"
 msgstr "X.509 certifikat"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook-contacts/e-contact.c:297
+msgid "PGP Certificate"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr ""
+#: ../addressbook/libebook-contacts/e-contact.c:299
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu kućni ID 1"
 
-#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr ""
+#: ../addressbook/libebook-contacts/e-contact.c:300
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu kućni ID 2"
 
-#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr ""
+#: ../addressbook/libebook-contacts/e-contact.c:301
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu kućni ID 3"
 
-#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr ""
+#: ../addressbook/libebook-contacts/e-contact.c:302
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu poslovni ID 1"
 
-#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr ""
+#: ../addressbook/libebook-contacts/e-contact.c:303
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu poslovni ID 2"
 
-#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr ""
+#: ../addressbook/libebook-contacts/e-contact.c:304
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu poslovni ID 3"
+
+#: ../addressbook/libebook-contacts/e-contact.c:305
+msgid "Gadu-Gadu ID List"
+msgstr "Gadu-Gadu ID popis"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook-contacts/e-contact.c:308
 msgid "Geographic Information"
-msgstr ""
+msgstr "Zemljopisne informacije"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook-contacts/e-contact.c:310
 msgid "Telephone"
+msgstr "Telefon"
+
+#: ../addressbook/libebook-contacts/e-contact.c:312
+msgid "Skype Home Name 1"
+msgstr "Skype kućno ime 1"
+
+#: ../addressbook/libebook-contacts/e-contact.c:313
+msgid "Skype Home Name 2"
+msgstr "Skype kućno ime 2"
+
+#: ../addressbook/libebook-contacts/e-contact.c:314
+msgid "Skype Home Name 3"
+msgstr "Skype kućno ime 3"
+
+#: ../addressbook/libebook-contacts/e-contact.c:315
+msgid "Skype Work Name 1"
+msgstr "Skype poslovno ime 1"
+
+#: ../addressbook/libebook-contacts/e-contact.c:316
+msgid "Skype Work Name 2"
+msgstr "Skype poslovno ime 2"
+
+#: ../addressbook/libebook-contacts/e-contact.c:317
+msgid "Skype Work Name 3"
+msgstr "Skype poslovno ime 3"
+
+#: ../addressbook/libebook-contacts/e-contact.c:318
+msgid "Skype Name List"
+msgstr "Skype popis imena"
+
+#: ../addressbook/libebook-contacts/e-contact.c:320
+msgid "SIP address"
+msgstr "SIP adresa"
+
+#: ../addressbook/libebook-contacts/e-contact.c:322
+msgid "Google Talk Home Name 1"
+msgstr "Google Talk kućno ime 1"
+
+#: ../addressbook/libebook-contacts/e-contact.c:323
+msgid "Google Talk Home Name 2"
+msgstr "Google Talk kućno ime 2"
+
+#: ../addressbook/libebook-contacts/e-contact.c:324
+msgid "Google Talk Home Name 3"
+msgstr "Google Talk kućno ime 3"
+
+#: ../addressbook/libebook-contacts/e-contact.c:325
+msgid "Google Talk Work Name 1"
+msgstr "Google Talk poslovno ime 1"
+
+#: ../addressbook/libebook-contacts/e-contact.c:326
+msgid "Google Talk Work Name 2"
+msgstr "Google Talk poslovno ime 2"
+
+#: ../addressbook/libebook-contacts/e-contact.c:327
+msgid "Google Talk Work Name 3"
+msgstr "Google Talk poslovno ime 3"
+
+#: ../addressbook/libebook-contacts/e-contact.c:328
+msgid "Google Talk Name List"
+msgstr "Google Talk popis imena"
+
+#: ../addressbook/libebook-contacts/e-contact.c:330
+msgid "Twitter Name List"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:1499
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook-contacts/e-contact.c:1660
+#: ../addressbook/libebook/e-destination.c:918
 msgid "Unnamed List"
-msgstr "Lista bez imena"
+msgstr "Neimenovani popis"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463
-#: ../libedataserver/e-categories.c:44
-msgid "Birthday"
-msgstr "Rođendan"
+#: ../addressbook/libebook-contacts/e-phone-number.c:41
+msgid "The library was built without phone number support."
+msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489
-#, c-format
-msgid "Birthday: %s"
-msgstr "Rođendan: %s"
+#: ../addressbook/libebook-contacts/e-phone-number.c:43
+msgid "The phone number parser reported a yet unknown error code."
+msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513
-#, c-format
-msgid "Anniversary: %s"
-msgstr "Godišnjica: %s"
+#: ../addressbook/libebook-contacts/e-phone-number.c:45
+msgid "Not a phone number"
+msgstr ""
 
-#: ../calendar/backends/file/e-cal-backend-file.c:214
-msgid "Cannot save calendar data: Malformed URI."
+#: ../addressbook/libebook-contacts/e-phone-number.c:47
+msgid "Invalid country calling code"
 msgstr ""
 
-#: ../calendar/backends/file/e-cal-backend-file.c:221
-#: ../calendar/backends/file/e-cal-backend-file.c:227
-#, fuzzy
-msgid "Cannot save calendar data"
-msgstr "Nije kalendar"
+#: ../addressbook/libebook-contacts/e-phone-number.c:49
+msgid ""
+"Remaining text after the country calling code is too short for a phone number"
+msgstr ""
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:335
-msgid "Could not create thread for getting deltas"
-msgstr "Ne mogu stvoriti nit za pribavljanje razlika"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:367
-#: ../calendar/backends/google/e-cal-backend-google.c:1194
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:584
-#: ../calendar/backends/weather/e-cal-backend-weather.c:466
-msgid "Could not create cache file"
-msgstr "Nisam mogao stvoriti datoteku pričuvne memorije"
+#: ../addressbook/libebook-contacts/e-phone-number.c:51
+msgid "Text is too short for a phone number"
+msgstr ""
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:380
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
-msgid "Could not create thread for populating cache"
-msgstr "Ne mogu stvoriti nit za popunjavanje međuspremnika"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795
-msgid "Reply Requested: by "
-msgstr "Potreban odgovor: za "
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800
-msgid "Reply Requested: When convenient"
-msgstr "Potreban odgovor: Ukoliko je moguće"
+#: ../addressbook/libebook-contacts/e-phone-number.c:53
+msgid "Text is too long for a phone number"
+msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../addressbook/libebook/e-book-client.c:931
 #, c-format
-msgid "Loading %s items"
-msgstr "Učitavanje %s stavki"
+msgid "Unknown book property '%s'"
+msgstr "Nepoznato svojstvo knjige '%s'"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "Kalendar"
+#: ../addressbook/libebook/e-book-client.c:946
+#, c-format
+msgid "Cannot change value of book property '%s'"
+msgstr "Promjena svojstva knjige '%s' nije moguće"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
-msgid "Invalid server URI"
-msgstr "Neispravni URI poslužitelja"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5082
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145
-#: ../camel/providers/groupwise/camel-groupwise-store.c:594
-#: ../camel/providers/groupwise/camel-groupwise-store.c:746
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
-msgstr "Neuspješna identifikacija"
+#: ../addressbook/libebook/e-book-client.c:1390
+#: ../addressbook/libebook/e-book-client.c:1621
+#: ../addressbook/libebook/e-book-client.c:1898
+#: ../calendar/libecal/e-cal-client.c:1717
+#: ../calendar/libecal/e-cal-client.c:1955
+#, c-format
+msgid "Unable to connect to '%s': "
+msgstr ""
 
-#: ../calendar/backends/http/e-cal-backend-http.c:269
-msgid "Redirected to Invalid URI"
-msgstr "Preusmjereno na neispravnui URI"
+#: ../addressbook/libebook/e-book-client-view.c:868
+#: ../calendar/libecal/e-cal-client-view.c:681
+#, c-format
+msgid "Client disappeared"
+msgstr ""
 
-#: ../calendar/backends/http/e-cal-backend-http.c:290
-msgid "Bad file format."
-msgstr "Neispravan format datoteke."
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
+#: ../addressbook/libedata-book/e-book-sqlite.c:2229
+#, c-format
+msgid "Error introspecting unknown summary field '%s'"
+msgstr ""
 
-#: ../calendar/backends/http/e-cal-backend-http.c:296
-msgid "Not a calendar."
-msgstr "Nije kalendar"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../addressbook/libedata-book/e-book-sqlite.c:1368
+msgid "Error parsing regular expression"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:144
-msgid "Could not retrieve weather data"
-msgstr "Ne mogu dobiti podataka o vremenskim prilikama"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
+#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:751
+#, c-format
+msgid "Insufficient memory"
+msgstr "Nedovoljno memorije"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:216
-msgid "Fair"
-msgstr "Lijepo"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:217
-msgid "Snow showers"
-msgstr "Mećave"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:218
-msgid "Snow"
-msgstr "Snijeg"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:219
-msgid "Partly cloudy"
-msgstr "Djelomično oblačno"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:220
-msgid "Smoke"
-msgstr "Dim"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:221
-msgid "Thunderstorms"
-msgstr "Grmljavine"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:222
-msgid "Cloudy"
-msgstr "Oblačno"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:223
-msgid "Drizzle"
-msgstr "Sitna kiša"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:224
-msgid "Sunny"
-msgstr "Sunčano"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:225
-msgid "Dust"
-msgstr "Prašina"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:226
-msgid "Clear"
-msgstr "Vedro"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:227
-msgid "Mostly cloudy"
-msgstr "Pretežno oblačno"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:228
-msgid "Windy"
-msgstr "Vjetrovito"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:229
-msgid "Rain showers"
-msgstr "Pljuskovi"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:230
-msgid "Foggy"
-msgstr "Maglovito"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:231
-msgid "Rain/snow mixed"
-msgstr "Kiša i snijeg"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:232
-msgid "Sleet"
-msgstr "Susnježica"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:233
-msgid "Very hot/humid"
-msgstr "Vrlo toplo/vlažno"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:234
-msgid "Blizzard"
-msgstr "Snježna oluja"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:235
-msgid "Freezing rain"
-msgstr "Ledena kiša"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:236
-msgid "Haze"
-msgstr "Izmaglica"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:237
-msgid "Blowing snow"
-msgstr "Snježni nanosi"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:238
-msgid "Freezing drizzle"
-msgstr "Ledena slaba kiša"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:239
-msgid "Very cold/wind chill"
-msgstr "Jako hladno/vjetrovito"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:240
-msgid "Rain"
-msgstr "Kiša"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
-#: ../calendar/backends/weather/e-cal-backend-weather.c:260
-#: ../calendar/backends/weather/e-cal-backend-weather.c:267
-msgid "Weather: Sunny"
-msgstr "Vrijeme: sunčano"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
+#, c-format
+msgid "Invalid contact field '%d' specified in summary"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-#: ../calendar/backends/weather/e-cal-backend-weather.c:268
-#: ../calendar/backends/weather/e-cal-backend-weather.c:271
-msgid "Weather: Snow"
-msgstr "Vrijeme: snijeg"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
+#: ../addressbook/libedata-book/e-book-sqlite.c:579
+#, c-format
+msgid ""
+"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"string and string list field types are supported"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Partly Cloudy"
-msgstr "Vrijeme: djelomično oblačno"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
-#: ../calendar/backends/weather/e-cal-backend-weather.c:264
-#: ../calendar/backends/weather/e-cal-backend-weather.c:270
-msgid "Weather: Fog"
-msgstr "Vrijeme: magla"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4169
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. vcards cannot be returned."
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
-msgid "Weather: Thunderstorms"
-msgstr "Vrijeme: grmljavina"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
+#: ../addressbook/libedata-book/e-book-sqlite.c:5807
+#, c-format
+msgid "Query contained unsupported elements"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
-#: ../calendar/backends/weather/e-cal-backend-weather.c:261
-msgid "Weather: Cloudy"
-msgstr "Vrijeme: oblačno"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4304
+#, c-format
+msgid "Invalid Query"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
-#: ../calendar/backends/weather/e-cal-backend-weather.c:263
-#: ../calendar/backends/weather/e-cal-backend-weather.c:265
-#: ../calendar/backends/weather/e-cal-backend-weather.c:266
-#: ../calendar/backends/weather/e-cal-backend-weather.c:269
-#: ../calendar/backends/weather/e-cal-backend-weather.c:272
-#: ../calendar/backends/weather/e-cal-backend-weather.c:274
-msgid "Weather: Rain"
-msgstr "Vrijeme: kiša"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4328
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. Hence only summary query is "
+"supported."
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:349
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4397
+#: ../addressbook/libedata-book/e-data-book.c:396
+#: ../addressbook/libedata-book/e-data-book.c:1146
+#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../calendar/libedata-cal/e-data-cal.c:1427 ../libedataserver/e-client.c:177
 #, c-format
-msgid "%.1f°C - %s"
-msgstr "%.1f°C - %s"
+msgid "Invalid query"
+msgstr "Nevažeći upit"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:351
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4440
 #, c-format
-msgid "%.1f°F - %s"
-msgstr "%.1f°F - %s"
+msgid ""
+"Full vcards are not stored in cache. Hence only summary query is supported."
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:354
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5263
 #, c-format
-msgid "%.1f/%.1f°C - %s"
-msgstr "%.1f/%.1f°C - %s"
+msgid "Unable to remove the db file: errno %d"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:356
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6050
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6450
 #, c-format
-msgid "%.1f/%.1f°F - %s"
-msgstr "%.1f/%.1f°F - %s"
+msgid "Only summary queries are supported by EbSdbCursor"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:362
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
 #, c-format
-msgid "%d%% chance of precipitation\n"
-msgstr "%d%% mogućnost za padaline\n"
+msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:369
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6071
 #, c-format
-msgid "%.1fcm snow\n"
-msgstr "%.1fcm snijeg\n"
+msgid "Cannot sort by a field that is not in the summary"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:371
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
 #, c-format
-msgid "%.1fin snow\n"
-msgstr "%.1fin snijeg\n"
+msgid "Cannot sort by a field which may have multiple values"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:374
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../addressbook/libedata-book/e-book-sqlite.c:8106
 #, c-format
-msgid "%.1f-%.1fcm snow\n"
-msgstr "%.1f-%.1fcm snijeg\n"
+msgid ""
+"Tried to step a cursor in reverse, but cursor is already at the beginning of "
+"the contact list"
+msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:376
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
+#: ../addressbook/libedata-book/e-book-sqlite.c:8114
 #, c-format
-msgid "%.1f-%.1fin snow\n"
-msgstr "%.1f-%.1fin snijeg\n"
+msgid ""
+"Tried to step a cursor forwards, but cursor is already at the end of the "
+"contact list"
+msgstr ""
 
-#: ../calendar/libecal/e-cal-component.c:1322
-msgid "Untitled appointment"
-msgstr "Neimenovani sastanak"
+#: ../addressbook/libedata-book/e-book-sqlite.c:545
+#, c-format
+msgid "Unsupported contact field '%d' specified in summary"
+msgstr ""
 
-#: ../calendar/libecal/e-cal-recur.c:4041
-msgid "1st"
-msgstr "1."
+#: ../addressbook/libedata-book/e-book-sqlite.c:1925
+msgid ""
+"Cannot upgrade contacts database from a legacy database with more than one "
+"addressbook. Delete one of the entries in the 'folders' table first."
+msgstr ""
 
-#: ../calendar/libecal/e-cal-recur.c:4042
-msgid "2nd"
-msgstr "2."
+#: ../addressbook/libedata-book/e-book-sqlite.c:5800
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Nevaljali upit: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
-msgid "3rd"
-msgstr "3."
+#: ../addressbook/libedata-book/e-book-sqlite.c:5975
+msgid "Invalid query for EbSqlCursor"
+msgstr ""
 
-#: ../calendar/libecal/e-cal-recur.c:4044
-msgid "4th"
-msgstr "4."
+#: ../addressbook/libedata-book/e-book-sqlite.c:7928
+msgid "At least one sort field must be specified to use an EbSqlCursor"
+msgstr ""
 
-#: ../calendar/libecal/e-cal-recur.c:4045
-msgid "5th"
-msgstr "5."
+#: ../addressbook/libedata-book/e-book-sqlite.c:7946
+msgid "Cannot sort by a field that is not a string type"
+msgstr ""
 
-#: ../calendar/libecal/e-cal-recur.c:4046
-msgid "6th"
-msgstr "6."
+#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../calendar/libedata-cal/e-data-cal.c:409
+msgid "Success"
+msgstr "Uspjeh"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
-msgid "7th"
-msgstr "7."
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libecal/e-cal.c:2304 ../calendar/libedata-cal/e-data-cal.c:410
+#: ../libedataserver/e-client.c:144
+msgid "Backend is busy"
+msgstr "Pozadinska aplikacija je zauzeta"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
-msgid "8th"
-msgstr "8."
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:154
+msgid "Repository offline"
+msgstr "Repozitorij odspojen"
+
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/libecal/e-cal.c:2318 ../calendar/libedata-cal/e-data-cal.c:412
+#: ../libedataserver/e-client.c:161
+msgid "Permission denied"
+msgstr "Pristup odbijen"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
-msgid "9th"
-msgstr "9."
+#: ../addressbook/libedata-book/e-data-book.c:386
+#: ../calendar/libedata-cal/e-data-cal.c:417
+msgid "Authentication Failed"
+msgstr "Provjera vjerodostojnosti neuspješna"
+
+#: ../addressbook/libedata-book/e-data-book.c:387
+#: ../calendar/libedata-cal/e-data-cal.c:418
+msgid "Authentication Required"
+msgstr "Potrebna je provjera vjerodostojnosti"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
-msgid "10th"
-msgstr "10."
+#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Unsupported field"
+msgstr "Nepodržano polje"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
-msgid "11th"
-msgstr "11."
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:169
+msgid "Unsupported authentication method"
+msgstr "Način provjere vjerodostojnosti nije podržan"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
-msgid "12th"
-msgstr "12."
+#: ../addressbook/libedata-book/e-data-book.c:390
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:171
+msgid "TLS not available"
+msgstr "TLS nedostupan"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
-msgid "13th"
-msgstr "13."
+#: ../addressbook/libedata-book/e-data-book.c:391
+msgid "Address book does not exist"
+msgstr "Adresar ne postoji"
+
+#: ../addressbook/libedata-book/e-data-book.c:392
+msgid "Book removed"
+msgstr "Knjiga uklonjena"
+
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../calendar/libedata-cal/e-data-cal.c:425
+msgid "Not available in offline mode"
+msgstr "Nije dostupno u radu bez mreže"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
-msgid "14th"
-msgstr "14og"
+#: ../addressbook/libedata-book/e-data-book.c:394
+#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:173
+msgid "Search size limit exceeded"
+msgstr "Prekoračeno dužinsko ograničenje pretrage"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
-msgid "15th"
-msgstr "15og"
+#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:175
+msgid "Search time limit exceeded"
+msgstr "Prekoračeno vremensko ograničenje pretrage"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
-msgid "16th"
-msgstr "16."
+#: ../addressbook/libedata-book/e-data-book.c:397
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:179
+msgid "Query refused"
+msgstr "Upit odbijen"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
-msgid "17th"
-msgstr "17."
+#: ../addressbook/libedata-book/e-data-book.c:398
+#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:165
+msgid "Could not cancel"
+msgstr "Nemoguće otkazati"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:400
+#: ../calendar/libedata-cal/e-data-cal.c:432
+msgid "Invalid server version"
+msgstr "Neispravna inačica poslužitelja"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
-msgid "18th"
-msgstr "18."
+#: ../addressbook/libedata-book/e-data-book.c:402
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:433
+#: ../libedataserver/e-client.c:142
+msgid "Invalid argument"
+msgstr "Nevaljali argument"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
-msgid "19th"
-msgstr "19."
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:404
+#: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
+#: ../calendar/libecal/e-cal.c:1909 ../calendar/libecal/e-cal.c:2341
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:167
+#, c-format
+msgid "Not supported"
+msgstr "Nije podržano"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
-msgid "20th"
-msgstr "20og"
+#: ../addressbook/libedata-book/e-data-book.c:405
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
+msgid "Backend is not opened yet"
+msgstr "Pozadinski servis još nije otvoren"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
-msgid "21st"
-msgstr "21og"
+#: ../addressbook/libedata-book/e-data-book.c:406
+#: ../libedataserver/e-client.c:187
+msgid "Object is out of sync"
+msgstr ""
 
-#: ../calendar/libecal/e-cal-recur.c:4062
-msgid "22nd"
-msgstr "22."
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:183
+msgid "Other error"
+msgstr "Druga greška"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
-msgid "23rd"
-msgstr "23."
+#: ../addressbook/libedata-book/e-data-book.c:1171
+#: ../calendar/libedata-cal/e-data-cal.c:1452
+msgid "Invalid query: "
+msgstr "Neispravan upit: "
 
-#: ../calendar/libecal/e-cal-recur.c:4064
-msgid "24th"
-msgstr "24."
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1420
+msgid "Cannot open book: "
+msgstr "Otvaranje knjige nije moguće: "
 
-#: ../calendar/libecal/e-cal-recur.c:4065
-msgid "25th"
-msgstr "25."
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1458
+msgid "Cannot refresh address book: "
+msgstr "Osvježavanje adrese knjige nije moguće: "
 
-#: ../calendar/libecal/e-cal-recur.c:4066
-msgid "26th"
-msgstr "26."
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1497
+msgid "Cannot get contact: "
+msgstr "Dobivanje kontakta nije moguće: "
 
-#: ../calendar/libecal/e-cal-recur.c:4067
-msgid "27th"
-msgstr "27."
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1546
+msgid "Cannot get contact list: "
+msgstr "Dobivanje popisa kontakata nije moguće: "
 
-#: ../calendar/libecal/e-cal-recur.c:4068
-msgid "28th"
-msgstr "28."
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1602
+msgid "Cannot get contact list uids: "
+msgstr "Dobivanje UID-a popisa kontakata nije moguće: "
 
-#: ../calendar/libecal/e-cal-recur.c:4069
-msgid "29th"
-msgstr "29."
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1653
+msgid "Cannot add contact: "
+msgstr "Dodavanje kontakta nije moguće: "
 
-#: ../calendar/libecal/e-cal-recur.c:4070
-msgid "30th"
-msgstr "30."
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1706
+msgid "Cannot modify contacts: "
+msgstr ""
 
-#: ../calendar/libecal/e-cal-recur.c:4071
-msgid "31st"
-msgstr "31."
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1759
+msgid "Cannot remove contacts: "
+msgstr "Uklanjanje kontakata nije moguće: "
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
-msgid "High"
-msgstr "Visok"
+#: ../addressbook/libedata-book/e-data-book-cursor.c:776
+msgid "Cursor does not support setting the search expression"
+msgstr ""
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
-msgid "Normal"
-msgstr "Obično"
+#: ../addressbook/libedata-book/e-data-book-cursor.c:859
+msgid "Cursor does not support step"
+msgstr ""
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
-msgid "Low"
-msgstr "Nisko"
+#: ../addressbook/libedata-book/e-data-book-cursor.c:942
+msgid "Cursor does not support alphabetic indexes"
+msgstr ""
 
-#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
-msgid "Undefined"
-msgstr "Neodređeno"
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+msgid "Unrecognized cursor origin"
+msgstr ""
 
-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:336
+msgid "Out of sync revision while moving cursor"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:430
+msgid "Alphabetic index was set for incorrect locale"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:583
 #, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Unesite lozinku za %s (korisnik %s)"
+msgid "Server is unreachable (%s)"
+msgstr "Poslužitelj je nedostupan (%s)"
 
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:1679
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "Unesite lozinku za %s kako bi omogućili zastupnika za korisnika %s"
+msgid "Failed to connect to a server using SSL: %s"
+msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5054
-msgid "Invalid argument"
-msgstr "Nedozvoljeni argument"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:630
+#, c-format
+msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
+msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5056
-msgid "Backend is busy"
-msgstr "Pozadinska aplikacija je zauzeta"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:651
+msgid "CalDAV backend is not loaded yet"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1100
+#: ../libedataserver/e-webdav-discover.c:146
+msgid "Invalid Redirect URL"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2955
+#, c-format
+msgid "Cannot create local cache folder '%s'"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3035
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"Poslužitelj je nedostupan, kalendar je otvoren samo za čitanje.\n"
+"Poruka greške: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4123
+msgid "CalDAV does not support bulk additions"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4226
+msgid "CalDAV does not support bulk modifications"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4507
+msgid "CalDAV does not support bulk removals"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5189
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Kalendar ne podržava Slobodno/Zauzeto"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5198
+msgid "Schedule outbox url not found"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5295
+msgid "Unexpected result in schedule-response"
+msgstr ""
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:950
+msgid "Birthday"
+msgstr "Rođendan"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:986
+#, c-format
+msgid "Birthday: %s"
+msgstr "Rođendan: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1017
+#, c-format
+msgid "Anniversary: %s"
+msgstr "Godišnjica: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:245
+msgid "Cannot save calendar data: Malformed URI."
+msgstr "Nemoguće spremiti kalendarske podatke: Krivo oblikovan URI."
+
+#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+msgid "Cannot save calendar data"
+msgstr "Nemoguće spremiti kalendarske podatke"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:581
+#, c-format
+msgid "Redirected to Invalid URI"
+msgstr "Preusmjereno na neispravni URI"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:640
+#, c-format
+msgid "Bad file format."
+msgstr "Neispravan oblik datoteke."
+
+#: ../calendar/backends/http/e-cal-backend-http.c:650
+#, c-format
+msgid "Not a calendar."
+msgstr "Nije kalendar."
+
+#: ../calendar/backends/http/e-cal-backend-http.c:954
+#: ../calendar/backends/weather/e-cal-backend-weather.c:709
+msgid "Could not create cache file"
+msgstr "Neuspjelo stvaranje datoteke privremene memorije"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:195
+msgid "Could not retrieve weather data"
+msgstr "Nemoguće dobiti podatke o vremenu"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:378
+msgid "Weather: Fog"
+msgstr "Vrijeme: magla"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:379
+msgid "Weather: Cloudy Night"
+msgstr "Vrijeme: oblačna noć"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:380
+msgid "Weather: Cloudy"
+msgstr "Vrijeme: oblačno"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:381
+msgid "Weather: Overcast"
+msgstr "Vrijeme: oblačno"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:382
+msgid "Weather: Showers"
+msgstr "Vrijeme: pljuskovi"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:383
+msgid "Weather: Snow"
+msgstr "Vrijeme: snijeg"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:384
+msgid "Weather: Clear Night"
+msgstr "Vrijeme: vedra noć"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:385
+msgid "Weather: Sunny"
+msgstr "Vrijeme: sunčano"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:386
+msgid "Weather: Thunderstorms"
+msgstr "Vrijeme: grmljavina"
+
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:412
+#, c-format
+msgid "%.1f °F"
+msgstr ""
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:415
+#, c-format
+msgid "%.1f °C"
+msgstr ""
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../calendar/backends/weather/e-cal-backend-weather.c:418
+#, c-format
+msgid "%.1f K"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:424
+#, c-format
+msgid "%.1f"
+msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5058
-#: ../calendar/libedata-cal/e-cal-backend-util.c:97
+#: ../calendar/backends/weather/e-cal-backend-weather.c:589
+#: ../calendar/backends/weather/e-cal-backend-weather.c:617
+msgid "Forecast"
+msgstr "Prognoza"
+
+#: ../calendar/libecal/e-cal.c:2306
 msgid "Repository is offline"
 msgstr "Repozitorij nije priključen na mrežu"
 
-#: ../calendar/libecal/e-cal.c:5060
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:266
 msgid "No such calendar"
 msgstr "Ne postoji takav kalendar"
 
-#: ../calendar/libecal/e-cal.c:5062
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Object not found"
 msgstr "Objekt nije nađen"
 
-#: ../calendar/libecal/e-cal.c:5064
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Invalid object"
 msgstr "Neispravni objekt"
 
-#: ../calendar/libecal/e-cal.c:5066
+#: ../calendar/libecal/e-cal.c:2314
 msgid "URI not loaded"
 msgstr "URI nije učitan"
 
-#: ../calendar/libecal/e-cal.c:5068
+#: ../calendar/libecal/e-cal.c:2316
 msgid "URI already loaded"
 msgstr "URI je već učitan"
 
-#: ../calendar/libecal/e-cal.c:5070
-#: ../calendar/libedata-cal/e-cal-backend-util.c:99
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "Pristup odbijen"
-
-#: ../calendar/libecal/e-cal.c:5072
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:2320
 msgid "Unknown User"
 msgstr "Nepoznat korisnik"
 
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:274
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Object ID already exists"
 msgstr "ID objekta već postoji"
 
-#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libecal/e-cal.c:2324
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
-#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libecal/e-cal.c:2326
 msgid "Operation has been canceled"
-msgstr ""
+msgstr "Radnja je otkazana"
 
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:136
+#: ../calendar/libecal/e-cal.c:2328
 msgid "Could not cancel operation"
-msgstr "Ne mogu otkazati operaciju"
+msgstr "Nemoguće otkazati operaciju"
+
+#: ../calendar/libecal/e-cal.c:2330 ../libedataserver/e-client.c:150
+msgid "Authentication failed"
+msgstr "Ovjera nije uspjela"
 
-#: ../calendar/libecal/e-cal.c:5084
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../calendar/libecal/e-cal.c:2332
+#: ../camel/providers/smtp/camel-smtp-transport.c:1119
+#: ../libedataserver/e-client.c:152
 msgid "Authentication required"
-msgstr "Zahtijev za autentifikaciju obavezan"
+msgstr "Potrebna ovjera"
 
-#: ../calendar/libecal/e-cal.c:5086
-msgid "A CORBA exception has occurred"
-msgstr "Dogodila se iznimka za CORBA-a"
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:553
-#: ../camel/providers/pop3/camel-pop3-store.c:560
-#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "Nepoznata greška"
+#: ../calendar/libecal/e-cal.c:2334
+msgid "A D-Bus exception has occurred"
+msgstr "Dogodila se D-Bus iznimka"
 
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:95
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../calendar/libecal/e-cal.c:2338
 msgid "No error"
 msgstr "Nema greške"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libecal/e-cal-client.c:272
+#: ../calendar/libedata-cal/e-data-cal.c:424
+msgid "Unknown user"
+msgstr "Nepoznati korisnik"
+
+#: ../calendar/libecal/e-cal-client.c:276
+#: ../calendar/libedata-cal/e-data-cal.c:413
+msgid "Invalid range"
+msgstr "Nepodržan raspon"
+
+#: ../calendar/libecal/e-cal-client.c:1065
 #, c-format
-msgid "\"%s\" expects no arguments"
-msgstr "\"%s\" ne očekuje argumente"
+msgid "Unknown calendar property '%s'"
+msgstr "Nepoznato svojstvo kalendara '%s'"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libecal/e-cal-client.c:1080
+#, c-format
+msgid "Cannot change value of calendar property '%s'"
+msgstr "Promjena vrijednosti svojstva kalendara '%s' nije moguća"
+
+#: ../calendar/libecal/e-cal-component.c:1349
+msgid "Untitled appointment"
+msgstr "Neimenovani zakazani sastanak"
+
+#: ../calendar/libecal/e-cal-recur.c:4046
+msgid "1st"
+msgstr "1."
+
+#: ../calendar/libecal/e-cal-recur.c:4047
+msgid "2nd"
+msgstr "2."
+
+#: ../calendar/libecal/e-cal-recur.c:4048
+msgid "3rd"
+msgstr "3."
+
+#: ../calendar/libecal/e-cal-recur.c:4049
+msgid "4th"
+msgstr "4."
+
+#: ../calendar/libecal/e-cal-recur.c:4050
+msgid "5th"
+msgstr "5."
+
+#: ../calendar/libecal/e-cal-recur.c:4051
+msgid "6th"
+msgstr "6."
+
+#: ../calendar/libecal/e-cal-recur.c:4052
+msgid "7th"
+msgstr "7."
+
+#: ../calendar/libecal/e-cal-recur.c:4053
+msgid "8th"
+msgstr "8."
+
+#: ../calendar/libecal/e-cal-recur.c:4054
+msgid "9th"
+msgstr "9."
+
+#: ../calendar/libecal/e-cal-recur.c:4055
+msgid "10th"
+msgstr "10."
+
+#: ../calendar/libecal/e-cal-recur.c:4056
+msgid "11th"
+msgstr "11."
+
+#: ../calendar/libecal/e-cal-recur.c:4057
+msgid "12th"
+msgstr "12."
+
+#: ../calendar/libecal/e-cal-recur.c:4058
+msgid "13th"
+msgstr "13."
+
+#: ../calendar/libecal/e-cal-recur.c:4059
+msgid "14th"
+msgstr "14."
+
+#: ../calendar/libecal/e-cal-recur.c:4060
+msgid "15th"
+msgstr "15."
+
+#: ../calendar/libecal/e-cal-recur.c:4061
+msgid "16th"
+msgstr "16."
+
+#: ../calendar/libecal/e-cal-recur.c:4062
+msgid "17th"
+msgstr "17."
+
+#: ../calendar/libecal/e-cal-recur.c:4063
+msgid "18th"
+msgstr "18."
+
+#: ../calendar/libecal/e-cal-recur.c:4064
+msgid "19th"
+msgstr "19."
+
+#: ../calendar/libecal/e-cal-recur.c:4065
+msgid "20th"
+msgstr "20."
+
+#: ../calendar/libecal/e-cal-recur.c:4066
+msgid "21st"
+msgstr "21."
+
+#: ../calendar/libecal/e-cal-recur.c:4067
+msgid "22nd"
+msgstr "22."
+
+#: ../calendar/libecal/e-cal-recur.c:4068
+msgid "23rd"
+msgstr "23."
+
+#: ../calendar/libecal/e-cal-recur.c:4069
+msgid "24th"
+msgstr "24."
+
+#: ../calendar/libecal/e-cal-recur.c:4070
+msgid "25th"
+msgstr "25."
+
+#: ../calendar/libecal/e-cal-recur.c:4071
+msgid "26th"
+msgstr "26."
+
+#: ../calendar/libecal/e-cal-recur.c:4072
+msgid "27th"
+msgstr "27."
+
+#: ../calendar/libecal/e-cal-recur.c:4073
+msgid "28th"
+msgstr "28."
+
+#: ../calendar/libecal/e-cal-recur.c:4074
+msgid "29th"
+msgstr "29."
+
+#: ../calendar/libecal/e-cal-recur.c:4075
+msgid "30th"
+msgstr "30."
+
+#: ../calendar/libecal/e-cal-recur.c:4076
+msgid "31st"
+msgstr "31."
+
+#: ../calendar/libecal/e-cal-util.c:706 ../calendar/libecal/e-cal-util.c:733
+msgctxt "Priority"
+msgid "High"
+msgstr "Najviši"
+
+#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
+msgctxt "Priority"
+msgid "Normal"
+msgstr "Normalan"
+
+#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
+msgctxt "Priority"
+msgid "Low"
+msgstr "Nizak"
+
+#. An empty string is the same as 'None'.
+#: ../calendar/libecal/e-cal-util.c:731
+msgctxt "Priority"
+msgid "Undefined"
+msgstr "Neodređen"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1379
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1506
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1555
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" očekuje jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" očekuje da prvi argument bude znakovni niz"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
 #, c-format
-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "\"%s\" očekuje da prvi argument bude ISO 8601 vrijeme/datum niz"
+msgid "\"%s\" expects two or three arguments"
+msgstr "\"%s\" očekuje dva ili tri argumenta"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
-#, c-format
-msgid "\"%s\" expects two arguments"
-msgstr "\"%s\" očekuje dva argumenta"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:263
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:824
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
 #, 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:174
-#, c-format
-msgid "\"%s\" expects the second argument to be an integer"
-msgstr "\"%s\" očekuje da drugi argument bude cijeli broj"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:335
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
 #, 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:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
+#, c-format
+msgid "\"%s\" expects the third argument to be a string"
+msgstr "\"%s\" očekuje da treći argument bude znakovni niz"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:255
+#, c-format
+msgid "\"%s\" expects none or two arguments"
+msgstr ""
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
+#, c-format
+msgid "\"%s\" expects two arguments"
+msgstr "\"%s\" očekuje dva argumenta"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:603
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:626
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:749
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:988
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1340
+#, c-format
+msgid "\"%s\" expects no arguments"
+msgstr "\"%s\" ne očekuje argumente"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:683
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" očekuje da drugi argument bude znakovni niz"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 msgstr ""
+"\"%s\" očekuje da prvi argument bude \"išta\", \"sažetak\", \"opis\", "
+"\"lokacija\", \"sudionik\", \"organizator\" ili \"klasifikacija\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" očekuje barem jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:900
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1317,653 +1807,698 @@
 "\"%s\" očekuje da svi argumenti budu znakovni nizovi, a da samo jedan "
 "argument  bude booleovo netočno (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:101
-#, fuzzy
-msgid "Invalid range"
-msgstr "Nedozvoljeni argument"
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1403
+#, c-format
+msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
+msgstr "\"%s\" očekuje da prvi argument bude ISO 8601 vrijeme/datum niz"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#, fuzzy
-msgid "Unsupported field"
-msgstr "Nepodržan sigurnosni sloj."
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1464
+#, c-format
+msgid "\"%s\" expects the second argument to be an integer"
+msgstr "\"%s\" očekuje da drugi argument bude cijeli broj"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
-#, fuzzy
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Unsupported method"
-msgstr "Nepodržan sigurnosni sloj."
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#, fuzzy
-msgid "Unsupported authentication method"
-msgstr "Nema podrške za tip autentifikacije  %s"
+msgstr "Nepodržana metoda"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#, fuzzy
-msgid "TLS not available"
-msgstr "SSL nedostupan"
-
-#. Translators: This means "Offline mode unavailable"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:126
-#, fuzzy
-msgid "Offline unavailable"
-msgstr "SSL nedostupan"
+#: ../calendar/libedata-cal/e-data-cal.c:423
+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:1645
+msgid "Cannot open calendar: "
+msgstr "Otvaranje kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1682
+msgid "Cannot refresh calendar: "
+msgstr "Osvježavanje kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1723
+msgid "Cannot retrieve calendar object path: "
+msgstr "Učitavanje putanje objekta kalendara nije moguće: : "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1775
+msgid "Cannot retrieve calendar object list: "
+msgstr "Učitavanje popisa objekata kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1832
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "Učitavanje slobodan/zauzet popisa kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1882
+msgid "Cannot create calendar object: "
+msgstr "Stvaranje objekta kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1950
+msgid "Cannot modify calendar object: "
+msgstr "Uređivanje objekta kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:2028
+msgid "Cannot remove calendar object: "
+msgstr "Uklanjanje objekta kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:2114
+msgid "Cannot receive calendar objects: "
+msgstr "Primanje objekata kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:2157
+msgid "Cannot send calendar objects: "
+msgstr "Slanje objekata kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:2209
+msgid "Could not retrieve attachment uris: "
+msgstr "Učitavanje URI-ja privitaka nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:2254
+msgid "Could not discard reminder: "
+msgstr "Poništavanje podsjetnika nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:2295
+msgid "Could not retrieve calendar time zone: "
+msgstr "Dobivanje vremenske zone kalendara nije moguće: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:2335
+msgid "Could not add calendar time zone: "
+msgstr "Dodavanje vremenske zone kalendara nije moguće: "
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:128
-#, fuzzy
-msgid "Search size limit exceeded"
-msgstr "Premašena dužina putanje"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:130
-#, fuzzy
-msgid "Search time limit exceeded"
-msgstr "Premašena dužina putanje"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:132
-#, fuzzy
-msgid "Invalid query"
-msgstr "Neispravna svrha"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:134
-msgid "Query refused"
-msgstr ""
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-#, fuzzy
-msgid "Invalid server version"
-msgstr "Neispravni URI poslužitelja"
-
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:199
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Ovaj logaritam ne podržava potpisivanje"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "Potpisivanje poruke"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:212
+#, c-format
 msgid "Verifying is not supported by this cipher"
-msgstr "Provjeru ovaj logaritam ne podržava"
-
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "Provjeravanje poruke"
+msgstr "Ovaj logaritam ne podržava potvrđivanje"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:228
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Ovaj algoritam ne podržava šifriranje"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "Kodiranje poruke"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:242
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Ovaj logaritam ne podržava dešifriranje"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "Dekodiranje poruke"
-
-#: ../camel/camel-cipher-context.c:271
-msgid "You may not import keys with this cipher"
-msgstr "Možda nećete moći uvesti ključeve sa ovim algoritnom"
+#: ../camel/camel-cipher-context.c:358
+msgid "Signing message"
+msgstr "Potpisivanje poruke"
 
-#: ../camel/camel-cipher-context.c:301
-msgid "You may not export keys with this cipher"
-msgstr "Možda nećete moći izvezesti ključeve sa ovim algoritmom"
+#: ../camel/camel-cipher-context.c:648
+msgid "Encrypting message"
+msgstr "Šifriranje poruke"
 
-#: ../camel/camel-data-cache.c:136
-msgid "Unable to create cache path"
-msgstr "Nisam mogao napraviti putanju za skrivenu memoriju"
+#: ../camel/camel-cipher-context.c:820
+msgid "Decrypting message"
+msgstr "Dešifriranje poruke"
 
-#: ../camel/camel-data-cache.c:381
+#: ../camel/camel-data-cache.c:179
 #, c-format
-msgid "Could not remove cache entry: %s: %s"
-msgstr "Nisam mogao ukloniti cache unos: %s: %s"
+msgid "Unable to create cache path"
+msgstr "Neuspjelo stvaranje putanje privremene memorije"
 
-#: ../camel/camel-db.c:104
-msgid "Insufficient memory"
+#: ../camel/camel-data-cache.c:449
+msgid "Empty cache file"
 msgstr ""
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-data-cache.c:522
 #, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"Nisam mogao da upišem unos u zapisnik: %s\n"
-"Daljnjee operacije na ovom serveru neće biti izvršene kada\n"
-"se budete ponovo povezali na mrežu."
-
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:299
-#, fuzzy, c-format
-msgid ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"Ne mogu otvoriti `%s':\n"
-"%s\n"
-"Promjene na ovom direktoriju neće biti sinhronizirane."
-
-#: ../camel/camel-disco-diary.c:297
-msgid "Resynchronizing with server"
-msgstr "Sinkronizovanje sa poslužiteljem"
-
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "Kopiraj sadržaj mape lokalno za neumreženi rad"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
-msgid "Downloading new messages for offline mode"
-msgstr "Skidanje novih poruka za neumreženi način rada"
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Nemoguće ukloniti unos privremene memorije: %s: %s"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
 #, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr "Pripremam mapu '%s' za neumreženi rad"
-
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/imap/camel-imap-store.c:1002
-#: ../camel/providers/imap/camel-imap-store.c:1810
-#: ../camel/providers/imap/camel-imap-store.c:2226
-#: ../camel/providers/imap/camel-imap-store.c:2994
-msgid "You must be working online to complete this operation"
-msgstr "Morate biti na mreži da biste završili ovu operaciju"
-
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "Opis nije dostupan"
+msgid "Could not rename '%s' to %s: %s"
+msgstr "Nemoguće preimenovati  '%s' u %s: %s"
 
-#: ../camel/camel-filter-driver.c:785
+#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:798
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "Nije uspjelo stvaranje nasljednog procesa \"%s\": %s"
+msgstr "Neuspjelo stvaranje nasljednog procesa \"%s\": %s"
 
-#: ../camel/camel-filter-driver.c:827
+#: ../camel/camel-filter-driver.c:962
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od %s: %s"
 
-#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
-msgstr "Sinkroniziram mape"
+msgstr "Usklađivanje mapa"
 
-#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1520
+#: ../camel/camel-filter-driver.c:1276
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Greška kod čitanja filtera: %s: %s"
+msgstr "Greška kod obrađivanja filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1529
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "Greška kod primjene filtera: %s: %s"
+msgstr "Greška kod izvršavanja filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1211
+#: ../camel/camel-filter-driver.c:1383
+#, c-format
 msgid "Unable to open spool folder"
-msgstr "Nisam mogao otvoriti mapu za smještanje reda ( spool )"
+msgstr "Neuspjelo otvoranje mape za smještanje reda ( spool )"
 
-#: ../camel/camel-filter-driver.c:1220
+#: ../camel/camel-filter-driver.c:1395
+#, c-format
 msgid "Unable to process spool folder"
-msgstr "Nisam mogao da prođem kroz mapu sa redom"
+msgstr "Neuspjelo obrađivanje mape s redom"
 
-#: ../camel/camel-filter-driver.c:1236
+#: ../camel/camel-filter-driver.c:1418
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Primam poruku %d (%d%%)"
+msgstr "Primanje poruke %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1240
-msgid "Cannot open message"
-msgstr "Ne mogu otvoriti poruku"
-
-#: ../camel/camel-filter-driver.c:1241 ../camel/camel-filter-driver.c:1259
+#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
 #, c-format
 msgid "Failed on message %d"
 msgstr "Greška kod poruke %d"
 
-#: ../camel/camel-filter-driver.c:1273 ../camel/camel-filter-driver.c:1364
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
 msgid "Syncing folder"
-msgstr "Sinkroniziram mapu"
+msgstr "Usklađivanje mape"
 
-#: ../camel/camel-filter-driver.c:1277 ../camel/camel-filter-driver.c:1369
+#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
 msgid "Complete"
-msgstr "Završi"
+msgstr "Završeno"
 
-#: ../camel/camel-filter-driver.c:1334
+#: ../camel/camel-filter-driver.c:1536
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Primam poruku %d od %d"
+msgstr "Primanje poruke %d od %d"
 
-#: ../camel/camel-filter-driver.c:1349
+#: ../camel/camel-filter-driver.c:1554
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Greška kod poruke %d od %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-driver.c:1749 ../camel/camel-filter-driver.c:1776
+#, c-format
+msgid "Execution of filter '%s' failed: "
+msgstr ""
+
+#: ../camel/camel-filter-driver.c:1766
+#, c-format
+msgid "Error parsing filter '%s': %s: %s"
+msgstr ""
+
+#: ../camel/camel-filter-driver.c:1785
+#, c-format
+msgid "Error executing filter '%s': %s: %s"
+msgstr ""
+
+#: ../camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
-msgstr "Nisam mogao primiti poruku"
+msgstr "Neuspjelo primanje poruke"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:538
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neispravni argumenti za (sustavska zastavica)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:556
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 
-#: ../camel/camel-filter-search.c:581
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Neuspjelo stvaranje sadržanog procesa '%s': %s"
+#: ../camel/camel-filter-search.c:1068
+msgid "Invalid arguments to (message-location)"
+msgstr ""
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:1149 ../camel/camel-filter-search.c:1160
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr "Greška kod primjene filtera pretrage: %s: %s"
+msgstr "Greška pri izvršavanju filtrirane pretrage: %s: %s"
 
-#: ../camel/camel-folder-search.c:333 ../camel/camel-folder-search.c:445
+#: ../camel/camel-folder.c:321
 #, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Učenje o novoj neželjenoj poruci u '%s'"
+msgstr[1] "Učenje o novim neželjenim porukama u '%s'"
+msgstr[2] "Učenje o novim neželjenim porukama u '%s'"
+
+#: ../camel/camel-folder.c:361
+#, c-format
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Učenje nove ham poruke u '%s'"
+msgstr[1] "Učenje novih ham poruka u '%s'"
+msgstr[2] "Učenje novih ham poruka u '%s'"
+
+#: ../camel/camel-folder.c:409
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Filtriranje nove poruke u '%s'"
+msgstr[1] "Filtriranje nove poruke u '%s'"
+msgstr[2] "Filtriranje novih poruka u '%s'"
+
+#: ../camel/camel-folder.c:1015
+#: ../camel/providers/local/camel-maildir-folder.c:330
+msgid "Moving messages"
+msgstr "Premještanje poruka"
+
+#: ../camel/camel-folder.c:1018
+msgid "Copying messages"
+msgstr "Kopiranje poruka"
+
+#: ../camel/camel-folder.c:1060
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "Informacije o kvoti nisu podržane za direktorij '%s'"
+
+#: ../camel/camel-folder.c:1152
+#, c-format
+msgid "Filtering folder '%s'"
 msgstr ""
-"Ne mogu parsirati trženi izraz: %s:\n"
-"%s"
 
-#: ../camel/camel-folder-search.c:343 ../camel/camel-folder-search.c:455
+#: ../camel/camel-folder.c:2878
 #, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
+msgid "Expunging folder '%s'"
 msgstr ""
-"Greška kod izvršavanja izraza za pretragu: %s:\n"
-"%s"
 
-#: ../camel/camel-folder-search.c:647 ../camel/camel-folder-search.c:691
+#: ../camel/camel-folder.c:3009
 #, c-format
-msgid "(%s) requires a single bool result"
+msgid "Retrieving message '%s' in %s"
+msgstr "Preuzimanje poruke '%s' u %s"
+
+#: ../camel/camel-folder.c:3200
+#, c-format
+msgid "Retrieving quota information for '%s'"
+msgstr "Preuzimanje informacije o kvoti za '%s'"
+
+#: ../camel/camel-folder.c:3497
+#, c-format
+msgid "Refreshing folder '%s'"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:744
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:915 ../camel/camel-folder-search.c:957
+#, c-format
+msgid "(%s) requires a single bool result"
+msgstr "(%s) zahtijeva jedan Boolov rezultat"
+
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:992
 #, c-format
 msgid "(%s) not allowed inside %s"
-msgstr ""
+msgstr "(%s) nije dozvoljen unutar %s"
 
-#: ../camel/camel-folder-search.c:750 ../camel/camel-folder-search.c:757
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:999 ../camel/camel-folder-search.c:1007
 #, c-format
 msgid "(%s) requires a match type string"
-msgstr ""
+msgstr "(%s) zahtijeva podudaranje vrste niza podataka"
 
-#: ../camel/camel-folder-search.c:784
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1035
 #, c-format
 msgid "(%s) expects an array result"
-msgstr ""
+msgstr "(%s) očekuje tablični rezultat"
 
-#: ../camel/camel-folder-search.c:793
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1045
 #, c-format
 msgid "(%s) requires the folder set"
-msgstr ""
+msgstr "(%s) zahtijeva postavljen direktorij"
 
-#: ../camel/camel-folder-search.c:888
+#: ../camel/camel-folder-search.c:1962 ../camel/camel-folder-search.c:2131
 #, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Izvršavam pretragu na nepoznatom zaglavlju: %s"
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Nemoguće obraditi traženi izraz: %s:\n"
+"%s"
 
-#: ../camel/camel-folder.c:693
+#: ../camel/camel-folder-search.c:1974 ../camel/camel-folder-search.c:2143
 #, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodržana operacija: priključena poruka: za %s"
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Greška kod izvršavanja traženog izraza: %s:\n"
+"%s"
 
-#: ../camel/camel-folder.c:1349
+#: ../camel/camel-folder-summary.c:2139
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
+msgid "Release unused memory for folder '%s'"
+msgstr ""
 
-#: ../camel/camel-folder.c:1390
+#: ../camel/camel-folder-summary.c:2351
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
+msgid "Update preview data for folder '%s'"
 msgstr ""
 
-#: ../camel/camel-folder.c:1506
-msgid "Moving messages"
-msgstr "Premještam poruke"
-
-#: ../camel/camel-folder.c:1506
-msgid "Copying messages"
-msgstr "Kopiram poruke"
-
-#: ../camel/camel-folder.c:1852
-msgid "Learning junk"
-msgstr "Poduči da je ovo smeće"
-
-#: ../camel/camel-folder.c:1869
-msgid "Learning non-junk"
-msgstr "Poduči da ovo nije smeće"
+#: ../camel/camel-gpg-context.c:728 ../camel/camel-gpg-context.c:733
+#: ../camel/camel-gpg-context.c:1400
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Neuspjelo izvršavanje gpg-a: %s"
 
-#: ../camel/camel-folder.c:1888
-msgid "Filtering new message(s)"
-msgstr "Filtriranje novih poruka"
+#: ../camel/camel-gpg-context.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+msgid "Unknown"
+msgstr "Nepoznato"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:798
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"Susreo sam neočekivan GnuPG status poruke:\n"
+"Dobijen neočekivan GnuPG status poruke:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:834
+#, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "Nisam mogao pročitati gpg userid podsetnik."
+msgstr "Neuspjela obrada gpg userid podsjetnika."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:874
+#, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "Nisam mogao pročitati zahtjev za gpg lozinkom"
+msgstr "Neuspjela obrada zahtjeva za gpg lozinkom."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:895
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
+"Za otključavanje ključa potreban vam je PIN\n"
+"SmartCard: \"%s\""
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:899
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 "Potrebna vam je lozinka za otključavanje ključa\n"
-"korisnika: \"%s\"3+"
+"korisnika: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
-#, fuzzy, c-format
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "Neočekivan odgovor od GnuPG: %s"
+msgstr "Neočekivani zahtjev od GnuPG-a za '%s'"
 
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068
-#: ../camel/providers/nntp/camel-nntp-store.c:1281
-msgid "Canceled."
+#: ../camel/camel-gpg-context.c:917
+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."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:948 ../camel/camel-net-utils.c:524
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../libedataserver/e-client.c:163
+#, c-format
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#: ../camel/camel-gpg-context.c:969
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Nisam mogao otključati tajni ključ: date su 3 pogrešne lozinke."
+msgstr "Neuspjelo otključavanje tajnog ključa: date su 3 pogrešne lozinke."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:982
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:937
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Nisam mogao dekriptirati: nisu označeni ispravni primatelji."
-
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1334
-#: ../camel/camel-gpg-context.c:1829 ../camel/camel-gpg-context.c:1874
+#: ../camel/camel-gpg-context.c:1120
 #, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Nisam mogao izvršiti gpg: %s"
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Neuspjelo šifriranje: nisu označeni ispravni primatelji."
 
-#: ../camel/camel-gpg-context.c:1302 ../camel/camel-smime-context.c:392
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Ne mogu stvoriti podatke za potpis: %s"
+#: ../camel/camel-gpg-context.c:1675 ../camel/camel-smime-context.c:843
+msgid "Could not generate signing data: "
+msgstr "Neuspjelo stvaranje podataka potpisivanja: "
 
-#: ../camel/camel-gpg-context.c:1349 ../camel/camel-gpg-context.c:1534
-#: ../camel/camel-gpg-context.c:1619 ../camel/camel-gpg-context.c:1634
-#: ../camel/camel-gpg-context.c:1750 ../camel/camel-gpg-context.c:1765
-#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:1725 ../camel/camel-gpg-context.c:1937
+#: ../camel/camel-gpg-context.c:2047 ../camel/camel-gpg-context.c:2198
 msgid "Failed to execute gpg."
-msgstr "Nisam mogao izvršiti gpg."
+msgstr "Neuspjelo izvršavanje gpg-a."
 
-#: ../camel/camel-gpg-context.c:1368
-msgid "This is a digitally signed message part"
-msgstr "Dio poruke sa digitalnim potpisom"
-
-#: ../camel/camel-gpg-context.c:1453 ../camel/camel-gpg-context.c:1459
-#: ../camel/camel-gpg-context.c:1465 ../camel/camel-gpg-context.c:1480
-#: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-gpg-context.c:1808 ../camel/camel-gpg-context.c:1816
+#: ../camel/camel-gpg-context.c:1824 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
+#: ../camel/camel-smime-context.c:995
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Ne mogu provjeriti potpis poruke: Neispravan format poruke"
+msgstr "Nemoguće provjeriti potpis poruke: Neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1519
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"Ne mogu provjeriti potpis poruke: nisam mogao napraviti temp datoteku: %s"
+#: ../camel/camel-gpg-context.c:1890
+msgid "Cannot verify message signature: "
+msgstr "Nemoguće potvrditi potpis poruke: "
 
-#: ../camel/camel-gpg-context.c:1602
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Ne mogu stvoriti podatke za kriptiranje: %s"
+#: ../camel/camel-gpg-context.c:2013
+msgid "Could not generate encrypting data: "
+msgstr "Neuspjelo stvaranje podataka šifriranja: "
 
-#: ../camel/camel-gpg-context.c:1652
+#: ../camel/camel-gpg-context.c:2066
 msgid "This is a digitally encrypted message part"
-msgstr "Ovo je digitalno kriptirani dio poruke"
+msgstr "Ovo je digitalno šifrirani dio poruke"
 
-#: ../camel/camel-gpg-context.c:1705 ../camel/camel-gpg-context.c:1713
-#: ../camel/camel-gpg-context.c:1732
+#: ../camel/camel-gpg-context.c:2122 ../camel/camel-gpg-context.c:2131
+#: ../camel/camel-gpg-context.c:2154
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "Ne moguće dešifrirati poruku: neispravan oblik poruke"
+msgstr "Nemoguće dešifrirati poruku: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1722
+#: ../camel/camel-gpg-context.c:2142
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Nisam mogao dekriptirati MIME deo: greška u protokolu"
+msgstr "Neuspjelo dešifriranje MIME dijela: greška u protokolu"
 
-#: ../camel/camel-gpg-context.c:1787 ../camel/camel-smime-context.c:969
-msgid "Encrypted content"
-msgstr "Kriptirani sadržaj"
+#: ../camel/camel-gpg-context.c:2208
+#, c-format
+msgid "Failed to decrypt MIME part: Secret key not found"
+msgstr ""
 
-#: ../camel/camel-gpg-context.c:1806
-msgid "Unable to parse message content"
-msgstr "Nije moguća analiza sadržaja poruke"
-
-#: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "Nepoznato"
+#: ../camel/camel-gpg-context.c:2244 ../camel/camel-smime-context.c:1288
+msgid "Encrypted content"
+msgstr "Šifrirani sadržaj"
 
-#: ../camel/camel-lock-client.c:104
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ne mogu kreirati pomoćni cjevovod za zaključavanje (baze podataka): %s"
+#: ../camel/camel-junk-filter.c:167
+msgid "Synchronizing junk database"
+msgstr ""
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock.c:110
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne mogu podijeliti pomoćnika zaključavanja: %s"
+msgid "Could not create lock file for %s: %s"
+msgstr "Nemoguće zaključati datoteku za %s: %s"
 
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock.c:153
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Ne mogu zaključati '%s': greška u protokolu s pomoćnikom zaključavanja"
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"Isteklo je vrijeme za zaključavanje datoteke %s. Pokušajte ponovno kasnije."
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock.c:215
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "Ne mogu zaključati '%s"
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Neuspjelo zaključavanje koristeći fcntl(2): %s"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:282
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Nisam mogao zaključati datoteku za %s: %s"
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Neuspjelo zaključavanje koristeći flock(2): %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock-client.c:107
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
-"Isteklo je vrijeme kod pokušaja pribavljanja zaključane datoteke na %s. "
-"Pokušajte kasnije."
+"Nemoguće stvoriti pomoćni cjevovod za zaključavanje (baze podataka): %s"
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock-client.c:131
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Nisam mogao zaključiti koristeći fcntl(2): %s"
+msgid "Cannot fork locking helper: %s"
+msgstr "Nemoguće račvati pomoćnika zaključavanja: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Nisam mogao zaključiti koristeći flock(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+"Nemoguće zaključati '%s': greška u protokolu s pomoćnikom zaključavanja"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-lock-client.c:234
 #, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Nisam mogao provjeriti datoteku pošte %s: %s"
+msgid "Could not lock '%s'"
+msgstr "Nemoguće zaključati '%s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:101
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Nisam mogao otvoriti datoteku pošte  %s: %s"
+msgstr "Nemoguće otvoriti datoteku pošte  %s: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:121
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Nemoguće provjeriti datoteku pošte %s: %s"
+
+#: ../camel/camel-movemail.c:136
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "Nisam mogao otvoriti privremenu datoteku pošte %s: %s"
+msgstr "Nemoguće otvoriti privremenu datoteku pošte %s: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:166
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Nisam mogao smijestiti poštu u temp datoteku %s: %s"
+msgstr "Neuspjelo smještanje pošte u temp datoteku %s: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:200
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "Nisam mogao napraviti cjevovod: %s"
+msgstr "Nemoguće stvaranje cjevovoda: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:214
 #, c-format
 msgid "Could not fork: %s"
-msgstr "Ne mogu forkati: %s"
+msgstr "Nemoguće račvanje: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:252
 #, c-format
 msgid "Movemail program failed: %s"
-msgstr "Program za premeštanje pošte nije uspio: %s"
+msgstr "Program za premještanje pošte nije uspio: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:253
 msgid "(Unknown error)"
 msgstr "(Nepoznata greška)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:280
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Greška kod čitanja datoteke pošte: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:293
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Greška kod pisanja privremene datoteke: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:500 ../camel/camel-movemail.c:569
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr "Greška kod kopiranja privremene datoteke: %s"
+msgstr "Greška kod kopiranja privremene datoteke pošte: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "greška pri parsiranju"
+#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432
+#, c-format
+msgid "No content available"
+msgstr "Nema dostupnog sadržaja"
 
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:447
-#: ../camel/providers/pop3/camel-pop3-store.c:547
-msgid "Canceled"
-msgstr ""
+#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440
+#, c-format
+msgid "No signature available"
+msgstr "Potpis nije dostupan"
 
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "nemoguće kreiranje niti"
+#: ../camel/camel-multipart-signed.c:806
+#, c-format
+msgid "parse error"
+msgstr "greška pri obradi"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:706
 #, c-format
 msgid "Resolving: %s"
-msgstr "Razlučujem: %s"
+msgstr "Razlučivanje: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:731
 msgid "Host lookup failed"
 msgstr "Računalo nije pronađeno"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:737
+#, c-format
+msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgstr ""
+
+#: ../camel/camel-net-utils.c:741
 #, c-format
-msgid "Host lookup failed: %s: %s"
-msgstr "Računalo nije nađeno: %s: %s"
+msgid "Host lookup '%s' failed: %s"
+msgstr ""
 
-#: ../camel/camel-net-utils.c:803
-msgid "Resolving address"
-msgstr "Razlučujem adresu"
+#: ../camel/camel-offline-folder.c:93
+#, c-format
+msgid "Downloading new messages for offline mode in '%s'"
+msgstr ""
 
-#: ../camel/camel-net-utils.c:823
-msgid "Name lookup failed"
-msgstr "Ime nije nađeno"
+#: ../camel/camel-offline-folder.c:160
+#, c-format
+msgid "Storing changes in folder '%s'"
+msgstr ""
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-offline-folder.c:259
 #, c-format
-msgid "Name lookup failed: %s"
-msgstr "Traženje imena neuspešno: %s"
+msgid "Checking download of new messages for offline in '%s'"
+msgstr ""
 
-#: ../camel/camel-offline-folder.c:254
+#: ../camel/camel-offline-folder.c:372
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Usklađivanje poruka u mapi ’%s‘ sa diskom"
 
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
-#, fuzzy, c-format
-msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "Nemoguć upis u dnevnik za mapu `%s': %s"
+#: ../camel/camel-offline-folder.c:435
+msgid "Copy folder content locally for _offline operation"
+msgstr ""
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:55
 msgid "Virtual folder email provider"
-msgstr "Ponuđač elktronske pošte sa virtualnim direktorijom"
+msgstr "Ponuđač e-pošte s virtualnim direktorijom"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:57
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za čitanje pošte kao upita drugog niza mapa"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:260
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Ne mogu učitati %s: ovaj sustav ne podržava učitavanje modula."
+msgstr "Nemoguće učitati %s: ovaj sustav ne podržava učitavanje modula."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:269
 #, c-format
 msgid "Could not load %s: %s"
-msgstr "Ne mogu učitati %s: %s"
+msgstr "Nemoguće učitati %s: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:278
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "Ne mogu učitati %s: nema koda za pokretanje u modulu."
+msgstr "Nemoguće učitati %s: nema koda za pokretanje u modulu."
 
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177
-#, fuzzy, c-format
+#: ../camel/camel-provider.c:424 ../camel/camel-session.c:421
+#, c-format
 msgid "No provider available for protocol '%s'"
-msgstr "Nema dostupnog ponuđača za protokol `%s'"
+msgstr "Nema davatelja usluge za protokol '%s'"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:32
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid "Anonymous"
-msgstr "Anonimno"
+msgstr "Anoniman"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:34
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Spajanje na poslužitelj korištenjem anonimne prijave."
 
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:67
+#, c-format
 msgid "Authentication failed."
-msgstr "Neuspjelo spajanje."
+msgstr "Neuspjela ovjera."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:78
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1972,16 +2507,16 @@
 "Neispravna informacija o porijeklu elektronske adrese:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:92
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
-"Neispravna informacija o prozirnom tragu:\n"
+"Neispravna informacija o neprozirnom tragu:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:106
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1990,11 +2525,11 @@
 "Neispravne informacija o porijeklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2002,11 +2537,11 @@
 "Spajanje na poslužitelj korištenjem lozinke kodirane CRAM-MD5 algoritmom, "
 "ako ga poslužitelj podržava."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2014,58 +2549,71 @@
 "Spajanje na poslužitelj korištenjem lozinke kodirane DIGEST-MD5 algoritmom, "
 "ako ga poslužitelj podržava."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:854
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Upit na poslužitelj predug (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:865
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "Upit na poslužitelj je neispravan\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:873
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Upit na poslužitelj ima neispravni „Kvaliteta zaštite“ signal"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:906
+#, c-format
 msgid "Server response did not contain authorization data"
-msgstr "Odgovor poslužitelja nije imao podatke o autorizaciji"
+msgstr "Odgovor poslužitelja nije imao podatke o ovlašćenju"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:927
+#, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "Odgovor poslužitelja nije imao kompletne podatke o autorizaciji"
+msgstr "Odgovor poslužitelja nije imao kompletne podatke o ovlašćenju"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:940
+#, c-format
 msgid "Server response does not match"
-msgstr "Odgovor poslužitelja nije usklađen"
+msgstr "Odgovor poslužitelja ne odgovara"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:94
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
-msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Spajanje na poslužitelj korištenjem Kerberos 4 autentifikacije."
+#: ../camel/camel-sasl-gssapi.c:96
+msgid ""
+"This option will connect to the server using Kerberos 5 authentication."
+msgstr "Spajanje na poslužitelj korištenjem Kerberos 4 ovjere."
+
+#: ../camel/camel-sasl-gssapi.c:148
+#, c-format
+msgid "(Unknown GSSAPI mechanism code: %x)"
+msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:181
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr ""
-"Odabrani mehanizam metoda prijave ne podržava, ili primjenjena metoda ga "
-"nije prepoznala."
+"Dano uvjerenje ne podržava odabrani mehanizam ili ga primjenjena metoda ne "
+"prepoznaje."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:186
 msgid "The provided target_name parameter was ill-formed."
-msgstr "Ponuđeni parametar ime_cilja nije pravilno formiran."
+msgstr "Ponuđeni parametar target_name nije pravilno oblikovan."
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
-"Ponuđeni parametar ime_cilja je sadržao neispravan ili nepodržan tip imena."
+"Ponuđeni parametar target_name je sadržavao neispravnu ili nepodržanu vrstu "
+"imena."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:193
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2073,83 +2621,67 @@
 "input_token sadrži različita vezivanja za kanale od onih određenih preko "
 "parametra input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../camel/camel-sasl-gssapi.c:198
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
-"input_token sadrži neispravnu strukturu, ili potpis nije mogao biti "
-"provjeren."
+"input_token sadrži neispravan potpis, ili potpis nije mogao biti provjeren."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:202
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
-"Pružena uvjeravanja nisu bila ispravna za započimanje procesa, ili je nosač "
+"Pružena uvjerenja nisu bila ispravna za započimanje procesa, ili je nosač "
 "uvjerenja došao bez njih."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:207
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Pruženi nosač sadržaja nije upućivao na ispravan sadržaj."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:210
 msgid "The consistency checks performed on the input_token failed."
-msgstr "Neuspjele provjere cijelovitosti na input_token."
+msgstr "Neuspjele provjere dosljednosti na input_token."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:213
 msgid "The consistency checks performed on the credential failed."
-msgstr "Neuspjele provjere cijelovitosti na uvijerenjima."
+msgstr "Neuspjele provjere dosljednosti na uvjerenjima."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:216
 msgid "The referenced credentials have expired."
-msgstr "Važenje traženih uverenja je isteklo."
+msgstr "Uvjerenja na koja se upućuje su istekla."
 
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
+#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
+#: ../camel/providers/smtp/camel-smtp-transport.c:790
+#, c-format
 msgid "Bad authentication response from server."
-msgstr "Neispravan odgovor autentifikacije od servera."
+msgstr "Neispravan odgovor ovjere od poslužitelja."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:482
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Nepodržan sigurnosni sloj."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Spajanje na poslužitelj korištenjem Kerberos 4 autentifikacije."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Ne mogu dobiti Kerberos ulaznicu:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:37
 msgid "Login"
-msgstr "Korisnička oznaka"
+msgstr "Prijava"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
 msgid "This option will connect to the server using a simple password."
 msgstr "Spajanje na poslužitelj korištenjem obične lozinke."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:107
+#, c-format
 msgid "Unknown authentication state."
-msgstr "Nepoznat status prijave."
+msgstr "Nepoznato stanje ovjere."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:46
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:48
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2157,2108 +2689,1426 @@
 "Spajanje na Windows poslužitelj korištenjem NTLM / Secure Password "
 "Authentication."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:41
 msgid "PLAIN"
 msgstr "JASAN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:43
 msgid "POP before SMTP"
 msgstr "POP prije SMTP identifikacija..."
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:45
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Prvo se prijavi na POP, a zatim pokušaj SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
-msgid "POP Source URI"
-msgstr "POP izvorna URI"
-
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP prije SMTP autorizacije korištenjem nepoznatog transporta"
-
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP prije SMTP autorizacija korištenjem izvora koji nije pop"
+#: ../camel/camel-sasl-popb4smtp.c:81
+msgid "POP Source UID"
+msgstr "UID POP izvora"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-sasl-popb4smtp.c:95
 #, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Neuspjela kompilacija regularnog izraza: %s: %s"
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "POP prije SMTP-a ovjera koristeći nepoznati prijenos"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-sasl-popb4smtp.c:107 ../camel/camel-sasl-popb4smtp.c:116
 #, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s traži dio sa korisničkim imenom'"
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr "POP prije SMTP autentifikacija isprobana sa servisom %s"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-search-private.c:113
 #, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s traži dio sa imenom računala"
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Neuspjelo sastavljanje regularnog izraza: %s: %s"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-session.c:430
 #, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' traži dio sa putanjom"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "Neispravan GType registriran za protokol '%s'"
 
-#: ../camel/camel-session.c:303
+#: ../camel/camel-session.c:499
+#: ../camel/providers/imapx/camel-imapx-server.c:2924
+#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:786
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
+msgid "No support for %s authentication"
 msgstr ""
-"Ne mogu kreirati mapu %s:\n"
-"%s"
 
-#: ../camel/camel-session.c:478
+#: ../camel/camel-session.c:514
 #, c-format
-msgid "Please enter the %s password for %s on host %s."
+msgid "%s authentication failed"
+msgstr ""
+
+#: ../camel/camel-session.c:583
+msgid "Forwarding messages is not supported"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
 #, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "Ne mogu naći certifikat za '%s'"
+msgstr "Nemoguće naći potvrdu za '%s'"
 
-#: ../camel/camel-smime-context.c:240
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
-msgstr "Ne mogu kreirati CMS poruku"
+msgstr "Nemoguće stvoriti CMS poruku"
 
-#: ../camel/camel-smime-context.c:245
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
-msgstr "Ne mogu kreirati CMS potpisane podatke"
+msgstr "Nemoguće stvoriti CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:251
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
-msgstr "Ne mogu dodati CMS potpisane podatke"
+msgstr "Nemoguće priložiti CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:258
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
-msgstr "Ne mogu dodati CMS podatke"
+msgstr "Nemoguće priložiti CMS podatke"
 
-#: ../camel/camel-smime-context.c:264
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
-msgstr "Ne mogu izraditi CMS Potpisnik informaciju"
+msgstr "Nemoguće stvoriti CMS Potpisnik informaciju"
 
-#: ../camel/camel-smime-context.c:270
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
-msgstr "Ne mogu naći lanac certifikata"
+msgstr "Nemoguće naći lanac potvrda"
 
-#: ../camel/camel-smime-context.c:276
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
-msgstr "Ne mogu dodati CMS vrijeme potpisa"
+msgstr "Nemoguće dodati CMS vrijeme potpisa"
 
-#: ../camel/camel-smime-context.c:298 ../camel/camel-smime-context.c:310
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "'%s' certifikat za kriptiranje ne postoji"
+msgstr "Potvrda šifriranja ’%s‘ ne postoji"
 
-#: ../camel/camel-smime-context.c:317
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "Ne mogu dodati SMIMEEncKeyPrefs atribut"
+msgstr "Nemoguće dodati SMIMEEncKeyPrefs atribut"
 
-#: ../camel/camel-smime-context.c:322
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "Ne mogu dodati MS SMIMEEncKeyPrefs atribut"
+msgstr "Nemoguće dodati MS SMIMEEncKeyPrefs atribut"
 
-#: ../camel/camel-smime-context.c:327
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
-msgstr "Ne mogu dodati certifikat kriptiranja"
+msgstr "Nemoguće dodati potvrdu šifriranja"
 
-#: ../camel/camel-smime-context.c:333
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
-msgstr "Ne mogu dodati CMS potpisanu obavijest"
-
-#: ../camel/camel-smime-context.c:403 ../camel/camel-smime-context.c:851
-msgid "Cannot create encoder context"
-msgstr "Ne mogu izraditi kontekst enkodera"
-
-#: ../camel/camel-smime-context.c:409
-msgid "Failed to add data to CMS encoder"
-msgstr "Ne mogu dodati podatke u CMS enkoder"
-
-#: ../camel/camel-smime-context.c:414 ../camel/camel-smime-context.c:868
-msgid "Failed to encode data"
-msgstr "Neuspjeh pri enkodiranju podataka"
+msgstr "Nemoguće dodati CMS Potpisnik informaciju"
 
-#: ../camel/camel-smime-context.c:487
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:507
 msgid "Unverified"
 msgstr "Neprovjereno"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:509
 msgid "Good signature"
-msgstr "Datoteka s potpisom:"
+msgstr "Dobar potpis"
 
-#: ../camel/camel-smime-context.c:491
+#: ../camel/camel-smime-context.c:511
 msgid "Bad signature"
-msgstr "Neispravan potpis"
+msgstr "Loš potpis"
 
-#: ../camel/camel-smime-context.c:493
+#: ../camel/camel-smime-context.c:513
 msgid "Content tampered with or altered in transit"
 msgstr "Sadržaj je mijenjan prilikom prijenosa"
 
-#: ../camel/camel-smime-context.c:495
+#: ../camel/camel-smime-context.c:515
 msgid "Signing certificate not found"
-msgstr "Potpisni certifikat nije pronađen"
+msgstr "Potpisna potvrda nije pronađena"
 
-#: ../camel/camel-smime-context.c:497
+#: ../camel/camel-smime-context.c:517
 msgid "Signing certificate not trusted"
-msgstr "Potpisni certifikat nije povjerljiv"
+msgstr "Potpisna potvrda nije povjerljiva"
 
-#: ../camel/camel-smime-context.c:499
+#: ../camel/camel-smime-context.c:519
 msgid "Signature algorithm unknown"
-msgstr "Algoritam za potpis nije poznat"
+msgstr "Algoritam za potpis nepoznat"
 
-#: ../camel/camel-smime-context.c:501
-#, fuzzy
+#: ../camel/camel-smime-context.c:521
 msgid "Signature algorithm unsupported"
-msgstr "Algoritam za potpis nije podržan"
+msgstr "Algoritam potpisa nepodržan"
 
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:523
 msgid "Malformed signature"
 msgstr "Neispravni potpis"
 
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:525
 msgid "Processing error"
 msgstr "Greška u obradi"
 
-#: ../camel/camel-smime-context.c:542
+#: ../camel/camel-smime-context.c:570
 msgid "No signed data in signature"
 msgstr "Nema potpisanih podataka u potpisu"
 
-#: ../camel/camel-smime-context.c:549
+#: ../camel/camel-smime-context.c:575
 msgid "Digests missing from enveloped data"
 msgstr "Obuhvaćeni podatak ne sadrži sažetak poruke"
 
-#: ../camel/camel-smime-context.c:562 ../camel/camel-smime-context.c:572
+#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
 msgid "Cannot calculate digests"
-msgstr "Ne mogu izračunati sažetak"
+msgstr "Nemoguće izračunati sažetak"
 
-#: ../camel/camel-smime-context.c:577
+#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
 msgid "Cannot set message digests"
-msgstr "Ne mogu postaviti sažetak poruke"
+msgstr "Nemoguće postaviti sažetak poruke"
 
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:592
+#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
 msgid "Certificate import failed"
-msgstr "Unos certifikata nije uspio"
+msgstr "Neuspio uvoz potvrde"
 
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:635
+#, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Poruka ima samo certifikat, nije moguća provera certifikata"
+msgstr "Potvrda je jedina poruka, nije moguća provjera potvrda"
 
-#: ../camel/camel-smime-context.c:605
+#: ../camel/camel-smime-context.c:638
+#, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Poruka ima samo certifikat, certifikati unešeni i provjereni"
+msgstr "Potvrda je jedina poruka, potvrde uvežene i provjerene"
 
-#: ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:642
 msgid "Cannot find signature digests"
-msgstr "Ne mogu naći potpis sažetka"
+msgstr "Nemoguće naći potpis sažetka"
 
-#: ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:659
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
-msgstr "Potpisao: %s <%s>: %s\n"
+msgstr "Potpisnik: %s <%s>: %s\n"
+
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1149
+msgid "Cannot create encoder context"
+msgstr "Nemoguće izraditi kontekst kodera"
+
+#: ../camel/camel-smime-context.c:861
+msgid "Failed to add data to CMS encoder"
+msgstr "Neuspješno dodavanje podataka u CMS koder"
+
+#: ../camel/camel-smime-context.c:866 ../camel/camel-smime-context.c:1166
+msgid "Failed to encode data"
+msgstr "Neuspješno šifriranje podataka"
 
-#: ../camel/camel-smime-context.c:726
+#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
 msgid "Decoder failed"
 msgstr "Pogreška dekodera"
 
-#: ../camel/camel-smime-context.c:785
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot find common bulk encryption algorithm"
-msgstr "Ne mogu naći zajednički algoritam za enkripciju"
+msgstr "Nemoguće naći zajednički algoritam za masovno šifriranje"
 
-#. PORT_GetError(); ??
-#: ../camel/camel-smime-context.c:794
+#: ../camel/camel-smime-context.c:1091
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr "Ne mogu dodijeliti prostor za ključ enkripcije"
+msgstr "Nemoguće dodijeliti prostor za masovni ključ šifriranja"
 
-#: ../camel/camel-smime-context.c:805
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Message"
-msgstr "Ne mogu izraditi CMS poruku"
+msgstr "Nemoguće stvoriti CMS poruku"
 
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:1108
 msgid "Cannot create CMS Enveloped data"
-msgstr "Ne mogu izraditi CMS Enveloped podatak"
+msgstr "Nemoguće stvoriti CMS kuvertirani podatak"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot attach CMS Enveloped data"
-msgstr "Ne mogu priložiti CMS Enveloped podatak"
-
-#: ../camel/camel-smime-context.c:823
-msgid "Cannot attach CMS data object"
-msgstr "Ne mogu priložiti CMS objekt podataka"
-
-#: ../camel/camel-smime-context.c:832
-msgid "Cannot create CMS Recipient information"
-msgstr "Ne mogu izraditi CMS informaciju primatelja"
-
-#: ../camel/camel-smime-context.c:837
-msgid "Cannot add CMS Recipient information"
-msgstr "Ne mogu dodati CMS informaciju primatelja"
-
-#: ../camel/camel-smime-context.c:862
-msgid "Failed to add data to encoder"
-msgstr "Nisam uspio dodati podatke u enkoder"
-
-#: ../camel/camel-smime-context.c:949
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "Dekodiranje neuspešno, greška %d"
-
-#: ../camel/camel-smime-context.c:956
-msgid "S/MIME Decrypt: No encrypted content found"
-msgstr "S/MIME dekripcija: Nema kriptiranog sadržaja"
-
-#: ../camel/camel-smime-context.c:983
-msgid "import keys: unimplemented"
-msgstr "unos ključena: nepodržano"
-
-#: ../camel/camel-smime-context.c:991
-msgid "export keys: unimplemented"
-msgstr "izvoz ključeva: nepodržano"
-
-#: ../camel/camel-store.c:272
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Ne mogu dobiti mapu: neispravna operacija"
-
-#: ../camel/camel-store.c:305
-#, fuzzy, c-format
-msgid "Cannot create folder '%s': folder exists"
-msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji"
-
-#: ../camel/camel-store.c:369
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Ne mogu napraviti mapu: neispravna operacija"
-
-#: ../camel/camel-store.c:397
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "Ne mogu stvoriti mapu: %s: mapa postoji"
-
-#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
-
-#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
-
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:856 ../camel/camel-vtrash-folder.c:53
-#: ../camel/providers/imap/camel-imap-store.c:1060
-msgid "Trash"
-msgstr "Smeće"
-
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:859 ../camel/camel-vtrash-folder.c:55
-msgid "Junk"
-msgstr "Smeće"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "Ne mogu dobiti certifikat izdavača"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "Ne mogu da dobijem popis povučenih certifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "Ne mogu da dešifrriram potpis certifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Ne mogu da dešifriram potpis za popis povučenih certifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "Ne mogu dešifrirati javni ključ izdavača"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "Nevažeći potpis certifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "Greška potpisa popisa povučenih certifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "Certifikat još nije važeći"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "Certifikat je istekao"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL još nije važeći"
-
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL je istekao"
+msgstr "Nemoguće priložiti CMS kuvertirani podatak"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "Greška u CRL"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "Nemam više memorije"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "Samopotpisani certifikat je nulte veličine"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "Samopotpisani certifikat u lancu"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "Ne mogu da lokalno dobijem izdavačev certifikat"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "Ne mogu da ovjerim potpis lista"
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "Lanac certifikata je predugačak"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "Certifikat pročitan"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Neispravan izdavatelj certifikata (CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "Premašena dužina putanje"
-
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Neispravna svrha"
-
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Nepoverljiv certifikat"
-
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Certifikat odbijen"
-
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Subjekt/Izdavač neslaganje"
-
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID neslaganje"
-
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/Issuer serijsko neslaganje"
-
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "Upotreba ključa ne podržava potpis certifikatom"
-
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "Greška kod provjere programa"
-
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
-#, c-format
-msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
-msgstr ""
-"Izdavač:            %s\n"
-"Naslov:           %s\n"
-"Oznaka:       %s\n"
-"Potpis:         %s"
-
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
-msgid "GOOD"
-msgstr "DOBAR"
-
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
-msgid "BAD"
-msgstr "LOŠ"
-
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Neispravan certifikat od %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Želite li ipak prihvatiti?"
-
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
-#, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
-msgstr ""
-"Provjera SSL certifikata za %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Želite li prihvatiti?"
-
-#: ../camel/camel-tcp-stream-ssl.c:934
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"Problem sa certifikatom: %s\n"
-"Izdavač: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:986
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"Neispravna domena certifikata: %s\n"
-"Izdavač: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:1004
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Certifikat istekao: %s\n"
-"Izdavač: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:1021
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Popis priznatih certifikata istekao: %s\n"
-"Izdavač: %s"
-
-#: ../camel/camel-url.c:313
-#, fuzzy, c-format
-msgid "Could not parse URL '%s'"
-msgstr "Nisam mogao obraditi URL `%s"
-
-#: ../camel/camel-vee-folder.c:586
-#, fuzzy, c-format
-msgid "Error storing '%s': %s"
-msgstr "Greška kod spremanja `%s': %s"
-
-#: ../camel/camel-vee-folder.c:638
-#, c-format
-msgid "No such message %s in %s"
-msgstr "Nema takve poruke %s u %s"
-
-#: ../camel/camel-vee-folder.c:761 ../camel/camel-vee-folder.c:767
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
-
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
-msgid "Unmatched"
-msgstr "Neupariv"
-
-#: ../camel/camel-vee-store.c:407
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
-
-#: ../camel/camel-vee-store.c:429
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
-
-#: ../camel/camel-vtrash-folder.c:54
-msgid "Cannot copy messages to the Trash folder"
-msgstr "Ne možete kopirati poruke u mapu \"Smeće\""
-
-#: ../camel/camel-vtrash-folder.c:56
-msgid "Cannot copy messages to the Junk folder"
-msgstr "Ne možete kopirati poruke u mapu \"Smeće\""
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Ne mogu dobiti poruku: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
-#: ../camel/providers/local/camel-maildir-folder.c:251
-#: ../camel/providers/local/camel-mbox-folder.c:348
-#: ../camel/providers/local/camel-mh-folder.c:204
-msgid "No such message"
-msgstr "Nema takve poruke"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
-#: ../camel/providers/imap4/camel-imap4-folder.c:812
-#: ../camel/providers/nntp/camel-nntp-folder.c:156
-#: ../camel/providers/nntp/camel-nntp-folder.c:232
-#: ../camel/providers/nntp/camel-nntp-folder.c:373
-#: ../camel/providers/pop3/camel-pop3-folder.c:266
-#: ../camel/providers/pop3/camel-pop3-folder.c:560
-#: ../camel/providers/pop3/camel-pop3-folder.c:621
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-msgid "User canceled"
-msgstr ""
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:135
-#: ../camel/providers/imap4/camel-imap4-folder.c:817
-#: ../camel/providers/nntp/camel-nntp-folder.c:147
-#: ../camel/providers/nntp/camel-nntp-folder.c:149
-#: ../camel/providers/nntp/camel-nntp-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
-#: ../camel/providers/pop3/camel-pop3-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Ne mogu dobiti poruku %s: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:160
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164
-#: ../camel/providers/imap4/camel-imap4-folder.c:835
-msgid "This message is not available in offline mode."
-msgstr "Ova poruka nije dostupna ukloliko nema veze na mrežu."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747
-msgid "Could not get message"
-msgstr "Ne mogu dohvatiti poruku"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:818
-#: ../camel/providers/imap/camel-imap-folder.c:248
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Ne mogu učitati sažetak za %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071
-msgid "Trash Folder Full. Please Empty."
-msgstr ""
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248
-#: ../camel/providers/groupwise/camel-groupwise-store.c:623
-#: ../camel/providers/groupwise/camel-groupwise-store.c:736
-#: ../camel/providers/imap/camel-imap-folder.c:3183
-#: ../camel/providers/imap/camel-imap-folder.c:3260
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "Prikupljanje pregleda podataka za nove poruke u %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073
-#, fuzzy, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "Ne mogu dodati poruku u mapu `%s': %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "Nije moguće kreiranje poruke: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "Nije moguće dobiti sadržaj mape %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr ""
-"Ne mogu dodati poruku ako nisam spojen na mrežu: spremnik nije dostupan"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Ne mogu dodati poruku ako nisam spojen na mrežu: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
-msgid "Checking for new mail"
-msgstr "Provjeravam za novu poštu"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
-msgid "C_heck for new messages in all folders"
-msgstr "_Provjeri za nove poruke u svim mapama"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
-msgid "Options"
-msgstr "Odrednice"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr ""
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
-msgid "Check new messages for J_unk contents"
-msgstr ""
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr ""
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
-msgid "Automatically synchroni_ze account locally"
-msgstr ""
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
-msgid "SOAP Settings"
-msgstr "SOAP postavke"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-msgid "Post Office Agent SOAP Port:"
-msgstr "Posrednik za SOAP port za poštu:"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
-msgid "For accessing Novell GroupWise servers"
-msgstr "Za pristupanje Novell Groupwise serverima"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
-msgid "Password"
-msgstr "Lozinka"
+#: ../camel/camel-smime-context.c:1120
+msgid "Cannot attach CMS data object"
+msgstr "Nemoguće priložiti CMS podatkovni objekt"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
-msgstr "Spajanje na GroupWise poslužitelj korištenjem lozinke u čistom tekstu."
+#: ../camel/camel-smime-context.c:1129
+msgid "Cannot create CMS Recipient information"
+msgstr "Nemoguće stvoriti CMS informaciju o primatelju"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:103
-msgid "Host or user not available in url"
-msgstr "Domaćin ili korisnik nisu dostupni u adresi"
+#: ../camel/camel-smime-context.c:1134
+msgid "Cannot add CMS Recipient information"
+msgstr "Nemoguće dodati CMS informaciju o primatelju"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:206
-#: ../camel/providers/imap/camel-imap-store.c:1356
-msgid "You did not enter a password."
-msgstr ""
+#: ../camel/camel-smime-context.c:1160
+msgid "Failed to add data to encoder"
+msgstr "Neuspješno dodavanje podataka u koder"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:302
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
-"Neke postavke možda neće ispravno raditi na trenutnoj verziji poslužitelja"
+#: ../camel/camel-smime-context.c:1270
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr "S/MIME dešifriranje: nisu nađeni šifrirani podaci"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:532
-#: ../camel/providers/imap/camel-imap-store.c:1846
-#: ../camel/providers/imap/camel-imap-store.c:2044
+#: ../camel/camel-store.c:1248
 #, c-format
-msgid "No such folder %s"
-msgstr "Nema takve mape %s"
+msgid "Opening folder '%s'"
+msgstr "Otvaranje direktorija '%s'"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1219
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Ne mogu stvoriti GroupWise mape dok nisam spojen na mrežu."
+#: ../camel/camel-store.c:1539
+#, c-format
+msgid "Scanning folders in '%s'"
+msgstr "Skeniranje direktorija u '%s'"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
-#: ../camel/providers/imap/camel-imap-store.c:1921
-#: ../camel/providers/imap/camel-imap-store.c:2301
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Glavni direktorij ne smije sadržati direktorije"
+#: ../camel/camel-store.c:1567 ../camel/camel-store.c:1612
+#: ../camel/camel-vtrash-folder.c:45
+msgid "Trash"
+msgstr "Smeće"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1309
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1330
-#, fuzzy, c-format
-msgid "Cannot rename Groupwise folder '%s' to '%s'"
-msgstr "Ne mogu preimenovati Groupwise mapu `%s' u %s"
+#: ../camel/camel-store.c:1581 ../camel/camel-store.c:1629
+#: ../camel/camel-vtrash-folder.c:47
+msgid "Junk"
+msgstr "Nepoželjna"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/camel-store.c:2230
 #, c-format
-msgid "GroupWise server %s"
-msgstr "GroupWise poslužitelj %s"
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Nemoguće stvoriti mapu: %s: mapa postoji"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1364
+#: ../camel/camel-store.c:2237
 #, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "GroupWise poslužitelj za %s na %s"
+msgid "Creating folder '%s'"
+msgstr "Stvaranje direktorija '%s'"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/camel-store.c:2414 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:346
 #, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "GroupWise dostava pošte preko %s"
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Nemoguće obrisati mapu: %s: neispravna operacija"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
-#, fuzzy
-msgid "Sending Message"
-msgstr "Slanje poruke"
+#: ../camel/camel-store.c:2604 ../camel/camel-vee-store.c:461
+#: ../camel/providers/local/camel-maildir-store.c:914
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Nemoguće preimenovati mapu: %s: neispravna operacija"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
+#: ../camel/camel-stream.c:168
+msgid "Cannot write with no base stream"
 msgstr ""
-"Prešli ste smeštajno ograničenje za ovaj nalog. Vaše poruke odlagati će se u "
-"Odlaznu poštu. Pošaljite ih ponovno pritiskom na Pošalji/Primi tipku nako "
-"što uklonite/zapakirate dio vaše pošte.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
 #, c-format
-msgid "Could not send message: %s"
-msgstr "Nisam mogao poslati poruku: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Gledam ima li nove pošte"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "Veza na poslužitelj"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_Koristi prilagođenu naredbu za spajanje na poslužitelj"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "Naredba:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Mape"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "_Pokaži samo pretplaćene mape"
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr "Zaobiđi imena mapa koje daje poslužitelj"
+msgid "Stream type '%s' is not seekable"
+msgstr ""
 
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "Prostor naziva"
+#: ../camel/camel-stream-filter.c:344
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr "S CamelStreamFilter je podržano samo resetiranje na početak"
 
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "Hula"
+#: ../camel/camel-stream-null.c:74
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "S CamelHttpStream je podržano samo resetiranje na početak"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "Za pristupanje Hula poslužiteljima"
+#: ../camel/camel-stream-process.c:278
+#: ../camel/providers/smtp/camel-smtp-transport.c:711
+#, c-format
+msgid "Connection cancelled"
+msgstr "Veza otkazana"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr ""
-"Ova postavka omogućuje povezivanje na Hula poslužitelj koristeći lozinke u "
-"običnom tekstu."
+#: ../camel/camel-stream-process.c:283
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Nemoguće spajanje s naredbom \"%s\": %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
-msgid "No output stream"
+#: ../camel/camel-subscribable.c:273
+#, c-format
+msgid "Subscribing to folder '%s'"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
-msgid "No input stream"
+#: ../camel/camel-subscribable.c:442
+#, c-format
+msgid "Unsubscribing from folder '%s'"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3034
-msgid "Operation cancelled"
-msgstr "Operacija je opozvana"
-
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/camel-url.c:327
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
+msgid "Could not parse URL '%s'"
+msgstr "Nemoguće raščlaniti URL '%s'"
 
-#. for imap ALERT codes, account user@host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/camel-vee-folder.c:491
 #, c-format
-msgid ""
-"Alert from IMAP server %s@%s:\n"
-"%s"
+msgid "Updating folder '%s'"
 msgstr ""
-"Upozorenje od IMAP servera %s@%s:\n"
-"%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:979
+#, c-format
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Nemoguće kopirati ili premjestiti poruke u virtualnu mapu"
+
+#: ../camel/camel-vee-folder.c:902
 #, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
+msgid "No such message %s in %s"
+msgstr "Nema takve poruke %s u %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/camel-vee-folder.c:955
 #, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP naredba nije uspjela: %s"
+msgid "Error storing '%s': "
+msgstr "Greška pri pohrani '%s': "
+
+#: ../camel/camel-vee-folder.c:1191
+msgid "Automatically _update on change in source folders"
+msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:508
-msgid "Server response ended too soon."
-msgstr "Odgovor poslužitelja je prerano završen."
+#. Translators: 'Unmatched' is a folder name under Search folders where are shown
+#. * all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:40
+msgid "Unmatched"
+msgstr "Neupariv"
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/camel-vee-store.c:436
 #, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "Odgovor IMAP poslužitelja ne sadrži %s informaciju"
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Nemoguće obrisati mapu: %s: nema takve mape"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/camel-vee-store.c:471
 #, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Neočekivan OK odgovor od IMAP poslužitelja: %s"
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Nemoguće preimenovati mapu: %s: nema takve mape"
+
+#: ../camel/camel-vee-store.c:533
+msgid "Enable _Unmatched folder"
+msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:88
-msgid "Always check for new mail in this folder"
+#: ../camel/camel-vee-store.c:1025
+msgid "Updating Unmatched search folder"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:229
+#: ../camel/camel-vtrash-folder.c:46
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Nemoguće kopirati poruke u mapu \"Smeće\""
+
+#: ../camel/camel-vtrash-folder.c:48
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Nemoguće kopirati poruke u mapu \"Neželjeno\""
+
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:953
 #, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Ne mogu kreirati mapu %s: %s"
+msgid "You must be working online to complete this operation (%s)"
+msgstr ""
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:843
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:961
+#: ../camel/providers/nntp/camel-nntp-store.c:1284
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:632
+#: ../camel/providers/pop3/camel-pop3-folder.c:834
+#: ../camel/providers/pop3/camel-pop3-folder.c:1044
+#: ../camel/providers/pop3/camel-pop3-store.c:296
+#: ../camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:672
+#: ../camel/providers/pop3/camel-pop3-store.c:1103
 #, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "Pretraživanje za izmjenjenim porukama u %s"
+msgid "You must be working online to complete this operation"
+msgstr "Morate biti na mreži da biste završili ovu operaciju"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1860
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1533
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1621
 #, c-format
-msgid "Unexpected response status '%s' after APPEND command"
+msgid "No destination folder specified"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:1875
-msgid "No response on continuation after APPEND command"
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1560
+msgid "Unable to move junk messages"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:1917
-msgid "Unknown error occurred during APPEND command!"
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1655
+msgid "Unable to move deleted messages"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:2729
+#: ../camel/providers/imapx/camel-imapx-folder.c:702
 #, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Ne mogu da pokupim poruku: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2770
-#, fuzzy, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "Ne mogu dobiti poruku %s: %s"
+msgid "No quota information available for folder '%s'"
+msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:2771
-#, fuzzy
-msgid "No such message available."
-msgstr "Nema takve poruke"
+#: ../camel/providers/imapx/camel-imapx-folder.c:964
+#: ../camel/providers/nntp/camel-nntp-folder.c:765
+msgid "Apply message _filters to this folder"
+msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:2810
-#: ../camel/providers/imap/camel-imap-folder.c:3562
-#: ../camel/providers/nntp/camel-nntp-folder.c:220
-msgid "This message is not currently available"
-msgstr "Ova poruka je trenutno nedostupna"
+#: ../camel/providers/imapx/camel-imapx-folder.c:975
+msgid "Always check for _new mail in this folder"
+msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:3389
+#: ../camel/providers/imapx/camel-imapx-folder.c:1088
 #, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "Nepotpun odgovor poslužitelja: podaci nisu dati za poruku %d"
+msgid "Could not create folder summary for %s"
+msgstr "Nemoguće stvoriti sažetak mape za %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3397
+#: ../camel/providers/imapx/camel-imapx-folder.c:1097
 #, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Nepotpun odgovor poslužitelja: UID nije dat za poruku %d"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3600
-msgid "Could not find message body in FETCH response."
-msgstr "Nisam mogao pronaći tekst poruke u FETCH odgovoru."
+msgid "Could not create cache for %s: "
+msgstr "Nemoguće stvoriti predmemoriju za %s "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:160
-#: ../camel/providers/imap/camel-imap-message-cache.c:220
+#: ../camel/providers/imapx/camel-imapx-folder.c:1295
 #, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Nisam mogao otvoriti direktorij za pričuvnu memoriju: %s"
+msgid "No IMAP mailbox available for folder '%s'"
+msgstr ""
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:307
-#: ../camel/providers/imap/camel-imap-message-cache.c:364
-#: ../camel/providers/imap/camel-imap-message-cache.c:395
-#: ../camel/providers/imap/camel-imap-message-cache.c:427
+#: ../camel/providers/imapx/camel-imapx-input-stream.c:101
 #, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "Nisam uspio privremeno sačuvati poruku %s: %s"
+msgid "Source stream returned no data"
+msgstr "Izvorni tok nije vratio nikakve podatke"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:478
-#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Nisam uspio privremeno sačuvati %s: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
+msgid "Checking for New Mail"
+msgstr "Provjeravanje ima li nove pošte"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "C_heck for new messages in all folders"
+msgstr "P_rovjeri za nove poruke u svim mapama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#, fuzzy
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
-msgstr "_Provjeri za nove poruke u svim mapama"
+msgstr "Pr_ovjeri ima li novih poruka u pretplaćenim mapama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Koristi \"_Brzo ponovno usklađenje\" ako ga podržava poslužitelj"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "_Primjeni filtere na nove poruke u INBOXu ovog poslužitelja"
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
+msgid "Connection to Server"
+msgstr "Veza na poslužitelj"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-msgid "Check new messages for Jun_k contents"
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Numbe_r of concurrent connections to use"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
-msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Automatska _sinkronizacija udaljenje pošte s lokalnom"
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+msgid "Folders"
+msgstr "Mape"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
-msgid "IMAP"
-msgstr "IMAP"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "_Show only subscribed folders"
+msgstr "_Pokaži samo pretplaćene mape"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Za čitanje i spremanje pošte na IMAP servere."
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+msgid "O_verride server-supplied folder namespace"
+msgstr "Z_aobiđi prostor naziva mapa koje daje poslužitelj"
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
+msgid "Namespace:"
+msgstr "Prostor naziva:"
 
-#: ../camel/providers/imap/camel-imap-store.c:436
-#: ../camel/providers/imap4/camel-imap4-store.c:214
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP poslužitelj %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/local/camel-local-provider.c:39
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:99
+#: ../camel/providers/nntp/camel-nntp-provider.c:38
+msgid "Options"
+msgstr "Mogućnosti"
 
-#: ../camel/providers/imap/camel-imap-store.c:438
-#: ../camel/providers/imap4/camel-imap4-store.c:216
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za %s na %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:40
+msgid "Apply _filters to new messages in all folders"
+msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap/camel-imap-store.c:582
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/pop3/camel-pop3-store.c:185
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "Nisam se mogao povezati na %s: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
-msgid "SSL unavailable"
-msgstr "SSL nedostupan"
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr ""
+"_Primjeni filtere na nove poruke u mapi dolazne pošte na ovom poslužitelju"
 
-#: ../camel/providers/imap/camel-imap-store.c:579
-#: ../camel/providers/imap/camel-imap-store.c:861
-msgid "Connection cancelled"
-msgstr "Povezivanje poništeno"
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Check new messages for _Junk contents"
+msgstr "Provjeri nove poruke za neželjenim sadržajem"
 
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+msgid "Only check for Junk messages in the In_box folder"
 msgstr ""
-"Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
-msgid "STARTTLS not supported"
-msgstr "STARTTLS nije podržan"
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "Synchroni_ze remote mail locally in all folders"
+msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:710
-msgid "SSL negotiations failed"
-msgstr "SSL pregovori nisu uspjeli"
-
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
-msgid "SSL is not available in this build"
-msgstr "SSL nije dostupan u ovoj verziji"
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
+msgid "Default IMAP port"
+msgstr "Zadani IMAP port"
 
-#: ../camel/providers/imap/camel-imap-store.c:864
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Ne mogu se spojiti s naredbom \"%s\": %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
+msgid "IMAP over SSL"
+msgstr "IMAP putem SSL-a"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1052
-#: ../camel/providers/imap/camel-imap-store.c:2397
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:77
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "Dolazna pošta"
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap/camel-imap-store.c:1054
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Nedovršeno"
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
+msgid "For reading and storing mail on IMAP servers."
+msgstr "Za čitanje i spremanje pošte na IMAP poslužiteljima."
 
-#: ../camel/providers/imap/camel-imap-store.c:1056
-msgid "Sent"
+#: ../camel/providers/imapx/camel-imapx-server.c:1134
+msgid "Error writing to cache stream"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:1058
-msgid "Templates"
+#: ../camel/providers/imapx/camel-imapx-server.c:2741
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
+#: ../camel/providers/imapx/camel-imapx-server.c:3081
+msgid "Failed to get capabilities"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
 #, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP poslužitelj %s ne podržava traženi tip prijave  %s"
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nemoguće povezivanje na IMAP poslužitelj %s u sigurnosnom načinu rada: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "Nema podrške za tip autentifikacije  %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:2761
+#: ../camel/providers/smtp/camel-smtp-transport.c:281
+msgid "STARTTLS not supported"
+msgstr "STARTTLS nije podržan"
 
-#: ../camel/providers/imap/camel-imap-store.c:1385
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
+#: ../camel/providers/imapx/camel-imapx-server.c:2769
+msgid "Failed to issue STARTTLS"
 msgstr ""
-"Ne mogu da se prijavim na IMAP poslužitelj.\n"
-"%s\n"
-"\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1858
-#: ../camel/providers/imap/camel-imap-store.c:2239
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imapx/camel-imapx-server.c:2817
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime mape \"%s\" nije ispravno jer sadrži znak \"%c\""
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr ""
+"Neuspjelo povezivanje na IMAP poslužitelj %s u sigurnom načinu rada: "
 
-#: ../camel/providers/imap/camel-imap-store.c:1975
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
-#, fuzzy, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji."
-
-#: ../camel/providers/imap/camel-imap-store.c:2250
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Nepoznata glavna mapa: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Neuspjeh pri slanju naredbe na IMAP poslužitelj %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Neočekivan odgovor od IMAP4 poslužitelja %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Neočekivani pozdrav od IMAP poslužitelja: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
-#, fuzzy, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Ne mogu odabrati mapu '%s': neispravno ime sandučića"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, fuzzy, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Ne mogu izabrati mapu `%s': loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, fuzzy, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Neuspjeh pri slanju naredbe na IMAP poslužitelj %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-#, fuzzy
-msgid "service unavailable"
-msgstr "SSL nedostupan"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP4 poslužiteljem %s je neočekivano prekinuta: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-#, fuzzy
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"Omogućivanje otkrivanja dopisne liste potrebno je nekim filterima i "
-"pravilima za vFolder"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:423
-#, fuzzy, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Ne mogu pristupiti mapi `%s': %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:482
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Nije moguće usklađivanje oznaka za mapu ’%s‘: nepoznato"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:488
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Nije moguće usklađivanje oznaka za mapu ’%s‘: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:628
-#, fuzzy, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Ne mogu isprazniti mapu `%s': nepoznato"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:633
-#, fuzzy, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Ne mogu isprazniti mapu `%s': loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:889
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Ne mogu dobiti poruku %s iz mape `%s': nema takve poruke"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:894
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Ne mogu dobiti poruku %s iz mape `%s': loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:938
-#, fuzzy, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "Ne mogu dodati poruku u mapu `%s': mapa je samo za čitanje"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1031
-#, fuzzy, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Ne mogu dodati poruku u mapu `%s': nepoznata greška"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1061
-#, fuzzy, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Nije moguće dodati poruku u mapu ’%s‘: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1181
-#, fuzzy, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Ne mogu premjestiti poruke iz mape `%s' u mapu `%s': nepoznato"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1185
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Nije moguće kopiranje poruke iz mape ’%s‘ u mapu ’%s‘: nepoznato"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1193
-#, fuzzy, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "Nije moguće premještanje poruku iz mape ’%s‘ u mapu ’%s‘: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1197
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "Nije moguće kopiranje poruke iz mape ’%s‘ u mapu ’%s‘: loša naredba"
+#: ../camel/providers/imapx/camel-imapx-server.c:2911
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "Provjeri nove poruke za _SPAM sadržajem."
+#: ../camel/providers/imapx/camel-imapx-server.c:2942
+#: ../camel/providers/nntp/camel-nntp-store.c:393
+#: ../camel/providers/nntp/camel-nntp-store.c:535
+msgid "Cannot authenticate without a username"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Provjeri SPAM poruke samo u mapi Dolazne pošte"
+#: ../camel/providers/imapx/camel-imapx-server.c:2951
+#: ../camel/providers/nntp/camel-nntp-store.c:544
+#: ../camel/providers/pop3/camel-pop3-store.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:728
+msgid "Authentication password not available"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
+#: ../camel/providers/imapx/camel-imapx-server.c:2959
+msgid "Failed to authenticate"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Za čitanje i spremanje pošte na IMAPv4rev1 poslužiteljima."
+#: ../camel/providers/imapx/camel-imapx-server.c:3103
+msgid "Failed to issue NAMESPACE"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
+#: ../camel/providers/imapx/camel-imapx-server.c:3121
+msgid "Failed to enable QResync"
 msgstr ""
-"Povezivanje na IMAPv4rev1 poslužitelj koristeći lozinku u čistom tekstu."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
+#: ../camel/providers/imapx/camel-imapx-server.c:3153
+msgid "Failed to issue NOTIFY"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:300
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
+#: ../camel/providers/imapx/camel-imapx-server.c:3612
+msgid "Failed to select mailbox"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-msgid "TLS negotiations failed"
+#: ../camel/providers/imapx/camel-imapx-server.c:3710
+msgid "Cannot issue command, no stream available"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:415
+#: ../camel/providers/imapx/camel-imapx-server.c:3972
 #, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Nije moguća prijava na IMAP poslužitelj %s pomoću mehanizma prijave %s"
+msgid "Cannot get message with message ID %s: %s"
+msgstr "Nemoguće dohvatiti poruku s ID-om %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nisam se mogao prijaviti na IMAP poslužitelj %s koristeći %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3973
+msgid "No such message available."
+msgstr "Takva poruka nije dostupna."
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4007
+#: ../camel/providers/imapx/camel-imapx-server.c:4032
+#: ../camel/providers/imapx/camel-imapx-server.c:4051
+msgid "Error fetching message"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Ne mogu izraditi IMAP mape ako nisam spojen na mrežu."
+#: ../camel/providers/imapx/camel-imapx-server.c:4044
+msgid "Failed to close the tmp stream"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4075
+msgid "Failed to copy the tmp file"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, fuzzy, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Ne mogu dohvatiti mapu `%s' na IMAP poslužitelju %s: nepoznato"
+#: ../camel/providers/imapx/camel-imapx-server.c:4238
+msgid "Error moving messages"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:821
-#, fuzzy, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:4238
+msgid "Error copying messages"
 msgstr ""
-"Nije moguće dobiti LIST informaciju za `%s' na IMAP poslužitelju %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-msgid "Bad command"
-msgstr "Loša naredba"
+#: ../camel/providers/imapx/camel-imapx-server.c:4422
+#: ../camel/providers/imapx/camel-imapx-server.c:4443
+msgid "Cannot create spool file: "
+msgstr "Nemoguće stvoriti spool datoteku: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, fuzzy, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Ne mogu izraditi mapu `%s': neispravno ime sandučića"
+#: ../camel/providers/imapx/camel-imapx-server.c:4534
+msgid "Error appending message"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:907
-#, fuzzy, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Nije moguće napraviti mapu ’%s‘: loša naredba"
+#: ../camel/providers/imapx/camel-imapx-server.c:4624
+msgid "Error performing NOOP"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
-#, fuzzy, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Ne mogu obrisati mapu `%s': posebna mapa"
+#: ../camel/providers/imapx/camel-imapx-server.c:4772
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Ne mogu obrisati IMAP mape ako nisam spojen na mrežu."
+#: ../camel/providers/imapx/camel-imapx-server.c:4775
+msgid "Error scanning changes"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, fuzzy, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Ne mogu obrisati mapu `%s': neispravno ime sandučića"
+#: ../camel/providers/imapx/camel-imapx-server.c:4793
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, fuzzy, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Ne mogu obrisati mapu `%s': loša naredba"
+#: ../camel/providers/imapx/camel-imapx-server.c:4810
+msgid "Error fetching message info"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
-#, fuzzy, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Nije moguće preimenovati mapu `%s' u `%s': specijalna mapa"
+#: ../camel/providers/imapx/camel-imapx-server.c:4872
+msgid "Error running STATUS"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Ne mogu preimenovati IMAP mape ako nisam spojen na mrežu."
+#: ../camel/providers/imapx/camel-imapx-server.c:5355
+#: ../camel/providers/imapx/camel-imapx-server.c:5407
+msgid "Error syncing changes"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, fuzzy, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#: ../camel/providers/imapx/camel-imapx-server.c:5518
+msgid "Error expunging message"
 msgstr ""
-"Nije moguće preimenovati mapu ’%s‘ u ’%s‘: neispravno ime poštanskog pretinca"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, fuzzy, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Ne mogu preimenovati mapu `%s' u `%s': loša naredba"
+#: ../camel/providers/imapx/camel-imapx-server.c:5588
+msgid "Error fetching folders"
+msgstr ""
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#, fuzzy, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5599
+msgid "Error fetching subscribed folders"
 msgstr ""
-"Nije moguće dobiti podatke %s za obrazac ’%s‘ na IMAP poslužitelju %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Ne mogu se pretplatiti na IMAP mapu ako nisam spojen na mrežu."
+#: ../camel/providers/imapx/camel-imapx-server.c:5621
+msgid "Error creating folder"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Ne mogu se pretplatiti na mapu `%s': neispravno ime sandučića"
+#: ../camel/providers/imapx/camel-imapx-server.c:5677
+msgid "Error deleting folder"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Ne mogu se pretplatiti na mapu `%s': loša naredba"
+#: ../camel/providers/imapx/camel-imapx-server.c:5723
+msgid "Error renaming folder"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Ne mogu se odjaviti sa IMAP mape ako nisam spojen na mrežu."
+#: ../camel/providers/imapx/camel-imapx-server.c:5755
+msgid "Error subscribing to folder"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Ne mogu se odjaviti sa mape `%s': neispravno ime sandučića"
+#: ../camel/providers/imapx/camel-imapx-server.c:5791
+msgid "Error unsubscribing from folder"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Nije moguća odjava iz mape ’%s‘: loša naredba"
+#: ../camel/providers/imapx/camel-imapx-server.c:5831
+msgid "IMAP server does not support quotas"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "Tragam za promijenjenim porukama"
+#: ../camel/providers/imapx/camel-imapx-server.c:5843
+msgid "Error retrieving quota information"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
+#: ../camel/providers/imapx/camel-imapx-server.c:5890
+msgid "Search failed"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-msgid "Fetching envelopes of new messages"
+#. Blocks, until the DONE is issued or on inactivity timeout, error, ...
+#: ../camel/providers/imapx/camel-imapx-server.c:6008
+msgid "Error running IDLE"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Neočekivan odgovor od IMAP poslužitelja %s: "
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imapx/camel-imapx-store.c:224
+#: ../camel/providers/local/camel-maildir-folder.c:482
+#: ../camel/providers/local/camel-maildir-store.c:347
+#: ../camel/providers/local/camel-maildir-store.c:826
+#: ../camel/providers/local/camel-maildir-store.c:832
+#: ../camel/providers/local/camel-maildir-store.c:915
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "Ulazni sandučić"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "Nema podataka"
+#: ../camel/providers/imapx/camel-imapx-store.c:765
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP poslužitelj %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imapx/camel-imapx-store.c:768
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Veza s poslužiteljom %s je neočekivano prekinuta: %s"
+msgid "IMAP service for %s on %s"
+msgstr "IMAP usluge za %s na %s"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "Spremnik za poruke"
+#: ../camel/providers/imapx/camel-imapx-store.c:836
+msgid "No IMAPx connection object provided"
+msgstr ""
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
+#: ../camel/providers/imapx/camel-imapx-store.c:853
+#: ../camel/providers/nntp/camel-nntp-provider.c:92
+#: ../camel/providers/pop3/camel-pop3-provider.c:80
+msgid "Password"
+msgstr "Lozinka"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-store.c:855
 msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"Eksperimentalni IMAP 4(.1) klijent\n"
-"Ovo je nesiguran i nepodržan kod, preporučamo običan IMAP.\n"
-"\n"
-" !!! NE KORISTITE OVO ZA VAŽNU POŠTU !!!\n"
+"This option will connect to the IMAP server using a plaintext password."
+msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u običnom tekstu."
+
+#: ../camel/providers/imapx/camel-imapx-store.c:938
+#, c-format
+msgid "No such folder %s"
+msgstr "Nema takve mape %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-store.c:1353
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Nije moguće povezivanje na %s (port %s): %s"
+msgid "No IMAP namespace for folder path '%s'"
+msgstr ""
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapx/camel-imapx-store.c:1614
+#: ../camel/providers/imapx/camel-imapx-store.c:1847
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Nije moguće povezivanje na POP poslužitelj %s"
+msgid "Retrieving folder list for '%s'"
+msgstr ""
 
-#: ../camel/providers/local/camel-local-folder.c:174
-msgid "Index message body data"
-msgstr "Indeksiranje sadržaja poruka"
+#: ../camel/providers/imapx/camel-imapx-store.c:2063
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime mape \"%s\" nije ispravno jer sadrži znak \"%c\""
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:390
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:394
-#: ../camel/providers/local/camel-local-folder.c:397
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
-msgid "mailbox:%s (%s)"
-msgstr "sandučić:%s (%s)"
+msgid "mailbox: %s (%s)"
+msgstr "poštanski sandučić: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:401
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
-msgid "_Use the '.folders' folder summary file (exmh)"
+#: ../camel/providers/local/camel-local-folder.c:499
+msgid "_Index message body data"
+msgstr ""
+
+#: ../camel/providers/local/camel-local-folder.c:727
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
 msgstr ""
+"Nemoguće dobiti poruku %s iz mape %s\n"
+"%s"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:41
+msgid "_Use the '.folders' folder summary file (exmh)"
+msgstr "_Koristi datoteku (exmh) sažetka mape '.folders'"
+
+#: ../camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
-msgstr "mape pošte MH-formata"
+msgstr "Direktoriji pošte MH oblika"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Za spremanje lokalne pošte u direktorije nalik MH-u."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:66
 msgid "Local delivery"
 msgstr "Lokalna dostava"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:67
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
-"Za preuzimanje (premještanje) lokalne pošte iz standardnog mbox formata u "
-"format kojim upravlja Evolution."
+"Za preuzimanje (premještanje) lokalne pošte iz standardnog mbox oblika u "
+"oblik kojim upravlja Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
-msgid "_Apply filters to new messages in INBOX"
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:101
+msgid "_Apply filters to new messages in Inbox"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Direktoriji pošte u Maildir formatu"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "Za spremanje lokalne pošte u maildir direktorije."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr ""
+msgstr "_Spremi zaglavlja stanja u Elm/Pine/Mutt obliku"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:109
 msgid "Standard Unix mbox spool file"
-msgstr ""
+msgstr "Standardna Unix mbox spool datoteka"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:110
+#: ../camel/providers/local/camel-local-provider.c:124
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Za čitanje i smještanje lokalne pošte u vanjse standardne mbox spool "
+"Za čitanje i smještanje lokalne pošte u vanjske standardne mbox spool "
 "datoteke.\n"
 "Također se može koristiti za čitanje stabla direktorija u Elm, Pine, ili "
 "Mutt stilu."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid "Standard Unix mbox spool directory"
-msgstr ""
+msgstr "Standardni Unix mbox spool direktorij"
+
+#: ../camel/providers/local/camel-local-store.c:88
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Nemoguće preimenovati mapu %s u %s: %s"
+
+#: ../camel/providers/local/camel-local-store.c:170
+#, c-format
+msgid "Local mail file %s"
+msgstr "Lokalna datoteka pošte %s"
 
-#: ../camel/providers/local/camel-local-store.c:171
-#: ../camel/providers/local/camel-local-store.c:282
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:213
+#: ../camel/providers/local/camel-local-store.c:373
+#: ../camel/providers/local/camel-maildir-store.c:123
+#: ../camel/providers/local/camel-mbox-store.c:572
+#: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Spremnik root %s nije apsolutna putanja"
 
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:222
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Spremnik root %s nije regularan direktorij"
 
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:195
-#: ../camel/providers/local/camel-local-store.c:293
+#: ../camel/providers/local/camel-local-store.c:234
+#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:386
+#: ../camel/providers/local/camel-maildir-store.c:165
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "Ne mogu dobiti mapu: %s: %s"
+msgstr "Nemoguće dobiti mapu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:207
+#: ../camel/providers/local/camel-local-store.c:281
+#, c-format
 msgid "Local stores do not have an inbox"
-msgstr "Lokalna spremišta ne sadrže sandučić za poštu."
+msgstr "Lokalna spremišta ne sadrže ulazni poštanski sandučić."
 
-#: ../camel/providers/local/camel-local-store.c:253
+#: ../camel/providers/local/camel-local-store.c:446
+#: ../camel/providers/local/camel-mbox-store.c:739
 #, c-format
-msgid "Local mail file %s"
-msgstr "Lokalna datoteka pošte %s"
+msgid "Could not delete folder index file '%s': %s"
+msgstr "Nemoguće izbrisati indeks datoteku mape '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:348
+#: ../camel/providers/local/camel-local-store.c:474
+#: ../camel/providers/local/camel-mbox-store.c:769
 #, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Nisam mogao preimenovati direktorij %s u %s: %s"
+msgid "Could not delete folder meta file '%s': %s"
+msgstr "Nemoguće izbrisati meta datoteku mape '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:416
+#: ../camel/providers/local/camel-local-store.c:587
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "Nisam mogao preimenovati '%s': %s"
-
-#: ../camel/providers/local/camel-local-store.c:441
-#: ../camel/providers/local/camel-mbox-store.c:300
-#, fuzzy, c-format
-msgid "Could not delete folder index file '%s': %s"
-msgstr "Nisam mogao obrisati indeks datoteku mape `%s': %s"
+msgstr "Nemoguće preimenovati preimenovati '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:464
-#: ../camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "Ne mogu obrisati meta datoteku mape: `%s': %s"
+#: ../camel/providers/local/camel-maildir-folder.c:109
+#: ../camel/providers/local/camel-maildir-folder.c:344
+#: ../camel/providers/local/camel-mbox-folder.c:126
+#: ../camel/providers/local/camel-mbox-folder.c:339
+#: ../camel/providers/local/camel-mh-folder.c:157
+msgid "No such message"
+msgstr "Nema takve poruke"
 
-#: ../camel/providers/local/camel-local-summary.c:506
-msgid "Unable to add message to summary: unknown reason"
-msgstr "Ne mogu dodati poruku u sažetak: nepoznat razlog"
+#: ../camel/providers/local/camel-maildir-folder.c:234
+#, c-format
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Nemoguće pridodati poruku u maildir mapu: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:220
-msgid "Maildir append message canceled"
-msgstr ""
+#: ../camel/providers/local/camel-maildir-folder.c:282
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-mbox-folder.c:400
+#: ../camel/providers/local/camel-mh-folder.c:169
+#: ../camel/providers/local/camel-mh-folder.c:179
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Nemoguće dobiti poruku %s iz mape %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:362
 #, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Ne mogu dodati poruku u maildir mapu: %s: %s"
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Nemoguće premjestiti poruku u odredišnu mapu: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:250
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mbox-folder.c:407
-#: ../camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-mh-folder.c:214
-#: ../camel/providers/local/camel-mh-folder.c:223
+#: ../camel/providers/local/camel-maildir-store.c:131
+#: ../camel/providers/local/camel-maildir-store.c:931
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+msgid "Cannot create folder containing '%s'"
 msgstr ""
-"Ne mogu dobiti poruku: %s iz mape %s\n"
-"  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:274
-msgid "Invalid message contents"
-msgstr "Neispravan sadržaj poruke"
+#: ../camel/providers/local/camel-maildir-store.c:139
+#: ../camel/providers/local/camel-maildir-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:923
+#, c-format
+msgid "Folder %s already exists"
+msgstr "Direktorij %s već postoji"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-store.c:266
+#: ../camel/providers/local/camel-maildir-store.c:297
+#: ../camel/providers/local/camel-mbox-store.c:401
+#: ../camel/providers/local/camel-mbox-store.c:422
+#, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "Ne mogu stvoriti mapu: `%s': %s"
+msgstr "Nemoguće stvoriti mapu '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-store.c:281
+#: ../camel/providers/local/camel-mbox-store.c:367
+#: ../camel/providers/local/camel-mh-store.c:523
+#, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr "Ne mogu dohvatiti mapu: `%s': %s"
+msgstr "Nemoguće dobiti mapu '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-store.c:287
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mh-store.c:532
+#, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "Ne mogu dohvatiti mapu `%s': mapa ne postoji."
+msgstr "Nemoguće dobiti mapu '%s': mapa ne postoji."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-store.c:314
+#, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "Ne mogu dohvatiti mapu `%s': nije maildir direktorij."
+msgstr "Nemoguće dobiti mapu '%s': nije maildir direktorij."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../camel/providers/local/camel-maildir-store.c:418
+#: ../camel/providers/local/camel-mh-store.c:676
+#, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr "Nisam mogao obrisati direktorij `%s': %s"
+msgstr "Nemouguće izbrisati mapu '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:380
 msgid "not a maildir directory"
 msgstr "nije maildir direktorij"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-maildir-store.c:666
+#: ../camel/providers/local/camel-maildir-store.c:1146
+#: ../camel/providers/local/camel-spool-store.c:212
+#: ../camel/providers/local/camel-spool-store.c:231
+#, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "Nisam mogao skenirati direktorij `%s': %s"
+msgstr "Nemoguće skenirati mapu '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:434
-#: ../camel/providers/local/camel-maildir-summary.c:553
+#: ../camel/providers/local/camel-maildir-summary.c:476
+#: ../camel/providers/local/camel-maildir-summary.c:616
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Ne mogu otvoriti putanju maildir direktorija: %s: %s"
+msgstr "Nemoguće otvoriti putanju maildir direktorija: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:546
+#: ../camel/providers/local/camel-maildir-summary.c:607
 msgid "Checking folder consistency"
-msgstr "Provjeravam dosljednost mape"
+msgstr "Provjeravanje dosljednosti mape"
 
-#: ../camel/providers/local/camel-maildir-summary.c:650
+#: ../camel/providers/local/camel-maildir-summary.c:707
 msgid "Checking for new messages"
-msgstr "Provjeravam za nove poruke"
+msgstr "Provjeravanje za nove poruke"
 
-#: ../camel/providers/local/camel-maildir-summary.c:736
-#: ../camel/providers/local/camel-mbox-summary.c:534
-#: ../camel/providers/local/camel-mbox-summary.c:714
-#: ../camel/providers/local/camel-mbox-summary.c:810
-#: ../camel/providers/local/camel-spool-summary.c:158
+#: ../camel/providers/local/camel-maildir-summary.c:810
+#: ../camel/providers/local/camel-mbox-summary.c:466
+#: ../camel/providers/local/camel-mbox-summary.c:687
+#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-spool-summary.c:139
 msgid "Storing folder"
-msgstr "Smiještam direktorij"
+msgstr "Smještanje mape"
 
-#: ../camel/providers/local/camel-mbox-folder.c:156
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:196
 #, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "Ne mogu zaključati  mapu %s: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:217
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Ne mogu otvoriti sandučić: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:278
-msgid "Mail append canceled"
-msgstr ""
+msgid "Cannot open mailbox: %s: "
+msgstr "Nemoguće otvoriti poštanski sandučić: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:262
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Ne mogu dodati poruku u mbox datoteku: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Nemoguće pridodati poruku u datoteku poštanskog sandučića: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:400
+#: ../camel/providers/local/camel-mbox-folder.c:392
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mapa izgleda nepopravljivo oštećena."
 
-#: ../camel/providers/local/camel-mbox-folder.c:408
-#: ../camel/providers/local/camel-mh-folder.c:224
-msgid "Message construction failed."
-msgstr "Sastavljanje poruke neuspjelo."
+#: ../camel/providers/local/camel-mbox-folder.c:449
+#: ../camel/providers/local/camel-spool-folder.c:67
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Nemoguće zaključati mapu %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:580
+#, c-format
 msgid "Cannot create a folder by this name."
-msgstr "Ne mogu stvoriti mapu s ovim imenom."
+msgstr "Nemoguće stvoriti mapu s ovim imenom."
+
+#: ../camel/providers/local/camel-mbox-store.c:433
+#, c-format
+msgid "Cannot get folder '%s': not a regular file."
+msgstr "Nemoguće dobiti mapu '%s': nije regularna datoteka."
+
+#: ../camel/providers/local/camel-mbox-store.c:596
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "Nemoguće stvoriti direktorij '%s': %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:608
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Nemoguće stvoriti mapu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:198
-#, fuzzy, c-format
-msgid "Cannot get folder '%s': not a regular file."
-msgstr "Ne mogu dohvatiti mapu `%s': nije obična datoteka"
+#: ../camel/providers/local/camel-mbox-store.c:610
+msgid "Folder already exists"
+msgstr "Mapa već postoji"
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:663
+#: ../camel/providers/local/camel-mbox-store.c:692
+#, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"isam mogao obrisati mapu `%s':\n"
+"Nemoguće obrisati mapu '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-store.c:673
+#, c-format
 msgid "'%s' is not a regular file."
-msgstr "`%s' nije regularna datoteka."
+msgstr "'%s' nije regularna datoteka."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-store.c:682
+#, c-format
 msgid "Folder '%s' is not empty. Not deleted."
-msgstr "Mapa `%s' nije prazna. Nije obrisana."
+msgstr "Mapa '%s' nije prazna. Nije obrisana."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mbox-store.c:709
+#: ../camel/providers/local/camel-mbox-store.c:724
+#, c-format
 msgid "Could not delete folder summary file '%s': %s"
-msgstr "Nisam mogao obrisati datoteku sažetka mape `%s': %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, fuzzy, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Ne mogu otvoriti direktorij  `%s': %s."
+msgstr "Nemoguće obrisati datoteku sažetka mape '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:806
 #, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Ne mogu stvoriti mapu: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "Mapa već postoji"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "Ime nove mape je neispravno."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
-#, fuzzy, c-format
-msgid "Could not rename '%s': '%s': %s"
-msgstr "Ne mogu preimenovati `%s': `%s': %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:822
 #, c-format
-msgid "Could not rename '%s' to %s: %s"
-msgstr "Ne mogu preimenovati  '%s' u %s: %s"
+msgid "Could not rename '%s': '%s': %s"
+msgstr "Nemoguće preimenovati '%s': '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:540
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "Nisam mogao otvoriti direktorij: %s: %s"
+msgstr "Nemoguće otvoriti mapu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:588
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Fatalna greška u obradi pošte na poziciji %ld u direktoriju %s"
-
-#: ../camel/providers/local/camel-mbox-summary.c:651
+#: ../camel/providers/local/camel-mbox-summary.c:611
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "Ne mogu provjeriti mapu: %s: %s"
+msgstr "Nemoguće provjeriti mapu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:719
-#: ../camel/providers/local/camel-mbox-summary.c:815
-#: ../camel/providers/local/camel-spool-summary.c:163
+#: ../camel/providers/local/camel-mbox-summary.c:696
+#: ../camel/providers/local/camel-mbox-summary.c:845
+#: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr "Nisam mogao otvoriti datoteku: %s: %s"
+msgstr "Nemoguće otvoriti datoteku: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:731
-#: ../camel/providers/local/camel-spool-summary.c:176
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-spool-summary.c:161
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "Ne mogu otvoriti privremeni sandučić: %s"
+msgstr "Nemoguće otvoriti privremeni sandučić: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:744
-#: ../camel/providers/local/camel-mbox-summary.c:920
+#: ../camel/providers/local/camel-mbox-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:967
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "Nisam mogao zatvoriti izvornu mapu%s: %s"
+msgstr "Nemoguće zatvoriti izvornu mapu%s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:753
+#: ../camel/providers/local/camel-mbox-summary.c:745
 #, c-format
 msgid "Could not close temporary folder: %s"
-msgstr ""
+msgstr "Nemoguće zatvoriti privremenu mapu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:768
+#: ../camel/providers/local/camel-mbox-summary.c:764
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "Nisam mogao preimenovati direktorij: %s"
+msgstr "Nemoguće preimenovati mapu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:826
-#: ../camel/providers/local/camel-mbox-summary.c:1050
+#: ../camel/providers/local/camel-mbox-summary.c:859
+#: ../camel/providers/local/camel-mbox-summary.c:1132
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "Nisam mogao spremiti direktorij: %s"
+msgstr "Nemoguće smjestiti mapu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:862
-#: ../camel/providers/local/camel-mbox-summary.c:870
-#: ../camel/providers/local/camel-mbox-summary.c:1080
-#: ../camel/providers/local/camel-mbox-summary.c:1088
-msgid "Summary and folder mismatch, even after a sync"
+#: ../camel/providers/local/camel-mbox-summary.c:898
+#: ../camel/providers/local/camel-mbox-summary.c:1172
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
 msgstr ""
+"MBOX datoteka je pokvarena, popravite ju. (Očekivano \"Iz retka\", ali nije "
+"dobijeno.)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:908
+#: ../camel/providers/local/camel-mbox-summary.c:1184
+#, c-format
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Neslaganje sažetka i mape, čak i nakon usklađenja"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1013
-#: ../camel/providers/local/camel-spool-summary.c:344
+#: ../camel/providers/local/camel-mbox-summary.c:1077
+#: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nepoznata greška: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1156
-#: ../camel/providers/local/camel-mbox-summary.c:1182
+#: ../camel/providers/local/camel-mbox-summary.c:1242
+#: ../camel/providers/local/camel-mbox-summary.c:1272
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
-msgstr ""
+msgstr "Pisanje u privremeni sandučić nije uspjelo: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1173
+#: ../camel/providers/local/camel-mbox-summary.c:1261
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
-msgstr ""
-
-#: ../camel/providers/local/camel-mh-folder.c:176
-msgid "MH append message canceled"
-msgstr ""
+msgstr "Pisanje u privremeni sandučić nije uspjelo: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../camel/providers/local/camel-mh-folder.c:116
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Ne mogu dodati poruku u mh mapu: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Nemoguće pridodati poruku u mh mapu: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mh-store.c:542
+#, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "Nisam mogao napraviti mapu `%s':%s"
+msgstr "Nemoguće stvoriti mapu '%s': %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-mh-store.c:558
+#, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "Ne mogu dohvatiti mapu: %s: nije direktorij."
+msgstr "Nemoguće dobiti mapu '%s': nije direktorij."
 
-#: ../camel/providers/local/camel-mh-summary.c:248
+#: ../camel/providers/local/camel-mh-summary.c:236
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "Ne mogu otvoriti putanju MH direktorija: %s: %s"
+msgstr "Nemoguće otvoriti putanju MH direktorija: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-store.c:95
+#, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "Spool `%s' se ne može otvoriti: %s"
+msgstr "Spool '%s' se ne može otvoriti: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-store.c:109
+#, c-format
 msgid "Spool '%s' is not a regular file or directory"
-msgstr "Spool `%s' nije regularna datoteka ili direktorij"
+msgstr "Spool '%s' nije regularna datoteka ili direktorij"
+
+#: ../camel/providers/local/camel-spool-store.c:425
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Spool datoteka pošte %s"
+
+#: ../camel/providers/local/camel-spool-store.c:429
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "Stablo spool direktorija %s"
+
+#: ../camel/providers/local/camel-spool-store.c:432
+msgid "Invalid spool"
+msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:166
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-store.c:481
+#, c-format
 msgid "Folder '%s/%s' does not exist."
-msgstr "Mapa `%s/%s' ne postoji."
+msgstr "Mapa '%s/%s' ne postoji."
 
-#: ../camel/providers/local/camel-spool-store.c:176
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-store.c:494
+#, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"Nisam mogao otvoriti direktorij `%s':\n"
+"Nemoguće otvoriti mapu '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-store.c:500
+#, c-format
 msgid "Folder '%s' does not exist."
-msgstr "Mapa `%s' ne postoji."
+msgstr "Mapa '%s' ne postoji."
 
-#: ../camel/providers/local/camel-spool-store.c:185
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-store.c:508
+#, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"Nisam mogao napraviti mapu `%s':\n"
+"Nemoguće stvoriti mapu '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-store.c:521
+#, c-format
 msgid "'%s' is not a mailbox file."
-msgstr "`%s' nije mailbox datoteka."
+msgstr "'%s' nije datoteka poštanskog sandučića"
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:585
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Spremnik ne podržava INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:604
 #, c-format
-msgid "Spool mail file %s"
-msgstr "Spool datoteka pošte %s"
+msgid "Spool folders cannot be deleted"
+msgstr "Spool mape se ne mogu brisati"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:619
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "Lista spool direktorija %s"
-
-#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
-msgstr "Spool direktoriji se ne mogu preimenovati"
-
-#: ../camel/providers/local/camel-spool-store.c:238
-msgid "Spool folders cannot be deleted"
-msgstr "Spool direktoriji se ne mogu brisati"
+msgstr "Spool mape se ne mogu preimenovati"
 
+#: ../camel/providers/local/camel-spool-summary.c:177
 #: ../camel/providers/local/camel-spool-summary.c:189
-#: ../camel/providers/local/camel-spool-summary.c:199
-#: ../camel/providers/local/camel-spool-summary.c:209
+#: ../camel/providers/local/camel-spool-summary.c:201
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "Nisam mogao sinkronizirati privremenu mapu %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "Nemoguće uskladiti privremenu mapu %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:225
+#: ../camel/providers/local/camel-spool-summary.c:219
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Nisam mogao sinhronizirati spool direktorij %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "Nemoguće uskladiti spool mapu %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:256
-#: ../camel/providers/local/camel-spool-summary.c:273
-#: ../camel/providers/local/camel-spool-summary.c:284
-#, fuzzy, c-format
+#: ../camel/providers/local/camel-spool-summary.c:253
+#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:285
+#, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"Nisam mogao sinkronizirat spool mapu%s: %s\n"
-"Direktorij je možda oštećen, kopirajte sačuvano u `%s'"
+"Nemoguće uskladiti spool mapu %s: %s\n"
+"Mapa je možda pokvarena, kopija spremljena u '%s'"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:176
-#: ../camel/providers/nntp/camel-nntp-folder.c:208
+#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:595
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
-msgstr ""
+msgstr "Unutarnja greška: UID u neispravnom obliku: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:297
+#: ../camel/providers/nntp/camel-nntp-folder.c:302
+#: ../camel/providers/pop3/camel-pop3-folder.c:574
+#: ../camel/providers/pop3/camel-pop3-folder.c:1002
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Nemoguće dobiti poruku %s: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:309
+#: ../camel/providers/nntp/camel-nntp-folder.c:629
+#: ../camel/providers/pop3/camel-pop3-folder.c:478
+#: ../camel/providers/pop3/camel-pop3-folder.c:510
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:564
+#: ../camel/providers/pop3/camel-pop3-folder.c:583
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "Nemoguće dobiti poruku %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:330
-#: ../camel/providers/nntp/camel-nntp-folder.c:333
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
-#: ../camel/providers/nntp/camel-nntp-folder.c:377
+#: ../camel/providers/nntp/camel-nntp-folder.c:435
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Posting failed: %s"
-msgstr "Neuspjelo slanje: %s"
+msgstr "Neuspjelo slanje odgovora: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:508
+msgid "Posting failed: "
+msgstr "Neuspjelo slanje odgovora: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:395
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "Ne možete slati NNTP poruke prilikom neumreženog rada!"
+#: ../camel/providers/nntp/camel-nntp-folder.c:618
+#, c-format
+msgid "This message is not currently available"
+msgstr "Ova poruka je trenutno nedostupna"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:406
-msgid "You cannot copy messages from a NNTP folder!"
-msgstr "Ne možete kopirati poruke iz NNTP mape!"
+#: ../camel/providers/nntp/camel-nntp-folder.c:727
+#, c-format
+msgid "You cannot copy messages from a NNTP folder"
+msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:45
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
+msgstr "_Pokazuj mape u kraticama (npr. c.o.linux, a ne comp.os.linux)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
-msgstr ""
+msgstr "U _dijalogu pretplate, pokazuj relativna imena mape"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:54
+msgid "Default NNTP port"
+msgstr "Zadani NNTP port"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:55
+msgid "NNTP over SSL"
+msgstr "NNTP putem SSL-a"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
 msgstr "USENET vijesti"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr ""
 "Ovo je pružatelj usluga za čitanje USENET grupa i slanje poruka na iste."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+msgid ""
+"This option will connect to the NNTP server anonymously, without "
+"authentication."
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:94
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "Prijava na NNTP server korištenjem lozinke u čistom tekstu."
+msgstr "Prijava na NNTP poslužitelj korištenjem lozinke u čistom tekstu."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Nisam mogao pročitati pozdrav od %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Nemoguće pročitati pozdrav od %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:378
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP server %s je uzvratio kodom o grešci %d: %s"
+msgstr "NNTP poslužitelj %s je uzvratio kodom o grešci %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:448
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET vijesti preko %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:798
+#: ../camel/providers/nntp/camel-nntp-store.c:1185
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4269,7 +4119,27 @@
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:892
+#: ../camel/providers/nntp/camel-nntp-store.c:1301
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+"Ne možete stvoriti mapu u spremniku \"Vijesti\": umjesto toga otkažite "
+"pretplatu."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1317
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "Ne možete preimenovati mapu u spremniku \"Vijesti\""
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1340
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+"Ne možete ukloniti mapu u spremniku \"Vijesti\": umjesto toga otkažite "
+"pretplatu"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1550
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4279,7 +4149,8 @@
 "\n"
 "Ta grupa ne postoji. Odabrana stavka je vjerojatno nadređena mapa."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:924
+#: ../camel/providers/nntp/camel-nntp-store.c:1617
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4289,1128 +4160,1442 @@
 "\n"
 "grupa ne postoji!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:949
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"Ne možete stvoriti mapu u pohrani USENET poruka: umjesto toga otkažite "
-"pretplatu."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:957
-msgid "You cannot rename a folder in a News store."
-msgstr "Ne možete ukloniti mapu u spremištu USENET poruka."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:965
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"Ne možete ukloniti mapu u spremištu USENET poruka: otkažite pretplatu "
-"umjesto toga."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1154
-msgid "Authentication requested but no username provided"
-msgstr "Autentifikacija obavezna, ali nije dano korisničko ime"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1166
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Nije moguća prijava na poslužitelj: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:2043
+msgid "NNTP Command failed: "
+msgstr "Neuspješna NNTP naredba: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:2141
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komanda nije uspjela: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
 msgid "Not connected."
-msgstr "Nisam spojen."
+msgstr "Nije spojen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:2235
 #, c-format
 msgid "No such folder: %s"
 msgstr "Nema takve mape: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:273
-#: ../camel/providers/nntp/camel-nntp-summary.c:369
+#: ../camel/providers/nntp/camel-nntp-summary.c:197
+#: ../camel/providers/nntp/camel-nntp-summary.c:337
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: Tražim nove poruke"
+msgstr "%s: Skeniranje novih poruka"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:280
+#: ../camel/providers/nntp/camel-nntp-summary.c:219
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "Neočekivani odgovor prilikom XOVER naredbe: %s"
+msgstr "Neočekivani odgovor poslužitelja od xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:383
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "Unexpected server response from head: %s"
-msgstr "Neočekivani odgovor poslužitelja od HEAD: %s"
+msgstr "Neočekivani odgovor poslužitelja od head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:423
-msgid "Use cancel"
-msgstr "Koristite poništi"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:425
+#: ../camel/providers/nntp/camel-nntp-summary.c:406
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspjela operacija: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
-msgid "Retrieving POP summary"
-msgstr "Preuzimam POP sažetak"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "Ne mogu dobiti POP sažetak: %s"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:312
-msgid "Expunging old messages"
-msgstr ""
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:320
-msgid "Expunging deleted messages"
-msgstr "Nepročitana poruka"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:357
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
 #, c-format
 msgid "No message with UID %s"
-msgstr ""
+msgstr "Nema poruke s UID-om %s"
 
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:541
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr "Preuzimam POP poruke (%d)"
+msgstr "Preuzimanje POP poruke (%d)"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-folder.c:644
+msgid "Retrieving POP summary"
+msgstr "Preuzimanje POP sažetka"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:703
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#: ../camel/providers/pop3/camel-pop3-folder.c:719
+#: ../camel/providers/pop3/camel-pop3-folder.c:732
+#: ../camel/providers/pop3/camel-pop3-folder.c:746
+msgid "Cannot get POP summary: "
+msgstr "Nije moguće dobiti POP sažetak: "
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:811
+msgid "Expunging old messages"
+msgstr "Čišćenje starih poruka"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:839
+msgid "Expunging deleted messages"
+msgstr "Čišćenje izbrisanih poruka"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:36
+msgid "Message Storage"
+msgstr "Spremište poruke"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:38
 msgid "_Leave messages on server"
-msgstr ""
+msgstr "_Ostavi poruke na poslužitelju"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#. Translators: '%s' is replaced with a widget, where user can
+#. * select how many days can be message left on the server.
+#: ../camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 msgid "_Delete after %s day(s)"
-msgstr ""
+msgstr "_Obriši nakon %s dan(a)"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
+msgid "Delete _expunged from local Inbox"
+msgstr "Obriši _obrisano iz lokalne dolazne pošte"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Disable _support for all POP3 extensions"
-msgstr ""
+msgstr "Onemogući _podršku za sva POP3 proširenja"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:52
+msgid "Default POP3 port"
+msgstr "Zadani POP3 port"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
+msgid "POP3 over SSL"
+msgstr "POP3 putem SSL-a"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "Za povezivanje i preuzimanje pošte sa POP servera."
+msgstr "Za povezivanje i preuzimanje pošte sa POP poslužitelja."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"Spajanje na POP poslužitelj korištenjem lozinke u čistim tekstom. Ovo je "
+"Spajanje na POP poslužitelj korištenjem lozinke u čistom tekstom. Ovo je "
 "jedini način prijenosa kojeg podržavaju mnogi POP poslužitelji."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"Spajanje na POP poslužitelj korištenjem enkriptirane lozinke preko APOP "
-"protokola.Možda neće raditi svim korisnicima, čak i sa poslužiteljma koji "
+"Spajanje na POP poslužitelj korištenjem šifrirane lozinke preko APOP "
+"protokola. Možda neće raditi svim korisnicima, čak i na poslužiteljma koji "
 "tvrde da to podržavaju."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:208
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:95
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:162
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Neuspješno čitanje ispravnog pozdrava POP poslužitelja %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:225
-#: ../camel/providers/pop3/camel-pop3-store.c:239
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#: ../camel/providers/pop3/camel-pop3-store.c:177
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Nisam se mogao povezati na POP server %s u sigurnosnom načinu rada: %s"
+msgstr ""
+"Neuspjelo povezivanje na POP poslužitelj %s u sigurnosnom načinu rada: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
+#: ../camel/providers/pop3/camel-pop3-store.c:178
 msgid "STLS not supported by server"
-msgstr ""
+msgstr "Poslužitelj ne podržava STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:256
-msgid "TLS is not available in this build"
-msgstr ""
+#. Translators: Last %s is an optional
+#. * explanation beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "Neuspješno povezivanje na POP poslužitelj %s u sigurnom načinu %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Nisam se mogao povezati na POP server %s"
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "Neuspjelo povezivanje na POP poslužitelj %s u sigurnom načinu rada: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:403
-#: ../camel/providers/pop3/camel-pop3-store.c:536
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
-"Nisam mogao da se povežem na POP poslužitelj %s: Traženi mehanizam prijave "
-"nije podržan."
+"Nemoguće se prijaviti na POP poslužitelj %s: greška kod SASL protokola"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:419
-#, fuzzy, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "SASL `%s' prijava neuspela na POP poslužitelj %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:379
+#, c-format
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Neuspješna ovjera na POP poslužitelj %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:431
+#: ../camel/providers/pop3/camel-pop3-store.c:487
 #, c-format
-msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "Ne mogu se prijaviti na POP server %s: greška kod SASL protokola"
+msgid "POP3 server %s"
+msgstr "POP3 poslužitelj %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:450
+#: ../camel/providers/pop3/camel-pop3-store.c:490
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Nisam se mogao prijaviti na POP server %s: %s"
+msgid "POP3 server for %s on %s"
+msgstr "POP3 poslužitelj za %s na %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:509
+#: ../camel/providers/pop3/camel-pop3-store.c:702
+#: ../camel/providers/pop3/camel-pop3-store.c:715
+#: ../camel/providers/pop3/camel-pop3-store.c:797
 #, c-format
 msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
+"Unable to connect to POP server %s.\n"
+"Error sending password: "
 msgstr ""
+"Neuspjelo povezivanje na POP poslužitelj %s.\n"
+"Greška pri slanju lozinke: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:550
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:742
 #, c-format
 msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
 msgstr ""
-"Nisam mogao da se povežem na POP poslužitelj %s.\n"
-"Greška kod slanja zaporke: %s"
+"Nemoguće spajanje na POP poslužitelj %s:\tPrimljen neispravan APOP ID. Možda "
+"se dogodio napad nepoznate osobe. Kontaktirajte svog administratora."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:557
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:812
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
-"Ne mogu se povezati na POP poslužitelj %s.\n"
-"Greška pri slanju korisničkog imena: %s"
+"Neuspjelo spajanje na POP poslužitelj %s.\n"
+"Greška pri slanju korisničkog imena%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:663
-#, fuzzy, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:896
+#, c-format
 msgid "No such folder '%s'."
-msgstr "Nema takve mape `%s'."
+msgstr "Nema takve mape '%s'"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:913
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 spremnici nemaju hijerarhiju mapa"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
+#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "Za dostavu pošte prosljeđivanjem \"sendmail\" programu na lokalnom sustavu."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
+msgid "Mail delivery via the sendmail program"
+msgstr "Dostava pošte preko programa sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:137
+#, c-format
+msgid "Failed to read From address"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:154
+#, c-format
+msgid "Message send in offline mode is disabled"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "Nisam mogao obraditi popis primatelja"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:199
 #, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Nisam mogao napraviti cjevovod na sendmail: %s: poruka nije poslana"
+msgid "Could not parse arguments"
+msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:230
 #, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Ne mogu forkati sendmail: %s: poruka nije poslana"
+msgid "Could not create pipe to '%s': %s: mail not sent"
+msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
 #, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail je završio signalom %s: poruka nije poslana"
+msgid "Could not fork '%s': %s: mail not sent"
+msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Nisam mogao izvršiti %s: poruka nije poslana"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:304
+msgid "Could not send message: "
+msgstr "Nemoguće slanje poruke: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:334
 #, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail je završio sa statusom %d: poruka nije poslana"
+msgid "'%s' exited with signal %s: mail not sent."
+msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "sendmail"
-msgstr "sendmail"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:344
+#, c-format
+msgid "Could not execute '%s': mail not sent."
+msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
-msgid "Mail delivery via the sendmail program"
-msgstr "Dostava pošte preko programa sendmail"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:349
+#, c-format
+msgid "'%s' exited with status %d: mail not sent."
+msgstr ""
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:39
+msgid "Default SMTP port"
+msgstr "Zadani SMTP port"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
+msgid "SMTP over SSL"
+msgstr "SMTP putem SSL-a"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
+msgid "Message submission port"
+msgstr "Port predaje poruka"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:47
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:49
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Za dostavu pošte povezivanjem na udaljeni mailhub, korištenjem SMTP-a."
+msgstr ""
+"Za dostavu pošte povezivanjem na udaljeni mailhub, korištenjem SMTP-a."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
+msgid "Welcome response error: "
+msgstr "Greška u odgovoru na pozdrav: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+"Nisam se mogao povezati na SMTP server %s u sigurnosnom načinu rada: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:289
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:309
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS naredba neuspješna: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:328
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr ""
+"Neuspjelo povezivanje na SMTP poslužitelj %s u sigurnom načinu rada: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP poslužitelj %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:442
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP dostava pošte preko %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:574
+#, c-format
+msgid "SMTP server %s does not support %s authentication"
+msgstr ""
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:655
+#, c-format
+msgid "No SASL mechanism was specified"
+msgstr ""
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:691
+msgid "AUTH command failed: Not connected."
+msgstr ""
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:698
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
+msgid "AUTH command failed: "
+msgstr "AUTH naredba neuspješna: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:880
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "Nemoguće poslati poruku: nema veze s uslugom.."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "Nemoguće poslati poruku: adresa pošiljatelja nije ispravna."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
+msgid "Sending message"
+msgstr "Slanje poruke"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:922
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "Nemoguće poslati poruku: nisu određeni primatelji."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:937
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "Nemoguće poslati poruku: jedan ili više neispravnih primatelja"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1069
 msgid "Syntax error, command unrecognized"
-msgstr "Greška u sintaksi, naredbs neprepoznata"
+msgstr "Greška u sintaksi, naredba neprepoznata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:1071
 msgid "Syntax error in parameters or arguments"
 msgstr "Greška u sintaksi u parametrima ili argumentima"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:1073
 msgid "Command not implemented"
 msgstr "Naredba nije ostvarena"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:1075
 msgid "Command parameter not implemented"
 msgstr "Parametar naredbe nije ostvaren"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1077
 msgid "System status, or system help reply"
 msgstr "Status sustava, ili odgovor na pomoć"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:1079
 msgid "Help message"
 msgstr "Poruka o pomoći"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "Service ready"
 msgstr "Servis spreman"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:1083
 msgid "Service closing transmission channel"
 msgstr "Servis zatvara prijenosni kanal"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:1085
 msgid "Service not available, closing transmission channel"
 msgstr "Servis nije dostupan, zatvaram prijenosni kanal"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:1087
 msgid "Requested mail action okay, completed"
 msgstr "Tražena akcija za poštu u redu, gotovo"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:1089
 msgid "User not local; will forward to "
 msgstr "Korisnik nije lokalan; proslijediću na "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:1091
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Tražena akcija za poštu nije napravljena: nedostupan sandučić"
+msgstr "Tražena radnja za poštu nije napravljena: nedostupan sandučić"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "Tražena akcija nije napravljena: nedostupan sandučić"
+msgstr "Tražena radnja nije napravljena: nedostupan sandučić"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "Requested action aborted: error in processing"
-msgstr "Tražena akcija nije napravljena: greška u obradi"
+msgstr "Tražena radnja nije napravljena: greška u obradi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
 msgid "User not local; please try "
-msgstr "Korisnik nije lokalan; molim pokušajte "
+msgstr "Korisnik nije lokalan; pokušajte "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Tražena akcija nije napravljena: nedovoljno prostora na računalu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Odustato od tražene akcije za poštu: premašen dodeljen prostor"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1101
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr "Tražena poštanska radnja otkazana: dodijeljeni prostor premašen"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1103
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr "Tražena radnja nije napravljena: ime sandučića nije dozvoljeno"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1105
+msgid "Start mail input; end with ."
+msgstr "Počni unos pošte; završava sa ."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+msgid "Transaction failed"
+msgstr "Prijenos neuspješan"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1111
+msgid "A password transition is needed"
+msgstr "Potrebna je izmjena lozinke"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1113
+msgid "Authentication mechanism is too weak"
+msgstr "Mehanizam ovjere je preslab"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+msgid "Encryption required for requested authentication mechanism"
+msgstr "Obavezno šifriranje za traženi mehanizam ovjere"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1117
+msgid "Temporary authentication failure"
+msgstr "Neuspjela privremena ovjera"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1407
+msgid "SMTP Greeting"
+msgstr "SMTP pozdrav"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1416
+#: ../camel/providers/smtp/camel-smtp-transport.c:1429
+#: ../camel/providers/smtp/camel-smtp-transport.c:1436
+msgid "HELO command failed: "
+msgstr "HELO naredba neuspješna: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
+#: ../camel/providers/smtp/camel-smtp-transport.c:1526
+#: ../camel/providers/smtp/camel-smtp-transport.c:1535
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM naredba neuspješna: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1563
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO naredba neuspješna: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1588
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> neuspješno: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1660
+#: ../camel/providers/smtp/camel-smtp-transport.c:1671
+#: ../camel/providers/smtp/camel-smtp-transport.c:1682
+#: ../camel/providers/smtp/camel-smtp-transport.c:1744
+#: ../camel/providers/smtp/camel-smtp-transport.c:1762
+#: ../camel/providers/smtp/camel-smtp-transport.c:1775
+#: ../camel/providers/smtp/camel-smtp-transport.c:1783
+msgid "DATA command failed: "
+msgstr "DATA naredba neuspješna: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1809
+#: ../camel/providers/smtp/camel-smtp-transport.c:1823
+#: ../camel/providers/smtp/camel-smtp-transport.c:1831
+msgid "RSET command failed: "
+msgstr "REST naredba neuspješna: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1857
+#: ../camel/providers/smtp/camel-smtp-transport.c:1869
+#: ../camel/providers/smtp/camel-smtp-transport.c:1875
+msgid "QUIT command failed: "
+msgstr "QUIT naredba neuspješna: "
+
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+msgid "Contact UID of a user"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Tražena akcija nije napravljena: ime sandučića nije dozvoljeno"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
-msgid "Start mail input; end with ."
-msgstr "Počni unos pošte; završava sa ."
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
-msgid "Transaction failed"
-msgstr "Prijenos neuspješan"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
-msgid "A password transition is needed"
-msgstr "Potrebna je izmjena lozinke"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
-msgid "Authentication mechanism is too weak"
-msgstr "Mehanizam autentifikacije je preslab"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
-msgid "Encryption required for requested authentication mechanism"
-msgstr "Obavezno šifriranje za traženi mehanizam prijave"
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
+msgid "Whether the migration of old setting was already done"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
-msgid "Temporary authentication failure"
-msgstr "Neuspjela privremena prijava"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "(Deprecated) Proxy type to use"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "Greška kod odgovora dobrodošlice"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"This key was deprecated in version 3.12 and should no longer be used. Proxy "
+"settings are now integrated into Evolution-Data-Server's account system. See "
+"the ESourceProxy API documentation for details."
 msgstr ""
-"Nisam se mogao povezati na SMTP server %s u sigurnosnom načinu rada: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Greška kod izvršavanja naredbe STARTTLS: %s"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "(Deprecated) Whether to use http-proxy"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "Greška kod izvršavanja naredbe STARTTLS"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "(Deprecated) Whether proxy server requires authentication"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP poslužitelj %s ne podržava traženi tip autorizacije (%s)."
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "(Deprecated) Host name for HTTP requests"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:564
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "(Deprecated) Port number for HTTP requests"
 msgstr ""
-"Ne mogu da se prijavim na SMTP poslužitelj.\n"
-"%s\n"
-"\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:697
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP poslužitelj %s"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "(Deprecated) Proxy authentication user name"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP dostava pošte preko %s"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "(Deprecated) Proxy authentication password"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
-msgid "Cannot send message: service not connected."
-msgstr "Ne mogu poslati poruku: nema veze sa servisom.."
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "(Deprecated) List of hosts to connect to without proxy"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
-msgid "Cannot send message: sender address not valid."
-msgstr "Ne mogu poslati poruku: adresa pošiljatelja nije ispravna."
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "(Deprecated) Host name for HTTPS requests"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
-msgid "Sending message"
-msgstr "Slanje poruke"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "(Deprecated) Port number for HTTPS requests"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:742
-msgid "Cannot send message: no recipients defined."
-msgstr "Ne mogu poslati poruku: nisu određeni primatelji."
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "(Deprecated) Host name for SOCKS requests"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "Ne mogu poslati poruku: jedan ili više neispravnih primatelja"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "(Deprecated) Port number for SOCKS requests"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:982
-msgid "SMTP Greeting"
-msgstr "SMTP pozdrav"
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "(Deprecated) Automatic proxy configuration URL"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+#: ../libebackend/e-collection-backend.c:976
 #, c-format
-msgid "HELO command failed: %s"
-msgstr "Greška kod izvršavanja naredbe HELO: %s"
+msgid "%s does not support creating remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1024
-msgid "HELO command failed"
-msgstr "Greška kod izvršavanja naredbe HELO"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1090
-msgid "SMTP Authentication"
-msgstr "SMTP prijava"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1096
-msgid "Error creating SASL authentication object."
-msgstr "Greška kod stvaranja objekta SASL prijave."
+#: ../libebackend/e-collection-backend.c:1035
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
-#: ../camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../libebackend/e-data-factory.c:1292
 #, c-format
-msgid "AUTH command failed: %s"
-msgstr "Greška kod izvršavanja naredbe AUTH: %s"
+msgid "Backend factory for source '%s' and extension '%s' cannot be found."
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1130
-msgid "AUTH command failed"
-msgstr "Greška kod izvršavanja naredbe AUTH"
+#: ../libebackend/e-server-side-source.c:141
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1200
-msgid "Bad authentication response from server.\n"
-msgstr "Neispravan odgovor autentifikacije od servera.\n"
+#: ../libebackend/e-server-side-source.c:466
+msgid "Failed to lookup credentials: "
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1227
+#: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
 #, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Greška kod izvršavanja naredbe MAIL FROM: %s: poruka nije poslana"
+msgid "Data source '%s' does not support creating remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1244
-msgid "MAIL FROM command failed"
-msgstr "Greška kod izvršavanja naredbe MAIL FROM"
+#: ../libebackend/e-server-side-source.c:1405
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to create the remote resource"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+#: ../libebackend/e-server-side-source.c:1433 ../libedataserver/e-source.c:1708
 #, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Greška kod izvršavanja naredbe RCPT TO: %s: poruka nije poslana"
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1287
+#: ../libebackend/e-server-side-source.c:1447
 #, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> neuspelo"
+msgid ""
+"Data source '%s' has no collection backend to delete the remote resource"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
-#: ../camel/providers/smtp/camel-smtp-transport.c:1396
-#: ../camel/providers/smtp/camel-smtp-transport.c:1415
+#: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
 #, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Greška kod izvršavanja naredbe DATA: %s: poruka nije poslana"
+msgid "Data source '%s' does not support OAuth 2.0 authentication"
+msgstr ""
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1344
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
-msgid "DATA command failed"
-msgstr "Greška kod izvršavanja naredbe DATA"
+#: ../libebackend/e-server-side-source.c:1856
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1454
+#: ../libebackend/e-source-registry-server.c:319
 #, c-format
-msgid "RSET command failed: %s"
-msgstr "Greška kod izvršavanja naredbe RSET: %s"
+msgid "UID '%s' is already in use"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1470
-msgid "RSET command failed"
-msgstr "Greška kod izvršavanja naredbe RSET"
+#: ../libebackend/e-subprocess-factory.c:285
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../libebackend/e-user-prompter-server.c:305
 #, c-format
-msgid "QUIT command failed: %s"
-msgstr "Greška kod izvršavanja naredbe QUIT: %s"
+msgid "Extension dialog '%s' not found."
+msgstr ""
+
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "Godišnjica"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
-msgid "QUIT command failed"
-msgstr "Greška kod izvršavanja naredbe QUIT"
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "Rođendan"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "Posao"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
 msgid "Competition"
-msgstr "Konkurencija"
+msgstr "Natjecanje"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
 msgid "Favorites"
-msgstr "Zabilješke"
+msgstr "Favoriti"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Pokloni"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
-msgstr "Planovi/Ciljevi"
+msgstr "Planovi/ciljevi"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:56
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Praznik"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
 msgid "Holiday Cards"
-msgstr "Čestitke"
+msgstr "Razglednice"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Važni kontakti"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideje"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
 msgid "International"
-msgstr "Međunarodno"
+msgstr "Međunarodni"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
 msgid "Key Customer"
-msgstr "Ključni korisnik"
+msgstr "Ključni klijent"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:64
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Osobno"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Telefonski pozivi"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "Stanje"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategije"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Dobavljači"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Vrijeme i troškovi"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:71
+msgctxt "CategoryName"
 msgid "VIP"
-msgstr "Važne osobe"
+msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:72
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Čekanje"
 
+#: ../libedataserver/e-client.c:146
+msgid "Source not loaded"
+msgstr "Izvor nije učitan"
+
+#: ../libedataserver/e-client.c:148
+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:159
+msgid "Offline unavailable"
+msgstr "Rad van mreže nije dostupan"
+
+#: ../libedataserver/e-client.c:181
+msgid "D-Bus error"
+msgstr "D-Bus greška"
+
+#: ../libedataserver/e-client.c:2023
+msgid "Timeout was reached"
+msgstr ""
+
+#: ../libedataserver/e-source.c:771
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr ""
+
+#: ../libedataserver/e-source.c:1375
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr ""
+
+#: ../libedataserver/e-source.c:1498
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr ""
+
+#: ../libedataserver/e-source.c:2194
+msgid "Unnamed"
+msgstr ""
+
+#: ../libedataserver/e-source-credentials-provider-impl.c:41
+msgid "Credentials lookup is not supported"
+msgstr ""
+
+#: ../libedataserver/e-source-credentials-provider-impl.c:54
+msgid "Credentials store is not supported"
+msgstr ""
+
+#: ../libedataserver/e-source-credentials-provider-impl.c:65
+msgid "Credentials delete is not supported"
+msgstr ""
+
+#: ../libedataserver/e-source-credentials-provider-impl-password.c:81
+msgid "Password not found"
+msgstr ""
+
+#: ../libedataserver/e-source-mail-signature.c:481
+#, c-format
+msgid "Signature script must be a local file"
+msgstr ""
+
+#: ../libedataserver/e-source-proxy.c:1641
+#, c-format
+msgid "Source '%s' does not support proxy lookups"
+msgstr ""
+
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1692 ../libedataserver/e-time-utils.c:1991
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y. %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1982
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
+#. * 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:1654 ../libedataserver/e-time-utils.c:1907
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1702 ../libedataserver/e-time-utils.c:1987
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
+#. * 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:1659 ../libedataserver/e-time-utils.c:1898
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1978
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%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:1664
+#. * in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1712
 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:1669
+#. * in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1717
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1720 ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1973
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1727
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1731
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1736
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1741
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1746
 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:1704
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1751
 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:1707 ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1754 ../libedataserver/e-time-utils.c:1843
 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:1834 ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1914 ../libedataserver/e-time-utils.c:2035
 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:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1918 ../libedataserver/e-time-utils.c:2027
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1923 ../libedataserver/e-time-utils.c:2032
 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:1847 ../libedataserver/e-time-utils.c:1945
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1927 ../libedataserver/e-time-utils.c:2024
 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:1850
+#. strptime format for time of day, without seconds 24-hour format,
+#. * and no colon.
+#: ../libedataserver/e-time-utils.c:1931
 msgid "%H%M"
-msgstr ""
+msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1935
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimno pristupanje LDAP poslužitelju"
-
-#: ../libedataserverui/e-book-auth-util.c:192
-msgid "Failed to authenticate.\n"
-msgstr "Neuspjela prijava.\n"
-
-#: ../libedataserverui/e-categories-dialog.c:261
+#: ../libedataserver/e-webdav-discover.c:468
+#: ../libedataserver/e-webdav-discover.c:477
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "Već postoji kategorija ’%s‘. Izaberite drugo ime"
+msgid "HTTP Error: %s"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.c:466
-msgid "Icon"
+#: ../libedataserver/e-webdav-discover.c:507
+msgid "Could not parse response"
 msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.c:471
-msgid "Category"
-msgstr "Kategorija"
+#: ../libedataserver/e-webdav-discover.c:516
+msgid "Empty response"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "Ikona kategorije"
+#: ../libedataserver/e-webdav-discover.c:524
+msgid "Unexpected reply from server"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "Postavke kategorije"
+#: ../libedataserverui/e-credentials-prompter.c:259
+#: ../libedataserverui/e-credentials-prompter.c:1561
+#: ../libedataserverui/e-credentials-prompter.c:1605
+msgid "Credentials prompt was cancelled"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "_Ikona kategorije"
+#: ../libedataserverui/e-credentials-prompter.c:663
+#, c-format
+msgid "Source '%s' doesn't support prompt for credentials"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "_Ime kategorije"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:133
+msgid "Address book authentication request"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "_Stavke koje pripadaju ovim kategorijama:"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:138
+msgid "Calendar authentication request"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
-msgid "_Available Categories:"
-msgstr "Dostupn_e kategorije"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:142
+msgid "Mail authentication request"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
-msgid "_Edit"
-msgstr "_Uredi"
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:145
+msgid "Authentication request"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "kategorije"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:156
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:272
-msgid "Select Contacts from Address Book"
-msgstr "Odabir kontakata iz adresara"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:160
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:559
-msgid "_Add"
-msgstr "_Dodaj"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:164
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:584
-msgid "_Remove"
-msgstr "_Ukloni"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:168
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.c:761
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-msgid "Any Category"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:172
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
 msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:176
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "Co_ntacts"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:180
+#, c-format
+msgid "Please enter the password for account \"%s\"."
 msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "Show Contacts"
-msgstr "Pokaži kontakte"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:229
+#: ../libedataserverui/e-trust-prompt.c:114
+#: ../libedataserverui/e-webdav-discover-widget.c:1063
+msgid "_Cancel"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:230
+#: ../libedataserverui/e-webdav-discover-widget.c:1064
+msgid "_OK"
 msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
-msgid "Address Book"
-msgstr "Adresar"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:340
+msgid "_User Name:"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-msgid "Cate_gory:"
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:352
+msgid "_Password:"
 msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
-msgid "Contacts"
-msgstr "Kontakti"
+#. Remember password check
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:368
+msgid "_Add this password to your keyring"
+msgstr "_Dodajte ovu lozinku u vaš skup ključeva"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "Traži"
+#: ../libedataserverui/e-trust-prompt.c:113
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
+msgid "Certificate trust..."
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "_Traži:"
+#: ../libedataserverui/e-trust-prompt.c:115
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
+msgid "_Reject"
+msgstr ""
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2369
-#, c-format
-msgid "E_xpand %s Inline"
-msgstr "_Proširi %s u liniji"
+#: ../libedataserverui/e-trust-prompt.c:116
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
+msgid "Accept _Temporarily"
+msgstr ""
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2384
-#, c-format
-msgid "Cop_y %s"
+#: ../libedataserverui/e-trust-prompt.c:117
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
+msgid "_Accept Permanently"
 msgstr ""
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2394
+#: ../libedataserverui/e-trust-prompt.c:188
+#: ../modules/trust-prompt/trust-prompt-gtk.c:159
 #, c-format
-msgid "C_ut %s"
+msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
 msgstr ""
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2411
-#, c-format
-msgid "_Edit %s"
-msgstr "_Uredi %s"
+#: ../libedataserverui/e-trust-prompt.c:210
+#: ../modules/trust-prompt/trust-prompt-gtk.c:174
+msgid "Reason:"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-list.c:466
-#, c-format
-msgid "_Delete %s"
-msgstr "_Obriši %s"
+#: ../libedataserverui/e-trust-prompt.c:213
+msgid "Detailed error:"
+msgstr ""
 
-#: ../libedataserverui/e-passwords.c:218
-msgid "Keyring key is unusable: no user or host name"
+#: ../libedataserverui/e-trust-prompt.c:275
+#: ../modules/trust-prompt/module-trust-prompt.c:82
+msgid "The signing certificate authority is not known."
 msgstr ""
 
-#: ../libedataserverui/e-passwords.c:1055
-msgid "You have the Caps Lock key on."
+#: ../libedataserverui/e-trust-prompt.c:277
+#: ../modules/trust-prompt/module-trust-prompt.c:84
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
 msgstr ""
 
-#: ../libedataserverui/e-passwords.c:1175
-msgid "_Remember this passphrase"
+#: ../libedataserverui/e-trust-prompt.c:279
+#: ../modules/trust-prompt/module-trust-prompt.c:86
+msgid "The certificate's activation time is still in the future."
 msgstr ""
 
-#: ../libedataserverui/e-passwords.c:1176
-msgid "_Remember this passphrase for the remainder of this session"
+#: ../libedataserverui/e-trust-prompt.c:281
+#: ../modules/trust-prompt/module-trust-prompt.c:88
+msgid "The certificate has expired."
 msgstr ""
 
-#: ../libedataserverui/e-passwords.c:1181
-msgid "_Remember this password"
-msgstr "_Zapamti ovu lozinku"
+#: ../libedataserverui/e-trust-prompt.c:283
+#: ../modules/trust-prompt/module-trust-prompt.c:90
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
+msgstr ""
 
-#: ../libedataserverui/e-passwords.c:1182
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Zapamti ovu lozinku za ostatak ove prijave"
+#: ../libedataserverui/e-trust-prompt.c:285
+#: ../modules/trust-prompt/module-trust-prompt.c:92
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:95
-msgid "Select destination"
-msgstr "Odaberite odredište"
+#: ../libedataserverui/e-webdav-discover-widget.c:166
+msgid "Supports"
+msgstr ""
 
-#: ../libedataserverui/e-source-selector-dialog.c:148
-msgid "_Destination"
-msgstr "_Odredište"
+#: ../libedataserverui/e-webdav-discover-widget.c:177
+msgid "_User mail:"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1683
-#: ../servers/exchange/storage/exchange-account.c:953
-#, c-format
-msgid "Enter password for %s"
-msgstr "Unesite lozinku za %s"
+#: ../libedataserverui/e-webdav-discover-widget.c:523
+msgctxt "WebDAVDiscover"
+msgid "Contacts"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1684
-#: ../servers/exchange/storage/exchange-account.c:958
-msgid "Enter password"
-msgstr "Unesite lozinku"
+#: ../libedataserverui/e-webdav-discover-widget.c:524
+msgctxt "WebDAVDiscover"
+msgid "Events"
+msgstr ""
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "Vlasnik"
+#: ../libedataserverui/e-webdav-discover-widget.c:525
+msgctxt "WebDAVDiscover"
+msgid "Memos"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "Uređivač izdanja"
+#: ../libedataserverui/e-webdav-discover-widget.c:526
+msgctxt "WebDAVDiscover"
+msgid "Tasks"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "Uređivač"
+#: ../libedataserverui/e-webdav-discover-widget.c:825
+msgid "Invalid URL"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "Autor izdanja"
+#: ../libedataserverui/e-webdav-discover-widget.c:839
+msgid "User name not filled"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "Autor"
+#: ../libedataserverui/e-webdav-discover-widget.c:880
+msgid "Cancel"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "Ne-urednički autor"
+#: ../libedataserverui/e-webdav-discover-widget.c:883
+msgid "Searching server sources..."
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "Recenzent"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:210
+#, c-format
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain a password for '%s'"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "Suradnik"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:273
+msgid "Failed to get password from GOA: "
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "Niti jedan"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:219
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "Prilagođeno"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:240
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr ""
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "Općenita greška"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:249
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr ""
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "Mapa sa tim imenom već postoji"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:261
+#, c-format
+msgid "Failed to find Response element"
+msgstr ""
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "Navedeni tip mape nije ispravan"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:273
+#, c-format
+msgid "Failed to find Account element"
+msgstr ""
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O greška"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:287
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr ""
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "Nedovoljno mesta za izradu mape"
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1235
+#, c-format
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an access token for '%s'"
+msgstr ""
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "Mapa nije prazna"
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#, c-format
+msgid "Failed to obtain an access token for '%s': "
+msgstr ""
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "Navedena mapa nije pronađena"
+#: ../modules/google-backend/module-google-backend.c:461
+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
+msgid "Tasks"
+msgstr "Zadaci"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "Funkcija nije podržana za ovo skladište"
+#: ../modules/google-backend/module-google-backend.c:515
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+msgid "Contacts"
+msgstr "Kontakti"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "Operacija nije podržana"
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../modules/yahoo-backend/module-yahoo-backend.c:199
+msgid "Calendar"
+msgstr "Kalendar"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "Navedena vrsta nije podržana za ovo skladište"
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
+msgid "Integrate your calendars"
+msgstr "Integrira vaše kalendare"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "Navedena mapa ne može se izmjeniti ili obrisati"
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
+msgid "Integrate your contacts"
+msgstr "Integrira vaše kontakte"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Ne mogu učiniti mapu nasljednikom svojeg potomka"
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:272
+msgid "Signon service did not return a secret"
+msgstr ""
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "Nije moguće napraviti mapu tog imena"
+#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
+msgid "Evolution Data Server"
+msgstr "Evolution poslužitelj podataka"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Ovu aktivnost ne možete izvršiti bez mreže"
+#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
+msgid "Required to have EDS appear in UOA"
+msgstr ""
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:644
-#, c-format
-msgid "%s's Folders"
-msgstr "%s mapa"
+#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
+msgid "Google Calendar"
+msgstr "Google kalendar"
 
-#: ../servers/exchange/storage/exchange-account.c:1259
-msgid "Personal Folders"
-msgstr "Osobna mapa"
+#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
+msgid "Google Contacts"
+msgstr "Google kontakti"
 
-#: ../servers/exchange/storage/exchange-account.c:1274
-msgid "Favorite Public Folders"
-msgstr "Omiljene javne mape"
+#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
+msgid "GMail"
+msgstr "GMail"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1291
-msgid "All Public Folders"
-msgstr "Sve javne mape"
+#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
+msgid "Mail"
+msgstr ""
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1305
-msgid "Global Address List"
-msgstr "Opća lista adresa"
+#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
+msgid "Integrate your mailboxes"
+msgstr "Integrira vašu e-poštu"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Obrisani predmeti"
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
+#, c-format
+msgid ""
+"Cannot find a corresponding account service in the accounts database from "
+"which to obtain an access token for '%s'"
+msgstr ""
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Dnevnik"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
+#, c-format
+msgid ""
+"Expected status 200 when requesting your identity, instead got status %d (%s)"
+msgstr ""
+"Očekivano stanje 200 kada se zahtijeva vaš identitet, umjesto dobivenog "
+"stanja %d (%s)"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Bilješke"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
+msgid "Error parsing response as JSON: "
+msgstr ""
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Izlazna pošta"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
+msgid "Didn't find 'email' in JSON data"
+msgstr ""
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Poslati predmeti"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:316
+msgid "Didn't find 'id' in JSON data"
+msgstr ""
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Zadaci"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:321
+msgid "Didn't find 'emails.account' in JSON data"
+msgstr ""
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Neispravna veza"
+#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
+msgid "Windows Live Mail"
+msgstr ""
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "Neispravan odgovor poslužitelja"
+#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
+msgid "Yahoo! Calendar"
+msgstr ""
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "Nema odgovora od poslužitelja"
+#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
+msgid "Yahoo! Mail"
+msgstr ""
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "Loš parametar"
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:38
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:32
+msgid "Keep running after the last client is closed"
+msgstr ""
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Pozadinski program za Evolution datoteku adresara"
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
+msgid "Wait running until at least one client is connected"
+msgstr ""
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolution datoteka kalendara i webcal pozadina"
+#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1
+msgid "Birthdays & Anniversaries"
+msgstr ""
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Servis za provjeru sučelja Evolution Data Servera"
+#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
+msgid "CalDAV"
+msgstr ""
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Servis za prijavu poslužitelja podataka Evolution"
+#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1
+msgid "Google"
+msgstr "Google"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
+msgid "On LDAP Servers"
 msgstr ""
 
-#: ../libedataserverui/e-cell-renderer-color.c:210
-msgid "Color Info"
-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 "Na ovom računalu"
 
-#: ../libedataserverui/e-cell-renderer-color.c:211
-msgid "The color to render"
+#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1
+msgid "Search Folders"
 msgstr ""
 
-#~ msgid "Cannot find certificate for `%s'"
-#~ msgstr "Ne mogu pronaći certifikat za`%s'"
+#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1
+msgid "Weather"
+msgstr ""
 
-#~ msgid "Folder was destroyed and recreated on server."
-#~ msgstr "Mapa je uništena i ponovo kreirana na serveru."
+#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
+msgid "On The Web"
+msgstr ""
 
-#~ msgid ""
-#~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
-#~ msgstr "Neočekivan odgovor poslužitelja: jednak UID za poruke %d i %d"
+#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
+msgid "WebDAV"
+msgstr ""
 
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "Nisam mogao sačuvati sažetak: %s: %s"
+#: ../services/evolution-source-registry/evolution-source-registry.c:39
+msgid "Don't migrate user data from previous versions of Evolution"
+msgstr ""
 
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "Na ovom računalu"
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
+msgid "_Dismiss"
+msgstr ""
diff -Nru evolution-data-server-3.22.0/po/hu.po evolution-data-server-3.22.1/po/hu.po
--- evolution-data-server-3.22.0/po/hu.po	2016-08-25 12:14:19.000000000 +0000
+++ evolution-data-server-3.22.1/po/hu.po	2016-10-10 08:03:54.000000000 +0000
@@ -10,15 +10,15 @@
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution-data-server&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-08-24 15:50+0000\n"
-"PO-Revision-Date: 2016-08-24 21:07+0200\n"
-"Last-Translator: Balázs Úr \n"
+"POT-Creation-Date: 2016-10-07 09:41+0000\n"
+"PO-Revision-Date: 2016-10-09 00:36+0200\n"
+"Last-Translator: Meskó Balázs \n"
 "Language-Team: Hungarian \n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Poedit 1.8.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:120
@@ -1328,7 +1328,6 @@
 
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
 #, c-format
-#| msgid "Failed to get the DN for user '%s'"
 msgid "Failed to login to the server: %s"
 msgstr "Nem sikerült bejelentkezni a kiszolgálóra: %s"
 
@@ -1346,17 +1345,17 @@
 msgid "CalDAV backend is not loaded yet"
 msgstr "A CalDAV háttérprogram még nincs betöltve"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1200
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1205
 #: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "Érvénytelen átirányítási URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2899
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2919
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Nem lehet létrehozni a helyi „%s” gyorsítótármappát"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2985
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3005
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1365,27 +1364,27 @@
 "A kiszolgáló nem érhető el, a naptár csak olvasható módban van megnyitva.\n"
 "A hibaüzenet: (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4090
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4110
 msgid "CalDAV does not support bulk additions"
 msgstr "A CalDAV nem támogatja a tömeges hozzáadásokat"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4193
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4213
 msgid "CalDAV does not support bulk modifications"
 msgstr "A CalDAV nem támogatja a tömeges módosításokat"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4474
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4494
 msgid "CalDAV does not support bulk removals"
 msgstr "A CalDAV nem támogatja a tömeges eltávolításokat"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5221
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5241
 msgid "Calendar doesn't support Free/Busy"
 msgstr "A naptár nem támogatja a szabad/elfoglalt jelzését"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5230
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5250
 msgid "Schedule outbox url not found"
 msgstr "Ütemezés kimenő URL-je nem található"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5327
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5347
 msgid "Unexpected result in schedule-response"
 msgstr "Váratlan eredmény az ütemezésre adott válaszban"
 
@@ -2150,36 +2149,36 @@
 msgstr "„%s : %s” mappa frissítése"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:845 ../camel/camel-folder-search.c:887
+#: ../camel/camel-folder-search.c:865 ../camel/camel-folder-search.c:907
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "A(z) (%s) egyetlen logikai eredményt vár"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:922
+#: ../camel/camel-folder-search.c:942
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nem engedélyezett a(z) %s elemen belül"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:929 ../camel/camel-folder-search.c:937
+#: ../camel/camel-folder-search.c:949 ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "A(z) (%s) egy keresési típusszöveget igényel"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:965
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "A(z) (%s) egy tömb eredményt vár"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:995
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "A(z) (%s) a mappahalmazt igényli"
 
-#: ../camel/camel-folder-search.c:1887 ../camel/camel-folder-search.c:2056
+#: ../camel/camel-folder-search.c:1918 ../camel/camel-folder-search.c:2090
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2188,7 +2187,7 @@
 "Nem sikerült értelmezni a keresőkifejezést:  %s\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1899 ../camel/camel-folder-search.c:2068
+#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2102
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2200,7 +2199,7 @@
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2171
+#: ../camel/camel-folder-summary.c:2196
 #, c-format
 msgid "Release unused memory for folder '%s : %s'"
 msgstr "Nem használt memória elengedése a következő mappánál: „%s : %s”"
@@ -2208,7 +2207,7 @@
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2390
+#: ../camel/camel-folder-summary.c:2420
 #, c-format
 msgid "Update preview data for folder '%s : %s'"
 msgstr "Előnézeti adatok frissítése a következő mappánál: „%s : %s”"
@@ -3038,13 +3037,13 @@
 msgid "Creating folder '%s'"
 msgstr "„%s” mappa létrehozása"
 
-#: ../camel/camel-store.c:2453 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2453 ../camel/camel-vee-store.c:422
 #: ../camel/providers/local/camel-maildir-store.c:346
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
 
-#: ../camel/camel-store.c:2643 ../camel/camel-vee-store.c:461
+#: ../camel/camel-store.c:2643 ../camel/camel-vee-store.c:473
 #: ../camel/providers/local/camel-maildir-store.c:914
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3095,12 +3094,12 @@
 msgid "Could not parse URL '%s'"
 msgstr "Nem sikerült értelmezni ezt az URL címet: „%s”"
 
-#: ../camel/camel-vee-folder.c:491
+#: ../camel/camel-vee-folder.c:499
 #, c-format
 msgid "Updating folder '%s'"
 msgstr "„%s” mappa frissítése"
 
-#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:984
+#: ../camel/camel-vee-folder.c:884 ../camel/camel-vee-folder.c:999
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
@@ -3109,17 +3108,17 @@
 #. is replaced with an account name and the third '%s' is replaced with a full
 #. path name. The spaces around ':' are intentional, as the whole '%s : %s' is
 #. meant as an absolute identification of the folder.
-#: ../camel/camel-vee-folder.c:906
+#: ../camel/camel-vee-folder.c:921
 #, c-format
 msgid "No such message %s in '%s : %s'"
 msgstr "Nincs ilyen üzenet (%s) ezen a helyen: „%s : %s”"
 
-#: ../camel/camel-vee-folder.c:960
+#: ../camel/camel-vee-folder.c:975
 #, c-format
 msgid "Error storing '%s': "
 msgstr "Hiba „%s” tárolásakor: "
 
-#: ../camel/camel-vee-folder.c:1198
+#: ../camel/camel-vee-folder.c:1221
 msgid "Automatically _update on change in source folders"
 msgstr "A_utomatikus frissítés a forrásmappák változásakor"
 
@@ -3129,21 +3128,21 @@
 msgid "Unmatched"
 msgstr "Ki nem válogatott"
 
-#: ../camel/camel-vee-store.c:436
+#: ../camel/camel-vee-store.c:448
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
 
-#: ../camel/camel-vee-store.c:471
+#: ../camel/camel-vee-store.c:483
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
 
-#: ../camel/camel-vee-store.c:533
+#: ../camel/camel-vee-store.c:546
 msgid "Enable _Unmatched folder"
 msgstr "A „_Ki nem válogatott” mappa engedélyezése"
 
-#: ../camel/camel-vee-store.c:1030
+#: ../camel/camel-vee-store.c:1043
 msgid "Updating Unmatched search folder"
 msgstr "A „Ki nem válogatott” keresőmappa frissítése"
 
@@ -5297,23 +5296,50 @@
 msgid "Credentials delete is not supported"
 msgstr "A hitelesítési adatok törlése nem támogatott"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
-msgid "Google authentication is not supported"
-msgstr "A Google hitelesítés nem támogatott"
-
 #. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:81
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:145
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:242
 #, c-format
 msgid "Source '%s' (%s) is not a valid Google source"
 msgstr "A(z) „%s” (%s) nem egy érvényes Google forrás"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:159
 msgid "Google secret not found"
-msgstr "A Google titkos információ nem található"
+msgstr "A Google titok nem található"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:190
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:212
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:235
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:521
+msgid "Google authentication is not supported"
+msgstr "A Google hitelesítés nem támogatott"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:397
+msgid "Failed to get Google secret from credentials"
+msgstr "Nem sikerült a Google titok kinyerése a hitelesítési adatokból"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:404
+msgid "Refresh token not found in Google secret"
+msgstr "A frissítési token nem található a Google titokban"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:412
+msgid "Failed to construct refresh_token request"
+msgstr "Nem sikerült létrehozni a refresh_token kérést"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:445
+msgid "Failed to encode new access token to Google secret"
+msgstr "Nem sikerült kódolni az új hozzáférési tokent a Google titokhoz"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:455
+msgid "Failed to get access token from refresh_token server response"
+msgstr ""
+"Nem sikerült a hozzáférési token lekérése a refresh_token kiszolgáló "
+"válaszból"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:461
+msgid "Failed to refresh token"
+msgstr "Nem sikerült a token frissítése"
 
 #: ../libedataserver/e-source-credentials-provider-impl-password.c:81
 msgid "Password not found"
@@ -5477,8 +5503,8 @@
 msgstr "Váratlan válasz a kiszolgálótól"
 
 #: ../libedataserverui/e-credentials-prompter.c:260
-#: ../libedataserverui/e-credentials-prompter.c:1563
-#: ../libedataserverui/e-credentials-prompter.c:1607
+#: ../libedataserverui/e-credentials-prompter.c:1573
+#: ../libedataserverui/e-credentials-prompter.c:1617
 msgid "Credentials prompt was cancelled"
 msgstr "A hitelesítési adatok megadása megszakítva"
 
@@ -5487,43 +5513,43 @@
 msgid "Source '%s' doesn't support prompt for credentials"
 msgstr "A(z) „%s” forrás nem támogatja a hitelesítési adatok bekérését"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:441
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:446
 #, c-format
 msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
 msgstr ""
 "Nem sikerült beszerezni a hozzáférési tokent ettől a címtől: „%s”. Hibakód "
 "%d (%s)"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:487
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:494
 msgid "Requesting access token, please wait..."
-msgstr "Hozzáférési jelsor kérése, kis türelmet…"
+msgstr "Hozzáférési token kérése, kis türelmet…"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:589
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:596
 msgid "Google Address book authentication request"
 msgstr "Google címjegyzék hitelesítési kérés"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:592
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:599
 msgid "Google Calendar authentication request"
 msgstr "Google naptár hitelesítési kérés"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:595
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
 msgid "Google Memo List authentication request"
 msgstr "Google feljegyzések hitelesítési kérés"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:598
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
 msgid "Google Task List authentication request"
 msgstr "Google feladatlista hitelesítési kérés"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:609
 msgid "Google Mail authentication request"
 msgstr "Google levélhitelesítési kérés"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:612
 msgid "Google account authentication request"
 msgstr "Google fiók hitelesítési kérés"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:616
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5532,7 +5558,7 @@
 "Jelentkezzen be a Google fiókjába, és fogadja el a feltételeket a(z) „%s” "
 "címjegyzék eléréséhez."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:620
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5541,7 +5567,7 @@
 "Jelentkezzen be a Google fiókjába, és fogadja el a feltételeket a(z) „%s” "
 "naptár eléréséhez."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:624
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5550,7 +5576,7 @@
 "Jelentkezzen be a Google fiókjába, és fogadja el a feltételeket a(z) „%s” e-"
 "mail fiók eléréséhez."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:628
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5559,7 +5585,7 @@
 "Jelentkezzen be a Google fiókjába, és fogadja el a feltételeket a(z) „%s” "
 "levélküldő eléréséhez."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:632
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5568,7 +5594,7 @@
 "Jelentkezzen be a Google fiókjába, és fogadja el a feltételeket a(z) „%s” "
 "feljegyzések eléréséhez."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:636
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:643
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5577,7 +5603,7 @@
 "Jelentkezzen be a Google fiókjába, és fogadja el a feltételeket a(z) „%s” "
 "feladatlista eléréséhez."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:640
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:647
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5586,7 +5612,7 @@
 "Jelentkezzen be a Google fiókjába, és fogadja el a feltételeket a(z) „%s” "
 "fiók eléréséhez."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:684
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:691
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:232
 #: ../libedataserverui/e-trust-prompt.c:114
 #: ../libedataserverui/e-webdav-discover-widget.c:1063
@@ -6005,7 +6031,7 @@
 msgstr "_Rendben"
 
 #: ../tools/addressbook-export/addressbook-export.c:70
-#: ../tools/addressbook-export/addressbook-export.c:767
+#: ../tools/addressbook-export/addressbook-export.c:784
 msgid "Can not open file"
 msgstr "Nem nyitható meg a fájl"
 
@@ -6014,38 +6040,37 @@
 msgid "Failed to open client '%s': %s"
 msgstr "A(z) „%s” kliens megnyitása meghiúsult: %s"
 
-#: ../tools/addressbook-export/addressbook-export.c:877
+#: ../tools/addressbook-export/addressbook-export.c:894
 msgid "Unhandled error"
 msgstr "Nem kezelt hiba"
 
-#: ../tools/addressbook-export/addressbook-export.c:910
+#: ../tools/addressbook-export/addressbook-export.c:927
 msgid "Specify the output file instead of standard output"
 msgstr "Adja meg a szabvány kimenet helyett használandó kimenet fájlt"
 
-#: ../tools/addressbook-export/addressbook-export.c:911
+#: ../tools/addressbook-export/addressbook-export.c:928
 msgid "OUTPUTFILE"
 msgstr "KIMENETIFÁJL"
 
-#: ../tools/addressbook-export/addressbook-export.c:914
+#: ../tools/addressbook-export/addressbook-export.c:931
 msgid "List local address book folders"
 msgstr "A helyi címjegyzékmappák listája"
 
-#: ../tools/addressbook-export/addressbook-export.c:917
+#: ../tools/addressbook-export/addressbook-export.c:934
 msgid "Show cards as vcard or csv file"
 msgstr "Névjegykártyák megjelenítése vcard vagy csv fájlként"
 
-#: ../tools/addressbook-export/addressbook-export.c:918
+#: ../tools/addressbook-export/addressbook-export.c:935
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../tools/addressbook-export/addressbook-export.c:966
+#: ../tools/addressbook-export/addressbook-export.c:983
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Hiba a parancssori argumentumok feldolgozásakor, kérem indítsa --help "
 "paraméterrel a használat megjelenítéséhez."
 
-#: ../tools/addressbook-export/addressbook-export.c:980
+#: ../tools/addressbook-export/addressbook-export.c:997
 msgid "Only support csv or vcard format."
 msgstr "Csak csv vagy vcard formátum támogatása."
-
diff -Nru evolution-data-server-3.22.0/po/it.po evolution-data-server-3.22.1/po/it.po
--- evolution-data-server-3.22.0/po/it.po	2016-08-02 07:42:15.000000000 +0000
+++ evolution-data-server-3.22.1/po/it.po	2016-10-10 08:03:54.000000000 +0000
@@ -28,9 +28,9 @@
 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: 2016-03-19 13:13+0000\n"
-"PO-Revision-Date: 2016-03-20 16:16+0100\n"
+"product=evolution-data-server&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-10-06 22:17+0000\n"
+"PO-Revision-Date: 2016-10-07 10:47+0200\n"
 "Last-Translator: Gianvito Cavasoli \n"
 "Language-Team: Italiano \n"
 "Language: it\n"
@@ -83,8 +83,8 @@
 #: ../addressbook/backends/file/e-book-backend-file.c:1475
 #: ../addressbook/backends/file/e-book-backend-file.c:1560
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
-#: ../addressbook/libedata-book/e-book-sqlite.c:7332
-#: ../addressbook/libedata-book/e-book-sqlite.c:7401
+#: ../addressbook/libedata-book/e-book-sqlite.c:7342
+#: ../addressbook/libedata-book/e-book-sqlite.c:7411
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "Contatto «%s» non trovato"
@@ -129,9 +129,9 @@
 #: ../addressbook/libebook/e-book-client.c:3424
 #: ../addressbook/libebook/e-book-client.c:3642
 #: ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:673
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:721
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:680
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:728
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:745
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
 #: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
 #: ../calendar/libecal/e-cal-client.c:3520
@@ -152,9 +152,10 @@
 #: ../calendar/libecal/e-cal-client.c:6452
 #: ../calendar/libecal/e-cal-client.c:6815
 #: ../calendar/libecal/e-cal-client.c:7037
-#: ../camel/providers/imapx/camel-imapx-server.c:2979
-#: ../camel/providers/imapx/camel-imapx-server.c:2989
-#: ../camel/providers/imapx/camel-imapx-server.c:3001
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
+#: ../camel/providers/imapx/camel-imapx-server.c:3051
+#: ../camel/providers/imapx/camel-imapx-server.c:3063
+#: ../camel/providers/nntp/camel-nntp-store.c:424
 #: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
@@ -173,18 +174,18 @@
 
 #: ../addressbook/backends/google/e-book-backend-google.c:1748
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1503
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504
 msgid "The backend does not support bulk additions"
 msgstr "Il backend non supporta le aggiunte in serie"
 
 #: ../addressbook/backends/google/e-book-backend-google.c:1905
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1625
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1626
 msgid "The backend does not support bulk modifications"
 msgstr "Il backend non supporta le modifiche in serie"
 
 #: ../addressbook/backends/google/e-book-backend-google.c:2114
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1725
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1726
 msgid "The backend does not support bulk removals"
 msgstr "Il backend non supporta le rimozioni in serie"
 
@@ -290,7 +291,7 @@
 msgstr "Recupero del DN per l'utente \"%s\" non riuscito"
 
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
-#: ../calendar/backends/http/e-cal-backend-http.c:512
+#: ../calendar/backends/http/e-cal-backend-http.c:513
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "URI malformato: %s"
@@ -317,22 +318,22 @@
 msgid "Cannot transform SoupURI to string"
 msgstr "Impossibile trasformare il SoupURI in stringa"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1554
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1555
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "Creazione della risorsa «%s» non riuscita con stato HTTP %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1656
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1657
 msgid "Contact on server changed -> not modifying"
 msgstr "Contatto sul server cambiato → non modificato"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1664
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1665
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "Modifica del contatto non riuscita con stato HTTP %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1757
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1773
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1758
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1774
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE non riuscita con stato HTTP %d"
@@ -1026,18 +1027,18 @@
 msgstr "Client scomparso"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../addressbook/libedata-book/e-book-sqlite.c:2229
+#: ../addressbook/libedata-book/e-book-sqlite.c:2254
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "Errore nell'eseguire l'introspezione del campo di riepilogo «%s»"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../addressbook/libedata-book/e-book-sqlite.c:1368
+#: ../addressbook/libedata-book/e-book-sqlite.c:1393
 msgid "Error parsing regular expression"
 msgstr "Errore nell'analizzare l'espressione regolare"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:751
+#: ../addressbook/libedata-book/e-book-sqlite.c:1877 ../camel/camel-db.c:751
 #, c-format
 msgid "Insufficient memory"
 msgstr "Memoria non sufficiente"
@@ -1048,7 +1049,7 @@
 msgstr "Campo «%d» del contatto specificato nel riepilogo non valido"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
-#: ../addressbook/libedata-book/e-book-sqlite.c:579
+#: ../addressbook/libedata-book/e-book-sqlite.c:604
 #, c-format
 msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
@@ -1058,7 +1059,7 @@
 "sono supportati solo campi di tipo booleano, stringa e lista di stringhe"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4169
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
@@ -1066,19 +1067,19 @@
 "Nella cache non sono memorizzati i search_contacts completi. Impossibile "
 "restituire vcards."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
-#: ../addressbook/libedata-book/e-book-sqlite.c:5807
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
+#: ../addressbook/libedata-book/e-book-sqlite.c:5817
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "La query conteneva elementi non supportati"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4304
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
 #, c-format
 msgid "Invalid Query"
 msgstr "Interrogazione non valida"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4328
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
@@ -1087,7 +1088,7 @@
 "Nella cache non sono memorizzati i search_contacts completi. Sono supportate "
 "solo le interrogazioni di riepilogo."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4397
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
 #: ../addressbook/libedata-book/e-data-book.c:396
 #: ../addressbook/libedata-book/e-data-book.c:1146
 #: ../calendar/libedata-cal/e-data-cal.c:428
@@ -1096,7 +1097,7 @@
 msgid "Invalid query"
 msgstr "Interrogazione non valida"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4440
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
@@ -1104,35 +1105,35 @@
 "Nella cache non sono memorizzati i vcards completi. Sono supportate solo le "
 "interrogazioni di riepilogo."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5263
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "Impossibile rimuovere il file del database: errore numero %d"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6050
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6450
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "Solo le interrogazioni di riepilogo sono supportate da EbSdbCursor"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr ""
 "Deve essere specificato almeno un campo di ordinamento per usare EbSdbCursor"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6071
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr "Impossibile ordinare per un campo che non è nel riepilogo"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "Impossibile ordinare per un campo che potrebbe avere valori multipli"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
-#: ../addressbook/libedata-book/e-book-sqlite.c:8106
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
+#: ../addressbook/libedata-book/e-book-sqlite.c:8116
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
@@ -1141,8 +1142,8 @@
 "Si è cercato di passare un cursore in senso inverso, ma il cursore è già "
 "alla fine dell'elenco dei contatti"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
-#: ../addressbook/libedata-book/e-book-sqlite.c:8114
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
+#: ../addressbook/libedata-book/e-book-sqlite.c:8124
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
@@ -1151,12 +1152,12 @@
 "Si è cercato di passare un cursore in avanti, ma il cursore è già all'inizio "
 "dell'elenco dei contatti"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:545
+#: ../addressbook/libedata-book/e-book-sqlite.c:570
 #, c-format
 msgid "Unsupported contact field '%d' specified in summary"
 msgstr "Campo «%d» del contatto specificato nel riepilogo non supportato"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1925
+#: ../addressbook/libedata-book/e-book-sqlite.c:1950
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the 'folders' table first."
@@ -1165,22 +1166,22 @@
 "più di una rubrica. Eliminare prima una delle voci nella tabella delle "
 "«cartelle»."
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5800
+#: ../addressbook/libedata-book/e-book-sqlite.c:5810
 #, c-format
 msgid "Invalid query: %s"
 msgstr "Interrogazione non valida: %s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5975
+#: ../addressbook/libedata-book/e-book-sqlite.c:5985
 msgid "Invalid query for EbSqlCursor"
 msgstr "Interrogazione non valida per EbSqlCursor"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7928
+#: ../addressbook/libedata-book/e-book-sqlite.c:7938
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr ""
 "Almeno un campo di ordinamento deve essere specificato per usare un "
 "EbSqlCursor"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7946
+#: ../addressbook/libedata-book/e-book-sqlite.c:7956
 msgid "Cannot sort by a field that is not a string type"
 msgstr "Impossibile ordinare per un campo che non è un tipo di stringa"
 
@@ -1371,36 +1372,41 @@
 msgstr ""
 "L'indice alfabetico è stato impostato per una localizzazione non corretta"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:671
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:678
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Il server è irragiungibile (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:702
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
+#, c-format
+msgid "Failed to login to the server: %s"
+msgstr "Accesso al server non riuscito: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:726
 #, c-format
 msgid "Failed to connect to a server using SSL/TLS: %s"
 msgstr "Connessione a un server usando SSL/TLS non riuscita: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:718
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:742
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
 msgstr "Restituito codice di stato HTTP %d inatteso (%s) per l'URI: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:739
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:763
 msgid "CalDAV backend is not loaded yet"
 msgstr "Il backend CalDAV non è ancora caricato"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1176
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1205
 #: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "URL di redirezione non valido"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3033
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2919
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Impossibile creare la cartella cache locale «%s»"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3116
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3005
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1410,27 +1416,27 @@
 "lettura.\n"
 "Messaggio d'errore: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4211
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4110
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV non supporta le aggiunte in serie"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4314
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4213
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV non supporta le modifiche in serie"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4595
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4494
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV non supporta le rimozioni in serie"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5277
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5241
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Il calendario non supporta libero/occupato"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5286
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5250
 msgid "Schedule outbox url not found"
 msgstr "URL schedule outbox non trovato"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5383
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5347
 msgid "Unexpected result in schedule-response"
 msgstr "Risultato inatteso in schedule-response"
 
@@ -1457,22 +1463,22 @@
 msgid "Cannot save calendar data"
 msgstr "Impossibile salvare i dati del calendario"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:581
+#: ../calendar/backends/http/e-cal-backend-http.c:582
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Rediretto a un URI non valido"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:640
+#: ../calendar/backends/http/e-cal-backend-http.c:641
 #, c-format
 msgid "Bad file format."
 msgstr "Formato di file errato."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:650
+#: ../calendar/backends/http/e-cal-backend-http.c:651
 #, c-format
 msgid "Not a calendar."
 msgstr "Non è un calendario."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:954
+#: ../calendar/backends/http/e-cal-backend-http.c:955
 #: ../calendar/backends/weather/e-cal-backend-weather.c:709
 msgid "Could not create cache file"
 msgstr "Impossibile creare il file cache"
@@ -1587,7 +1593,7 @@
 msgstr "Protocollo non supportato"
 
 #: ../calendar/libecal/e-cal.c:2326
-msgid "Operation has been canceled"
+msgid "Operation has been cancelled"
 msgstr "L'operazione è stata annullata"
 
 #: ../calendar/libecal/e-cal.c:2328
@@ -1599,7 +1605,7 @@
 msgstr "Autenticazione non riuscita"
 
 #: ../calendar/libecal/e-cal.c:2332
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
 #: ../libedataserver/e-client.c:152
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
@@ -2023,79 +2029,79 @@
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Impossibile rinominare «%s» come «%s»: %s"
 
-#: ../camel/camel-filter-driver.c:934 ../camel/camel-filter-search.c:798
+#: ../camel/camel-filter-driver.c:935 ../camel/camel-filter-search.c:773
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Creazione del processo figlio «%s» non riuscita: %s"
 
-#: ../camel/camel-filter-driver.c:982
+#: ../camel/camel-filter-driver.c:983
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Flusso di messaggi non valido ricevuto da %s: %s"
 
-#: ../camel/camel-filter-driver.c:1189 ../camel/camel-filter-driver.c:1198
+#: ../camel/camel-filter-driver.c:1190 ../camel/camel-filter-driver.c:1199
 msgid "Syncing folders"
 msgstr "Sincronizzazione cartelle"
 
-#: ../camel/camel-filter-driver.c:1296
+#: ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nell'analizzare il filtro: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1308
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'eseguire il filtro: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1403
+#: ../camel/camel-filter-driver.c:1404
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Impossibile aprire la cartella di spool"
 
-#: ../camel/camel-filter-driver.c:1415
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Impossibile esaminare la cartella di spool"
 
-#: ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1439
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ricezione del messaggio %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1447 ../camel/camel-filter-driver.c:1469
+#: ../camel/camel-filter-driver.c:1448 ../camel/camel-filter-driver.c:1470
 #, c-format
 msgid "Failed on message %d"
 msgstr "Non riuscito al messaggio %d"
 
-#: ../camel/camel-filter-driver.c:1488 ../camel/camel-filter-driver.c:1602
+#: ../camel/camel-filter-driver.c:1489 ../camel/camel-filter-driver.c:1603
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: ../camel/camel-filter-driver.c:1493 ../camel/camel-filter-driver.c:1610
+#: ../camel/camel-filter-driver.c:1494 ../camel/camel-filter-driver.c:1611
 msgid "Complete"
 msgstr "Completato"
 
-#: ../camel/camel-filter-driver.c:1556
+#: ../camel/camel-filter-driver.c:1557
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ricezione del messaggio %d di %d"
 
-#: ../camel/camel-filter-driver.c:1574
+#: ../camel/camel-filter-driver.c:1575
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Non riuscito al messaggio %d di %d"
 
-#: ../camel/camel-filter-driver.c:1769 ../camel/camel-filter-driver.c:1796
+#: ../camel/camel-filter-driver.c:1770 ../camel/camel-filter-driver.c:1797
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "Esecuzione del filtro «%s» non riuscita: "
 
-#: ../camel/camel-filter-driver.c:1786
+#: ../camel/camel-filter-driver.c:1787
 #, c-format
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "Errore nell'analizzare il filtro «%s»: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1805
+#: ../camel/camel-filter-driver.c:1806
 #, c-format
 msgid "Error executing filter '%s': %s: %s"
 msgstr "Errore nell'eseguire il filtro «%s»: %s: %s"
@@ -2104,114 +2110,132 @@
 msgid "Failed to retrieve message"
 msgstr "Recupero del messaggio non riuscito"
 
-#: ../camel/camel-filter-search.c:538
+#: ../camel/camel-filter-search.c:513
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argomenti non validi per (system-flag)"
 
-#: ../camel/camel-filter-search.c:556
+#: ../camel/camel-filter-search.c:531
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argomenti non validi per (user-tag)"
 
-#: ../camel/camel-filter-search.c:1068
+#: ../camel/camel-filter-search.c:1043
 msgid "Invalid arguments to (message-location)"
 msgstr "Argomenti non validi per (message-location)"
 
-#: ../camel/camel-filter-search.c:1149 ../camel/camel-filter-search.c:1160
+#: ../camel/camel-filter-search.c:1124 ../camel/camel-filter-search.c:1135
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'eseguire la ricerca nei filtri: %s: %s"
 
-#: ../camel/camel-folder.c:326
+#: ../camel/camel-folder.c:327
 #, c-format
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "Apprendimento nuovo messaggio di spam in «%s»"
-msgstr[1] "Apprendimento nuovi messaggi di spam in «%s»"
+msgid "Learning new spam message in '%s : %s'"
+msgid_plural "Learning new spam messages in '%s : %s'"
+msgstr[0] "Apprendimento nuovo messaggio di spam in «%s : %s»"
+msgstr[1] "Apprendimento nuovi messaggi di spam in «%s : %s»"
 
-#: ../camel/camel-folder.c:366
+#: ../camel/camel-folder.c:370
 #, c-format
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "Apprendimento nuovo messaggio attendibile in «%s»"
-msgstr[1] "Apprendimento nuovi messaggi attendibili in «%s»"
+msgid "Learning new ham message in '%s : %s'"
+msgid_plural "Learning new ham messages in '%s : %s'"
+msgstr[0] "Apprendimento nuovo messaggio attendibile in «%s : %s»"
+msgstr[1] "Apprendimento nuovi messaggi attendibili in «%s : %s»"
 
-#: ../camel/camel-folder.c:414
+#: ../camel/camel-folder.c:421
 #, c-format
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "Filtraggio nuovo messaggio in «%s»"
-msgstr[1] "Filtraggio nuovi messaggi in «%s»"
+msgid "Filtering new message in '%s : %s'"
+msgid_plural "Filtering new messages in '%s : %s'"
+msgstr[0] "Filtraggio nuovo messaggio in «%s : %s»"
+msgstr[1] "Filtraggio nuovi messaggi in «%s : %s»"
 
-#: ../camel/camel-folder.c:1020
+#: ../camel/camel-folder.c:1029
 #: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Spostamento messaggi"
 
-#: ../camel/camel-folder.c:1023
+#: ../camel/camel-folder.c:1032
 msgid "Copying messages"
 msgstr "Copia messaggi"
 
-#: ../camel/camel-folder.c:1065
-#, c-format
-msgid "Quota information not supported for folder '%s'"
-msgstr "Informazioni sulla quota non supportate per la cartella «%s»"
-
-#: ../camel/camel-folder.c:1160
-#, c-format
-msgid "Filtering folder '%s'"
-msgstr "Filtraggio cartella «%s»"
-
-#: ../camel/camel-folder.c:2896
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "Svuotamento cartella «%s»"
-
-#: ../camel/camel-folder.c:3027
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:1077
+#, c-format
+msgid "Quota information not supported for folder '%s : %s'"
+msgstr "Informazioni sulla quota non supportate per la cartella «%s : %s»"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:1176
+#, c-format
+msgid "Filtering folder '%s : %s'"
+msgstr "Filtraggio cartella «%s : %s»"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:2916
+#, c-format
+msgid "Expunging folder '%s : %s'"
+msgstr "Svuotamento cartella «%s : %s»"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:3050
+#, c-format
+msgid "Retrieving message '%s' in '%s : %s'"
+msgstr "Ricezione messaggio «%s» in «%s : %s»"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:3243
+#, c-format
+msgid "Retrieving quota information for '%s : %s'"
+msgstr "Recupero informazioni di quota per «%s : %s»"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder.c:3541
 #, c-format
-msgid "Retrieving message '%s' in %s"
-msgstr "Ricezione messaggio «%s» in %s"
-
-#: ../camel/camel-folder.c:3218
-#, c-format
-msgid "Retrieving quota information for '%s'"
-msgstr "Recupero informazioni di quota per «%s»"
-
-#: ../camel/camel-folder.c:3515
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Aggiornamento cartella «%s»"
+msgid "Refreshing folder '%s : %s'"
+msgstr "Aggiornamento cartella «%s : %s»"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:915 ../camel/camel-folder-search.c:957
+#: ../camel/camel-folder-search.c:865 ../camel/camel-folder-search.c:907
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) richiede un singolo risultato booleano"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:992
+#: ../camel/camel-folder-search.c:942
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) non consentito all'interno di %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:999 ../camel/camel-folder-search.c:1007
+#: ../camel/camel-folder-search.c:949 ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) richiede una stringa di tipo match"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1035
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) attende un risultato array"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1045
+#: ../camel/camel-folder-search.c:995
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) richiede il set di cartelle"
 
-#: ../camel/camel-folder-search.c:1963 ../camel/camel-folder-search.c:2132
+#: ../camel/camel-folder-search.c:1918 ../camel/camel-folder-search.c:2090
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2220,7 +2244,7 @@
 "Impossibile analizzare l'espressione di ricerca: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1975 ../camel/camel-folder-search.c:2144
+#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2102
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2229,28 +2253,34 @@
 "Errore nell'eseguire l'espressione di ricerca: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-summary.c:2156
-#, c-format
-msgid "Release unused memory for folder '%s'"
-msgstr "Rilasciare memoria inutilizzata per la cartella «%s»"
-
-#: ../camel/camel-folder-summary.c:2368
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder-summary.c:2196
+#, c-format
+msgid "Release unused memory for folder '%s : %s'"
+msgstr "Rilasciare memoria inutilizzata per la cartella «%s : %s»"
+
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-folder-summary.c:2420
 #, c-format
-msgid "Update preview data for folder '%s'"
-msgstr "Aggiornare i dati di anteprima per la cartella «%s»"
+msgid "Update preview data for folder '%s : %s'"
+msgstr "Aggiornare i dati di anteprima per la cartella «%s : %s»"
 
-#: ../camel/camel-gpg-context.c:770 ../camel/camel-gpg-context.c:775
-#: ../camel/camel-gpg-context.c:1442
+#: ../camel/camel-gpg-context.c:819 ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:1514
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Esecuzione di gpg non riuscita: %s"
 
-#: ../camel/camel-gpg-context.c:775
-#: ../camel/providers/smtp/camel-smtp-transport.c:1130
+#: ../camel/camel-gpg-context.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:1131
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../camel/camel-gpg-context.c:840
+#: ../camel/camel-gpg-context.c:936
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2261,17 +2291,17 @@
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:972
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Analisi hint ID utente gpg non riuscita."
 
-#: ../camel/camel-gpg-context.c:901 ../camel/camel-gpg-context.c:916
+#: ../camel/camel-gpg-context.c:997 ../camel/camel-gpg-context.c:1012
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Analisi richiesta passphrase gpg non riuscita."
 
-#: ../camel/camel-gpg-context.c:937
+#: ../camel/camel-gpg-context.c:1033
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2280,7 +2310,7 @@
 "È necessario un PIN per sbloccare la chiave\n"
 "della propria SmartCard: «%s»"
 
-#: ../camel/camel-gpg-context.c:941
+#: ../camel/camel-gpg-context.c:1037
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2289,12 +2319,12 @@
 "È necessaria una passphrase per sbloccare la chiave\n"
 "per l'utente: «%s»"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:1043
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Richiesta inattesa da GnuPG per «%s»"
 
-#: ../camel/camel-gpg-context.c:959
+#: ../camel/camel-gpg-context.c:1055
 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."
@@ -2303,41 +2333,41 @@
 "destinatario, perciò verrà chiesta una password per ciascuna delle chiavi "
 "private memorizzate."
 
-#: ../camel/camel-gpg-context.c:990 ../camel/camel-net-utils.c:524
+#: ../camel/camel-gpg-context.c:1086 ../camel/camel-net-utils.c:524
 #: ../camel/providers/nntp/camel-nntp-summary.c:401
 #: ../libedataserver/e-client.c:163
 #, c-format
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: ../camel/camel-gpg-context.c:1011
+#: ../camel/camel-gpg-context.c:1107
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Sblocco della chiave segreta non riuscito: sono state fornite 3 passphrase "
 "errate."
 
-#: ../camel/camel-gpg-context.c:1024
+#: ../camel/camel-gpg-context.c:1120
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Risposta inattesa da GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1162
+#: ../camel/camel-gpg-context.c:1234
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Cifratura non riuscita: nessun destinatario valido specificato."
 
-#: ../camel/camel-gpg-context.c:1761 ../camel/camel-smime-context.c:843
+#: ../camel/camel-gpg-context.c:1943 ../camel/camel-smime-context.c:843
 msgid "Could not generate signing data: "
 msgstr "Impossibile generare i dati per la firma: "
 
-#: ../camel/camel-gpg-context.c:1812 ../camel/camel-gpg-context.c:2047
-#: ../camel/camel-gpg-context.c:2163 ../camel/camel-gpg-context.c:2338
+#: ../camel/camel-gpg-context.c:1994 ../camel/camel-gpg-context.c:2230
+#: ../camel/camel-gpg-context.c:2346 ../camel/camel-gpg-context.c:2522
 msgid "Failed to execute gpg."
 msgstr "Esecuzione di gpg non riuscita."
 
-#: ../camel/camel-gpg-context.c:1918 ../camel/camel-gpg-context.c:1926
-#: ../camel/camel-gpg-context.c:1934 ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:2100 ../camel/camel-gpg-context.c:2108
+#: ../camel/camel-gpg-context.c:2116 ../camel/camel-gpg-context.c:2136
 #: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
 #: ../camel/camel-smime-context.c:995
 #, c-format
@@ -2345,35 +2375,35 @@
 msgstr ""
 "Impossibile verificare la firma del messaggio: formato messaggio non corretto"
 
-#: ../camel/camel-gpg-context.c:2000
+#: ../camel/camel-gpg-context.c:2182
 msgid "Cannot verify message signature: "
 msgstr "Impossibile verificare la firma del messaggio: "
 
-#: ../camel/camel-gpg-context.c:2128
+#: ../camel/camel-gpg-context.c:2311
 msgid "Could not generate encrypting data: "
 msgstr "Impossibile generare i dati per la cifratura: "
 
-#: ../camel/camel-gpg-context.c:2203
+#: ../camel/camel-gpg-context.c:2386
 msgid "This is a digitally encrypted message part"
 msgstr "Questa è una parte del messaggio cifrata digitalmente"
 
-#: ../camel/camel-gpg-context.c:2262 ../camel/camel-gpg-context.c:2271
-#: ../camel/camel-gpg-context.c:2294
+#: ../camel/camel-gpg-context.c:2445 ../camel/camel-gpg-context.c:2454
+#: ../camel/camel-gpg-context.c:2477
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Impossibile decifrare il messaggio: formato del messaggio non valido"
 
-#: ../camel/camel-gpg-context.c:2282
+#: ../camel/camel-gpg-context.c:2465
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Decifratura della parte MIME non riuscita: errore di protocollo"
 
-#: ../camel/camel-gpg-context.c:2348
+#: ../camel/camel-gpg-context.c:2532
 #, c-format
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "Decifratura della parte MIME non riuscita: chiave segreta non trovata"
 
-#: ../camel/camel-gpg-context.c:2384 ../camel/camel-smime-context.c:1288
+#: ../camel/camel-gpg-context.c:2568 ../camel/camel-smime-context.c:1288
 msgid "Encrypted content"
 msgstr "Contenuto cifrato"
 
@@ -2513,27 +2543,40 @@
 msgid "Host lookup '%s' failed: %s"
 msgstr "Ricerca dell'host «%s» non riuscita: %s"
 
-#: ../camel/camel-offline-folder.c:93
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-offline-folder.c:96
 #, c-format
-msgid "Downloading new messages for offline mode in '%s'"
-msgstr "Scaricamento dei nuovi messaggi per la modalità fuori rete in «%s»"
+msgid "Downloading new messages for offline mode in '%s : %s'"
+msgstr ""
+"Scaricamento dei nuovi messaggi per la modalità fuori rete in «%s : %s»"
 
-#: ../camel/camel-offline-folder.c:160
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-offline-folder.c:167
 #, c-format
-msgid "Storing changes in folder '%s'"
-msgstr "Salvataggio delle modifiche nella cartella «%s»"
+msgid "Storing changes in folder '%s : %s'"
+msgstr "Salvataggio delle modifiche nella cartella «%s : %s»"
 
-#: ../camel/camel-offline-folder.c:262
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-offline-folder.c:257
 #, c-format
-msgid "Checking download of new messages for offline in '%s'"
-msgstr "Controllo dei nuovi messaggi per la modalità fuori rete in «%s»"
+msgid "Checking download of new messages for offline in '%s : %s'"
+msgstr "Controllo dei nuovi messaggi per la modalità fuori rete in «%s : %s»"
 
-#: ../camel/camel-offline-folder.c:375
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/camel-offline-folder.c:373
 #, c-format
-msgid "Syncing messages in folder '%s' to disk"
-msgstr "Sincronizzazione dei messaggi nella cartella «%s» su disco"
+msgid "Syncing messages in folder '%s : %s' to disk"
+msgstr "Sincronizzazione dei messaggi nella cartella «%s : %s» su disco"
 
-#: ../camel/camel-offline-folder.c:438
+#: ../camel/camel-offline-folder.c:436
 msgid "Copy folder content locally for _offline operation"
 msgstr ""
 "Copiare localmente il contenuto della cartella per operazioni _fuori rete"
@@ -2564,7 +2607,7 @@
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
 
-#: ../camel/camel-provider.c:424 ../camel/camel-session.c:421
+#: ../camel/camel-provider.c:424 ../camel/camel-session.c:436
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Nessun fornitore disponibile per il protocollo «%s»"
@@ -2742,7 +2785,7 @@
 
 #: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
 #: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Risposta di autenticazione dal server errata."
@@ -2808,26 +2851,26 @@
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilazione dell'espressione regolare non riuscita: %s: %s"
 
-#: ../camel/camel-session.c:430
+#: ../camel/camel-session.c:445
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "GType non valido registato per il protocollo «%s»"
 
-#: ../camel/camel-session.c:499
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/camel-session.c:514
+#: ../camel/providers/imapx/camel-imapx-server.c:2990
 #: ../camel/providers/pop3/camel-pop3-store.c:308
-#: ../camel/providers/pop3/camel-pop3-store.c:786
+#: ../camel/providers/pop3/camel-pop3-store.c:790
 #: ../camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "No support for %s authentication"
 msgstr "Nessun supporto per l'autenticazione %s"
 
-#: ../camel/camel-session.c:514
+#: ../camel/camel-session.c:529
 #, c-format
 msgid "%s authentication failed"
 msgstr "Autenticazione %s non riuscita"
 
-#: ../camel/camel-session.c:583
+#: ../camel/camel-session.c:598
 msgid "Forwarding messages is not supported"
 msgstr "Inoltro dei messaggi non supportato"
 
@@ -3030,43 +3073,43 @@
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Decifratura S/MIME: non è stato trovato alcun contenuto cifrato"
 
-#: ../camel/camel-store.c:1280
+#: ../camel/camel-store.c:1284
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Apertura cartella «%s»"
 
-#: ../camel/camel-store.c:1571
+#: ../camel/camel-store.c:1578
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Scansione cartelle in «%s»"
 
-#: ../camel/camel-store.c:1599 ../camel/camel-store.c:1644
+#: ../camel/camel-store.c:1606 ../camel/camel-store.c:1651
 #: ../camel/camel-vtrash-folder.c:45
 msgid "Trash"
 msgstr "Cestino"
 
-#: ../camel/camel-store.c:1613 ../camel/camel-store.c:1661
+#: ../camel/camel-store.c:1620 ../camel/camel-store.c:1668
 #: ../camel/camel-vtrash-folder.c:47
 msgid "Junk"
 msgstr "Indesiderata"
 
-#: ../camel/camel-store.c:2262
+#: ../camel/camel-store.c:2269
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Impossibile creare la cartella «%s»: la cartella esiste già"
 
-#: ../camel/camel-store.c:2269
+#: ../camel/camel-store.c:2276
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Creazione cartella «%s»"
 
-#: ../camel/camel-store.c:2446 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2453 ../camel/camel-vee-store.c:422
 #: ../camel/providers/local/camel-maildir-store.c:346
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossibile eliminare la cartella: %s: operazione non valida"
 
-#: ../camel/camel-store.c:2636 ../camel/camel-vee-store.c:461
+#: ../camel/camel-store.c:2643 ../camel/camel-vee-store.c:473
 #: ../camel/providers/local/camel-maildir-store.c:914
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3117,29 +3160,33 @@
 msgid "Could not parse URL '%s'"
 msgstr "Impossibile analizzare l'URL «%s»"
 
-#: ../camel/camel-vee-folder.c:491
+#: ../camel/camel-vee-folder.c:499
 #, c-format
 msgid "Updating folder '%s'"
 msgstr "Aggiornamento della cartella «%s»"
 
-#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:979
+#: ../camel/camel-vee-folder.c:884 ../camel/camel-vee-folder.c:999
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Impossibile copiare o spostare i messaggi all'interno di una cartella "
 "virtuale"
 
-#: ../camel/camel-vee-folder.c:902
+#. Translators: The first '%s' is replaced with a message UID, the second '%s'
+#. is replaced with an account name and the third '%s' is replaced with a full
+#. path name. The spaces around ':' are intentional, as the whole '%s : %s' is
+#. meant as an absolute identification of the folder.
+#: ../camel/camel-vee-folder.c:921
 #, c-format
-msgid "No such message %s in %s"
-msgstr "Messaggio %s in %s inesistente"
+msgid "No such message %s in '%s : %s'"
+msgstr "Messaggio «%s» in «%s : %s» inesistente"
 
-#: ../camel/camel-vee-folder.c:955
+#: ../camel/camel-vee-folder.c:975
 #, c-format
 msgid "Error storing '%s': "
 msgstr "Errore nell'archiviare «%s»: "
 
-#: ../camel/camel-vee-folder.c:1193
+#: ../camel/camel-vee-folder.c:1221
 msgid "Automatically _update on change in source folders"
 msgstr "A_ggiornamento automatico con modifiche nelle cartelle sorgenti"
 
@@ -3149,21 +3196,21 @@
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
-#: ../camel/camel-vee-store.c:436
+#: ../camel/camel-vee-store.c:448
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossibile eliminare la cartella: %s: cartella inesistente"
 
-#: ../camel/camel-vee-store.c:471
+#: ../camel/camel-vee-store.c:483
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossibile rinominare la cartella: %s: cartella inesistente"
 
-#: ../camel/camel-vee-store.c:533
+#: ../camel/camel-vee-store.c:546
 msgid "Enable _Unmatched folder"
 msgstr "Abilitare cartella senza corrisponden_za"
 
-#: ../camel/camel-vee-store.c:1030
+#: ../camel/camel-vee-store.c:1043
 msgid "Updating Unmatched search folder"
 msgstr "Aggiornamento cartella di ricerca senza corrispondenza"
 
@@ -3178,7 +3225,7 @@
 # Umoristica: se in linea --> i ciccioni non possono completare
 # questa operazione :-) -Luca
 #
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:953
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:973
 #, c-format
 msgid "You must be working online to complete this operation (%s)"
 msgstr ""
@@ -3187,12 +3234,12 @@
 # Umoristica: se in linea --> i ciccioni non possono completare
 # questa operazione :-) -Luca
 #
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:961
-#: ../camel/providers/imapx/camel-imapx-server.c:3060
-#: ../camel/providers/nntp/camel-nntp-store.c:349
-#: ../camel/providers/nntp/camel-nntp-store.c:1291
-#: ../camel/providers/nntp/camel-nntp-store.c:2099
-#: ../camel/providers/nntp/camel-nntp-store.c:2243
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:981
+#: ../camel/providers/imapx/camel-imapx-server.c:3123
+#: ../camel/providers/nntp/camel-nntp-store.c:353
+#: ../camel/providers/nntp/camel-nntp-store.c:1350
+#: ../camel/providers/nntp/camel-nntp-store.c:2158
+#: ../camel/providers/nntp/camel-nntp-store.c:2302
 #: ../camel/providers/pop3/camel-pop3-folder.c:449
 #: ../camel/providers/pop3/camel-pop3-folder.c:632
 #: ../camel/providers/pop3/camel-pop3-folder.c:834
@@ -3201,54 +3248,60 @@
 #: ../camel/providers/pop3/camel-pop3-store.c:529
 #: ../camel/providers/pop3/camel-pop3-store.c:577
 #: ../camel/providers/pop3/camel-pop3-store.c:672
-#: ../camel/providers/pop3/camel-pop3-store.c:1103
+#: ../camel/providers/pop3/camel-pop3-store.c:1107
 #: ../camel/providers/smtp/camel-smtp-transport.c:543
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "È necessario non essere fuori rete per completare questa operazione"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1533
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1621
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1561
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1649
 #, c-format
 msgid "No destination folder specified"
 msgstr "Nessuna cartella di destinazione specificata"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1560
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1588
 msgid "Unable to move junk messages"
 msgstr "Impossibile spostare i messaggi indesiderati"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1655
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1683
 msgid "Unable to move deleted messages"
 msgstr "Impossibile spostare i messaggi eliminati"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:702
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/providers/imapx/camel-imapx-folder.c:705
 #, c-format
-msgid "No quota information available for folder '%s'"
-msgstr "Informazioni sulla quota non disponibile per la cartella «%s»"
+msgid "No quota information available for folder '%s : %s'"
+msgstr "Informazioni sulla quota non disponibile per la cartella «%s : %s»"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:964
+#: ../camel/providers/imapx/camel-imapx-folder.c:968
 #: ../camel/providers/nntp/camel-nntp-folder.c:765
 msgid "Apply message _filters to this folder"
 msgstr "_Applicare i filtri di messaggio a questa cartella"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:975
+#: ../camel/providers/imapx/camel-imapx-folder.c:979
 msgid "Always check for _new mail in this folder"
-msgstr "Controllare sempre per le _nuove mail in questa cartella"
+msgstr "Controllare sempre per la _nuova posta in questa cartella"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1088
+#: ../camel/providers/imapx/camel-imapx-folder.c:1090
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Impossibile l'indice di cartella per %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1097
+#: ../camel/providers/imapx/camel-imapx-folder.c:1099
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Impossibile creare la cache per %s: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1295
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/providers/imapx/camel-imapx-folder.c:1300
 #, c-format
-msgid "No IMAP mailbox available for folder '%s'"
-msgstr "Nessuna mailbox IMAP disponibile per la cartella «%s»"
+msgid "No IMAP mailbox available for folder '%s : %s'"
+msgstr "Nessuna mailbox IMAP disponibile per la cartella «%s : %s»"
 
 #: ../camel/providers/imapx/camel-imapx-input-stream.c:101
 #, c-format
@@ -3349,197 +3402,204 @@
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per leggere e memorizzare la posta su server IMAP."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1134
+#: ../camel/providers/imapx/camel-imapx-server.c:1167
 msgid "Error writing to cache stream"
 msgstr "Errore nello scrivere sullo stream di cache"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2745
-#: ../camel/providers/imapx/camel-imapx-server.c:2832
-#: ../camel/providers/imapx/camel-imapx-server.c:3093
+#: ../camel/providers/imapx/camel-imapx-server.c:2806
+#: ../camel/providers/imapx/camel-imapx-server.c:2894
+#: ../camel/providers/imapx/camel-imapx-server.c:3156
 msgid "Failed to get capabilities"
 msgstr "Recupero della capacità non riuscito"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2764
+#: ../camel/providers/imapx/camel-imapx-server.c:2825
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Connessione al server IMAP %s in modalità sicura non riuscita: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2765
+#: ../camel/providers/imapx/camel-imapx-server.c:2826
 #: ../camel/providers/smtp/camel-smtp-transport.c:281
 msgid "STARTTLS not supported"
 msgstr "STARTTLS non supportato"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2773
+#: ../camel/providers/imapx/camel-imapx-server.c:2835
 msgid "Failed to issue STARTTLS"
 msgstr "Emissione STARTTLS non riuscita"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2821
+#: ../camel/providers/imapx/camel-imapx-server.c:2883
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Connessione al server IMAP %s in modalità sicura non riuscita: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2915
+#: ../camel/providers/imapx/camel-imapx-server.c:2977
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "Il server IMAP %s non supporta l'autenticazione %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2946
-#: ../camel/providers/nntp/camel-nntp-store.c:400
-#: ../camel/providers/nntp/camel-nntp-store.c:542
+#: ../camel/providers/imapx/camel-imapx-server.c:3008
+#: ../camel/providers/nntp/camel-nntp-store.c:459
+#: ../camel/providers/nntp/camel-nntp-store.c:601
 msgid "Cannot authenticate without a username"
 msgstr "Impossibile effettuare l'autenticazione senza un nome utente"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2955
-#: ../camel/providers/nntp/camel-nntp-store.c:551
+#: ../camel/providers/imapx/camel-imapx-server.c:3017
+#: ../camel/providers/nntp/camel-nntp-store.c:610
 #: ../camel/providers/pop3/camel-pop3-store.c:690
 #: ../camel/providers/pop3/camel-pop3-store.c:728
 msgid "Authentication password not available"
 msgstr "Password di autenticazione non disponibile"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2963
+#: ../camel/providers/imapx/camel-imapx-server.c:3025
 msgid "Failed to authenticate"
 msgstr "Autenticazione non riuscita"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3115
+#: ../camel/providers/imapx/camel-imapx-server.c:3178
 msgid "Failed to issue NAMESPACE"
 msgstr "Emissione NAMESPACE non riuscita"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3133
+#: ../camel/providers/imapx/camel-imapx-server.c:3196
 msgid "Failed to enable QResync"
 msgstr "Abilitazione QResync non riuscita"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3165
+#: ../camel/providers/imapx/camel-imapx-server.c:3228
 msgid "Failed to issue NOTIFY"
 msgstr "Emissione NOTIFY non riuscita"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3624
+#: ../camel/providers/imapx/camel-imapx-server.c:3706
 msgid "Failed to select mailbox"
 msgstr "Selezione mailbox non riuscita"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3722
+#: ../camel/providers/imapx/camel-imapx-server.c:3809
 msgid "Cannot issue command, no stream available"
 msgstr "Impossibile emettere il comando, nessun flusso disponibile"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3985
+#: ../camel/providers/imapx/camel-imapx-server.c:4073
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Impossibile ottenere il messaggio avente ID %s: %s"
 
 # eeeeeeeehhh????
 # che ci sta a fare il such?
-#: ../camel/providers/imapx/camel-imapx-server.c:3986
+#: ../camel/providers/imapx/camel-imapx-server.c:4074
 msgid "No such message available."
 msgstr "Nessun messaggio disponibile."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4022
-#: ../camel/providers/imapx/camel-imapx-server.c:4047
-#: ../camel/providers/imapx/camel-imapx-server.c:4066
+#: ../camel/providers/imapx/camel-imapx-server.c:4111
+#: ../camel/providers/imapx/camel-imapx-server.c:4136
+#: ../camel/providers/imapx/camel-imapx-server.c:4175
 msgid "Error fetching message"
 msgstr "Errore nel recuperare il messaggio"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4059
+#: ../camel/providers/imapx/camel-imapx-server.c:4153
+#: ../camel/providers/imapx/camel-imapx-server.c:4760
+msgid "Error performing NOOP"
+msgstr "Errore nell'eseguire NOOP"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4168
 msgid "Failed to close the tmp stream"
 msgstr "Chiusura dello stream tmp non riuscita"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4090
+#: ../camel/providers/imapx/camel-imapx-server.c:4199
 msgid "Failed to copy the tmp file"
 msgstr "Copia del file tmp non riuscito"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4253
+#: ../camel/providers/imapx/camel-imapx-server.c:4362
 msgid "Error moving messages"
 msgstr "Errore nello spostare i messaggi"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4253
+#: ../camel/providers/imapx/camel-imapx-server.c:4362
 msgid "Error copying messages"
 msgstr "Errore nel copiare i messaggi"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4437
-#: ../camel/providers/imapx/camel-imapx-server.c:4458
+#: ../camel/providers/imapx/camel-imapx-server.c:4546
+#: ../camel/providers/imapx/camel-imapx-server.c:4567
 msgid "Cannot create spool file: "
 msgstr "Impossibile creare il file di spool: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4549
+#: ../camel/providers/imapx/camel-imapx-server.c:4668
 msgid "Error appending message"
 msgstr "Errore nell'accodare il messaggio"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4639
-msgid "Error performing NOOP"
-msgstr "Errore nell'eseguire NOOP"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4787
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/providers/imapx/camel-imapx-server.c:4913
 #, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "Scansione per messaggi cambiati in «%s»"
+msgid "Scanning for changed messages in '%s : %s'"
+msgstr "Scansione per messaggi cambiati in «%s : %s»"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4790
+#: ../camel/providers/imapx/camel-imapx-server.c:4917
 msgid "Error scanning changes"
 msgstr "Errore nella scansione delle modifiche"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4808
+#. Translators: The first '%s' is replaced with an account name and the second '%s'
+#. is replaced with a full path name. The spaces around ':' are intentional, as
+#. the whole '%s : %s' is meant as an absolute identification of the folder.
+#: ../camel/providers/imapx/camel-imapx-server.c:4938
 #, c-format
-msgid "Fetching summary information for new messages in '%s'"
-msgstr "Recupero informazioni di indice per nuovi messaggi in «%s»"
+msgid "Fetching summary information for new messages in '%s : %s'"
+msgstr "Recupero informazioni di indice per nuovi messaggi in «%s : %s»"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4825
+#: ../camel/providers/imapx/camel-imapx-server.c:4956
 msgid "Error fetching message info"
 msgstr "Errore nel recuperare le informazioni del messaggio"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4887
+#: ../camel/providers/imapx/camel-imapx-server.c:5018
 msgid "Error running STATUS"
 msgstr "Errore nell'eseguire STATUS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5370
-#: ../camel/providers/imapx/camel-imapx-server.c:5422
+#: ../camel/providers/imapx/camel-imapx-server.c:5510
+#: ../camel/providers/imapx/camel-imapx-server.c:5562
 msgid "Error syncing changes"
 msgstr "Errore nel sincronizzare le modifiche"
 
 # prima era "ripulire"
-#: ../camel/providers/imapx/camel-imapx-server.c:5533
+#: ../camel/providers/imapx/camel-imapx-server.c:5673
 msgid "Error expunging message"
 msgstr "Errore nel rimuovere il messaggio"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5603
+#: ../camel/providers/imapx/camel-imapx-server.c:5743
 msgid "Error fetching folders"
 msgstr "Errore nel recuperare le cartelle"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5614
+#: ../camel/providers/imapx/camel-imapx-server.c:5754
 msgid "Error fetching subscribed folders"
 msgstr "Errore nel recuperare le cartelle sottoscritte"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5636
+#: ../camel/providers/imapx/camel-imapx-server.c:5776
 msgid "Error creating folder"
 msgstr "Errore nel creare la cartella"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5692
+#: ../camel/providers/imapx/camel-imapx-server.c:5832
 msgid "Error deleting folder"
 msgstr "Errore nell'eliminare la cartella"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5738
+#: ../camel/providers/imapx/camel-imapx-server.c:5878
 msgid "Error renaming folder"
 msgstr "Errore nel rinominare la cartella"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5770
+#: ../camel/providers/imapx/camel-imapx-server.c:5910
 msgid "Error subscribing to folder"
 msgstr "Errore nell'eseguire la sottoscrizione alla cartella"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5806
+#: ../camel/providers/imapx/camel-imapx-server.c:5946
 msgid "Error unsubscribing from folder"
 msgstr "Errore nell'eseguire l'annullamento alla sottoscrizione dalla cartella"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5846
+#: ../camel/providers/imapx/camel-imapx-server.c:5986
 msgid "IMAP server does not support quotas"
 msgstr "Il server IMAP non supporta le quote"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5858
+#: ../camel/providers/imapx/camel-imapx-server.c:5998
 msgid "Error retrieving quota information"
 msgstr "Errore nel recuperare le informazioni sulla quota"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5905
+#: ../camel/providers/imapx/camel-imapx-server.c:6045
 msgid "Search failed"
 msgstr "Ricerca non riuscita"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../camel/providers/imapx/camel-imapx-server.c:6023
+#: ../camel/providers/imapx/camel-imapx-server.c:6163
 msgid "Error running IDLE"
 msgstr "Errore nell'eseguire IDLE"
 
@@ -3602,103 +3662,113 @@
 msgstr ""
 "Il nome della cartella «%s» non è valido perché contiene il carattere '%c'"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2444
+#: ../camel/providers/imapx/camel-imapx-store.c:2470
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Drafts"
 msgstr "[Gmail]/Bozze"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2445
+#: ../camel/providers/imapx/camel-imapx-store.c:2471
 msgctxt "IMAPDefaults"
 msgid "Drafts"
 msgstr "Bozze"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2446
+#: ../camel/providers/imapx/camel-imapx-store.c:2472
 msgctxt "IMAPDefaults"
 msgid "Draft"
 msgstr "Bozza"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2449
+#: ../camel/providers/imapx/camel-imapx-store.c:2475
 msgctxt "IMAPDefaults"
 msgid "Templates"
 msgstr "Modelli"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2452
+#: ../camel/providers/imapx/camel-imapx-store.c:2478
 msgctxt "IMAPDefaults"
 msgid "Archive"
 msgstr "Archivio"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2455
+#: ../camel/providers/imapx/camel-imapx-store.c:2481
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Sent Mail"
 msgstr "[Gmail]/Posta inviata"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2456
+#: ../camel/providers/imapx/camel-imapx-store.c:2482
 msgctxt "IMAPDefaults"
 msgid "Sent"
 msgstr "Inviata"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2457
+#: ../camel/providers/imapx/camel-imapx-store.c:2483
 msgctxt "IMAPDefaults"
 msgid "Sent Items"
 msgstr "Oggetti inviati"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2460
+#: ../camel/providers/imapx/camel-imapx-store.c:2484
+msgctxt "IMAPDefaults"
+msgid "Sent Messages"
+msgstr "Messaggi inviati"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2487
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Spam"
 msgstr "[Gmail]/Spam"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2461
+#: ../camel/providers/imapx/camel-imapx-store.c:2488
 msgctxt "IMAPDefaults"
 msgid "Junk"
 msgstr "Indesiderata"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2462
+#: ../camel/providers/imapx/camel-imapx-store.c:2489
 msgctxt "IMAPDefaults"
 msgid "Junk E-mail"
-msgstr "Mail indesiderata"
+msgstr "E-mail indesiderata"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2463
+#: ../camel/providers/imapx/camel-imapx-store.c:2490
 msgctxt "IMAPDefaults"
 msgid "Junk Email"
-msgstr "Mail indesiderata"
+msgstr "EMail indesiderata"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2464
+#: ../camel/providers/imapx/camel-imapx-store.c:2491
 msgctxt "IMAPDefaults"
 msgid "Spam"
 msgstr "Spam"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2465
+#: ../camel/providers/imapx/camel-imapx-store.c:2492
 msgctxt "IMAPDefaults"
 msgid "Bulk Mail"
 msgstr "Mail di massa"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2468
+#: ../camel/providers/imapx/camel-imapx-store.c:2495
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Trash"
 msgstr "[Gmail]/Cestino"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2469
+#: ../camel/providers/imapx/camel-imapx-store.c:2496
 msgctxt "IMAPDefaults"
 msgid "Trash"
 msgstr "Cestino"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2470
+#: ../camel/providers/imapx/camel-imapx-store.c:2497
 msgctxt "IMAPDefaults"
 msgid "Deleted Items"
 msgstr "Oggetti eliminati"
 
-#: ../camel/providers/local/camel-local-folder.c:194
+#: ../camel/providers/imapx/camel-imapx-store.c:2498
+msgctxt "IMAPDefaults"
+msgid "Deleted Messages"
+msgstr "Messaggi eliminati"
+
+#: ../camel/providers/local/camel-local-folder.c:190
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:204
-#: ../camel/providers/local/camel-local-folder.c:213
+#: ../camel/providers/local/camel-local-folder.c:200
+#: ../camel/providers/local/camel-local-folder.c:209
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:222
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -3706,11 +3776,11 @@
 # ##########################
 #
 # ricontrollare tutti i messaggi del provider local
-#: ../camel/providers/local/camel-local-folder.c:499
+#: ../camel/providers/local/camel-local-folder.c:495
 msgid "_Index message body data"
 msgstr "_Indicizzare i dati nel corpo dei messaggi"
 
-#: ../camel/providers/local/camel-local-folder.c:727
+#: ../camel/providers/local/camel-local-folder.c:723
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3725,7 +3795,7 @@
 
 #: ../camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
-msgstr "Directory in formato MH"
+msgstr "Directory di posta in formato MH"
 
 #: ../camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
@@ -4321,23 +4391,38 @@
 "Opzione per l'autenticazione con il server NNTP usando una password in testo "
 "semplice."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:377
+#: ../camel/providers/nntp/camel-nntp-store.c:381
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Impossibile leggere i saluti da %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:385
+#: ../camel/providers/nntp/camel-nntp-store.c:393
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Il server NNTP %s ha restituito il codice di errore %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:455
+#: ../camel/providers/nntp/camel-nntp-store.c:412
+#, c-format
+msgid "Failed to issue STARTTLS for NNTP server %s: "
+msgstr "Emissione STARTTLS per il server NNTP %s non riuscita:"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:423
+#, c-format
+msgid "NNTP server %s doesn't support STARTTLS: %s"
+msgstr "Il server NNTP %s non supporta STARTTLS: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:443
+#, c-format
+msgid "Failed to connect to NNTP server %s in secure mode: "
+msgstr "Connessione al server NNTP %s in modalità sicura non riuscita: "
+
+#: ../camel/providers/nntp/camel-nntp-store.c:514
 #, c-format
 msgid "USENET News via %s"
 msgstr "News USENET via %s"
 
 # usato . invece di :
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1251
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4348,19 +4433,19 @@
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1308
+#: ../camel/providers/nntp/camel-nntp-store.c:1367
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Impossibile creare una cartella in un archivio di news: piuttosto effettuare "
 "una sottoscrizione."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1324
+#: ../camel/providers/nntp/camel-nntp-store.c:1383
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Impossibile rinominare una cartella in un archivio di news."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1347
+#: ../camel/providers/nntp/camel-nntp-store.c:1406
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
@@ -4368,7 +4453,7 @@
 "annullare la sottoscrizione."
 
 # usato . invece di :
-#: ../camel/providers/nntp/camel-nntp-store.c:1557
+#: ../camel/providers/nntp/camel-nntp-store.c:1616
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4381,7 +4466,7 @@
 "di livello superiore."
 
 # usato . invece di :
-#: ../camel/providers/nntp/camel-nntp-store.c:1624
+#: ../camel/providers/nntp/camel-nntp-store.c:1683
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4392,16 +4477,16 @@
 "\n"
 "Il newsgroup non esiste!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2050
+#: ../camel/providers/nntp/camel-nntp-store.c:2109
 msgid "NNTP Command failed: "
 msgstr "Comando NNTP non riuscito: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2155
+#: ../camel/providers/nntp/camel-nntp-store.c:2214
 #, c-format
 msgid "Not connected."
 msgstr "Non connesso."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2257
+#: ../camel/providers/nntp/camel-nntp-store.c:2316
 #, c-format
 msgid "No such folder: %s"
 msgstr "Cartella inesistente: %s"
@@ -4575,7 +4660,7 @@
 
 #: ../camel/providers/pop3/camel-pop3-store.c:702
 #: ../camel/providers/pop3/camel-pop3-store.c:715
-#: ../camel/providers/pop3/camel-pop3-store.c:797
+#: ../camel/providers/pop3/camel-pop3-store.c:801
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4599,7 +4684,7 @@
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:812
+#: ../camel/providers/pop3/camel-pop3-store.c:816
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4608,12 +4693,12 @@
 "Impossibile connettersi al server POP %s.\n"
 "Errore nell'inviare il nome utente%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:896
+#: ../camel/providers/pop3/camel-pop3-store.c:900
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Cartella «%s» inesistente."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:913
+#: ../camel/providers/pop3/camel-pop3-store.c:917
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "L'archivio POP3 non ha gerarchia di cartelle"
@@ -4706,8 +4791,7 @@
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:49
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-"Per consegnare la posta connettendosi a un mail hub remoto usando SMTP."
+msgstr "Per consegnare la posta connettendosi a un mailhub remoto usando SMTP."
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:237
 #: ../camel/providers/smtp/camel-smtp-transport.c:244
@@ -4760,172 +4844,172 @@
 msgid "AUTH command failed: "
 msgstr "Comando AUTH non riuscito: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:888
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Impossibile inviare il messaggio: servizio non connesso."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:898
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Impossibile inviare il messaggio: indirizzo mittente non valido."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:901
+#: ../camel/providers/smtp/camel-smtp-transport.c:902
 msgid "Sending message"
 msgstr "Invio messaggio"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:930
+#: ../camel/providers/smtp/camel-smtp-transport.c:931
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: nessun destinatario definito."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:945
+#: ../camel/providers/smtp/camel-smtp-transport.c:946
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Impossibile inviare il messaggio: uno o più destinatari non validi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1077
+#: ../camel/providers/smtp/camel-smtp-transport.c:1078
 msgid "Syntax error, command unrecognized"
 msgstr "Errore di sintassi, comando non riconosciuto"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
+#: ../camel/providers/smtp/camel-smtp-transport.c:1080
 msgid "Syntax error in parameters or arguments"
 msgstr "Errore di sintassi nei parametri o negli argomenti"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "Command not implemented"
 msgstr "Comando non implementato"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1083
+#: ../camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Command parameter not implemented"
 msgstr "Parametro del comando non implementato"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1085
+#: ../camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "System status, or system help reply"
 msgstr "Stato del sistema o risposta di aiuto del sistema"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1087
+#: ../camel/providers/smtp/camel-smtp-transport.c:1088
 msgid "Help message"
 msgstr "Messaggio di aiuto"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1089
+#: ../camel/providers/smtp/camel-smtp-transport.c:1090
 msgid "Service ready"
 msgstr "Servizio pronto"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1091
+#: ../camel/providers/smtp/camel-smtp-transport.c:1092
 msgid "Service closing transmission channel"
 msgstr "Il servizio sta chiudendo il canale di trasmissione"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "Service not available, closing transmission channel"
 msgstr "Servizio non disponibile, chiusura del canale di trasmissione"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "Requested mail action okay, completed"
 msgstr "L'azione di posta richiesta è corretta, completata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../camel/providers/smtp/camel-smtp-transport.c:1098
 msgid "User not local; will forward to "
 msgstr "Utente non locale; verrà inoltrata a "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Azione di posta richiesta non intrapresa: mailbox non disponibile"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1101
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Azione richiesta non intrapresa: mailbox non disponibile"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1103
+#: ../camel/providers/smtp/camel-smtp-transport.c:1104
 msgid "Requested action aborted: error in processing"
 msgstr "Azione richiesta interrotta: errore nell'elaborazione"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1105
+#: ../camel/providers/smtp/camel-smtp-transport.c:1106
 msgid "User not local; please try "
 msgstr "Utente non locale; tentare "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Azione richiesta non intrapresa: archivio di sistema non sufficiente"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1109
+#: ../camel/providers/smtp/camel-smtp-transport.c:1110
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Azione di posta richiesta interrotta: allocazione dell'archivio superata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1111
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Azione richiesta non intrapresa: nome della mailbox non consentito"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
+#: ../camel/providers/smtp/camel-smtp-transport.c:1114
 msgid "Start mail input; end with ."
 msgstr "Iniziare a inserire la posta; terminare con ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+#: ../camel/providers/smtp/camel-smtp-transport.c:1116
 msgid "Transaction failed"
 msgstr "Transazione non riuscita"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1119
+#: ../camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "A password transition is needed"
 msgstr "È necessario passare attraverso la verifica della password"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1121
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
 msgid "Authentication mechanism is too weak"
 msgstr "Il meccanismo di autenticazione è troppo debole"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1123
+#: ../camel/providers/smtp/camel-smtp-transport.c:1124
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Il meccanismo di autenticazione richiesto richiede la cifratura"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1125
+#: ../camel/providers/smtp/camel-smtp-transport.c:1126
 msgid "Temporary authentication failure"
 msgstr "Autenticazione temporaneamente non riuscita"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1415
+#: ../camel/providers/smtp/camel-smtp-transport.c:1416
 msgid "SMTP Greeting"
 msgstr "Messaggio di benvenuto SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#: ../camel/providers/smtp/camel-smtp-transport.c:1437
-#: ../camel/providers/smtp/camel-smtp-transport.c:1444
+#: ../camel/providers/smtp/camel-smtp-transport.c:1425
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1445
 msgid "HELO command failed: "
 msgstr "Comando HELO non riuscito: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1520
-#: ../camel/providers/smtp/camel-smtp-transport.c:1534
-#: ../camel/providers/smtp/camel-smtp-transport.c:1543
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1535
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
 msgid "MAIL FROM command failed: "
 msgstr "Comando MAIL FROM non riuscito: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1571
+#: ../camel/providers/smtp/camel-smtp-transport.c:1572
 msgid "RCPT TO command failed: "
 msgstr "Comando RSET non riuscito: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1587
-#: ../camel/providers/smtp/camel-smtp-transport.c:1596
+#: ../camel/providers/smtp/camel-smtp-transport.c:1588
+#: ../camel/providers/smtp/camel-smtp-transport.c:1597
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> non riuscito: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1668
-#: ../camel/providers/smtp/camel-smtp-transport.c:1679
-#: ../camel/providers/smtp/camel-smtp-transport.c:1690
-#: ../camel/providers/smtp/camel-smtp-transport.c:1752
-#: ../camel/providers/smtp/camel-smtp-transport.c:1770
-#: ../camel/providers/smtp/camel-smtp-transport.c:1783
-#: ../camel/providers/smtp/camel-smtp-transport.c:1791
+#: ../camel/providers/smtp/camel-smtp-transport.c:1669
+#: ../camel/providers/smtp/camel-smtp-transport.c:1680
+#: ../camel/providers/smtp/camel-smtp-transport.c:1691
+#: ../camel/providers/smtp/camel-smtp-transport.c:1753
+#: ../camel/providers/smtp/camel-smtp-transport.c:1771
+#: ../camel/providers/smtp/camel-smtp-transport.c:1784
+#: ../camel/providers/smtp/camel-smtp-transport.c:1792
 msgid "DATA command failed: "
 msgstr "Comando DATA non riuscito: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1817
-#: ../camel/providers/smtp/camel-smtp-transport.c:1831
-#: ../camel/providers/smtp/camel-smtp-transport.c:1839
+#: ../camel/providers/smtp/camel-smtp-transport.c:1818
+#: ../camel/providers/smtp/camel-smtp-transport.c:1832
+#: ../camel/providers/smtp/camel-smtp-transport.c:1840
 msgid "RSET command failed: "
 msgstr "Comando RSET non riuscito: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1865
-#: ../camel/providers/smtp/camel-smtp-transport.c:1877
-#: ../camel/providers/smtp/camel-smtp-transport.c:1883
+#: ../camel/providers/smtp/camel-smtp-transport.c:1866
+#: ../camel/providers/smtp/camel-smtp-transport.c:1878
+#: ../camel/providers/smtp/camel-smtp-transport.c:1884
 msgid "QUIT command failed: "
 msgstr "Comando QUIT non riuscito: "
 
@@ -4978,6 +5062,33 @@
 "Un esempio è \"/usr/bin/gpg\"; se non è inserito, o non esiste, allora verrà "
 "cercato. La  modifica richiede il riavvio dell'applicazione."
 
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:4
+msgid "Whether to load photos of signers/encrypters"
+msgstr "Indica se caricare le foto dei firmatari/cifratori"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:5
+msgid ""
+"When set to 'true', tries to load also photo of the signers/encrypters, if "
+"available in the key/certificate."
+msgstr ""
+"Quando impostata a \"true\", prova a caricare anche la foto dei firmatari/"
+"cifratori, se disponibili nella chiave/certificato."
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:6
+msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
+msgstr ""
+"Nome GIO del GNetworkMonitor da usare per un'istanza di ENetworkMonitor"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:7
+msgid ""
+"When set to an unknown value, then the default GNetworkMonitor is used in "
+"the background. A special value 'always-online' is used for no network "
+"monitoring."
+msgstr ""
+"Quando è impostata su un valore sconosciuto, viene usato in modo predefinito "
+"in background GNetworkMonitor. Un valore speciale \"always-online\" è usato "
+"nessun monitoraggio della rete."
+
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
 msgstr "(Deprecato) Tipo di proxy da usare"
@@ -5109,11 +5220,22 @@
 msgid "UID '%s' is already in use"
 msgstr "L'UID «%s» è già in uso"
 
-#: ../libebackend/e-subprocess-factory.c:285
+#: ../libebackend/e-subprocess-factory.c:279
+#, c-format
+msgid "Module '%s' for source UID '%s' cannot be loaded"
+msgstr "Impossibile caricare il modulo «%s» per la sorgente UID «%s»"
+
+#: ../libebackend/e-subprocess-factory.c:291
 #, c-format
 msgid "No such source for UID '%s'"
 msgstr "Nessuna sorgente per l'UID \"%s\""
 
+#: ../libebackend/e-subprocess-factory.c:302
+#, c-format
+msgid "Failed to create backend of type '%s' for source UID '%s'"
+msgstr ""
+"Creazione del backend di tipo «%s» per la sorgente UID «%s» non riuscta"
+
 #: ../libebackend/e-user-prompter-server.c:305
 #, c-format
 msgid "Extension dialog '%s' not found."
@@ -5285,24 +5407,55 @@
 msgid "Credentials delete is not supported"
 msgstr "Le credenziali di eliminazione non sono supportate"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
-msgid "Google authentication is not supported"
-msgstr "l'autenticazione di Google non è supportata"
-
 #. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:81
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:145
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:242
 #, c-format
 msgid "Source '%s' (%s) is not a valid Google source"
 msgstr "La sorgente «%s» (%s) non è una sorgente Google valida"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:159
 msgid "Google secret not found"
 msgstr "Chiave segreta Google non trovata"
 
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:190
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:212
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:235
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:521
+msgid "Google authentication is not supported"
+msgstr "l'autenticazione di Google non è supportata"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:397
+#| msgid "Failed to lookup credentials: "
+msgid "Failed to get Google secret from credentials"
+msgstr "Recupero della chiave segreta dalle credenziali di Google non riuscito"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:404
+msgid "Refresh token not found in Google secret"
+msgstr "Aggiornamento token della chiave segreta di Google non trovato"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:412
+msgid "Failed to construct refresh_token request"
+msgstr "Richiesta costruzione di refresh_token non riuscita"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:445
+#| msgid "Failed to obtain an access token for '%s': "
+msgid "Failed to encode new access token to Google secret"
+msgstr ""
+"Codifica token di nuovo accesso alla chiave segreta di Google non riuscita"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:455
+#| msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgid "Failed to get access token from refresh_token server response"
+msgstr ""
+"Responso di recupero token di accesso dal server refresh_token non riuscito"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:461
+#| msgid "Failed to retrieve message"
+msgid "Failed to refresh token"
+msgstr "Aggiornamento token non riuscito"
+
 #: ../libedataserver/e-source-credentials-provider-impl-password.c:81
 msgid "Password not found"
 msgstr "Password non trovata"
@@ -5465,8 +5618,8 @@
 msgstr "Risposta inattesa dal server"
 
 #: ../libedataserverui/e-credentials-prompter.c:260
-#: ../libedataserverui/e-credentials-prompter.c:1563
-#: ../libedataserverui/e-credentials-prompter.c:1607
+#: ../libedataserverui/e-credentials-prompter.c:1573
+#: ../libedataserverui/e-credentials-prompter.c:1617
 msgid "Credentials prompt was cancelled"
 msgstr "LE credenziali di prompt sono state annullate"
 
@@ -5475,42 +5628,42 @@
 msgid "Source '%s' doesn't support prompt for credentials"
 msgstr "La sorgente «%s» non supporta il prompt per le credenziali"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:440
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:446
 #, c-format
 msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
 msgstr ""
 "Recupero del token di accesso per «%s» non riuscito. Codice di errore %d (%s)"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:486
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:494
 msgid "Requesting access token, please wait..."
 msgstr "Richiesta del token d'accesso, attendere..."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:588
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:596
 msgid "Google Address book authentication request"
 msgstr "Richiesta autenticazione rubrica Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:591
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:599
 msgid "Google Calendar authentication request"
 msgstr "Richiesta autenticazione calendario Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:594
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
 msgid "Google Memo List authentication request"
 msgstr "Richiesta autenticazione elenco memo Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:597
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
 msgid "Google Task List authentication request"
 msgstr "Richiesta autenticazione attività Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:601
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:609
 msgid "Google Mail authentication request"
 msgstr "Richiesta autenticazione posta Google"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:604
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:612
 msgid "Google account authentication request"
 msgstr "Richiesta autenticazione account Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:615
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5519,7 +5672,7 @@
 "Accedere all'account Google e accettare le condizioni per poter accedere "
 "alla rubrica «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:619
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5528,7 +5681,7 @@
 "Accedere all'account Google e accettare le condizioni per poter accedere al "
 "calendario «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5537,16 +5690,16 @@
 "Accedere all'account Google e accettare le condizioni per poter accedere "
 "all'account di posta «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
 "mail transport \"%s\"."
 msgstr ""
 "Accedere all'account Google e accettare le condizioni per poter accedere al "
-"trasferimento mail «%s»."
+"trasferimento di posta «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5555,7 +5708,7 @@
 "Accedere all'account Google e accettare le condizioni per poter accedere "
 "agli elenco memo «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:643
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5564,7 +5717,7 @@
 "Accedere all'account Google e accettare le condizioni per poter accedere "
 "alle attività «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:647
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5573,7 +5726,7 @@
 "Accedere all'account Google e accettare le condizioni per poter accedere "
 "all'account «%s»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:683
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:691
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:232
 #: ../libedataserverui/e-trust-prompt.c:114
 #: ../libedataserverui/e-webdav-discover-widget.c:1063
@@ -5590,7 +5743,7 @@
 
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:143
 msgid "Mail authentication request"
-msgstr "Richiesta autenticazione email"
+msgstr "Richiesta autenticazione posta"
 
 #. generic account prompt
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:146
@@ -5610,13 +5763,13 @@
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:165
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
-msgstr "Inserire la password per l'account email «%s»."
+msgstr "Inserire la password per l'account di posta «%s»."
 
 # credo indichi sia invio che ricezione...
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:169
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
-msgstr "Inserire la password per il trasferimento email «%s»."
+msgstr "Inserire la password per il trasferimento di posta «%s»."
 
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:173
 #, c-format
@@ -5831,12 +5984,12 @@
 msgid "Failed to obtain an access token for '%s': "
 msgstr "Recupero del token di accesso per «%s» non riuscito: "
 
-#: ../modules/google-backend/module-google-backend.c:568
+#: ../modules/google-backend/module-google-backend.c:602
 #: ../modules/yahoo-backend/module-yahoo-backend.c:226
 msgid "Tasks"
 msgstr "Attività"
 
-#: ../modules/google-backend/module-google-backend.c:625
+#: ../modules/google-backend/module-google-backend.c:659
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
@@ -5881,7 +6034,7 @@
 
 #: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
 msgid "Mail"
-msgstr "Mail"
+msgstr "Posta"
 
 #: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
 msgid "Integrate your mailboxes"
@@ -5989,3 +6142,48 @@
 #: ../services/evolution-user-prompter/prompt-user-gtk.c:121
 msgid "_Dismiss"
 msgstr "A_nnulla"
+
+#: ../tools/addressbook-export/addressbook-export.c:70
+#: ../tools/addressbook-export/addressbook-export.c:784
+msgid "Can not open file"
+msgstr "Impossibile aprire il file"
+
+#: ../tools/addressbook-export/addressbook-export.c:100
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "Impossibile aprire il client «%s»: %s"
+
+#: ../tools/addressbook-export/addressbook-export.c:894
+msgid "Unhandled error"
+msgstr "Errore non gestito"
+
+#: ../tools/addressbook-export/addressbook-export.c:927
+msgid "Specify the output file instead of standard output"
+msgstr "Specificare il file di output invece di quello standard"
+
+#: ../tools/addressbook-export/addressbook-export.c:928
+msgid "OUTPUTFILE"
+msgstr "OUTPUTFILE"
+
+#: ../tools/addressbook-export/addressbook-export.c:931
+msgid "List local address book folders"
+msgstr "Elenco delle cartelle della rubrica locale"
+
+#: ../tools/addressbook-export/addressbook-export.c:934
+msgid "Show cards as vcard or csv file"
+msgstr "Mostra le tessere come vcard o file csv"
+
+#: ../tools/addressbook-export/addressbook-export.c:935
+msgid "[vcard|csv]"
+msgstr "[vcard|csv]"
+
+#: ../tools/addressbook-export/addressbook-export.c:983
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Argomenti errati nella riga di comando. Usare l'opzione --help per le "
+"istruzioni sull'uso."
+
+#: ../tools/addressbook-export/addressbook-export.c:997
+msgid "Only support csv or vcard format."
+msgstr "Supporta solo il formato csv o vcard."
diff -Nru evolution-data-server-3.22.0/po/lv.po evolution-data-server-3.22.1/po/lv.po
--- evolution-data-server-3.22.0/po/lv.po	2016-08-29 10:48:14.000000000 +0000
+++ evolution-data-server-3.22.1/po/lv.po	2016-10-10 08:03:54.000000000 +0000
@@ -14,8 +14,8 @@
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolutio"
 "n-data-server&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-08-24 15:50+0000\n"
-"PO-Revision-Date: 2016-08-28 19:30+0200\n"
+"POT-Creation-Date: 2016-10-06 15:55+0000\n"
+"PO-Revision-Date: 2016-10-09 19:24+0200\n"
 "Last-Translator: Rūdolfs Mazurs \n"
 "Language-Team: Latvian \n"
 "Language: lv\n"
@@ -1331,7 +1331,6 @@
 
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
 #, c-format
-#| msgid "Failed to get the DN for user '%s'"
 msgid "Failed to login to the server: %s"
 msgstr "Neizdevās ierakstīties serverī: %s"
 
@@ -1349,17 +1348,17 @@
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV aizmugure vēl nav ielādēta"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1200
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1205
 #: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "Nederīgs pāradresēšanas URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2899
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2919
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Nevar izveidot lokālu kešatmiņas mapi “%s”"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2985
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3005
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1368,27 +1367,27 @@
 "Serveris nav sasniedzams, kalendārs ir atvērts tikai lasīšanas režīmā.\n"
 "Kļūdas ziņojums — %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4090
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4110
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV neatbalsta masveida pievienošanu"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4193
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4213
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV neatbalsta masveida izmaiņas"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4474
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4494
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV neatbalsta masveida izņemšanu"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5221
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5241
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalendārs neatbalsta brīvs/aizņemts"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5230
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5250
 msgid "Schedule outbox url not found"
 msgstr "Grafika izsūtnes url nav atrasts"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5327
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5347
 msgid "Unexpected result in schedule-response"
 msgstr "Negaidīta rezultāts grafika atbildē"
 
@@ -1543,7 +1542,6 @@
 msgstr "Protokols nav atbalstīts"
 
 #: ../calendar/libecal/e-cal.c:2326
-#| msgid "Operation has been canceled"
 msgid "Operation has been cancelled"
 msgstr "Darbība tika atcelta"
 
@@ -2077,8 +2075,6 @@
 
 #: ../camel/camel-folder.c:327
 #, c-format
-#| msgid "Learning new spam message in '%s'"
-#| msgid_plural "Learning new spam messages in '%s'"
 msgid "Learning new spam message in '%s : %s'"
 msgid_plural "Learning new spam messages in '%s : %s'"
 msgstr[0] "Iemācās jaunu mēstuli iekš “%s : %s”"
@@ -2087,8 +2083,6 @@
 
 #: ../camel/camel-folder.c:370
 #, c-format
-#| msgid "Learning new ham message in '%s'"
-#| msgid_plural "Learning new ham messages in '%s'"
 msgid "Learning new ham message in '%s : %s'"
 msgid_plural "Learning new ham messages in '%s : %s'"
 msgstr[0] "Iemācās jaunu īstu vēstuli iekš “%s : %s”"
@@ -2097,8 +2091,6 @@
 
 #: ../camel/camel-folder.c:421
 #, c-format
-#| msgid "Filtering new message in '%s'"
-#| msgid_plural "Filtering new messages in '%s'"
 msgid "Filtering new message in '%s : %s'"
 msgid_plural "Filtering new messages in '%s : %s'"
 msgstr[0] "Filtrē jauno vēstuli iekš “%s : %s”"
@@ -2119,7 +2111,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-folder.c:1077
 #, c-format
-#| msgid "Quota information not supported for folder '%s'"
 msgid "Quota information not supported for folder '%s : %s'"
 msgstr "Kvotu informācija mapei “%s : %s” nav atbalstīta"
 
@@ -2128,7 +2119,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-folder.c:1176
 #, c-format
-#| msgid "Filtering folder '%s'"
 msgid "Filtering folder '%s : %s'"
 msgstr "Filtrē mapi “%s : %s”"
 
@@ -2137,7 +2127,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-folder.c:2916
 #, c-format
-#| msgid "Expunging folder '%s'"
 msgid "Expunging folder '%s : %s'"
 msgstr "Iztīra mapi “%s : %s”"
 
@@ -2146,7 +2135,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-folder.c:3050
 #, c-format
-#| msgid "Retrieving message '%s' in %s"
 msgid "Retrieving message '%s' in '%s : %s'"
 msgstr "Saņem vēstuli “%s” no “%s : %s”"
 
@@ -2155,7 +2143,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-folder.c:3243
 #, c-format
-#| msgid "Retrieving quota information for '%s'"
 msgid "Retrieving quota information for '%s : %s'"
 msgstr "Saņem kvotas informāciju par “%s : %s”"
 
@@ -2164,41 +2151,40 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-folder.c:3541
 #, c-format
-#| msgid "Refreshing folder '%s'"
 msgid "Refreshing folder '%s : %s'"
 msgstr "Atsvaidzina mapi “%s : %s”"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:845 ../camel/camel-folder-search.c:887
+#: ../camel/camel-folder-search.c:865 ../camel/camel-folder-search.c:907
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) pieprasa vienu Būla rezultātu"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:922
+#: ../camel/camel-folder-search.c:942
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nav atļauts iekš %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:929 ../camel/camel-folder-search.c:937
+#: ../camel/camel-folder-search.c:949 ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) nepieciešams atbilstoša tipa virkni"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:965
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) sagaida masīva rezultātu"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:995
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) nepieciešama mapju kopa"
 
-#: ../camel/camel-folder-search.c:1887 ../camel/camel-folder-search.c:2056
+#: ../camel/camel-folder-search.c:1918 ../camel/camel-folder-search.c:2090
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2207,7 +2193,7 @@
 "Nevar parsēt meklēšanas izteiksmi — %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1899 ../camel/camel-folder-search.c:2068
+#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2102
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2219,18 +2205,16 @@
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2171
+#: ../camel/camel-folder-summary.c:2196
 #, c-format
-#| msgid "Release unused memory for folder '%s'"
 msgid "Release unused memory for folder '%s : %s'"
 msgstr "Atbrīvot neizmantoto atmiņu mapei “%s : %s”"
 
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2390
+#: ../camel/camel-folder-summary.c:2420
 #, c-format
-#| msgid "Update preview data for folder '%s'"
 msgid "Update preview data for folder '%s : %s'"
 msgstr "Atjaunināt priekšskatījumu datus mapei “%s : %s”"
 
@@ -2508,7 +2492,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-offline-folder.c:96
 #, c-format
-#| msgid "Downloading new messages for offline mode in '%s'"
 msgid "Downloading new messages for offline mode in '%s : %s'"
 msgstr "Lejupielādē jaunās vēstules, lai varētu darboties nesaistē “%s : %s”"
 
@@ -2517,7 +2500,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-offline-folder.c:167
 #, c-format
-#| msgid "Storing changes in folder '%s'"
 msgid "Storing changes in folder '%s : %s'"
 msgstr "Saglabā izmaiņas mapē “%s : %s”"
 
@@ -2526,7 +2508,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-offline-folder.c:257
 #, c-format
-#| msgid "Checking download of new messages for offline in '%s'"
 msgid "Checking download of new messages for offline in '%s : %s'"
 msgstr ""
 "Pārbauda, vai ir lejupielādējamas jaunas vēstules, lai varētu darboties "
@@ -2537,7 +2518,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/camel-offline-folder.c:373
 #, c-format
-#| msgid "Syncing messages in folder '%s' to disk"
 msgid "Syncing messages in folder '%s : %s' to disk"
 msgstr "Sinhronizē vēstules no mapes “%s : %s” uz disku"
 
@@ -3122,7 +3102,6 @@
 #. meant as an absolute identification of the folder.
 #: ../camel/camel-vee-folder.c:906
 #, c-format
-#| msgid "No such message %s in %s"
 msgid "No such message %s in '%s : %s'"
 msgstr "Nav tādas vēstules %s mapē “%s : %s”"
 
@@ -3211,7 +3190,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/providers/imapx/camel-imapx-folder.c:705
 #, c-format
-#| msgid "No quota information available for folder '%s'"
 msgid "No quota information available for folder '%s : %s'"
 msgstr "Nav pieejama kvotu informācija mapei “%s : %s”"
 
@@ -3239,7 +3217,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/providers/imapx/camel-imapx-folder.c:1300
 #, c-format
-#| msgid "No IMAP mailbox available for folder '%s'"
 msgid "No IMAP mailbox available for folder '%s : %s'"
 msgstr "Nav pieejama IMAP pastkaste mapei “%s : %s”"
 
@@ -3459,7 +3436,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/providers/imapx/camel-imapx-server.c:4913
 #, c-format
-#| msgid "Scanning for changed messages in '%s'"
 msgid "Scanning for changed messages in '%s : %s'"
 msgstr "Meklē izmainītās vēstules mapē “%s : %s”"
 
@@ -3472,7 +3448,6 @@
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
 #: ../camel/providers/imapx/camel-imapx-server.c:4938
 #, c-format
-#| msgid "Fetching summary information for new messages in '%s'"
 msgid "Fetching summary information for new messages in '%s : %s'"
 msgstr "Saņem kopsavilkuma informāciju par jaunām vēstulēm uz “%s : %s”"
 
@@ -3636,7 +3611,6 @@
 msgstr "Nosūtītie vienumi"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:2484
-#| msgid "Sending message"
 msgctxt "IMAPDefaults"
 msgid "Sent Messages"
 msgstr "Nosūtītās vēstules"
@@ -3687,8 +3661,6 @@
 msgstr "Dzēstie vienumi"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:2498
-#| msgctxt "IMAPDefaults"
-#| msgid "Deleted Items"
 msgctxt "IMAPDefaults"
 msgid "Deleted Messages"
 msgstr "Dzēstās vēstules"
@@ -4313,19 +4285,16 @@
 
 #: ../camel/providers/nntp/camel-nntp-store.c:412
 #, c-format
-#| msgid "Failed to issue STARTTLS"
 msgid "Failed to issue STARTTLS for NNTP server %s: "
 msgstr "Neizdevās izdot STARTTLS NNTP serverim %s:"
 
 #: ../camel/providers/nntp/camel-nntp-store.c:423
 #, c-format
-#| msgid "SMTP server %s does not support %s authentication"
 msgid "NNTP server %s doesn't support STARTTLS: %s"
 msgstr "NNTP serveris %s neatbalsta STARTTLS: %s"
 
 #: ../camel/providers/nntp/camel-nntp-store.c:443
 #, c-format
-#| msgid "Failed to connect to SMTP server %s in secure mode: "
 msgid "Failed to connect to NNTP server %s in secure mode: "
 msgstr "Neizdevās savienoties ar NNTP serveri %s drošā režīmā: "
 
@@ -4970,8 +4939,8 @@
 "When set to 'true', tries to load also photo of the signers/encrypters, if "
 "available in the key/certificate."
 msgstr ""
-"Ja iestatīts uz “patiess”, mēģina arī ielādēt parakstītāju / šifrētāju"
-" fotogrāfijas, ja ir pieejams atslēgā / sertifikātā."
+"Ja iestatīts uz “patiess”, mēģina arī ielādēt parakstītāju / šifrētāju "
+"fotogrāfijas, ja ir pieejams atslēgā / sertifikātā."
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:6
 msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
@@ -4983,9 +4952,9 @@
 "the background. A special value 'always-online' is used for no network "
 "monitoring."
 msgstr ""
-"Kad ir iestatīta nezināma vērtība, fonā tiks izmantots noklusējuma"
-" GNetworkMonitor. Īpaša vērtība “always-online” tiek izmantota tīkla"
-" pārraudzīšanai."
+"Kad ir iestatīta nezināma vērtība, fonā tiks izmantots noklusējuma "
+"GNetworkMonitor. Īpaša vērtība “always-online” tiek izmantota tīkla "
+"pārraudzīšanai."
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
@@ -5126,7 +5095,6 @@
 
 #: ../libebackend/e-subprocess-factory.c:302
 #, c-format
-#| msgid "Failed to create hardlink for resource '%s': %s"
 msgid "Failed to create backend of type '%s' for source UID '%s'"
 msgstr "Neizdevās izveidot aizmugures tipam “%s” avota UID “%s”"
 
@@ -5301,24 +5269,53 @@
 msgid "Credentials delete is not supported"
 msgstr "Akreditācijas datu dzēšana nav atbalstīta "
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
-msgid "Google authentication is not supported"
-msgstr "Google autentifikācija nav atbalstīta"
-
 #. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:81
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:145
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:242
 #, c-format
 msgid "Source '%s' (%s) is not a valid Google source"
 msgstr "Avots “%s” (%s) nav derīgs Google avots"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:159
 msgid "Google secret not found"
 msgstr "Google noslēpums nav atrasts"
 
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:190
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:212
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:235
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:521
+msgid "Google authentication is not supported"
+msgstr "Google autentifikācija nav atbalstīta"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:397
+#| msgid "Failed to lookup credentials: "
+msgid "Failed to get Google secret from credentials"
+msgstr "Neizdevās saņemt Google noslēpumu no akreditācijas datiem"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:404
+msgid "Refresh token not found in Google secret"
+msgstr "Atsvaidzināšanas marķieris nav atrasts Google noslēpumā"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:412
+msgid "Failed to construct refresh_token request"
+msgstr "Neizdevās izveidot refresh_token pieprasījumu"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:445
+#| msgid "Failed to obtain an access token for '%s': "
+msgid "Failed to encode new access token to Google secret"
+msgstr "Neizdevās iekodēt jauno piekļuves marķieri uz Google noslēpumu"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:455
+#| msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgid "Failed to get access token from refresh_token server response"
+msgstr "Neizdevās saņemt piekļuves marķieri no refresh_token servera atbildes"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:461
+#| msgid "Failed to retrieve message"
+msgid "Failed to refresh token"
+msgstr "Neizdevās atsvaidzināt marķieri"
+
 #: ../libedataserver/e-source-credentials-provider-impl-password.c:81
 msgid "Password not found"
 msgstr "Parole nav atrasta"
@@ -5481,8 +5478,8 @@
 msgstr "Negaidīta atbilde no servera"
 
 #: ../libedataserverui/e-credentials-prompter.c:260
-#: ../libedataserverui/e-credentials-prompter.c:1563
-#: ../libedataserverui/e-credentials-prompter.c:1607
+#: ../libedataserverui/e-credentials-prompter.c:1573
+#: ../libedataserverui/e-credentials-prompter.c:1617
 msgid "Credentials prompt was cancelled"
 msgstr "Akreditācijas datu uzvedne tika atsaukta"
 
@@ -5491,42 +5488,42 @@
 msgid "Source '%s' doesn't support prompt for credentials"
 msgstr "Avots “%s” neatbalsta akreditācijas datu vaicāšanu"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:441
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:446
 #, c-format
 msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
 msgstr ""
 "Neizdevās saņemt piekļuves marķieri no adreses “%s”. Kļūdas kods %d (%s)"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:487
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:494
 msgid "Requesting access token, please wait..."
 msgstr "Pieprasa piekļuves marķieri, lūdzu, uzgaidiet..."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:589
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:596
 msgid "Google Address book authentication request"
 msgstr "Google adrešu grāmatas autentifikācija pieprasījums"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:592
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:599
 msgid "Google Calendar authentication request"
 msgstr "Google kalendāra autentifikācijas pieprasījums"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:595
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
 msgid "Google Memo List authentication request"
 msgstr "Google memo saraksta autentifikācijas pieprasījums"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:598
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
 msgid "Google Task List authentication request"
 msgstr "Google uzdevumu saraksta autentifikācijas pieprasījums"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:609
 msgid "Google Mail authentication request"
 msgstr "Google pasta autentifikācijas pieprasījums"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:612
 msgid "Google account authentication request"
 msgstr "Google konta autentifikācijas pieprasījums"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:616
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5535,7 +5532,7 @@
 "Ierakstieties savā Google kontā un pieņemiet nosacījumus, lai piekļūtu savai "
 "adrešu grāmatai “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:620
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5544,7 +5541,7 @@
 "Ierakstieties savā Google kontā un pieņemiet nosacījumus, lai piekļūtu savam "
 "kalendāram “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:624
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5553,7 +5550,7 @@
 "Ierakstieties savā Google kontā un pieņemiet nosacījumus, lai piekļūtu savam "
 "pasta kontam “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:628
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5562,7 +5559,7 @@
 "Ierakstieties savā Google kontā un pieņemiet nosacījumus, lai piekļūtu savam "
 "pasta transportam “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:632
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5571,7 +5568,7 @@
 "Ierakstieties savā Google kontā un pieņemiet nosacījumus, lai piekļūtu savam "
 "memo sarakstam “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:636
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:643
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5580,7 +5577,7 @@
 "Ierakstieties savā Google kontā un pieņemiet nosacījumus, lai piekļūtu savam "
 "uzdevumu sarakstam “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:640
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:647
 #, c-format
 msgid ""
 "Login to your Google account and accept conditions in order to access your "
@@ -5589,7 +5586,7 @@
 "Ierakstieties savā Google kontā un pieņemiet nosacījumus, lai piekļūtu savam "
 "kontam “%s”."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:684
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:691
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:232
 #: ../libedataserverui/e-trust-prompt.c:114
 #: ../libedataserverui/e-webdav-discover-widget.c:1063
@@ -6006,51 +6003,47 @@
 msgstr "_Atmest"
 
 #: ../tools/addressbook-export/addressbook-export.c:70
-#: ../tools/addressbook-export/addressbook-export.c:767
-#| msgid "Cannot open calendar: "
+#: ../tools/addressbook-export/addressbook-export.c:784
 msgid "Can not open file"
 msgstr "Nevar atvērt datni"
 
 #: ../tools/addressbook-export/addressbook-export.c:100
 #, c-format
-#| msgid "Failed to remove file '%s': %s"
 msgid "Failed to open client '%s': %s"
 msgstr "Neizdevās atvērt klientu “%s” — %s"
 
-#: ../tools/addressbook-export/addressbook-export.c:877
-#| msgid "Detailed error:"
+#: ../tools/addressbook-export/addressbook-export.c:894
 msgid "Unhandled error"
 msgstr "Neapstrādāta kļūda"
 
-#: ../tools/addressbook-export/addressbook-export.c:910
+#: ../tools/addressbook-export/addressbook-export.c:927
 msgid "Specify the output file instead of standard output"
 msgstr "Norādiet izvades datņu standarta izvades vietā"
 
-#: ../tools/addressbook-export/addressbook-export.c:911
+#: ../tools/addressbook-export/addressbook-export.c:928
 msgid "OUTPUTFILE"
 msgstr "IZVADESDATNE"
 
-#: ../tools/addressbook-export/addressbook-export.c:914
+#: ../tools/addressbook-export/addressbook-export.c:931
 msgid "List local address book folders"
 msgstr "Parādīt lokālās adrešu grāmatas mapes"
 
-#: ../tools/addressbook-export/addressbook-export.c:917
+#: ../tools/addressbook-export/addressbook-export.c:934
 msgid "Show cards as vcard or csv file"
 msgstr "Parādīt kartes kā vcard vai csv datni"
 
-#: ../tools/addressbook-export/addressbook-export.c:918
+#: ../tools/addressbook-export/addressbook-export.c:935
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../tools/addressbook-export/addressbook-export.c:966
+#: ../tools/addressbook-export/addressbook-export.c:983
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Komandrindas argumentu kļūda. Lai skatītu informāciju par argumentu "
 "lietošanu, izmantojiet --help opciju."
 
-#: ../tools/addressbook-export/addressbook-export.c:980
+#: ../tools/addressbook-export/addressbook-export.c:997
 msgid "Only support csv or vcard format."
 msgstr "Atbalstīt vienīgi csv vai vcard formātus."
 
-
diff -Nru evolution-data-server-3.22.0/po/pt_BR.po evolution-data-server-3.22.1/po/pt_BR.po
--- evolution-data-server-3.22.0/po/pt_BR.po	2016-08-25 19:55:35.000000000 +0000
+++ evolution-data-server-3.22.1/po/pt_BR.po	2016-10-10 08:03:54.000000000 +0000
@@ -16,22 +16,21 @@
 # Felipe Braga , 2015.
 # Rafael Fontenelle , 2012, 2013, 2014, 2016.
 # Enrico Nicoletto , 2013, 2015, 2016.
-#
 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=general\n"
-"POT-Creation-Date: 2016-08-24 15:50+0000\n"
-"PO-Revision-Date: 2016-08-25 13:13-0300\n"
-"Last-Translator: Enrico Nicoletto \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product"
+"=evolution-data-server&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-10-06 15:55+0000\n"
+"PO-Revision-Date: 2016-10-06 17:23-0200\n"
+"Last-Translator: Rafael Fontenelle \n"
 "Language-Team: Brazilian Portuguese \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.7.3\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:120
@@ -49,7 +48,8 @@
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Falha ao criar o link absoluto para o recurso \"%s\": %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:524 ../addressbook/backends/file/e-book-backend-file.c:1256
+#: ../addressbook/backends/file/e-book-backend-file.c:524
+#: ../addressbook/backends/file/e-book-backend-file.c:1256
 msgid "No UID in the contact"
 msgstr "Não há UID no contato"
 
@@ -62,7 +62,8 @@
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:992 ../addressbook/backends/ldap/e-book-backend-ldap.c:4357
+#: ../addressbook/backends/file/e-book-backend-file.c:992
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4357
 msgid "Searching..."
 msgstr "Pesquisando..."
 
@@ -71,19 +72,23 @@
 msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr "Foi tentado modificar o contato \"%s\" com revisão sem sincronia"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1475 ../addressbook/backends/file/e-book-backend-file.c:1560
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085 ../addressbook/libedata-book/e-book-sqlite.c:7342
+#: ../addressbook/backends/file/e-book-backend-file.c:1475
+#: ../addressbook/backends/file/e-book-backend-file.c:1560
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
+#: ../addressbook/libedata-book/e-book-sqlite.c:7342
 #: ../addressbook/libedata-book/e-book-sqlite.c:7411
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "O contato \"%s\" não foi encontrado"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1620 ../addressbook/backends/file/e-book-backend-file.c:1701
+#: ../addressbook/backends/file/e-book-backend-file.c:1620
+#: ../addressbook/backends/file/e-book-backend-file.c:1701
 #, c-format
 msgid "Query '%s' not supported"
 msgstr "Não há suporte à consulta \"%s\""
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1629 ../addressbook/backends/file/e-book-backend-file.c:1710
+#: ../addressbook/backends/file/e-book-backend-file.c:1629
+#: ../addressbook/backends/file/e-book-backend-file.c:1710
 #, c-format
 msgid "Invalid Query '%s'"
 msgstr "Consulta \"%s\" inválida"
@@ -95,33 +100,56 @@
 #: ../addressbook/backends/file/e-book-backend-file.c:2046
 #, c-format
 msgid "Failed to rename old database from '%s' to '%s': %s"
-msgstr "Não foi possível renomear a velha base de dados de \"%s\" para \"%s\": %s"
+msgstr ""
+"Não foi possível renomear a velha base de dados de \"%s\" para \"%s\": %s"
 
 #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166 ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384 ../addressbook/backends/webdav/e-book-backend-webdav.c:867
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51 ../addressbook/libebook-contacts/e-phone-number.c:56
-#: ../addressbook/libebook/e-book.c:1078 ../addressbook/libebook/e-book-client.c:2131
-#: ../addressbook/libebook/e-book-client.c:2303 ../addressbook/libebook/e-book-client.c:2516
-#: ../addressbook/libebook/e-book-client.c:2647 ../addressbook/libebook/e-book-client.c:2806
-#: ../addressbook/libebook/e-book-client.c:2940 ../addressbook/libebook/e-book-client.c:3071
-#: ../addressbook/libebook/e-book-client.c:3229 ../addressbook/libebook/e-book-client.c:3424
-#: ../addressbook/libebook/e-book-client.c:3642 ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:680 ../calendar/backends/caldav/e-cal-backend-caldav.c:728
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:745 ../calendar/backends/contacts/e-cal-backend-contacts.c:274
-#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279 ../calendar/libecal/e-cal-client.c:3520
-#: ../calendar/libecal/e-cal-client.c:3693 ../calendar/libecal/e-cal-client.c:3957
-#: ../calendar/libecal/e-cal-client.c:4198 ../calendar/libecal/e-cal-client.c:4388
-#: ../calendar/libecal/e-cal-client.c:4581 ../calendar/libecal/e-cal-client.c:4790
-#: ../calendar/libecal/e-cal-client.c:4959 ../calendar/libecal/e-cal-client.c:5162
-#: ../calendar/libecal/e-cal-client.c:5312 ../calendar/libecal/e-cal-client.c:5506
-#: ../calendar/libecal/e-cal-client.c:5659 ../calendar/libecal/e-cal-client.c:5876
-#: ../calendar/libecal/e-cal-client.c:6030 ../calendar/libecal/e-cal-client.c:6256
-#: ../calendar/libecal/e-cal-client.c:6452 ../calendar/libecal/e-cal-client.c:6815
-#: ../calendar/libecal/e-cal-client.c:7037 ../camel/providers/imapx/camel-imapx-server.c:3041
-#: ../camel/providers/imapx/camel-imapx-server.c:3051 ../camel/providers/imapx/camel-imapx-server.c:3063
-#: ../camel/providers/nntp/camel-nntp-store.c:424 ../libebackend/e-server-side-source.c:497
-#: ../libedataserver/e-client.c:190
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:867
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51
+#: ../addressbook/libebook-contacts/e-phone-number.c:56
+#: ../addressbook/libebook/e-book.c:1078
+#: ../addressbook/libebook/e-book-client.c:2131
+#: ../addressbook/libebook/e-book-client.c:2303
+#: ../addressbook/libebook/e-book-client.c:2516
+#: ../addressbook/libebook/e-book-client.c:2647
+#: ../addressbook/libebook/e-book-client.c:2806
+#: ../addressbook/libebook/e-book-client.c:2940
+#: ../addressbook/libebook/e-book-client.c:3071
+#: ../addressbook/libebook/e-book-client.c:3229
+#: ../addressbook/libebook/e-book-client.c:3424
+#: ../addressbook/libebook/e-book-client.c:3642
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:680
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:728
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:745
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
+#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
+#: ../calendar/libecal/e-cal-client.c:3520
+#: ../calendar/libecal/e-cal-client.c:3693
+#: ../calendar/libecal/e-cal-client.c:3957
+#: ../calendar/libecal/e-cal-client.c:4198
+#: ../calendar/libecal/e-cal-client.c:4388
+#: ../calendar/libecal/e-cal-client.c:4581
+#: ../calendar/libecal/e-cal-client.c:4790
+#: ../calendar/libecal/e-cal-client.c:4959
+#: ../calendar/libecal/e-cal-client.c:5162
+#: ../calendar/libecal/e-cal-client.c:5312
+#: ../calendar/libecal/e-cal-client.c:5506
+#: ../calendar/libecal/e-cal-client.c:5659
+#: ../calendar/libecal/e-cal-client.c:5876
+#: ../calendar/libecal/e-cal-client.c:6030
+#: ../calendar/libecal/e-cal-client.c:6256
+#: ../calendar/libecal/e-cal-client.c:6452
+#: ../calendar/libecal/e-cal-client.c:6815
+#: ../calendar/libecal/e-cal-client.c:7037
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
+#: ../camel/providers/imapx/camel-imapx-server.c:3051
+#: ../camel/providers/imapx/camel-imapx-server.c:3063
+#: ../camel/providers/nntp/camel-nntp-store.c:424
+#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -135,12 +163,14 @@
 msgid "Querying for updated groups…"
 msgstr "Consultando por grupos atualizados…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1748 ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
+#: ../addressbook/backends/google/e-book-backend-google.c:1748
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504
 msgid "The backend does not support bulk additions"
 msgstr "O backend não tem suporte a adição em massa"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1905 ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
+#: ../addressbook/backends/google/e-book-backend-google.c:1905
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:1626
 msgid "The backend does not support bulk modifications"
 msgstr "O backend não tem suporte a alterações em massa"
@@ -196,22 +226,26 @@
 msgid "Invalid DN syntax"
 msgstr "Sintaxe DN inválida"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163 ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "Erro LDAP 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1775 ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1775
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: Retornado NULL de ldap_first_entry"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028 ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: Retornou um tipo de resultado não manipulado %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2289 ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2289
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: Retornou um tipo de pesquisa não manipulada %d"
@@ -246,7 +280,8 @@
 msgid "Failed to get the DN for user '%s'"
 msgstr "Falha ao adquirir o DN para o usuário \"%s\""
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588 ../calendar/backends/http/e-cal-backend-http.c:513
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
+#: ../calendar/backends/http/e-cal-backend-http.c:513
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "URI mal formada: %s"
@@ -297,11 +332,13 @@
 msgid "No such book"
 msgstr "Não existe o catálogo"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42 ../addressbook/libedata-book/e-data-book.c:384
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../addressbook/libedata-book/e-data-book.c:384
 msgid "Contact not found"
 msgstr "O contato não foi localizado"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44 ../addressbook/libedata-book/e-data-book.c:385
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
+#: ../addressbook/libedata-book/e-data-book.c:385
 msgid "Contact ID already exists"
 msgstr "O ID do contato já existe"
 
@@ -309,7 +346,8 @@
 msgid "No such source"
 msgstr "Não existe a fonte"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:48 ../addressbook/libedata-book/e-data-book.c:401
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:48
+#: ../addressbook/libedata-book/e-data-book.c:401
 msgid "No space"
 msgstr "Sem espaço"
 
@@ -722,7 +760,8 @@
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:269 ../libedataserverui/e-webdav-discover-widget.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:269
+#: ../libedataserverui/e-webdav-discover-widget.c:153
 msgid "Name"
 msgstr "Nome"
 
@@ -778,7 +817,8 @@
 msgid "Birth Date"
 msgstr "Data de nascimento"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293 ../calendar/backends/contacts/e-cal-backend-contacts.c:948
+#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:948
 msgid "Anniversary"
 msgstr "Bodas"
 
@@ -892,7 +932,8 @@
 msgid "Twitter Name List"
 msgstr "Lista de nomes do Twitter"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1660 ../addressbook/libebook/e-destination.c:918
+#: ../addressbook/libebook-contacts/e-contact.c:1660
+#: ../addressbook/libebook/e-destination.c:918
 msgid "Unnamed List"
 msgstr "Lista sem nome"
 
@@ -902,7 +943,9 @@
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:43
 msgid "The phone number parser reported a yet unknown error code."
-msgstr "O analisador de número de telefone informou um código de erro ainda desconhecido."
+msgstr ""
+"O analisador de número de telefone informou um código de erro ainda "
+"desconhecido."
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Not a phone number"
@@ -913,8 +956,11 @@
 msgstr "O código de chamada do país é inválido"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:49
-msgid "Remaining text after the country calling code is too short for a phone number"
-msgstr "Texto restante após o código de chamada do país é muito curto para ser um número de telefone"
+msgid ""
+"Remaining text after the country calling code is too short for a phone number"
+msgstr ""
+"Texto restante após o código de chamada do país é muito curto para ser um "
+"número de telefone"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:51
 msgid "Text is too short for a phone number"
@@ -934,29 +980,34 @@
 msgid "Cannot change value of book property '%s'"
 msgstr "Não é possível modificar o valor da propriedade do catálogo \"%s\""
 
-#: ../addressbook/libebook/e-book-client.c:1390 ../addressbook/libebook/e-book-client.c:1621
-#: ../addressbook/libebook/e-book-client.c:1898 ../calendar/libecal/e-cal-client.c:1717
+#: ../addressbook/libebook/e-book-client.c:1390
+#: ../addressbook/libebook/e-book-client.c:1621
+#: ../addressbook/libebook/e-book-client.c:1898
+#: ../calendar/libecal/e-cal-client.c:1717
 #: ../calendar/libecal/e-cal-client.c:1955
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "Não é possível conectar-se a \"%s\": "
 
-#: ../addressbook/libebook/e-book-client-view.c:870 ../calendar/libecal/e-cal-client-view.c:681
+#: ../addressbook/libebook/e-book-client-view.c:870
+#: ../calendar/libecal/e-cal-client-view.c:681
 #, c-format
 msgid "Client disappeared"
 msgstr "O cliente desapareceu"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905 ../addressbook/libedata-book/e-book-sqlite.c:2254
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
+#: ../addressbook/libedata-book/e-book-sqlite.c:2254
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "Ocorreu erro ao inspecionar campo de resumo \"%s\" desconhecido"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515 ../addressbook/libedata-book/e-book-sqlite.c:1393
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../addressbook/libedata-book/e-book-sqlite.c:1393
 msgid "Error parsing regular expression"
 msgstr "Erro ao analisar expressão regular"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560 ../addressbook/libedata-book/e-book-sqlite.c:1877
-#: ../camel/camel-db.c:751
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
+#: ../addressbook/libedata-book/e-book-sqlite.c:1877 ../camel/camel-db.c:751
 #, c-format
 msgid "Insufficient memory"
 msgstr "Memória insuficiente"
@@ -966,23 +1017,28 @@
 msgid "Invalid contact field '%d' specified in summary"
 msgstr "Campo de contato \"%d\" inválido especificado no resumo"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731 ../addressbook/libedata-book/e-book-sqlite.c:604
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
+#: ../addressbook/libedata-book/e-book-sqlite.c:604
 #, c-format
 msgid ""
-"Contact field '%s' of type '%s' specified in summary, but only boolean, string and string list field types are "
-"supported"
+"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"string and string list field types are supported"
 msgstr ""
-"Campo de contato \"%s\" do tipo \"%s\" especificado no resumo, porém só há suporte apenas a campos de tipo booleano, "
-"string e string list"
+"Campo de contato \"%s\" do tipo \"%s\" especificado no resumo, porém só há "
+"suporte apenas a campos de tipo booleano, string e string list"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
 #, c-format
-msgid "Full search_contacts are not stored in cache. vcards cannot be returned."
-msgstr "Os \"search_contacts\" completos não são armazenados em cache. vcards não podem ser retornados."
+msgid ""
+"Full search_contacts are not stored in cache. vcards cannot be returned."
+msgstr ""
+"Os \"search_contacts\" completos não são armazenados em cache. vcards não "
+"podem ser retornados."
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4400 ../addressbook/libedata-book/e-book-sqlite.c:5817
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
+#: ../addressbook/libedata-book/e-book-sqlite.c:5817
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "A consulta contém elementos sem suporte"
@@ -994,11 +1050,17 @@
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
 #, c-format
-msgid "Full search_contacts are not stored in cache. Hence only summary query is supported."
-msgstr "Os \"search_contacts\" completos não são armazenados em cache. Uma vez que so há suporte a consulta do resumo."
+msgid ""
+"Full search_contacts are not stored in cache. Hence only summary query is "
+"supported."
+msgstr ""
+"Os \"search_contacts\" completos não são armazenados em cache. Uma vez que "
+"so há suporte a consulta do resumo."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4404 ../addressbook/libedata-book/e-data-book.c:396
-#: ../addressbook/libedata-book/e-data-book.c:1146 ../calendar/libedata-cal/e-data-cal.c:428
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
+#: ../addressbook/libedata-book/e-data-book.c:396
+#: ../addressbook/libedata-book/e-data-book.c:1146
+#: ../calendar/libedata-cal/e-data-cal.c:428
 #: ../calendar/libedata-cal/e-data-cal.c:1427 ../libedataserver/e-client.c:177
 #, c-format
 msgid "Invalid query"
@@ -1006,8 +1068,11 @@
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
 #, c-format
-msgid "Full vcards are not stored in cache. Hence only summary query is supported."
-msgstr "Os vcards completos não são armazenados em cache. Uma vez que so há suporte a consulta do resumo."
+msgid ""
+"Full vcards are not stored in cache. Hence only summary query is supported."
+msgstr ""
+"Os vcards completos não são armazenados em cache. Uma vez que so há suporte "
+"a consulta do resumo."
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
 #, c-format
@@ -1023,7 +1088,9 @@
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
-msgstr "Pelo menos um campo de ordenação deve ser especificado para usar um EbSdbCursor"
+msgstr ""
+"Pelo menos um campo de ordenação deve ser especificado para usar um "
+"EbSdbCursor"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
 #, c-format
@@ -1035,15 +1102,25 @@
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "Não é possível ordenar por um campo que pode ter múltiplos valores"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6218 ../addressbook/libedata-book/e-book-sqlite.c:8116
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
+#: ../addressbook/libedata-book/e-book-sqlite.c:8116
 #, c-format
-msgid "Tried to step a cursor in reverse, but cursor is already at the beginning of the contact list"
-msgstr "Tentou mover um cursor no sentido inverso, mas o cursor já está no começo da lista de contatos"
+msgid ""
+"Tried to step a cursor in reverse, but cursor is already at the beginning of "
+"the contact list"
+msgstr ""
+"Tentou mover um cursor no sentido inverso, mas o cursor já está no começo da "
+"lista de contatos"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6226 ../addressbook/libedata-book/e-book-sqlite.c:8124
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
+#: ../addressbook/libedata-book/e-book-sqlite.c:8124
 #, c-format
-msgid "Tried to step a cursor forwards, but cursor is already at the end of the contact list"
-msgstr "Tentou mover um cursor para frente, mas o cursor já estava no fim da lista de contatos"
+msgid ""
+"Tried to step a cursor forwards, but cursor is already at the end of the "
+"contact list"
+msgstr ""
+"Tentou mover um cursor para frente, mas o cursor já estava no fim da lista "
+"de contatos"
 
 #: ../addressbook/libedata-book/e-book-sqlite.c:570
 #, c-format
@@ -1052,11 +1129,12 @@
 
 #: ../addressbook/libedata-book/e-book-sqlite.c:1950
 msgid ""
-"Cannot upgrade contacts database from a legacy database with more than one addressbook. Delete one of the entries in "
-"the 'folders' table first."
+"Cannot upgrade contacts database from a legacy database with more than one "
+"addressbook. Delete one of the entries in the 'folders' table first."
 msgstr ""
-"Não foi possível atualizar o banco de dados de contatos a partir do banco de dados legado com mais de um catálogo de "
-"endereços. Exclua um dos registros na tabela \"folder\" primeiro."
+"Não foi possível atualizar o banco de dados de contatos a partir do banco de "
+"dados legado com mais de um catálogo de endereços. Exclua um dos registros "
+"na tabela \"folder\" primeiro."
 
 #: ../addressbook/libedata-book/e-book-sqlite.c:5810
 #, c-format
@@ -1069,50 +1147,57 @@
 
 #: ../addressbook/libedata-book/e-book-sqlite.c:7938
 msgid "At least one sort field must be specified to use an EbSqlCursor"
-msgstr "Ao menos um campo de ordenação deve ser especificado para usar um EbSqlCursor"
+msgstr ""
+"Ao menos um campo de ordenação deve ser especificado para usar um EbSqlCursor"
 
 #: ../addressbook/libedata-book/e-book-sqlite.c:7956
 msgid "Cannot sort by a field that is not a string type"
 msgstr "Não foi possível ordenar por um campo que não é um tipo string"
 
-#: ../addressbook/libedata-book/e-data-book.c:380 ../calendar/libedata-cal/e-data-cal.c:409
+#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Success"
 msgstr "Sucesso"
 
-#: ../addressbook/libedata-book/e-data-book.c:381 ../calendar/libecal/e-cal.c:2304
-#: ../calendar/libedata-cal/e-data-cal.c:410 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libecal/e-cal.c:2304 ../calendar/libedata-cal/e-data-cal.c:410
+#: ../libedataserver/e-client.c:144
 msgid "Backend is busy"
 msgstr "O backend está ocupado"
 
-#: ../addressbook/libedata-book/e-data-book.c:382 ../calendar/libedata-cal/e-data-cal.c:411
-#: ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:154
 msgid "Repository offline"
 msgstr "O repositório está desconectado"
 
-#: ../addressbook/libedata-book/e-data-book.c:383 ../calendar/libecal/e-cal.c:2318
-#: ../calendar/libedata-cal/e-data-cal.c:412 ../libedataserver/e-client.c:161
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/libecal/e-cal.c:2318 ../calendar/libedata-cal/e-data-cal.c:412
+#: ../libedataserver/e-client.c:161
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: ../addressbook/libedata-book/e-data-book.c:386 ../calendar/libedata-cal/e-data-cal.c:417
+#: ../addressbook/libedata-book/e-data-book.c:386
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Authentication Failed"
 msgstr "A autenticação falhou"
 
-#: ../addressbook/libedata-book/e-data-book.c:387 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../addressbook/libedata-book/e-data-book.c:387
+#: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Authentication Required"
 msgstr "Autenticação exigida"
 
-#: ../addressbook/libedata-book/e-data-book.c:388 ../calendar/libedata-cal/e-data-cal.c:419
+#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Unsupported field"
 msgstr "Não há suporte ao campo"
 
-#: ../addressbook/libedata-book/e-data-book.c:389 ../calendar/libedata-cal/e-data-cal.c:421
-#: ../libedataserver/e-client.c:169
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:169
 msgid "Unsupported authentication method"
 msgstr "Não há suporte ao método de autenticação"
 
-#: ../addressbook/libedata-book/e-data-book.c:390 ../calendar/libedata-cal/e-data-cal.c:422
-#: ../libedataserver/e-client.c:171
+#: ../addressbook/libedata-book/e-data-book.c:390
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:171
 msgid "TLS not available"
 msgstr "TLS não disponível"
 
@@ -1124,64 +1209,70 @@
 msgid "Book removed"
 msgstr "Catálogo removido"
 
-#: ../addressbook/libedata-book/e-data-book.c:393 ../calendar/libedata-cal/e-data-cal.c:425
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Not available in offline mode"
 msgstr "Não disponível no modo desconectado"
 
-#: ../addressbook/libedata-book/e-data-book.c:394 ../calendar/libedata-cal/e-data-cal.c:426
-#: ../libedataserver/e-client.c:173
+#: ../addressbook/libedata-book/e-data-book.c:394
+#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:173
 msgid "Search size limit exceeded"
 msgstr "Limite do tamanho da pesquisa excedido"
 
-#: ../addressbook/libedata-book/e-data-book.c:395 ../calendar/libedata-cal/e-data-cal.c:427
-#: ../libedataserver/e-client.c:175
+#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:175
 msgid "Search time limit exceeded"
 msgstr "Limite do tempo da pesquisa excedido"
 
-#: ../addressbook/libedata-book/e-data-book.c:397 ../calendar/libedata-cal/e-data-cal.c:429
-#: ../libedataserver/e-client.c:179
+#: ../addressbook/libedata-book/e-data-book.c:397
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:179
 msgid "Query refused"
 msgstr "Consulta recusada"
 
-#: ../addressbook/libedata-book/e-data-book.c:398 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:165
+#: ../addressbook/libedata-book/e-data-book.c:398
+#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:165
 msgid "Could not cancel"
 msgstr "Não foi possível cancelar"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:400 ../calendar/libedata-cal/e-data-cal.c:432
+#: ../addressbook/libedata-book/e-data-book.c:400
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Invalid server version"
 msgstr "Versão do servidor inválida"
 
-#: ../addressbook/libedata-book/e-data-book.c:402 ../calendar/libecal/e-cal.c:2302
-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:402
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:433
+#: ../libedataserver/e-client.c:142
 msgid "Invalid argument"
 msgstr "Argumento inválido"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:404 ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
-#: ../calendar/libecal/e-cal.c:1909 ../calendar/libecal/e-cal.c:2341 ../calendar/libedata-cal/e-data-cal.c:435
-#: ../libedataserver/e-client.c:167
+#: ../addressbook/libedata-book/e-data-book.c:404
+#: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
+#: ../calendar/libecal/e-cal.c:1909 ../calendar/libecal/e-cal.c:2341
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:167
 #, c-format
 msgid "Not supported"
 msgstr "Não há suporte"
 
-#: ../addressbook/libedata-book/e-data-book.c:405 ../calendar/libedata-cal/e-data-cal.c:436
-#: ../libedataserver/e-client.c:185
+#: ../addressbook/libedata-book/e-data-book.c:405
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
 msgid "Backend is not opened yet"
 msgstr "O backend ainda não está aberto"
 
-#: ../addressbook/libedata-book/e-data-book.c:406 ../libedataserver/e-client.c:187
+#: ../addressbook/libedata-book/e-data-book.c:406
+#: ../libedataserver/e-client.c:187
 msgid "Object is out of sync"
 msgstr "O objeto está fora de sincronia"
 
-#: ../addressbook/libedata-book/e-data-book.c:414 ../calendar/libedata-cal/e-data-cal.c:444
-#: ../libedataserver/e-client.c:183
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:183
 msgid "Other error"
 msgstr "Outro erro"
 
-#: ../addressbook/libedata-book/e-data-book.c:1171 ../calendar/libedata-cal/e-data-cal.c:1452
+#: ../addressbook/libedata-book/e-data-book.c:1171
+#: ../calendar/libedata-cal/e-data-cal.c:1452
 msgid "Invalid query: "
 msgstr "Consulta inválida: "
 
@@ -1273,16 +1364,17 @@
 msgid "CalDAV backend is not loaded yet"
 msgstr "O backend CalDAV ainda não está carregado"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1200 ../libedataserver/e-webdav-discover.c:147
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1205
+#: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "URI de redirecionamento inválida"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2899
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2919
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Não foi possível criar a pasta cache local \"%s\""
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2985
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3005
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1291,29 +1383,29 @@
 "O servidor está inacessível, calendário foi aberto em modo somente leitura.\n"
 "Mensagem de erro: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4090
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4110
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV não oferece suporte a adição em massa"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4193
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4213
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV não oferece suporte a alterações em massa"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4474
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4494
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV não oferece suporte a remoção em massa"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5221
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5241
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Agenda não oferece suporte a livre/ocupado"
 
 # Schedule outbox = caixa de saíde de agendamento? (ou talvez "de agenda" ou "de reunião"?)
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5230
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5250
 msgid "Schedule outbox url not found"
 msgstr "URL de saída do agendamento não encontrada"
 
 # Vendo pelo código fonte, "schedule-response" parece ser algum tipo campo, e não meramente uma "resposta de agendamento"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5327
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5347
 msgid "Unexpected result in schedule-response"
 msgstr "Resultado inesperado no schedule-response"
 
@@ -1335,7 +1427,8 @@
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Não é possível salvar dados da agenda: URI malformado."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:252 ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
 msgid "Cannot save calendar data"
 msgstr "Não é possível salvar dados da agenda"
 
@@ -1354,7 +1447,8 @@
 msgid "Not a calendar."
 msgstr "Não é uma agenda."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:955 ../calendar/backends/weather/e-cal-backend-weather.c:709
+#: ../calendar/backends/http/e-cal-backend-http.c:955
+#: ../calendar/backends/weather/e-cal-backend-weather.c:709
 msgid "Could not create cache file"
 msgstr "Não foi possível criar arquivo de cache"
 
@@ -1421,7 +1515,8 @@
 msgid "%.1f"
 msgstr "%.1f"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:589 ../calendar/backends/weather/e-cal-backend-weather.c:617
+#: ../calendar/backends/weather/e-cal-backend-weather.c:589
+#: ../calendar/backends/weather/e-cal-backend-weather.c:617
 msgid "Forecast"
 msgstr "Previsão"
 
@@ -1433,11 +1528,13 @@
 msgid "No such calendar"
 msgstr "Não existe tal agenda"
 
-#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268 ../calendar/libedata-cal/e-data-cal.c:414
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Object not found"
 msgstr "O objeto não foi localizado"
 
-#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270 ../calendar/libedata-cal/e-data-cal.c:415
+#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Invalid object"
 msgstr "Objeto inválido"
 
@@ -1453,7 +1550,8 @@
 msgid "Unknown User"
 msgstr "Usuário desconhecido"
 
-#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:274 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:274
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Object ID already exists"
 msgstr "O ID do objeto já existe"
 
@@ -1473,7 +1571,9 @@
 msgid "Authentication failed"
 msgstr "A autenticação falhou"
 
-#: ../calendar/libecal/e-cal.c:2332 ../camel/providers/smtp/camel-smtp-transport.c:1128 ../libedataserver/e-client.c:152
+#: ../calendar/libecal/e-cal.c:2332
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../libedataserver/e-client.c:152
 msgid "Authentication required"
 msgstr "Autenticação exigida"
 
@@ -1485,11 +1585,13 @@
 msgid "No error"
 msgstr "Sem erro"
 
-#: ../calendar/libecal/e-cal-client.c:272 ../calendar/libedata-cal/e-data-cal.c:424
+#: ../calendar/libecal/e-cal-client.c:272
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unknown user"
 msgstr "Usuário desconhecido"
 
-#: ../calendar/libecal/e-cal-client.c:276 ../calendar/libedata-cal/e-data-cal.c:413
+#: ../calendar/libecal/e-cal-client.c:276
+#: ../calendar/libedata-cal/e-data-cal.c:413
 msgid "Invalid range"
 msgstr "Faixa inválida"
 
@@ -1652,15 +1754,19 @@
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85 ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1379 ../calendar/libedata-cal/e-cal-backend-sexp.c:1506
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1379
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1506
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1555
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" espera um argumento"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92 ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386 ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" espera que o primeiro argumento seja uma string"
@@ -1670,16 +1776,22 @@
 msgid "\"%s\" expects two or three arguments"
 msgstr "\"%s\" espera dois ou três argumentos"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174 ../calendar/libedata-cal/e-cal-backend-sexp.c:263
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325 ../calendar/libedata-cal/e-cal-backend-sexp.c:824
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070 ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513 ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:263
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:824
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" espera que o primeiro argumento seja um time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:183 ../calendar/libedata-cal/e-cal-backend-sexp.c:271
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:335 ../calendar/libedata-cal/e-cal-backend-sexp.c:833
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:335
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" espera que o segundo argumento seja um time_t"
@@ -1694,15 +1806,20 @@
 msgid "\"%s\" expects none or two arguments"
 msgstr "\"%s\" espera nenhum ou dois argumentos"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318 ../calendar/libedata-cal/e-cal-backend-sexp.c:667
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817 ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" espera dois argumentos"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:603 ../calendar/libedata-cal/e-cal-backend-sexp.c:626
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:749 ../calendar/libedata-cal/e-cal-backend-sexp.c:781
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:988 ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:603
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:626
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:749
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:988
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1340
 #, c-format
 msgid "\"%s\" expects no arguments"
@@ -1716,11 +1833,13 @@
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
 #, c-format
 msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee"
-"\", or \"organizer\", or \"classification\""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
 msgstr ""
-"\"%s\" espera que o primeiro argumento seja um de \"any\", \"summary\", ou \"description\", ou \"location\", ou "
-"\"attendee\", ou \"organizer\", ou \"classification\""
+"\"%s\" espera que o primeiro argumento seja um de \"any\", \"summary\", ou "
+"\"description\", ou \"location\", ou \"attendee\", ou \"organizer\", ou "
+"\"classification\""
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
 #, c-format
@@ -1729,13 +1848,18 @@
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:900
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "\"%s\" espera que todos os argumentos sejam strings ou um e somente um argumento que seja um falso booleano (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"\"%s\" espera que todos os argumentos sejam strings ou um e somente um "
+"argumento que seja um falso booleano (#f)"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1403
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "\"%s\" espera que o primeiro argumento seja uma string de data/hora ISO 8601"
+msgstr ""
+"\"%s\" espera que o primeiro argumento seja uma string de data/hora ISO 8601"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1464
 #, c-format
@@ -1990,7 +2114,8 @@
 msgstr[0] "Filtrando nova mensagem em \"%s : %s\""
 msgstr[1] "Filtrando novas mensagens em \"%s : %s\""
 
-#: ../camel/camel-folder.c:1029 ../camel/providers/local/camel-maildir-folder.c:330
+#: ../camel/camel-folder.c:1029
+#: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Movendo mensagens"
 
@@ -2047,36 +2172,36 @@
 msgstr "Atualizando pasta \"%s : %s\""
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:845 ../camel/camel-folder-search.c:887
+#: ../camel/camel-folder-search.c:865 ../camel/camel-folder-search.c:907
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) requer um simples resultado booleano"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:922
+#: ../camel/camel-folder-search.c:942
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) não é permitido dentro de %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:929 ../camel/camel-folder-search.c:937
+#: ../camel/camel-folder-search.c:949 ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) requer uma string do tipo de combinação"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:965
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) requer um resultado vetor"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:995
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) requer um conjunto de pastas"
 
-#: ../camel/camel-folder-search.c:1887 ../camel/camel-folder-search.c:2056
+#: ../camel/camel-folder-search.c:1918 ../camel/camel-folder-search.c:2090
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2085,7 +2210,7 @@
 "Não foi possível analisar expressão de pesquisa: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1899 ../camel/camel-folder-search.c:2068
+#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2102
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2097,7 +2222,7 @@
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2171
+#: ../camel/camel-folder-summary.c:2196
 #, c-format
 msgid "Release unused memory for folder '%s : %s'"
 msgstr "Liberar memória inutilizada para a pasta \"%s : %s\""
@@ -2105,17 +2230,19 @@
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2390
+#: ../camel/camel-folder-summary.c:2420
 #, c-format
 msgid "Update preview data for folder '%s : %s'"
 msgstr "Atualizar previsão de dados para a pasta \"%s : %s\""
 
-#: ../camel/camel-gpg-context.c:819 ../camel/camel-gpg-context.c:824 ../camel/camel-gpg-context.c:1514
+#: ../camel/camel-gpg-context.c:819 ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:1514
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Falha ao executar GPG: %s"
 
-#: ../camel/camel-gpg-context.c:824 ../camel/providers/smtp/camel-smtp-transport.c:1131
+#: ../camel/camel-gpg-context.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:1131
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -2165,13 +2292,15 @@
 
 #: ../camel/camel-gpg-context.c:1055
 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."
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
 msgstr ""
-"Note que o conteúdo criptografado não contém informação sobre o destinatário, assim, será exibida uma tela pedindo a "
-"senha para cada chave privada armazenada."
+"Note que o conteúdo criptografado não contém informação sobre o "
+"destinatário, assim, será exibida uma tela pedindo a senha para cada chave "
+"privada armazenada."
 
-#: ../camel/camel-gpg-context.c:1086 ../camel/camel-net-utils.c:524 ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../camel/camel-gpg-context.c:1086 ../camel/camel-net-utils.c:524
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #: ../libedataserver/e-client.c:163
 #, c-format
 msgid "Cancelled"
@@ -2180,7 +2309,8 @@
 #: ../camel/camel-gpg-context.c:1107
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Falha ao desbloquear chave secreta: fornecidas 3 frases secretas inválidas."
+msgstr ""
+"Falha ao desbloquear chave secreta: fornecidas 3 frases secretas inválidas."
 
 #: ../camel/camel-gpg-context.c:1120
 #, c-format
@@ -2196,17 +2326,20 @@
 msgid "Could not generate signing data: "
 msgstr "Não foi possível gerar dados de assinatura: "
 
-#: ../camel/camel-gpg-context.c:1994 ../camel/camel-gpg-context.c:2230 ../camel/camel-gpg-context.c:2346
-#: ../camel/camel-gpg-context.c:2522
+#: ../camel/camel-gpg-context.c:1994 ../camel/camel-gpg-context.c:2230
+#: ../camel/camel-gpg-context.c:2346 ../camel/camel-gpg-context.c:2522
 msgid "Failed to execute gpg."
 msgstr "Falha ao executar GPG."
 
-#: ../camel/camel-gpg-context.c:2100 ../camel/camel-gpg-context.c:2108 ../camel/camel-gpg-context.c:2116
-#: ../camel/camel-gpg-context.c:2136 ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
+#: ../camel/camel-gpg-context.c:2100 ../camel/camel-gpg-context.c:2108
+#: ../camel/camel-gpg-context.c:2116 ../camel/camel-gpg-context.c:2136
+#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
 #: ../camel/camel-smime-context.c:995
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Não foi possível verificar assinatura da mensagem: Formato de mensagem incorreto"
+msgstr ""
+"Não foi possível verificar assinatura da mensagem: Formato de mensagem "
+"incorreto"
 
 #: ../camel/camel-gpg-context.c:2182
 msgid "Cannot verify message signature: "
@@ -2220,10 +2353,12 @@
 msgid "This is a digitally encrypted message part"
 msgstr "Esta é uma parte de mensagem criptografada digitalmente"
 
-#: ../camel/camel-gpg-context.c:2445 ../camel/camel-gpg-context.c:2454 ../camel/camel-gpg-context.c:2477
+#: ../camel/camel-gpg-context.c:2445 ../camel/camel-gpg-context.c:2454
+#: ../camel/camel-gpg-context.c:2477
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "Não foi possível descriptografar a mensagem: Formato de mensagem incorreto"
+msgstr ""
+"Não foi possível descriptografar a mensagem: Formato de mensagem incorreto"
 
 #: ../camel/camel-gpg-context.c:2465
 #, c-format
@@ -2251,7 +2386,9 @@
 #: ../camel/camel-lock.c:153
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
-msgstr "Tempo esgotado ao tentar obter arquivo de bloqueio em %s. Tente novamente mais tarde."
+msgstr ""
+"Tempo esgotado ao tentar obter arquivo de bloqueio em %s. Tente novamente "
+"mais tarde."
 
 #: ../camel/camel-lock.c:215
 #, c-format
@@ -2276,7 +2413,8 @@
 #: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Não foi possível bloquear \"%s\": erro de protocolo com \"lock-helper\""
+msgstr ""
+"Não foi possível bloquear \"%s\": erro de protocolo com \"lock-helper\""
 
 #: ../camel/camel-lock-client.c:234
 #, c-format
@@ -2364,7 +2502,9 @@
 #: ../camel/camel-net-utils.c:739
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
-msgstr "A consulta de máquina \"%s\" falhou. Verifique seu nome de máquina por erros de escrita."
+msgstr ""
+"A consulta de máquina \"%s\" falhou. Verifique seu nome de máquina por erros "
+"de escrita."
 
 #: ../camel/camel-net-utils.c:743
 #, c-format
@@ -2393,7 +2533,9 @@
 #: ../camel/camel-offline-folder.c:257
 #, c-format
 msgid "Checking download of new messages for offline in '%s : %s'"
-msgstr "Verificando download de novas mensagens para o modo desconectado em \"%s : %s\""
+msgstr ""
+"Verificando download de novas mensagens para o modo desconectado em \"%s : %s"
+"\""
 
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
@@ -2418,7 +2560,9 @@
 #: ../camel/camel-provider.c:260
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Não foi possível carregar %s: Não há suporte à carga de módulos neste sistema."
+msgstr ""
+"Não foi possível carregar %s: Não há suporte à carga de módulos neste "
+"sistema."
 
 #: ../camel/camel-provider.c:269
 #, c-format
@@ -2435,13 +2579,15 @@
 msgid "No provider available for protocol '%s'"
 msgstr "Sem provedor disponível para o protocolo \"%s\""
 
-#: ../camel/camel-sasl-anonymous.c:32 ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../camel/camel-sasl-anonymous.c:32
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid "Anonymous"
 msgstr "Anônimo"
 
 #: ../camel/camel-sasl-anonymous.c:34
 msgid "This option will connect to the server using an anonymous login."
-msgstr "Esta opção estabelece conexão com o servidor usando um usuário anônimo."
+msgstr ""
+"Esta opção estabelece conexão com o servidor usando um usuário anônimo."
 
 #: ../camel/camel-sasl-anonymous.c:67
 #, c-format
@@ -2480,16 +2626,24 @@
 msgstr "CRAM-MD5"
 
 #: ../camel/camel-sasl-cram-md5.c:45
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Esta opção estabelecerá uma conexão com o servidor usando uma senha segura CRAM-MD5, se o servidor suportá-la."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Esta opção estabelecerá uma conexão com o servidor usando uma senha segura "
+"CRAM-MD5, se o servidor suportá-la."
 
 #: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: ../camel/camel-sasl-digest-md5.c:58
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "Esta opção estabelecerá conexão com o servidor usando uma senha segura DIGEST-MD5, se o servidor suportá-la."
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Esta opção estabelecerá conexão com o servidor usando uma senha segura "
+"DIGEST-MD5, se o servidor suportá-la."
 
 #: ../camel/camel-sasl-digest-md5.c:854
 #, c-format
@@ -2504,7 +2658,8 @@
 #: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "O desafio do servidor continha token de \"Quality of Protection\" inválido"
+msgstr ""
+"O desafio do servidor continha token de \"Quality of Protection\" inválido"
 
 #: ../camel/camel-sasl-digest-md5.c:906
 #, c-format
@@ -2527,7 +2682,9 @@
 
 #: ../camel/camel-sasl-gssapi.c:96
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Esta opção estabelecerá conexão com o servidor usando autenticação Kerberos 5."
+msgstr ""
+"Esta opção estabelecerá conexão com o servidor usando autenticação Kerberos "
+"5."
 
 #: ../camel/camel-sasl-gssapi.c:148
 #, c-format
@@ -2535,36 +2692,53 @@
 msgstr "(Código de mecanismo GSSAPI desconhecido: %x)"
 
 #: ../camel/camel-sasl-gssapi.c:181
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "O mecanismo especificado não tem suporte pela credencial fornecida ou não é reconhecido pela implementação."
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"O mecanismo especificado não tem suporte pela credencial fornecida ou não é "
+"reconhecido pela implementação."
 
 #: ../camel/camel-sasl-gssapi.c:186
 msgid "The provided target_name parameter was ill-formed."
 msgstr "O parâmetro target_name fornecido foi mal formado."
 
 #: ../camel/camel-sasl-gssapi.c:189
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "O parâmetro target_name fornecido continha um tipo de nome inválido ou sem suporte."
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"O parâmetro target_name fornecido continha um tipo de nome inválido ou sem "
+"suporte."
 
 #: ../camel/camel-sasl-gssapi.c:193
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "O input_token contém associações de canal diferentes daquelas especificadas pelo parâmetro input_chan_bindings."
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"O input_token contém associações de canal diferentes daquelas especificadas "
+"pelo parâmetro input_chan_bindings."
 
 #: ../camel/camel-sasl-gssapi.c:198
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "O input_token contém uma assinatura inválida ou uma assinatura que não pode ser verificada."
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"O input_token contém uma assinatura inválida ou uma assinatura que não pode "
+"ser verificada."
 
 #: ../camel/camel-sasl-gssapi.c:202
 msgid ""
-"The supplied credentials were not valid for context initiation, or the credential handle did not reference any "
-"credentials."
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
 msgstr ""
-"As credenciais fornecidas não foram válidas para início de contexto ou o manipulador de credenciais não fazia "
-"referência a nenhuma credencial."
+"As credenciais fornecidas não foram válidas para início de contexto ou o "
+"manipulador de credenciais não fazia referência a nenhuma credencial."
 
 #: ../camel/camel-sasl-gssapi.c:207
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "O manipulador de contexto fornecido não se referia a um contexto válido."
+msgstr ""
+"O manipulador de contexto fornecido não se referia a um contexto válido."
 
 #: ../camel/camel-sasl-gssapi.c:210
 msgid "The consistency checks performed on the input_token failed."
@@ -2578,8 +2752,9 @@
 msgid "The referenced credentials have expired."
 msgstr "As credenciais de referência expiraram."
 
-#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404 ../camel/camel-sasl-gssapi.c:453
-#: ../camel/camel-sasl-gssapi.c:470 ../camel/providers/smtp/camel-smtp-transport.c:799
+#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
+#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação do servidor inválida."
@@ -2595,7 +2770,8 @@
 
 #: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
 msgid "This option will connect to the server using a simple password."
-msgstr "Esta opção estabelecerá conexão com o servidor usando uma senha simples."
+msgstr ""
+"Esta opção estabelecerá conexão com o servidor usando uma senha simples."
 
 #: ../camel/camel-sasl-login.c:107
 #, c-format
@@ -2607,8 +2783,12 @@
 msgstr "NTLM / SPA"
 
 #: ../camel/camel-sasl-ntlm.c:48
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Esta opção estabelecerá conexão com um servidor Windows usando NTLM / Secure Password Authentication."
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Esta opção estabelecerá conexão com um servidor Windows usando NTLM / Secure "
+"Password Authentication."
 
 #: ../camel/camel-sasl-plain.c:41
 msgid "PLAIN"
@@ -2646,8 +2826,10 @@
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "O GType registrado não é válido para o protocolo \"%s\""
 
-#: ../camel/camel-session.c:514 ../camel/providers/imapx/camel-imapx-server.c:2990
-#: ../camel/providers/pop3/camel-pop3-store.c:308 ../camel/providers/pop3/camel-pop3-store.c:790
+#: ../camel/camel-session.c:514
+#: ../camel/providers/imapx/camel-imapx-server.c:2990
+#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:790
 #: ../camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "No support for %s authentication"
@@ -2780,12 +2962,14 @@
 #: ../camel/camel-smime-context.c:635
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "O certificado é a única mensagem, não foi possível verificar certificados"
+msgstr ""
+"O certificado é a única mensagem, não foi possível verificar certificados"
 
 #: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "O certificado é a única mensagem, certificados importados e verificados"
+msgstr ""
+"O certificado é a única mensagem, certificados importados e verificados"
 
 #: ../camel/camel-smime-context.c:642
 msgid "Cannot find signature digests"
@@ -2864,11 +3048,13 @@
 msgid "Scanning folders in '%s'"
 msgstr "Verificando pastas em \"%s\""
 
-#: ../camel/camel-store.c:1606 ../camel/camel-store.c:1651 ../camel/camel-vtrash-folder.c:45
+#: ../camel/camel-store.c:1606 ../camel/camel-store.c:1651
+#: ../camel/camel-vtrash-folder.c:45
 msgid "Trash"
 msgstr "Lixeira"
 
-#: ../camel/camel-store.c:1620 ../camel/camel-store.c:1668 ../camel/camel-vtrash-folder.c:47
+#: ../camel/camel-store.c:1620 ../camel/camel-store.c:1668
+#: ../camel/camel-vtrash-folder.c:47
 msgid "Junk"
 msgstr "Spam"
 
@@ -2882,12 +3068,14 @@
 msgid "Creating folder '%s'"
 msgstr "Criando pasta \"%s\""
 
-#: ../camel/camel-store.c:2453 ../camel/camel-vee-store.c:410 ../camel/providers/local/camel-maildir-store.c:346
+#: ../camel/camel-store.c:2453 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:346
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Não foi possível excluir pasta: %s: Operação inválida"
 
-#: ../camel/camel-store.c:2643 ../camel/camel-vee-store.c:461 ../camel/providers/local/camel-maildir-store.c:914
+#: ../camel/camel-store.c:2643 ../camel/camel-vee-store.c:461
+#: ../camel/providers/local/camel-maildir-store.c:914
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Não foi possível renomear pasta: %s: Operação inválida"
@@ -2909,7 +3097,8 @@
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Reinicialização inicial somente tem suporte com CamelHttpStream"
 
-#: ../camel/camel-stream-process.c:278 ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../camel/camel-stream-process.c:278
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "Connection cancelled"
 msgstr "Conexão cancelada"
@@ -2997,21 +3186,32 @@
 #: ../camel/providers/imapx/camel-imapx-conn-manager.c:973
 #, c-format
 msgid "You must be working online to complete this operation (%s)"
-msgstr "Você deve estar trabalhando em modo conectado para completar esta operação (%s)"
+msgstr ""
+"Você deve estar trabalhando em modo conectado para completar esta operação "
+"(%s)"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:981 ../camel/providers/imapx/camel-imapx-server.c:3123
-#: ../camel/providers/nntp/camel-nntp-store.c:353 ../camel/providers/nntp/camel-nntp-store.c:1350
-#: ../camel/providers/nntp/camel-nntp-store.c:2158 ../camel/providers/nntp/camel-nntp-store.c:2302
-#: ../camel/providers/pop3/camel-pop3-folder.c:449 ../camel/providers/pop3/camel-pop3-folder.c:632
-#: ../camel/providers/pop3/camel-pop3-folder.c:834 ../camel/providers/pop3/camel-pop3-folder.c:1044
-#: ../camel/providers/pop3/camel-pop3-store.c:296 ../camel/providers/pop3/camel-pop3-store.c:529
-#: ../camel/providers/pop3/camel-pop3-store.c:577 ../camel/providers/pop3/camel-pop3-store.c:672
-#: ../camel/providers/pop3/camel-pop3-store.c:1107 ../camel/providers/smtp/camel-smtp-transport.c:543
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:981
+#: ../camel/providers/imapx/camel-imapx-server.c:3123
+#: ../camel/providers/nntp/camel-nntp-store.c:353
+#: ../camel/providers/nntp/camel-nntp-store.c:1350
+#: ../camel/providers/nntp/camel-nntp-store.c:2158
+#: ../camel/providers/nntp/camel-nntp-store.c:2302
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:632
+#: ../camel/providers/pop3/camel-pop3-folder.c:834
+#: ../camel/providers/pop3/camel-pop3-folder.c:1044
+#: ../camel/providers/pop3/camel-pop3-store.c:296
+#: ../camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:672
+#: ../camel/providers/pop3/camel-pop3-store.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:543
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Você deve estar em modo conectado para completar esta operação"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1561 ../camel/providers/imapx/camel-imapx-conn-manager.c:1649
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1561
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1649
 #, c-format
 msgid "No destination folder specified"
 msgstr "Nenhuma pasta de destino foi especificada"
@@ -3032,7 +3232,8 @@
 msgid "No quota information available for folder '%s : %s'"
 msgstr "Não há informações disponíveis sobre cota para a pasta \"%s : %s\""
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:968 ../camel/providers/nntp/camel-nntp-folder.c:765
+#: ../camel/providers/imapx/camel-imapx-folder.c:968
+#: ../camel/providers/nntp/camel-nntp-folder.c:765
 msgid "Apply message _filters to this folder"
 msgstr "Aplicar os _filtros de mensagens nesta pasta"
 
@@ -3091,7 +3292,8 @@
 msgid "Numbe_r of concurrent connections to use"
 msgstr "Núme_ro de conexões concorrentes a serem usadas"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:54 ../camel/providers/nntp/camel-nntp-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "Pastas"
 
@@ -3107,13 +3309,16 @@
 msgid "Namespace:"
 msgstr "Nomes:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:64 ../camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:77 ../camel/providers/local/camel-local-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/local/camel-local-provider.c:39
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:99
 #: ../camel/providers/nntp/camel-nntp-provider.c:38
 msgid "Options"
 msgstr "Opções"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:66 ../camel/providers/nntp/camel-nntp-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:40
 msgid "Apply _filters to new messages in all folders"
 msgstr "A_plicar filtros às novas mensagens em todas as pastas"
 
@@ -3153,7 +3358,8 @@
 msgid "Error writing to cache stream"
 msgstr "Erro ao escrever em fluxo de cache"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2806 ../camel/providers/imapx/camel-imapx-server.c:2894
+#: ../camel/providers/imapx/camel-imapx-server.c:2806
+#: ../camel/providers/imapx/camel-imapx-server.c:2894
 #: ../camel/providers/imapx/camel-imapx-server.c:3156
 msgid "Failed to get capabilities"
 msgstr "Falha ao obter capacidades"
@@ -3163,7 +3369,8 @@
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Falha ao conectar ao servidor IMAP %s em modo seguro: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2826 ../camel/providers/smtp/camel-smtp-transport.c:281
+#: ../camel/providers/imapx/camel-imapx-server.c:2826
+#: ../camel/providers/smtp/camel-smtp-transport.c:281
 msgid "STARTTLS not supported"
 msgstr "Não há suporte a STARTTLS"
 
@@ -3181,13 +3388,16 @@
 msgid "IMAP server %s does not support %s authentication"
 msgstr "O servidor IMAP %s não oferece suporte a autenticação %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3008 ../camel/providers/nntp/camel-nntp-store.c:459
+#: ../camel/providers/imapx/camel-imapx-server.c:3008
+#: ../camel/providers/nntp/camel-nntp-store.c:459
 #: ../camel/providers/nntp/camel-nntp-store.c:601
 msgid "Cannot authenticate without a username"
 msgstr "Não é possível autenticar sem um nome de usuário"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3017 ../camel/providers/nntp/camel-nntp-store.c:610
-#: ../camel/providers/pop3/camel-pop3-store.c:690 ../camel/providers/pop3/camel-pop3-store.c:728
+#: ../camel/providers/imapx/camel-imapx-server.c:3017
+#: ../camel/providers/nntp/camel-nntp-store.c:610
+#: ../camel/providers/pop3/camel-pop3-store.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:728
 msgid "Authentication password not available"
 msgstr "A senha de autenticação não está disponível"
 
@@ -3224,12 +3434,14 @@
 msgid "No such message available."
 msgstr "Não existe tal mensagem."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4111 ../camel/providers/imapx/camel-imapx-server.c:4136
+#: ../camel/providers/imapx/camel-imapx-server.c:4111
+#: ../camel/providers/imapx/camel-imapx-server.c:4136
 #: ../camel/providers/imapx/camel-imapx-server.c:4175
 msgid "Error fetching message"
 msgstr "Erro ao obter a mensagem"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4153 ../camel/providers/imapx/camel-imapx-server.c:4760
+#: ../camel/providers/imapx/camel-imapx-server.c:4153
+#: ../camel/providers/imapx/camel-imapx-server.c:4760
 msgid "Error performing NOOP"
 msgstr "Erro ao executar NOOP"
 
@@ -3249,7 +3461,8 @@
 msgid "Error copying messages"
 msgstr "Erro ao copiar as mensagens"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4546 ../camel/providers/imapx/camel-imapx-server.c:4567
+#: ../camel/providers/imapx/camel-imapx-server.c:4546
+#: ../camel/providers/imapx/camel-imapx-server.c:4567
 msgid "Cannot create spool file: "
 msgstr "Não foi possível criar arquivo de fila: "
 
@@ -3285,7 +3498,8 @@
 msgid "Error running STATUS"
 msgstr "Erro ao executar STATUS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5510 ../camel/providers/imapx/camel-imapx-server.c:5562
+#: ../camel/providers/imapx/camel-imapx-server.c:5510
+#: ../camel/providers/imapx/camel-imapx-server.c:5562
 msgid "Error syncing changes"
 msgstr "Erro ao sincronizar as mudanças"
 
@@ -3339,9 +3553,12 @@
 msgstr "Erro ao executar IDLE"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imapx/camel-imapx-store.c:224 ../camel/providers/local/camel-maildir-folder.c:482
-#: ../camel/providers/local/camel-maildir-store.c:347 ../camel/providers/local/camel-maildir-store.c:826
-#: ../camel/providers/local/camel-maildir-store.c:832 ../camel/providers/local/camel-maildir-store.c:915
+#: ../camel/providers/imapx/camel-imapx-store.c:224
+#: ../camel/providers/local/camel-maildir-folder.c:482
+#: ../camel/providers/local/camel-maildir-store.c:347
+#: ../camel/providers/local/camel-maildir-store.c:826
+#: ../camel/providers/local/camel-maildir-store.c:832
+#: ../camel/providers/local/camel-maildir-store.c:915
 #: ../camel/providers/local/camel-spool-store.c:393
 msgid "Inbox"
 msgstr "Entrada"
@@ -3360,14 +3577,16 @@
 msgid "No IMAPx connection object provided"
 msgstr "Nenhum objeto de conexão IMAPx fornecido"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:853 ../camel/providers/nntp/camel-nntp-provider.c:92
+#: ../camel/providers/imapx/camel-imapx-store.c:853
+#: ../camel/providers/nntp/camel-nntp-provider.c:92
 #: ../camel/providers/pop3/camel-pop3-provider.c:80
 msgid "Password"
 msgstr "Senha"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:855
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Esta opção conectará com o servidor IMAP usando uma senha em texto aberto."
+msgstr ""
+"Esta opção conectará com o servidor IMAP usando uma senha em texto aberto."
 
 #: ../camel/providers/imapx/camel-imapx-store.c:938
 #, c-format
@@ -3379,14 +3598,16 @@
 msgid "No IMAP namespace for folder path '%s'"
 msgstr "Nenhum espaço de nomes de IMAP para o caminho de pasta \"%s\""
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1642 ../camel/providers/imapx/camel-imapx-store.c:1876
+#: ../camel/providers/imapx/camel-imapx-store.c:1642
+#: ../camel/providers/imapx/camel-imapx-store.c:1876
 #, c-format
 msgid "Retrieving folder list for '%s'"
 msgstr "Recuperando a lista de pastas para \"%s\""
 
 #: ../camel/providers/imapx/camel-imapx-store.c:2093
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "O nome de pasta \"%s\" é inválido pois ele contém o caractere \"%c\""
 
 #: ../camel/providers/imapx/camel-imapx-store.c:2470
@@ -3489,7 +3710,8 @@
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:200 ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:200
+#: ../camel/providers/local/camel-local-folder.c:209
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "caixa de correio: %s (%s)"
@@ -3529,11 +3751,15 @@
 msgstr "Entrega local"
 
 #: ../camel/providers/local/camel-local-provider.c:67
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
 msgstr ""
-"Para recuperar (mover) correio local de repositórios no formato padrão mbox para pastas gerenciadas pelo Evolution."
+"Para recuperar (mover) correio local de repositórios no formato padrão mbox "
+"para pastas gerenciadas pelo Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:79 ../camel/providers/local/camel-local-provider.c:101
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:101
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Aplicar filtros às novas mensagens na caixa de entrada"
 
@@ -3553,12 +3779,14 @@
 msgid "Standard Unix mbox spool file"
 msgstr "Arquivo de fila mbox padrão do Unix"
 
-#: ../camel/providers/local/camel-local-provider.c:110 ../camel/providers/local/camel-local-provider.c:124
+#: ../camel/providers/local/camel-local-provider.c:110
+#: ../camel/providers/local/camel-local-provider.c:124
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Para ler e armazenar correio local em arquivos de fila mbox padrão externos.\n"
+"Para ler e armazenar correio local em arquivos de fila mbox padrão "
+"externos.\n"
 "Pode também ser usado para ler uma árvore de pastas do Elm, Pine ou Mutt."
 
 #: ../camel/providers/local/camel-local-provider.c:123
@@ -3575,8 +3803,10 @@
 msgid "Local mail file %s"
 msgstr "Arquivo de correio local %s"
 
-#: ../camel/providers/local/camel-local-store.c:213 ../camel/providers/local/camel-local-store.c:373
-#: ../camel/providers/local/camel-maildir-store.c:123 ../camel/providers/local/camel-mbox-store.c:572
+#: ../camel/providers/local/camel-local-store.c:213
+#: ../camel/providers/local/camel-local-store.c:373
+#: ../camel/providers/local/camel-maildir-store.c:123
+#: ../camel/providers/local/camel-mbox-store.c:572
 #: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -3587,8 +3817,10 @@
 msgid "Store root %s is not a regular directory"
 msgstr "Raiz de armazenagem %s não é um diretório comum"
 
-#: ../camel/providers/local/camel-local-store.c:234 ../camel/providers/local/camel-local-store.c:244
-#: ../camel/providers/local/camel-local-store.c:386 ../camel/providers/local/camel-maildir-store.c:165
+#: ../camel/providers/local/camel-local-store.c:234
+#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:386
+#: ../camel/providers/local/camel-maildir-store.c:165
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Não foi possível obter a pasta: %s: %s"
@@ -3598,12 +3830,14 @@
 msgid "Local stores do not have an inbox"
 msgstr "Os repositórios locais não possuem uma Caixa de entrada"
 
-#: ../camel/providers/local/camel-local-store.c:446 ../camel/providers/local/camel-mbox-store.c:739
+#: ../camel/providers/local/camel-local-store.c:446
+#: ../camel/providers/local/camel-mbox-store.c:739
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Não foi possível excluir o arquivo de índice de pasta \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-store.c:474 ../camel/providers/local/camel-mbox-store.c:769
+#: ../camel/providers/local/camel-local-store.c:474
+#: ../camel/providers/local/camel-mbox-store.c:769
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Não foi possível excluir o meta arquivo de pasta \"%s\": %s"
@@ -3613,8 +3847,10 @@
 msgid "Could not rename '%s': %s"
 msgstr "Não foi possível renomear \"%s\": %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:109 ../camel/providers/local/camel-maildir-folder.c:344
-#: ../camel/providers/local/camel-mbox-folder.c:126 ../camel/providers/local/camel-mbox-folder.c:339
+#: ../camel/providers/local/camel-maildir-folder.c:109
+#: ../camel/providers/local/camel-maildir-folder.c:344
+#: ../camel/providers/local/camel-mbox-folder.c:126
+#: ../camel/providers/local/camel-mbox-folder.c:339
 #: ../camel/providers/local/camel-mh-folder.c:157
 msgid "No such message"
 msgstr "Não existe tal mensagem"
@@ -3624,8 +3860,10 @@
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Não foi possível acrescentar a mensagem à pasta de correio local: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:282 ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-mbox-folder.c:400 ../camel/providers/local/camel-mh-folder.c:169
+#: ../camel/providers/local/camel-maildir-folder.c:282
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-mbox-folder.c:400
+#: ../camel/providers/local/camel-mh-folder.c:169
 #: ../camel/providers/local/camel-mh-folder.c:179
 #, c-format
 msgid "Cannot get message %s from folder %s: "
@@ -3636,30 +3874,36 @@
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Não foi possível transferir a mensagem para a pasta destino: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:131 ../camel/providers/local/camel-maildir-store.c:931
+#: ../camel/providers/local/camel-maildir-store.c:131
+#: ../camel/providers/local/camel-maildir-store.c:931
 #, c-format
 msgid "Cannot create folder containing '%s'"
 msgstr "Não foi possível criar a pasta \"%s\""
 
-#: ../camel/providers/local/camel-maildir-store.c:139 ../camel/providers/local/camel-maildir-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:139
+#: ../camel/providers/local/camel-maildir-store.c:158
 #: ../camel/providers/local/camel-maildir-store.c:923
 #, c-format
 msgid "Folder %s already exists"
 msgstr "A pasta %s já existe"
 
-#: ../camel/providers/local/camel-maildir-store.c:266 ../camel/providers/local/camel-maildir-store.c:297
-#: ../camel/providers/local/camel-mbox-store.c:401 ../camel/providers/local/camel-mbox-store.c:422
+#: ../camel/providers/local/camel-maildir-store.c:266
+#: ../camel/providers/local/camel-maildir-store.c:297
+#: ../camel/providers/local/camel-mbox-store.c:401
+#: ../camel/providers/local/camel-mbox-store.c:422
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Não foi possível criar a pasta \"%s\": %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:281 ../camel/providers/local/camel-mbox-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:281
+#: ../camel/providers/local/camel-mbox-store.c:367
 #: ../camel/providers/local/camel-mh-store.c:523
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Não foi possível obter a pasta \"%s\": %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:287 ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-maildir-store.c:287
+#: ../camel/providers/local/camel-mbox-store.c:377
 #: ../camel/providers/local/camel-mh-store.c:532
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -3670,7 +3914,8 @@
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Não foi possível obter a pasta \"%s\": não é um diretório maildir."
 
-#: ../camel/providers/local/camel-maildir-store.c:378 ../camel/providers/local/camel-maildir-store.c:418
+#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../camel/providers/local/camel-maildir-store.c:418
 #: ../camel/providers/local/camel-mh-store.c:676
 #, c-format
 msgid "Could not delete folder '%s': %s"
@@ -3680,13 +3925,16 @@
 msgid "not a maildir directory"
 msgstr "não é um diretório maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:666 ../camel/providers/local/camel-maildir-store.c:1146
-#: ../camel/providers/local/camel-spool-store.c:212 ../camel/providers/local/camel-spool-store.c:231
+#: ../camel/providers/local/camel-maildir-store.c:666
+#: ../camel/providers/local/camel-maildir-store.c:1146
+#: ../camel/providers/local/camel-spool-store.c:212
+#: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Não foi possível examinar a pasta \"%s\": %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:476 ../camel/providers/local/camel-maildir-summary.c:616
+#: ../camel/providers/local/camel-maildir-summary.c:476
+#: ../camel/providers/local/camel-maildir-summary.c:616
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Não é possível abrir o diretório maildir: %s: %s"
@@ -3699,8 +3947,10 @@
 msgid "Checking for new messages"
 msgstr "Verificando novas mensagens"
 
-#: ../camel/providers/local/camel-maildir-summary.c:810 ../camel/providers/local/camel-mbox-summary.c:466
-#: ../camel/providers/local/camel-mbox-summary.c:687 ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-maildir-summary.c:810
+#: ../camel/providers/local/camel-mbox-summary.c:466
+#: ../camel/providers/local/camel-mbox-summary.c:687
+#: ../camel/providers/local/camel-mbox-summary.c:836
 #: ../camel/providers/local/camel-spool-summary.c:139
 msgid "Storing folder"
 msgstr "Armazenando pasta"
@@ -3719,12 +3969,14 @@
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A pasta aparenta estar corrompida de modo irrecuperável."
 
-#: ../camel/providers/local/camel-mbox-folder.c:449 ../camel/providers/local/camel-spool-folder.c:67
+#: ../camel/providers/local/camel-mbox-folder.c:449
+#: ../camel/providers/local/camel-spool-folder.c:67
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Não foi possível criar a pasta de bloqueio em %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:389 ../camel/providers/local/camel-mbox-store.c:580
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:580
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Não foi possível criar uma pasta com este nome."
@@ -3748,7 +4000,8 @@
 msgid "Folder already exists"
 msgstr "A pasta já existe"
 
-#: ../camel/providers/local/camel-mbox-store.c:650 ../camel/providers/local/camel-mbox-store.c:663
+#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:663
 #: ../camel/providers/local/camel-mbox-store.c:692
 #, c-format
 msgid ""
@@ -3768,7 +4021,8 @@
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "A pasta \"%s\" não está vazia. Ela não foi excluída."
 
-#: ../camel/providers/local/camel-mbox-store.c:709 ../camel/providers/local/camel-mbox-store.c:724
+#: ../camel/providers/local/camel-mbox-store.c:709
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Não foi possível excluir o arquivo de resumo de pasta \"%s\": %s"
@@ -3793,18 +4047,21 @@
 msgid "Cannot check folder: %s: %s"
 msgstr "Não foi possível verificar a pasta: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:696 ../camel/providers/local/camel-mbox-summary.c:845
+#: ../camel/providers/local/camel-mbox-summary.c:696
+#: ../camel/providers/local/camel-mbox-summary.c:845
 #: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Não foi possível abrir o arquivo: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:715 ../camel/providers/local/camel-spool-summary.c:161
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-spool-summary.c:161
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Não foi possível abrir a caixa de correio temporária: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:732 ../camel/providers/local/camel-mbox-summary.c:967
+#: ../camel/providers/local/camel-mbox-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:967
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Não foi possível fechar a pasta fonte %s: %s"
@@ -3819,27 +4076,36 @@
 msgid "Could not rename folder: %s"
 msgstr "Não foi possível renomear a pasta: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:859 ../camel/providers/local/camel-mbox-summary.c:1132
+#: ../camel/providers/local/camel-mbox-summary.c:859
+#: ../camel/providers/local/camel-mbox-summary.c:1132
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Não foi possível armazenar a pasta: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:898 ../camel/providers/local/camel-mbox-summary.c:1172
+#: ../camel/providers/local/camel-mbox-summary.c:898
+#: ../camel/providers/local/camel-mbox-summary.c:1172
 #, c-format
-msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
-msgstr "O arquivo MBOX está corrompido. Por favor, corrija-o. (Uma linha De era esperada, mas não foi recebida.)"
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"O arquivo MBOX está corrompido. Por favor, corrija-o. (Uma linha De era "
+"esperada, mas não foi recebida.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:908 ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../camel/providers/local/camel-mbox-summary.c:908
+#: ../camel/providers/local/camel-mbox-summary.c:1184
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Incompatibilidade entre resumo e pasta, mesmo após sincronização"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1077 ../camel/providers/local/camel-spool-summary.c:356
+#: ../camel/providers/local/camel-mbox-summary.c:1077
+#: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1242 ../camel/providers/local/camel-mbox-summary.c:1272
+#: ../camel/providers/local/camel-mbox-summary.c:1242
+#: ../camel/providers/local/camel-mbox-summary.c:1272
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "A escrita na caixa de correio temporária falhou: %s"
@@ -3941,7 +4207,8 @@
 msgid "Spool folders cannot be renamed"
 msgstr "As pastas de fila não podem ser renomeadas"
 
-#: ../camel/providers/local/camel-spool-summary.c:177 ../camel/providers/local/camel-spool-summary.c:189
+#: ../camel/providers/local/camel-spool-summary.c:177
+#: ../camel/providers/local/camel-spool-summary.c:189
 #: ../camel/providers/local/camel-spool-summary.c:201
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
@@ -3952,7 +4219,8 @@
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Não foi possível sincronizar a pasta de fila %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:253 ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:253
+#: ../camel/providers/local/camel-spool-summary.c:272
 #: ../camel/providers/local/camel-spool-summary.c:285
 #, c-format
 msgid ""
@@ -3962,26 +4230,33 @@
 "Não foi possível sincronizar a pasta de fila %s: %s\n"
 "A pasta pode estar corrompida, cópia salva em \"%s\""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:227 ../camel/providers/nntp/camel-nntp-folder.c:595
+#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:595
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Erro interno: UID em formato inválido: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:297 ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/pop3/camel-pop3-folder.c:574 ../camel/providers/pop3/camel-pop3-folder.c:1002
+#: ../camel/providers/nntp/camel-nntp-folder.c:297
+#: ../camel/providers/nntp/camel-nntp-folder.c:302
+#: ../camel/providers/pop3/camel-pop3-folder.c:574
+#: ../camel/providers/pop3/camel-pop3-folder.c:1002
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Não foi possível obter mensagem: %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:309 ../camel/providers/nntp/camel-nntp-folder.c:629
-#: ../camel/providers/pop3/camel-pop3-folder.c:478 ../camel/providers/pop3/camel-pop3-folder.c:510
-#: ../camel/providers/pop3/camel-pop3-folder.c:542 ../camel/providers/pop3/camel-pop3-folder.c:564
+#: ../camel/providers/nntp/camel-nntp-folder.c:309
+#: ../camel/providers/nntp/camel-nntp-folder.c:629
+#: ../camel/providers/pop3/camel-pop3-folder.c:478
+#: ../camel/providers/pop3/camel-pop3-folder.c:510
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:564
 #: ../camel/providers/pop3/camel-pop3-folder.c:583
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Não foi possível obter mensagem %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:435 ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:435
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Posting failed: %s"
 msgstr "A publicação falhou: %s"
@@ -4001,8 +4276,11 @@
 msgstr "Você não pode copiar mensagens de uma pasta NNTP"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:45
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "Mo_strar pastas usando notação reduzida (ex.: c.o.linux no lugar de comp.os.linux)"
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"Mo_strar pastas usando notação reduzida (ex.: c.o.linux no lugar de comp.os."
+"linux)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
@@ -4022,15 +4300,23 @@
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "Este é um provedor para ler e publicar em grupos de notícias da USENET."
+msgstr ""
+"Este é um provedor para ler e publicar em grupos de notícias da USENET."
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:84
-msgid "This option will connect to the NNTP server anonymously, without authentication."
-msgstr "Esta opção estabelecerá conexão com o servidor NNTP de forma anônima, sem autenticação."
+msgid ""
+"This option will connect to the NNTP server anonymously, without "
+"authentication."
+msgstr ""
+"Esta opção estabelecerá conexão com o servidor NNTP de forma anônima, sem "
+"autenticação."
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:94
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "Esta opção autenticará com o servidor NNTP usando uma senha em texto aberto."
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Esta opção autenticará com o servidor NNTP usando uma senha em texto aberto."
 
 #: ../camel/providers/nntp/camel-nntp-store.c:381
 #, c-format
@@ -4076,7 +4362,9 @@
 #: ../camel/providers/nntp/camel-nntp-store.c:1367
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Você não pode criar uma pasta num repositório de notícias: em vez disso, inscreva-se."
+msgstr ""
+"Você não pode criar uma pasta num repositório de notícias: em vez disso, "
+"inscreva-se."
 
 #: ../camel/providers/nntp/camel-nntp-store.c:1383
 #, c-format
@@ -4086,7 +4374,9 @@
 #: ../camel/providers/nntp/camel-nntp-store.c:1406
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Você não pode remover uma pasta de um repositório de notícias: em vez disso, desinscreva-se."
+msgstr ""
+"Você não pode remover uma pasta de um repositório de notícias: em vez disso, "
+"desinscreva-se."
 
 #: ../camel/providers/nntp/camel-nntp-store.c:1616
 #, c-format
@@ -4124,7 +4414,8 @@
 msgid "No such folder: %s"
 msgstr "Não existe a pasta: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:197 ../camel/providers/nntp/camel-nntp-summary.c:337
+#: ../camel/providers/nntp/camel-nntp-summary.c:197
+#: ../camel/providers/nntp/camel-nntp-summary.c:337
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Verificando novas mensagens"
@@ -4144,7 +4435,8 @@
 msgid "Operation failed: %s"
 msgstr "A operação falhou: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:357 ../camel/providers/pop3/camel-pop3-folder.c:441
+#: ../camel/providers/pop3/camel-pop3-folder.c:357
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
 #, c-format
 msgid "No message with UID %s"
 msgstr "Não existe mensagem com UID %s"
@@ -4162,8 +4454,10 @@
 msgid "Retrieving POP summary"
 msgstr "Buscando resumo POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:703 ../camel/providers/pop3/camel-pop3-folder.c:706
-#: ../camel/providers/pop3/camel-pop3-folder.c:719 ../camel/providers/pop3/camel-pop3-folder.c:732
+#: ../camel/providers/pop3/camel-pop3-folder.c:703
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#: ../camel/providers/pop3/camel-pop3-folder.c:719
+#: ../camel/providers/pop3/camel-pop3-folder.c:732
 #: ../camel/providers/pop3/camel-pop3-folder.c:746
 msgid "Cannot get POP summary: "
 msgstr "Não é possível obter resumo POP: "
@@ -4217,19 +4511,21 @@
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
-"This option will connect to the POP server using a plaintext password. This is the only option supported by many POP "
-"servers."
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
 msgstr ""
-"Esta opção conectará com o servidor POP usando uma senha em texto aberto. Esta é a única opção que tem suporte de "
-"vários servidores POP."
+"Esta opção conectará com o servidor POP usando uma senha em texto aberto. "
+"Esta é a única opção que tem suporte de vários servidores POP."
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
-"This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for "
-"all users even on servers that claim to support it."
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
-"Esta opção estabelecerá uma conexão com o servidor POP através do protocolo APOP, usando uma senha criptografada. Isto "
-"poderá não funcionar para todos os usuários, mesmo em servidores que alegam oferecer suporte ao protocolo."
+"Esta opção estabelecerá uma conexão com o servidor POP através do protocolo "
+"APOP, usando uma senha criptografada. Isto poderá não funcionar para todos "
+"os usuários, mesmo em servidores que alegam oferecer suporte ao protocolo."
 
 #. Translators: This is the separator between an error and an explanation
 #: ../camel/providers/pop3/camel-pop3-store.c:95
@@ -4265,7 +4561,8 @@
 #: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "Não foi possível iniciar sessão no servidor POP %s: Erro do protocolo SASL"
+msgstr ""
+"Não foi possível iniciar sessão no servidor POP %s: Erro do protocolo SASL"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
@@ -4282,7 +4579,8 @@
 msgid "POP3 server for %s on %s"
 msgstr "Serviço POP3 para %s em %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:702 ../camel/providers/pop3/camel-pop3-store.c:715
+#: ../camel/providers/pop3/camel-pop3-store.c:702
+#: ../camel/providers/pop3/camel-pop3-store.c:715
 #: ../camel/providers/pop3/camel-pop3-store.c:801
 #, c-format
 msgid ""
@@ -4295,11 +4593,11 @@
 #: ../camel/providers/pop3/camel-pop3-store.c:742
 #, c-format
 msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your "
-"admin."
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
 msgstr ""
-"Não foi possível conectar ao servidor POP %s:\tID APOP recebido é inválido. Suspeita de ataque do falsa origem. Por "
-"favor contacte o administrador."
+"Não foi possível conectar ao servidor POP %s:\tID APOP recebido é inválido. "
+"Suspeita de ataque do falsa origem. Por favor contacte o administrador."
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
@@ -4328,8 +4626,12 @@
 msgstr "Sendmail"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:35
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "Para entregar correio passando-o para o programa \"sendmail\" no sistema local."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Para entregar correio passando-o para o programa \"sendmail\" no sistema "
+"local."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "sendmail"
@@ -4362,7 +4664,8 @@
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:230
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
-msgstr "Não foi possível criar pipe para \"%s\": %s: correio eletrônico não enviado"
+msgstr ""
+"Não foi possível criar pipe para \"%s\": %s: correio eletrônico não enviado"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:255
 #, c-format
@@ -4408,7 +4711,8 @@
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "Para entregar o correio conectando à um servidor remoto usando SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:237 ../camel/providers/smtp/camel-smtp-transport.c:244
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
 msgid "Welcome response error: "
 msgstr "Erro na resposta de boas vindas: "
 
@@ -4417,7 +4721,8 @@
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Falha ao se conectar ao servidor SMTP %s em modo seguro: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:289 ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:289
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
 #: ../camel/providers/smtp/camel-smtp-transport.c:309
 msgid "STARTTLS command failed: "
 msgstr "O comando STARTTLS falhou: "
@@ -4451,7 +4756,8 @@
 msgid "AUTH command failed: Not connected."
 msgstr "O comando AUTH falhou: Não conectado."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:706 ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 #: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "AUTH command failed: "
 msgstr "O comando AUTH falhou: "
@@ -4526,7 +4832,8 @@
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Ação de correio solicitada não executada: caixa de correio indisponível"
+msgstr ""
+"Ação de correio solicitada não executada: caixa de correio indisponível"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1102
 msgid "Requested action not taken: mailbox unavailable"
@@ -4580,12 +4887,14 @@
 msgid "SMTP Greeting"
 msgstr "Saudação SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1425 ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1425
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
 #: ../camel/providers/smtp/camel-smtp-transport.c:1445
 msgid "HELO command failed: "
 msgstr "O comando HELO falhou: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1521 ../camel/providers/smtp/camel-smtp-transport.c:1535
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1535
 #: ../camel/providers/smtp/camel-smtp-transport.c:1544
 msgid "MAIL FROM command failed: "
 msgstr "O comando MAIL FROM falhou: "
@@ -4594,24 +4903,30 @@
 msgid "RCPT TO command failed: "
 msgstr "O comando RCPT TO falhou: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1588 ../camel/providers/smtp/camel-smtp-transport.c:1597
+#: ../camel/providers/smtp/camel-smtp-transport.c:1588
+#: ../camel/providers/smtp/camel-smtp-transport.c:1597
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> falhou: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1669 ../camel/providers/smtp/camel-smtp-transport.c:1680
-#: ../camel/providers/smtp/camel-smtp-transport.c:1691 ../camel/providers/smtp/camel-smtp-transport.c:1753
-#: ../camel/providers/smtp/camel-smtp-transport.c:1771 ../camel/providers/smtp/camel-smtp-transport.c:1784
+#: ../camel/providers/smtp/camel-smtp-transport.c:1669
+#: ../camel/providers/smtp/camel-smtp-transport.c:1680
+#: ../camel/providers/smtp/camel-smtp-transport.c:1691
+#: ../camel/providers/smtp/camel-smtp-transport.c:1753
+#: ../camel/providers/smtp/camel-smtp-transport.c:1771
+#: ../camel/providers/smtp/camel-smtp-transport.c:1784
 #: ../camel/providers/smtp/camel-smtp-transport.c:1792
 msgid "DATA command failed: "
 msgstr "O comando DATA falhou: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1818 ../camel/providers/smtp/camel-smtp-transport.c:1832
+#: ../camel/providers/smtp/camel-smtp-transport.c:1818
+#: ../camel/providers/smtp/camel-smtp-transport.c:1832
 #: ../camel/providers/smtp/camel-smtp-transport.c:1840
 msgid "RSET command failed: "
 msgstr "O comando RSET falhou: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1866 ../camel/providers/smtp/camel-smtp-transport.c:1878
+#: ../camel/providers/smtp/camel-smtp-transport.c:1866
+#: ../camel/providers/smtp/camel-smtp-transport.c:1878
 #: ../camel/providers/smtp/camel-smtp-transport.c:1884
 msgid "QUIT command failed: "
 msgstr "O comando QUIT falhou: "
@@ -4641,8 +4956,12 @@
 msgstr "Unidades de lembrete de aniversário e bodas"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
-msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "Unidades para o lembrete de aniversário e bodas, \"minutos\", \"horas\" ou \"dias\""
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"Unidades para o lembrete de aniversário e bodas, \"minutos\", \"horas\" ou "
+"\"dias\""
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
 msgid "Whether the migration of old setting was already done"
@@ -4654,33 +4973,38 @@
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
 msgid ""
-"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it is searched for it. Change requires "
-"restart of the application."
+"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it "
+"is searched for it. Change requires restart of the application."
 msgstr ""
-"Um exemplo é \"/usr/bin/gpg\"; se não estiver preenchido, ou não existir, então ele será procurado. Alteração requer "
-"reinicializar o aplicativo."
+"Um exemplo é \"/usr/bin/gpg\"; se não estiver preenchido, ou não existir, "
+"então ele será procurado. Alteração requer reinicializar o aplicativo."
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:4
 msgid "Whether to load photos of signers/encrypters"
 msgstr "Se deve carregar fotos de signatários/criptografadores"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:5
-msgid "When set to 'true', tries to load also photo of the signers/encrypters, if available in the key/certificate."
+msgid ""
+"When set to 'true', tries to load also photo of the signers/encrypters, if "
+"available in the key/certificate."
 msgstr ""
-"Ao definir para \"true\", também tenta carregar a foto de signatários/criptografadores, se disponível na chave/"
-"certificado."
+"Ao definir para \"true\", também tenta carregar a foto de signatários/"
+"criptografadores, se disponível na chave/certificado."
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:6
 msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
-msgstr "Nome GIO do GNetworkMonitor a ser usado para uma instância ENetworkMonitor"
+msgstr ""
+"Nome GIO do GNetworkMonitor a ser usado para uma instância ENetworkMonitor"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:7
 msgid ""
-"When set to an unknown value, then the default GNetworkMonitor is used in the background. A special value 'always-"
-"online' is used for no network monitoring."
+"When set to an unknown value, then the default GNetworkMonitor is used in "
+"the background. A special value 'always-online' is used for no network "
+"monitoring."
 msgstr ""
-"Ao definir para um valor desconhecido, o GNetworkMonitor padrão a ser usado no plano de fundo. Um valor especial "
-"\"always-online\" é usado para nenhum monitoramento de rede."
+"Ao definir para um valor desconhecido, o GNetworkMonitor padrão a ser usado "
+"no plano de fundo. Um valor especial \"always-online\" é usado para nenhum "
+"monitoramento de rede."
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
@@ -4688,11 +5012,13 @@
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
 msgid ""
-"This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-"
-"Data-Server's account system. See the ESourceProxy API documentation for details."
+"This key was deprecated in version 3.12 and should no longer be used. Proxy "
+"settings are now integrated into Evolution-Data-Server's account system. See "
+"the ESourceProxy API documentation for details."
 msgstr ""
-"Esta chave se tornou obsoleta na versão 3.12 e não deve mais ser usada. As configurações de proxy agora estão "
-"integradas ao sistema de contas do Evolution-Data-Server. Veja a documentação da API ESourceProxy para detalhes."
+"Esta chave se tornou obsoleta na versão 3.12 e não deve mais ser usada. As "
+"configurações de proxy agora estão integradas ao sistema de contas do "
+"Evolution-Data-Server. Veja a documentação da API ESourceProxy para detalhes."
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
 msgid "(Deprecated) Whether to use http-proxy"
@@ -4755,7 +5081,9 @@
 #: ../libebackend/e-data-factory.c:1294
 #, c-format
 msgid "Backend factory for source '%s' and extension '%s' cannot be found."
-msgstr "Não foi possível localizar a fábrica de retaguarda (backend) \"%s\" e extensão \"%s\"."
+msgstr ""
+"Não foi possível localizar a fábrica de retaguarda (backend) \"%s\" e "
+"extensão \"%s\"."
 
 #: ../libebackend/e-server-side-source.c:141
 #, c-format
@@ -4769,22 +5097,30 @@
 #: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
-msgstr "Fonte de dados \"%s\" não oferece suporte a criação de recursos remotos"
+msgstr ""
+"Fonte de dados \"%s\" não oferece suporte a criação de recursos remotos"
 
 #: ../libebackend/e-server-side-source.c:1405
 #, c-format
-msgid "Data source '%s' has no collection backend to create the remote resource"
-msgstr "Fonte de dados \"%s\" não possui coleção de backend para criação de recursos remotos"
+msgid ""
+"Data source '%s' has no collection backend to create the remote resource"
+msgstr ""
+"Fonte de dados \"%s\" não possui coleção de backend para criação de recursos "
+"remotos"
 
 #: ../libebackend/e-server-side-source.c:1433 ../libedataserver/e-source.c:1708
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
-msgstr "Fonte de dados \"%s\" não oferece suporte a exclusão de recursos remotos"
+msgstr ""
+"Fonte de dados \"%s\" não oferece suporte a exclusão de recursos remotos"
 
 #: ../libebackend/e-server-side-source.c:1447
 #, c-format
-msgid "Data source '%s' has no collection backend to delete the remote resource"
-msgstr "Fonte de dados \"%s\" não possui coleção de backend para exclusão de recursos remotos"
+msgid ""
+"Data source '%s' has no collection backend to delete the remote resource"
+msgstr ""
+"Fonte de dados \"%s\" não possui coleção de backend para exclusão de "
+"recursos remotos"
 
 #: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
 #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
@@ -4988,24 +5324,54 @@
 msgid "Credentials delete is not supported"
 msgstr "Não há suporte à exclusão de credenciais"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
-msgid "Google authentication is not supported"
-msgstr "Não há suporte à autenticação do Google"
-
 #. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:81
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:145
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:242
 #, c-format
 msgid "Source '%s' (%s) is not a valid Google source"
 msgstr "Fonte '%s' (%s) não é uma fonte do Google válida"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:159
 msgid "Google secret not found"
 msgstr "O segredo de Google não foi localizado"
 
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:190
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:212
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:235
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:521
+msgid "Google authentication is not supported"
+msgstr "Não há suporte à autenticação do Google"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:397
+#| msgid "Failed to lookup credentials: "
+msgid "Failed to get Google secret from credentials"
+msgstr "Falha ao obter segredo de Google para credenciais"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:404
+msgid "Refresh token not found in Google secret"
+msgstr "Token de renovação não localizado no segredo de Google"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:412
+msgid "Failed to construct refresh_token request"
+msgstr "Falha ao construir requisição de refresh_token"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:445
+#| msgid "Failed to obtain an access token for '%s': "
+msgid "Failed to encode new access token to Google secret"
+msgstr "Falha ao codificar novo token de acesso ao segredo de Google"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:455
+#| msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgid "Failed to get access token from refresh_token server response"
+msgstr ""
+"Falha ao obter um token de acesso da resposta de refresh_token do servidor"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:461
+#| msgid "Failed to retrieve message"
+msgid "Failed to refresh token"
+msgstr "Falha ao renovar token"
+
 #: ../libedataserver/e-source-credentials-provider-impl-password.c:81
 msgid "Password not found"
 msgstr "Senha não encontrada"
@@ -5066,7 +5432,8 @@
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1720 ../libedataserver/e-time-utils.c:1840 ../libedataserver/e-time-utils.c:1973
+#: ../libedataserver/e-time-utils.c:1720 ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1973
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5148,7 +5515,8 @@
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserver/e-webdav-discover.c:484 ../libedataserver/e-webdav-discover.c:493
+#: ../libedataserver/e-webdav-discover.c:484
+#: ../libedataserver/e-webdav-discover.c:493
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "Erro de HTTP: %s"
@@ -5165,8 +5533,9 @@
 msgid "Unexpected reply from server"
 msgstr "Resposta não esperada do servidor"
 
-#: ../libedataserverui/e-credentials-prompter.c:260 ../libedataserverui/e-credentials-prompter.c:1563
-#: ../libedataserverui/e-credentials-prompter.c:1607
+#: ../libedataserverui/e-credentials-prompter.c:260
+#: ../libedataserverui/e-credentials-prompter.c:1573
+#: ../libedataserverui/e-credentials-prompter.c:1617
 msgid "Credentials prompt was cancelled"
 msgstr "A solicitação de credenciais foi cancelada"
 
@@ -5175,77 +5544,108 @@
 msgid "Source '%s' doesn't support prompt for credentials"
 msgstr "A fonte \"%s\" não possui suporte a ­­solicitação de credenciais"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:441
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:446
 #, c-format
 msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
-msgstr "Falha ao obter um token de acesso para o endereço \"%s\": código de erro %d (%s)"
+msgstr ""
+"Falha ao obter um token de acesso para o endereço \"%s\": código de erro %d "
+"(%s)"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:487
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:494
 msgid "Requesting access token, please wait..."
 msgstr "Requisitando token de acesso, por favor espere..."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:589
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:596
 msgid "Google Address book authentication request"
 msgstr "Requisição de autenticação de Google Contatos"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:592
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:599
 msgid "Google Calendar authentication request"
 msgstr "Requisição de autenticação de Google Agenda"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:595
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
 msgid "Google Memo List authentication request"
 msgstr "Requisição de autenticação de Google Keep"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:598
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
 msgid "Google Task List authentication request"
 msgstr "Requisição de autenticação de Google Tarefas"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:609
 msgid "Google Mail authentication request"
 msgstr "Requisição de autenticação do Google Mail"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:612
 msgid "Google account authentication request"
 msgstr "Requisição de autenticação de conta do Google"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:616
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
 #, c-format
-msgid "Login to your Google account and accept conditions in order to access your address book \"%s\"."
-msgstr "Autentique-se na sua conta Google e aceite condições para ter acesso a seu catálogo de endereços \"%s\"."
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"address book \"%s\"."
+msgstr ""
+"Autentique-se na sua conta Google e aceite condições para ter acesso a seu "
+"catálogo de endereços \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:620
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
 #, c-format
-msgid "Login to your Google account and accept conditions in order to access your calendar \"%s\"."
-msgstr "Autentique-se na sua conta Google e aceite condições para ter acesso a sua agenda \"%s\"."
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"calendar \"%s\"."
+msgstr ""
+"Autentique-se na sua conta Google e aceite condições para ter acesso a sua "
+"agenda \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:624
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
 #, c-format
-msgid "Login to your Google account and accept conditions in order to access your mail account \"%s\"."
-msgstr "Autentique-se na sua conta Google e aceite condições para ter acesso a sua conta de correio \"%s\"."
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail account \"%s\"."
+msgstr ""
+"Autentique-se na sua conta Google e aceite condições para ter acesso a sua "
+"conta de correio \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:628
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
 #, c-format
-msgid "Login to your Google account and accept conditions in order to access your mail transport \"%s\"."
-msgstr "Autentique-se na sua conta Google e aceite condições para ter acesso a seu transporte de correio \"%s\"."
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail transport \"%s\"."
+msgstr ""
+"Autentique-se na sua conta Google e aceite condições para ter acesso a seu "
+"transporte de correio \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:632
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
 #, c-format
-msgid "Login to your Google account and accept conditions in order to access your memo list \"%s\"."
-msgstr "Autentique-se na sua conta Google e aceite condições para ter acesso a sua lista memorandos \"%s\"."
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"memo list \"%s\"."
+msgstr ""
+"Autentique-se na sua conta Google e aceite condições para ter acesso a sua "
+"lista memorandos \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:636
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:643
 #, c-format
-msgid "Login to your Google account and accept conditions in order to access your task list \"%s\"."
-msgstr "Autentique-se na sua conta Google e aceite condições para ter acesso a sua lista de tarefas \"%s\"."
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"task list \"%s\"."
+msgstr ""
+"Autentique-se na sua conta Google e aceite condições para ter acesso a sua "
+"lista de tarefas \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:640
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:647
 #, c-format
-msgid "Login to your Google account and accept conditions in order to access your account \"%s\"."
-msgstr "Autentique-se na sua conta Google e aceite condições para ter acesso a sua conta \"%s\"."
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"account \"%s\"."
+msgstr ""
+"Autentique-se na sua conta Google e aceite condições para ter acesso a sua "
+"conta \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:684
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:232 ../libedataserverui/e-trust-prompt.c:114
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:691
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:232
+#: ../libedataserverui/e-trust-prompt.c:114
 #: ../libedataserverui/e-webdav-discover-widget.c:1063
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -5302,7 +5702,8 @@
 msgid "Please enter the password for account \"%s\"."
 msgstr "Por favor, entre com a senha para a conta de \"%s\"."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:233 ../libedataserverui/e-webdav-discover-widget.c:1064
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
+#: ../libedataserverui/e-webdav-discover-widget.c:1064
 msgid "_OK"
 msgstr "_OK"
 
@@ -5319,28 +5720,35 @@
 msgid "_Add this password to your keyring"
 msgstr "_Adicionar esta senha ao seu chaveiro"
 
-#: ../libedataserverui/e-trust-prompt.c:113 ../modules/trust-prompt/trust-prompt-gtk.c:119
+#: ../libedataserverui/e-trust-prompt.c:113
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
 msgid "Certificate trust..."
 msgstr "Confiança do certificado..."
 
-#: ../libedataserverui/e-trust-prompt.c:115 ../modules/trust-prompt/trust-prompt-gtk.c:120
+#: ../libedataserverui/e-trust-prompt.c:115
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
 msgid "_Reject"
 msgstr "_Rejeitar"
 
-#: ../libedataserverui/e-trust-prompt.c:116 ../modules/trust-prompt/trust-prompt-gtk.c:121
+#: ../libedataserverui/e-trust-prompt.c:116
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
 msgid "Accept _Temporarily"
 msgstr "Aceitar _temporariamente"
 
-#: ../libedataserverui/e-trust-prompt.c:117 ../modules/trust-prompt/trust-prompt-gtk.c:122
+#: ../libedataserverui/e-trust-prompt.c:117
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
 msgid "_Accept Permanently"
 msgstr "_Aceitar permanentemente"
 
-#: ../libedataserverui/e-trust-prompt.c:188 ../modules/trust-prompt/trust-prompt-gtk.c:159
+#: ../libedataserverui/e-trust-prompt.c:188
+#: ../modules/trust-prompt/trust-prompt-gtk.c:159
 #, c-format
 msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "O certificado SSL/TLS para \"%s\" não é confiável. Você deseja aceitá-lo?"
+msgstr ""
+"O certificado SSL/TLS para \"%s\" não é confiável. Você deseja aceitá-lo?"
 
-#: ../libedataserverui/e-trust-prompt.c:210 ../modules/trust-prompt/trust-prompt-gtk.c:174
+#: ../libedataserverui/e-trust-prompt.c:210
+#: ../modules/trust-prompt/trust-prompt-gtk.c:174
 msgid "Reason:"
 msgstr "Motivo:"
 
@@ -5348,27 +5756,41 @@
 msgid "Detailed error:"
 msgstr "Erro detalhado:"
 
-#: ../libedataserverui/e-trust-prompt.c:275 ../modules/trust-prompt/module-trust-prompt.c:82
+#: ../libedataserverui/e-trust-prompt.c:275
+#: ../modules/trust-prompt/module-trust-prompt.c:82
 msgid "The signing certificate authority is not known."
 msgstr "A autoridade da assinatura do certificado não é conhecida."
 
-#: ../libedataserverui/e-trust-prompt.c:277 ../modules/trust-prompt/module-trust-prompt.c:84
-msgid "The certificate does not match the expected identity of the site that it was retrieved from."
-msgstr "O certificado não coincide com a identidade esperada do site a qual esta foi recuperada."
+#: ../libedataserverui/e-trust-prompt.c:277
+#: ../modules/trust-prompt/module-trust-prompt.c:84
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"O certificado não coincide com a identidade esperada do site a qual esta foi "
+"recuperada."
 
-#: ../libedataserverui/e-trust-prompt.c:279 ../modules/trust-prompt/module-trust-prompt.c:86
+#: ../libedataserverui/e-trust-prompt.c:279
+#: ../modules/trust-prompt/module-trust-prompt.c:86
 msgid "The certificate's activation time is still in the future."
 msgstr "O tempo de ativação do certificado ainda permanece no futuro."
 
-#: ../libedataserverui/e-trust-prompt.c:281 ../modules/trust-prompt/module-trust-prompt.c:88
+#: ../libedataserverui/e-trust-prompt.c:281
+#: ../modules/trust-prompt/module-trust-prompt.c:88
 msgid "The certificate has expired."
 msgstr "O certificado expirou."
 
-#: ../libedataserverui/e-trust-prompt.c:283 ../modules/trust-prompt/module-trust-prompt.c:90
-msgid "The certificate has been revoked according to the connection's certificate revocation list."
-msgstr "O certificado foi revogado de acordo com a lista de revogação do certificado da conexão."
+#: ../libedataserverui/e-trust-prompt.c:283
+#: ../modules/trust-prompt/module-trust-prompt.c:90
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
+msgstr ""
+"O certificado foi revogado de acordo com a lista de revogação do certificado "
+"da conexão."
 
-#: ../libedataserverui/e-trust-prompt.c:285 ../modules/trust-prompt/module-trust-prompt.c:92
+#: ../libedataserverui/e-trust-prompt.c:285
+#: ../modules/trust-prompt/module-trust-prompt.c:92
 msgid "The certificate's algorithm is considered insecure."
 msgstr "O algoritmo do certificado é considerado inseguro."
 
@@ -5419,10 +5841,11 @@
 #: ../modules/gnome-online-accounts/e-goa-password-based.c:210
 #, c-format
 msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain a password for '%s'"
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain a password for '%s'"
 msgstr ""
-"Não foi possível encontrar uma conta correspondente no serviço \"org.gnome.OnlineAccounts\" a fim de obter uma senha "
-"para \"%s\""
+"Não foi possível encontrar uma conta correspondente no serviço \"org.gnome."
+"OnlineAccounts\" a fim de obter uma senha para \"%s\""
 
 #: ../modules/gnome-online-accounts/e-goa-password-based.c:273
 msgid "Failed to get password from GOA: "
@@ -5467,18 +5890,19 @@
 #: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1235
 #, c-format
 msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain an access token for "
-"'%s'"
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an access token for '%s'"
 msgstr ""
-"Não foi possível encontrar uma conta correspondente no serviço \"org.gnome.OnlineAccounts\" a fim de obter um token de "
-"acesso para \"%s\""
+"Não foi possível encontrar uma conta correspondente no serviço \"org.gnome."
+"OnlineAccounts\" a fim de obter um token de acesso para \"%s\""
 
 #: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
 msgstr "Falha ao obter um token de acesso para \"%s\": "
 
-#: ../modules/google-backend/module-google-backend.c:602 ../modules/yahoo-backend/module-yahoo-backend.c:226
+#: ../modules/google-backend/module-google-backend.c:602
+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -5488,7 +5912,8 @@
 msgid "Contacts"
 msgstr "Contatos"
 
-#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1 ../modules/yahoo-backend/module-yahoo-backend.c:199
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../modules/yahoo-backend/module-yahoo-backend.c:199
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -5536,17 +5961,23 @@
 #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
 #, c-format
 msgid ""
-"Cannot find a corresponding account service in the accounts database from which to obtain an access token for '%s'"
+"Cannot find a corresponding account service in the accounts database from "
+"which to obtain an access token for '%s'"
 msgstr ""
-"Não foi possível encontrar um serviço de conta correspondente na base de dados de contas a fim de obter um token de "
-"acesso para \"%s\""
+"Não foi possível encontrar um serviço de conta correspondente na base de "
+"dados de contas a fim de obter um token de acesso para \"%s\""
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:84 ../modules/ubuntu-online-accounts/uoa-utils.c:281
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
 #, c-format
-msgid "Expected status 200 when requesting your identity, instead got status %d (%s)"
-msgstr "Esperava-se estado 200 ao solicitar sua identidade, ao invés disso obteve-se estado %d (%s)"
+msgid ""
+"Expected status 200 when requesting your identity, instead got status %d (%s)"
+msgstr ""
+"Esperava-se estado 200 ao solicitar sua identidade, ao invés disso obteve-se "
+"estado %d (%s)"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:101 ../modules/ubuntu-online-accounts/uoa-utils.c:298
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
 msgid "Error parsing response as JSON: "
 msgstr "Erro ao analisar resposta em JSON: "
 
@@ -5630,7 +6061,8 @@
 msgid "_Dismiss"
 msgstr "_Descartar"
 
-#: ../tools/addressbook-export/addressbook-export.c:70 ../tools/addressbook-export/addressbook-export.c:767
+#: ../tools/addressbook-export/addressbook-export.c:70
+#: ../tools/addressbook-export/addressbook-export.c:784
 msgid "Can not open file"
 msgstr "Não foi possível abrir o arquivo"
 
@@ -5639,35 +6071,38 @@
 msgid "Failed to open client '%s': %s"
 msgstr "Falha ao abrir o cliente \"%s\": %s"
 
-#: ../tools/addressbook-export/addressbook-export.c:877
+#: ../tools/addressbook-export/addressbook-export.c:894
 msgid "Unhandled error"
 msgstr "Erro não tratado"
 
-#: ../tools/addressbook-export/addressbook-export.c:910
+#: ../tools/addressbook-export/addressbook-export.c:927
 msgid "Specify the output file instead of standard output"
 msgstr "Especifica o arquivo de saída ao invés da saída padrão"
 
-#: ../tools/addressbook-export/addressbook-export.c:911
+#: ../tools/addressbook-export/addressbook-export.c:928
 msgid "OUTPUTFILE"
 msgstr "ARQUIVO-SAÍDA"
 
-#: ../tools/addressbook-export/addressbook-export.c:914
+#: ../tools/addressbook-export/addressbook-export.c:931
 msgid "List local address book folders"
 msgstr "Lista pastas locais de catálogo de endereços"
 
-#: ../tools/addressbook-export/addressbook-export.c:917
+#: ../tools/addressbook-export/addressbook-export.c:934
 msgid "Show cards as vcard or csv file"
 msgstr "Mostra cartas como arquivo vcard ou csv"
 
-#: ../tools/addressbook-export/addressbook-export.c:918
+#: ../tools/addressbook-export/addressbook-export.c:935
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../tools/addressbook-export/addressbook-export.c:966
-msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "Erro nos argumentos de linha de comando; por favor, use a opção --help para ver o uso."
+#: ../tools/addressbook-export/addressbook-export.c:983
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Erro nos argumentos de linha de comando; por favor, use a opção --help para "
+"ver o uso."
 
-#: ../tools/addressbook-export/addressbook-export.c:980
+#: ../tools/addressbook-export/addressbook-export.c:997
 msgid "Only support csv or vcard format."
 msgstr "Há suporte apenas aos formatos csv ou vcard."
 
@@ -5720,22 +6155,33 @@
 #~ msgid "The user declined to authenticate"
 #~ msgstr "O usuário se recusou a autenticar."
 
-#~ msgid "SSL certificate for host '%s', used by address book '%s', is not trusted. Do you wish to accept it?"
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by address book '%s', is not trusted. "
+#~ "Do you wish to accept it?"
 #~ msgstr ""
-#~ "O certificado SSL para a máquina \"%s\", usado pelo livro de endereços \"%s\", não é confiável. Você deseja aceitá-"
-#~ "lo?"
+#~ "O certificado SSL para a máquina \"%s\", usado pelo livro de endereços "
+#~ "\"%s\", não é confiável. Você deseja aceitá-lo?"
 
-#~ msgid "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you wish to accept it?"
-#~ msgstr "O certificado SSL para a máquina \"%s\", usado pela agenda \"%s\", não é confiável. Você deseja aceitá-lo?"
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "O certificado SSL para a máquina \"%s\", usado pela agenda \"%s\", não é "
+#~ "confiável. Você deseja aceitá-lo?"
 
-#~ msgid "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do you wish to accept it?"
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
 #~ msgstr ""
-#~ "O certificado SSL para a máquina \"%s\", usado pela lista de memorandos \"%s\", não é confiável. Você deseja aceitá-"
-#~ "lo?"
+#~ "O certificado SSL para a máquina \"%s\", usado pela lista de memorandos "
+#~ "\"%s\", não é confiável. Você deseja aceitá-lo?"
 
-#~ msgid "SSL certificate for host '%s', used by task list '%s', is not trusted. Do you wish to accept it?"
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
 #~ msgstr ""
-#~ "O certificado SSL para a máquina \"%s\", usado pela lista de tarefas \"%s\", não é confiável. Você deseja aceitá-lo?"
+#~ "O certificado SSL para a máquina \"%s\", usado pela lista de tarefas \"%s"
+#~ "\", não é confiável. Você deseja aceitá-lo?"
 
 #~ msgid "No such data source for UID '%s'"
 #~ msgstr "Nenhuma fonte de dados para o UID \"%s\""
@@ -5795,17 +6241,22 @@
 #~ msgstr "A pasta pai não pode conter subpastas"
 
 #~ msgid "You cannot post NNTP messages while working offline!"
-#~ msgstr "Você não pode publicar mensagens NNTP enquanto trabalha desconectado!"
+#~ msgstr ""
+#~ "Você não pode publicar mensagens NNTP enquanto trabalha desconectado!"
 
-#~ msgid "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" means manual proxy."
+#~ msgid ""
+#~ "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+#~ "means manual proxy."
 #~ msgstr ""
-#~ "Qual o tipo de proxy a ser usado. \"0\" significa sistema, \"1\" significa sem proxy, \"2\" significa proxy manual."
+#~ "Qual o tipo de proxy a ser usado. \"0\" significa sistema, \"1\" "
+#~ "significa sem proxy, \"2\" significa proxy manual."
 
 #~ msgid "Whether to use proxy for HTTP requests."
 #~ msgstr "Se o proxy deve ser usado nas requisições HTTP."
 
 #~ msgid "Whether authentication is required to access proxy server."
-#~ msgstr "Se autenticação é necessária para acessar este servidor proxy ou não."
+#~ msgstr ""
+#~ "Se autenticação é necessária para acessar este servidor proxy ou não."
 
 #~ msgid "Host name to use for HTTP requests."
 #~ msgstr "Nome da máquina para requisições HTTP"
@@ -5850,7 +6301,9 @@
 #~ msgstr "A consulta de nome falhou"
 
 #~ msgid "Name lookup failed. Check your host name for spelling errors."
-#~ msgstr "A consulta de nome falhou. Verifique seu nome de máquina por erros de escrita."
+#~ msgstr ""
+#~ "A consulta de nome falhou. Verifique seu nome de máquina por erros de "
+#~ "escrita."
 
 #~ msgid "Name lookup failed: %s"
 #~ msgstr "A consulta de nome falhou: %s"
@@ -5919,7 +6372,8 @@
 #~ msgstr "Não foi possível adicionar mensagem ao resumo: razão desconhecida"
 
 #~ msgid "Fatal mail parser error near position %s in folder %s"
-#~ msgstr "Erro fatal do analisador de correio próximo à posição %s na pasta %s"
+#~ msgstr ""
+#~ "Erro fatal do analisador de correio próximo à posição %s na pasta %s"
 
 #~ msgid "Not part of certificate"
 #~ msgstr "Não faz parte do certificado"
diff -Nru evolution-data-server-3.22.0/po/sk.po evolution-data-server-3.22.1/po/sk.po
--- evolution-data-server-3.22.0/po/sk.po	2016-09-12 06:01:38.000000000 +0000
+++ evolution-data-server-3.22.1/po/sk.po	2016-10-06 14:50:19.000000000 +0000
@@ -13,7 +13,7 @@
 "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=general\n"
-"POT-Creation-Date: 2016-08-24 15:50+0000\n"
+"POT-Creation-Date: 2016-09-19 08:02+0000\n"
 "PO-Revision-Date: 2016-09-10 16:50+0200\n"
 "Last-Translator: Dušan Kazik \n"
 "Language-Team: Slovak \n"
@@ -1351,17 +1351,17 @@
 msgid "CalDAV backend is not loaded yet"
 msgstr "Obslužný program CalDAV nie je ešte načítaný"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1200
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1204
 #: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "Neplatná URL presmerovania"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2899
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2918
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Nedá sa vytvoriť miestny priečinok vyrovnávacej pamäte „%s“"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2985
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3004
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1370,28 +1370,28 @@
 "Server je nedostupný, kalendár je otvorený v režime iba-na-čítanie.\n"
 "Chybová správa: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4090
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4109
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV nepodporuje hromadné pridávanie"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4193
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4212
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV nepodporuje hromadné úpravy"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4474
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4493
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV nepodporuje hromadné odstraňovanie"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5221
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5240
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalendár nepodporuje diár"
 
 # MČ: 	/* with 'calendar-schedule' supported, here's an outbox url for queries of free/busy information */
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5230
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5249
 msgid "Schedule outbox url not found"
 msgstr "Nebola nájdená url výstupu diára"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5327
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5346
 msgid "Unexpected result in schedule-response"
 msgstr "Neočakávaný výsledok v odpovedi diára"
 
@@ -2163,36 +2163,36 @@
 msgstr "Obnovuje sa priečinok „%s : %s“"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:845 ../camel/camel-folder-search.c:887
+#: ../camel/camel-folder-search.c:865 ../camel/camel-folder-search.c:907
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) vyžaduje jeden výsledok ako logickú hodnotu"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:922
+#: ../camel/camel-folder-search.c:942
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nie je povolené vnútri %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:929 ../camel/camel-folder-search.c:937
+#: ../camel/camel-folder-search.c:949 ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) vyžaduje reťazcový typ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:965
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) očakáva ako výsledok pole"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:995
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) vyžaduje množinu priečinkov"
 
-#: ../camel/camel-folder-search.c:1887 ../camel/camel-folder-search.c:2056
+#: ../camel/camel-folder-search.c:1918 ../camel/camel-folder-search.c:2090
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2201,7 +2201,7 @@
 "Nedá sa analyzovať vyhľadávací výraz: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1899 ../camel/camel-folder-search.c:2068
+#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2102
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2213,7 +2213,7 @@
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2171
+#: ../camel/camel-folder-summary.c:2196
 #, c-format
 msgid "Release unused memory for folder '%s : %s'"
 msgstr "Uvoľniť nevyužitú pamäť pre priečinok „%s : %s“"
@@ -2221,7 +2221,7 @@
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2390
+#: ../camel/camel-folder-summary.c:2420
 #, c-format
 msgid "Update preview data for folder '%s : %s'"
 msgstr "Aktualizovať prehľad údajov priečinku „%s : %s“"
@@ -5039,18 +5039,18 @@
 msgid ""
 "When set to 'true', tries to load also photo of the signers/encrypters, if "
 "available in the key/certificate."
-msgstr ""
+msgstr "Keď je nastavené na „true“, pokúsi sa načítať aj fotografie podpisovateľov/šifrovateľov ak sú dostupné v kľúči/certifikáte"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:6
 msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
-msgstr ""
+msgstr "Názov GIO objektu GNetworkMonitorm, ktorý sa pužije v inštancii ENetworkMonitor"
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:7
 msgid ""
 "When set to an unknown value, then the default GNetworkMonitor is used in "
 "the background. A special value 'always-online' is used for no network "
 "monitoring."
-msgstr ""
+msgstr "Keď je nastavená neznáma hodnota, potom sa v pozadí použije predvolená hodnota triedy GNetworkMonitor. Špeciálna hodnota „always-online“ sa používa na sledovanie bez siete."
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
@@ -6089,7 +6089,7 @@
 msgstr "_Zavrhnúť"
 
 #: ../tools/addressbook-export/addressbook-export.c:70
-#: ../tools/addressbook-export/addressbook-export.c:767
+#: ../tools/addressbook-export/addressbook-export.c:784
 msgid "Can not open file"
 msgstr "Nedá sa otvoriť súbor"
 
@@ -6098,41 +6098,41 @@
 msgid "Failed to open client '%s': %s"
 msgstr "Zlyhalo otvorenie klienta „%s“: %s"
 
-#: ../tools/addressbook-export/addressbook-export.c:877
+#: ../tools/addressbook-export/addressbook-export.c:894
 msgid "Unhandled error"
 msgstr "Neošetrená chyba"
 
 # cmd line desc
-#: ../tools/addressbook-export/addressbook-export.c:910
+#: ../tools/addressbook-export/addressbook-export.c:927
 msgid "Specify the output file instead of standard output"
 msgstr "Určí výstupný súbor namiesto štandardného výstupu"
 
-#: ../tools/addressbook-export/addressbook-export.c:911
+#: ../tools/addressbook-export/addressbook-export.c:928
 msgid "OUTPUTFILE"
 msgstr "VÝSTUPNÝ_SÚBOR"
 
 # cmd line desc
-#: ../tools/addressbook-export/addressbook-export.c:914
+#: ../tools/addressbook-export/addressbook-export.c:931
 msgid "List local address book folders"
 msgstr "Vypíše zoznam miestnych priečinkov s adresármi kontaktov"
 
 # cmd line desc
-#: ../tools/addressbook-export/addressbook-export.c:917
+#: ../tools/addressbook-export/addressbook-export.c:934
 msgid "Show cards as vcard or csv file"
 msgstr "Zobrazí vizitky ako súbor vcard alebo csv"
 
-#: ../tools/addressbook-export/addressbook-export.c:918
+#: ../tools/addressbook-export/addressbook-export.c:935
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../tools/addressbook-export/addressbook-export.c:966
+#: ../tools/addressbook-export/addressbook-export.c:983
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Chyba parametrov príkazového riadka. Prosím, použite parameter --help na "
 "zobrazenie pomocníka s použitím."
 
-#: ../tools/addressbook-export/addressbook-export.c:980
+#: ../tools/addressbook-export/addressbook-export.c:997
 msgid "Only support csv or vcard format."
 msgstr "Podporovaný je iba formát csv alebo vcard."
 
diff -Nru evolution-data-server-3.22.0/services/evolution-source-registry/evolution-source-registry-resource.c evolution-data-server-3.22.1/services/evolution-source-registry/evolution-source-registry-resource.c
--- evolution-data-server-3.22.0/services/evolution-source-registry/evolution-source-registry-resource.c	2016-09-19 07:50:02.000000000 +0000
+++ evolution-data-server-3.22.1/services/evolution-source-registry/evolution-source-registry-resource.c	2016-10-10 08:11:39.000000000 +0000
@@ -6,7 +6,7 @@
 # define SECTION
 #endif
 
-static const SECTION union { const guint8 data[37704]; const double alignment; void * const ptr;}  evolution_source_registry_resource_data = { {
+static const SECTION union { const guint8 data[37728]; const double alignment; void * const ptr;}  evolution_source_registry_resource_data = { {
   0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x18, 0x00, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00, 
@@ -43,55 +43,55 @@
   0x85, 0x2b, 0x00, 0x00, 0xb7, 0x39, 0x08, 0xac, 
   0x09, 0x00, 0x00, 0x00, 0x85, 0x2b, 0x00, 0x00, 
   0x12, 0x00, 0x76, 0x00, 0x98, 0x2b, 0x00, 0x00, 
-  0xfc, 0x30, 0x00, 0x00, 0x4b, 0xed, 0xd0, 0x8f, 
-  0x03, 0x00, 0x00, 0x00, 0xfc, 0x30, 0x00, 0x00, 
-  0x13, 0x00, 0x76, 0x00, 0x10, 0x31, 0x00, 0x00, 
-  0xa6, 0x31, 0x00, 0x00, 0xcf, 0xa8, 0x84, 0x78, 
-  0x16, 0x00, 0x00, 0x00, 0xa6, 0x31, 0x00, 0x00, 
-  0x16, 0x00, 0x4c, 0x00, 0xbc, 0x31, 0x00, 0x00, 
-  0xc4, 0x31, 0x00, 0x00, 0xd0, 0x24, 0x17, 0x21, 
-  0x08, 0x00, 0x00, 0x00, 0xc4, 0x31, 0x00, 0x00, 
-  0x0b, 0x00, 0x4c, 0x00, 0xd0, 0x31, 0x00, 0x00, 
-  0xf0, 0x31, 0x00, 0x00, 0x44, 0xd4, 0x6c, 0xcd, 
-  0x03, 0x00, 0x00, 0x00, 0xf0, 0x31, 0x00, 0x00, 
-  0x0f, 0x00, 0x76, 0x00, 0x00, 0x32, 0x00, 0x00, 
-  0xba, 0x3a, 0x00, 0x00, 0xc7, 0x1f, 0x3f, 0x63, 
-  0x03, 0x00, 0x00, 0x00, 0xba, 0x3a, 0x00, 0x00, 
-  0x1a, 0x00, 0x76, 0x00, 0xd8, 0x3a, 0x00, 0x00, 
-  0xa0, 0x44, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xa0, 0x44, 0x00, 0x00, 
-  0x01, 0x00, 0x4c, 0x00, 0xa4, 0x44, 0x00, 0x00, 
-  0xa8, 0x44, 0x00, 0x00, 0xbb, 0x3f, 0xc0, 0x6e, 
-  0x09, 0x00, 0x00, 0x00, 0xa8, 0x44, 0x00, 0x00, 
-  0x10, 0x00, 0x76, 0x00, 0xb8, 0x44, 0x00, 0x00, 
-  0x85, 0x4d, 0x00, 0x00, 0x62, 0xd3, 0xba, 0xad, 
-  0x03, 0x00, 0x00, 0x00, 0x85, 0x4d, 0x00, 0x00, 
-  0x0c, 0x00, 0x76, 0x00, 0x98, 0x4d, 0x00, 0x00, 
-  0xec, 0x5a, 0x00, 0x00, 0xb3, 0x79, 0xeb, 0x01, 
-  0x09, 0x00, 0x00, 0x00, 0xec, 0x5a, 0x00, 0x00, 
-  0x12, 0x00, 0x76, 0x00, 0x00, 0x5b, 0x00, 0x00, 
-  0x44, 0x60, 0x00, 0x00, 0x81, 0x84, 0x17, 0x78, 
-  0x03, 0x00, 0x00, 0x00, 0x44, 0x60, 0x00, 0x00, 
-  0x10, 0x00, 0x76, 0x00, 0x58, 0x60, 0x00, 0x00, 
-  0xc5, 0x6b, 0x00, 0x00, 0xea, 0x4e, 0x41, 0x5c, 
-  0x09, 0x00, 0x00, 0x00, 0xc5, 0x6b, 0x00, 0x00, 
-  0x13, 0x00, 0x76, 0x00, 0xd8, 0x6b, 0x00, 0x00, 
-  0xe7, 0x71, 0x00, 0x00, 0x43, 0x09, 0xf4, 0x52, 
-  0x03, 0x00, 0x00, 0x00, 0xe7, 0x71, 0x00, 0x00, 
-  0x16, 0x00, 0x76, 0x00, 0x00, 0x72, 0x00, 0x00, 
-  0xbe, 0x7b, 0x00, 0x00, 0x85, 0x3a, 0x5c, 0x31, 
-  0x03, 0x00, 0x00, 0x00, 0xbe, 0x7b, 0x00, 0x00, 
-  0x17, 0x00, 0x76, 0x00, 0xd8, 0x7b, 0x00, 0x00, 
-  0x97, 0x85, 0x00, 0x00, 0x05, 0x10, 0x60, 0x23, 
-  0x09, 0x00, 0x00, 0x00, 0x97, 0x85, 0x00, 0x00, 
-  0x11, 0x00, 0x76, 0x00, 0xa8, 0x85, 0x00, 0x00, 
-  0x31, 0x93, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, 
-  0x0c, 0x00, 0x00, 0x00, 0x31, 0x93, 0x00, 0x00, 
-  0x04, 0x00, 0x4c, 0x00, 0x38, 0x93, 0x00, 0x00, 
-  0x3c, 0x93, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, 
-  0x15, 0x00, 0x00, 0x00, 0x3c, 0x93, 0x00, 0x00, 
-  0x06, 0x00, 0x4c, 0x00, 0x44, 0x93, 0x00, 0x00, 
-  0x48, 0x93, 0x00, 0x00, 0x76, 0x66, 0x6f, 0x6c, 
+  0x13, 0x31, 0x00, 0x00, 0x4b, 0xed, 0xd0, 0x8f, 
+  0x03, 0x00, 0x00, 0x00, 0x13, 0x31, 0x00, 0x00, 
+  0x13, 0x00, 0x76, 0x00, 0x28, 0x31, 0x00, 0x00, 
+  0xbe, 0x31, 0x00, 0x00, 0xcf, 0xa8, 0x84, 0x78, 
+  0x16, 0x00, 0x00, 0x00, 0xbe, 0x31, 0x00, 0x00, 
+  0x16, 0x00, 0x4c, 0x00, 0xd4, 0x31, 0x00, 0x00, 
+  0xdc, 0x31, 0x00, 0x00, 0xd0, 0x24, 0x17, 0x21, 
+  0x08, 0x00, 0x00, 0x00, 0xdc, 0x31, 0x00, 0x00, 
+  0x0b, 0x00, 0x4c, 0x00, 0xe8, 0x31, 0x00, 0x00, 
+  0x08, 0x32, 0x00, 0x00, 0x44, 0xd4, 0x6c, 0xcd, 
+  0x03, 0x00, 0x00, 0x00, 0x08, 0x32, 0x00, 0x00, 
+  0x0f, 0x00, 0x76, 0x00, 0x18, 0x32, 0x00, 0x00, 
+  0xd2, 0x3a, 0x00, 0x00, 0xc7, 0x1f, 0x3f, 0x63, 
+  0x03, 0x00, 0x00, 0x00, 0xd2, 0x3a, 0x00, 0x00, 
+  0x1a, 0x00, 0x76, 0x00, 0xf0, 0x3a, 0x00, 0x00, 
+  0xb8, 0x44, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 
+  0xff, 0xff, 0xff, 0xff, 0xb8, 0x44, 0x00, 0x00, 
+  0x01, 0x00, 0x4c, 0x00, 0xbc, 0x44, 0x00, 0x00, 
+  0xc0, 0x44, 0x00, 0x00, 0xbb, 0x3f, 0xc0, 0x6e, 
+  0x09, 0x00, 0x00, 0x00, 0xc0, 0x44, 0x00, 0x00, 
+  0x10, 0x00, 0x76, 0x00, 0xd0, 0x44, 0x00, 0x00, 
+  0x9d, 0x4d, 0x00, 0x00, 0x62, 0xd3, 0xba, 0xad, 
+  0x03, 0x00, 0x00, 0x00, 0x9d, 0x4d, 0x00, 0x00, 
+  0x0c, 0x00, 0x76, 0x00, 0xb0, 0x4d, 0x00, 0x00, 
+  0x04, 0x5b, 0x00, 0x00, 0xb3, 0x79, 0xeb, 0x01, 
+  0x09, 0x00, 0x00, 0x00, 0x04, 0x5b, 0x00, 0x00, 
+  0x12, 0x00, 0x76, 0x00, 0x18, 0x5b, 0x00, 0x00, 
+  0x5c, 0x60, 0x00, 0x00, 0x81, 0x84, 0x17, 0x78, 
+  0x03, 0x00, 0x00, 0x00, 0x5c, 0x60, 0x00, 0x00, 
+  0x10, 0x00, 0x76, 0x00, 0x70, 0x60, 0x00, 0x00, 
+  0xdd, 0x6b, 0x00, 0x00, 0xea, 0x4e, 0x41, 0x5c, 
+  0x09, 0x00, 0x00, 0x00, 0xdd, 0x6b, 0x00, 0x00, 
+  0x13, 0x00, 0x76, 0x00, 0xf0, 0x6b, 0x00, 0x00, 
+  0xff, 0x71, 0x00, 0x00, 0x43, 0x09, 0xf4, 0x52, 
+  0x03, 0x00, 0x00, 0x00, 0xff, 0x71, 0x00, 0x00, 
+  0x16, 0x00, 0x76, 0x00, 0x18, 0x72, 0x00, 0x00, 
+  0xd6, 0x7b, 0x00, 0x00, 0x85, 0x3a, 0x5c, 0x31, 
+  0x03, 0x00, 0x00, 0x00, 0xd6, 0x7b, 0x00, 0x00, 
+  0x17, 0x00, 0x76, 0x00, 0xf0, 0x7b, 0x00, 0x00, 
+  0xaf, 0x85, 0x00, 0x00, 0x05, 0x10, 0x60, 0x23, 
+  0x09, 0x00, 0x00, 0x00, 0xaf, 0x85, 0x00, 0x00, 
+  0x11, 0x00, 0x76, 0x00, 0xc0, 0x85, 0x00, 0x00, 
+  0x49, 0x93, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, 
+  0x0c, 0x00, 0x00, 0x00, 0x49, 0x93, 0x00, 0x00, 
+  0x04, 0x00, 0x4c, 0x00, 0x50, 0x93, 0x00, 0x00, 
+  0x54, 0x93, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, 
+  0x15, 0x00, 0x00, 0x00, 0x54, 0x93, 0x00, 0x00, 
+  0x06, 0x00, 0x4c, 0x00, 0x5c, 0x93, 0x00, 0x00, 
+  0x60, 0x93, 0x00, 0x00, 0x76, 0x66, 0x6f, 0x6c, 
   0x64, 0x65, 0x72, 0x2e, 0x73, 0x6f, 0x75, 0x72, 
   0x63, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x03, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -1402,7 +1402,7 @@
   0x75, 0x75, 0x61, 0x79, 0x29, 0x67, 0x6f, 0x6f, 
   0x67, 0x6c, 0x65, 0x2d, 0x73, 0x74, 0x75, 0x62, 
   0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x00, 
-  0x54, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x6b, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x0a, 0x5b, 0x44, 0x61, 0x74, 0x61, 0x20, 0x53, 
   0x6f, 0x75, 0x72, 0x63, 0x65, 0x5d, 0x0a, 0x44, 
   0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 
@@ -1469,114 +1469,117 @@
   0x97, 0xe0, 0xa5, 0x82, 0xe0, 0xa4, 0x97, 0xe0, 
   0xa4, 0xb2, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 
   0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x68, 
-  0x75, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
+  0x72, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
   0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 
-  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x69, 0x64, 
+  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x68, 0x75, 
   0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 
   0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 
-  0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x69, 0x74, 0x5d, 
+  0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x69, 0x64, 0x5d, 
   0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 
   0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 
-  0x61, 0x6d, 0x65, 0x5b, 0x6a, 0x61, 0x5d, 0x3d, 
+  0x61, 0x6d, 0x65, 0x5b, 0x69, 0x74, 0x5d, 0x3d, 
   0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 
   0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 
-  0x6d, 0x65, 0x5b, 0x6b, 0x6b, 0x5d, 0x3d, 0x47, 
+  0x6d, 0x65, 0x5b, 0x6a, 0x61, 0x5d, 0x3d, 0x47, 
   0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 
   0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 
-  0x65, 0x5b, 0x6b, 0x6e, 0x5d, 0x3d, 0xe0, 0xb2, 
-  0x97, 0xe0, 0xb3, 0x82, 0xe0, 0xb2, 0x97, 0xe0, 
-  0xb2, 0xb2, 0xe0, 0xb3, 0x8d, 0x0a, 0x44, 0x69, 
-  0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 
-  0x65, 0x5b, 0x6b, 0x6f, 0x5d, 0x3d, 0xea, 0xb5, 
-  0xac, 0xea, 0xb8, 0x80, 0x0a, 0x44, 0x69, 0x73, 
+  0x65, 0x5b, 0x6b, 0x6b, 0x5d, 0x3d, 0x47, 0x6f, 
+  0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 
   0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 
-  0x5b, 0x6c, 0x74, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 
-  0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 
+  0x5b, 0x6b, 0x6e, 0x5d, 0x3d, 0xe0, 0xb2, 0x97, 
+  0xe0, 0xb3, 0x82, 0xe0, 0xb2, 0x97, 0xe0, 0xb2, 
+  0xb2, 0xe0, 0xb3, 0x8d, 0x0a, 0x44, 0x69, 0x73, 
+  0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 
+  0x5b, 0x6b, 0x6f, 0x5d, 0x3d, 0xea, 0xb5, 0xac, 
+  0xea, 0xb8, 0x80, 0x0a, 0x44, 0x69, 0x73, 0x70, 
   0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 
-  0x6c, 0x76, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 
+  0x6c, 0x74, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 
   0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 
-  0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x6d, 
-  0x72, 0x5d, 0x3d, 0xe0, 0xa4, 0x97, 0xe0, 0xa5, 
-  0x82, 0xe0, 0xa4, 0x97, 0xe0, 0xa4, 0xb2, 0x0a, 
-  0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 
-  0x61, 0x6d, 0x65, 0x5b, 0x6e, 0x62, 0x5d, 0x3d, 
-  0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 
+  0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x6c, 
+  0x76, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
+  0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 
+  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x6d, 0x72, 
+  0x5d, 0x3d, 0xe0, 0xa4, 0x97, 0xe0, 0xa5, 0x82, 
+  0xe0, 0xa4, 0x97, 0xe0, 0xa4, 0xb2, 0x0a, 0x44, 
   0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 
-  0x6d, 0x65, 0x5b, 0x6e, 0x6c, 0x5d, 0x3d, 0x47, 
+  0x6d, 0x65, 0x5b, 0x6e, 0x62, 0x5d, 0x3d, 0x47, 
   0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 
   0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 
-  0x65, 0x5b, 0x6f, 0x63, 0x5d, 0x3d, 0x47, 0x6f, 
+  0x65, 0x5b, 0x6e, 0x6c, 0x5d, 0x3d, 0x47, 0x6f, 
   0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 
   0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 
-  0x5b, 0x6f, 0x72, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 
+  0x5b, 0x6f, 0x63, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 
   0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 
   0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 
-  0x70, 0x6c, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 
+  0x6f, 0x72, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 
   0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 
   0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x70, 
-  0x74, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
+  0x6c, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
   0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 
   0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x70, 0x74, 
-  0x5f, 0x42, 0x52, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 
-  0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 
-  0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 
-  0x72, 0x75, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 
+  0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 
+  0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 
+  0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x70, 0x74, 0x5f, 
+  0x42, 0x52, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 
   0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 
-  0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73, 
-  0x6b, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
+  0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x72, 
+  0x75, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
   0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 
-  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73, 0x6c, 
+  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73, 0x6b, 
   0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 
   0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 
-  0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73, 0x72, 0x5d, 
-  0x3d, 0xd0, 0x93, 0xd1, 0x83, 0xd0, 0xb3, 0xd0, 
-  0xbb, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 
-  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73, 0x72, 
-  0x40, 0x6c, 0x61, 0x74, 0x69, 0x6e, 0x5d, 0x3d, 
-  0x47, 0x75, 0x67, 0x6c, 0x0a, 0x44, 0x69, 0x73, 
-  0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 
-  0x5b, 0x73, 0x76, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 
-  0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 
+  0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73, 0x6c, 0x5d, 
+  0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 
+  0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 
+  0x61, 0x6d, 0x65, 0x5b, 0x73, 0x72, 0x5d, 0x3d, 
+  0xd0, 0x93, 0xd1, 0x83, 0xd0, 0xb3, 0xd0, 0xbb, 
+  0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 
+  0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73, 0x72, 0x40, 
+  0x6c, 0x61, 0x74, 0x69, 0x6e, 0x5d, 0x3d, 0x47, 
+  0x75, 0x67, 0x6c, 0x0a, 0x44, 0x69, 0x73, 0x70, 
   0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 
-  0x74, 0x61, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 
+  0x73, 0x76, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 
   0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 
   0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x74, 
-  0x65, 0x5d, 0x3d, 0xe0, 0xb0, 0x97, 0xe0, 0xb1, 
-  0x82, 0xe0, 0xb0, 0x97, 0xe0, 0xb1, 0x81, 0xe0, 
-  0xb0, 0xb2, 0xe0, 0xb1, 0x8d, 0x0a, 0x44, 0x69, 
-  0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 
-  0x65, 0x5b, 0x74, 0x68, 0x5d, 0x3d, 0xe0, 0xb8, 
-  0x81, 0xe0, 0xb8, 0xb9, 0xe0, 0xb9, 0x80, 0xe0, 
-  0xb8, 0x81, 0xe0, 0xb8, 0xb4, 0xe0, 0xb8, 0xa5, 
+  0x61, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
+  0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 
+  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x74, 0x65, 
+  0x5d, 0x3d, 0xe0, 0xb0, 0x97, 0xe0, 0xb1, 0x82, 
+  0xe0, 0xb0, 0x97, 0xe0, 0xb1, 0x81, 0xe0, 0xb0, 
+  0xb2, 0xe0, 0xb1, 0x8d, 0x0a, 0x44, 0x69, 0x73, 
+  0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 
+  0x5b, 0x74, 0x68, 0x5d, 0x3d, 0xe0, 0xb8, 0x81, 
+  0xe0, 0xb8, 0xb9, 0xe0, 0xb9, 0x80, 0xe0, 0xb8, 
+  0x81, 0xe0, 0xb8, 0xb4, 0xe0, 0xb8, 0xa5, 0x0a, 
+  0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 
+  0x61, 0x6d, 0x65, 0x5b, 0x74, 0x72, 0x5d, 0x3d, 
+  0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 
+  0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 
+  0x6d, 0x65, 0x5b, 0x75, 0x67, 0x5d, 0x3d, 0xda, 
+  0xaf, 0xdb, 0x87, 0xda, 0xaf, 0xd9, 0x89, 0xd9, 
+  0x84, 0x28, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 
+  0x29, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 
+  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x75, 0x6b, 
+  0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 
   0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 
-  0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x74, 0x72, 0x5d, 
+  0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x76, 0x69, 0x5d, 
   0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 
   0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 
-  0x61, 0x6d, 0x65, 0x5b, 0x75, 0x67, 0x5d, 0x3d, 
-  0xda, 0xaf, 0xdb, 0x87, 0xda, 0xaf, 0xd9, 0x89, 
-  0xd9, 0x84, 0x28, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
-  0x65, 0x29, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 
-  0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x75, 
-  0x6b, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
+  0x61, 0x6d, 0x65, 0x5b, 0x7a, 0x68, 0x5f, 0x43, 
+  0x4e, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 
   0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 
-  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x76, 0x69, 
-  0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 
-  0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 
-  0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x7a, 0x68, 0x5f, 
-  0x43, 0x4e, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 
-  0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 
-  0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x7a, 
-  0x68, 0x5f, 0x48, 0x4b, 0x5d, 0x3d, 0x47, 0x6f, 
-  0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 
-  0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 
-  0x5b, 0x7a, 0x68, 0x5f, 0x54, 0x57, 0x5d, 0x3d, 
-  0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x45, 
-  0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x3d, 0x74, 
-  0x72, 0x75, 0x65, 0x0a, 0x50, 0x61, 0x72, 0x65, 
-  0x6e, 0x74, 0x3d, 0x0a, 0x00, 0x00, 0x28, 0x75, 
-  0x75, 0x61, 0x79, 0x29, 0x73, 0x79, 0x73, 0x74, 
-  0x65, 0x6d, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 
-  0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x00, 
+  0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x7a, 0x68, 
+  0x5f, 0x48, 0x4b, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 
+  0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 
+  0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 
+  0x7a, 0x68, 0x5f, 0x54, 0x57, 0x5d, 0x3d, 0x47, 
+  0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x45, 0x6e, 
+  0x61, 0x62, 0x6c, 0x65, 0x64, 0x3d, 0x74, 0x72, 
+  0x75, 0x65, 0x0a, 0x50, 0x61, 0x72, 0x65, 0x6e, 
+  0x74, 0x3d, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 
+  0x61, 0x79, 0x29, 0x73, 0x79, 0x73, 0x74, 0x65, 
+  0x6d, 0x2d, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 
+  0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x00, 0x00, 
   0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x0a, 0x5b, 0x44, 0x61, 0x74, 0x61, 0x20, 0x53, 
   0x6f, 0x75, 0x72, 0x63, 0x65, 0x5d, 0x0a, 0x44,