summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2017-11-29 09:48:07 +0100
committerAndreas Grapentin <andreas@grapentin.org>2017-11-29 09:48:07 +0100
commitebb7228c14c12cb30865da7f6a11fa9edcea269b (patch)
treec9ce14b967f1a9335800ecead5531966e26be256
parent1e6ce442d9068ad7d6954898501bb7e92b0e5544 (diff)
downloadabslibre-ebb7228c14c12cb30865da7f6a11fa9edcea269b.tar.gz
abslibre-ebb7228c14c12cb30865da7f6a11fa9edcea269b.tar.bz2
abslibre-ebb7228c14c12cb30865da7f6a11fa9edcea269b.zip
nonprism/evolution-data-server: updated to 3.26.2.1
-rw-r--r--nonprism/evolution-data-server/PKGBUILD17
-rw-r--r--nonprism/evolution-data-server/git-fixes.patch7856
2 files changed, 11 insertions, 7862 deletions
diff --git a/nonprism/evolution-data-server/PKGBUILD b/nonprism/evolution-data-server/PKGBUILD
index d6a9dc548..4015d3433 100644
--- a/nonprism/evolution-data-server/PKGBUILD
+++ b/nonprism/evolution-data-server/PKGBUILD
@@ -1,19 +1,24 @@
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
pkgname=evolution-data-server
-pkgver=3.24.4
-pkgrel=1.nonprism1
+
+pkgver=3.26.2.1
+pkgrel=3.nonprism1
+_commit=7149f838ab4a908c1a8fc71fcac3a769b3043895 # tags/EVOLUTION_DATA_SERVER_3_26_2_1^0
+arch=(i686 x86_64)
+
pkgdesc="Centralized access to appointments and contacts, without libgdata support"
url="https://wiki.gnome.org/Apps/Evolution"
-arch=(i686 x86_64)
+license=(GPL)
+
depends=(gnome-online-accounts nss krb5 libgweather libical db libphonenumber)
makedepends=(intltool gperf gobject-introspection vala gtk-doc boost git cmake ninja)
-license=(GPL)
replaces=("${pkgname}-coherence" "${pkgname}-nonprism")
conflicts=("${pkgname}-coherence" "${pkgname}-nonprism")
-_commit=4b64d44b1dd01a05be38504ae2a130f21a417913 # tags/EVOLUTION_DATA_SERVER_3_24_4^0
+
source=("git+https://git.gnome.org/browse/evolution-data-server#commit=$_commit")
sha256sums=('SKIP')
diff --git a/nonprism/evolution-data-server/git-fixes.patch b/nonprism/evolution-data-server/git-fixes.patch
deleted file mode 100644
index 88c0a1fb6..000000000
--- a/nonprism/evolution-data-server/git-fixes.patch
+++ /dev/null
@@ -1,7856 +0,0 @@
-diff --git a/addressbook/backends/google/e-gdata-oauth2-authorizer.c b/addressbook/backends/google/e-gdata-oauth2-authorizer.c
-index 8b1bca5..9bd5c38 100644
---- a/addressbook/backends/google/e-gdata-oauth2-authorizer.c
-+++ b/addressbook/backends/google/e-gdata-oauth2-authorizer.c
-@@ -150,8 +150,7 @@ gdata_oauth2_authorizer_constructed (GObject *object)
- GList *domains;
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->constructed (object);
-
- priv = E_GDATA_OAUTH2_AUTHORIZER_GET_PRIVATE (object);
-
-diff --git a/addressbook/backends/ldap/e-source-ldap.c b/addressbook/backends/ldap/e-source-ldap.c
-index 24f4a1e..fe6c349 100644
---- a/addressbook/backends/ldap/e-source-ldap.c
-+++ b/addressbook/backends/ldap/e-source-ldap.c
-@@ -241,6 +241,9 @@ source_ldap_constructed (GObject *object)
- ESourceExtension *other_extension;
- const gchar *extension_name;
-
-+ /* Chain up to parent's method. */
-+ G_OBJECT_CLASS (e_source_ldap_parent_class)->constructed (object);
-+
- this_extension = E_SOURCE_EXTENSION (object);
- source = e_source_extension_ref_source (this_extension);
-
-diff --git a/addressbook/libebook-contacts/e-contact.c b/addressbook/libebook-contacts/e-contact.c
-index dce1e0e..7a59169 100644
---- a/addressbook/libebook-contacts/e-contact.c
-+++ b/addressbook/libebook-contacts/e-contact.c
-@@ -1457,6 +1457,25 @@ e_contact_vcard_attribute (EContactField field_id)
- }
-
- /**
-+ * e_contact_field_is_string:
-+ * @field_id: an #EContactField
-+ *
-+ * Returns whether the @field_id is of a string type,
-+ * thus it can be used with e_contact_get_const().
-+ *
-+ * Returns: Whether the @field_id is of a string type.
-+ *
-+ * Since: 3.14
-+ **/
-+gboolean
-+e_contact_field_is_string (EContactField field_id)
-+{
-+ g_return_val_if_fail (field_id >= 1 && field_id < E_CONTACT_FIELD_LAST, FALSE);
-+
-+ return (field_info[field_id].t & E_CONTACT_FIELD_TYPE_STRING) != 0;
-+}
-+
-+/**
- * e_contact_field_id:
- * @field_name: a string representing a contact field
- *
-@@ -1711,7 +1730,8 @@ e_contact_get (EContact *contact,
- * @field_id: an #EContactField
- *
- * Gets the value of @contact's field specified by @field_id, caching
-- * the result so it can be freed later.
-+ * the result so it can be freed later. Use e_contact_field_is_string()
-+ * to check whether the field can be used here.
- *
- * Returns: (transfer none): Depends on the field's type, owned by the
- * #EContact.
-diff --git a/addressbook/libebook-contacts/e-contact.h b/addressbook/libebook-contacts/e-contact.h
-index dbd9778..22ac45c 100644
---- a/addressbook/libebook-contacts/e-contact.h
-+++ b/addressbook/libebook-contacts/e-contact.h
-@@ -421,6 +421,7 @@ GType e_contact_field_type (EContactField field_id);
- const gchar * e_contact_field_name (EContactField field_id);
- const gchar * e_contact_pretty_name (EContactField field_id);
- const gchar * e_contact_vcard_attribute (EContactField field_id);
-+gboolean e_contact_field_is_string (EContactField field_id);
- EContactField e_contact_field_id (const gchar *field_name);
- EContactField e_contact_field_id_from_vcard (const gchar *vcard_field);
-
-diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
-index e0bf16c..c99ef09 100644
---- a/addressbook/libedata-book/e-book-backend-sexp.c
-+++ b/addressbook/libedata-book/e-book-backend-sexp.c
-@@ -962,7 +962,7 @@ func_exists (struct _ESExp *f,
-
- if (argc == 1
- && argv[0]->type == ESEXP_RES_STRING) {
-- gchar *propname;
-+ const gchar *propname;
- struct prop_info *info = NULL;
- gint i;
- gboolean saw_any = FALSE;
-@@ -1013,15 +1013,22 @@ func_exists (struct _ESExp *f,
- * against value in this field only */
- EContactField fid = e_contact_field_id (propname);
-
-- if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST) {
-+ if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST &&
-+ e_contact_field_is_string (fid)) {
- const gchar *prop = e_contact_get_const (ctx->contact, fid);
-
- if (prop && *prop)
- truth = TRUE;
- } else {
- /* is is not a known EContact field, try with EVCard attributes */
-- EVCardAttribute *attr = e_vcard_get_attribute (E_VCARD (ctx->contact), propname);
-- GList *l, *values = attr ? e_vcard_attribute_get_values (attr) : NULL;
-+ EVCardAttribute *attr;
-+ GList *l, *values;
-+
-+ if (fid >= E_CONTACT_FIELD_FIRST && fid < E_CONTACT_FIELD_LAST)
-+ propname = e_contact_vcard_attribute (fid);
-+
-+ attr = e_vcard_get_attribute (E_VCARD (ctx->contact), propname);
-+ values = attr ? e_vcard_attribute_get_values (attr) : NULL;
-
- for (l = values; l && !truth; l = l->next) {
- const gchar *value = l->data;
-diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
-index b7c07b9..f189126 100644
---- a/calendar/backends/caldav/e-cal-backend-caldav.c
-+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
-@@ -5239,14 +5239,6 @@ e_cal_backend_caldav_finalize (GObject *object)
- }
-
- static void
--cal_backend_caldav_constructed (GObject *object)
--{
-- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_cal_backend_caldav_parent_class)->
-- constructed (object);
--}
--
--static void
- e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
- {
- SoupSessionFeature *feature;
-@@ -5325,7 +5317,6 @@ e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *class)
-
- object_class->dispose = e_cal_backend_caldav_dispose;
- object_class->finalize = e_cal_backend_caldav_finalize;
-- object_class->constructed = cal_backend_caldav_constructed;
-
- backend_class->get_backend_property = caldav_get_backend_property;
- backend_class->shutdown = caldav_shutdown;
-diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
-index d5fca99..4c2b67e 100644
---- a/calendar/backends/contacts/e-cal-backend-contacts.c
-+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
-@@ -1290,8 +1290,7 @@ e_cal_backend_contacts_constructed (GObject *object)
- (GDestroyNotify) g_object_unref);
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_cal_backend_contacts_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_cal_backend_contacts_parent_class)->constructed (object);
- }
-
- /* Object initialization function for the contacts backend */
-diff --git a/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c b/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c
-index d65b934..c1c5632 100644
---- a/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c
-+++ b/calendar/backends/gtasks/e-gdata-oauth2-authorizer.c
-@@ -150,8 +150,7 @@ gdata_oauth2_authorizer_constructed (GObject *object)
- GList *domains;
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_gdata_oauth2_authorizer_parent_class)->constructed (object);
-
- priv = E_GDATA_OAUTH2_AUTHORIZER_GET_PRIVATE (object);
-
-diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c
-index e84cea7..b0a47dd 100644
---- a/calendar/libedata-cal/e-cal-backend-store.c
-+++ b/calendar/libedata-cal/e-cal-backend-store.c
-@@ -619,8 +619,7 @@ cal_backend_store_constructed (GObject *object)
- g_object_unref (timezone_cache);
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_cal_backend_store_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_cal_backend_store_parent_class)->constructed (object);
- }
-
- static gboolean
-diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
-index 4faa992..983682f 100644
---- a/camel/camel-folder-search.c
-+++ b/camel/camel-folder-search.c
-@@ -754,8 +754,7 @@ folder_search_constructed (GObject *object)
- gint ii;
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (camel_folder_search_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (camel_folder_search_parent_class)->constructed (object);
-
- search = CAMEL_FOLDER_SEARCH (object);
- class = CAMEL_FOLDER_SEARCH_GET_CLASS (search);
-diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c
-index fbaafcb..c56ed94 100644
---- a/camel/camel-offline-store.c
-+++ b/camel/camel-offline-store.c
-@@ -61,8 +61,7 @@ offline_store_constructed (GObject *object)
- priv = CAMEL_OFFLINE_STORE_GET_PRIVATE (object);
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (camel_offline_store_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (camel_offline_store_parent_class)->constructed (object);
-
- session = camel_service_ref_session (CAMEL_SERVICE (object));
- priv->online = camel_session_get_online (session);
-diff --git a/camel/providers/imapx/camel-imapx-input-stream.c b/camel/providers/imapx/camel-imapx-input-stream.c
-index 2a383c7..02983f3 100644
---- a/camel/providers/imapx/camel-imapx-input-stream.c
-+++ b/camel/providers/imapx/camel-imapx-input-stream.c
-@@ -679,6 +679,7 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is,
- guchar *o, *p, *e;
- guint literal;
- gint digits;
-+ gboolean is_literal8 = FALSE;
-
- g_return_val_if_fail (CAMEL_IS_IMAPX_INPUT_STREAM (is), IMAPX_TOK_ERROR);
- g_return_val_if_fail (data != NULL, IMAPX_TOK_ERROR);
-@@ -711,6 +712,21 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is,
- c = *p++;
- } while (c == ' ' || c == '\r');
-
-+ if (c == '~') {
-+ if (p >= e) {
-+ is->priv->ptr = p;
-+ if (imapx_input_stream_fill (is, cancellable, error) == IMAPX_TOK_ERROR)
-+ return IMAPX_TOK_ERROR;
-+ p = is->priv->ptr;
-+ e = is->priv->end;
-+ }
-+
-+ if (*p == '{') {
-+ c = *p++;
-+ is_literal8 = TRUE;
-+ }
-+ }
-+
- /*strchr("\n*()[]+", c)*/
- if (imapx_is_token_char (c)) {
- is->priv->ptr = p;
-@@ -723,6 +739,18 @@ camel_imapx_input_stream_token (CamelIMAPXInputStream *is,
- c = *p++;
- if (isdigit (c) && literal < (UINT_MAX / 10)) {
- literal = literal * 10 + (c - '0');
-+ } else if (is_literal8 && c == '+') {
-+ if (p >= e) {
-+ is->priv->ptr = p;
-+ if (imapx_input_stream_fill (is, cancellable, error) == IMAPX_TOK_ERROR)
-+ return IMAPX_TOK_ERROR;
-+ p = is->priv->ptr;
-+ e = is->priv->end;
-+ }
-+
-+ /* The '+' can be only at the end of the literal8 token */
-+ if (*p != '}')
-+ goto protocol_error;
- } else if (c == '}') {
- while (1) {
- while (p < e) {
-diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
-index 63b6f65..cfff143 100644
---- a/camel/providers/imapx/camel-imapx-server.c
-+++ b/camel/providers/imapx/camel-imapx-server.c
-@@ -320,6 +320,7 @@ typedef enum {
- IMAPX_IDLE_STARTED, /* IDLE continuation received; IDLE active */
- IMAPX_IDLE_CANCEL, /* Cancelled from ISSUED state; need to send
- DONE as soon as we receive continuation */
-+ IMAPX_IDLE_WAIT_DONE /* DONE was issued, waiting for a confirmation response */
- } CamelIMAPXIdleState;
-
- #define IMAPX_IDLE_DWELL_TIME 2 /* Number of seconds to remain in PENDING
-@@ -390,7 +391,7 @@ struct _CamelIMAPXServerPrivate {
- gchar inbox_separator;
-
- /* IDLE support */
-- GMutex idle_lock;
-+ GRecMutex idle_lock;
- GThread *idle_thread;
- GMainLoop *idle_main_loop;
- GMainContext *idle_main_context;
-@@ -1472,7 +1473,7 @@ imapx_command_start_next (CamelIMAPXServer *is)
- "waiting for idle to stop \n");
- /* if there are more pending commands,
- * then they should be processed too */
-- break;
-+ return;
-
- case IMAPX_IDLE_STOP_ERROR:
- return;
-@@ -3054,25 +3055,27 @@ imapx_continuation (CamelIMAPXServer *is,
- return FALSE;
-
- c (is->tagprefix, "Got continuation response for IDLE \n");
-- g_mutex_lock (&is->priv->idle_lock);
-+ g_rec_mutex_lock (&is->priv->idle_lock);
- /* We might have actually sent the DONE already! */
-- if (is->priv->idle_state == IMAPX_IDLE_ISSUED)
-+ if (is->priv->idle_state == IMAPX_IDLE_ISSUED) {
- is->priv->idle_state = IMAPX_IDLE_STARTED;
-- else if (is->priv->idle_state == IMAPX_IDLE_CANCEL) {
-+ } else if (is->priv->idle_state == IMAPX_IDLE_CANCEL) {
- /* IDLE got cancelled after we sent the command, while
- * we were waiting for this continuation. Send DONE
- * immediately. */
- if (!imapx_command_idle_stop (is, error)) {
-- g_mutex_unlock (&is->priv->idle_lock);
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
- return FALSE;
- }
-- is->priv->idle_state = IMAPX_IDLE_OFF;
-+ is->priv->idle_state = IMAPX_IDLE_WAIT_DONE;
-+ } else if (is->priv->idle_state == IMAPX_IDLE_WAIT_DONE) {
-+ /* Do nothing, just wait */
- } else {
- c (
- is->tagprefix, "idle starts in wrong state %d\n",
- is->priv->idle_state);
- }
-- g_mutex_unlock (&is->priv->idle_lock);
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
-
- QUEUE_LOCK (is);
- is->literal = NULL;
-@@ -3548,9 +3551,9 @@ imapx_command_idle_done (CamelIMAPXServer *is,
- camel_imapx_job_take_error (job, local_error);
- }
-
-- g_mutex_lock (&is->priv->idle_lock);
-+ g_rec_mutex_lock (&is->priv->idle_lock);
- is->priv->idle_state = IMAPX_IDLE_OFF;
-- g_mutex_unlock (&is->priv->idle_lock);
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
-
- imapx_unregister_job (is, job);
- }
-@@ -3579,29 +3582,23 @@ imapx_job_idle_start (CamelIMAPXJob *job,
- cp = g_queue_peek_head (&ic->parts);
- cp->type |= CAMEL_IMAPX_COMMAND_CONTINUATION;
-
-- g_mutex_lock (&is->priv->idle_lock);
-+ QUEUE_LOCK (is);
-+ g_rec_mutex_lock (&is->priv->idle_lock);
- /* Don't issue it if the idle was cancelled already */
- if (is->priv->idle_state == IMAPX_IDLE_PENDING) {
- is->priv->idle_state = IMAPX_IDLE_ISSUED;
-- g_mutex_unlock (&is->priv->idle_lock);
-
-- QUEUE_LOCK (is);
-- /* It can be that another thread started a command between
-- the two locks above had been interchanged, thus also test
-- whether the active command queue is empty, before starting
-- the IDLE command. */
- if (camel_imapx_command_queue_is_empty (is->active)) {
- imapx_command_start (is, ic);
- } else {
- c (is->tagprefix, "finally cancelling IDLE, other command was quicker\n");
-+ is->priv->idle_state = IMAPX_IDLE_OFF;
- imapx_unregister_job (is, job);
- }
- } else {
-- g_mutex_unlock (&is->priv->idle_lock);
--
-- QUEUE_LOCK (is);
- imapx_unregister_job (is, job);
- }
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
- QUEUE_UNLOCK (is);
-
- camel_imapx_command_unref (ic);
-@@ -3690,13 +3687,16 @@ imapx_call_idle (gpointer data)
- goto exit;
-
- /* XXX Rename to 'pending_lock'? */
-- g_mutex_lock (&is->priv->idle_lock);
-+ g_rec_mutex_lock (&is->priv->idle_lock);
- g_source_unref (is->priv->idle_pending);
- is->priv->idle_pending = NULL;
-- g_mutex_unlock (&is->priv->idle_lock);
-
-- if (is->priv->idle_state != IMAPX_IDLE_PENDING)
-+ if (is->priv->idle_state != IMAPX_IDLE_PENDING) {
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
- goto exit;
-+ }
-+
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
-
- g_mutex_lock (&is->priv->select_lock);
- mailbox = g_weak_ref_get (&is->priv->select_mailbox);
-@@ -3765,7 +3765,7 @@ imapx_idle_thread (gpointer data)
- * regressions.
- */
-
-- g_mutex_lock (&is->priv->idle_lock);
-+ g_rec_mutex_lock (&is->priv->idle_lock);
-
- g_warn_if_fail (is->priv->idle_pending == NULL);
- pending = g_timeout_source_new_seconds (IMAPX_IDLE_DWELL_TIME);
-@@ -3778,7 +3778,7 @@ imapx_idle_thread (gpointer data)
- is->priv->idle_pending = g_source_ref (pending);
- g_source_unref (pending);
-
-- g_mutex_unlock (&is->priv->idle_lock);
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
-
- g_main_loop_run (is->priv->idle_main_loop);
-
-@@ -3798,36 +3798,40 @@ imapx_stop_idle (CamelIMAPXServer *is,
-
- time (&now);
-
-- g_mutex_lock (&is->priv->idle_lock);
-+ g_rec_mutex_lock (&is->priv->idle_lock);
-
- switch (is->priv->idle_state) {
- case IMAPX_IDLE_ISSUED:
- is->priv->idle_state = IMAPX_IDLE_CANCEL;
-- /* fall through */
-+ result = IMAPX_IDLE_STOP_SUCCESS;
-+ break;
-
- case IMAPX_IDLE_CANCEL:
-+ case IMAPX_IDLE_WAIT_DONE:
- result = IMAPX_IDLE_STOP_SUCCESS;
- break;
-
- case IMAPX_IDLE_STARTED:
- if (imapx_command_idle_stop (is, error)) {
- result = IMAPX_IDLE_STOP_SUCCESS;
-+ is->priv->idle_state = IMAPX_IDLE_WAIT_DONE;
- } else {
- result = IMAPX_IDLE_STOP_ERROR;
-+ is->priv->idle_state = IMAPX_IDLE_OFF;
- goto exit;
- }
-- /* fall through */
-+ break;
-
- case IMAPX_IDLE_PENDING:
- is->priv->idle_state = IMAPX_IDLE_OFF;
-- /* fall through */
-+ break;
-
- case IMAPX_IDLE_OFF:
- break;
- }
-
- exit:
-- g_mutex_unlock (&is->priv->idle_lock);
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
-
- return result;
- }
-@@ -3838,9 +3842,14 @@ imapx_start_idle (CamelIMAPXServer *is)
- if (camel_application_is_exiting)
- return;
-
-- g_mutex_lock (&is->priv->idle_lock);
-+ g_rec_mutex_lock (&is->priv->idle_lock);
-+
-+ if (is->priv->idle_state != IMAPX_IDLE_OFF) {
-+ g_warn_if_fail (is->priv->idle_state == IMAPX_IDLE_OFF);
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
-+ return;
-+ }
-
-- g_return_if_fail (is->priv->idle_state == IMAPX_IDLE_OFF);
- is->priv->idle_state = IMAPX_IDLE_PENDING;
-
- if (is->priv->idle_thread == NULL) {
-@@ -3861,7 +3870,7 @@ imapx_start_idle (CamelIMAPXServer *is)
- g_source_unref (pending);
- }
-
-- g_mutex_unlock (&is->priv->idle_lock);
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
- }
-
- static gboolean
-@@ -3869,12 +3878,12 @@ imapx_in_idle (CamelIMAPXServer *is)
- {
- gboolean in_idle = FALSE;
-
-- g_mutex_lock (&is->priv->idle_lock);
-+ g_rec_mutex_lock (&is->priv->idle_lock);
-
- if (is->priv->idle_thread != NULL)
- in_idle = (is->priv->idle_state > IMAPX_IDLE_OFF);
-
-- g_mutex_unlock (&is->priv->idle_lock);
-+ g_rec_mutex_unlock (&is->priv->idle_lock);
-
- return in_idle;
- }
-@@ -3918,7 +3927,7 @@ imapx_command_select_done (CamelIMAPXServer *is,
- GQueue trash = G_QUEUE_INIT;
- GList *list, *link;
-
-- c (is->tagprefix, "Select failed\n");
-+ c (is->tagprefix, "Select failed: %s\n", local_error ? local_error->message : "Unknown error");
-
- g_mutex_lock (&is->priv->select_lock);
- select_closing = g_weak_ref_get (&is->priv->select_closing);
-@@ -4192,7 +4201,7 @@ imapx_server_set_streams (CamelIMAPXServer *is,
- }
-
- #if GLIB_CHECK_VERSION(2,39,0)
--#ifndef G_OS_WIN32
-+#ifdef G_OS_UNIX
- static void
- imapx_server_child_process_setup (gpointer user_data)
- {
-@@ -4210,7 +4219,7 @@ imapx_server_child_process_setup (gpointer user_data)
- }
- #endif /* TIOCNOTTY */
- }
--#endif /* G_OS_WIN32 */
-+#endif /* G_OS_UNIX */
- #endif
-
- static gboolean
-@@ -4242,7 +4251,7 @@ connect_to_server_process (CamelIMAPXServer *is,
- G_SUBPROCESS_FLAGS_STDOUT_PIPE |
- G_SUBPROCESS_FLAGS_STDERR_SILENCE);
-
--#ifndef G_OS_WIN32
-+#ifdef G_OS_UNIX
- g_subprocess_launcher_set_child_setup (
- launcher, imapx_server_child_process_setup,
- NULL, (GDestroyNotify) NULL);
-@@ -7809,7 +7818,7 @@ imapx_server_finalize (GObject *object)
- g_hash_table_destroy (is->priv->known_alerts);
- g_mutex_clear (&is->priv->known_alerts_lock);
-
-- g_mutex_clear (&is->priv->idle_lock);
-+ g_rec_mutex_clear (&is->priv->idle_lock);
- g_main_loop_unref (is->priv->idle_main_loop);
- g_main_context_unref (is->priv->idle_main_context);
-
-@@ -7835,6 +7844,9 @@ imapx_server_constructed (GObject *object)
- CamelIMAPXServer *server;
- CamelIMAPXServerClass *class;
-
-+ /* Chain up to parent's method. */
-+ G_OBJECT_CLASS (camel_imapx_server_parent_class)->constructed (object);
-+
- server = CAMEL_IMAPX_SERVER (object);
- class = CAMEL_IMAPX_SERVER_GET_CLASS (server);
-
-@@ -7993,7 +8005,7 @@ camel_imapx_server_init (CamelIMAPXServer *is)
-
- main_context = g_main_context_new ();
-
-- g_mutex_init (&is->priv->idle_lock);
-+ g_rec_mutex_init (&is->priv->idle_lock);
- is->priv->idle_main_loop = g_main_loop_new (main_context, FALSE);
- is->priv->idle_main_context = g_main_context_ref (main_context);
-
-diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
-index 373f27d..482983d 100644
---- a/camel/providers/local/camel-local-folder.c
-+++ b/camel/providers/local/camel-local-folder.c
-@@ -164,6 +164,9 @@ local_folder_constructed (GObject *object)
- gchar *root_path;
- gchar *path;
-
-+ /* Chain up to parent's method. */
-+ G_OBJECT_CLASS (camel_local_folder_parent_class)->constructed (object);
-+
- folder = CAMEL_FOLDER (object);
- full_name = camel_folder_get_full_name (folder);
- parent_store = camel_folder_get_parent_store (folder);
-diff --git a/libebackend/e-authentication-mediator.c b/libebackend/e-authentication-mediator.c
-index 9d36933..b6f2e3b 100644
---- a/libebackend/e-authentication-mediator.c
-+++ b/libebackend/e-authentication-mediator.c
-@@ -718,8 +718,7 @@ authentication_mediator_constructed (GObject *object)
- mediator, (GDestroyNotify) NULL);
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_authentication_mediator_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_authentication_mediator_parent_class)->constructed (object);
- }
-
- static gboolean
-diff --git a/libebackend/e-authentication-session.c b/libebackend/e-authentication-session.c
-index bfec0e3..f664a30 100644
---- a/libebackend/e-authentication-session.c
-+++ b/libebackend/e-authentication-session.c
-@@ -322,8 +322,7 @@ authentication_session_constructed (GObject *object)
- session = E_AUTHENTICATION_SESSION (object);
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_authentication_session_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_authentication_session_parent_class)->constructed (object);
-
- /* If the server knows about the data source UID we've been
- * given, then we can auto-configure our own prompt strings. */
-diff --git a/libebackend/e-collection-backend.c b/libebackend/e-collection-backend.c
-index 66c836c..d41998d 100644
---- a/libebackend/e-collection-backend.c
-+++ b/libebackend/e-collection-backend.c
-@@ -680,8 +680,7 @@ collection_backend_constructed (GObject *object)
- backend = E_COLLECTION_BACKEND (object);
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_collection_backend_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_collection_backend_parent_class)->constructed (object);
-
- server = e_collection_backend_ref_server (backend);
- source = e_backend_get_source (E_BACKEND (backend));
-diff --git a/libebackend/e-user-prompter-server.c b/libebackend/e-user-prompter-server.c
-index 9b74a0c..5348327 100644
---- a/libebackend/e-user-prompter-server.c
-+++ b/libebackend/e-user-prompter-server.c
-@@ -326,8 +326,7 @@ static void
- user_prompter_server_constructed (GObject *object)
- {
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_user_prompter_server_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_user_prompter_server_parent_class)->constructed (object);
-
- e_extensible_load_extensions (E_EXTENSIBLE (object));
- }
-diff --git a/libedataserver/e-source-camel.c b/libedataserver/e-source-camel.c
-index bb5660a..b040e49 100644
---- a/libedataserver/e-source-camel.c
-+++ b/libedataserver/e-source-camel.c
-@@ -369,8 +369,7 @@ source_camel_constructed (GObject *object)
- guint array_index = 0;
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_source_camel_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_source_camel_parent_class)->constructed (object);
-
- class = E_SOURCE_CAMEL_GET_CLASS (object);
- priv = E_SOURCE_CAMEL_GET_PRIVATE (object);
-diff --git a/libedataserver/e-source-mail-signature.c b/libedataserver/e-source-mail-signature.c
-index 39f56a9..3dd4b5b 100644
---- a/libedataserver/e-source-mail-signature.c
-+++ b/libedataserver/e-source-mail-signature.c
-@@ -169,8 +169,7 @@ source_mail_signature_constructed (GObject *object)
- priv = E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE (object);
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_source_mail_signature_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_source_mail_signature_parent_class)->constructed (object);
-
- extension = E_SOURCE_EXTENSION (object);
- source = e_source_extension_ref_source (extension);
-diff --git a/modules/gnome-online-accounts/goaewsclient.c b/modules/gnome-online-accounts/goaewsclient.c
-index 98eede2..0a97fa4 100644
---- a/modules/gnome-online-accounts/goaewsclient.c
-+++ b/modules/gnome-online-accounts/goaewsclient.c
-@@ -515,6 +515,7 @@ goa_ews_autodiscover (GoaObject *goa_object,
- data->session, data->msgs[1],
- ews_autodiscover_response_cb, simple);
- } else {
-+ g_dbus_error_strip_remote_error (error);
- g_simple_async_result_take_error (simple, error);
- g_simple_async_result_complete_in_idle (simple);
- g_object_unref (simple);
-diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c
-index 973d182..99a6b1e 100644
---- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
-+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
-@@ -1235,8 +1235,7 @@ gnome_online_accounts_constructed (GObject *object)
- extension);
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_gnome_online_accounts_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_gnome_online_accounts_parent_class)->constructed (object);
- }
-
- static gboolean
-@@ -1283,6 +1282,9 @@ gnome_online_accounts_get_access_token_sync (EOAuth2Support *support,
- g_object_unref (goa_account);
- g_object_unref (goa_object);
-
-+ if (error && *error)
-+ g_dbus_error_strip_remote_error (*error);
-+
- g_prefix_error (
- error,
- _("Failed to obtain an access token for '%s': "),
-diff --git a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
-index 3e16146..130951a 100644
---- a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
-+++ b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
-@@ -899,8 +899,7 @@ ubuntu_online_accounts_constructed (GObject *object)
- extension);
-
- /* Chain up to parent's constructed() method. */
-- G_OBJECT_CLASS (e_ubuntu_online_accounts_parent_class)->
-- constructed (object);
-+ G_OBJECT_CLASS (e_ubuntu_online_accounts_parent_class)->constructed (object);
- }
-
- static gboolean
-diff --git a/po/nb.po b/po/nb.po
-index 066e1eb..071a4e3 100644
---- a/po/nb.po
-+++ b/po/nb.po
-@@ -6,10 +6,10 @@
- # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
- msgid ""
- msgstr ""
--"Project-Id-Version: evolution-data-server 3.11.x\n"
-+"Project-Id-Version: evolution-data-server 3.12.x\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2014-03-05 07:35+0100\n"
--"PO-Revision-Date: 2014-03-05 17:58+0100\n"
-+"POT-Creation-Date: 2014-07-23 14:37+0200\n"
-+"PO-Revision-Date: 2014-07-23 14:39+0200\n"
- "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
- "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
- "Language: nb\n"
-@@ -18,79 +18,79 @@ msgstr ""
- "Content-Transfer-Encoding: 8-bit\n"
- "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:117
-+#: ../addressbook/backends/file/e-book-backend-file.c:120
- #, c-format
- msgid "Failed to remove file '%s': %s"
- msgstr "Klarte ikke å fjerne fil «%s»: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:145
-+#: ../addressbook/backends/file/e-book-backend-file.c:148
- #, c-format
- msgid "Failed to make directory %s: %s"
- msgstr "Klarte ikke å opprette katalog %s: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:396
-+#: ../addressbook/backends/file/e-book-backend-file.c:419
- #, c-format
- msgid "Failed to create hardlink for resource '%s': %s"
- msgstr "Klarte ikke å opprette hard lenke for ressurs «%s»: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:501
--#: ../addressbook/backends/file/e-book-backend-file.c:1230
-+#: ../addressbook/backends/file/e-book-backend-file.c:524
-+#: ../addressbook/backends/file/e-book-backend-file.c:1253
- msgid "No UID in the contact"
- msgstr "Ingen UID i kontakten"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:828
-+#: ../addressbook/backends/file/e-book-backend-file.c:851
- #, c-format
- msgid "Conflicting UIDs found in added contacts"
- msgstr "UID'er som er i konflikt ble funnet i tillagte kontakter"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:967
-+#: ../addressbook/backends/file/e-book-backend-file.c:990
- msgid "Loading..."
- msgstr "Laster …"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:969
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423
-+#: ../addressbook/backends/file/e-book-backend-file.c:992
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353
- msgid "Searching..."
- msgstr "Søker …"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1258
-+#: ../addressbook/backends/file/e-book-backend-file.c:1281
- #, c-format
- msgid "Tried to modify contact '%s' with out of sync revision"
- msgstr "Prøvde å endre kontakt «%s» med revisjon som ikke er synkronisert"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1449
--#: ../addressbook/backends/file/e-book-backend-file.c:1532
-+#: ../addressbook/backends/file/e-book-backend-file.c:1472
-+#: ../addressbook/backends/file/e-book-backend-file.c:1555
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
--#: ../addressbook/libedata-book/e-book-sqlite.c:6706
-+#: ../addressbook/libedata-book/e-book-sqlite.c:6711
- #, c-format
- msgid "Contact '%s' not found"
- msgstr "Kontakt «%s» ble ikke funnet"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1592
--#: ../addressbook/backends/file/e-book-backend-file.c:1673
-+#: ../addressbook/backends/file/e-book-backend-file.c:1615
-+#: ../addressbook/backends/file/e-book-backend-file.c:1696
- #, c-format
- msgid "Query '%s' not supported"
- msgstr "Spørring «%s» er ikke støttet"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1601
--#: ../addressbook/backends/file/e-book-backend-file.c:1682
-+#: ../addressbook/backends/file/e-book-backend-file.c:1624
-+#: ../addressbook/backends/file/e-book-backend-file.c:1705
- #, c-format
- msgid "Invalid Query '%s'"
- msgstr "Ugyldig spørring «%s»"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1947
-+#: ../addressbook/backends/file/e-book-backend-file.c:1970
- msgid "Requested to delete an unrelated cursor"
- msgstr "Forespørsel om å slette en ikke-relatert markør"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:2014
-+#: ../addressbook/backends/file/e-book-backend-file.c:2041
- #, c-format
- msgid "Failed to rename old database from '%s' to '%s': %s"
- msgstr "Kunne ikke endre navn på gammel database fra «%s» til «%s»: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820
-+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887
- #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
- #: ../addressbook/libebook-contacts/e-phone-number.c:56
- #: ../addressbook/libebook/e-book.c:1078
-@@ -105,67 +105,69 @@ msgstr "Kunne ikke endre navn på gammel database fra «%s» til «%s»: %s"
- #: ../addressbook/libebook/e-book-client.c:3175
- #: ../addressbook/libebook/e-book-client.c:3393
- #: ../addressbook/libedata-book/e-book-backend-sexp.c:878
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621
- #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
- #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
- #: ../calendar/libecal/e-cal-client.c:3239
- #: ../calendar/libecal/e-cal-client.c:3412
- #: ../calendar/libecal/e-cal-client.c:3676
- #: ../calendar/libecal/e-cal-client.c:3917
--#: ../calendar/libecal/e-cal-client.c:4105
--#: ../calendar/libecal/e-cal-client.c:4297
--#: ../calendar/libecal/e-cal-client.c:4467
--#: ../calendar/libecal/e-cal-client.c:4636
--#: ../calendar/libecal/e-cal-client.c:4839
--#: ../calendar/libecal/e-cal-client.c:4989
--#: ../calendar/libecal/e-cal-client.c:5183
--#: ../calendar/libecal/e-cal-client.c:5336
--#: ../calendar/libecal/e-cal-client.c:5553
--#: ../calendar/libecal/e-cal-client.c:5707
--#: ../calendar/libecal/e-cal-client.c:5933
--#: ../calendar/libecal/e-cal-client.c:6129
--#: ../calendar/libecal/e-cal-client.c:6492
--#: ../calendar/libecal/e-cal-client.c:6706
--#: ../camel/providers/imapx/camel-imapx-command.c:642
-+#: ../calendar/libecal/e-cal-client.c:4107
-+#: ../calendar/libecal/e-cal-client.c:4299
-+#: ../calendar/libecal/e-cal-client.c:4469
-+#: ../calendar/libecal/e-cal-client.c:4638
-+#: ../calendar/libecal/e-cal-client.c:4841
-+#: ../calendar/libecal/e-cal-client.c:4991
-+#: ../calendar/libecal/e-cal-client.c:5185
-+#: ../calendar/libecal/e-cal-client.c:5338
-+#: ../calendar/libecal/e-cal-client.c:5555
-+#: ../calendar/libecal/e-cal-client.c:5709
-+#: ../calendar/libecal/e-cal-client.c:5935
-+#: ../calendar/libecal/e-cal-client.c:6131
-+#: ../calendar/libecal/e-cal-client.c:6494
-+#: ../calendar/libecal/e-cal-client.c:6708
-+#: ../camel/providers/imapx/camel-imapx-command.c:645
-+#: ../camel/providers/imapx/camel-imapx-server.c:4769
-+#: ../camel/providers/imapx/camel-imapx-server.c:4778
- #: ../libedataserver/e-client.c:185
- msgid "Unknown error"
- msgstr "Ukjent feil"
-
- #. Query for new contacts asynchronously
--#: ../addressbook/backends/google/e-book-backend-google.c:836
-+#: ../addressbook/backends/google/e-book-backend-google.c:828
- msgid "Querying for updated contacts…"
- msgstr "Spør etter oppdaterte kontakter …"
-
- #. Run the query asynchronously
--#: ../addressbook/backends/google/e-book-backend-google.c:988
-+#: ../addressbook/backends/google/e-book-backend-google.c:1010
- msgid "Querying for updated groups…"
- msgstr "Spør etter oppdaterte grupper …"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:1705
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1273
-+#: ../addressbook/backends/google/e-book-backend-google.c:1757
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433
- msgid "The backend does not support bulk additions"
- msgstr "Motor støtter ikke å legge til flere oppføringer samtidig"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:1854
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1375
-+#: ../addressbook/backends/google/e-book-backend-google.c:1912
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545
- msgid "The backend does not support bulk modifications"
- msgstr "Motor støtter ikke å legge til flere oppføringer samtidig"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:2054
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1467
-+#: ../addressbook/backends/google/e-book-backend-google.c:2119
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645
- msgid "The backend does not support bulk removals"
- msgstr "Kalender støtter ikke fjerning av mange oppføringer"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:2180
-+#: ../addressbook/backends/google/e-book-backend-google.c:2239
- msgid "Loading…"
- msgstr "Laster …"
-
- #. System Group: My Contacts
--#: ../addressbook/backends/google/e-book-google-utils.c:1618
-+#: ../addressbook/backends/google/e-book-google-utils.c:1631
- #: ../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
-@@ -174,129 +176,130 @@ msgid "Personal"
- msgstr "Personlig"
-
- #. System Group: Friends
--#: ../addressbook/backends/google/e-book-google-utils.c:1620
-+#: ../addressbook/backends/google/e-book-google-utils.c:1633
- msgid "Friends"
- msgstr "Venner"
-
- #. System Group: Family
--#: ../addressbook/backends/google/e-book-google-utils.c:1622
-+#: ../addressbook/backends/google/e-book-google-utils.c:1635
- msgid "Family"
- msgstr "Familie"
-
- #. System Group: Coworkers
--#: ../addressbook/backends/google/e-book-google-utils.c:1624
-+#: ../addressbook/backends/google/e-book-google-utils.c:1637
- msgid "Coworkers"
- msgstr "Kolleger"
-
- #. 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:170
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113
- msgid "Not connected"
- msgstr "Ikke tilkoblet"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899
- msgid "Failed to bind using either v3 or v2 binds"
- msgstr "Klarte ikke å koble til med hverken v3 eller v2 binding"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
- msgid "Reconnecting to LDAP server..."
- msgstr "Kobler til LDAP-tjener på nytt …"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153
- msgid "Invalid DN syntax"
- msgstr "Ugyldig DN-syntaks"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
- #, c-format
- msgid "LDAP error 0x%x (%s)"
- msgstr "LDAP-feil 0x%x (%s)"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104
- #, c-format
- msgid "%s: NULL returned from ldap_first_entry"
- msgstr "%s: NULL returnert fra ldap_first_entry"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162
- #, c-format
- msgid "%s: Unhandled result type %d returned"
- msgstr "%s: Uhåndtert resultat type %d returnert"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422
- #, c-format
- msgid "%s: Unhandled search result type %d returned"
- msgstr "%s: Ikke håndtert søkeresultat av type %d ble returnert"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196
- msgid "Receiving LDAP search results..."
- msgstr "Mottar søkeresultater fra LDAP-tjener …"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375
- msgid "Error performing search"
- msgstr "Feil ved utføring av søk"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503
- #, c-format
- msgid "Downloading contacts (%d)..."
- msgstr "Laster ned kontakter (%d) …"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067
- msgid "Adding contact to LDAP server..."
- msgstr "Legger til kontakt på LDAP-tjener …"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142
- msgid "Modifying contact from LDAP server..."
- msgstr "Endrer kontakt fra LDAP-tjener …"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208
- msgid "Removing contact from LDAP server..."
- msgstr "Fjerner kontakt fra LDAP-tjener …"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597
- #, c-format
- msgid "Failed to get the DN for user '%s'"
- msgstr "Klarte ikke å hente DN for bruker «%s»"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
- msgid "Loading Addressbook summary..."
- msgstr "Laster sammendrag for adressebok …"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
- #, c-format
- msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
- msgstr "PROPFIND på webdav feilet med HTTP-status: %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903
- msgid "No response body in webdav PROPFIND result"
- msgstr "Ingen svarkropp i resultat av WebDAV PROPFIND kommando"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964
- #, c-format
- msgid "Loading Contacts (%d%%)"
- msgstr "Laster kontakter (%d%%)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1196
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353
- msgid "Cannot transform SoupURI to string"
- msgstr "Kan ikke transformere SoupURI til streng"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1306
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474
- #, c-format
- msgid "Create resource '%s' failed with HTTP status %d (%s)"
- msgstr "Oppretting av ressurs «%s» feilet med HTTP-status %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1404
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576
- msgid "Contact on server changed -> not modifying"
- msgstr "Kontakt på tjener endret -> endrer ikke"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1412
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584
- #, c-format
- msgid "Modify contact failed with HTTP status %d (%s)"
- msgstr "Endring av kontakt feilet med HTTP-status %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1488
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693
- #, c-format
- msgid "DELETE failed with HTTP status %d"
- msgstr "DELETE feilet med HTTP-status: %d"
-@@ -900,8 +903,8 @@ msgstr "Liste med Google Talk navn"
- msgid "Twitter Name List"
- msgstr "Liste med Twitter-navn"
-
--#: ../addressbook/libebook-contacts/e-contact.c:1635
--#: ../addressbook/libebook/e-destination.c:881
-+#: ../addressbook/libebook-contacts/e-contact.c:1654
-+#: ../addressbook/libebook/e-destination.c:920
- msgid "Unnamed List"
- msgstr "Liste uten navn"
-
-@@ -995,7 +998,7 @@ msgstr "Hele search_contacts lagres ikke i buffer. vcard kan ikke returneres."
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
--#: ../addressbook/libedata-book/e-book-sqlite.c:5364
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5369
- #, c-format
- msgid "Query contained unsupported elements"
- msgstr "Spørringen innehold elementer som ikke støttes"
-@@ -1038,7 +1041,7 @@ msgstr "Klarte ikke å fjerne databasefil: errno %d"
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442
- #, c-format
- msgid "Only summary queries are supported by EbSdbCursor"
--msgstr ""
-+msgstr "EbSdbCursor støtter bare spørringer på sammendrag"
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
- #, c-format
-@@ -1056,7 +1059,7 @@ msgid "Cannot sort by a field which may have multiple values"
- msgstr "Kan ikke sortere på et felt som kan ha flere verdier"
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
--#: ../addressbook/libedata-book/e-book-sqlite.c:7376
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7381
- #, c-format
- msgid ""
- "Tried to step a cursor in reverse, but cursor is already at the beginning of "
-@@ -1064,7 +1067,7 @@ msgid ""
- msgstr ""
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
--#: ../addressbook/libedata-book/e-book-sqlite.c:7384
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7389
- #, c-format
- msgid ""
- "Tried to step a cursor forwards, but cursor is already at the end of the "
-@@ -1082,20 +1085,20 @@ msgid ""
- "addressbook. Delete one of the entries in the 'folders' table first."
- msgstr ""
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:5357
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5362
- #, c-format
- msgid "Invalid query: %s"
- msgstr "Ugyldig spørring: %s"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:5532
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5537
- msgid "Invalid query for EbSqlCursor"
- msgstr "Ugyldig spørring for EbSqlCursor"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:7198
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7203
- msgid "At least one sort field must be specified to use an EbSqlCursor"
- msgstr ""
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:7216
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7221
- msgid "Cannot sort by a field that is not a string type"
- msgstr "Kan ikke sortere på et felt som ikke er av type streng"
-
-@@ -1303,31 +1306,35 @@ msgstr "Mangler UID for kilde"
- msgid "No such source for UID '%s'"
- msgstr "Kilden eksisterer ikke for UID «%s»"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576
- #, c-format
- msgid "Server is unreachable (%s)"
- msgstr "Tjener kan ikke nås (%s)"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607
- #, c-format
- msgid "Failed to connect to a server using SSL: %s"
- msgstr "Klarte ikke å koble til en tjener med SSL: %s"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
- #, c-format
- msgid "Unexpected HTTP status code %d returned (%s)"
- msgstr "Uventet HTTP-statuskode %d mottatt (%s)"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637
- msgid "CalDAV backend is not loaded yet"
- msgstr "CalDAV-motor er ikke lastet ennå"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079
- msgid "Invalid Redirect URL"
- msgstr "Ugyldig objekt for omdirigering"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882
-+#, c-format
-+msgid "Cannot create local cache folder '%s'"
-+msgstr "Kan ikke opprette lokal buffermappe «%s»"
-+
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934
- #, c-format
- msgid ""
- "Server is unreachable, calendar is opened in read-only mode.\n"
-@@ -1336,32 +1343,27 @@ msgstr ""
- "Tjeneren kan ikke nås. Kalender åpnes i skrivebeskyttet modus.\n"
- "Feilmelding: %s"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885
--#, c-format
--msgid "Cannot create local cache folder '%s'"
--msgstr "Kan ikke opprette lokal buffermappe «%s»"
--
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968
- msgid "CalDAV does not support bulk additions"
- msgstr "CalDAV støtter ikke å legge til flere oppføringer samtidig"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071
- msgid "CalDAV does not support bulk modifications"
- msgstr "CalDAV støtter ikke å endre flere oppføringer samtidig"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
- msgid "CalDAV does not support bulk removals"
- msgstr "CalDAV støtter ikke fjerning av flere oppføringer samtidig"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914
- msgid "Calendar doesn't support Free/Busy"
- msgstr "Kalender støtter ikke ledig/opptatt"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923
- msgid "Schedule outbox url not found"
- msgstr "URL for kalenderutboks"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020
- msgid "Unexpected result in schedule-response"
- msgstr "Uventet resultat i schedule-response"
-
-@@ -1388,27 +1390,27 @@ msgstr "Kan ikke lagre kalenderdata: Feil i URI."
- msgid "Cannot save calendar data"
- msgstr "Kan ikke lagre kalenderdata"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:486
-+#: ../calendar/backends/http/e-cal-backend-http.c:491
- #, c-format
- msgid "Malformed URI: %s"
- msgstr "Feilutformet URI: %s"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:577
-+#: ../calendar/backends/http/e-cal-backend-http.c:582
- #, c-format
- msgid "Redirected to Invalid URI"
- msgstr "Omdirigert til ugyldig URI"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:620
-+#: ../calendar/backends/http/e-cal-backend-http.c:625
- #, c-format
- msgid "Bad file format."
- msgstr "Ugyldig filformat."
-
--#: ../calendar/backends/http/e-cal-backend-http.c:630
-+#: ../calendar/backends/http/e-cal-backend-http.c:635
- #, c-format
- msgid "Not a calendar."
- msgstr "Ikke en kalender."
-
--#: ../calendar/backends/http/e-cal-backend-http.c:917
-+#: ../calendar/backends/http/e-cal-backend-http.c:925
- #: ../calendar/backends/weather/e-cal-backend-weather.c:536
- msgid "Could not create cache file"
- msgstr "Kunne ikke opprette bufferfil"
-@@ -1456,25 +1458,25 @@ msgstr "Vær: Tordenvær"
- #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
- #: ../calendar/backends/weather/e-cal-backend-weather.c:329
- #, c-format
--msgid "%.1f °F"
--msgstr ""
-+msgid "%.1f ےF"
-+msgstr "%.1f ےF"
-
- #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
- #: ../calendar/backends/weather/e-cal-backend-weather.c:332
- #, c-format
--msgid "%.1f °C"
--msgstr ""
-+msgid "%.1f ےC"
-+msgstr "%.1f ےC"
-
- #. TRANSLATOR: This is the temperature in kelvin
- #: ../calendar/backends/weather/e-cal-backend-weather.c:335
- #, c-format
- msgid "%.1f K"
--msgstr ""
-+msgstr "%.1f K"
-
- #: ../calendar/backends/weather/e-cal-backend-weather.c:341
- #, c-format
- msgid "%.1f"
--msgstr ""
-+msgstr "%.1f"
-
- #: ../calendar/backends/weather/e-cal-backend-weather.c:452
- msgid "Forecast"
-@@ -2038,7 +2040,7 @@ msgstr "Ugyldige argumenter til (system-flag)"
- msgid "Invalid arguments to (user-tag)"
- msgstr "Ugyldige argumenter til (user-tag)"
-
--#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053
-+#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086
- #, c-format
- msgid "Error executing filter search: %s: %s"
- msgstr "Feil under lagring av filtersøk: %s: %s"
-@@ -2065,7 +2067,7 @@ msgstr[0] "Filtrerer ny melding i «%s»"
- msgstr[1] "Filtrerer nye meldinger i «%s»"
-
- #: ../camel/camel-folder.c:1011
--#: ../camel/providers/local/camel-maildir-folder.c:319
-+#: ../camel/providers/local/camel-maildir-folder.c:330
- msgid "Moving messages"
- msgstr "Flytter meldinger"
-
-@@ -2078,57 +2080,57 @@ msgstr "Kopierer meldinger"
- msgid "Quota information not supported for folder '%s'"
- msgstr "Kvoteinformasjon er ikke støttet for mappe «%s»"
-
--#: ../camel/camel-folder.c:2868
-+#: ../camel/camel-folder.c:2862
- #, c-format
- msgid "Expunging folder '%s'"
- msgstr "Tømmer mappe «%s»"
-
--#: ../camel/camel-folder.c:2996
-+#: ../camel/camel-folder.c:2990
- #, c-format
- msgid "Retrieving message '%s' in %s"
- msgstr "Henter melding «%s» i %s"
-
--#: ../camel/camel-folder.c:3187
-+#: ../camel/camel-folder.c:3181
- #, c-format
- msgid "Retrieving quota information for '%s'"
- msgstr "Henter kvoteinformasjon for «%s»"
-
--#: ../camel/camel-folder.c:3487
-+#: ../camel/camel-folder.c:3478
- #, c-format
- msgid "Refreshing folder '%s'"
- msgstr "Oppdaterer mappe «%s»"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929
-+#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941
- #, c-format
- msgid "(%s) requires a single bool result"
- msgstr "(%s) krever et enkelt bolsk resultat"
-
- #. Translators: Each '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:964
-+#: ../camel/camel-folder-search.c:976
- #, c-format
- msgid "(%s) not allowed inside %s"
- msgstr "(%s) tillates ikke inne i %s"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979
-+#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991
- #, c-format
- msgid "(%s) requires a match type string"
- msgstr "(%s) krever en streng for trefftype"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:1007
-+#: ../camel/camel-folder-search.c:1019
- #, c-format
- msgid "(%s) expects an array result"
- msgstr "(%s) forventer resultat på tabellform"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:1017
-+#: ../camel/camel-folder-search.c:1029
- #, c-format
- msgid "(%s) requires the folder set"
- msgstr "(%s) krever et mappesett"
-
--#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097
-+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
- #, c-format
- msgid ""
- "Cannot parse search expression: %s:\n"
-@@ -2137,7 +2139,7 @@ msgstr ""
- "Kan ikke tolke uttrykket: %s:\n"
- "%s"
-
--#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
-+#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121
- #, c-format
- msgid ""
- "Error executing search expression: %s:\n"
-@@ -2383,7 +2385,7 @@ msgstr "Ikke noe innhold tilgjengelig"
- msgid "No signature available"
- msgstr "Ingen signatur tilgjengelig"
-
--#: ../camel/camel-multipart-signed.c:779
-+#: ../camel/camel-multipart-signed.c:806
- #, c-format
- msgid "parse error"
- msgstr "lesefeil"
-@@ -2407,10 +2409,6 @@ msgstr "Navneoppslag «%s» feilet. Sjekk vertsnavnet for stavefeil."
- msgid "Host lookup '%s' failed: %s"
- msgstr "Navneoppslag «%s» feilet: %s"
-
--#: ../camel/camel-network-service.c:1009
--msgid "No host information available"
--msgstr "Ingen vertsinformasjon tilgjengelig"
--
- #: ../camel/camel-offline-folder.c:90
- msgid "Downloading new messages for offline mode"
- msgstr "Laster ned nye meldinger for frakoblet modus"
-@@ -2691,7 +2689,7 @@ msgid "Invalid GType registered for protocol '%s'"
- msgstr "Ugyldig GType registrert for protokoll «%s»"
-
- #: ../camel/camel-session.c:502
--#: ../camel/providers/imapx/camel-imapx-server.c:4814
-+#: ../camel/providers/imapx/camel-imapx-server.c:4719
- #: ../camel/providers/pop3/camel-pop3-store.c:311
- #: ../camel/providers/pop3/camel-pop3-store.c:757
- #: ../camel/providers/smtp/camel-smtp-transport.c:515
-@@ -2930,14 +2928,14 @@ msgstr "Kan ikke opprette mappe: «%s»: mappen eksisterer"
- msgid "Creating folder '%s'"
- msgstr "Lager mappe «%s»"
-
--#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416
--#: ../camel/providers/local/camel-maildir-store.c:315
-+#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410
-+#: ../camel/providers/local/camel-maildir-store.c:321
- #, c-format
- msgid "Cannot delete folder: %s: Invalid operation"
- msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
-
--#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467
--#: ../camel/providers/local/camel-maildir-store.c:846
-+#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461
-+#: ../camel/providers/local/camel-maildir-store.c:872
- #, c-format
- msgid "Cannot rename folder: %s: Invalid operation"
- msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
-@@ -3010,17 +3008,17 @@ msgstr "_Oppdater automatisk ved endring i kildemapper"
- msgid "Unmatched"
- msgstr "Ingen treff"
-
--#: ../camel/camel-vee-store.c:442
-+#: ../camel/camel-vee-store.c:436
- #, c-format
- msgid "Cannot delete folder: %s: No such folder"
- msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
-
--#: ../camel/camel-vee-store.c:477
-+#: ../camel/camel-vee-store.c:471
- #, c-format
- msgid "Cannot rename folder: %s: No such folder"
- msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
-
--#: ../camel/camel-vee-store.c:539
-+#: ../camel/camel-vee-store.c:533
- msgid "Enable _Unmatched folder"
- msgstr "Slå på _mappe uten treff"
-
-@@ -3032,46 +3030,46 @@ msgstr "Kan ikke kopiere meldinger til papirkurvmappen"
- msgid "Cannot copy messages to the Junk folder"
- msgstr "Kan ikke kopiere meldinger til søppelmappen"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:687
-+#: ../camel/providers/imapx/camel-imapx-folder.c:796
- #, c-format
- msgid "No quota information available for folder '%s'"
- msgstr "Kvoteinformasjon er ikke tilgjengelig for mappe «%s»"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:801
--#: ../camel/providers/imapx/camel-imapx-folder.c:894
-+#: ../camel/providers/imapx/camel-imapx-folder.c:936
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1029
- #, c-format
- msgid "No destination folder specified"
- msgstr "Ingen målmappe oppgitt"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:829
-+#: ../camel/providers/imapx/camel-imapx-folder.c:964
- msgid "Unable to move junk messages"
- msgstr "Kan ikke flytte uønskede meldinger"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:922
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1057
- msgid "Unable to move deleted messages"
- msgstr "Kan ikke flytte slettede meldinger"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1148
--#: ../camel/providers/nntp/camel-nntp-folder.c:758
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1374
-+#: ../camel/providers/nntp/camel-nntp-folder.c:760
- msgid "Apply message _filters to this folder"
- msgstr "Bruk mappe_filter på denne mappen"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1254
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1485
- #, c-format
- msgid "Could not create folder summary for %s"
- msgstr "Kunne ikke lage sammendrag for mappe %s"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1263
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1494
- #, c-format
- msgid "Could not create cache for %s: "
- msgstr "Kunne ikke lage mellomlager for %s: "
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1448
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1709
- #, c-format
- msgid "No IMAP mailbox available for folder '%s'"
- msgstr "Ingen IMAP-postboks tilgjengelig for mappe «%s»"
-
--#: ../camel/providers/imapx/camel-imapx-input-stream.c:92
-+#: ../camel/providers/imapx/camel-imapx-input-stream.c:93
- #, c-format
- msgid "Source stream returned no data"
- msgstr "Kildestrøm returnerte ingen data"
-@@ -3097,23 +3095,31 @@ msgid "_Listen for server change notifications"
- msgstr "_Lytt etter endringsvarsling fra tjener"
-
- #: ../camel/providers/imapx/camel-imapx-provider.c:49
-+msgid "Connection to Server"
-+msgstr "Tilkobling til tjener"
-+
-+#: ../camel/providers/imapx/camel-imapx-provider.c:51
-+msgid "Numbe_r of concurrent connections to use"
-+msgstr "Antall samtidige tilkoblinger som skal b_rukes"
-+
-+#: ../camel/providers/imapx/camel-imapx-provider.c:54
- #: ../camel/providers/nntp/camel-nntp-provider.c:44
- msgid "Folders"
- msgstr "Mapper"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:51
-+#: ../camel/providers/imapx/camel-imapx-provider.c:56
- msgid "_Show only subscribed folders"
- msgstr "Vi_s kun abonnerte mapper"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:54
-+#: ../camel/providers/imapx/camel-imapx-provider.c:59
- msgid "O_verride server-supplied folder namespace"
- msgstr "O_verstyr tjeners navneområde for mapper"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:56
-+#: ../camel/providers/imapx/camel-imapx-provider.c:61
- msgid "Namespace:"
- msgstr "Navneområde:"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:59
-+#: ../camel/providers/imapx/camel-imapx-provider.c:64
- #: ../camel/providers/local/camel-local-provider.c:39
- #: ../camel/providers/local/camel-local-provider.c:79
- #: ../camel/providers/local/camel-local-provider.c:99
-@@ -3121,262 +3127,264 @@ msgstr "Navneområde:"
- msgid "Options"
- msgstr "Alternativer"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:61
-+#: ../camel/providers/imapx/camel-imapx-provider.c:66
- #: ../camel/providers/nntp/camel-nntp-provider.c:41
- msgid "Apply _filters to new messages in all folders"
- msgstr "Bruk filtre for nye meldinger i alle mapper"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:63
-+#: ../camel/providers/imapx/camel-imapx-provider.c:68
- msgid "_Apply filters to new messages in Inbox on this server"
- msgstr "_Bruk filtre for nye meldinger i Innboks på denne tjeneren"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:65
-+#: ../camel/providers/imapx/camel-imapx-provider.c:70
- msgid "Check new messages for _Junk contents"
- msgstr "Se etter søppelinn_hold i nye meldinger"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:67
-+#: ../camel/providers/imapx/camel-imapx-provider.c:72
- msgid "Only check for Junk messages in the IN_BOX folder"
- msgstr "Se kun etter søppelinnhold i nye meldinger i inn_boksen"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:69
-+#: ../camel/providers/imapx/camel-imapx-provider.c:74
- msgid "Automatically synchroni_ze remote mail locally"
- msgstr "S_ynkroniser eksterne meldinger med lokale meldinger automatisk"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:75
-+#: ../camel/providers/imapx/camel-imapx-provider.c:80
- msgid "Default IMAP port"
- msgstr "Forvalgt port for IMAP"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:76
-+#: ../camel/providers/imapx/camel-imapx-provider.c:81
- msgid "IMAP over SSL"
- msgstr "IMAP over SSL"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:83
-+#: ../camel/providers/imapx/camel-imapx-provider.c:88
- msgid "IMAP+"
- msgstr "IMAP+"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:85
-+#: ../camel/providers/imapx/camel-imapx-provider.c:90
- msgid "For reading and storing mail on IMAP servers."
- msgstr "For lesing og lagring av e-post på IMAP-tjenere."
-
--#: ../camel/providers/imapx/camel-imapx-server.c:844
-+#: ../camel/providers/imapx/camel-imapx-server.c:1009
-+#: ../camel/providers/imapx/camel-imapx-server.c:1016
- #, c-format
- msgid "Not authenticated"
- msgstr "Ikke autentisert"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:1773
-+#: ../camel/providers/imapx/camel-imapx-server.c:1713
- msgid "Server disconnected"
- msgstr "Tjener frakoblet"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:2255
-+#: ../camel/providers/imapx/camel-imapx-server.c:2205
- msgid "Error writing to cache stream"
- msgstr "Feil ved skriving til mellomlagerstrøm"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:3672
-+#: ../camel/providers/imapx/camel-imapx-server.c:3550
- msgid "Error performing IDLE"
- msgstr "Feil ved utføring av IDLE"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4661
-+#: ../camel/providers/imapx/camel-imapx-server.c:4558
- #, c-format
- msgid "Failed to connect to IMAP server %s in secure mode: %s"
- msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4662
-+#: ../camel/providers/imapx/camel-imapx-server.c:4559
- #: ../camel/providers/smtp/camel-smtp-transport.c:215
- msgid "STARTTLS not supported"
- msgstr "STARTTLS er ikke støttet"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4722
-+#: ../camel/providers/imapx/camel-imapx-server.c:4619
- #, c-format
- msgid "Failed to connect to IMAP server %s in secure mode: "
- msgstr "Klarte ikke å koble til IMAP-tjener %s i sikker modus: "
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4803
-+#: ../camel/providers/imapx/camel-imapx-server.c:4708
- #, c-format
- msgid "IMAP server %s does not support %s authentication"
- msgstr "IMAP-tjener %s støtter ikke autentiseringstype %s"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4833
-+#: ../camel/providers/imapx/camel-imapx-server.c:4738
- #: ../camel/providers/nntp/camel-nntp-store.c:394
- #: ../camel/providers/nntp/camel-nntp-store.c:531
- msgid "Cannot authenticate without a username"
- msgstr "Kan ikke autentisere uten brukernavn"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4842
-+#: ../camel/providers/imapx/camel-imapx-server.c:4747
- #: ../camel/providers/nntp/camel-nntp-store.c:540
- #: ../camel/providers/pop3/camel-pop3-store.c:678
- #: ../camel/providers/pop3/camel-pop3-store.c:699
- msgid "Authentication password not available"
- msgstr "Passord for autentisering er ikke tilgjengelig"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5093
-+#: ../camel/providers/imapx/camel-imapx-server.c:4983
-+#: ../camel/providers/imapx/camel-imapx-server.c:5042
- msgid "Error fetching message"
- msgstr "Feil ved henting av melding"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5139
-+#: ../camel/providers/imapx/camel-imapx-server.c:5035
- msgid "Failed to close the tmp stream"
- msgstr "Klarte ikke å lukke midlertidig strøm"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5168
-+#: ../camel/providers/imapx/camel-imapx-server.c:5071
- msgid "Failed to copy the tmp file"
- msgstr "Klarte ikke å kopiere midlertidig fil"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5294
-+#: ../camel/providers/imapx/camel-imapx-server.c:5212
- msgid "Error moving messages"
- msgstr "Feil ved flytting av meldinger"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5298
-+#: ../camel/providers/imapx/camel-imapx-server.c:5216
- msgid "Error copying messages"
- msgstr "Feil ved kopiering av meldinger"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5520
-+#: ../camel/providers/imapx/camel-imapx-server.c:5438
- msgid "Error appending message"
- msgstr "Feil ved forsøk på å legge til en melding"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5756
-+#: ../camel/providers/imapx/camel-imapx-server.c:5674
- msgid "Error fetching message headers"
- msgstr "Feil ved henting av meldingshoder"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5921
-+#: ../camel/providers/imapx/camel-imapx-server.c:5841
- msgid "Error retrieving message"
- msgstr "Feil ved henting av melding"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6051
--#: ../camel/providers/imapx/camel-imapx-server.c:6274
-+#: ../camel/providers/imapx/camel-imapx-server.c:5975
-+#: ../camel/providers/imapx/camel-imapx-server.c:6204
- #, c-format
- msgid "Fetching summary information for new messages in '%s'"
- msgstr "Henter sammendragsinformasjon for nye meldinger i «%s»"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6103
-+#: ../camel/providers/imapx/camel-imapx-server.c:6027
- #, c-format
- msgid "Scanning for changed messages in '%s'"
- msgstr "Søker etter endrede meldinger i «%s»"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6155
-+#: ../camel/providers/imapx/camel-imapx-server.c:6079
- msgid "Error fetching new messages"
- msgstr "Feil ved henting av nye meldinger"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6423
-+#: ../camel/providers/imapx/camel-imapx-server.c:6352
- msgid "Error refreshing folder"
- msgstr "Feil ved oppdatering av mappe"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6573
-+#: ../camel/providers/imapx/camel-imapx-server.c:6502
- msgid "Error expunging message"
- msgstr "Feil ved tømming av melding"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6682
--#: ../camel/providers/imapx/camel-imapx-server.c:6707
-+#: ../camel/providers/imapx/camel-imapx-server.c:6617
-+#: ../camel/providers/imapx/camel-imapx-server.c:6642
- msgid "Error fetching folders"
- msgstr "Feil ved henting av mapper"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6787
-+#: ../camel/providers/imapx/camel-imapx-server.c:6722
- msgid "Error creating folder"
- msgstr "Feil ved oppretting av mappe"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6839
-+#: ../camel/providers/imapx/camel-imapx-server.c:6774
- msgid "Error deleting folder"
- msgstr "Feil ved sletting av mappe"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6906
-+#: ../camel/providers/imapx/camel-imapx-server.c:6850
- msgid "Error renaming folder"
- msgstr "Feil ved endring av navn på mappe"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6993
-+#: ../camel/providers/imapx/camel-imapx-server.c:6924
- msgid "Error subscribing to folder"
- msgstr "Feil ved abonnering på mappe"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7053
-+#: ../camel/providers/imapx/camel-imapx-server.c:6990
- msgid "Error unsubscribing from folder"
- msgstr "Feil ved fjerning av abonnement på mappe"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7109
-+#: ../camel/providers/imapx/camel-imapx-server.c:7052
- msgid "Error retrieving quota information"
- msgstr "Feil ved henting av kvoteinformasjon"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7161
-+#: ../camel/providers/imapx/camel-imapx-server.c:7104
- msgid "Search failed"
- msgstr "Søk feilet"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7223
-+#: ../camel/providers/imapx/camel-imapx-server.c:7166
- msgid "Error performing NOOP"
- msgstr "Feil ved utføring av NOOP"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7330
-+#: ../camel/providers/imapx/camel-imapx-server.c:7273
- msgid "Error syncing changes"
- msgstr "Feil ved synkronisering av endringer"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8441
-+#: ../camel/providers/imapx/camel-imapx-server.c:8258
- #, c-format
- msgid "Cannot get message with message ID %s: %s"
- msgstr "Kan ikke hente melding med meldings-ID %s: %s"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8442
-+#: ../camel/providers/imapx/camel-imapx-server.c:8259
- msgid "No such message available."
- msgstr "Ingen slik melding tilgjengelig."
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8640
--#: ../camel/providers/imapx/camel-imapx-server.c:8658
-+#: ../camel/providers/imapx/camel-imapx-server.c:8466
-+#: ../camel/providers/imapx/camel-imapx-server.c:8487
- msgid "Cannot create spool file: "
- msgstr "Kan ikke spool-fil: "
-
--#: ../camel/providers/imapx/camel-imapx-server.c:9400
-+#: ../camel/providers/imapx/camel-imapx-server.c:9228
- msgid "IMAP server does not support quotas"
- msgstr "IMAP-tjener støtter ikke kvoter"
-
- #. create a dummy "." parent inbox, use to scan, then put back at the top level
--#: ../camel/providers/imapx/camel-imapx-store.c:207
--#: ../camel/providers/local/camel-maildir-folder.c:471
--#: ../camel/providers/local/camel-maildir-store.c:316
--#: ../camel/providers/local/camel-maildir-store.c:758
--#: ../camel/providers/local/camel-maildir-store.c:764
--#: ../camel/providers/local/camel-maildir-store.c:847
-+#: ../camel/providers/imapx/camel-imapx-store.c:223
-+#: ../camel/providers/local/camel-maildir-folder.c:482
-+#: ../camel/providers/local/camel-maildir-store.c:322
-+#: ../camel/providers/local/camel-maildir-store.c:784
-+#: ../camel/providers/local/camel-maildir-store.c:790
-+#: ../camel/providers/local/camel-maildir-store.c:873
- #: ../camel/providers/local/camel-spool-store.c:393
- msgid "Inbox"
- msgstr "Innboks"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:823
-+#: ../camel/providers/imapx/camel-imapx-store.c:758
- #, c-format
- msgid "IMAP server %s"
- msgstr "IMAP-tjener %s"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:826
-+#: ../camel/providers/imapx/camel-imapx-store.c:761
- #, c-format
- msgid "IMAP service for %s on %s"
- msgstr "IMAP-tjeneste for %s på %s"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1035
-+#: ../camel/providers/imapx/camel-imapx-store.c:836
- #: ../camel/providers/nntp/camel-nntp-provider.c:93
- #: ../camel/providers/pop3/camel-pop3-provider.c:81
- msgid "Password"
- msgstr "Passord"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1037
-+#: ../camel/providers/imapx/camel-imapx-store.c:838
- msgid "This option will connect to the IMAP server using a plaintext password."
- msgstr ""
- "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-"
- "passord."
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1112
-+#: ../camel/providers/imapx/camel-imapx-store.c:913
- #, c-format
- msgid "No such folder %s"
- msgstr "Mappen %s eksisterer ikke"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1507
-+#: ../camel/providers/imapx/camel-imapx-store.c:1324
- #, c-format
- msgid "No IMAP namespace for folder path '%s'"
--msgstr ""
-+msgstr "IMAP-navneområde for mappesti «%s» finnes ikke"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1656
-+#: ../camel/providers/imapx/camel-imapx-store.c:1472
- #, c-format
- msgid "Retrieving folder list for %s"
- msgstr "Henter mappeliste for %s"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:2094
-+#: ../camel/providers/imapx/camel-imapx-store.c:1924
- #, c-format
- msgid ""
- "The folder name \"%s\" is invalid because it contains the character \"%c\""
- msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:2615
-+#: ../camel/providers/imapx/camel-imapx-store.c:2689
- #: ../camel/providers/nntp/camel-nntp-store.c:1250
- #: ../camel/providers/pop3/camel-pop3-folder.c:450
- #: ../camel/providers/pop3/camel-pop3-folder.c:593
-@@ -3391,27 +3399,27 @@ msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
- msgid "You must be working online to complete this operation"
- msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
-
--#: ../camel/providers/local/camel-local-folder.c:192
-+#: ../camel/providers/local/camel-local-folder.c:195
- #, c-format
- msgid "~%s (%s)"
- msgstr "~%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:202
--#: ../camel/providers/local/camel-local-folder.c:211
-+#: ../camel/providers/local/camel-local-folder.c:205
-+#: ../camel/providers/local/camel-local-folder.c:214
- #, c-format
- msgid "mailbox: %s (%s)"
- msgstr "postboks: %s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:220
-+#: ../camel/providers/local/camel-local-folder.c:223
- #, c-format
- msgid "%s (%s)"
- msgstr "%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:497
-+#: ../camel/providers/local/camel-local-folder.c:500
- msgid "_Index message body data"
- msgstr "_Indekser data i meldingskropp"
-
--#: ../camel/providers/local/camel-local-folder.c:725
-+#: ../camel/providers/local/camel-local-folder.c:730
- #, c-format
- msgid ""
- "Cannot get message %s from folder %s\n"
-@@ -3505,7 +3513,7 @@ msgstr "Lagerrot %s er ikke en vanlig katalog"
- #: ../camel/providers/local/camel-local-store.c:242
- #: ../camel/providers/local/camel-local-store.c:252
- #: ../camel/providers/local/camel-local-store.c:394
--#: ../camel/providers/local/camel-maildir-store.c:150
-+#: ../camel/providers/local/camel-maildir-store.c:156
- #, c-format
- msgid "Cannot get folder: %s: %s"
- msgstr "Finner ikke mappe: %s: %s"
-@@ -3532,79 +3540,80 @@ msgstr "Kunne ikke slette metadatafil for mappe «%s»: %s"
- msgid "Could not rename '%s': %s"
- msgstr "Kunne ikke endre navn på «%s»: %s"
-
--#: ../camel/providers/local/camel-maildir-folder.c:98
--#: ../camel/providers/local/camel-maildir-folder.c:333
--#: ../camel/providers/local/camel-mbox-folder.c:115
--#: ../camel/providers/local/camel-mbox-folder.c:328
-+#: ../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 "Ingen slik melding"
-
--#: ../camel/providers/local/camel-maildir-folder.c:223
-+#: ../camel/providers/local/camel-maildir-folder.c:234
- #, c-format
- msgid "Cannot append message to maildir folder: %s: "
- msgstr "Kan ikke legge til melding i maildir mappe: %s: "
-
--#: ../camel/providers/local/camel-maildir-folder.c:271
--#: ../camel/providers/local/camel-maildir-folder.c:281
--#: ../camel/providers/local/camel-mbox-folder.c:389
-+#: ../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 "Kan ikke hente melding %s fra mappe %s: "
-
--#: ../camel/providers/local/camel-maildir-folder.c:351
-+#: ../camel/providers/local/camel-maildir-folder.c:362
- #, c-format
- msgid "Cannot transfer message to destination folder: %s"
- msgstr "Kan ikke overføre melding til målmappe: %s"
-
- #: ../camel/providers/local/camel-maildir-store.c:130
--#: ../camel/providers/local/camel-maildir-store.c:855
-+#: ../camel/providers/local/camel-maildir-store.c:149
-+#: ../camel/providers/local/camel-maildir-store.c:881
- #, c-format
- msgid "Folder %s already exists"
- msgstr "Mappen %s eksisterer allerede"
-
--#: ../camel/providers/local/camel-maildir-store.c:235
--#: ../camel/providers/local/camel-maildir-store.c:266
-+#: ../camel/providers/local/camel-maildir-store.c:241
-+#: ../camel/providers/local/camel-maildir-store.c:272
- #: ../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 "Kan ikke opprette mappe «%s»: %s"
-
--#: ../camel/providers/local/camel-maildir-store.c:250
-+#: ../camel/providers/local/camel-maildir-store.c:256
- #: ../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 "Finner ikke mappe «%s»: %s"
-
--#: ../camel/providers/local/camel-maildir-store.c:256
-+#: ../camel/providers/local/camel-maildir-store.c:262
- #: ../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 "Finner ikke mappe «%s»: mappen eksisterer ikke."
-
--#: ../camel/providers/local/camel-maildir-store.c:283
-+#: ../camel/providers/local/camel-maildir-store.c:289
- #, c-format
- msgid "Cannot get folder '%s': not a maildir directory."
- msgstr "Kan ikke hente mappe «%s»: ikke en maildir katalog."
-
--#: ../camel/providers/local/camel-maildir-store.c:347
--#: ../camel/providers/local/camel-maildir-store.c:387
-+#: ../camel/providers/local/camel-maildir-store.c:353
-+#: ../camel/providers/local/camel-maildir-store.c:393
- #: ../camel/providers/local/camel-mh-store.c:676
- #, c-format
- msgid "Could not delete folder '%s': %s"
- msgstr "Kunne ikke slette mappe «%s»: %s"
-
--#: ../camel/providers/local/camel-maildir-store.c:349
-+#: ../camel/providers/local/camel-maildir-store.c:355
- msgid "not a maildir directory"
- msgstr "ikke en maildir katalog"
-
--#: ../camel/providers/local/camel-maildir-store.c:630
--#: ../camel/providers/local/camel-maildir-store.c:1069
-+#: ../camel/providers/local/camel-maildir-store.c:637
-+#: ../camel/providers/local/camel-maildir-store.c:1095
- #: ../camel/providers/local/camel-spool-store.c:212
- #: ../camel/providers/local/camel-spool-store.c:231
- #, c-format
-@@ -3625,29 +3634,29 @@ msgstr "Sjekker om mappen er konsistent"
- msgid "Checking for new messages"
- msgstr "Ser etter nye meldinger"
-
--#: ../camel/providers/local/camel-maildir-summary.c:784
-+#: ../camel/providers/local/camel-maildir-summary.c:791
- #: ../camel/providers/local/camel-mbox-summary.c:466
--#: ../camel/providers/local/camel-mbox-summary.c:682
--#: ../camel/providers/local/camel-mbox-summary.c:831
-+#: ../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 "Lagrer mappe"
-
--#: ../camel/providers/local/camel-mbox-folder.c:185
-+#: ../camel/providers/local/camel-mbox-folder.c:196
- #, c-format
- msgid "Cannot open mailbox: %s: "
- msgstr "Kan ikke åpne postboks: %s: "
-
--#: ../camel/providers/local/camel-mbox-folder.c:251
-+#: ../camel/providers/local/camel-mbox-folder.c:262
- #, c-format
- msgid "Cannot append message to mbox file: %s: "
- msgstr "Kan ikke legge til melding i mbox-fil: %s: "
-
--#: ../camel/providers/local/camel-mbox-folder.c:381
-+#: ../camel/providers/local/camel-mbox-folder.c:392
- msgid "The folder appears to be irrecoverably corrupted."
- msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres."
-
--#: ../camel/providers/local/camel-mbox-folder.c:438
-+#: ../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"
-@@ -3725,48 +3734,48 @@ msgstr "Kunne ikke endre navn på «%s» til %s: %s"
- msgid "Could not open folder: %s: %s"
- msgstr "Kunne ikke åpne mappe %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:606
-+#: ../camel/providers/local/camel-mbox-summary.c:611
- #, c-format
- msgid "Cannot check folder: %s: %s"
- msgstr "Kan ikke sjekke mappe: %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:695
--#: ../camel/providers/local/camel-mbox-summary.c:840
-+#: ../camel/providers/local/camel-mbox-summary.c:700
-+#: ../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 "Kunne ikke åpne fil %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:710
-+#: ../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 "Kan ikke åpne midlertidig postboks: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:727
--#: ../camel/providers/local/camel-mbox-summary.c:962
-+#: ../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 "Kunne ikke lukke kildemappe %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:740
-+#: ../camel/providers/local/camel-mbox-summary.c:745
- #, c-format
- msgid "Could not close temporary folder: %s"
- msgstr "Kunne ikke lukke midlertidig mappe: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:759
-+#: ../camel/providers/local/camel-mbox-summary.c:764
- #, c-format
- msgid "Could not rename folder: %s"
- msgstr "Kunne ikke endre navn på mappe: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:854
--#: ../camel/providers/local/camel-mbox-summary.c:1127
-+#: ../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 "Kunne ikke lagre mappe: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:893
--#: ../camel/providers/local/camel-mbox-summary.c:1167
-+#: ../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 "
-@@ -3775,25 +3784,25 @@ msgstr ""
- "MBOX-filen er korrupt. Vennligst korriger den. (Forventet en From: linje, "
- "men fant den ikke.)"
-
--#: ../camel/providers/local/camel-mbox-summary.c:903
--#: ../camel/providers/local/camel-mbox-summary.c:1179
-+#: ../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 "Sammendrag og mappe stemmer ikke overens selv etter synkronisering"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1072
-+#: ../camel/providers/local/camel-mbox-summary.c:1077
- #: ../camel/providers/local/camel-spool-summary.c:356
- #, c-format
- msgid "Unknown error: %s"
- msgstr "Ukjent feil: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1237
--#: ../camel/providers/local/camel-mbox-summary.c:1267
-+#: ../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 "Skriving til midlertidig postboks feilet: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1256
-+#: ../camel/providers/local/camel-mbox-summary.c:1261
- #, c-format
- msgid "Writing to temporary mailbox failed: %s: %s"
- msgstr "Skriving til midlertidig postboks feilet: %s: %s"
-@@ -3914,21 +3923,21 @@ msgstr ""
- "Mappen kan være korrupt, kopi lagret i «%s»"
-
- #: ../camel/providers/nntp/camel-nntp-folder.c:222
--#: ../camel/providers/nntp/camel-nntp-folder.c:588
-+#: ../camel/providers/nntp/camel-nntp-folder.c:590
- #, c-format
- msgid "Internal error: UID in invalid format: %s"
- msgstr "Intern feil: UID har ugyldig format: %s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:291
--#: ../camel/providers/nntp/camel-nntp-folder.c:296
-+#: ../camel/providers/nntp/camel-nntp-folder.c:292
-+#: ../camel/providers/nntp/camel-nntp-folder.c:297
- #: ../camel/providers/pop3/camel-pop3-folder.c:546
- #: ../camel/providers/pop3/camel-pop3-folder.c:945
- #, c-format
- msgid "Cannot get message %s: %s"
- msgstr "Kan ikke hente melding %s: %s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:303
--#: ../camel/providers/nntp/camel-nntp-folder.c:622
-+#: ../camel/providers/nntp/camel-nntp-folder.c:304
-+#: ../camel/providers/nntp/camel-nntp-folder.c:624
- #: ../camel/providers/pop3/camel-pop3-folder.c:476
- #: ../camel/providers/pop3/camel-pop3-folder.c:536
- #: ../camel/providers/pop3/camel-pop3-folder.c:555
-@@ -3942,16 +3951,16 @@ msgstr "Kan ikke hente melding %s: "
- msgid "Posting failed: %s"
- msgstr "Posting feilet: %s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:501
-+#: ../camel/providers/nntp/camel-nntp-folder.c:503
- msgid "Posting failed: "
- msgstr "Posting feilet: "
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:611
-+#: ../camel/providers/nntp/camel-nntp-folder.c:613
- #, c-format
- msgid "This message is not currently available"
- msgstr "Denne meldingen er ikke tilgjengelig"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:720
-+#: ../camel/providers/nntp/camel-nntp-folder.c:722
- #, c-format
- msgid "You cannot copy messages from a NNTP folder"
- msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe"
-@@ -4678,8 +4687,8 @@ msgstr "(Utfaset) URL for automatisk konfigurasjon av proxy"
-
- #: ../libebackend/e-authentication-mediator.c:204
- #: ../libebackend/e-authentication-mediator.c:215
--#: ../libebackend/e-authentication-mediator.c:861
--#: ../libebackend/e-authentication-mediator.c:1198
-+#: ../libebackend/e-authentication-mediator.c:860
-+#: ../libebackend/e-authentication-mediator.c:1197
- msgid "Bus name vanished (client terminated?)"
- msgstr "Navn på bussen forsvang (klient terminert?)"
-
-@@ -4689,8 +4698,8 @@ msgstr "Ingen svar fra klient"
-
- #: ../libebackend/e-authentication-mediator.c:333
- #: ../libebackend/e-authentication-mediator.c:344
--#: ../libebackend/e-authentication-mediator.c:855
--#: ../libebackend/e-authentication-mediator.c:1192
-+#: ../libebackend/e-authentication-mediator.c:854
-+#: ../libebackend/e-authentication-mediator.c:1191
- msgid "Client cancelled the operation"
- msgstr "Klienten avbrøt operasjon"
-
-@@ -4698,11 +4707,11 @@ msgstr "Klienten avbrøt operasjon"
- msgid "Client reports password was rejected"
- msgstr "Klienten rapporterer at passordet ble avvist"
-
--#: ../libebackend/e-authentication-session.c:554
-+#: ../libebackend/e-authentication-session.c:539
- msgid "Add this password to your keyring"
- msgstr "Legg til dette passordet i nøkkelringen"
-
--#: ../libebackend/e-authentication-session.c:664
-+#: ../libebackend/e-authentication-session.c:649
- msgid "Password was incorrect"
- msgstr "Passordet var ikke korrekt"
-
-@@ -4711,12 +4720,12 @@ msgstr "Passordet var ikke korrekt"
- msgid "%s does not support authentication"
- msgstr "%s støtter ikke autentisering"
-
--#: ../libebackend/e-collection-backend.c:900
-+#: ../libebackend/e-collection-backend.c:901
- #, c-format
- msgid "%s does not support creating remote resources"
- msgstr "%s støtter ikke å lage eksterne ressurser"
-
--#: ../libebackend/e-collection-backend.c:959
-+#: ../libebackend/e-collection-backend.c:960
- #, c-format
- msgid "%s does not support deleting remote resources"
- msgstr "%s støtter ikke sletting av eksterne ressurser"
-@@ -4731,38 +4740,38 @@ msgstr "Ingen fabrikk for motor for hash-nøkkel «%s»"
- msgid "Data source is missing a [%s] group"
- msgstr "Datakilden mangler en [%s]-gruppe"
-
--#: ../libebackend/e-server-side-source.c:1020
--#: ../libedataserver/e-source.c:1348
-+#: ../libebackend/e-server-side-source.c:1022
-+#: ../libedataserver/e-source.c:1394
- #, c-format
- msgid "Data source '%s' does not support creating remote resources"
- msgstr "Datakilde «%s» støtter ikke å lage eksterne ressurser"
-
--#: ../libebackend/e-server-side-source.c:1034
-+#: ../libebackend/e-server-side-source.c:1036
- #, c-format
- msgid ""
- "Data source '%s' has no collection backend to create the remote resource"
- msgstr "Datakilde «%s» har ingen samlingsmotor for å lage ekstern ressurs"
-
--#: ../libebackend/e-server-side-source.c:1062
--#: ../libedataserver/e-source.c:1461
-+#: ../libebackend/e-server-side-source.c:1064
-+#: ../libedataserver/e-source.c:1507
- #, c-format
- msgid "Data source '%s' does not support deleting remote resources"
- msgstr "Datakilde «%s» støtter ikke sletting av eksterne ressurser"
-
--#: ../libebackend/e-server-side-source.c:1076
-+#: ../libebackend/e-server-side-source.c:1078
- #, c-format
- msgid ""
- "Data source '%s' has no collection backend to delete the remote resource"
- msgstr "Datakilde «%s» har ingen samlingsmotor for å slette ekstern ressurs"
-
--#: ../libebackend/e-server-side-source.c:1107
--#: ../libedataserver/e-source.c:1557
--#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
-+#: ../libebackend/e-server-side-source.c:1109
-+#: ../libedataserver/e-source.c:1603
-+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026
- #, c-format
- msgid "Data source '%s' does not support OAuth 2.0 authentication"
- msgstr "Datakilde «%s» støtter ikke OAuth 2.0 autentisering"
-
--#: ../libebackend/e-server-side-source.c:1452
-+#: ../libebackend/e-server-side-source.c:1456
- #, c-format
- msgid "File must have a '.source' extension"
- msgstr "Filen må ha en «.source»-filtype"
-@@ -4965,26 +4974,26 @@ msgstr "Vennligst oppgi passordet for oppgaveliste «%s»."
- msgid "Please enter the password for account \"%s\"."
- msgstr "Vennligst oppgi passordet for konto «%s»."
-
--#: ../libedataserver/e-source.c:765
-+#: ../libedataserver/e-source.c:768
- #, c-format
- msgid "Source file is missing a [%s] group"
- msgstr "Kildefilen mangler en [%s]-gruppe"
-
--#: ../libedataserver/e-source.c:1128
-+#: ../libedataserver/e-source.c:1174
- #, c-format
- msgid "Data source '%s' is not removable"
- msgstr "Datakilde «%s» kan ikke fjernes"
-
--#: ../libedataserver/e-source.c:1251
-+#: ../libedataserver/e-source.c:1297
- #, c-format
- msgid "Data source '%s' is not writable"
- msgstr "Datakilde «%s» er ikke skrivbar"
-
--#: ../libedataserver/e-source.c:1864
-+#: ../libedataserver/e-source.c:1910
- msgid "Unnamed"
- msgstr "Uten navn"
-
--#: ../libedataserver/e-source-mail-signature.c:486
-+#: ../libedataserver/e-source-mail-signature.c:485
- #, c-format
- msgid "Signature script must be a local file"
- msgstr "Signaturskriptet må være en lokal fil"
-@@ -4994,7 +5003,7 @@ msgstr "Signaturskriptet må være en lokal fil"
- msgid "Source '%s' does not support proxy lookups"
- msgstr "Kilde «%s» støtter ikke oppslag via proxy"
-
--#: ../libedataserver/e-source-webdav.c:1551
-+#: ../libedataserver/e-source-webdav.c:1555
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
-@@ -5003,7 +5012,7 @@ msgstr ""
- "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av adressebok «%s». "
- "Vil du akseptere det?"
-
--#: ../libedataserver/e-source-webdav.c:1560
-+#: ../libedataserver/e-source-webdav.c:1564
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
-@@ -5012,7 +5021,7 @@ msgstr ""
- "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av kalender «%s». Vil "
- "du akseptere det?"
-
--#: ../libedataserver/e-source-webdav.c:1569
-+#: ../libedataserver/e-source-webdav.c:1573
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
-@@ -5021,7 +5030,7 @@ msgstr ""
- "Stoler ikke på SSL-sertifikat for vert «%s» som brukes av notatliste «%s». "
- "Vil du akseptere det?"
-
--#: ../libedataserver/e-source-webdav.c:1578
-+#: ../libedataserver/e-source-webdav.c:1582
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
-@@ -5215,7 +5224,7 @@ msgstr "Klarte ikke å finne kontoelement"
- msgid "Failed to find ASUrl and OABUrl in autodiscover response"
- msgstr "Klarte ikke å finne ASUrl og OABUrl i svar fra automatisk gjenkjenning"
-
--#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261
-+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260
- #, c-format
- msgid ""
- "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-@@ -5224,18 +5233,23 @@ msgstr ""
- "Kan ikke finne samsvarende konto å finne tilgangstegn for «%s» i org.gnome."
- "OnlineAccounts-tjenesten"
-
--#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288
-+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290
- #, c-format
- msgid "Failed to obtain an access token for '%s': "
- msgstr "Klarte ikke å hente et adgangstegn for «%s»: "
-
--#: ../modules/google-backend/module-google-backend.c:191
-+#: ../modules/google-backend/module-google-backend.c:195
- #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
- #: ../modules/yahoo-backend/module-yahoo-backend.c:199
- msgid "Calendar"
- msgstr "Kalender"
-
--#: ../modules/google-backend/module-google-backend.c:260
-+#: ../modules/google-backend/module-google-backend.c:268
-+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
-+msgid "Tasks"
-+msgstr "Oppgaver"
-+
-+#: ../modules/google-backend/module-google-backend.c:321
- #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
- #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
- msgid "Contacts"
-@@ -5338,7 +5352,7 @@ msgstr "E-post"
- msgid "Integrate your mailboxes"
- msgstr "Integrer dine postbokser"
-
--#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008
-+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007
- #, c-format
- msgid ""
- "Cannot find a corresponding account service in the accounts database from "
-@@ -5352,7 +5366,9 @@ msgstr ""
- #, c-format
- msgid ""
- "Expected status 200 when requesting your identity, instead got status %d (%s)"
--msgstr "Forventet status 200 ved forespørsel om din identitet. Fikk i stedet status %d (%s)"
-+msgstr ""
-+"Forventet status 200 ved forespørsel om din identitet. Fikk i stedet status "
-+"%d (%s)"
-
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:101
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:298
-@@ -5383,10 +5399,6 @@ msgstr "Yahoo! kalender"
- msgid "Yahoo! Mail"
- msgstr "Yahoo! e-post"
-
--#: ../modules/yahoo-backend/module-yahoo-backend.c:226
--msgid "Tasks"
--msgstr "Oppgaver"
--
- #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
- #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
- #: ../services/evolution-user-prompter/evolution-user-prompter.c:30
-diff --git a/po/sr.po b/po/sr.po
-index f6c4725..08a921c 100644
---- a/po/sr.po
-+++ b/po/sr.po
-@@ -9,8 +9,8 @@ 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: 2014-03-17 17:45+0000\n"
--"PO-Revision-Date: 2014-03-17 23:19+0200\n"
-+"POT-Creation-Date: 2014-07-22 04:28+0000\n"
-+"PO-Revision-Date: 2014-07-22 11:22+0200\n"
- "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
- "Language-Team: Serbian <gnom@prevod.org>\n"
- "Language: sr\n"
-@@ -21,79 +21,79 @@ msgstr ""
- "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
- "X-Project-Style: gnome\n"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:117
-+#: ../addressbook/backends/file/e-book-backend-file.c:120
- #, c-format
- msgid "Failed to remove file '%s': %s"
- msgstr "Нисам успео да уклоним датотеку „%s“: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:145
-+#: ../addressbook/backends/file/e-book-backend-file.c:148
- #, c-format
- msgid "Failed to make directory %s: %s"
- msgstr "Нисам успео да направим директоријум „%s“: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:396
-+#: ../addressbook/backends/file/e-book-backend-file.c:419
- #, c-format
- msgid "Failed to create hardlink for resource '%s': %s"
- msgstr "Нисам успео да направим чврсту везу за извор „%s“: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:501
--#: ../addressbook/backends/file/e-book-backend-file.c:1230
-+#: ../addressbook/backends/file/e-book-backend-file.c:524
-+#: ../addressbook/backends/file/e-book-backend-file.c:1253
- msgid "No UID in the contact"
- msgstr "Нема КИБ-а у контакту"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:828
-+#: ../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:967
-+#: ../addressbook/backends/file/e-book-backend-file.c:990
- msgid "Loading..."
- msgstr "Учитавам..."
-
--#: ../addressbook/backends/file/e-book-backend-file.c:969
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423
-+#: ../addressbook/backends/file/e-book-backend-file.c:992
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353
- msgid "Searching..."
- msgstr "Претражујем..."
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1258
-+#: ../addressbook/backends/file/e-book-backend-file.c:1281
- #, c-format
- msgid "Tried to modify contact '%s' with out of sync revision"
- msgstr "Покушах да изменим контакт „%s“ са прегледом који није усклађен"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1449
--#: ../addressbook/backends/file/e-book-backend-file.c:1532
-+#: ../addressbook/backends/file/e-book-backend-file.c:1472
-+#: ../addressbook/backends/file/e-book-backend-file.c:1555
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
--#: ../addressbook/libedata-book/e-book-sqlite.c:6706
-+#: ../addressbook/libedata-book/e-book-sqlite.c:6711
- #, c-format
- msgid "Contact '%s' not found"
- msgstr "Контакт „%s“ није пронађен"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1592
--#: ../addressbook/backends/file/e-book-backend-file.c:1673
-+#: ../addressbook/backends/file/e-book-backend-file.c:1615
-+#: ../addressbook/backends/file/e-book-backend-file.c:1696
- #, c-format
- msgid "Query '%s' not supported"
- msgstr "Упит „%s“ није подржан"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1601
--#: ../addressbook/backends/file/e-book-backend-file.c:1682
-+#: ../addressbook/backends/file/e-book-backend-file.c:1624
-+#: ../addressbook/backends/file/e-book-backend-file.c:1705
- #, c-format
- msgid "Invalid Query '%s'"
- msgstr "Неисправан упит „%s“"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1947
-+#: ../addressbook/backends/file/e-book-backend-file.c:1970
- msgid "Requested to delete an unrelated cursor"
- msgstr "Затражили сте брисање неодносног курзора"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:2014
-+#: ../addressbook/backends/file/e-book-backend-file.c:2041
- #, c-format
- msgid "Failed to rename old database from '%s' to '%s': %s"
- msgstr "Нисам успео да преименујем стару базу података „%s“ у „%s“: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:417
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:874
-+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887
- #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
- #: ../addressbook/libebook-contacts/e-phone-number.c:56
- #: ../addressbook/libebook/e-book.c:1078
-@@ -108,67 +108,69 @@ msgstr "Нисам успео да преименујем стару базу п
- #: ../addressbook/libebook/e-book-client.c:3175
- #: ../addressbook/libebook/e-book-client.c:3393
- #: ../addressbook/libedata-book/e-book-backend-sexp.c:878
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621
- #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
- #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
- #: ../calendar/libecal/e-cal-client.c:3239
- #: ../calendar/libecal/e-cal-client.c:3412
- #: ../calendar/libecal/e-cal-client.c:3676
- #: ../calendar/libecal/e-cal-client.c:3917
--#: ../calendar/libecal/e-cal-client.c:4105
--#: ../calendar/libecal/e-cal-client.c:4297
--#: ../calendar/libecal/e-cal-client.c:4467
--#: ../calendar/libecal/e-cal-client.c:4636
--#: ../calendar/libecal/e-cal-client.c:4839
--#: ../calendar/libecal/e-cal-client.c:4989
--#: ../calendar/libecal/e-cal-client.c:5183
--#: ../calendar/libecal/e-cal-client.c:5336
--#: ../calendar/libecal/e-cal-client.c:5553
--#: ../calendar/libecal/e-cal-client.c:5707
--#: ../calendar/libecal/e-cal-client.c:5933
--#: ../calendar/libecal/e-cal-client.c:6129
--#: ../calendar/libecal/e-cal-client.c:6492
--#: ../calendar/libecal/e-cal-client.c:6706
--#: ../camel/providers/imapx/camel-imapx-command.c:642
-+#: ../calendar/libecal/e-cal-client.c:4107
-+#: ../calendar/libecal/e-cal-client.c:4299
-+#: ../calendar/libecal/e-cal-client.c:4469
-+#: ../calendar/libecal/e-cal-client.c:4638
-+#: ../calendar/libecal/e-cal-client.c:4841
-+#: ../calendar/libecal/e-cal-client.c:4991
-+#: ../calendar/libecal/e-cal-client.c:5185
-+#: ../calendar/libecal/e-cal-client.c:5338
-+#: ../calendar/libecal/e-cal-client.c:5555
-+#: ../calendar/libecal/e-cal-client.c:5709
-+#: ../calendar/libecal/e-cal-client.c:5935
-+#: ../calendar/libecal/e-cal-client.c:6131
-+#: ../calendar/libecal/e-cal-client.c:6494
-+#: ../calendar/libecal/e-cal-client.c:6708
-+#: ../camel/providers/imapx/camel-imapx-command.c:645
-+#: ../camel/providers/imapx/camel-imapx-server.c:4769
-+#: ../camel/providers/imapx/camel-imapx-server.c:4778
- #: ../libedataserver/e-client.c:185
- msgid "Unknown error"
- msgstr "Непозната грешка"
-
- #. Query for new contacts asynchronously
--#: ../addressbook/backends/google/e-book-backend-google.c:836
-+#: ../addressbook/backends/google/e-book-backend-google.c:828
- msgid "Querying for updated contacts…"
- msgstr "Пропитујем за ажурираним контактима…"
-
- #. Run the query asynchronously
--#: ../addressbook/backends/google/e-book-backend-google.c:988
-+#: ../addressbook/backends/google/e-book-backend-google.c:1010
- msgid "Querying for updated groups…"
- msgstr "Пропитујем за ажурираним групама…"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:1705
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1361
-+#: ../addressbook/backends/google/e-book-backend-google.c:1757
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433
- msgid "The backend does not support bulk additions"
- msgstr "Позадинац не подржава групно додавање"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:1854
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1473
-+#: ../addressbook/backends/google/e-book-backend-google.c:1912
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545
- msgid "The backend does not support bulk modifications"
- msgstr "Позадинац не подржава групно уређивање"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:2054
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1573
-+#: ../addressbook/backends/google/e-book-backend-google.c:2119
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645
- msgid "The backend does not support bulk removals"
- msgstr "Позадинац не подржава групно уклањање"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:2180
-+#: ../addressbook/backends/google/e-book-backend-google.c:2239
- msgid "Loading…"
- msgstr "Учитавам…"
-
- #. System Group: My Contacts
--#: ../addressbook/backends/google/e-book-google-utils.c:1618
-+#: ../addressbook/backends/google/e-book-google-utils.c:1631
- #: ../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
-@@ -177,131 +179,131 @@ msgid "Personal"
- msgstr "Лично"
-
- #. System Group: Friends
--#: ../addressbook/backends/google/e-book-google-utils.c:1620
-+#: ../addressbook/backends/google/e-book-google-utils.c:1633
- msgid "Friends"
- msgstr "Пријатељи"
-
- #. System Group: Family
--#: ../addressbook/backends/google/e-book-google-utils.c:1622
-+#: ../addressbook/backends/google/e-book-google-utils.c:1635
- msgid "Family"
- msgstr "Породица"
-
- #. System Group: Coworkers
--#: ../addressbook/backends/google/e-book-google-utils.c:1624
-+#: ../addressbook/backends/google/e-book-google-utils.c:1637
- msgid "Coworkers"
- msgstr "Сарадници"
-
- #. 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:170
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113
- msgid "Not connected"
- msgstr "Нисам повезан"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899
- msgid "Failed to bind using either v3 or v2 binds"
- msgstr "Нисам успео да повежем користећи ни в3 ни в2 везице"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
- msgid "Reconnecting to LDAP server..."
- msgstr "Поново се повезујем на ЛДАП сервер..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153
- msgid "Invalid DN syntax"
- msgstr "Неисправна ДН синтакса"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
- #, c-format
- msgid "LDAP error 0x%x (%s)"
- msgstr "Грешка ЛДАП-а 0x%x (%s)"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104
- #, c-format
- msgid "%s: NULL returned from ldap_first_entry"
- msgstr "%s: „NULL“ је враћено са првог уноса лдапа (ldap_first_entry)"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162
- #, c-format
- msgid "%s: Unhandled result type %d returned"
- msgstr "%s: Враћена је непозната врста резултата %d"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422
- #, c-format
- msgid "%s: Unhandled search result type %d returned"
- msgstr "%s: Враћена је непозната врста резултата претраге %d"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196
- msgid "Receiving LDAP search results..."
- msgstr "Примам резултате претраге са ЛДАП сервера..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375
- msgid "Error performing search"
- msgstr "Грешка током претраге"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503
- #, c-format
- msgid "Downloading contacts (%d)..."
- msgstr "Преузимам контакте (%d)..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067
- msgid "Adding contact to LDAP server..."
- msgstr "Додајем контакт на ЛДАП сервер..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142
- msgid "Modifying contact from LDAP server..."
- msgstr "Мењам контакт са ЛДАП сервера..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208
- msgid "Removing contact from LDAP server..."
- msgstr "Уклањам контакт са ЛДАП сервера..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597
- #, c-format
- msgid "Failed to get the DN for user '%s'"
- msgstr "Нисам успео да добавим ДН за корисника „%s“"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:853
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
- msgid "Loading Addressbook summary..."
- msgstr "Учитавам сажетак адресара..."
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:871
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
- #, c-format
- msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
- msgstr ""
- "Није успело налажење својства (PROPFIND) на вебдаву са ХТТП стањем %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:890
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903
- msgid "No response body in webdav PROPFIND result"
- msgstr "Нема тела одговора у резултатима налажења својстава вебдава"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:951
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964
- #, c-format
- msgid "Loading Contacts (%d%%)"
- msgstr "Учитавам контакте (%d%%)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1283
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353
- msgid "Cannot transform SoupURI to string"
- msgstr "Не могу да преобратим Соуп адресу у ниску"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474
- #, c-format
- msgid "Create resource '%s' failed with HTTP status %d (%s)"
- msgstr "Није успело стварање ресурса „%s“ са ХТТП стањем %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576
- msgid "Contact on server changed -> not modifying"
- msgstr "Измењен је контакт на серверу —> не мењам"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1512
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584
- #, c-format
- msgid "Modify contact failed with HTTP status %d (%s)"
- msgstr "Измена контакта није успела са ХТТП стањем %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1605
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1621
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693
- #, c-format
- msgid "DELETE failed with HTTP status %d"
- msgstr "Није успело брисање (DELETE) са ХТТП стањем %d"
-@@ -905,8 +907,8 @@ msgstr "Списак имена Гугл разговора"
- msgid "Twitter Name List"
- msgstr "Списак Твитер имена"
-
--#: ../addressbook/libebook-contacts/e-contact.c:1635
--#: ../addressbook/libebook/e-destination.c:917
-+#: ../addressbook/libebook-contacts/e-contact.c:1654
-+#: ../addressbook/libebook/e-destination.c:920
- msgid "Unnamed List"
- msgstr "Неименовани списак"
-
-@@ -1002,7 +1004,7 @@ msgstr ""
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
--#: ../addressbook/libedata-book/e-book-sqlite.c:5364
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5369
- #, c-format
- msgid "Query contained unsupported elements"
- msgstr "Упит је садржао неподржане елементе"
-@@ -1065,7 +1067,7 @@ msgid "Cannot sort by a field which may have multiple values"
- msgstr "Не могу да поређам према пољу које може имати више вредности"
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
--#: ../addressbook/libedata-book/e-book-sqlite.c:7376
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7381
- #, c-format
- msgid ""
- "Tried to step a cursor in reverse, but cursor is already at the beginning of "
-@@ -1074,7 +1076,7 @@ msgstr ""
- "Покушах да померим курзор уназад, али је он већ на почетку списка контакта"
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
--#: ../addressbook/libedata-book/e-book-sqlite.c:7384
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7389
- #, c-format
- msgid ""
- "Tried to step a cursor forwards, but cursor is already at the end of the "
-@@ -1084,7 +1086,6 @@ msgstr ""
-
- #: ../addressbook/libedata-book/e-book-sqlite.c:524
- #, c-format
--#| msgid "Invalid contact field '%d' specified in summary"
- msgid "Unsupported contact field '%d' specified in summary"
- msgstr "Неподржано поље контакта „%d“ је наведено у сажетку"
-
-@@ -1096,22 +1097,20 @@ msgstr ""
- "Не могу да надоградим базу података контаката из старе базе података са више "
- "од једним адресаром. Обришите прво један од уноса у табели „фасцикли“."
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:5357
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5362
- #, c-format
--#| msgid "Invalid query: "
- msgid "Invalid query: %s"
- msgstr "Неисправан упит: %s"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:5532
--#| msgid "Invalid query: "
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5537
- msgid "Invalid query for EbSqlCursor"
- msgstr "Неисправан упит за ЕбСдбКурзор"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:7198
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7203
- msgid "At least one sort field must be specified to use an EbSqlCursor"
- msgstr "За коришћење ЕбСкулКурзор-а мора бити наведено барем једно поље ређања"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:7216
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7221
- msgid "Cannot sort by a field that is not a string type"
- msgstr "Не могу да поређам према пољу које није врста ниске"
-
-@@ -1278,17 +1277,14 @@ msgid "Cannot remove contacts: "
- msgstr "Не могу да уклоним контакте: "
-
- #: ../addressbook/libedata-book/e-data-book-cursor.c:772
--#| msgid "%s does not support creating remote resources"
- msgid "Cursor does not support setting the search expression"
- msgstr "Курзор не подржава подешавање израза претраге"
-
- #: ../addressbook/libedata-book/e-data-book-cursor.c:855
--#| msgid "Store does not support an INBOX"
- msgid "Cursor does not support step"
- msgstr "Курзор не подржава корак"
-
- #: ../addressbook/libedata-book/e-data-book-cursor.c:938
--#| msgid "%s does not support authentication"
- msgid "Cursor does not support alphabetic indexes"
- msgstr "Курзор не подржава азбучне индексе"
-
-@@ -1322,31 +1318,35 @@ msgstr "Недостаје КИБ извора"
- msgid "No such source for UID '%s'"
- msgstr "Нема таквог извора за КИБ „%s“"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576
- #, c-format
- msgid "Server is unreachable (%s)"
- msgstr "Сервер је недоступан (%s)"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607
- #, c-format
- msgid "Failed to connect to a server using SSL: %s"
- msgstr "Нисам успео да се повежем на сервер користећи ССЛ: %s"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
- #, c-format
- msgid "Unexpected HTTP status code %d returned (%s)"
- msgstr "Враћен је неочекивани код „%d“ ХТТП стања (%s)"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637
- msgid "CalDAV backend is not loaded yet"
- msgstr "Позадинац КолДАВ-а још увек није учитан"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1074
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079
- msgid "Invalid Redirect URL"
- msgstr "Неисправна адреса преусмеравања"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2577
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2942
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882
-+#, c-format
-+msgid "Cannot create local cache folder '%s'"
-+msgstr "Не могу да направим фасциклу месне оставе „%s“"
-+
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934
- #, c-format
- msgid ""
- "Server is unreachable, calendar is opened in read-only mode.\n"
-@@ -1355,32 +1355,27 @@ msgstr ""
- "Сервер је недоступан, календар је отворен у режиму само за читање.\n"
- "Порука грешке: %s"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2897
--#, c-format
--msgid "Cannot create local cache folder '%s'"
--msgstr "Не могу да направим фасциклу месне оставе „%s“"
--
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3982
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968
- msgid "CalDAV does not support bulk additions"
- msgstr "КолДАВ не подржава групно додавање"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4085
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071
- msgid "CalDAV does not support bulk modifications"
- msgstr "КолДАВ не подржава групно уређивање"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4261
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
- msgid "CalDAV does not support bulk removals"
- msgstr "КолДАВ не подржава групно уклањање"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914
- msgid "Calendar doesn't support Free/Busy"
- msgstr "Календар не подржава Слободно / Заузето"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4937
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923
- msgid "Schedule outbox url not found"
- msgstr "Није пронађена адреса отпремног сандучета распореда"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5034
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020
- msgid "Unexpected result in schedule-response"
- msgstr "Неочекиван резултат у распореду-одговору"
-
-@@ -1407,27 +1402,27 @@ msgstr "Не могу да сачувам податак из календара
- msgid "Cannot save calendar data"
- msgstr "Не могу да сачувам податке календара"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:486
-+#: ../calendar/backends/http/e-cal-backend-http.c:491
- #, c-format
- msgid "Malformed URI: %s"
- msgstr "Лоша адреса: %s"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:577
-+#: ../calendar/backends/http/e-cal-backend-http.c:582
- #, c-format
- msgid "Redirected to Invalid URI"
- msgstr "Преусмерено на неисправну адресу"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:620
-+#: ../calendar/backends/http/e-cal-backend-http.c:625
- #, c-format
- msgid "Bad file format."
- msgstr "Лош облик датотеке."
-
--#: ../calendar/backends/http/e-cal-backend-http.c:630
-+#: ../calendar/backends/http/e-cal-backend-http.c:635
- #, c-format
- msgid "Not a calendar."
- msgstr "Није календар."
-
--#: ../calendar/backends/http/e-cal-backend-http.c:917
-+#: ../calendar/backends/http/e-cal-backend-http.c:925
- #: ../calendar/backends/weather/e-cal-backend-weather.c:536
- msgid "Could not create cache file"
- msgstr "Не могу да направим датотеку за оставу"
-@@ -2057,7 +2052,7 @@ msgstr "Неисправни аргументи за (системска-озн
- msgid "Invalid arguments to (user-tag)"
- msgstr "Неисправни аргументи за (корисничка-ознака)"
-
--#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053
-+#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086
- #, c-format
- msgid "Error executing filter search: %s: %s"
- msgstr "Грешка у примени филтера за претрагу: %s: %s"
-@@ -2103,57 +2098,57 @@ msgstr "Умножавам поруке"
- msgid "Quota information not supported for folder '%s'"
- msgstr "Обавештење о количини није подржано за фасциклу „%s“"
-
--#: ../camel/camel-folder.c:2868
-+#: ../camel/camel-folder.c:2862
- #, c-format
- msgid "Expunging folder '%s'"
- msgstr "Празним фасциклу „%s“"
-
--#: ../camel/camel-folder.c:2996
-+#: ../camel/camel-folder.c:2990
- #, c-format
- msgid "Retrieving message '%s' in %s"
- msgstr "Довлачим поруку „%s“ у %s"
-
--#: ../camel/camel-folder.c:3187
-+#: ../camel/camel-folder.c:3181
- #, c-format
- msgid "Retrieving quota information for '%s'"
- msgstr "Довлачим обавештење о количини за „%s“"
-
--#: ../camel/camel-folder.c:3487
-+#: ../camel/camel-folder.c:3478
- #, c-format
- msgid "Refreshing folder '%s'"
- msgstr "Освежавам фасциклу „%s“"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929
-+#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941
- #, c-format
- msgid "(%s) requires a single bool result"
- msgstr "(%s) захтева само један логички резултат"
-
- #. Translators: Each '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:964
-+#: ../camel/camel-folder-search.c:976
- #, c-format
- msgid "(%s) not allowed inside %s"
- msgstr "(%s) није дозвољено унутар %s"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979
-+#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991
- #, c-format
- msgid "(%s) requires a match type string"
- msgstr "(%s) захтева ниску са типом поклапања"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:1007
-+#: ../camel/camel-folder-search.c:1019
- #, c-format
- msgid "(%s) expects an array result"
- msgstr "(%s) очекује низ као резултат"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:1017
-+#: ../camel/camel-folder-search.c:1029
- #, c-format
- msgid "(%s) requires the folder set"
- msgstr "(%s) захтева скуп фасцикли"
-
--#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097
-+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
- #, c-format
- msgid ""
- "Cannot parse search expression: %s:\n"
-@@ -2162,7 +2157,7 @@ msgstr ""
- "Не могу да анализирам израз претраге: %s:\n"
- "%s"
-
--#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
-+#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121
- #, c-format
- msgid ""
- "Error executing search expression: %s:\n"
-@@ -2436,11 +2431,6 @@ msgstr ""
- msgid "Host lookup '%s' failed: %s"
- msgstr "Није успело тражење домаћина „%s“: %s"
-
--#: ../camel/camel-network-service.c:1009
--#| msgid "No quota information available for folder '%s'"
--msgid "No host information available"
--msgstr "Нису доступни подаци о домаћину"
--
- #: ../camel/camel-offline-folder.c:90
- msgid "Downloading new messages for offline mode"
- msgstr "Преузимам нове поруке за рад ван мреже"
-@@ -2721,7 +2711,7 @@ msgid "Invalid GType registered for protocol '%s'"
- msgstr "Неисправна Гврста регистрована за протокол „%s“"
-
- #: ../camel/camel-session.c:502
--#: ../camel/providers/imapx/camel-imapx-server.c:4814
-+#: ../camel/providers/imapx/camel-imapx-server.c:4719
- #: ../camel/providers/pop3/camel-pop3-store.c:311
- #: ../camel/providers/pop3/camel-pop3-store.c:757
- #: ../camel/providers/smtp/camel-smtp-transport.c:515
-@@ -2961,21 +2951,20 @@ msgstr "Не могу да направим фасциклу: %s: фасцикл
- msgid "Creating folder '%s'"
- msgstr "Стварам фасциклу „%s“"
-
--#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416
-+#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410
- #: ../camel/providers/local/camel-maildir-store.c:321
- #, c-format
- msgid "Cannot delete folder: %s: Invalid operation"
- msgstr "Не могу да обришем фасциклу: %s: неисправна операција"
-
--#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467
--#: ../camel/providers/local/camel-maildir-store.c:852
-+#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461
-+#: ../camel/providers/local/camel-maildir-store.c:872
- #, c-format
- msgid "Cannot rename folder: %s: Invalid operation"
- msgstr "Не могу да преименујем фасциклу: %s: неисправна операција"
-
- #: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
- #, c-format
--#| msgid "Data source '%s' is not removable"
- msgid "Stream type '%s' is not seekable"
- msgstr "Врста тока „%s“ се не може премотати"
-
-@@ -3042,17 +3031,17 @@ msgstr "Сам _ажурирај ори измени у изворним фас
- msgid "Unmatched"
- msgstr "Непоклопљено"
-
--#: ../camel/camel-vee-store.c:442
-+#: ../camel/camel-vee-store.c:436
- #, c-format
- msgid "Cannot delete folder: %s: No such folder"
- msgstr "Не могу да обришем фасциклу: %s: нема такве фасцикле"
-
--#: ../camel/camel-vee-store.c:477
-+#: ../camel/camel-vee-store.c:471
- #, c-format
- msgid "Cannot rename folder: %s: No such folder"
- msgstr "Не могу да променим име фасцикле: %s: нема такве фасцикле"
-
--#: ../camel/camel-vee-store.c:539
-+#: ../camel/camel-vee-store.c:533
- msgid "Enable _Unmatched folder"
- msgstr "Укључи _непоклопљене фасцикле"
-
-@@ -3064,47 +3053,46 @@ msgstr "Не могу да умножим поруке у фасциклу за
- msgid "Cannot copy messages to the Junk folder"
- msgstr "Не могу да умножим поруке у фасциклу за ђубре"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:687
-+#: ../camel/providers/imapx/camel-imapx-folder.c:796
- #, c-format
- msgid "No quota information available for folder '%s'"
- msgstr "Обавештење о количини није доступно за фасциклу „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:801
--#: ../camel/providers/imapx/camel-imapx-folder.c:894
-+#: ../camel/providers/imapx/camel-imapx-folder.c:936
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1029
- #, c-format
- msgid "No destination folder specified"
- msgstr "Није наведена фасцикла одредишта"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:829
-+#: ../camel/providers/imapx/camel-imapx-folder.c:964
- msgid "Unable to move junk messages"
- msgstr "Не могу да преместим непожељне поруке"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:922
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1057
- msgid "Unable to move deleted messages"
- msgstr "Не могу да преместим обрисане поруке"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1148
--#: ../camel/providers/nntp/camel-nntp-folder.c:758
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1374
-+#: ../camel/providers/nntp/camel-nntp-folder.c:760
- msgid "Apply message _filters to this folder"
- msgstr "Примени _филтере поруке над овом фасциклом"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1254
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1485
- #, c-format
- msgid "Could not create folder summary for %s"
- msgstr "Не могу да направим сажетак фасцикле за „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1263
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1494
- #, c-format
- msgid "Could not create cache for %s: "
- msgstr "Не могу да направим оставу за „%s“: "
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1448
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1709
- #, c-format
--#| msgid "No quota information available for folder '%s'"
- msgid "No IMAP mailbox available for folder '%s'"
- msgstr "Ниједно ИМАП сандуче није доступно за фасциклу „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-input-stream.c:92
-+#: ../camel/providers/imapx/camel-imapx-input-stream.c:93
- #, c-format
- msgid "Source stream returned no data"
- msgstr "Одговор изворног тока је без података"
-@@ -3130,23 +3118,32 @@ msgid "_Listen for server change notifications"
- msgstr "_Ослушкуј за обавештењима о изменама сервера"
-
- #: ../camel/providers/imapx/camel-imapx-provider.c:49
-+#| msgid "Evolution Data Server"
-+msgid "Connection to Server"
-+msgstr "Повезивање на сервер"
-+
-+#: ../camel/providers/imapx/camel-imapx-provider.c:51
-+msgid "Numbe_r of concurrent connections to use"
-+msgstr "_Број тренутних веза за коришћење"
-+
-+#: ../camel/providers/imapx/camel-imapx-provider.c:54
- #: ../camel/providers/nntp/camel-nntp-provider.c:44
- msgid "Folders"
- msgstr "Фасцикле"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:51
-+#: ../camel/providers/imapx/camel-imapx-provider.c:56
- msgid "_Show only subscribed folders"
- msgstr "Прик_ажи само пријављене фасцикле"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:54
-+#: ../camel/providers/imapx/camel-imapx-provider.c:59
- msgid "O_verride server-supplied folder namespace"
- msgstr "П_ремости облик имена фасцикле које даје сервер"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:56
-+#: ../camel/providers/imapx/camel-imapx-provider.c:61
- msgid "Namespace:"
- msgstr "Облик имена:"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:59
-+#: ../camel/providers/imapx/camel-imapx-provider.c:64
- #: ../camel/providers/local/camel-local-provider.c:39
- #: ../camel/providers/local/camel-local-provider.c:79
- #: ../camel/providers/local/camel-local-provider.c:99
-@@ -3154,262 +3151,263 @@ msgstr "Облик имена:"
- msgid "Options"
- msgstr "Опције"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:61
-+#: ../camel/providers/imapx/camel-imapx-provider.c:66
- #: ../camel/providers/nntp/camel-nntp-provider.c:41
- msgid "Apply _filters to new messages in all folders"
- msgstr "Примени филтере на нове поруке у свим _фасциклама"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:63
-+#: ../camel/providers/imapx/camel-imapx-provider.c:68
- msgid "_Apply filters to new messages in Inbox on this server"
- msgstr "_Примени пропуснике на нове поруке у сандучету овог сервера"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:65
-+#: ../camel/providers/imapx/camel-imapx-provider.c:70
- msgid "Check new messages for _Junk contents"
- msgstr "Провери да нема _ђубрета међу новим порукама"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:67
-+#: ../camel/providers/imapx/camel-imapx-provider.c:72
- msgid "Only check for Junk messages in the IN_BOX folder"
- msgstr "Провери да нема ђубрета само у фасцикли САН_ДУЧЕ"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:69
-+#: ../camel/providers/imapx/camel-imapx-provider.c:74
- msgid "Automatically synchroni_ze remote mail locally"
- msgstr "Сам усклади уд_аљену пошту са локалном"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:75
-+#: ../camel/providers/imapx/camel-imapx-provider.c:80
- msgid "Default IMAP port"
- msgstr "Основни порт ИМАП-а"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:76
-+#: ../camel/providers/imapx/camel-imapx-provider.c:81
- msgid "IMAP over SSL"
- msgstr "ИМАП преко ССЛ-а"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:83
-+#: ../camel/providers/imapx/camel-imapx-provider.c:88
- msgid "IMAP+"
- msgstr "ИМАП+"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:85
-+#: ../camel/providers/imapx/camel-imapx-provider.c:90
- msgid "For reading and storing mail on IMAP servers."
- msgstr "За читање и смештање поште на ИМАП сервере."
-
--#: ../camel/providers/imapx/camel-imapx-server.c:844
-+#: ../camel/providers/imapx/camel-imapx-server.c:1009
-+#: ../camel/providers/imapx/camel-imapx-server.c:1016
- #, c-format
- msgid "Not authenticated"
- msgstr "Непотврђеног идентитета"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:1773
-+#: ../camel/providers/imapx/camel-imapx-server.c:1713
- msgid "Server disconnected"
- msgstr "Веза са сервером је искључена"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:2255
-+#: ../camel/providers/imapx/camel-imapx-server.c:2205
- msgid "Error writing to cache stream"
- msgstr "Грешка приликом уписа у ток оставе"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:3672
-+#: ../camel/providers/imapx/camel-imapx-server.c:3550
- msgid "Error performing IDLE"
- msgstr "Грешка приликом извршавања ИДЛЕ-а"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4661
-+#: ../camel/providers/imapx/camel-imapx-server.c:4558
- #, c-format
- msgid "Failed to connect to IMAP server %s in secure mode: %s"
- msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: %s"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4662
-+#: ../camel/providers/imapx/camel-imapx-server.c:4559
- #: ../camel/providers/smtp/camel-smtp-transport.c:215
- msgid "STARTTLS not supported"
- msgstr "СТАРТТЛС није подржано"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4722
-+#: ../camel/providers/imapx/camel-imapx-server.c:4619
- #, c-format
- msgid "Failed to connect to IMAP server %s in secure mode: "
- msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: "
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4803
-+#: ../camel/providers/imapx/camel-imapx-server.c:4708
- #, c-format
- msgid "IMAP server %s does not support %s authentication"
- msgstr "ИМАП сервер „%s“ не подржава „%s“ пријављивање идентитета"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4833
-+#: ../camel/providers/imapx/camel-imapx-server.c:4738
- #: ../camel/providers/nntp/camel-nntp-store.c:394
- #: ../camel/providers/nntp/camel-nntp-store.c:531
- msgid "Cannot authenticate without a username"
- msgstr "Не могу да потврдим идентитет без корисничког имена"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4842
-+#: ../camel/providers/imapx/camel-imapx-server.c:4747
- #: ../camel/providers/nntp/camel-nntp-store.c:540
- #: ../camel/providers/pop3/camel-pop3-store.c:678
- #: ../camel/providers/pop3/camel-pop3-store.c:699
- msgid "Authentication password not available"
- msgstr "Лозинка потврђивања идентитета није доступна"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5093
-+#: ../camel/providers/imapx/camel-imapx-server.c:4983
-+#: ../camel/providers/imapx/camel-imapx-server.c:5042
- msgid "Error fetching message"
- msgstr "Грешка приликом преузимања поруке"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5139
-+#: ../camel/providers/imapx/camel-imapx-server.c:5035
- msgid "Failed to close the tmp stream"
- msgstr "Нисам успео да затворим привремену датотеку"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5168
-+#: ../camel/providers/imapx/camel-imapx-server.c:5071
- msgid "Failed to copy the tmp file"
- msgstr "Нисам успео да умножим привремену датотеку"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5294
-+#: ../camel/providers/imapx/camel-imapx-server.c:5212
- msgid "Error moving messages"
- msgstr "Грешка премештања порука"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5298
-+#: ../camel/providers/imapx/camel-imapx-server.c:5216
- msgid "Error copying messages"
- msgstr "Грешка умножавања порука"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5520
-+#: ../camel/providers/imapx/camel-imapx-server.c:5438
- msgid "Error appending message"
- msgstr "Грешка прикачињања порука"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5756
-+#: ../camel/providers/imapx/camel-imapx-server.c:5674
- msgid "Error fetching message headers"
- msgstr "Грешка преузимања заглавља поруке"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5921
-+#: ../camel/providers/imapx/camel-imapx-server.c:5841
- msgid "Error retrieving message"
- msgstr "Грешка довлачења поруке"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6051
--#: ../camel/providers/imapx/camel-imapx-server.c:6274
-+#: ../camel/providers/imapx/camel-imapx-server.c:5975
-+#: ../camel/providers/imapx/camel-imapx-server.c:6204
- #, c-format
- msgid "Fetching summary information for new messages in '%s'"
- msgstr "Прикупљам преглед података нових порука у „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6103
-+#: ../camel/providers/imapx/camel-imapx-server.c:6027
- #, c-format
- msgid "Scanning for changed messages in '%s'"
- msgstr "Прегледам измењене поруке у „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6155
-+#: ../camel/providers/imapx/camel-imapx-server.c:6079
- msgid "Error fetching new messages"
- msgstr "Грешка приликом преузимања нових порука"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6423
-+#: ../camel/providers/imapx/camel-imapx-server.c:6352
- msgid "Error refreshing folder"
- msgstr "Грешка током претраге"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6573
-+#: ../camel/providers/imapx/camel-imapx-server.c:6502
- msgid "Error expunging message"
- msgstr "Грешка приликом избацивања поруке"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6682
--#: ../camel/providers/imapx/camel-imapx-server.c:6707
-+#: ../camel/providers/imapx/camel-imapx-server.c:6617
-+#: ../camel/providers/imapx/camel-imapx-server.c:6642
- msgid "Error fetching folders"
- msgstr "Грешка приликом преузимања фасцикле"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6787
-+#: ../camel/providers/imapx/camel-imapx-server.c:6722
- msgid "Error creating folder"
- msgstr "Грешка приликом стварања фасцикле"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6839
-+#: ../camel/providers/imapx/camel-imapx-server.c:6774
- msgid "Error deleting folder"
- msgstr "Грешка приликом брисања фасцикле"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6906
-+#: ../camel/providers/imapx/camel-imapx-server.c:6850
- msgid "Error renaming folder"
- msgstr "Грешка приликом преименовања фасцикле"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6993
-+#: ../camel/providers/imapx/camel-imapx-server.c:6924
- msgid "Error subscribing to folder"
- msgstr "Грешка приликом пријављивања на фасциклу"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7053
--#| msgid "Error subscribing to folder"
-+#: ../camel/providers/imapx/camel-imapx-server.c:6990
- msgid "Error unsubscribing from folder"
- msgstr "Грешка одјављивања са фасцикле"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7109
-+#: ../camel/providers/imapx/camel-imapx-server.c:7052
- msgid "Error retrieving quota information"
- msgstr "Грешка довлачења обавештења о количини"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7161
-+#: ../camel/providers/imapx/camel-imapx-server.c:7104
- msgid "Search failed"
- msgstr "Претрага није успела"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7223
-+#: ../camel/providers/imapx/camel-imapx-server.c:7166
- msgid "Error performing NOOP"
- msgstr "Грешка приликом обављања НООП-а"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7330
-+#: ../camel/providers/imapx/camel-imapx-server.c:7273
- msgid "Error syncing changes"
- msgstr "Грешка приликом усклађивања измена"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8441
-+#: ../camel/providers/imapx/camel-imapx-server.c:8258
- #, c-format
- msgid "Cannot get message with message ID %s: %s"
- msgstr "Не могу да набавим поруку са ИБ „%s“: %s"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8442
-+#: ../camel/providers/imapx/camel-imapx-server.c:8259
- msgid "No such message available."
- msgstr "Нема такве поруке."
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8640
--#: ../camel/providers/imapx/camel-imapx-server.c:8661
-+#: ../camel/providers/imapx/camel-imapx-server.c:8466
-+#: ../camel/providers/imapx/camel-imapx-server.c:8487
- msgid "Cannot create spool file: "
- msgstr "Не могу да направим датотеку припреме: "
-
--#: ../camel/providers/imapx/camel-imapx-server.c:9403
-+#: ../camel/providers/imapx/camel-imapx-server.c:9228
- msgid "IMAP server does not support quotas"
- msgstr "ИМАП сервер не подржава количине"
-
- #. create a dummy "." parent inbox, use to scan, then put back at the top level
--#: ../camel/providers/imapx/camel-imapx-store.c:207
-+#: ../camel/providers/imapx/camel-imapx-store.c:223
- #: ../camel/providers/local/camel-maildir-folder.c:482
- #: ../camel/providers/local/camel-maildir-store.c:322
--#: ../camel/providers/local/camel-maildir-store.c:764
--#: ../camel/providers/local/camel-maildir-store.c:770
--#: ../camel/providers/local/camel-maildir-store.c:853
-+#: ../camel/providers/local/camel-maildir-store.c:784
-+#: ../camel/providers/local/camel-maildir-store.c:790
-+#: ../camel/providers/local/camel-maildir-store.c:873
- #: ../camel/providers/local/camel-spool-store.c:393
- msgid "Inbox"
- msgstr "Сандуче"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:823
-+#: ../camel/providers/imapx/camel-imapx-store.c:758
- #, c-format
- msgid "IMAP server %s"
- msgstr "ИМАП сервер „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:826
-+#: ../camel/providers/imapx/camel-imapx-store.c:761
- #, c-format
- msgid "IMAP service for %s on %s"
- msgstr "ИМАП сервис за „%s“ на „%s"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1035
-+#: ../camel/providers/imapx/camel-imapx-store.c:836
- #: ../camel/providers/nntp/camel-nntp-provider.c:93
- #: ../camel/providers/pop3/camel-pop3-provider.c:81
- msgid "Password"
- msgstr "Лозинка"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1037
-+#: ../camel/providers/imapx/camel-imapx-store.c:838
- msgid "This option will connect to the IMAP server using a plaintext password."
- msgstr ""
- "Ова опција ће повезати на ИМАП сервер коришћењем лозинке у обичном тексту."
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1112
-+#: ../camel/providers/imapx/camel-imapx-store.c:913
- #, c-format
- msgid "No such folder %s"
- msgstr "Нема такве фасцикле „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1507
--#, c-format,
-+#: ../camel/providers/imapx/camel-imapx-store.c:1324
-+#, c-format
- msgid "No IMAP namespace for folder path '%s'"
- msgstr "Нема ИМАП простора назива за путању фасцикле „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1656
-+#: ../camel/providers/imapx/camel-imapx-store.c:1472
- #, c-format
- msgid "Retrieving folder list for %s"
- msgstr "Довлачим списак фасцикле за „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:2094
-+#: ../camel/providers/imapx/camel-imapx-store.c:1924
- #, c-format
- msgid ""
- "The folder name \"%s\" is invalid because it contains the character \"%c\""
- msgstr "Име фасцикле „%s“ није исправно јер садржи знак „%c“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:2615
-+#: ../camel/providers/imapx/camel-imapx-store.c:2689
- #: ../camel/providers/nntp/camel-nntp-store.c:1250
- #: ../camel/providers/pop3/camel-pop3-folder.c:450
- #: ../camel/providers/pop3/camel-pop3-folder.c:593
-@@ -3424,27 +3422,27 @@ msgstr "Име фасцикле „%s“ није исправно јер сад
- msgid "You must be working online to complete this operation"
- msgstr "Морате да будете на мрежи да бисте завршили ову операцију"
-
--#: ../camel/providers/local/camel-local-folder.c:192
-+#: ../camel/providers/local/camel-local-folder.c:195
- #, c-format
- msgid "~%s (%s)"
- msgstr "~%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:202
--#: ../camel/providers/local/camel-local-folder.c:211
-+#: ../camel/providers/local/camel-local-folder.c:205
-+#: ../camel/providers/local/camel-local-folder.c:214
- #, c-format
- msgid "mailbox: %s (%s)"
- msgstr "поштанско сандуче:%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:220
-+#: ../camel/providers/local/camel-local-folder.c:223
- #, c-format
- msgid "%s (%s)"
- msgstr "%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:497
-+#: ../camel/providers/local/camel-local-folder.c:500
- msgid "_Index message body data"
- msgstr "_Попиши садржаје порука"
-
--#: ../camel/providers/local/camel-local-folder.c:725
-+#: ../camel/providers/local/camel-local-folder.c:730
- #, c-format
- msgid ""
- "Cannot get message %s from folder %s\n"
-@@ -3595,7 +3593,7 @@ msgstr "Не могу да пребацим поруку у одредишну
-
- #: ../camel/providers/local/camel-maildir-store.c:130
- #: ../camel/providers/local/camel-maildir-store.c:149
--#: ../camel/providers/local/camel-maildir-store.c:861
-+#: ../camel/providers/local/camel-maildir-store.c:881
- #, c-format
- msgid "Folder %s already exists"
- msgstr "Фасцикла „%s“ већ постоји"
-@@ -3638,8 +3636,8 @@ msgstr "Не могу да обришем фасциклу „%s“: %s"
- msgid "not a maildir directory"
- msgstr "није директоријум поште"
-
--#: ../camel/providers/local/camel-maildir-store.c:636
--#: ../camel/providers/local/camel-maildir-store.c:1075
-+#: ../camel/providers/local/camel-maildir-store.c:637
-+#: ../camel/providers/local/camel-maildir-store.c:1095
- #: ../camel/providers/local/camel-spool-store.c:212
- #: ../camel/providers/local/camel-spool-store.c:231
- #, c-format
-@@ -3660,10 +3658,10 @@ msgstr "Проверавам целовитост фасцикле"
- msgid "Checking for new messages"
- msgstr "Вршим проверу за новим порукама"
-
--#: ../camel/providers/local/camel-maildir-summary.c:784
-+#: ../camel/providers/local/camel-maildir-summary.c:791
- #: ../camel/providers/local/camel-mbox-summary.c:466
--#: ../camel/providers/local/camel-mbox-summary.c:682
--#: ../camel/providers/local/camel-mbox-summary.c:831
-+#: ../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 "Смештам фасциклу"
-@@ -3761,48 +3759,48 @@ msgstr "Не могу да преименујем „%s“ у „%s“: %s"
- msgid "Could not open folder: %s: %s"
- msgstr "Не могу да отворим фасциклу: %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:606
-+#: ../camel/providers/local/camel-mbox-summary.c:611
- #, c-format
- msgid "Cannot check folder: %s: %s"
- msgstr "Не могу да проверим фасциклу: %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:695
--#: ../camel/providers/local/camel-mbox-summary.c:840
-+#: ../camel/providers/local/camel-mbox-summary.c:700
-+#: ../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 "Не могу да отворим датотеку: %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:710
-+#: ../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 "Не могу да отворим привремено поштанско сандуче: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:727
--#: ../camel/providers/local/camel-mbox-summary.c:962
-+#: ../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 "Не могу да затворим изворну фасциклу „%s“: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:740
-+#: ../camel/providers/local/camel-mbox-summary.c:745
- #, c-format
- msgid "Could not close temporary folder: %s"
- msgstr "Не могу да затворим привремену фасциклу: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:759
-+#: ../camel/providers/local/camel-mbox-summary.c:764
- #, c-format
- msgid "Could not rename folder: %s"
- msgstr "Не могу да преименујем фасциклу: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:854
--#: ../camel/providers/local/camel-mbox-summary.c:1127
-+#: ../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 "Не могу да сачувам фасциклу: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:893
--#: ../camel/providers/local/camel-mbox-summary.c:1167
-+#: ../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 "
-@@ -3811,25 +3809,25 @@ msgstr ""
- "МБОКС датотека је оштећена, поправите је. (Очекивано је „Из реда“, али нисам "
- "добио.)"
-
--#: ../camel/providers/local/camel-mbox-summary.c:903
--#: ../camel/providers/local/camel-mbox-summary.c:1179
-+#: ../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 "Неслагање прегледа и фасцикле, чак и након усклађивања"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1072
-+#: ../camel/providers/local/camel-mbox-summary.c:1077
- #: ../camel/providers/local/camel-spool-summary.c:356
- #, c-format
- msgid "Unknown error: %s"
- msgstr "Непозната грешка: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1237
--#: ../camel/providers/local/camel-mbox-summary.c:1267
-+#: ../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 "Нисам успео да запишем у привремено поштанско сандуче: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1256
-+#: ../camel/providers/local/camel-mbox-summary.c:1261
- #, c-format
- msgid "Writing to temporary mailbox failed: %s: %s"
- msgstr "Нисам успео да запишем у привремено поштанско сандуче: %s: %s"
-@@ -3950,21 +3948,21 @@ msgstr ""
- "Фасцикла је можда оштећена, умножите сачувано у „%s“"
-
- #: ../camel/providers/nntp/camel-nntp-folder.c:222
--#: ../camel/providers/nntp/camel-nntp-folder.c:588
-+#: ../camel/providers/nntp/camel-nntp-folder.c:590
- #, c-format
- msgid "Internal error: UID in invalid format: %s"
- msgstr "Унутрашња грешка: КИБ у неисправном облику: %s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:291
--#: ../camel/providers/nntp/camel-nntp-folder.c:296
-+#: ../camel/providers/nntp/camel-nntp-folder.c:292
-+#: ../camel/providers/nntp/camel-nntp-folder.c:297
- #: ../camel/providers/pop3/camel-pop3-folder.c:546
- #: ../camel/providers/pop3/camel-pop3-folder.c:945
- #, c-format
- msgid "Cannot get message %s: %s"
- msgstr "Не могу да добавим поруку „%s“: %s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:303
--#: ../camel/providers/nntp/camel-nntp-folder.c:622
-+#: ../camel/providers/nntp/camel-nntp-folder.c:304
-+#: ../camel/providers/nntp/camel-nntp-folder.c:624
- #: ../camel/providers/pop3/camel-pop3-folder.c:476
- #: ../camel/providers/pop3/camel-pop3-folder.c:536
- #: ../camel/providers/pop3/camel-pop3-folder.c:555
-@@ -3978,18 +3976,17 @@ msgstr "Не могу да добавим поруку „%s“: "
- msgid "Posting failed: %s"
- msgstr "Неуспела пошиљка: %s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:501
-+#: ../camel/providers/nntp/camel-nntp-folder.c:503
- msgid "Posting failed: "
- msgstr "Неуспела пошиљка: "
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:611
-+#: ../camel/providers/nntp/camel-nntp-folder.c:613
- #, c-format
- msgid "This message is not currently available"
- msgstr "Ова порука није тренутно доступна"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:720
-+#: ../camel/providers/nntp/camel-nntp-folder.c:722
- #, c-format
--#| msgid "You cannot copy messages from a NNTP folder!"
- msgid "You cannot copy messages from a NNTP folder"
- msgstr "Не можете да умножите поруке из ННТП фасцикле"
-
-@@ -4652,7 +4649,6 @@ msgstr ""
- "Јединице за подсетник на рођендане или годишњице, „минути“, „сати“ или „дани“"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
--#| msgid "Proxy type to use"
- msgid "(Deprecated) Proxy type to use"
- msgstr "(Застарело) Врста посредника за коришћење"
-
-@@ -4667,69 +4663,57 @@ msgstr ""
- "Еволуције. Видите АПИ документацију „ESourceProxy“ за појединости."
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
--#| msgid "Whether to use http-proxy"
- msgid "(Deprecated) Whether to use http-proxy"
- msgstr "(Застарело) Да ли да користи хттп-посредника"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
--#| msgid "Whether proxy server requires authentication"
- msgid "(Deprecated) Whether proxy server requires authentication"
- msgstr "(Застарело) Да ли сервер посредник захтева потврду идентитета"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
--#| msgid "Host name for HTTP requests"
- msgid "(Deprecated) Host name for HTTP requests"
- msgstr "(Застарело) Назив домаћина за ХТТП захтеве"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
--#| msgid "Port number for HTTP requests"
- msgid "(Deprecated) Port number for HTTP requests"
- msgstr "(Застарело) Број прикључника за ХТТП захтеве"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
--#| msgid "Proxy authentication user name"
- msgid "(Deprecated) Proxy authentication user name"
- msgstr "(Застарело) Корисничко име потврде идентитета посредника"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
--#| msgid "Proxy authentication password"
- msgid "(Deprecated) Proxy authentication password"
- msgstr "(Застарело) Лозинка потврде идентитета посредника"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
--#| msgid "List of hosts to connect to without proxy"
- msgid "(Deprecated) List of hosts to connect to without proxy"
- msgstr "(Застарело) Списак домаћина за повезивање без посредника"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
--#| msgid "Host name for HTTPS requests"
- msgid "(Deprecated) Host name for HTTPS requests"
- msgstr "(Застарело) Назив домаћина за ХТТПС захтеве"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
--#| msgid "Port number for HTTPS requests"
- msgid "(Deprecated) Port number for HTTPS requests"
- msgstr "(Застарело) Број прикључника за ХТТПС захтеве"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
--#| msgid "Host name for SOCKS requests"
- msgid "(Deprecated) Host name for SOCKS requests"
- msgstr "(Застарело) Назив домаћина за СОЦКС захтеве"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
--#| msgid "Port number for SOCKS requests"
- msgid "(Deprecated) Port number for SOCKS requests"
- msgstr "(Застарело) Број прикључника за СОЦКС захтеве"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
--#| msgid "Automatic proxy configuration URL"
- msgid "(Deprecated) Automatic proxy configuration URL"
- msgstr "(Застарело) Адреса за самоподешавање посредника"
-
- #: ../libebackend/e-authentication-mediator.c:204
- #: ../libebackend/e-authentication-mediator.c:215
--#: ../libebackend/e-authentication-mediator.c:861
--#: ../libebackend/e-authentication-mediator.c:1198
-+#: ../libebackend/e-authentication-mediator.c:860
-+#: ../libebackend/e-authentication-mediator.c:1197
- msgid "Bus name vanished (client terminated?)"
- msgstr "Назив сабирнице је нестао (клијент је окончан?)"
-
-@@ -4739,8 +4723,8 @@ msgstr "Нема одговора са клијента"
-
- #: ../libebackend/e-authentication-mediator.c:333
- #: ../libebackend/e-authentication-mediator.c:344
--#: ../libebackend/e-authentication-mediator.c:855
--#: ../libebackend/e-authentication-mediator.c:1192
-+#: ../libebackend/e-authentication-mediator.c:854
-+#: ../libebackend/e-authentication-mediator.c:1191
- msgid "Client cancelled the operation"
- msgstr "Клијент је отказао сте операцију"
-
-@@ -4748,11 +4732,11 @@ msgstr "Клијент је отказао сте операцију"
- msgid "Client reports password was rejected"
- msgstr "Лозинка извештаја клијента је одбијена"
-
--#: ../libebackend/e-authentication-session.c:554
-+#: ../libebackend/e-authentication-session.c:539
- msgid "Add this password to your keyring"
- msgstr "Додајте ову лозинку у ваш привезак"
-
--#: ../libebackend/e-authentication-session.c:664
-+#: ../libebackend/e-authentication-session.c:649
- msgid "Password was incorrect"
- msgstr "Лозинка је неисправна"
-
-@@ -4761,12 +4745,12 @@ msgstr "Лозинка је неисправна"
- msgid "%s does not support authentication"
- msgstr "„%s“ не подржава потврђивање идентитета"
-
--#: ../libebackend/e-collection-backend.c:900
-+#: ../libebackend/e-collection-backend.c:901
- #, c-format
- msgid "%s does not support creating remote resources"
- msgstr "„%s“ не подржава стварање удаљених изворишта"
-
--#: ../libebackend/e-collection-backend.c:959
-+#: ../libebackend/e-collection-backend.c:960
- #, c-format
- msgid "%s does not support deleting remote resources"
- msgstr "„%s“ не подржава брисање удаљених изворишта"
-@@ -4781,40 +4765,40 @@ msgstr "Нема погона позадинца за тастер мешања
- msgid "Data source is missing a [%s] group"
- msgstr "Извору података недостаје [%s] група"
-
--#: ../libebackend/e-server-side-source.c:1020
--#: ../libedataserver/e-source.c:1348
-+#: ../libebackend/e-server-side-source.c:1022
-+#: ../libedataserver/e-source.c:1394
- #, c-format
- msgid "Data source '%s' does not support creating remote resources"
- msgstr "Извор података „%s“ не подржава стварање удаљених изворишта"
-
--#: ../libebackend/e-server-side-source.c:1034
-+#: ../libebackend/e-server-side-source.c:1036
- #, c-format
- msgid ""
- "Data source '%s' has no collection backend to create the remote resource"
- msgstr ""
- "Извор података „%s“ нема позадинца збирке да би направио удаљено извориште"
-
--#: ../libebackend/e-server-side-source.c:1062
--#: ../libedataserver/e-source.c:1461
-+#: ../libebackend/e-server-side-source.c:1064
-+#: ../libedataserver/e-source.c:1507
- #, c-format
- msgid "Data source '%s' does not support deleting remote resources"
- msgstr "Извор података „%s“ не подржава брисање удаљених изворишта"
-
--#: ../libebackend/e-server-side-source.c:1076
-+#: ../libebackend/e-server-side-source.c:1078
- #, c-format
- msgid ""
- "Data source '%s' has no collection backend to delete the remote resource"
- msgstr ""
- "Извор података „%s“ нема позадинца збирке да би обрисао удаљено извориште"
-
--#: ../libebackend/e-server-side-source.c:1107
--#: ../libedataserver/e-source.c:1557
--#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
-+#: ../libebackend/e-server-side-source.c:1109
-+#: ../libedataserver/e-source.c:1603
-+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026
- #, c-format
- msgid "Data source '%s' does not support OAuth 2.0 authentication"
- msgstr "Извор података „%s“ не подржава ОАут 2.0 потврђивање идентитета"
-
--#: ../libebackend/e-server-side-source.c:1452
-+#: ../libebackend/e-server-side-source.c:1456
- #, c-format
- msgid "File must have a '.source' extension"
- msgstr "Датотека мора да има наставак „.source“"
-@@ -5018,37 +5002,36 @@ msgstr "Унесите лозинку за списак задужења „%s
- msgid "Please enter the password for account \"%s\"."
- msgstr "Унесите лозинку за налог „%s“."
-
--#: ../libedataserver/e-source.c:765
-+#: ../libedataserver/e-source.c:768
- #, c-format
- msgid "Source file is missing a [%s] group"
- msgstr "Изворној датотеци недостаје [%s] група"
-
--#: ../libedataserver/e-source.c:1128
-+#: ../libedataserver/e-source.c:1174
- #, c-format
- msgid "Data source '%s' is not removable"
- msgstr "Извор података „%s“ се не може уклонити"
-
--#: ../libedataserver/e-source.c:1251
-+#: ../libedataserver/e-source.c:1297
- #, c-format
- msgid "Data source '%s' is not writable"
- msgstr "Извор подтака „%s“ није уписив"
-
--#: ../libedataserver/e-source.c:1864
-+#: ../libedataserver/e-source.c:1910
- msgid "Unnamed"
- msgstr "Неименован"
-
--#: ../libedataserver/e-source-mail-signature.c:486
-+#: ../libedataserver/e-source-mail-signature.c:485
- #, c-format
- msgid "Signature script must be a local file"
- msgstr "Скрипта потписа мора да буде месна датотека"
-
- #: ../libedataserver/e-source-proxy.c:1646
- #, c-format
--#| msgid "Data source '%s' does not support creating remote resources"
- msgid "Source '%s' does not support proxy lookups"
- msgstr "Извор „%s“ не подржава тражења посредника"
-
--#: ../libedataserver/e-source-webdav.c:1551
-+#: ../libedataserver/e-source-webdav.c:1555
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
-@@ -5057,7 +5040,7 @@ msgstr ""
- "ССЛ уверење за домаћина „%s“, које користи адресар „%s“, није од поверења. "
- "Да ли желите да га прихватите?"
-
--#: ../libedataserver/e-source-webdav.c:1560
-+#: ../libedataserver/e-source-webdav.c:1564
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
-@@ -5066,7 +5049,7 @@ msgstr ""
- "ССЛ уверење за домаћина „%s“, које користи календар „%s“, није од поверења. "
- "Да ли желите да га прихватите?"
-
--#: ../libedataserver/e-source-webdav.c:1569
-+#: ../libedataserver/e-source-webdav.c:1573
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
-@@ -5075,7 +5058,7 @@ msgstr ""
- "ССЛ уверење за домаћина „%s“, које користе белешке „%s“, није од поверења. "
- "Да ли желите да га прихватите?"
-
--#: ../libedataserver/e-source-webdav.c:1578
-+#: ../libedataserver/e-source-webdav.c:1582
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
-@@ -5269,7 +5252,7 @@ msgstr "Нисам успео да пронађем елемент налога"
- msgid "Failed to find ASUrl and OABUrl in autodiscover response"
- msgstr "Нисам успео да пронађем АСадресу и ОАБадресу у одговору самооткривања"
-
--#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261
-+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260
- #, c-format
- msgid ""
- "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-@@ -5278,18 +5261,23 @@ msgstr ""
- "Не могу да пронађем одговарајући налог на услузи „орг.гном.Налози на мрежи“ "
- "са које бих добио приступ за „%s“."
-
--#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288
-+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290
- #, c-format
- msgid "Failed to obtain an access token for '%s': "
- msgstr "Нисам успео да добијем приступ за „%s“: "
-
--#: ../modules/google-backend/module-google-backend.c:191
-+#: ../modules/google-backend/module-google-backend.c:195
- #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
- #: ../modules/yahoo-backend/module-yahoo-backend.c:199
- msgid "Calendar"
- msgstr "Календар"
-
--#: ../modules/google-backend/module-google-backend.c:260
-+#: ../modules/google-backend/module-google-backend.c:268
-+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
-+msgid "Tasks"
-+msgstr "Задужења"
-+
-+#: ../modules/google-backend/module-google-backend.c:321
- #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
- #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
- msgid "Contacts"
-@@ -5388,7 +5376,7 @@ msgstr "Пошта"
- msgid "Integrate your mailboxes"
- msgstr "Обједините ваше сандучиће"
-
--#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008
-+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007
- #, c-format
- msgid ""
- "Cannot find a corresponding account service in the accounts database from "
-@@ -5400,7 +5388,6 @@ msgstr ""
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:84
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:281
- #, c-format
--#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
- msgid ""
- "Expected status 200 when requesting your identity, instead got status %d (%s)"
- msgstr ""
-@@ -5413,22 +5400,18 @@ msgid "Error parsing response as JSON: "
- msgstr "Грешка обраде одговора као ЈСОН:"
-
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:119
--#| msgid "Didn't find email member in JSON data"
- msgid "Didn't find 'email' in JSON data"
- msgstr "Нисам нашао „email“ у ЈСОН подацима"
-
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:316
--#| msgid "Didn't find email member in JSON data"
- msgid "Didn't find 'id' in JSON data"
- msgstr "Нисам нашао „id“ у ЈСОН подацима"
-
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:321
--#| msgid "Didn't find email member in JSON data"
- msgid "Didn't find 'emails.account' in JSON data"
- msgstr "Нисам нашао „emails.account“ у ЈСОН подацима"
-
- #: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
--#| msgid "Wants HTML Mail"
- msgid "Windows Live Mail"
- msgstr "Пошта Виндоуза уживо"
-
-@@ -5440,10 +5423,6 @@ msgstr "Јаху! календар"
- msgid "Yahoo! Mail"
- msgstr "Јаху! пошта"
-
--#: ../modules/yahoo-backend/module-yahoo-backend.c:226
--msgid "Tasks"
--msgstr "Задужења"
--
- #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
- #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
- #: ../services/evolution-user-prompter/evolution-user-prompter.c:30
-@@ -5500,6 +5479,10 @@ msgstr "Не пресељавај корисничке податке из пр
- msgid "_Dismiss"
- msgstr "_Занемари"
-
-+#~| msgid "No quota information available for folder '%s'"
-+#~ msgid "No host information available"
-+#~ msgstr "Нису доступни подаци о домаћину"
-+
- #~ msgid "You may not import keys with this cipher"
- #~ msgstr "Можда нећете моћи да увезете кључеве са овим алгоритмом"
-
-diff --git a/po/sr@latin.po b/po/sr@latin.po
-index c238a0e..2b70068 100644
---- a/po/sr@latin.po
-+++ b/po/sr@latin.po
-@@ -9,8 +9,8 @@ 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: 2014-03-17 17:45+0000\n"
--"PO-Revision-Date: 2014-03-17 23:19+0200\n"
-+"POT-Creation-Date: 2014-07-22 04:28+0000\n"
-+"PO-Revision-Date: 2014-07-22 11:22+0200\n"
- "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
- "Language-Team: Serbian <gnom@prevod.org>\n"
- "Language: sr\n"
-@@ -21,79 +21,79 @@ msgstr ""
- "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
- "X-Project-Style: gnome\n"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:117
-+#: ../addressbook/backends/file/e-book-backend-file.c:120
- #, c-format
- msgid "Failed to remove file '%s': %s"
- msgstr "Nisam uspeo da uklonim datoteku „%s“: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:145
-+#: ../addressbook/backends/file/e-book-backend-file.c:148
- #, c-format
- msgid "Failed to make directory %s: %s"
- msgstr "Nisam uspeo da napravim direktorijum „%s“: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:396
-+#: ../addressbook/backends/file/e-book-backend-file.c:419
- #, c-format
- msgid "Failed to create hardlink for resource '%s': %s"
- msgstr "Nisam uspeo da napravim čvrstu vezu za izvor „%s“: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:501
--#: ../addressbook/backends/file/e-book-backend-file.c:1230
-+#: ../addressbook/backends/file/e-book-backend-file.c:524
-+#: ../addressbook/backends/file/e-book-backend-file.c:1253
- msgid "No UID in the contact"
- msgstr "Nema KIB-a u kontaktu"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:828
-+#: ../addressbook/backends/file/e-book-backend-file.c:851
- #, c-format
- msgid "Conflicting UIDs found in added contacts"
- msgstr "Pronađeni su sukobljavajući KIB-ovi u dodatim kontaktima"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:967
-+#: ../addressbook/backends/file/e-book-backend-file.c:990
- msgid "Loading..."
- msgstr "Učitavam..."
-
--#: ../addressbook/backends/file/e-book-backend-file.c:969
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423
-+#: ../addressbook/backends/file/e-book-backend-file.c:992
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353
- msgid "Searching..."
- msgstr "Pretražujem..."
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1258
-+#: ../addressbook/backends/file/e-book-backend-file.c:1281
- #, c-format
- msgid "Tried to modify contact '%s' with out of sync revision"
- msgstr "Pokušah da izmenim kontakt „%s“ sa pregledom koji nije usklađen"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1449
--#: ../addressbook/backends/file/e-book-backend-file.c:1532
-+#: ../addressbook/backends/file/e-book-backend-file.c:1472
-+#: ../addressbook/backends/file/e-book-backend-file.c:1555
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
--#: ../addressbook/libedata-book/e-book-sqlite.c:6706
-+#: ../addressbook/libedata-book/e-book-sqlite.c:6711
- #, c-format
- msgid "Contact '%s' not found"
- msgstr "Kontakt „%s“ nije pronađen"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1592
--#: ../addressbook/backends/file/e-book-backend-file.c:1673
-+#: ../addressbook/backends/file/e-book-backend-file.c:1615
-+#: ../addressbook/backends/file/e-book-backend-file.c:1696
- #, c-format
- msgid "Query '%s' not supported"
- msgstr "Upit „%s“ nije podržan"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1601
--#: ../addressbook/backends/file/e-book-backend-file.c:1682
-+#: ../addressbook/backends/file/e-book-backend-file.c:1624
-+#: ../addressbook/backends/file/e-book-backend-file.c:1705
- #, c-format
- msgid "Invalid Query '%s'"
- msgstr "Neispravan upit „%s“"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1947
-+#: ../addressbook/backends/file/e-book-backend-file.c:1970
- msgid "Requested to delete an unrelated cursor"
- msgstr "Zatražili ste brisanje neodnosnog kurzora"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:2014
-+#: ../addressbook/backends/file/e-book-backend-file.c:2041
- #, c-format
- msgid "Failed to rename old database from '%s' to '%s': %s"
- msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s"
-
--#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:417
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:874
-+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887
- #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
- #: ../addressbook/libebook-contacts/e-phone-number.c:56
- #: ../addressbook/libebook/e-book.c:1078
-@@ -108,67 +108,69 @@ msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s"
- #: ../addressbook/libebook/e-book-client.c:3175
- #: ../addressbook/libebook/e-book-client.c:3393
- #: ../addressbook/libedata-book/e-book-backend-sexp.c:878
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621
- #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
- #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
- #: ../calendar/libecal/e-cal-client.c:3239
- #: ../calendar/libecal/e-cal-client.c:3412
- #: ../calendar/libecal/e-cal-client.c:3676
- #: ../calendar/libecal/e-cal-client.c:3917
--#: ../calendar/libecal/e-cal-client.c:4105
--#: ../calendar/libecal/e-cal-client.c:4297
--#: ../calendar/libecal/e-cal-client.c:4467
--#: ../calendar/libecal/e-cal-client.c:4636
--#: ../calendar/libecal/e-cal-client.c:4839
--#: ../calendar/libecal/e-cal-client.c:4989
--#: ../calendar/libecal/e-cal-client.c:5183
--#: ../calendar/libecal/e-cal-client.c:5336
--#: ../calendar/libecal/e-cal-client.c:5553
--#: ../calendar/libecal/e-cal-client.c:5707
--#: ../calendar/libecal/e-cal-client.c:5933
--#: ../calendar/libecal/e-cal-client.c:6129
--#: ../calendar/libecal/e-cal-client.c:6492
--#: ../calendar/libecal/e-cal-client.c:6706
--#: ../camel/providers/imapx/camel-imapx-command.c:642
-+#: ../calendar/libecal/e-cal-client.c:4107
-+#: ../calendar/libecal/e-cal-client.c:4299
-+#: ../calendar/libecal/e-cal-client.c:4469
-+#: ../calendar/libecal/e-cal-client.c:4638
-+#: ../calendar/libecal/e-cal-client.c:4841
-+#: ../calendar/libecal/e-cal-client.c:4991
-+#: ../calendar/libecal/e-cal-client.c:5185
-+#: ../calendar/libecal/e-cal-client.c:5338
-+#: ../calendar/libecal/e-cal-client.c:5555
-+#: ../calendar/libecal/e-cal-client.c:5709
-+#: ../calendar/libecal/e-cal-client.c:5935
-+#: ../calendar/libecal/e-cal-client.c:6131
-+#: ../calendar/libecal/e-cal-client.c:6494
-+#: ../calendar/libecal/e-cal-client.c:6708
-+#: ../camel/providers/imapx/camel-imapx-command.c:645
-+#: ../camel/providers/imapx/camel-imapx-server.c:4769
-+#: ../camel/providers/imapx/camel-imapx-server.c:4778
- #: ../libedataserver/e-client.c:185
- msgid "Unknown error"
- msgstr "Nepoznata greška"
-
- #. Query for new contacts asynchronously
--#: ../addressbook/backends/google/e-book-backend-google.c:836
-+#: ../addressbook/backends/google/e-book-backend-google.c:828
- msgid "Querying for updated contacts…"
- msgstr "Propitujem za ažuriranim kontaktima…"
-
- #. Run the query asynchronously
--#: ../addressbook/backends/google/e-book-backend-google.c:988
-+#: ../addressbook/backends/google/e-book-backend-google.c:1010
- msgid "Querying for updated groups…"
- msgstr "Propitujem za ažuriranim grupama…"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:1705
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1361
-+#: ../addressbook/backends/google/e-book-backend-google.c:1757
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433
- msgid "The backend does not support bulk additions"
- msgstr "Pozadinac ne podržava grupno dodavanje"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:1854
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1473
-+#: ../addressbook/backends/google/e-book-backend-google.c:1912
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545
- msgid "The backend does not support bulk modifications"
- msgstr "Pozadinac ne podržava grupno uređivanje"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:2054
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1573
-+#: ../addressbook/backends/google/e-book-backend-google.c:2119
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645
- msgid "The backend does not support bulk removals"
- msgstr "Pozadinac ne podržava grupno uklanjanje"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:2180
-+#: ../addressbook/backends/google/e-book-backend-google.c:2239
- msgid "Loading…"
- msgstr "Učitavam…"
-
- #. System Group: My Contacts
--#: ../addressbook/backends/google/e-book-google-utils.c:1618
-+#: ../addressbook/backends/google/e-book-google-utils.c:1631
- #: ../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
-@@ -177,131 +179,131 @@ msgid "Personal"
- msgstr "Lično"
-
- #. System Group: Friends
--#: ../addressbook/backends/google/e-book-google-utils.c:1620
-+#: ../addressbook/backends/google/e-book-google-utils.c:1633
- msgid "Friends"
- msgstr "Prijatelji"
-
- #. System Group: Family
--#: ../addressbook/backends/google/e-book-google-utils.c:1622
-+#: ../addressbook/backends/google/e-book-google-utils.c:1635
- msgid "Family"
- msgstr "Porodica"
-
- #. System Group: Coworkers
--#: ../addressbook/backends/google/e-book-google-utils.c:1624
-+#: ../addressbook/backends/google/e-book-google-utils.c:1637
- msgid "Coworkers"
- msgstr "Saradnici"
-
- #. 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:170
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113
- msgid "Not connected"
- msgstr "Nisam povezan"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899
- msgid "Failed to bind using either v3 or v2 binds"
- msgstr "Nisam uspeo da povežem koristeći ni v3 ni v2 vezice"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
- msgid "Reconnecting to LDAP server..."
- msgstr "Ponovo se povezujem na LDAP server..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153
- msgid "Invalid DN syntax"
- msgstr "Neispravna DN sintaksa"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
- #, c-format
- msgid "LDAP error 0x%x (%s)"
- msgstr "Greška LDAP-a 0x%x (%s)"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104
- #, c-format
- msgid "%s: NULL returned from ldap_first_entry"
- msgstr "%s: „NULL“ je vraćeno sa prvog unosa ldapa (ldap_first_entry)"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162
- #, c-format
- msgid "%s: Unhandled result type %d returned"
- msgstr "%s: Vraćena je nepoznata vrsta rezultata %d"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422
- #, c-format
- msgid "%s: Unhandled search result type %d returned"
- msgstr "%s: Vraćena je nepoznata vrsta rezultata pretrage %d"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196
- msgid "Receiving LDAP search results..."
- msgstr "Primam rezultate pretrage sa LDAP servera..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375
- msgid "Error performing search"
- msgstr "Greška tokom pretrage"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503
- #, c-format
- msgid "Downloading contacts (%d)..."
- msgstr "Preuzimam kontakte (%d)..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067
- msgid "Adding contact to LDAP server..."
- msgstr "Dodajem kontakt na LDAP server..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142
- msgid "Modifying contact from LDAP server..."
- msgstr "Menjam kontakt sa LDAP servera..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208
- msgid "Removing contact from LDAP server..."
- msgstr "Uklanjam kontakt sa LDAP servera..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597
- #, c-format
- msgid "Failed to get the DN for user '%s'"
- msgstr "Nisam uspeo da dobavim DN za korisnika „%s“"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:853
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
- msgid "Loading Addressbook summary..."
- msgstr "Učitavam sažetak adresara..."
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:871
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
- #, c-format
- msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
- msgstr ""
- "Nije uspelo nalaženje svojstva (PROPFIND) na vebdavu sa HTTP stanjem %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:890
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903
- msgid "No response body in webdav PROPFIND result"
- msgstr "Nema tela odgovora u rezultatima nalaženja svojstava vebdava"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:951
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964
- #, c-format
- msgid "Loading Contacts (%d%%)"
- msgstr "Učitavam kontakte (%d%%)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1283
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353
- msgid "Cannot transform SoupURI to string"
- msgstr "Ne mogu da preobratim Soup adresu u nisku"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474
- #, c-format
- msgid "Create resource '%s' failed with HTTP status %d (%s)"
- msgstr "Nije uspelo stvaranje resursa „%s“ sa HTTP stanjem %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576
- msgid "Contact on server changed -> not modifying"
- msgstr "Izmenjen je kontakt na serveru —> ne menjam"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1512
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584
- #, c-format
- msgid "Modify contact failed with HTTP status %d (%s)"
- msgstr "Izmena kontakta nije uspela sa HTTP stanjem %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1605
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1621
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693
- #, c-format
- msgid "DELETE failed with HTTP status %d"
- msgstr "Nije uspelo brisanje (DELETE) sa HTTP stanjem %d"
-@@ -905,8 +907,8 @@ msgstr "Spisak imena Gugl razgovora"
- msgid "Twitter Name List"
- msgstr "Spisak Tviter imena"
-
--#: ../addressbook/libebook-contacts/e-contact.c:1635
--#: ../addressbook/libebook/e-destination.c:917
-+#: ../addressbook/libebook-contacts/e-contact.c:1654
-+#: ../addressbook/libebook/e-destination.c:920
- msgid "Unnamed List"
- msgstr "Neimenovani spisak"
-
-@@ -1002,7 +1004,7 @@ msgstr ""
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
--#: ../addressbook/libedata-book/e-book-sqlite.c:5364
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5369
- #, c-format
- msgid "Query contained unsupported elements"
- msgstr "Upit je sadržao nepodržane elemente"
-@@ -1065,7 +1067,7 @@ msgid "Cannot sort by a field which may have multiple values"
- msgstr "Ne mogu da poređam prema polju koje može imati više vrednosti"
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
--#: ../addressbook/libedata-book/e-book-sqlite.c:7376
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7381
- #, c-format
- msgid ""
- "Tried to step a cursor in reverse, but cursor is already at the beginning of "
-@@ -1074,7 +1076,7 @@ msgstr ""
- "Pokušah da pomerim kurzor unazad, ali je on već na početku spiska kontakta"
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
--#: ../addressbook/libedata-book/e-book-sqlite.c:7384
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7389
- #, c-format
- msgid ""
- "Tried to step a cursor forwards, but cursor is already at the end of the "
-@@ -1084,7 +1086,6 @@ msgstr ""
-
- #: ../addressbook/libedata-book/e-book-sqlite.c:524
- #, c-format
--#| msgid "Invalid contact field '%d' specified in summary"
- msgid "Unsupported contact field '%d' specified in summary"
- msgstr "Nepodržano polje kontakta „%d“ je navedeno u sažetku"
-
-@@ -1096,22 +1097,20 @@ msgstr ""
- "Ne mogu da nadogradim bazu podataka kontakata iz stare baze podataka sa više "
- "od jednim adresarom. Obrišite prvo jedan od unosa u tabeli „fascikli“."
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:5357
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5362
- #, c-format
--#| msgid "Invalid query: "
- msgid "Invalid query: %s"
- msgstr "Neispravan upit: %s"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:5532
--#| msgid "Invalid query: "
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5537
- msgid "Invalid query for EbSqlCursor"
- msgstr "Neispravan upit za EbSdbKurzor"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:7198
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7203
- msgid "At least one sort field must be specified to use an EbSqlCursor"
- msgstr "Za korišćenje EbSkulKurzor-a mora biti navedeno barem jedno polje ređanja"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:7216
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7221
- msgid "Cannot sort by a field that is not a string type"
- msgstr "Ne mogu da poređam prema polju koje nije vrsta niske"
-
-@@ -1278,17 +1277,14 @@ msgid "Cannot remove contacts: "
- msgstr "Ne mogu da uklonim kontakte: "
-
- #: ../addressbook/libedata-book/e-data-book-cursor.c:772
--#| msgid "%s does not support creating remote resources"
- msgid "Cursor does not support setting the search expression"
- msgstr "Kurzor ne podržava podešavanje izraza pretrage"
-
- #: ../addressbook/libedata-book/e-data-book-cursor.c:855
--#| msgid "Store does not support an INBOX"
- msgid "Cursor does not support step"
- msgstr "Kurzor ne podržava korak"
-
- #: ../addressbook/libedata-book/e-data-book-cursor.c:938
--#| msgid "%s does not support authentication"
- msgid "Cursor does not support alphabetic indexes"
- msgstr "Kurzor ne podržava azbučne indekse"
-
-@@ -1322,31 +1318,35 @@ msgstr "Nedostaje KIB izvora"
- msgid "No such source for UID '%s'"
- msgstr "Nema takvog izvora za KIB „%s“"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576
- #, c-format
- msgid "Server is unreachable (%s)"
- msgstr "Server je nedostupan (%s)"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607
- #, c-format
- msgid "Failed to connect to a server using SSL: %s"
- msgstr "Nisam uspeo da se povežem na server koristeći SSL: %s"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
- #, c-format
- msgid "Unexpected HTTP status code %d returned (%s)"
- msgstr "Vraćen je neočekivani kod „%d“ HTTP stanja (%s)"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637
- msgid "CalDAV backend is not loaded yet"
- msgstr "Pozadinac KolDAV-a još uvek nije učitan"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1074
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079
- msgid "Invalid Redirect URL"
- msgstr "Neispravna adresa preusmeravanja"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2577
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2942
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882
-+#, c-format
-+msgid "Cannot create local cache folder '%s'"
-+msgstr "Ne mogu da napravim fasciklu mesne ostave „%s“"
-+
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934
- #, c-format
- msgid ""
- "Server is unreachable, calendar is opened in read-only mode.\n"
-@@ -1355,32 +1355,27 @@ msgstr ""
- "Server je nedostupan, kalendar je otvoren u režimu samo za čitanje.\n"
- "Poruka greške: %s"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2897
--#, c-format
--msgid "Cannot create local cache folder '%s'"
--msgstr "Ne mogu da napravim fasciklu mesne ostave „%s“"
--
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3982
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968
- msgid "CalDAV does not support bulk additions"
- msgstr "KolDAV ne podržava grupno dodavanje"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4085
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071
- msgid "CalDAV does not support bulk modifications"
- msgstr "KolDAV ne podržava grupno uređivanje"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4261
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
- msgid "CalDAV does not support bulk removals"
- msgstr "KolDAV ne podržava grupno uklanjanje"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914
- msgid "Calendar doesn't support Free/Busy"
- msgstr "Kalendar ne podržava Slobodno / Zauzeto"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4937
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923
- msgid "Schedule outbox url not found"
- msgstr "Nije pronađena adresa otpremnog sandučeta rasporeda"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5034
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020
- msgid "Unexpected result in schedule-response"
- msgstr "Neočekivan rezultat u rasporedu-odgovoru"
-
-@@ -1407,27 +1402,27 @@ msgstr "Ne mogu da sačuvam podatak iz kalendara: loša adresa."
- msgid "Cannot save calendar data"
- msgstr "Ne mogu da sačuvam podatke kalendara"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:486
-+#: ../calendar/backends/http/e-cal-backend-http.c:491
- #, c-format
- msgid "Malformed URI: %s"
- msgstr "Loša adresa: %s"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:577
-+#: ../calendar/backends/http/e-cal-backend-http.c:582
- #, c-format
- msgid "Redirected to Invalid URI"
- msgstr "Preusmereno na neispravnu adresu"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:620
-+#: ../calendar/backends/http/e-cal-backend-http.c:625
- #, c-format
- msgid "Bad file format."
- msgstr "Loš oblik datoteke."
-
--#: ../calendar/backends/http/e-cal-backend-http.c:630
-+#: ../calendar/backends/http/e-cal-backend-http.c:635
- #, c-format
- msgid "Not a calendar."
- msgstr "Nije kalendar."
-
--#: ../calendar/backends/http/e-cal-backend-http.c:917
-+#: ../calendar/backends/http/e-cal-backend-http.c:925
- #: ../calendar/backends/weather/e-cal-backend-weather.c:536
- msgid "Could not create cache file"
- msgstr "Ne mogu da napravim datoteku za ostavu"
-@@ -2057,7 +2052,7 @@ msgstr "Neispravni argumenti za (sistemska-oznaka)"
- msgid "Invalid arguments to (user-tag)"
- msgstr "Neispravni argumenti za (korisnička-oznaka)"
-
--#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053
-+#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086
- #, c-format
- msgid "Error executing filter search: %s: %s"
- msgstr "Greška u primeni filtera za pretragu: %s: %s"
-@@ -2103,57 +2098,57 @@ msgstr "Umnožavam poruke"
- msgid "Quota information not supported for folder '%s'"
- msgstr "Obaveštenje o količini nije podržano za fasciklu „%s“"
-
--#: ../camel/camel-folder.c:2868
-+#: ../camel/camel-folder.c:2862
- #, c-format
- msgid "Expunging folder '%s'"
- msgstr "Praznim fasciklu „%s“"
-
--#: ../camel/camel-folder.c:2996
-+#: ../camel/camel-folder.c:2990
- #, c-format
- msgid "Retrieving message '%s' in %s"
- msgstr "Dovlačim poruku „%s“ u %s"
-
--#: ../camel/camel-folder.c:3187
-+#: ../camel/camel-folder.c:3181
- #, c-format
- msgid "Retrieving quota information for '%s'"
- msgstr "Dovlačim obaveštenje o količini za „%s“"
-
--#: ../camel/camel-folder.c:3487
-+#: ../camel/camel-folder.c:3478
- #, c-format
- msgid "Refreshing folder '%s'"
- msgstr "Osvežavam fasciklu „%s“"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929
-+#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941
- #, c-format
- msgid "(%s) requires a single bool result"
- msgstr "(%s) zahteva samo jedan logički rezultat"
-
- #. Translators: Each '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:964
-+#: ../camel/camel-folder-search.c:976
- #, c-format
- msgid "(%s) not allowed inside %s"
- msgstr "(%s) nije dozvoljeno unutar %s"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979
-+#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991
- #, c-format
- msgid "(%s) requires a match type string"
- msgstr "(%s) zahteva nisku sa tipom poklapanja"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:1007
-+#: ../camel/camel-folder-search.c:1019
- #, c-format
- msgid "(%s) expects an array result"
- msgstr "(%s) očekuje niz kao rezultat"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:1017
-+#: ../camel/camel-folder-search.c:1029
- #, c-format
- msgid "(%s) requires the folder set"
- msgstr "(%s) zahteva skup fascikli"
-
--#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097
-+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
- #, c-format
- msgid ""
- "Cannot parse search expression: %s:\n"
-@@ -2162,7 +2157,7 @@ msgstr ""
- "Ne mogu da analiziram izraz pretrage: %s:\n"
- "%s"
-
--#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
-+#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121
- #, c-format
- msgid ""
- "Error executing search expression: %s:\n"
-@@ -2436,11 +2431,6 @@ msgstr ""
- msgid "Host lookup '%s' failed: %s"
- msgstr "Nije uspelo traženje domaćina „%s“: %s"
-
--#: ../camel/camel-network-service.c:1009
--#| msgid "No quota information available for folder '%s'"
--msgid "No host information available"
--msgstr "Nisu dostupni podaci o domaćinu"
--
- #: ../camel/camel-offline-folder.c:90
- msgid "Downloading new messages for offline mode"
- msgstr "Preuzimam nove poruke za rad van mreže"
-@@ -2721,7 +2711,7 @@ msgid "Invalid GType registered for protocol '%s'"
- msgstr "Neispravna Gvrsta registrovana za protokol „%s“"
-
- #: ../camel/camel-session.c:502
--#: ../camel/providers/imapx/camel-imapx-server.c:4814
-+#: ../camel/providers/imapx/camel-imapx-server.c:4719
- #: ../camel/providers/pop3/camel-pop3-store.c:311
- #: ../camel/providers/pop3/camel-pop3-store.c:757
- #: ../camel/providers/smtp/camel-smtp-transport.c:515
-@@ -2961,21 +2951,20 @@ msgstr "Ne mogu da napravim fasciklu: %s: fascikla postoji"
- msgid "Creating folder '%s'"
- msgstr "Stvaram fasciklu „%s“"
-
--#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416
-+#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410
- #: ../camel/providers/local/camel-maildir-store.c:321
- #, c-format
- msgid "Cannot delete folder: %s: Invalid operation"
- msgstr "Ne mogu da obrišem fasciklu: %s: neispravna operacija"
-
--#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467
--#: ../camel/providers/local/camel-maildir-store.c:852
-+#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461
-+#: ../camel/providers/local/camel-maildir-store.c:872
- #, c-format
- msgid "Cannot rename folder: %s: Invalid operation"
- msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija"
-
- #: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
- #, c-format
--#| msgid "Data source '%s' is not removable"
- msgid "Stream type '%s' is not seekable"
- msgstr "Vrsta toka „%s“ se ne može premotati"
-
-@@ -3042,17 +3031,17 @@ msgstr "Sam _ažuriraj ori izmeni u izvornim fasciklama"
- msgid "Unmatched"
- msgstr "Nepoklopljeno"
-
--#: ../camel/camel-vee-store.c:442
-+#: ../camel/camel-vee-store.c:436
- #, c-format
- msgid "Cannot delete folder: %s: No such folder"
- msgstr "Ne mogu da obrišem fasciklu: %s: nema takve fascikle"
-
--#: ../camel/camel-vee-store.c:477
-+#: ../camel/camel-vee-store.c:471
- #, c-format
- msgid "Cannot rename folder: %s: No such folder"
- msgstr "Ne mogu da promenim ime fascikle: %s: nema takve fascikle"
-
--#: ../camel/camel-vee-store.c:539
-+#: ../camel/camel-vee-store.c:533
- msgid "Enable _Unmatched folder"
- msgstr "Uključi _nepoklopljene fascikle"
-
-@@ -3064,47 +3053,46 @@ msgstr "Ne mogu da umnožim poruke u fasciklu za smeće"
- msgid "Cannot copy messages to the Junk folder"
- msgstr "Ne mogu da umnožim poruke u fasciklu za đubre"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:687
-+#: ../camel/providers/imapx/camel-imapx-folder.c:796
- #, c-format
- msgid "No quota information available for folder '%s'"
- msgstr "Obaveštenje o količini nije dostupno za fasciklu „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:801
--#: ../camel/providers/imapx/camel-imapx-folder.c:894
-+#: ../camel/providers/imapx/camel-imapx-folder.c:936
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1029
- #, c-format
- msgid "No destination folder specified"
- msgstr "Nije navedena fascikla odredišta"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:829
-+#: ../camel/providers/imapx/camel-imapx-folder.c:964
- msgid "Unable to move junk messages"
- msgstr "Ne mogu da premestim nepoželjne poruke"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:922
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1057
- msgid "Unable to move deleted messages"
- msgstr "Ne mogu da premestim obrisane poruke"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1148
--#: ../camel/providers/nntp/camel-nntp-folder.c:758
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1374
-+#: ../camel/providers/nntp/camel-nntp-folder.c:760
- msgid "Apply message _filters to this folder"
- msgstr "Primeni _filtere poruke nad ovom fasciklom"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1254
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1485
- #, c-format
- msgid "Could not create folder summary for %s"
- msgstr "Ne mogu da napravim sažetak fascikle za „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1263
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1494
- #, c-format
- msgid "Could not create cache for %s: "
- msgstr "Ne mogu da napravim ostavu za „%s“: "
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1448
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1709
- #, c-format
--#| msgid "No quota information available for folder '%s'"
- msgid "No IMAP mailbox available for folder '%s'"
- msgstr "Nijedno IMAP sanduče nije dostupno za fasciklu „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-input-stream.c:92
-+#: ../camel/providers/imapx/camel-imapx-input-stream.c:93
- #, c-format
- msgid "Source stream returned no data"
- msgstr "Odgovor izvornog toka je bez podataka"
-@@ -3130,23 +3118,32 @@ msgid "_Listen for server change notifications"
- msgstr "_Osluškuj za obaveštenjima o izmenama servera"
-
- #: ../camel/providers/imapx/camel-imapx-provider.c:49
-+#| msgid "Evolution Data Server"
-+msgid "Connection to Server"
-+msgstr "Povezivanje na server"
-+
-+#: ../camel/providers/imapx/camel-imapx-provider.c:51
-+msgid "Numbe_r of concurrent connections to use"
-+msgstr "_Broj trenutnih veza za korišćenje"
-+
-+#: ../camel/providers/imapx/camel-imapx-provider.c:54
- #: ../camel/providers/nntp/camel-nntp-provider.c:44
- msgid "Folders"
- msgstr "Fascikle"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:51
-+#: ../camel/providers/imapx/camel-imapx-provider.c:56
- msgid "_Show only subscribed folders"
- msgstr "Prik_aži samo prijavljene fascikle"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:54
-+#: ../camel/providers/imapx/camel-imapx-provider.c:59
- msgid "O_verride server-supplied folder namespace"
- msgstr "P_remosti oblik imena fascikle koje daje server"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:56
-+#: ../camel/providers/imapx/camel-imapx-provider.c:61
- msgid "Namespace:"
- msgstr "Oblik imena:"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:59
-+#: ../camel/providers/imapx/camel-imapx-provider.c:64
- #: ../camel/providers/local/camel-local-provider.c:39
- #: ../camel/providers/local/camel-local-provider.c:79
- #: ../camel/providers/local/camel-local-provider.c:99
-@@ -3154,262 +3151,263 @@ msgstr "Oblik imena:"
- msgid "Options"
- msgstr "Opcije"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:61
-+#: ../camel/providers/imapx/camel-imapx-provider.c:66
- #: ../camel/providers/nntp/camel-nntp-provider.c:41
- msgid "Apply _filters to new messages in all folders"
- msgstr "Primeni filtere na nove poruke u svim _fasciklama"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:63
-+#: ../camel/providers/imapx/camel-imapx-provider.c:68
- msgid "_Apply filters to new messages in Inbox on this server"
- msgstr "_Primeni propusnike na nove poruke u sandučetu ovog servera"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:65
-+#: ../camel/providers/imapx/camel-imapx-provider.c:70
- msgid "Check new messages for _Junk contents"
- msgstr "Proveri da nema _đubreta među novim porukama"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:67
-+#: ../camel/providers/imapx/camel-imapx-provider.c:72
- msgid "Only check for Junk messages in the IN_BOX folder"
- msgstr "Proveri da nema đubreta samo u fascikli SAN_DUČE"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:69
-+#: ../camel/providers/imapx/camel-imapx-provider.c:74
- msgid "Automatically synchroni_ze remote mail locally"
- msgstr "Sam uskladi ud_aljenu poštu sa lokalnom"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:75
-+#: ../camel/providers/imapx/camel-imapx-provider.c:80
- msgid "Default IMAP port"
- msgstr "Osnovni port IMAP-a"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:76
-+#: ../camel/providers/imapx/camel-imapx-provider.c:81
- msgid "IMAP over SSL"
- msgstr "IMAP preko SSL-a"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:83
-+#: ../camel/providers/imapx/camel-imapx-provider.c:88
- msgid "IMAP+"
- msgstr "IMAP+"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:85
-+#: ../camel/providers/imapx/camel-imapx-provider.c:90
- msgid "For reading and storing mail on IMAP servers."
- msgstr "Za čitanje i smeštanje pošte na IMAP servere."
-
--#: ../camel/providers/imapx/camel-imapx-server.c:844
-+#: ../camel/providers/imapx/camel-imapx-server.c:1009
-+#: ../camel/providers/imapx/camel-imapx-server.c:1016
- #, c-format
- msgid "Not authenticated"
- msgstr "Nepotvrđenog identiteta"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:1773
-+#: ../camel/providers/imapx/camel-imapx-server.c:1713
- msgid "Server disconnected"
- msgstr "Veza sa serverom je isključena"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:2255
-+#: ../camel/providers/imapx/camel-imapx-server.c:2205
- msgid "Error writing to cache stream"
- msgstr "Greška prilikom upisa u tok ostave"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:3672
-+#: ../camel/providers/imapx/camel-imapx-server.c:3550
- msgid "Error performing IDLE"
- msgstr "Greška prilikom izvršavanja IDLE-a"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4661
-+#: ../camel/providers/imapx/camel-imapx-server.c:4558
- #, c-format
- msgid "Failed to connect to IMAP server %s in secure mode: %s"
- msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: %s"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4662
-+#: ../camel/providers/imapx/camel-imapx-server.c:4559
- #: ../camel/providers/smtp/camel-smtp-transport.c:215
- msgid "STARTTLS not supported"
- msgstr "STARTTLS nije podržano"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4722
-+#: ../camel/providers/imapx/camel-imapx-server.c:4619
- #, c-format
- msgid "Failed to connect to IMAP server %s in secure mode: "
- msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: "
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4803
-+#: ../camel/providers/imapx/camel-imapx-server.c:4708
- #, c-format
- msgid "IMAP server %s does not support %s authentication"
- msgstr "IMAP server „%s“ ne podržava „%s“ prijavljivanje identiteta"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4833
-+#: ../camel/providers/imapx/camel-imapx-server.c:4738
- #: ../camel/providers/nntp/camel-nntp-store.c:394
- #: ../camel/providers/nntp/camel-nntp-store.c:531
- msgid "Cannot authenticate without a username"
- msgstr "Ne mogu da potvrdim identitet bez korisničkog imena"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4842
-+#: ../camel/providers/imapx/camel-imapx-server.c:4747
- #: ../camel/providers/nntp/camel-nntp-store.c:540
- #: ../camel/providers/pop3/camel-pop3-store.c:678
- #: ../camel/providers/pop3/camel-pop3-store.c:699
- msgid "Authentication password not available"
- msgstr "Lozinka potvrđivanja identiteta nije dostupna"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5093
-+#: ../camel/providers/imapx/camel-imapx-server.c:4983
-+#: ../camel/providers/imapx/camel-imapx-server.c:5042
- msgid "Error fetching message"
- msgstr "Greška prilikom preuzimanja poruke"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5139
-+#: ../camel/providers/imapx/camel-imapx-server.c:5035
- msgid "Failed to close the tmp stream"
- msgstr "Nisam uspeo da zatvorim privremenu datoteku"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5168
-+#: ../camel/providers/imapx/camel-imapx-server.c:5071
- msgid "Failed to copy the tmp file"
- msgstr "Nisam uspeo da umnožim privremenu datoteku"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5294
-+#: ../camel/providers/imapx/camel-imapx-server.c:5212
- msgid "Error moving messages"
- msgstr "Greška premeštanja poruka"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5298
-+#: ../camel/providers/imapx/camel-imapx-server.c:5216
- msgid "Error copying messages"
- msgstr "Greška umnožavanja poruka"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5520
-+#: ../camel/providers/imapx/camel-imapx-server.c:5438
- msgid "Error appending message"
- msgstr "Greška prikačinjanja poruka"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5756
-+#: ../camel/providers/imapx/camel-imapx-server.c:5674
- msgid "Error fetching message headers"
- msgstr "Greška preuzimanja zaglavlja poruke"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5921
-+#: ../camel/providers/imapx/camel-imapx-server.c:5841
- msgid "Error retrieving message"
- msgstr "Greška dovlačenja poruke"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6051
--#: ../camel/providers/imapx/camel-imapx-server.c:6274
-+#: ../camel/providers/imapx/camel-imapx-server.c:5975
-+#: ../camel/providers/imapx/camel-imapx-server.c:6204
- #, c-format
- msgid "Fetching summary information for new messages in '%s'"
- msgstr "Prikupljam pregled podataka novih poruka u „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6103
-+#: ../camel/providers/imapx/camel-imapx-server.c:6027
- #, c-format
- msgid "Scanning for changed messages in '%s'"
- msgstr "Pregledam izmenjene poruke u „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6155
-+#: ../camel/providers/imapx/camel-imapx-server.c:6079
- msgid "Error fetching new messages"
- msgstr "Greška prilikom preuzimanja novih poruka"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6423
-+#: ../camel/providers/imapx/camel-imapx-server.c:6352
- msgid "Error refreshing folder"
- msgstr "Greška tokom pretrage"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6573
-+#: ../camel/providers/imapx/camel-imapx-server.c:6502
- msgid "Error expunging message"
- msgstr "Greška prilikom izbacivanja poruke"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6682
--#: ../camel/providers/imapx/camel-imapx-server.c:6707
-+#: ../camel/providers/imapx/camel-imapx-server.c:6617
-+#: ../camel/providers/imapx/camel-imapx-server.c:6642
- msgid "Error fetching folders"
- msgstr "Greška prilikom preuzimanja fascikle"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6787
-+#: ../camel/providers/imapx/camel-imapx-server.c:6722
- msgid "Error creating folder"
- msgstr "Greška prilikom stvaranja fascikle"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6839
-+#: ../camel/providers/imapx/camel-imapx-server.c:6774
- msgid "Error deleting folder"
- msgstr "Greška prilikom brisanja fascikle"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6906
-+#: ../camel/providers/imapx/camel-imapx-server.c:6850
- msgid "Error renaming folder"
- msgstr "Greška prilikom preimenovanja fascikle"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6993
-+#: ../camel/providers/imapx/camel-imapx-server.c:6924
- msgid "Error subscribing to folder"
- msgstr "Greška prilikom prijavljivanja na fasciklu"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7053
--#| msgid "Error subscribing to folder"
-+#: ../camel/providers/imapx/camel-imapx-server.c:6990
- msgid "Error unsubscribing from folder"
- msgstr "Greška odjavljivanja sa fascikle"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7109
-+#: ../camel/providers/imapx/camel-imapx-server.c:7052
- msgid "Error retrieving quota information"
- msgstr "Greška dovlačenja obaveštenja o količini"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7161
-+#: ../camel/providers/imapx/camel-imapx-server.c:7104
- msgid "Search failed"
- msgstr "Pretraga nije uspela"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7223
-+#: ../camel/providers/imapx/camel-imapx-server.c:7166
- msgid "Error performing NOOP"
- msgstr "Greška prilikom obavljanja NOOP-a"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7330
-+#: ../camel/providers/imapx/camel-imapx-server.c:7273
- msgid "Error syncing changes"
- msgstr "Greška prilikom usklađivanja izmena"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8441
-+#: ../camel/providers/imapx/camel-imapx-server.c:8258
- #, c-format
- msgid "Cannot get message with message ID %s: %s"
- msgstr "Ne mogu da nabavim poruku sa IB „%s“: %s"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8442
-+#: ../camel/providers/imapx/camel-imapx-server.c:8259
- msgid "No such message available."
- msgstr "Nema takve poruke."
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8640
--#: ../camel/providers/imapx/camel-imapx-server.c:8661
-+#: ../camel/providers/imapx/camel-imapx-server.c:8466
-+#: ../camel/providers/imapx/camel-imapx-server.c:8487
- msgid "Cannot create spool file: "
- msgstr "Ne mogu da napravim datoteku pripreme: "
-
--#: ../camel/providers/imapx/camel-imapx-server.c:9403
-+#: ../camel/providers/imapx/camel-imapx-server.c:9228
- msgid "IMAP server does not support quotas"
- msgstr "IMAP server ne podržava količine"
-
- #. create a dummy "." parent inbox, use to scan, then put back at the top level
--#: ../camel/providers/imapx/camel-imapx-store.c:207
-+#: ../camel/providers/imapx/camel-imapx-store.c:223
- #: ../camel/providers/local/camel-maildir-folder.c:482
- #: ../camel/providers/local/camel-maildir-store.c:322
--#: ../camel/providers/local/camel-maildir-store.c:764
--#: ../camel/providers/local/camel-maildir-store.c:770
--#: ../camel/providers/local/camel-maildir-store.c:853
-+#: ../camel/providers/local/camel-maildir-store.c:784
-+#: ../camel/providers/local/camel-maildir-store.c:790
-+#: ../camel/providers/local/camel-maildir-store.c:873
- #: ../camel/providers/local/camel-spool-store.c:393
- msgid "Inbox"
- msgstr "Sanduče"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:823
-+#: ../camel/providers/imapx/camel-imapx-store.c:758
- #, c-format
- msgid "IMAP server %s"
- msgstr "IMAP server „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:826
-+#: ../camel/providers/imapx/camel-imapx-store.c:761
- #, c-format
- msgid "IMAP service for %s on %s"
- msgstr "IMAP servis za „%s“ na „%s"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1035
-+#: ../camel/providers/imapx/camel-imapx-store.c:836
- #: ../camel/providers/nntp/camel-nntp-provider.c:93
- #: ../camel/providers/pop3/camel-pop3-provider.c:81
- msgid "Password"
- msgstr "Lozinka"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1037
-+#: ../camel/providers/imapx/camel-imapx-store.c:838
- msgid "This option will connect to the IMAP server using a plaintext password."
- msgstr ""
- "Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1112
-+#: ../camel/providers/imapx/camel-imapx-store.c:913
- #, c-format
- msgid "No such folder %s"
- msgstr "Nema takve fascikle „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1507
--#, c-format,
-+#: ../camel/providers/imapx/camel-imapx-store.c:1324
-+#, c-format
- msgid "No IMAP namespace for folder path '%s'"
- msgstr "Nema IMAP prostora naziva za putanju fascikle „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1656
-+#: ../camel/providers/imapx/camel-imapx-store.c:1472
- #, c-format
- msgid "Retrieving folder list for %s"
- msgstr "Dovlačim spisak fascikle za „%s“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:2094
-+#: ../camel/providers/imapx/camel-imapx-store.c:1924
- #, c-format
- msgid ""
- "The folder name \"%s\" is invalid because it contains the character \"%c\""
- msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:2615
-+#: ../camel/providers/imapx/camel-imapx-store.c:2689
- #: ../camel/providers/nntp/camel-nntp-store.c:1250
- #: ../camel/providers/pop3/camel-pop3-folder.c:450
- #: ../camel/providers/pop3/camel-pop3-folder.c:593
-@@ -3424,27 +3422,27 @@ msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“"
- msgid "You must be working online to complete this operation"
- msgstr "Morate da budete na mreži da biste završili ovu operaciju"
-
--#: ../camel/providers/local/camel-local-folder.c:192
-+#: ../camel/providers/local/camel-local-folder.c:195
- #, c-format
- msgid "~%s (%s)"
- msgstr "~%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:202
--#: ../camel/providers/local/camel-local-folder.c:211
-+#: ../camel/providers/local/camel-local-folder.c:205
-+#: ../camel/providers/local/camel-local-folder.c:214
- #, c-format
- msgid "mailbox: %s (%s)"
- msgstr "poštansko sanduče:%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:220
-+#: ../camel/providers/local/camel-local-folder.c:223
- #, c-format
- msgid "%s (%s)"
- msgstr "%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:497
-+#: ../camel/providers/local/camel-local-folder.c:500
- msgid "_Index message body data"
- msgstr "_Popiši sadržaje poruka"
-
--#: ../camel/providers/local/camel-local-folder.c:725
-+#: ../camel/providers/local/camel-local-folder.c:730
- #, c-format
- msgid ""
- "Cannot get message %s from folder %s\n"
-@@ -3595,7 +3593,7 @@ msgstr "Ne mogu da prebacim poruku u odredišnu fasciklu: %s"
-
- #: ../camel/providers/local/camel-maildir-store.c:130
- #: ../camel/providers/local/camel-maildir-store.c:149
--#: ../camel/providers/local/camel-maildir-store.c:861
-+#: ../camel/providers/local/camel-maildir-store.c:881
- #, c-format
- msgid "Folder %s already exists"
- msgstr "Fascikla „%s“ već postoji"
-@@ -3638,8 +3636,8 @@ msgstr "Ne mogu da obrišem fasciklu „%s“: %s"
- msgid "not a maildir directory"
- msgstr "nije direktorijum pošte"
-
--#: ../camel/providers/local/camel-maildir-store.c:636
--#: ../camel/providers/local/camel-maildir-store.c:1075
-+#: ../camel/providers/local/camel-maildir-store.c:637
-+#: ../camel/providers/local/camel-maildir-store.c:1095
- #: ../camel/providers/local/camel-spool-store.c:212
- #: ../camel/providers/local/camel-spool-store.c:231
- #, c-format
-@@ -3660,10 +3658,10 @@ msgstr "Proveravam celovitost fascikle"
- msgid "Checking for new messages"
- msgstr "Vršim proveru za novim porukama"
-
--#: ../camel/providers/local/camel-maildir-summary.c:784
-+#: ../camel/providers/local/camel-maildir-summary.c:791
- #: ../camel/providers/local/camel-mbox-summary.c:466
--#: ../camel/providers/local/camel-mbox-summary.c:682
--#: ../camel/providers/local/camel-mbox-summary.c:831
-+#: ../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 "Smeštam fasciklu"
-@@ -3761,48 +3759,48 @@ msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s"
- msgid "Could not open folder: %s: %s"
- msgstr "Ne mogu da otvorim fasciklu: %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:606
-+#: ../camel/providers/local/camel-mbox-summary.c:611
- #, c-format
- msgid "Cannot check folder: %s: %s"
- msgstr "Ne mogu da proverim fasciklu: %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:695
--#: ../camel/providers/local/camel-mbox-summary.c:840
-+#: ../camel/providers/local/camel-mbox-summary.c:700
-+#: ../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 "Ne mogu da otvorim datoteku: %s: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:710
-+#: ../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 da otvorim privremeno poštansko sanduče: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:727
--#: ../camel/providers/local/camel-mbox-summary.c:962
-+#: ../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 "Ne mogu da zatvorim izvornu fasciklu „%s“: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:740
-+#: ../camel/providers/local/camel-mbox-summary.c:745
- #, c-format
- msgid "Could not close temporary folder: %s"
- msgstr "Ne mogu da zatvorim privremenu fasciklu: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:759
-+#: ../camel/providers/local/camel-mbox-summary.c:764
- #, c-format
- msgid "Could not rename folder: %s"
- msgstr "Ne mogu da preimenujem fasciklu: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:854
--#: ../camel/providers/local/camel-mbox-summary.c:1127
-+#: ../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 "Ne mogu da sačuvam fasciklu: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:893
--#: ../camel/providers/local/camel-mbox-summary.c:1167
-+#: ../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 "
-@@ -3811,25 +3809,25 @@ msgstr ""
- "MBOKS datoteka je oštećena, popravite je. (Očekivano je „Iz reda“, ali nisam "
- "dobio.)"
-
--#: ../camel/providers/local/camel-mbox-summary.c:903
--#: ../camel/providers/local/camel-mbox-summary.c:1179
-+#: ../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 pregleda i fascikle, čak i nakon usklađivanja"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1072
-+#: ../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:1237
--#: ../camel/providers/local/camel-mbox-summary.c:1267
-+#: ../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 "Nisam uspeo da zapišem u privremeno poštansko sanduče: %s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1256
-+#: ../camel/providers/local/camel-mbox-summary.c:1261
- #, c-format
- msgid "Writing to temporary mailbox failed: %s: %s"
- msgstr "Nisam uspeo da zapišem u privremeno poštansko sanduče: %s: %s"
-@@ -3950,21 +3948,21 @@ msgstr ""
- "Fascikla je možda oštećena, umnožite sačuvano u „%s“"
-
- #: ../camel/providers/nntp/camel-nntp-folder.c:222
--#: ../camel/providers/nntp/camel-nntp-folder.c:588
-+#: ../camel/providers/nntp/camel-nntp-folder.c:590
- #, c-format
- msgid "Internal error: UID in invalid format: %s"
- msgstr "Unutrašnja greška: KIB u neispravnom obliku: %s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:291
--#: ../camel/providers/nntp/camel-nntp-folder.c:296
-+#: ../camel/providers/nntp/camel-nntp-folder.c:292
-+#: ../camel/providers/nntp/camel-nntp-folder.c:297
- #: ../camel/providers/pop3/camel-pop3-folder.c:546
- #: ../camel/providers/pop3/camel-pop3-folder.c:945
- #, c-format
- msgid "Cannot get message %s: %s"
- msgstr "Ne mogu da dobavim poruku „%s“: %s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:303
--#: ../camel/providers/nntp/camel-nntp-folder.c:622
-+#: ../camel/providers/nntp/camel-nntp-folder.c:304
-+#: ../camel/providers/nntp/camel-nntp-folder.c:624
- #: ../camel/providers/pop3/camel-pop3-folder.c:476
- #: ../camel/providers/pop3/camel-pop3-folder.c:536
- #: ../camel/providers/pop3/camel-pop3-folder.c:555
-@@ -3978,18 +3976,17 @@ msgstr "Ne mogu da dobavim poruku „%s“: "
- msgid "Posting failed: %s"
- msgstr "Neuspela pošiljka: %s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:501
-+#: ../camel/providers/nntp/camel-nntp-folder.c:503
- msgid "Posting failed: "
- msgstr "Neuspela pošiljka: "
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:611
-+#: ../camel/providers/nntp/camel-nntp-folder.c:613
- #, c-format
- msgid "This message is not currently available"
- msgstr "Ova poruka nije trenutno dostupna"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:720
-+#: ../camel/providers/nntp/camel-nntp-folder.c:722
- #, c-format
--#| msgid "You cannot copy messages from a NNTP folder!"
- msgid "You cannot copy messages from a NNTP folder"
- msgstr "Ne možete da umnožite poruke iz NNTP fascikle"
-
-@@ -4652,7 +4649,6 @@ msgstr ""
- "Jedinice za podsetnik na rođendane ili godišnjice, „minuti“, „sati“ ili „dani“"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
--#| msgid "Proxy type to use"
- msgid "(Deprecated) Proxy type to use"
- msgstr "(Zastarelo) Vrsta posrednika za korišćenje"
-
-@@ -4667,69 +4663,57 @@ msgstr ""
- "Evolucije. Vidite API dokumentaciju „ESourceProxy“ za pojedinosti."
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
--#| msgid "Whether to use http-proxy"
- msgid "(Deprecated) Whether to use http-proxy"
- msgstr "(Zastarelo) Da li da koristi http-posrednika"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
--#| msgid "Whether proxy server requires authentication"
- msgid "(Deprecated) Whether proxy server requires authentication"
- msgstr "(Zastarelo) Da li server posrednik zahteva potvrdu identiteta"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
--#| msgid "Host name for HTTP requests"
- msgid "(Deprecated) Host name for HTTP requests"
- msgstr "(Zastarelo) Naziv domaćina za HTTP zahteve"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
--#| msgid "Port number for HTTP requests"
- msgid "(Deprecated) Port number for HTTP requests"
- msgstr "(Zastarelo) Broj priključnika za HTTP zahteve"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
--#| msgid "Proxy authentication user name"
- msgid "(Deprecated) Proxy authentication user name"
- msgstr "(Zastarelo) Korisničko ime potvrde identiteta posrednika"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
--#| msgid "Proxy authentication password"
- msgid "(Deprecated) Proxy authentication password"
- msgstr "(Zastarelo) Lozinka potvrde identiteta posrednika"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
--#| msgid "List of hosts to connect to without proxy"
- msgid "(Deprecated) List of hosts to connect to without proxy"
- msgstr "(Zastarelo) Spisak domaćina za povezivanje bez posrednika"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
--#| msgid "Host name for HTTPS requests"
- msgid "(Deprecated) Host name for HTTPS requests"
- msgstr "(Zastarelo) Naziv domaćina za HTTPS zahteve"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
--#| msgid "Port number for HTTPS requests"
- msgid "(Deprecated) Port number for HTTPS requests"
- msgstr "(Zastarelo) Broj priključnika za HTTPS zahteve"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
--#| msgid "Host name for SOCKS requests"
- msgid "(Deprecated) Host name for SOCKS requests"
- msgstr "(Zastarelo) Naziv domaćina za SOCKS zahteve"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
--#| msgid "Port number for SOCKS requests"
- msgid "(Deprecated) Port number for SOCKS requests"
- msgstr "(Zastarelo) Broj priključnika za SOCKS zahteve"
-
- #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
--#| msgid "Automatic proxy configuration URL"
- msgid "(Deprecated) Automatic proxy configuration URL"
- msgstr "(Zastarelo) Adresa za samopodešavanje posrednika"
-
- #: ../libebackend/e-authentication-mediator.c:204
- #: ../libebackend/e-authentication-mediator.c:215
--#: ../libebackend/e-authentication-mediator.c:861
--#: ../libebackend/e-authentication-mediator.c:1198
-+#: ../libebackend/e-authentication-mediator.c:860
-+#: ../libebackend/e-authentication-mediator.c:1197
- msgid "Bus name vanished (client terminated?)"
- msgstr "Naziv sabirnice je nestao (klijent je okončan?)"
-
-@@ -4739,8 +4723,8 @@ msgstr "Nema odgovora sa klijenta"
-
- #: ../libebackend/e-authentication-mediator.c:333
- #: ../libebackend/e-authentication-mediator.c:344
--#: ../libebackend/e-authentication-mediator.c:855
--#: ../libebackend/e-authentication-mediator.c:1192
-+#: ../libebackend/e-authentication-mediator.c:854
-+#: ../libebackend/e-authentication-mediator.c:1191
- msgid "Client cancelled the operation"
- msgstr "Klijent je otkazao ste operaciju"
-
-@@ -4748,11 +4732,11 @@ msgstr "Klijent je otkazao ste operaciju"
- msgid "Client reports password was rejected"
- msgstr "Lozinka izveštaja klijenta je odbijena"
-
--#: ../libebackend/e-authentication-session.c:554
-+#: ../libebackend/e-authentication-session.c:539
- msgid "Add this password to your keyring"
- msgstr "Dodajte ovu lozinku u vaš privezak"
-
--#: ../libebackend/e-authentication-session.c:664
-+#: ../libebackend/e-authentication-session.c:649
- msgid "Password was incorrect"
- msgstr "Lozinka je neispravna"
-
-@@ -4761,12 +4745,12 @@ msgstr "Lozinka je neispravna"
- msgid "%s does not support authentication"
- msgstr "„%s“ ne podržava potvrđivanje identiteta"
-
--#: ../libebackend/e-collection-backend.c:900
-+#: ../libebackend/e-collection-backend.c:901
- #, c-format
- msgid "%s does not support creating remote resources"
- msgstr "„%s“ ne podržava stvaranje udaljenih izvorišta"
-
--#: ../libebackend/e-collection-backend.c:959
-+#: ../libebackend/e-collection-backend.c:960
- #, c-format
- msgid "%s does not support deleting remote resources"
- msgstr "„%s“ ne podržava brisanje udaljenih izvorišta"
-@@ -4781,40 +4765,40 @@ msgstr "Nema pogona pozadinca za taster mešanja „%s“"
- msgid "Data source is missing a [%s] group"
- msgstr "Izvoru podataka nedostaje [%s] grupa"
-
--#: ../libebackend/e-server-side-source.c:1020
--#: ../libedataserver/e-source.c:1348
-+#: ../libebackend/e-server-side-source.c:1022
-+#: ../libedataserver/e-source.c:1394
- #, c-format
- msgid "Data source '%s' does not support creating remote resources"
- msgstr "Izvor podataka „%s“ ne podržava stvaranje udaljenih izvorišta"
-
--#: ../libebackend/e-server-side-source.c:1034
-+#: ../libebackend/e-server-side-source.c:1036
- #, c-format
- msgid ""
- "Data source '%s' has no collection backend to create the remote resource"
- msgstr ""
- "Izvor podataka „%s“ nema pozadinca zbirke da bi napravio udaljeno izvorište"
-
--#: ../libebackend/e-server-side-source.c:1062
--#: ../libedataserver/e-source.c:1461
-+#: ../libebackend/e-server-side-source.c:1064
-+#: ../libedataserver/e-source.c:1507
- #, c-format
- msgid "Data source '%s' does not support deleting remote resources"
- msgstr "Izvor podataka „%s“ ne podržava brisanje udaljenih izvorišta"
-
--#: ../libebackend/e-server-side-source.c:1076
-+#: ../libebackend/e-server-side-source.c:1078
- #, c-format
- msgid ""
- "Data source '%s' has no collection backend to delete the remote resource"
- msgstr ""
- "Izvor podataka „%s“ nema pozadinca zbirke da bi obrisao udaljeno izvorište"
-
--#: ../libebackend/e-server-side-source.c:1107
--#: ../libedataserver/e-source.c:1557
--#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
-+#: ../libebackend/e-server-side-source.c:1109
-+#: ../libedataserver/e-source.c:1603
-+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026
- #, c-format
- msgid "Data source '%s' does not support OAuth 2.0 authentication"
- msgstr "Izvor podataka „%s“ ne podržava OAut 2.0 potvrđivanje identiteta"
-
--#: ../libebackend/e-server-side-source.c:1452
-+#: ../libebackend/e-server-side-source.c:1456
- #, c-format
- msgid "File must have a '.source' extension"
- msgstr "Datoteka mora da ima nastavak „.source“"
-@@ -5018,37 +5002,36 @@ msgstr "Unesite lozinku za spisak zaduženja „%s“."
- msgid "Please enter the password for account \"%s\"."
- msgstr "Unesite lozinku za nalog „%s“."
-
--#: ../libedataserver/e-source.c:765
-+#: ../libedataserver/e-source.c:768
- #, c-format
- msgid "Source file is missing a [%s] group"
- msgstr "Izvornoj datoteci nedostaje [%s] grupa"
-
--#: ../libedataserver/e-source.c:1128
-+#: ../libedataserver/e-source.c:1174
- #, c-format
- msgid "Data source '%s' is not removable"
- msgstr "Izvor podataka „%s“ se ne može ukloniti"
-
--#: ../libedataserver/e-source.c:1251
-+#: ../libedataserver/e-source.c:1297
- #, c-format
- msgid "Data source '%s' is not writable"
- msgstr "Izvor podtaka „%s“ nije upisiv"
-
--#: ../libedataserver/e-source.c:1864
-+#: ../libedataserver/e-source.c:1910
- msgid "Unnamed"
- msgstr "Neimenovan"
-
--#: ../libedataserver/e-source-mail-signature.c:486
-+#: ../libedataserver/e-source-mail-signature.c:485
- #, c-format
- msgid "Signature script must be a local file"
- msgstr "Skripta potpisa mora da bude mesna datoteka"
-
- #: ../libedataserver/e-source-proxy.c:1646
- #, c-format
--#| msgid "Data source '%s' does not support creating remote resources"
- msgid "Source '%s' does not support proxy lookups"
- msgstr "Izvor „%s“ ne podržava traženja posrednika"
-
--#: ../libedataserver/e-source-webdav.c:1551
-+#: ../libedataserver/e-source-webdav.c:1555
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
-@@ -5057,7 +5040,7 @@ msgstr ""
- "SSL uverenje za domaćina „%s“, koje koristi adresar „%s“, nije od poverenja. "
- "Da li želite da ga prihvatite?"
-
--#: ../libedataserver/e-source-webdav.c:1560
-+#: ../libedataserver/e-source-webdav.c:1564
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
-@@ -5066,7 +5049,7 @@ msgstr ""
- "SSL uverenje za domaćina „%s“, koje koristi kalendar „%s“, nije od poverenja. "
- "Da li želite da ga prihvatite?"
-
--#: ../libedataserver/e-source-webdav.c:1569
-+#: ../libedataserver/e-source-webdav.c:1573
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
-@@ -5075,7 +5058,7 @@ msgstr ""
- "SSL uverenje za domaćina „%s“, koje koriste beleške „%s“, nije od poverenja. "
- "Da li želite da ga prihvatite?"
-
--#: ../libedataserver/e-source-webdav.c:1578
-+#: ../libedataserver/e-source-webdav.c:1582
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
-@@ -5269,7 +5252,7 @@ msgstr "Nisam uspeo da pronađem element naloga"
- msgid "Failed to find ASUrl and OABUrl in autodiscover response"
- msgstr "Nisam uspeo da pronađem ASadresu i OABadresu u odgovoru samootkrivanja"
-
--#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261
-+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260
- #, c-format
- msgid ""
- "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-@@ -5278,18 +5261,23 @@ msgstr ""
- "Ne mogu da pronađem odgovarajući nalog na usluzi „org.gnom.Nalozi na mreži“ "
- "sa koje bih dobio pristup za „%s“."
-
--#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288
-+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290
- #, c-format
- msgid "Failed to obtain an access token for '%s': "
- msgstr "Nisam uspeo da dobijem pristup za „%s“: "
-
--#: ../modules/google-backend/module-google-backend.c:191
-+#: ../modules/google-backend/module-google-backend.c:195
- #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
- #: ../modules/yahoo-backend/module-yahoo-backend.c:199
- msgid "Calendar"
- msgstr "Kalendar"
-
--#: ../modules/google-backend/module-google-backend.c:260
-+#: ../modules/google-backend/module-google-backend.c:268
-+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
-+msgid "Tasks"
-+msgstr "Zaduženja"
-+
-+#: ../modules/google-backend/module-google-backend.c:321
- #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
- #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
- msgid "Contacts"
-@@ -5388,7 +5376,7 @@ msgstr "Pošta"
- msgid "Integrate your mailboxes"
- msgstr "Objedinite vaše sandučiće"
-
--#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008
-+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007
- #, c-format
- msgid ""
- "Cannot find a corresponding account service in the accounts database from "
-@@ -5400,7 +5388,6 @@ msgstr ""
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:84
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:281
- #, c-format
--#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
- msgid ""
- "Expected status 200 when requesting your identity, instead got status %d (%s)"
- msgstr ""
-@@ -5413,22 +5400,18 @@ msgid "Error parsing response as JSON: "
- msgstr "Greška obrade odgovora kao JSON:"
-
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:119
--#| msgid "Didn't find email member in JSON data"
- msgid "Didn't find 'email' in JSON data"
- msgstr "Nisam našao „email“ u JSON podacima"
-
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:316
--#| msgid "Didn't find email member in JSON data"
- msgid "Didn't find 'id' in JSON data"
- msgstr "Nisam našao „id“ u JSON podacima"
-
- #: ../modules/ubuntu-online-accounts/uoa-utils.c:321
--#| msgid "Didn't find email member in JSON data"
- msgid "Didn't find 'emails.account' in JSON data"
- msgstr "Nisam našao „emails.account“ u JSON podacima"
-
- #: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
--#| msgid "Wants HTML Mail"
- msgid "Windows Live Mail"
- msgstr "Pošta Vindouza uživo"
-
-@@ -5440,10 +5423,6 @@ msgstr "Jahu! kalendar"
- msgid "Yahoo! Mail"
- msgstr "Jahu! pošta"
-
--#: ../modules/yahoo-backend/module-yahoo-backend.c:226
--msgid "Tasks"
--msgstr "Zaduženja"
--
- #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
- #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
- #: ../services/evolution-user-prompter/evolution-user-prompter.c:30
-@@ -5500,6 +5479,10 @@ msgstr "Ne preseljavaj korisničke podatke iz prethodnih izdanja Evolucije"
- msgid "_Dismiss"
- msgstr "_Zanemari"
-
-+#~| msgid "No quota information available for folder '%s'"
-+#~ msgid "No host information available"
-+#~ msgstr "Nisu dostupni podaci o domaćinu"
-+
- #~ msgid "You may not import keys with this cipher"
- #~ msgstr "Možda nećete moći da uvezete ključeve sa ovim algoritmom"
-
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index e4120aa..61fb283 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -21,90 +21,90 @@ msgstr ""
- "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=Misc.\n"
--"POT-Creation-Date: 2014-01-23 12:42+0000\n"
--"PO-Revision-Date: 2013-08-20 10:54+0800\n"
--"Last-Translator: Luo Lei <luolei@ubuntukylin.com>\n"
-+"POT-Creation-Date: 2014-07-29 04:28+0000\n"
-+"PO-Revision-Date: 2014-07-29 16:34+0800\n"
-+"Last-Translator: Yunqiang Su <wzssyqa@gmail.com>\n"
- "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
- "Language: zh_CN\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=1; plural=0;\n"
--"X-Generator: Poedit 1.5.4\n"
-+"X-Generator: Poedit 1.6.7\n"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:117
-+#: ../addressbook/backends/file/e-book-backend-file.c:120
- #, c-format
- msgid "Failed to remove file '%s': %s"
- msgstr "删除文件“%s”失败:%s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:145
-+#: ../addressbook/backends/file/e-book-backend-file.c:148
- #, c-format
- msgid "Failed to make directory %s: %s"
- msgstr "创建目录“%s”失败:%s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:396
-+#: ../addressbook/backends/file/e-book-backend-file.c:419
- #, c-format
- msgid "Failed to create hardlink for resource '%s': %s"
- msgstr "创建资源“%s”的硬链接失败:%s"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:501
--#: ../addressbook/backends/file/e-book-backend-file.c:1230
-+#: ../addressbook/backends/file/e-book-backend-file.c:524
-+#: ../addressbook/backends/file/e-book-backend-file.c:1253
- msgid "No UID in the contact"
- msgstr "联系人没有 UID"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:828
-+#: ../addressbook/backends/file/e-book-backend-file.c:851
- #, c-format
- msgid "Conflicting UIDs found in added contacts"
- msgstr "增加的联系人有 UID 冲突"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:967
-+#: ../addressbook/backends/file/e-book-backend-file.c:990
- msgid "Loading..."
- msgstr "正在载入..."
-
--#: ../addressbook/backends/file/e-book-backend-file.c:969
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4425
-+#: ../addressbook/backends/file/e-book-backend-file.c:992
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4353
- msgid "Searching..."
- msgstr "正在搜索..."
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1258
-+#: ../addressbook/backends/file/e-book-backend-file.c:1281
- #, c-format
- msgid "Tried to modify contact '%s' with out of sync revision"
- msgstr "试图修改失去同步的联系人“%s”"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1449
--#: ../addressbook/backends/file/e-book-backend-file.c:1532
-+#: ../addressbook/backends/file/e-book-backend-file.c:1472
-+#: ../addressbook/backends/file/e-book-backend-file.c:1555
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
--#: ../addressbook/libedata-book/e-book-sqlite.c:6706
-+#: ../addressbook/libedata-book/e-book-sqlite.c:6711
- #, c-format
- msgid "Contact '%s' not found"
- msgstr "未找到联系人“%s”"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1592
--#: ../addressbook/backends/file/e-book-backend-file.c:1673
-+#: ../addressbook/backends/file/e-book-backend-file.c:1615
-+#: ../addressbook/backends/file/e-book-backend-file.c:1696
- #, c-format
- msgid "Query '%s' not supported"
- msgstr "不支持查询“%s”"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1601
--#: ../addressbook/backends/file/e-book-backend-file.c:1682
-+#: ../addressbook/backends/file/e-book-backend-file.c:1624
-+#: ../addressbook/backends/file/e-book-backend-file.c:1705
- #, c-format
- msgid "Invalid Query '%s'"
- msgstr "无效的查询:“%s”"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:1947
-+#: ../addressbook/backends/file/e-book-backend-file.c:1970
- msgid "Requested to delete an unrelated cursor"
- msgstr "请求删除一个无关的 cursor"
-
--#: ../addressbook/backends/file/e-book-backend-file.c:2014
-+#: ../addressbook/backends/file/e-book-backend-file.c:2041
- #, c-format
- msgid "Failed to rename old database from '%s' to '%s': %s"
- msgstr "无法将旧数据库“ %s” 改名为 “%s”:%s"
-
--#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1244
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4320
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820
-+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887
- #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
- #: ../addressbook/libebook-contacts/e-phone-number.c:56
- #: ../addressbook/libebook/e-book.c:1078
-@@ -119,67 +119,69 @@ msgstr "无法将旧数据库“ %s” 改名为 “%s”:%s"
- #: ../addressbook/libebook/e-book-client.c:3175
- #: ../addressbook/libebook/e-book-client.c:3393
- #: ../addressbook/libedata-book/e-book-backend-sexp.c:878
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621
- #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
- #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
--#: ../calendar/libecal/e-cal-client.c:3237
--#: ../calendar/libecal/e-cal-client.c:3410
--#: ../calendar/libecal/e-cal-client.c:3674
--#: ../calendar/libecal/e-cal-client.c:3915
--#: ../calendar/libecal/e-cal-client.c:4103
--#: ../calendar/libecal/e-cal-client.c:4295
--#: ../calendar/libecal/e-cal-client.c:4465
--#: ../calendar/libecal/e-cal-client.c:4634
--#: ../calendar/libecal/e-cal-client.c:4837
--#: ../calendar/libecal/e-cal-client.c:4987
--#: ../calendar/libecal/e-cal-client.c:5181
--#: ../calendar/libecal/e-cal-client.c:5334
--#: ../calendar/libecal/e-cal-client.c:5551
--#: ../calendar/libecal/e-cal-client.c:5705
--#: ../calendar/libecal/e-cal-client.c:5931
--#: ../calendar/libecal/e-cal-client.c:6127
--#: ../calendar/libecal/e-cal-client.c:6490
--#: ../calendar/libecal/e-cal-client.c:6704
--#: ../camel/providers/imapx/camel-imapx-command.c:654
-+#: ../calendar/libecal/e-cal-client.c:3239
-+#: ../calendar/libecal/e-cal-client.c:3412
-+#: ../calendar/libecal/e-cal-client.c:3676
-+#: ../calendar/libecal/e-cal-client.c:3917
-+#: ../calendar/libecal/e-cal-client.c:4107
-+#: ../calendar/libecal/e-cal-client.c:4299
-+#: ../calendar/libecal/e-cal-client.c:4469
-+#: ../calendar/libecal/e-cal-client.c:4638
-+#: ../calendar/libecal/e-cal-client.c:4841
-+#: ../calendar/libecal/e-cal-client.c:4991
-+#: ../calendar/libecal/e-cal-client.c:5185
-+#: ../calendar/libecal/e-cal-client.c:5338
-+#: ../calendar/libecal/e-cal-client.c:5555
-+#: ../calendar/libecal/e-cal-client.c:5709
-+#: ../calendar/libecal/e-cal-client.c:5935
-+#: ../calendar/libecal/e-cal-client.c:6131
-+#: ../calendar/libecal/e-cal-client.c:6494
-+#: ../calendar/libecal/e-cal-client.c:6708
-+#: ../camel/providers/imapx/camel-imapx-command.c:645
-+#: ../camel/providers/imapx/camel-imapx-server.c:4769
-+#: ../camel/providers/imapx/camel-imapx-server.c:4778
- #: ../libedataserver/e-client.c:185
- msgid "Unknown error"
- msgstr "未知的错误"
-
- #. Query for new contacts asynchronously
--#: ../addressbook/backends/google/e-book-backend-google.c:836
-+#: ../addressbook/backends/google/e-book-backend-google.c:828
- msgid "Querying for updated contacts…"
- msgstr "查询更新的联系人..."
-
- #. Run the query asynchronously
--#: ../addressbook/backends/google/e-book-backend-google.c:988
-+#: ../addressbook/backends/google/e-book-backend-google.c:1010
- msgid "Querying for updated groups…"
- msgstr "查询更新的组..."
-
--#: ../addressbook/backends/google/e-book-backend-google.c:1705
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5056
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1268
-+#: ../addressbook/backends/google/e-book-backend-google.c:1757
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433
- msgid "The backend does not support bulk additions"
- msgstr "后端不支持批量添加"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:1854
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5192
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1370
-+#: ../addressbook/backends/google/e-book-backend-google.c:1912
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545
- msgid "The backend does not support bulk modifications"
- msgstr "后端不支持批量修改"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:2054
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1462
-+#: ../addressbook/backends/google/e-book-backend-google.c:2119
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645
- msgid "The backend does not support bulk removals"
- msgstr "后端不支持批量删除"
-
--#: ../addressbook/backends/google/e-book-backend-google.c:2180
-+#: ../addressbook/backends/google/e-book-backend-google.c:2239
- msgid "Loading…"
- msgstr "正在载入..."
-
- #. System Group: My Contacts
--#: ../addressbook/backends/google/e-book-google-utils.c:1618
-+#: ../addressbook/backends/google/e-book-google-utils.c:1631
- #: ../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
-@@ -188,129 +190,130 @@ msgid "Personal"
- msgstr "个人"
-
- #. System Group: Friends
--#: ../addressbook/backends/google/e-book-google-utils.c:1620
-+#: ../addressbook/backends/google/e-book-google-utils.c:1633
- msgid "Friends"
- msgstr "朋友"
-
- #. System Group: Family
--#: ../addressbook/backends/google/e-book-google-utils.c:1622
-+#: ../addressbook/backends/google/e-book-google-utils.c:1635
- msgid "Family"
- msgstr "家人"
-
- #. System Group: Coworkers
--#: ../addressbook/backends/google/e-book-google-utils.c:1624
-+#: ../addressbook/backends/google/e-book-google-utils.c:1637
- msgid "Coworkers"
- msgstr "同事"
-
- #. 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:172
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113
- msgid "Not connected"
- msgstr "未连接。"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:899
- msgid "Failed to bind using either v3 or v2 binds"
- msgstr "无法使用 v3 或 v2 绑定"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
- msgid "Reconnecting to LDAP server..."
- msgstr "正在重新连接 LDAP 服务器..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1225
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153
- msgid "Invalid DN syntax"
- msgstr "无效 DN 语法"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1241
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4319
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
- #, c-format
- msgid "LDAP error 0x%x (%s)"
- msgstr "LDAP 错误 0x%x (%s)"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1853
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2176
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1781
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104
- #, c-format
- msgid "%s: NULL returned from ldap_first_entry"
- msgstr "%s:ldap_first_entry 返回 NULL"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2234
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2034
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162
- #, c-format
- msgid "%s: Unhandled result type %d returned"
- msgstr "%s:返回了未处理的结果类型 %d"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2367
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2494
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2295
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422
- #, c-format
- msgid "%s: Unhandled search result type %d returned"
- msgstr "%s:返回了未处理的搜索结果类型 %d"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4268
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4196
- msgid "Receiving LDAP search results..."
- msgstr "正在接收 LDAP 的搜索结果..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4447
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375
- msgid "Error performing search"
- msgstr "执行搜索错误"
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503
- #, c-format
- msgid "Downloading contacts (%d)..."
- msgstr "正在下载联系人(%d)..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5139
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067
- msgid "Adding contact to LDAP server..."
- msgstr "正在将联系人添加到 LDAP 服务器..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5214
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142
- msgid "Modifying contact from LDAP server..."
- msgstr "正在修改 LDAP 服务器上的联系人..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5280
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208
- msgid "Removing contact from LDAP server..."
- msgstr "正在从 LDAP 服务器删除联系人..."
-
--#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5669
-+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597
- #, c-format
- msgid "Failed to get the DN for user '%s'"
- msgstr "无法获取用户“%s”的 DN"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
- msgid "Loading Addressbook summary..."
- msgstr "正在加载地址簿概要..."
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
- #, c-format
- msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
- msgstr "webdav 上的 PROPFIND 失败,HTTP 状态码:%d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:903
- msgid "No response body in webdav PROPFIND result"
- msgstr "在 webdav PROPFIND 结果中无应答主体"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964
- #, c-format
- msgid "Loading Contacts (%d%%)"
- msgstr "正在加载联系人(%d%%)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1191
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353
- msgid "Cannot transform SoupURI to string"
- msgstr "无法将 SoupURI 转为字符串"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1301
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474
- #, c-format
- msgid "Create resource '%s' failed with HTTP status %d (%s)"
- msgstr "创建资源“%s”失败,HTTP 状态码为: %d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1399
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576
- msgid "Contact on server changed -> not modifying"
- msgstr "服务器上的联系人已更改 -> 将不做更改"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1407
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584
- #, c-format
- msgid "Modify contact failed with HTTP status %d (%s)"
- msgstr "修改联系人失败,HTTP 状态码:%d (%s)"
-
--#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1483
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677
-+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693
- #, c-format
- msgid "DELETE failed with HTTP status %d"
- msgstr "DELETE 失败,HTTP 状态码:%d"
-@@ -914,8 +917,8 @@ msgstr "Google Talk 姓名列表"
- msgid "Twitter Name List"
- msgstr "Twitter 姓名列表"
-
--#: ../addressbook/libebook-contacts/e-contact.c:1635
--#: ../addressbook/libebook/e-destination.c:881
-+#: ../addressbook/libebook-contacts/e-contact.c:1654
-+#: ../addressbook/libebook/e-destination.c:920
- msgid "Unnamed List"
- msgstr "未命名的列表"
-
-@@ -1008,7 +1011,7 @@ msgstr "缓存中没有保存完整的 search_contacts,无法返回电子名
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
--#: ../addressbook/libedata-book/e-book-sqlite.c:5364
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5369
- #, c-format
- msgid "Query contained unsupported elements"
- msgstr "查询中包含不支持的元素"
-@@ -1067,7 +1070,7 @@ msgid "Cannot sort by a field which may have multiple values"
- msgstr "无法按可能有多个值的字段排序"
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
--#: ../addressbook/libedata-book/e-book-sqlite.c:7376
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7381
- #, c-format
- msgid ""
- "Tried to step a cursor in reverse, but cursor is already at the beginning of "
-@@ -1075,7 +1078,7 @@ msgid ""
- msgstr "尝试对 cursor 反向步进,但 cursor 已位于联系人列表的开头"
-
- #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
--#: ../addressbook/libedata-book/e-book-sqlite.c:7384
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7389
- #, c-format
- msgid ""
- "Tried to step a cursor forwards, but cursor is already at the end of the "
-@@ -1095,20 +1098,20 @@ msgstr ""
- "无法从包含多于一个地址簿的旧数据库升级联系人数据库。请先删除“folders”表中的一"
- "条记录。"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:5357
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5362
- #, c-format
- msgid "Invalid query: %s"
- msgstr "无效的查询:%s"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:5532
-+#: ../addressbook/libedata-book/e-book-sqlite.c:5537
- msgid "Invalid query for EbSqlCursor"
- msgstr "无效的 EbSqlCursor 查询"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:7198
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7203
- msgid "At least one sort field must be specified to use an EbSqlCursor"
- msgstr "要使用 EbSqlCursor 至少要指定一个排序字段"
-
--#: ../addressbook/libedata-book/e-book-sqlite.c:7216
-+#: ../addressbook/libedata-book/e-book-sqlite.c:7221
- msgid "Cannot sort by a field that is not a string type"
- msgstr "无法按非字符串类型的字段排序"
-
-@@ -1316,31 +1319,35 @@ msgstr "缺少源 UID"
- msgid "No such source for UID '%s'"
- msgstr "没有 UID “%s”的源"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576
- #, c-format
- msgid "Server is unreachable (%s)"
- msgstr "服务器不可用 (%s)"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607
- #, c-format
- msgid "Failed to connect to a server using SSL: %s"
- msgstr "无法使用 SSL 连接到服务器:%s"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
- #, c-format
- msgid "Unexpected HTTP status code %d returned (%s)"
- msgstr "返回了意外的 HTTP 状态代码 %d(%s)"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637
- msgid "CalDAV backend is not loaded yet"
- msgstr "CalDAV 后端尚未加载"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079
- msgid "Invalid Redirect URL"
- msgstr "无效的重定向 URL"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882
-+#, c-format
-+msgid "Cannot create local cache folder '%s'"
-+msgstr "无法创建本地缓存文件夹“%s”"
-+
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934
- #, c-format
- msgid ""
- "Server is unreachable, calendar is opened in read-only mode.\n"
-@@ -1349,32 +1356,27 @@ msgstr ""
- "服务器不可用,日历将以只读模式打开。\n"
- "错误消息:%s"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885
--#, c-format
--msgid "Cannot create local cache folder '%s'"
--msgstr "无法创建本地缓存文件夹“%s”"
--
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968
- msgid "CalDAV does not support bulk additions"
- msgstr "CalDAV 不支持批量添加"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071
- msgid "CalDAV does not support bulk modifications"
- msgstr "CalDAV 不支持批量修改"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
- msgid "CalDAV does not support bulk removals"
- msgstr "CalDAV 不支持批量删除"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914
- msgid "Calendar doesn't support Free/Busy"
- msgstr "日历不支持空闲/繁忙"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923
- msgid "Schedule outbox url not found"
- msgstr "未找到定时发件箱 url"
-
--#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022
-+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020
- msgid "Unexpected result in schedule-response"
- msgstr "定时响应的结果异常"
-
-@@ -1401,27 +1403,27 @@ msgstr "无法保存日历数据:URI 格式错误。"
- msgid "Cannot save calendar data"
- msgstr "无法保存日历数据"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:483
-+#: ../calendar/backends/http/e-cal-backend-http.c:491
- #, c-format
- msgid "Malformed URI: %s"
- msgstr "URI 格式错误:%s"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:574
-+#: ../calendar/backends/http/e-cal-backend-http.c:582
- #, c-format
- msgid "Redirected to Invalid URI"
- msgstr "已重定向到无效 URI"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:617
-+#: ../calendar/backends/http/e-cal-backend-http.c:625
- #, c-format
- msgid "Bad file format."
- msgstr "无效的文件格式。"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:627
-+#: ../calendar/backends/http/e-cal-backend-http.c:635
- #, c-format
- msgid "Not a calendar."
- msgstr "不是日历。"
-
--#: ../calendar/backends/http/e-cal-backend-http.c:914
-+#: ../calendar/backends/http/e-cal-backend-http.c:925
- #: ../calendar/backends/weather/e-cal-backend-weather.c:536
- msgid "Could not create cache file"
- msgstr "无法创建缓存文件"
-@@ -2049,94 +2051,94 @@ msgstr "(system-flag)参数无效"
- msgid "Invalid arguments to (user-tag)"
- msgstr "(user-tag)参数无效"
-
--#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053
-+#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086
- #, c-format
- msgid "Error executing filter search: %s: %s"
- msgstr "执行过滤规则搜索错误:%s:%s"
-
--#: ../camel/camel-folder.c:300
-+#: ../camel/camel-folder.c:323
- #, c-format
- msgid "Learning new spam message in '%s'"
- msgid_plural "Learning new spam messages in '%s'"
- msgstr[0] "在“%s”中学习新的垃圾邮件"
-
--#: ../camel/camel-folder.c:340
-+#: ../camel/camel-folder.c:363
- #, c-format
- msgid "Learning new ham message in '%s'"
- msgid_plural "Learning new ham messages in '%s'"
- msgstr[0] "在“%s”中学习新的有害邮件"
-
--#: ../camel/camel-folder.c:388
-+#: ../camel/camel-folder.c:411
- #, c-format
- msgid "Filtering new message in '%s'"
- msgid_plural "Filtering new messages in '%s'"
- msgstr[0] "在“%s”中过滤新消息"
-
--#: ../camel/camel-folder.c:988
--#: ../camel/providers/local/camel-maildir-folder.c:319
-+#: ../camel/camel-folder.c:1011
-+#: ../camel/providers/local/camel-maildir-folder.c:330
- msgid "Moving messages"
- msgstr "移动消息"
-
--#: ../camel/camel-folder.c:991
-+#: ../camel/camel-folder.c:1014
- msgid "Copying messages"
- msgstr "复制消息"
-
--#: ../camel/camel-folder.c:1033
-+#: ../camel/camel-folder.c:1056
- #, c-format
- msgid "Quota information not supported for folder '%s'"
- msgstr "文件夹“%s”不支持配额信息"
-
--#: ../camel/camel-folder.c:2847
-+#: ../camel/camel-folder.c:2862
- #, c-format
- msgid "Expunging folder '%s'"
- msgstr "正在销毁文件夹“%s”"
-
--#: ../camel/camel-folder.c:2975
-+#: ../camel/camel-folder.c:2990
- #, c-format
- msgid "Retrieving message '%s' in %s"
- msgstr "正在获取 %2$s 中的消息“%1$s”"
-
--#: ../camel/camel-folder.c:3166
-+#: ../camel/camel-folder.c:3181
- #, c-format
- msgid "Retrieving quota information for '%s'"
- msgstr "正在获取“%s”的配额信息"
-
--#: ../camel/camel-folder.c:3466
-+#: ../camel/camel-folder.c:3478
- #, c-format
- msgid "Refreshing folder '%s'"
- msgstr "正在刷新文件夹“%s”"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929
-+#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941
- #, c-format
- msgid "(%s) requires a single bool result"
- msgstr "(%s) 需要一个布尔结果"
-
- #. Translators: Each '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:964
-+#: ../camel/camel-folder-search.c:976
- #, c-format
- msgid "(%s) not allowed inside %s"
- msgstr "(%s) 不允许在 %s 中使用"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979
-+#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991
- #, c-format
- msgid "(%s) requires a match type string"
- msgstr "(%s) 需要一个匹配类型字符串"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:1007
-+#: ../camel/camel-folder-search.c:1019
- #, c-format
- msgid "(%s) expects an array result"
- msgstr "(%s) 需要一个数组结果"
-
- #. Translators: The '%s' is an element type name, part of an expressing language
--#: ../camel/camel-folder-search.c:1017
-+#: ../camel/camel-folder-search.c:1029
- #, c-format
- msgid "(%s) requires the folder set"
- msgstr "(%s) 需要文件夹集"
-
--#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097
-+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
- #, c-format
- msgid ""
- "Cannot parse search expression: %s:\n"
-@@ -2145,7 +2147,7 @@ msgstr ""
- "无法解析搜索表达式:%s:\n"
- "%s"
-
--#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
-+#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121
- #, c-format
- msgid ""
- "Error executing search expression: %s:\n"
-@@ -2379,17 +2381,17 @@ msgstr "写入邮件临时文件错误:%s"
- msgid "Error copying mail temp file: %s"
- msgstr "复制邮件临时文件错误:%s"
-
--#: ../camel/camel-multipart-signed.c:279
-+#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432
- #, c-format
- msgid "No content available"
- msgstr "没有可用的内容"
-
--#: ../camel/camel-multipart-signed.c:287
-+#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440
- #, c-format
- msgid "No signature available"
- msgstr "没有可用的签名"
-
--#: ../camel/camel-multipart-signed.c:636
-+#: ../camel/camel-multipart-signed.c:806
- #, c-format
- msgid "parse error"
- msgstr "解析错误"
-@@ -2413,10 +2415,6 @@ msgstr "主机“%s”查找失败,请检查主机名是否存在拼写错误
- msgid "Host lookup '%s' failed: %s"
- msgstr "查找主机“%s”失败:%s"
-
--#: ../camel/camel-network-service.c:1009
--msgid "No host information available"
--msgstr "无可用的主机信息"
--
- #: ../camel/camel-offline-folder.c:90
- msgid "Downloading new messages for offline mode"
- msgstr "下载新消息以进行离线操作"
-@@ -2680,7 +2678,7 @@ msgid "Invalid GType registered for protocol '%s'"
- msgstr "为协议“%s”注册的 GType 无效"
-
- #: ../camel/camel-session.c:502
--#: ../camel/providers/imapx/camel-imapx-server.c:4629
-+#: ../camel/providers/imapx/camel-imapx-server.c:4719
- #: ../camel/providers/pop3/camel-pop3-store.c:311
- #: ../camel/providers/pop3/camel-pop3-store.c:757
- #: ../camel/providers/smtp/camel-smtp-transport.c:515
-@@ -2887,49 +2885,44 @@ msgstr "将数据添加到编码器失败"
- msgid "S/MIME Decrypt: No encrypted content found"
- msgstr "S/MIME 解密:没有找到加密内容"
-
--#: ../camel/camel-store.c:1201
--#, c-format
--msgid "Cannot create folder '%s': folder exists"
--msgstr "无法创建文件夹“%s”文件夹已存在"
--
--#: ../camel/camel-store.c:1244
-+#: ../camel/camel-store.c:1232
- #, c-format
- msgid "Opening folder '%s'"
- msgstr "打开文件夹“%s”"
-
--#: ../camel/camel-store.c:1471
-+#: ../camel/camel-store.c:1523
- #, c-format
- msgid "Scanning folders in '%s'"
- msgstr "扫描“%s”中的文件夹"
-
--#: ../camel/camel-store.c:1499 ../camel/camel-store.c:1544
-+#: ../camel/camel-store.c:1551 ../camel/camel-store.c:1596
- #: ../camel/camel-vtrash-folder.c:46
- msgid "Trash"
- msgstr "回收站"
-
--#: ../camel/camel-store.c:1513 ../camel/camel-store.c:1561
-+#: ../camel/camel-store.c:1565 ../camel/camel-store.c:1613
- #: ../camel/camel-vtrash-folder.c:48
- msgid "Junk"
- msgstr "垃圾"
-
--#: ../camel/camel-store.c:2162
-+#: ../camel/camel-store.c:2214
- #, c-format
- msgid "Cannot create folder: %s: folder exists"
- msgstr "无法创建文件夹:%s:文件夹已存在"
-
--#: ../camel/camel-store.c:2169
-+#: ../camel/camel-store.c:2221
- #, c-format
- msgid "Creating folder '%s'"
- msgstr "创建文件夹“%s”"
-
--#: ../camel/camel-store.c:2346 ../camel/camel-vee-store.c:416
--#: ../camel/providers/local/camel-maildir-store.c:320
-+#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410
-+#: ../camel/providers/local/camel-maildir-store.c:321
- #, c-format
- msgid "Cannot delete folder: %s: Invalid operation"
- msgstr "无法删除文件夹:%s:无效操作"
-
--#: ../camel/camel-store.c:2536 ../camel/camel-vee-store.c:467
--#: ../camel/providers/local/camel-maildir-store.c:851
-+#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461
-+#: ../camel/providers/local/camel-maildir-store.c:872
- #, c-format
- msgid "Cannot rename folder: %s: Invalid operation"
- msgstr "无法重命名文件夹:%s:无效操作"
-@@ -3002,17 +2995,17 @@ msgstr "自动更新源文件夹中的更改(_U)"
- msgid "Unmatched"
- msgstr "无匹配"
-
--#: ../camel/camel-vee-store.c:442
-+#: ../camel/camel-vee-store.c:436
- #, c-format
- msgid "Cannot delete folder: %s: No such folder"
- msgstr "无法删除文件夹:%s:没有该文件夹"
-
--#: ../camel/camel-vee-store.c:477
-+#: ../camel/camel-vee-store.c:471
- #, c-format
- msgid "Cannot rename folder: %s: No such folder"
- msgstr "无法重命名文件夹:%s:没有该文件夹"
-
--#: ../camel/camel-vee-store.c:539
-+#: ../camel/camel-vee-store.c:533
- msgid "Enable _Unmatched folder"
- msgstr "启用不匹配的文件夹(_U)"
-
-@@ -3024,45 +3017,50 @@ msgstr "无法将消息复制到回收站文件夹"
- msgid "Cannot copy messages to the Junk folder"
- msgstr "无法将消息复制到垃圾邮件文件夹"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:654
-+#: ../camel/providers/imapx/camel-imapx-folder.c:796
- #, c-format
- msgid "No quota information available for folder '%s'"
- msgstr "文件夹“%s”配额信息未定义"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:768
--#: ../camel/providers/imapx/camel-imapx-folder.c:861
-+#: ../camel/providers/imapx/camel-imapx-folder.c:936
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1029
- #, c-format
- msgid "No destination folder specified"
- msgstr "目标文件夹未指定"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:796
-+#: ../camel/providers/imapx/camel-imapx-folder.c:964
- msgid "Unable to move junk messages"
- msgstr "无法移动垃圾信息"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:889
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1057
- msgid "Unable to move deleted messages"
- msgstr "无法移动已删除信息"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1115
--#: ../camel/providers/nntp/camel-nntp-folder.c:758
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1374
-+#: ../camel/providers/nntp/camel-nntp-folder.c:760
- msgid "Apply message _filters to this folder"
- msgstr "对这个文件夹应用消息过滤器(_F)"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1221
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1485
- #, c-format
- msgid "Could not create folder summary for %s"
- msgstr "无法为 %s 创建文件夹概要"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1230
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1494
- #, c-format
- msgid "Could not create cache for %s: "
- msgstr "无法为 %s 创建缓存:"
-
--#: ../camel/providers/imapx/camel-imapx-folder.c:1415
-+#: ../camel/providers/imapx/camel-imapx-folder.c:1709
- #, c-format
- msgid "No IMAP mailbox available for folder '%s'"
- msgstr "文件夹“%s”没有可用的 IMAP 邮箱"
-
-+#: ../camel/providers/imapx/camel-imapx-input-stream.c:93
-+#, c-format
-+msgid "Source stream returned no data"
-+msgstr "源流没返回数据"
-+
- #: ../camel/providers/imapx/camel-imapx-provider.c:38
- msgid "Checking for New Mail"
- msgstr "检查新邮件"
-@@ -3084,23 +3082,33 @@ msgid "_Listen for server change notifications"
- msgstr "监听服务器变化提醒(_L)"
-
- #: ../camel/providers/imapx/camel-imapx-provider.c:49
-+#| msgid "Lost connection to IMAP server"
-+msgid "Connection to Server"
-+msgstr "到服务器的连接"
-+
-+#: ../camel/providers/imapx/camel-imapx-provider.c:51
-+#| msgid "Numbe_r of cached connections to use"
-+msgid "Numbe_r of concurrent connections to use"
-+msgstr "使用的并发连接的数目(_R)"
-+
-+#: ../camel/providers/imapx/camel-imapx-provider.c:54
- #: ../camel/providers/nntp/camel-nntp-provider.c:44
- msgid "Folders"
- msgstr "文件夹"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:51
-+#: ../camel/providers/imapx/camel-imapx-provider.c:56
- msgid "_Show only subscribed folders"
- msgstr "只显示订阅了的文件夹(_S)"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:54
-+#: ../camel/providers/imapx/camel-imapx-provider.c:59
- msgid "O_verride server-supplied folder namespace"
- msgstr "覆盖服务器提供的文件夹命名空间(_V)"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:56
-+#: ../camel/providers/imapx/camel-imapx-provider.c:61
- msgid "Namespace:"
- msgstr "命名空间:"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:59
-+#: ../camel/providers/imapx/camel-imapx-provider.c:64
- #: ../camel/providers/local/camel-local-provider.c:39
- #: ../camel/providers/local/camel-local-provider.c:79
- #: ../camel/providers/local/camel-local-provider.c:99
-@@ -3108,311 +3116,297 @@ msgstr "命名空间:"
- msgid "Options"
- msgstr "选项"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:61
-+#: ../camel/providers/imapx/camel-imapx-provider.c:66
- #: ../camel/providers/nntp/camel-nntp-provider.c:41
- msgid "Apply _filters to new messages in all folders"
- msgstr "对所有文件夹中的新消息应用过滤规则(_F)"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:63
-+#: ../camel/providers/imapx/camel-imapx-provider.c:68
- msgid "_Apply filters to new messages in Inbox on this server"
- msgstr "应用过滤规则到此服务器上收件箱中的新消息(_A)"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:65
-+#: ../camel/providers/imapx/camel-imapx-provider.c:70
- msgid "Check new messages for _Junk contents"
- msgstr "检查新消息的垃圾内容(_J)"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:67
-+#: ../camel/providers/imapx/camel-imapx-provider.c:72
- msgid "Only check for Junk messages in the IN_BOX folder"
- msgstr "仅在收件箱中检查垃圾邮件(_B)"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:69
-+#: ../camel/providers/imapx/camel-imapx-provider.c:74
- msgid "Automatically synchroni_ze remote mail locally"
- msgstr "自动将远程邮件同步到本地(_Z)"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:75
-+#: ../camel/providers/imapx/camel-imapx-provider.c:80
- msgid "Default IMAP port"
- msgstr "默认的 IMAP 端口"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:76
-+#: ../camel/providers/imapx/camel-imapx-provider.c:81
- msgid "IMAP over SSL"
- msgstr "IMAP (SSL 加密)"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:83
-+#: ../camel/providers/imapx/camel-imapx-provider.c:88
- msgid "IMAP+"
- msgstr "IMAP+"
-
--#: ../camel/providers/imapx/camel-imapx-provider.c:85
-+#: ../camel/providers/imapx/camel-imapx-provider.c:90
- msgid "For reading and storing mail on IMAP servers."
- msgstr "IMAP 服务器上的邮件的读写。"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:819
-+#: ../camel/providers/imapx/camel-imapx-server.c:1009
-+#: ../camel/providers/imapx/camel-imapx-server.c:1016
- #, c-format
- msgid "Not authenticated"
- msgstr "没有验证"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:1763
-+#: ../camel/providers/imapx/camel-imapx-server.c:1713
- msgid "Server disconnected"
- msgstr "服务器断开连接"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:2226
-+#: ../camel/providers/imapx/camel-imapx-server.c:2205
- msgid "Error writing to cache stream"
- msgstr "写入缓存流错误"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:3596
-+#: ../camel/providers/imapx/camel-imapx-server.c:3550
- msgid "Error performing IDLE"
- msgstr "执行 IDLE 命令出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4490
-+#: ../camel/providers/imapx/camel-imapx-server.c:4558
- #, c-format
- msgid "Failed to connect to IMAP server %s in secure mode: %s"
- msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4491
-+#: ../camel/providers/imapx/camel-imapx-server.c:4559
- #: ../camel/providers/smtp/camel-smtp-transport.c:215
- msgid "STARTTLS not supported"
- msgstr "不支持 STARTTLS"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4538
-+#: ../camel/providers/imapx/camel-imapx-server.c:4619
- #, c-format
- msgid "Failed to connect to IMAP server %s in secure mode: "
- msgstr "以安全模式连接到 IMAP 服务器 %s 失败:"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4618
-+#: ../camel/providers/imapx/camel-imapx-server.c:4708
- #, c-format
- msgid "IMAP server %s does not support %s authentication"
- msgstr "IMAP 服务器 %s 不支持 %s 认证"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4648
-+#: ../camel/providers/imapx/camel-imapx-server.c:4738
- #: ../camel/providers/nntp/camel-nntp-store.c:394
- #: ../camel/providers/nntp/camel-nntp-store.c:531
- msgid "Cannot authenticate without a username"
- msgstr "无法进行无用户名的认证"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4657
-+#: ../camel/providers/imapx/camel-imapx-server.c:4747
- #: ../camel/providers/nntp/camel-nntp-store.c:540
- #: ../camel/providers/pop3/camel-pop3-store.c:678
- #: ../camel/providers/pop3/camel-pop3-store.c:699
- msgid "Authentication password not available"
- msgstr "密码认证不可用"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4908
-+#: ../camel/providers/imapx/camel-imapx-server.c:4983
-+#: ../camel/providers/imapx/camel-imapx-server.c:5042
- msgid "Error fetching message"
- msgstr "取回消息出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4954
--#: ../camel/providers/imapx/camel-imapx-server.c:4961
-+#: ../camel/providers/imapx/camel-imapx-server.c:5035
- msgid "Failed to close the tmp stream"
- msgstr "无法关闭临时流"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:4996
-+#: ../camel/providers/imapx/camel-imapx-server.c:5071
- msgid "Failed to copy the tmp file"
- msgstr "无法复制临时文件"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5122
-+#: ../camel/providers/imapx/camel-imapx-server.c:5212
- msgid "Error moving messages"
- msgstr "移动消息出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5126
-+#: ../camel/providers/imapx/camel-imapx-server.c:5216
- msgid "Error copying messages"
- msgstr "复制消息出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5285
-+#: ../camel/providers/imapx/camel-imapx-server.c:5438
- msgid "Error appending message"
- msgstr "追加消息出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5479
-+#: ../camel/providers/imapx/camel-imapx-server.c:5674
- msgid "Error fetching message headers"
- msgstr "取回消息头出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5644
-+#: ../camel/providers/imapx/camel-imapx-server.c:5841
- msgid "Error retrieving message"
- msgstr "收取消息出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5774
--#: ../camel/providers/imapx/camel-imapx-server.c:5997
-+#: ../camel/providers/imapx/camel-imapx-server.c:5975
-+#: ../camel/providers/imapx/camel-imapx-server.c:6204
- #, c-format
- msgid "Fetching summary information for new messages in '%s'"
- msgstr "获取“%s”中新消息的概要信息"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5826
-+#: ../camel/providers/imapx/camel-imapx-server.c:6027
- #, c-format
- msgid "Scanning for changed messages in '%s'"
- msgstr "扫描“%s”中更改了的消息"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:5878
-+#: ../camel/providers/imapx/camel-imapx-server.c:6079
- msgid "Error fetching new messages"
- msgstr "取回新消息出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6146
-+#: ../camel/providers/imapx/camel-imapx-server.c:6352
- msgid "Error refreshing folder"
- msgstr "刷新文件夹出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6296
-+#: ../camel/providers/imapx/camel-imapx-server.c:6502
- msgid "Error expunging message"
- msgstr "销毁消息出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6405
--#: ../camel/providers/imapx/camel-imapx-server.c:6430
-+#: ../camel/providers/imapx/camel-imapx-server.c:6617
-+#: ../camel/providers/imapx/camel-imapx-server.c:6642
- msgid "Error fetching folders"
- msgstr "取回文件夹出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6510
-+#: ../camel/providers/imapx/camel-imapx-server.c:6722
- msgid "Error creating folder"
- msgstr "创建文件夹出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6562
-+#: ../camel/providers/imapx/camel-imapx-server.c:6774
- msgid "Error deleting folder"
- msgstr "删除文件夹出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6629
-+#: ../camel/providers/imapx/camel-imapx-server.c:6850
- msgid "Error renaming folder"
- msgstr "重命名文件夹出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6716
-+#: ../camel/providers/imapx/camel-imapx-server.c:6924
- msgid "Error subscribing to folder"
- msgstr "订阅文件夹出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6776
-+#: ../camel/providers/imapx/camel-imapx-server.c:6990
- msgid "Error unsubscribing from folder"
- msgstr "取消订阅文件夹出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6832
-+#: ../camel/providers/imapx/camel-imapx-server.c:7052
- msgid "Error retrieving quota information"
- msgstr "获取配额信息出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6884
-+#: ../camel/providers/imapx/camel-imapx-server.c:7104
- msgid "Search failed"
- msgstr "搜索失败"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:6946
-+#: ../camel/providers/imapx/camel-imapx-server.c:7166
- msgid "Error performing NOOP"
- msgstr "执行 NOOP 出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7053
-+#: ../camel/providers/imapx/camel-imapx-server.c:7273
- msgid "Error syncing changes"
- msgstr "同步变更出错"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:7340
--msgid "Lost connection to IMAP server"
--msgstr "与 IMAP 服务器的连接中断"
--
--#: ../camel/providers/imapx/camel-imapx-server.c:8190
-+#: ../camel/providers/imapx/camel-imapx-server.c:8258
- #, c-format
- msgid "Cannot get message with message ID %s: %s"
- msgstr "无法获取消息 ID %s:%s"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8191
-+#: ../camel/providers/imapx/camel-imapx-server.c:8259
- msgid "No such message available."
- msgstr "没有该消息。"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:8390
--#: ../camel/providers/imapx/camel-imapx-server.c:8405
-+#: ../camel/providers/imapx/camel-imapx-server.c:8466
-+#: ../camel/providers/imapx/camel-imapx-server.c:8487
- msgid "Cannot create spool file: "
- msgstr "无法创建离线文件:"
-
--#: ../camel/providers/imapx/camel-imapx-server.c:9110
-+#: ../camel/providers/imapx/camel-imapx-server.c:9228
- msgid "IMAP server does not support quotas"
- msgstr "IMAP 服务器不支持配额"
-
- #. create a dummy "." parent inbox, use to scan, then put back at the top level
--#: ../camel/providers/imapx/camel-imapx-store.c:207
--#: ../camel/providers/local/camel-maildir-folder.c:471
--#: ../camel/providers/local/camel-maildir-store.c:321
--#: ../camel/providers/local/camel-maildir-store.c:763
--#: ../camel/providers/local/camel-maildir-store.c:769
--#: ../camel/providers/local/camel-maildir-store.c:852
-+#: ../camel/providers/imapx/camel-imapx-store.c:223
-+#: ../camel/providers/local/camel-maildir-folder.c:482
-+#: ../camel/providers/local/camel-maildir-store.c:322
-+#: ../camel/providers/local/camel-maildir-store.c:784
-+#: ../camel/providers/local/camel-maildir-store.c:790
-+#: ../camel/providers/local/camel-maildir-store.c:873
- #: ../camel/providers/local/camel-spool-store.c:393
- msgid "Inbox"
- msgstr "收件箱"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:823
-+#: ../camel/providers/imapx/camel-imapx-store.c:758
- #, c-format
- msgid "IMAP server %s"
- msgstr "IMAP 服务器 %s"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:826
-+#: ../camel/providers/imapx/camel-imapx-store.c:761
- #, c-format
- msgid "IMAP service for %s on %s"
- msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1035
-+#: ../camel/providers/imapx/camel-imapx-store.c:836
- #: ../camel/providers/nntp/camel-nntp-provider.c:93
- #: ../camel/providers/pop3/camel-pop3-provider.c:81
- msgid "Password"
- msgstr "密码"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1037
-+#: ../camel/providers/imapx/camel-imapx-store.c:838
- msgid "This option will connect to the IMAP server using a plaintext password."
- msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1062
--#: ../camel/providers/imapx/camel-imapx-store.c:2600
--#: ../camel/providers/nntp/camel-nntp-store.c:1250
--#: ../camel/providers/pop3/camel-pop3-folder.c:450
--#: ../camel/providers/pop3/camel-pop3-folder.c:593
--#: ../camel/providers/pop3/camel-pop3-folder.c:789
--#: ../camel/providers/pop3/camel-pop3-folder.c:987
--#: ../camel/providers/pop3/camel-pop3-store.c:299
--#: ../camel/providers/pop3/camel-pop3-store.c:528
--#: ../camel/providers/pop3/camel-pop3-store.c:576
--#: ../camel/providers/pop3/camel-pop3-store.c:668
--#: ../camel/providers/pop3/camel-pop3-store.c:1072
--#, c-format
--msgid "You must be working online to complete this operation"
--msgstr "您必须在线工作以便完成该操作"
--
--#: ../camel/providers/imapx/camel-imapx-store.c:1129
-+#: ../camel/providers/imapx/camel-imapx-store.c:913
- #, c-format
- msgid "No such folder %s"
- msgstr "没有文件夹 %s"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1524
-+#: ../camel/providers/imapx/camel-imapx-store.c:1324
- #, c-format
- msgid "No IMAP namespace for folder path '%s'"
- msgstr "没有对应文件夹路径“%s”的 IMAP 名字空间"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:1673
-+#: ../camel/providers/imapx/camel-imapx-store.c:1472
- #, c-format
- msgid "Retrieving folder list for %s"
- msgstr "正在获取“%s”的文件夹列表"
-
--#: ../camel/providers/imapx/camel-imapx-store.c:2079
-+#: ../camel/providers/imapx/camel-imapx-store.c:1924
- #, c-format
- msgid ""
- "The folder name \"%s\" is invalid because it contains the character \"%c\""
- msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
-
--#: ../camel/providers/imapx/camel-imapx-stream.c:96
--#, c-format
--msgid "Source stream returned no data"
--msgstr "源流没返回数据"
--
--#: ../camel/providers/imapx/camel-imapx-stream.c:105
-+#: ../camel/providers/imapx/camel-imapx-store.c:2689
-+#: ../camel/providers/nntp/camel-nntp-store.c:1250
-+#: ../camel/providers/pop3/camel-pop3-folder.c:450
-+#: ../camel/providers/pop3/camel-pop3-folder.c:593
-+#: ../camel/providers/pop3/camel-pop3-folder.c:789
-+#: ../camel/providers/pop3/camel-pop3-folder.c:987
-+#: ../camel/providers/pop3/camel-pop3-store.c:299
-+#: ../camel/providers/pop3/camel-pop3-store.c:528
-+#: ../camel/providers/pop3/camel-pop3-store.c:576
-+#: ../camel/providers/pop3/camel-pop3-store.c:668
-+#: ../camel/providers/pop3/camel-pop3-store.c:1072
- #, c-format
--msgid "Source stream unavailable"
--msgstr "源流不可用"
-+msgid "You must be working online to complete this operation"
-+msgstr "您必须在线工作以便完成该操作"
-
--#: ../camel/providers/local/camel-local-folder.c:192
-+#: ../camel/providers/local/camel-local-folder.c:195
- #, c-format
- msgid "~%s (%s)"
- msgstr "~%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:202
--#: ../camel/providers/local/camel-local-folder.c:211
-+#: ../camel/providers/local/camel-local-folder.c:205
-+#: ../camel/providers/local/camel-local-folder.c:214
- #, c-format
- msgid "mailbox: %s (%s)"
- msgstr "邮件箱:%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:220
-+#: ../camel/providers/local/camel-local-folder.c:223
- #, c-format
- msgid "%s (%s)"
- msgstr "%s (%s)"
-
--#: ../camel/providers/local/camel-local-folder.c:497
-+#: ../camel/providers/local/camel-local-folder.c:500
- msgid "_Index message body data"
- msgstr "索引消息正文(_I)"
-
--#: ../camel/providers/local/camel-local-folder.c:725
-+#: ../camel/providers/local/camel-local-folder.c:730
- #, c-format
- msgid ""
- "Cannot get message %s from folder %s\n"
-@@ -3492,7 +3486,7 @@ msgstr "本地邮件文件 %s"
- #: ../camel/providers/local/camel-local-store.c:221
- #: ../camel/providers/local/camel-local-store.c:381
- #: ../camel/providers/local/camel-maildir-store.c:122
--#: ../camel/providers/local/camel-mbox-store.c:579
-+#: ../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"
-@@ -3506,7 +3500,7 @@ msgstr "存储根目录 %s 不是普通目录"
- #: ../camel/providers/local/camel-local-store.c:242
- #: ../camel/providers/local/camel-local-store.c:252
- #: ../camel/providers/local/camel-local-store.c:394
--#: ../camel/providers/local/camel-maildir-store.c:150
-+#: ../camel/providers/local/camel-maildir-store.c:156
- #, c-format
- msgid "Cannot get folder: %s: %s"
- msgstr "无法获取文件夹:%s:%s"
-@@ -3517,13 +3511,13 @@ msgid "Local stores do not have an inbox"
- msgstr "本地存储没有收件箱"
-
- #: ../camel/providers/local/camel-local-store.c:454
--#: ../camel/providers/local/camel-mbox-store.c:746
-+#: ../camel/providers/local/camel-mbox-store.c:739
- #, c-format
- msgid "Could not delete folder index file '%s': %s"
- msgstr "无法删除文件夹索引文件“%s”:%s"
-
- #: ../camel/providers/local/camel-local-store.c:482
--#: ../camel/providers/local/camel-mbox-store.c:776
-+#: ../camel/providers/local/camel-mbox-store.c:769
- #, c-format
- msgid "Could not delete folder meta file '%s': %s"
- msgstr "无法删除文件夹元文件“%s”:%s"
-@@ -3533,86 +3527,80 @@ msgstr "无法删除文件夹元文件“%s”:%s"
- msgid "Could not rename '%s': %s"
- msgstr "无法重命名“%s”:%s"
-
--#: ../camel/providers/local/camel-maildir-folder.c:98
--#: ../camel/providers/local/camel-maildir-folder.c:333
--#: ../camel/providers/local/camel-mbox-folder.c:115
--#: ../camel/providers/local/camel-mbox-folder.c:328
-+#: ../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 "没有该消息"
-
--#: ../camel/providers/local/camel-maildir-folder.c:223
-+#: ../camel/providers/local/camel-maildir-folder.c:234
- #, c-format
- msgid "Cannot append message to maildir folder: %s: "
- msgstr "无法将消息附加到邮件目录文件夹:%s:"
-
--#: ../camel/providers/local/camel-maildir-folder.c:271
--#: ../camel/providers/local/camel-maildir-folder.c:281
--#: ../camel/providers/local/camel-mbox-folder.c:389
-+#: ../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 "无法从文件夹 %2$s 获取消息 %1$s:"
-
--#: ../camel/providers/local/camel-maildir-folder.c:351
-+#: ../camel/providers/local/camel-maildir-folder.c:362
- #, c-format
- msgid "Cannot transfer message to destination folder: %s"
- msgstr "无法将消息转移到目标文件夹:%s"
-
- #: ../camel/providers/local/camel-maildir-store.c:130
--#: ../camel/providers/local/camel-maildir-store.c:860
-+#: ../camel/providers/local/camel-maildir-store.c:149
-+#: ../camel/providers/local/camel-maildir-store.c:881
- #, c-format
- msgid "Folder %s already exists"
- msgstr "文件夹 %s 已经存在"
-
--#: ../camel/providers/local/camel-maildir-store.c:235
--#: ../camel/providers/local/camel-maildir-store.c:266
-+#: ../camel/providers/local/camel-maildir-store.c:241
-+#: ../camel/providers/local/camel-maildir-store.c:272
- #: ../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 "无法创建文件夹“%s”:%s"
-
--#: ../camel/providers/local/camel-maildir-store.c:250
-+#: ../camel/providers/local/camel-maildir-store.c:256
- #: ../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 "无法获取文件夹“%s”:%s"
-
--#: ../camel/providers/local/camel-maildir-store.c:256
-+#: ../camel/providers/local/camel-maildir-store.c:262
- #: ../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 "无法获得文件夹“%s”:文件夹不存在。"
-
--#: ../camel/providers/local/camel-maildir-store.c:283
-+#: ../camel/providers/local/camel-maildir-store.c:289
- #, c-format
- msgid "Cannot get folder '%s': not a maildir directory."
- msgstr "无法获取文件夹“%s”:不是 maildir 目录。"
-
--#: ../camel/providers/local/camel-maildir-store.c:288
--#: ../camel/providers/local/camel-mbox-store.c:440
--#: ../camel/providers/local/camel-mh-store.c:565
--#, c-format
--msgid "Cannot create folder '%s': folder exists."
--msgstr "无法创建文件夹“%s”:文件夹已存在。"
--
--#: ../camel/providers/local/camel-maildir-store.c:352
--#: ../camel/providers/local/camel-maildir-store.c:392
--#: ../camel/providers/local/camel-mh-store.c:683
-+#: ../camel/providers/local/camel-maildir-store.c:353
-+#: ../camel/providers/local/camel-maildir-store.c:393
-+#: ../camel/providers/local/camel-mh-store.c:676
- #, c-format
- msgid "Could not delete folder '%s': %s"
- msgstr "无法删除文件夹“%s”:%s"
-
--#: ../camel/providers/local/camel-maildir-store.c:354
-+#: ../camel/providers/local/camel-maildir-store.c:355
- msgid "not a maildir directory"
- msgstr "不是 maildir 目录"
-
--#: ../camel/providers/local/camel-maildir-store.c:635
--#: ../camel/providers/local/camel-maildir-store.c:1074
-+#: ../camel/providers/local/camel-maildir-store.c:637
-+#: ../camel/providers/local/camel-maildir-store.c:1095
- #: ../camel/providers/local/camel-spool-store.c:212
- #: ../camel/providers/local/camel-spool-store.c:231
- #, c-format
-@@ -3633,36 +3621,36 @@ msgstr "检查文件夹一致性"
- msgid "Checking for new messages"
- msgstr "检查新消息"
-
--#: ../camel/providers/local/camel-maildir-summary.c:784
-+#: ../camel/providers/local/camel-maildir-summary.c:791
- #: ../camel/providers/local/camel-mbox-summary.c:466
--#: ../camel/providers/local/camel-mbox-summary.c:682
--#: ../camel/providers/local/camel-mbox-summary.c:831
-+#: ../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 "存储文件夹"
-
--#: ../camel/providers/local/camel-mbox-folder.c:185
-+#: ../camel/providers/local/camel-mbox-folder.c:196
- #, c-format
- msgid "Cannot open mailbox: %s: "
- msgstr "无法打开邮件箱:%s:"
-
--#: ../camel/providers/local/camel-mbox-folder.c:251
-+#: ../camel/providers/local/camel-mbox-folder.c:262
- #, c-format
- msgid "Cannot append message to mbox file: %s: "
- msgstr "无法将消息附加到邮件箱文件:%s:"
-
--#: ../camel/providers/local/camel-mbox-folder.c:381
-+#: ../camel/providers/local/camel-mbox-folder.c:392
- msgid "The folder appears to be irrecoverably corrupted."
- msgstr "文件夹好像已经被不可恢复地破坏了。"
-
--#: ../camel/providers/local/camel-mbox-folder.c:438
-+#: ../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 "无法在 %s 创建文件夹锁:%s"
-
- #: ../camel/providers/local/camel-mbox-store.c:389
--#: ../camel/providers/local/camel-mbox-store.c:587
-+#: ../camel/providers/local/camel-mbox-store.c:580
- #, c-format
- msgid "Cannot create a folder by this name."
- msgstr "无法以此名称创建文件夹。"
-@@ -3672,23 +3660,23 @@ msgstr "无法以此名称创建文件夹。"
- msgid "Cannot get folder '%s': not a regular file."
- msgstr "无法获取文件夹“%s”:不是普通文件"
-
--#: ../camel/providers/local/camel-mbox-store.c:603
-+#: ../camel/providers/local/camel-mbox-store.c:596
- #, c-format
- msgid "Cannot create directory '%s': %s."
- msgstr "无法创建目录“%s”:%s"
-
--#: ../camel/providers/local/camel-mbox-store.c:615
-+#: ../camel/providers/local/camel-mbox-store.c:608
- #, c-format
- msgid "Cannot create folder: %s: %s"
- msgstr "无法创建文件夹:%s:%s"
-
--#: ../camel/providers/local/camel-mbox-store.c:617
-+#: ../camel/providers/local/camel-mbox-store.c:610
- msgid "Folder already exists"
- msgstr "文件夹已经存在"
-
--#: ../camel/providers/local/camel-mbox-store.c:657
--#: ../camel/providers/local/camel-mbox-store.c:670
--#: ../camel/providers/local/camel-mbox-store.c:699
-+#: ../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"
-@@ -3697,33 +3685,33 @@ msgstr ""
- "无法删除文件夹“%s”:\n"
- "%s"
-
--#: ../camel/providers/local/camel-mbox-store.c:680
-+#: ../camel/providers/local/camel-mbox-store.c:673
- #, c-format
- msgid "'%s' is not a regular file."
- msgstr "“%s”并不是普通文件。"
-
--#: ../camel/providers/local/camel-mbox-store.c:689
-+#: ../camel/providers/local/camel-mbox-store.c:682
- #, c-format
- msgid "Folder '%s' is not empty. Not deleted."
- msgstr "文件夹“%s”非空。没有删除。"
-
--#: ../camel/providers/local/camel-mbox-store.c:716
--#: ../camel/providers/local/camel-mbox-store.c:731
-+#: ../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 "无法删除文件夹概要文件“%s”:%s"
-
--#: ../camel/providers/local/camel-mbox-store.c:813
-+#: ../camel/providers/local/camel-mbox-store.c:806
- #, c-format
- msgid "The new folder name is illegal."
- msgstr "指定的文件夹名称不合法。"
-
--#: ../camel/providers/local/camel-mbox-store.c:829
-+#: ../camel/providers/local/camel-mbox-store.c:822
- #, c-format
- msgid "Could not rename '%s': '%s': %s"
- msgstr "无法重命名“%s”:“%s”:%s"
-
--#: ../camel/providers/local/camel-mbox-store.c:913
-+#: ../camel/providers/local/camel-mbox-store.c:906
- #, c-format
- msgid "Could not rename '%s' to %s: %s"
- msgstr "无法将“%s”重命名为 %s:%s"
-@@ -3733,73 +3721,73 @@ msgstr "无法将“%s”重命名为 %s:%s"
- msgid "Could not open folder: %s: %s"
- msgstr "无法打开文件夹:%s:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:606
-+#: ../camel/providers/local/camel-mbox-summary.c:611
- #, c-format
- msgid "Cannot check folder: %s: %s"
- msgstr "无法检查文件夹:%s:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:695
--#: ../camel/providers/local/camel-mbox-summary.c:840
-+#: ../camel/providers/local/camel-mbox-summary.c:700
-+#: ../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 "无法打开文件:%s:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:710
-+#: ../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 "无法打开临时邮件箱:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:727
--#: ../camel/providers/local/camel-mbox-summary.c:962
-+#: ../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 "无法关闭来源文件夹 %s:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:740
-+#: ../camel/providers/local/camel-mbox-summary.c:745
- #, c-format
- msgid "Could not close temporary folder: %s"
- msgstr "无法关闭临时文件夹:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:759
-+#: ../camel/providers/local/camel-mbox-summary.c:764
- #, c-format
- msgid "Could not rename folder: %s"
- msgstr "无法重命名文件夹:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:854
--#: ../camel/providers/local/camel-mbox-summary.c:1127
-+#: ../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 "无法存储文件夹:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:893
--#: ../camel/providers/local/camel-mbox-summary.c:1167
-+#: ../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 文件损坏,请修复。(应该有 From 行,但未找到。)"
-
--#: ../camel/providers/local/camel-mbox-summary.c:903
--#: ../camel/providers/local/camel-mbox-summary.c:1179
-+#: ../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 "即使同步后,概要和文件夹仍然不匹配"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1072
-+#: ../camel/providers/local/camel-mbox-summary.c:1077
- #: ../camel/providers/local/camel-spool-summary.c:356
- #, c-format
- msgid "Unknown error: %s"
- msgstr "未知的错误:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1237
--#: ../camel/providers/local/camel-mbox-summary.c:1267
-+#: ../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 "写入临时 mailbox 失败:%s"
-
--#: ../camel/providers/local/camel-mbox-summary.c:1256
-+#: ../camel/providers/local/camel-mbox-summary.c:1261
- #, c-format
- msgid "Writing to temporary mailbox failed: %s: %s"
- msgstr "写入临时 mailbox 失败:%s:%s"
-@@ -3920,21 +3908,21 @@ msgstr ""
- "文件夹可能已损坏,副本已存放在 '%s'"
-
- #: ../camel/providers/nntp/camel-nntp-folder.c:222
--#: ../camel/providers/nntp/camel-nntp-folder.c:588
-+#: ../camel/providers/nntp/camel-nntp-folder.c:590
- #, c-format
- msgid "Internal error: UID in invalid format: %s"
- msgstr "内部错误:UID 的格式无效:%s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:291
--#: ../camel/providers/nntp/camel-nntp-folder.c:296
-+#: ../camel/providers/nntp/camel-nntp-folder.c:292
-+#: ../camel/providers/nntp/camel-nntp-folder.c:297
- #: ../camel/providers/pop3/camel-pop3-folder.c:546
- #: ../camel/providers/pop3/camel-pop3-folder.c:945
- #, c-format
- msgid "Cannot get message %s: %s"
- msgstr "无法获取消息 %s:%s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:303
--#: ../camel/providers/nntp/camel-nntp-folder.c:622
-+#: ../camel/providers/nntp/camel-nntp-folder.c:304
-+#: ../camel/providers/nntp/camel-nntp-folder.c:624
- #: ../camel/providers/pop3/camel-pop3-folder.c:476
- #: ../camel/providers/pop3/camel-pop3-folder.c:536
- #: ../camel/providers/pop3/camel-pop3-folder.c:555
-@@ -3948,16 +3936,16 @@ msgstr "无法获取消息 %s:"
- msgid "Posting failed: %s"
- msgstr "发送失败:%s"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:501
-+#: ../camel/providers/nntp/camel-nntp-folder.c:503
- msgid "Posting failed: "
- msgstr "发送失败:"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:611
-+#: ../camel/providers/nntp/camel-nntp-folder.c:613
- #, c-format
- msgid "This message is not currently available"
- msgstr "该消息目前不可用"
-
--#: ../camel/providers/nntp/camel-nntp-folder.c:720
-+#: ../camel/providers/nntp/camel-nntp-folder.c:722
- #, c-format
- msgid "You cannot copy messages from a NNTP folder"
- msgstr "您不能从 NNTP 文件夹复制信息"
-@@ -4674,8 +4662,8 @@ msgstr "(已废弃) 自动代理配置 URL"
-
- #: ../libebackend/e-authentication-mediator.c:204
- #: ../libebackend/e-authentication-mediator.c:215
--#: ../libebackend/e-authentication-mediator.c:861
--#: ../libebackend/e-authentication-mediator.c:1198
-+#: ../libebackend/e-authentication-mediator.c:860
-+#: ../libebackend/e-authentication-mediator.c:1197
- msgid "Bus name vanished (client terminated?)"
- msgstr "Bus 名称消失(客户端终止了?)"
-
-@@ -4685,8 +4673,8 @@ msgstr "客户端无响应"
-
- #: ../libebackend/e-authentication-mediator.c:333
- #: ../libebackend/e-authentication-mediator.c:344
--#: ../libebackend/e-authentication-mediator.c:855
--#: ../libebackend/e-authentication-mediator.c:1192
-+#: ../libebackend/e-authentication-mediator.c:854
-+#: ../libebackend/e-authentication-mediator.c:1191
- msgid "Client cancelled the operation"
- msgstr "客户端已取消操作"
-
-@@ -4694,11 +4682,11 @@ msgstr "客户端已取消操作"
- msgid "Client reports password was rejected"
- msgstr "客户端报告密码被拒绝"
-
--#: ../libebackend/e-authentication-session.c:568
-+#: ../libebackend/e-authentication-session.c:539
- msgid "Add this password to your keyring"
- msgstr "将该密码添加到您的密钥环"
-
--#: ../libebackend/e-authentication-session.c:673
-+#: ../libebackend/e-authentication-session.c:649
- msgid "Password was incorrect"
- msgstr "密码错误"
-
-@@ -4707,12 +4695,12 @@ msgstr "密码错误"
- msgid "%s does not support authentication"
- msgstr "%s 不支持认证"
-
--#: ../libebackend/e-collection-backend.c:900
-+#: ../libebackend/e-collection-backend.c:901
- #, c-format
- msgid "%s does not support creating remote resources"
- msgstr "%s 不支持创建远程资源"
-
--#: ../libebackend/e-collection-backend.c:959
-+#: ../libebackend/e-collection-backend.c:960
- #, c-format
- msgid "%s does not support deleting remote resources"
- msgstr "%s 不支持删除远程资源"
-@@ -4727,45 +4715,45 @@ msgstr "散列键“%s”没有对应的后端工厂"
- msgid "Data source is missing a [%s] group"
- msgstr "数据源缺少一个 [%s] 组"
-
--#: ../libebackend/e-server-side-source.c:1007
--#: ../libedataserver/e-source.c:1252
-+#: ../libebackend/e-server-side-source.c:1022
-+#: ../libedataserver/e-source.c:1394
- #, c-format
- msgid "Data source '%s' does not support creating remote resources"
- msgstr "数据源“%s”不支持创建远程资源"
-
- # collection backend,如何翻译更好?
--#: ../libebackend/e-server-side-source.c:1021
-+#: ../libebackend/e-server-side-source.c:1036
- #, c-format
- msgid ""
- "Data source '%s' has no collection backend to create the remote resource"
- msgstr "数据源“%s”没有合集后端(collection backend)来创建远程资源"
-
--#: ../libebackend/e-server-side-source.c:1049
--#: ../libedataserver/e-source.c:1365
-+#: ../libebackend/e-server-side-source.c:1064
-+#: ../libedataserver/e-source.c:1507
- #, c-format
- msgid "Data source '%s' does not support deleting remote resources"
- msgstr "数据源“%s”不支持删除远程资源"
-
--#: ../libebackend/e-server-side-source.c:1063
-+#: ../libebackend/e-server-side-source.c:1078
- #, c-format
- msgid ""
- "Data source '%s' has no collection backend to delete the remote resource"
- msgstr "数据源“%s”没有合集后端(collection backend)来删除远程资源"
-
--#: ../libebackend/e-server-side-source.c:1094
--#: ../libedataserver/e-source.c:1461
--#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
-+#: ../libebackend/e-server-side-source.c:1109
-+#: ../libedataserver/e-source.c:1603
-+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026
- #, c-format
- msgid "Data source '%s' does not support OAuth 2.0 authentication"
- msgstr "数据源“%s”不支持 OAuth 2.0 认证"
-
--#: ../libebackend/e-server-side-source.c:1439
-+#: ../libebackend/e-server-side-source.c:1456
- #, c-format
- msgid "File must have a '.source' extension"
- msgstr "文件扩展名必须为“.source”"
-
- #: ../libebackend/e-source-registry-server.c:531
--#: ../libedataserver/e-source-registry.c:1878
-+#: ../libedataserver/e-source-registry.c:1957
- msgid "The user declined to authenticate"
- msgstr "用户拒绝认证"
-
-@@ -4962,26 +4950,26 @@ msgstr "请输入任务列表“%s”的密码。"
- msgid "Please enter the password for account \"%s\"."
- msgstr "请输入帐号“%s”的密码。"
-
--#: ../libedataserver/e-source.c:669
-+#: ../libedataserver/e-source.c:768
- #, c-format
- msgid "Source file is missing a [%s] group"
- msgstr "源文件缺少一个 [%s] 组"
-
--#: ../libedataserver/e-source.c:1032
-+#: ../libedataserver/e-source.c:1174
- #, c-format
- msgid "Data source '%s' is not removable"
- msgstr "数据源“%s”不是可删除的"
-
--#: ../libedataserver/e-source.c:1155
-+#: ../libedataserver/e-source.c:1297
- #, c-format
- msgid "Data source '%s' is not writable"
- msgstr "数据源“%s”不是可写的"
-
--#: ../libedataserver/e-source.c:1768
-+#: ../libedataserver/e-source.c:1910
- msgid "Unnamed"
- msgstr "未命名"
-
--#: ../libedataserver/e-source-mail-signature.c:486
-+#: ../libedataserver/e-source-mail-signature.c:485
- #, c-format
- msgid "Signature script must be a local file"
- msgstr "签名脚本必须为本地文件"
-@@ -4991,28 +4979,28 @@ msgstr "签名脚本必须为本地文件"
- msgid "Source '%s' does not support proxy lookups"
- msgstr "数据源“%s”不支持代理查找"
-
--#: ../libedataserver/e-source-webdav.c:1551
-+#: ../libedataserver/e-source-webdav.c:1555
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
- "you wish to accept it?"
- msgstr "地址簿“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
-
--#: ../libedataserver/e-source-webdav.c:1560
-+#: ../libedataserver/e-source-webdav.c:1564
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
- "wish to accept it?"
- msgstr "日历“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
-
--#: ../libedataserver/e-source-webdav.c:1569
-+#: ../libedataserver/e-source-webdav.c:1573
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
- "you wish to accept it?"
- msgstr "备忘录“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
-
--#: ../libedataserver/e-source-webdav.c:1578
-+#: ../libedataserver/e-source-webdav.c:1582
- #, c-format
- msgid ""
- "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
-@@ -5203,25 +5191,30 @@ msgstr "无法找到帐号元素"
- msgid "Failed to find ASUrl and OABUrl in autodiscover response"
- msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl"
-
--#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1240
-+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1260
- #, c-format
- msgid ""
- "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
- "from which to obtain an access token for '%s'"
- msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐号并获取访问令牌"
-
--#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1267
-+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290
- #, c-format
- msgid "Failed to obtain an access token for '%s': "
- msgstr "无法获取“%s”的访问令牌:"
-
--#: ../modules/google-backend/module-google-backend.c:191
-+#: ../modules/google-backend/module-google-backend.c:195
- #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
- #: ../modules/yahoo-backend/module-yahoo-backend.c:199
- msgid "Calendar"
- msgstr "日历"
-
--#: ../modules/google-backend/module-google-backend.c:260
-+#: ../modules/google-backend/module-google-backend.c:268
-+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
-+msgid "Tasks"
-+msgstr "任务"
-+
-+#: ../modules/google-backend/module-google-backend.c:321
- #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
- #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
- msgid "Contacts"
-@@ -5320,7 +5313,7 @@ msgstr "邮件"
- msgid "Integrate your mailboxes"
- msgstr "集成您的邮箱"
-
--#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008
-+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1007
- #, c-format
- msgid ""
- "Cannot find a corresponding account service in the accounts database from "
-@@ -5363,10 +5356,6 @@ msgstr "Yahoo! 日历"
- msgid "Yahoo! Mail"
- msgstr "Yahoo! 邮箱"
-
--#: ../modules/yahoo-backend/module-yahoo-backend.c:226
--msgid "Tasks"
--msgstr "任务"
--
- #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
- #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
- #: ../services/evolution-user-prompter/evolution-user-prompter.c:30
-@@ -5423,6 +5412,18 @@ msgstr "不从先前版本的 Evolution 迁移用户数据"
- msgid "_Dismiss"
- msgstr "解除(_D)"
-
-+#~ msgid "No host information available"
-+#~ msgstr "无可用的主机信息"
-+
-+#~ msgid "Cannot create folder '%s': folder exists"
-+#~ msgstr "无法创建文件夹“%s”文件夹已存在"
-+
-+#~ msgid "Source stream unavailable"
-+#~ msgstr "源流不可用"
-+
-+#~ msgid "Cannot create folder '%s': folder exists."
-+#~ msgstr "无法创建文件夹“%s”:文件夹已存在。"
-+
- #~ msgid "You may not import keys with this cipher"
- #~ msgstr "您不能用此密码导入密钥"
-
-@@ -6217,9 +6218,6 @@ msgstr "解除(_D)"
- #~ msgid "Command:"
- #~ msgstr "命令:"
-
--#~ msgid "Numbe_r of cached connections to use"
--#~ msgstr "使用的缓存连接的数目(_R)"
--
- #~ msgid "Closing tmp stream failed: "
- #~ msgstr "关闭临时流失败:"
-