diff -Nru evolution-data-server-3.28.1/CMakeLists.txt evolution-data-server-3.28.2/CMakeLists.txt --- evolution-data-server-3.28.1/CMakeLists.txt 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/CMakeLists.txt 2018-05-07 08:03:27.000000000 +0000 @@ -4,7 +4,7 @@ cmake_policy(VERSION 3.1) project(evolution-data-server - VERSION 3.28.1 + VERSION 3.28.2 LANGUAGES C CXX) set(CMAKE_CXX_STANDARD 14) set(PROJECT_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server") @@ -388,11 +388,14 @@ add_printable_option(ENABLE_OAUTH2 "Enable built-in OAuth2 authentications" ON) if(ENABLE_OAUTH2) - pkg_check_modules_for_option(ENABLE_OAUTH2 "OAuth2 authentication support" OAUTH2 - webkit2gtk-4.0>=${webkit2gtk_minimum_version} + pkg_check_modules_for_option(ENABLE_OAUTH2 "OAuth2 authentication support" OAUTH2_JSON_GLIB json-glib-1.0>=${json_glib_minimum_version} ) + pkg_check_modules_for_option(ENABLE_OAUTH2 "OAuth2 authentication support" OAUTH2_WEBKIT2GTK + webkit2gtk-4.0>=${webkit2gtk_minimum_version} + ) + add_printable_variable(WITH_GOOGLE_CLIENT_ID "Google OAuth 2.0 client id" "") add_printable_variable(WITH_GOOGLE_CLIENT_SECRET "Google OAuth 2.0 client secret" "") diff -Nru evolution-data-server-3.28.1/debian/changelog evolution-data-server-3.28.2/debian/changelog --- evolution-data-server-3.28.1/debian/changelog 2018-04-11 11:00:01.000000000 +0000 +++ evolution-data-server-3.28.2/debian/changelog 2018-05-07 12:21:46.000000000 +0000 @@ -1,10 +1,8 @@ -evolution-data-server (3.28.1-1ubuntu1) bionic; urgency=medium +evolution-data-server (3.28.2-1) unstable; urgency=medium - * Sync with Debian (LP: #1758956). Remaining change: - - Add transitional evolution-data-server-online-accounts package. - This can be dropped after Ubuntu 18.04 LTS. + * New upstream release (LP: #1769637) - -- Jeremy Bicha Wed, 11 Apr 2018 07:00:01 -0400 + -- Jeremy Bicha Mon, 07 May 2018 08:21:46 -0400 evolution-data-server (3.28.1-1) unstable; urgency=medium @@ -29,20 +27,6 @@ -- Simon McVittie Tue, 03 Apr 2018 10:26:56 +0100 -evolution-data-server (3.28.0-2ubuntu2) bionic; urgency=medium - - * No change rebuild for launchpad import - - -- Sebastien Bacher Wed, 28 Mar 2018 12:00:53 +0200 - -evolution-data-server (3.28.0-2ubuntu1) bionic; urgency=medium - - * Sync with Debian (LP: #1758956). Remaining change: - - Add transitional evolution-data-server-online-accounts package. - This can be dropped after Ubuntu 18.04 LTS. - - -- Jeremy Bicha Tue, 27 Mar 2018 17:13:25 -0400 - evolution-data-server (3.28.0-2) unstable; urgency=medium [ Simon McVittie ] diff -Nru evolution-data-server-3.28.1/debian/control evolution-data-server-3.28.2/debian/control --- evolution-data-server-3.28.1/debian/control 2018-04-11 11:00:01.000000000 +0000 +++ evolution-data-server-3.28.2/debian/control 2018-05-07 12:21:46.000000000 +0000 @@ -5,8 +5,7 @@ Source: evolution-data-server Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GNOME Maintainers +Maintainer: Debian GNOME Maintainers Uploaders: Jeremy Bicha , Michael Biebl Build-Depends: cmake, debhelper (>= 11), @@ -58,8 +57,6 @@ evolution-data-server-common (>= ${source:Version}), libcamel-1.2-61 (= ${binary:Version}), gnome-keyring, -Breaks: evolution-data-server-online-accounts (<< 3.24.2-0ubuntu2~) -Replaces: evolution-data-server-online-accounts (<< 3.24.2-0ubuntu2~) Suggests: evolution Description: evolution database backend server The data server, called "Evolution Data Server" is responsible for managing @@ -489,14 +486,3 @@ . Evolution is the integrated mail, calendar, task and address book distributed suite from Novell, Inc. - -Package: evolution-data-server-online-accounts -Architecture: all -Section: oldlibs -Depends: ${misc:Depends}, - evolution-data-server, -Description: evolution database server (transitional package) - The data server, called "Evolution Data Server" is responsible for managing - mail, calendar, addressbook, tasks and memo information. - . - This is a transitional package. It can safely be removed. diff -Nru evolution-data-server-3.28.1/debian/control.in evolution-data-server-3.28.2/debian/control.in --- evolution-data-server-3.28.1/debian/control.in 2018-04-11 11:00:01.000000000 +0000 +++ evolution-data-server-3.28.2/debian/control.in 2018-05-07 12:21:46.000000000 +0000 @@ -1,8 +1,7 @@ Source: evolution-data-server Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GNOME Maintainers +Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: cmake, debhelper (>= 11), @@ -54,8 +53,6 @@ evolution-data-server-common (>= ${source:Version}), libcamel-1.2-61 (= ${binary:Version}), gnome-keyring, -Breaks: evolution-data-server-online-accounts (<< 3.24.2-0ubuntu2~) -Replaces: evolution-data-server-online-accounts (<< 3.24.2-0ubuntu2~) Suggests: evolution Description: evolution database backend server The data server, called "Evolution Data Server" is responsible for managing @@ -485,14 +482,3 @@ . Evolution is the integrated mail, calendar, task and address book distributed suite from Novell, Inc. - -Package: evolution-data-server-online-accounts -Architecture: all -Section: oldlibs -Depends: ${misc:Depends}, - evolution-data-server, -Description: evolution database server (transitional package) - The data server, called "Evolution Data Server" is responsible for managing - mail, calendar, addressbook, tasks and memo information. - . - This is a transitional package. It can safely be removed. diff -Nru evolution-data-server-3.28.1/NEWS evolution-data-server-3.28.2/NEWS --- evolution-data-server-3.28.1/NEWS 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/NEWS 2018-05-07 08:03:27.000000000 +0000 @@ -1,3 +1,23 @@ +Evolution-Data-Server 3.28.2 2018-05-07 +--------------------------------------- + +Bug Fixes: + Bug 795108 - Trailing bracket not stripped when linkifying URL inside angle brackets (Milan Crha) + Bug 791475 - Incorrectly parses headers in certain case ]I[ (Milan Crha) + Bug 795295 - Fails to compile after icu 61.1 upgrade (icu::UnicodeString) (Hussam Al-Tayeb) + Bug 795414 - Errors on delete of a detached instance (Milan Crha) + Bug 794727 - [IMAPx] False unsubscribed signal emitted when LSUB is required (Milan Crha) + +Miscellaneous: + Link WebKitGTK+ only with libedataserverui when OAuth2 is enabled (Milan Crha) + Stale connection used after resume (Milan Crha) + +Translations: + Balázs Meskó (hu) + Mario Blättermann (de) + Muhammet Kara (tr) + Kukuh Syafaat (id) + Evolution-Data-Server 3.28.1 2018-04-09 --------------------------------------- diff -Nru evolution-data-server-3.28.1/po/de.po evolution-data-server-3.28.2/po/de.po --- evolution-data-server-3.28.1/po/de.po 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/po/de.po 2018-05-07 08:03:27.000000000 +0000 @@ -18,8 +18,8 @@ "Project-Id-Version: evolution-data-server master\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution-data-server&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2018-02-23 13:33+0000\n" -"PO-Revision-Date: 2018-02-25 12:04+0100\n" +"POT-Creation-Date: 2018-04-01 15:05+0000\n" +"PO-Revision-Date: 2018-04-14 12:19+0200\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "Language: de\n" @@ -118,7 +118,7 @@ #: ../src/addressbook/libebook/e-book-client.c:3422 #: ../src/addressbook/libebook/e-book-client.c:3640 #: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877 -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:200 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:222 #: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:274 #: ../src/calendar/backends/http/e-cal-backend-http.c:204 #: ../src/calendar/libecal/e-cal.c:2334 @@ -143,8 +143,9 @@ #: ../src/calendar/libecal/e-cal-client.c:7061 #: ../src/calendar/libedata-cal/e-cal-cache.c:1742 #: ../src/camel/providers/imapx/camel-imapx-server.c:3029 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3039 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3051 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3035 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3045 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3057 #: ../src/camel/providers/nntp/camel-nntp-store.c:422 #: ../src/libebackend/e-server-side-source.c:501 #: ../src/libedataserver/e-client.c:188 @@ -155,7 +156,7 @@ msgstr "Unbekannter Fehler" #: ../src/addressbook/backends/google/e-book-backend-google.c:924 -#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1005 +#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1017 msgid "Object to save is not a valid vCard" msgstr "Zu speicherndes Objekt ist keine gültige vCard" @@ -278,7 +279,7 @@ msgid "Given URL “%s” doesn’t reference WebDAV address book" msgstr "Die angegebene Adresse »%s« referenziert kein WebDAV-Adressbuch" -#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:929 +#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:941 msgid "Received object is not a valid vCard" msgstr "Empfangenes Objekt ist keine gültige vCard" @@ -1115,7 +1116,7 @@ #: ../src/calendar/libedata-cal/e-cal-cache.c:2333 #: ../src/calendar/libedata-cal/e-cal-cache.c:2396 #: ../src/calendar/libedata-cal/e-cal-cache.c:2567 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1331 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1335 #: ../src/libebackend/e-cache.c:1385 ../src/libebackend/e-cache.c:2238 #: ../src/libebackend/e-cache.c:2278 #, c-format @@ -1142,20 +1143,20 @@ "Zeichenkette ist" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1050 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1052 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1056 #, c-format msgid "Preloaded object for UID “%s” is invalid" msgstr "Vorgeladenes Objekt für Benutzerkennung »%s« ist ungültig" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1058 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1060 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1064 #, c-format msgid "Received object for UID “%s” is invalid" msgstr "Empfangenes Objekt für Benutzerkennung »%s« ist ungültig" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1885 #: ../src/addressbook/libedata-book/e-book-meta-backend.c:2333 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3100 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3151 #, c-format msgid "Failed to create cache “%s”:" msgstr "Zwischenspeicher »%s« konnte nicht erstellt werden:" @@ -1382,12 +1383,12 @@ msgid "Alphabetic index was set for incorrect locale" msgstr "Der alphabetische Index wurde auf eine falsche Sprachumgebung gesetzt" -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:143 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:165 #, c-format msgid "Given URL “%s” doesn’t reference CalDAV calendar" msgstr "Die angegebene Adresse »%s« referenziert keinen CalDAV-Kalender" -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1579 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1616 msgid "Failed to parse response data" msgstr "Antwortdaten konnten nicht ausgewertet werden" @@ -1883,14 +1884,14 @@ msgid "Cannot add timezone with invalid component" msgstr "Zeitzone kann nicht mit ungültiger Komponente hinzugefügt werden" -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1107 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1111 #, c-format msgid "Received object for UID “%s” doesn’t contain any expected component" msgstr "" "Das empfangene Objekt für Benutzerkennung »%s« enthält keinerlei erwartete " "Komponenten" -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3896 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3955 msgid "attachment.dat" msgstr "Anlage.dat" @@ -2160,7 +2161,7 @@ msgstr[1] "Neue Nachrichten in »%s : %s« werden gefiltert" #: ../src/camel/camel-folder.c:1030 -#: ../src/camel/providers/local/camel-maildir-folder.c:330 +#: ../src/camel/providers/local/camel-maildir-folder.c:331 msgid "Moving messages" msgstr "Nachrichten werden verschoben" @@ -3339,7 +3340,7 @@ msgstr "Sie müssen online arbeiten, um diesen Vorgang abzuschließen (%s)" #: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:993 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3111 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3117 #: ../src/camel/providers/nntp/camel-nntp-store.c:351 #: ../src/camel/providers/nntp/camel-nntp-store.c:1346 #: ../src/camel/providers/nntp/camel-nntp-store.c:2158 @@ -3519,7 +3520,7 @@ #: ../src/camel/providers/imapx/camel-imapx-server.c:2793 #: ../src/camel/providers/imapx/camel-imapx-server.c:2881 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3144 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3150 msgid "Failed to get capabilities" msgstr "Ermitteln der Fähigkeiten gescheitert" @@ -3564,159 +3565,159 @@ msgid "Failed to authenticate" msgstr "Legitimierung gescheitert" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3166 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3172 msgid "Failed to issue NAMESPACE" msgstr "Fehler bei der Ausgabe von NAMESPACE" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3184 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3190 msgid "Failed to enable QResync" msgstr "Aktivieren von QResync fehlgeschlagen" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3216 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3222 msgid "Failed to issue NOTIFY" msgstr "Fehler bei der Ausgabe von NOTIFY" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3694 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3700 msgid "Failed to select mailbox" msgstr "Fehler beim Auswählen des Postfachs" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3797 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3803 msgid "Cannot issue command, no stream available" msgstr "Befehl kann nicht ausgegeben werden, kein Datenstrom vorhanden" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4061 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4067 #, c-format msgid "Cannot get message with message ID %s: %s" msgstr "Nachricht mit Kennung %s konnte nicht abgerufen werden: %s" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4062 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4068 msgid "No such message available." msgstr "Nachricht nicht verfügbar." -#: ../src/camel/providers/imapx/camel-imapx-server.c:4110 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4135 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4174 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4116 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4141 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4180 msgid "Error fetching message" msgstr "Fehler beim Abrufen der Nachricht" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4152 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4911 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4158 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4917 msgid "Error performing NOOP" msgstr "Fehler beim Ausführen von NOOP" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4167 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4173 msgid "Failed to close the tmp stream" msgstr "Temporärer Datenstrom konnte nicht geschlossen werden" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4198 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4204 msgid "Failed to copy the tmp file" msgstr "Temporäre Datei konnte nicht kopiert werden" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4434 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4440 msgid "Error moving messages" msgstr "Fehler beim Verschieben von Nachrichten" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4434 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4440 msgid "Error copying messages" msgstr "Fehler beim Kopieren von Nachrichten" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4704 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4725 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4710 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4731 msgid "Cannot create spool file: " msgstr "Spool-Datei konnte nicht angelegt werden: " -#: ../src/camel/providers/imapx/camel-imapx-server.c:4811 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4817 msgid "Error appending message" msgstr "Fehler beim Anhängen der Nachricht" #. Translators: The first “%s” is replaced with an account name and the second “%s” #. is replaced with a full path name. The spaces around “:” are intentional, as #. the whole “%s : %s” is meant as an absolute identification of the folder. -#: ../src/camel/providers/imapx/camel-imapx-server.c:5064 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5070 #, c-format msgid "Scanning for changed messages in “%s : %s”" msgstr "Geänderte Nachrichten werden in »%s : %s« gesucht" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5068 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5074 msgid "Error scanning changes" msgstr "Fehler beim Durchsuchen der Änderungen" #. Translators: The first “%s” is replaced with an account name and the second “%s” #. is replaced with a full path name. The spaces around “:” are intentional, as #. the whole “%s : %s” is meant as an absolute identification of the folder. -#: ../src/camel/providers/imapx/camel-imapx-server.c:5089 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5095 #, c-format msgid "Fetching summary information for new messages in “%s : %s”" msgstr "" "Zusammenfassende Informationen für neue Nachrichten in »%s : %s« werden " "abgerufen" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5107 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5113 msgid "Error fetching message info" msgstr "Fehler beim Abrufen der Nachrichtinfo" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5213 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5219 msgid "Error running STATUS" msgstr "Fehler beim Ausführen von STATUS" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5759 -#: ../src/camel/providers/imapx/camel-imapx-server.c:5789 -#: ../src/camel/providers/imapx/camel-imapx-server.c:5824 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5765 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5795 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5830 msgid "Error syncing changes" msgstr "Fehler beim Abgleichen der Änderungen" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5962 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5968 msgid "Error expunging message" msgstr "Fehler beim Löschen der Nachricht" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6034 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6040 msgid "Error fetching folders" msgstr "Fehler beim Abrufen der Ordner" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6045 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6051 msgid "Error fetching subscribed folders" msgstr "Fehler beim Abrufen der abonnierten Ordner" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6067 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6073 msgid "Error creating folder" msgstr "Fehler beim Anlegen des Ordners" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6123 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6129 msgid "Error deleting folder" msgstr "Fehler beim Löschen des Ordners" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6169 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6175 msgid "Error renaming folder" msgstr "Fehler beim Umbenennen des Ordners" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6201 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6207 msgid "Error subscribing to folder" msgstr "Fehler beim Abonnieren des Ordners" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6237 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6243 msgid "Error unsubscribing from folder" msgstr "Fehler beim Kündigen des Abonnement des Ordners" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6277 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6283 msgid "IMAP server does not support quotas" msgstr "IMAP-Server unterstützt keine Kontingente" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6289 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6295 msgid "Error retrieving quota information" msgstr "Fehler beim Abrufen der Kontingent-Informationen" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6352 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6358 msgid "Search failed" msgstr "Suche fehlgeschlagen" #. Blocks, until the DONE is issued or on inactivity timeout, error, ... -#: ../src/camel/providers/imapx/camel-imapx-server.c:6470 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6476 msgid "Error running IDLE" msgstr "Fehler beim Ausführen von IDLE" #. create a dummy "." parent inbox, use to scan, then put back at the top level #: ../src/camel/providers/imapx/camel-imapx-store.c:354 -#: ../src/camel/providers/local/camel-maildir-folder.c:478 +#: ../src/camel/providers/local/camel-maildir-folder.c:476 #: ../src/camel/providers/local/camel-maildir-store.c:345 #: ../src/camel/providers/local/camel-maildir-store.c:824 #: ../src/camel/providers/local/camel-maildir-store.c:830 @@ -3876,7 +3877,7 @@ #. * for folders being under $HOME. The first %s is replaced #. * with a relative path under $HOME, the second %s is #. * replaced with a protocol name, like mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:187 +#: ../src/camel/providers/local/camel-local-folder.c:190 #, c-format msgid "~%s (%s)" msgstr "~%s (%s)" @@ -3890,8 +3891,8 @@ #. * folders being under /var/mail. The first %s is replaced #. * with a relative path under /var/mail, the second %s is #. * replaced with a protocol name, like mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:197 -#: ../src/camel/providers/local/camel-local-folder.c:206 +#: ../src/camel/providers/local/camel-local-folder.c:200 +#: ../src/camel/providers/local/camel-local-folder.c:209 #, c-format msgid "mailbox: %s (%s)" msgstr "Postfach: %s (%s)" @@ -3900,19 +3901,19 @@ #. * The first %s is replaced with a folder's full path, #. * the second %s is replaced with a protocol name, like #. * mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:215 +#: ../src/camel/providers/local/camel-local-folder.c:218 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../src/camel/providers/local/camel-local-folder.c:505 +#: ../src/camel/providers/local/camel-local-folder.c:511 msgid "_Index message body data" msgstr "Rumpfdaten der Nachricht _indizieren" #. Translators: The first %s is replaced with a message ID, #. * the second %s is replaced with the folder path, #. * the third %s is replaced with a detailed error string -#: ../src/camel/providers/local/camel-local-folder.c:737 +#: ../src/camel/providers/local/camel-local-folder.c:749 #, c-format msgid "" "Cannot get message %s from folder %s\n" @@ -4040,28 +4041,28 @@ msgstr "»%s« konnte nicht umbenannt werden: %s" #: ../src/camel/providers/local/camel-maildir-folder.c:107 -#: ../src/camel/providers/local/camel-maildir-folder.c:344 -#: ../src/camel/providers/local/camel-mbox-folder.c:128 -#: ../src/camel/providers/local/camel-mbox-folder.c:336 -#: ../src/camel/providers/local/camel-mh-folder.c:157 +#: ../src/camel/providers/local/camel-maildir-folder.c:345 +#: ../src/camel/providers/local/camel-mbox-folder.c:133 +#: ../src/camel/providers/local/camel-mbox-folder.c:348 +#: ../src/camel/providers/local/camel-mh-folder.c:159 msgid "No such message" msgstr "Nachricht existiert nicht" -#: ../src/camel/providers/local/camel-maildir-folder.c:232 +#: ../src/camel/providers/local/camel-maildir-folder.c:239 #, c-format msgid "Cannot append message to maildir folder: %s: " msgstr "Nachricht konnte nicht an Maildir-Ordner angehängt werden: %s: " -#: ../src/camel/providers/local/camel-maildir-folder.c:282 -#: ../src/camel/providers/local/camel-maildir-folder.c:292 -#: ../src/camel/providers/local/camel-mbox-folder.c:395 -#: ../src/camel/providers/local/camel-mh-folder.c:169 -#: ../src/camel/providers/local/camel-mh-folder.c:179 +#: ../src/camel/providers/local/camel-maildir-folder.c:286 +#: ../src/camel/providers/local/camel-maildir-folder.c:296 +#: ../src/camel/providers/local/camel-mbox-folder.c:407 +#: ../src/camel/providers/local/camel-mh-folder.c:171 +#: ../src/camel/providers/local/camel-mh-folder.c:181 #, c-format msgid "Cannot get message %s from folder %s: " msgstr "Nachricht %s konnte nicht aus Ordner %s abgerufen werden: " -#: ../src/camel/providers/local/camel-maildir-folder.c:362 +#: ../src/camel/providers/local/camel-maildir-folder.c:363 #, c-format msgid "Cannot transfer message to destination folder: %s" msgstr "Nachricht kann nicht in den Zielordner übertragen werden: %s" @@ -4147,21 +4148,21 @@ msgid "Storing folder" msgstr "Ordner wird gespeichert" -#: ../src/camel/providers/local/camel-mbox-folder.c:194 +#: ../src/camel/providers/local/camel-mbox-folder.c:205 #, c-format msgid "Cannot open mailbox: %s: " msgstr "Postfach konnte nicht geöffnet werden: %s: " -#: ../src/camel/providers/local/camel-mbox-folder.c:257 +#: ../src/camel/providers/local/camel-mbox-folder.c:266 #, c-format msgid "Cannot append message to mbox file: %s: " msgstr "Nachricht konnte nicht an mbox-Datei angehängt werden: %s: " -#: ../src/camel/providers/local/camel-mbox-folder.c:387 +#: ../src/camel/providers/local/camel-mbox-folder.c:399 msgid "The folder appears to be irrecoverably corrupted." msgstr "Dieser Ordner scheint irreparabel beschädigt zu sein." -#: ../src/camel/providers/local/camel-mbox-folder.c:444 +#: ../src/camel/providers/local/camel-mbox-folder.c:454 #: ../src/camel/providers/local/camel-spool-folder.c:65 #, c-format msgid "Cannot create folder lock on %s: %s" @@ -4309,7 +4310,7 @@ msgid "Writing to temporary mailbox failed: %s: %s" msgstr "Fehler beim Schreiben in temporäres Postfach %s: %s" -#: ../src/camel/providers/local/camel-mh-folder.c:114 +#: ../src/camel/providers/local/camel-mh-folder.c:119 #, c-format msgid "Cannot append message to mh folder: %s: " msgstr "Nachricht konnte nicht an mh-Ordner angehängt werden: %s: " @@ -5409,7 +5410,7 @@ msgstr "Nachschlagen von Anmeldedaten gescheitert: " #: ../src/libebackend/e-server-side-source.c:1395 -#: ../src/libedataserver/e-source.c:1597 +#: ../src/libedataserver/e-source.c:1583 #, c-format msgid "Data source “%s” does not support creating remote resources" msgstr "" @@ -5424,7 +5425,7 @@ "Ressource" #: ../src/libebackend/e-server-side-source.c:1437 -#: ../src/libedataserver/e-source.c:1710 +#: ../src/libedataserver/e-source.c:1696 #, c-format msgid "Data source “%s” does not support deleting remote resources" msgstr "" @@ -5438,7 +5439,7 @@ "Datenquelle »%s« hat kein Sammel-Backend zum Löschen der entfernten Ressource" #: ../src/libebackend/e-server-side-source.c:1482 -#: ../src/libedataserver/e-source.c:1806 +#: ../src/libedataserver/e-source.c:1792 #: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080 #, c-format msgid "Data source “%s” does not support OAuth 2.0 authentication" @@ -5671,17 +5672,17 @@ msgid "Source file is missing a [%s] group" msgstr "In der Quelldatei fehlt eine [%s]-Gruppe" -#: ../src/libedataserver/e-source.c:1377 +#: ../src/libedataserver/e-source.c:1363 #, c-format msgid "Data source “%s” is not removable" msgstr "Datenquelle »%s« ist nicht entfernbar" -#: ../src/libedataserver/e-source.c:1500 +#: ../src/libedataserver/e-source.c:1486 #, c-format msgid "Data source “%s” is not writable" msgstr "Datenquelle »%s« ist schreibgeschützt" -#: ../src/libedataserver/e-source.c:2196 +#: ../src/libedataserver/e-source.c:2173 msgid "Unnamed" msgstr "Unbenannt" @@ -6595,6 +6596,10 @@ msgid "On This Computer" msgstr "Auf diesem Rechner" +#: ../src/services/evolution-source-registry/builtin/system-proxy.source.in.h:1 +msgid "Default Proxy Settings" +msgstr "Standard-Proxy-Einstellungen" + #: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1 msgid "Search Folders" msgstr "Suchordner" diff -Nru evolution-data-server-3.28.1/po/hu.po evolution-data-server-3.28.2/po/hu.po --- evolution-data-server-3.28.1/po/hu.po 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/po/hu.po 2018-05-07 08:03:27.000000000 +0000 @@ -10,15 +10,15 @@ "Project-Id-Version: evolution-data-server master\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution-data-server&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2018-02-23 13:33+0000\n" -"PO-Revision-Date: 2018-02-23 23:49+0100\n" -"Last-Translator: Balázs Úr \n" +"POT-Creation-Date: 2018-04-01 15:05+0000\n" +"PO-Revision-Date: 2018-04-11 13:33+0200\n" +"Last-Translator: Meskó Balázs \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Poedit 2.0.6\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/addressbook/backends/file/e-book-backend-file.c:120 @@ -109,7 +109,7 @@ #: ../src/addressbook/libebook/e-book-client.c:3422 #: ../src/addressbook/libebook/e-book-client.c:3640 #: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877 -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:200 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:222 #: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:274 #: ../src/calendar/backends/http/e-cal-backend-http.c:204 #: ../src/calendar/libecal/e-cal.c:2334 @@ -134,8 +134,9 @@ #: ../src/calendar/libecal/e-cal-client.c:7061 #: ../src/calendar/libedata-cal/e-cal-cache.c:1742 #: ../src/camel/providers/imapx/camel-imapx-server.c:3029 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3039 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3051 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3035 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3045 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3057 #: ../src/camel/providers/nntp/camel-nntp-store.c:422 #: ../src/libebackend/e-server-side-source.c:501 #: ../src/libedataserver/e-client.c:188 @@ -146,7 +147,7 @@ msgstr "Ismeretlen hiba" #: ../src/addressbook/backends/google/e-book-backend-google.c:924 -#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1005 +#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1017 msgid "Object to save is not a valid vCard" msgstr "A mentendő objektum nem érvényes vCard" @@ -268,7 +269,7 @@ msgid "Given URL “%s” doesn’t reference WebDAV address book" msgstr "A megadott „%s” URL nem egy WebDAV címjegyzékre hivatkozik" -#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:929 +#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:941 msgid "Received object is not a valid vCard" msgstr "A kapott objektum nem érvényes vCard" @@ -1098,7 +1099,7 @@ #: ../src/calendar/libedata-cal/e-cal-cache.c:2333 #: ../src/calendar/libedata-cal/e-cal-cache.c:2396 #: ../src/calendar/libedata-cal/e-cal-cache.c:2567 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1331 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1335 #: ../src/libebackend/e-cache.c:1385 ../src/libebackend/e-cache.c:2238 #: ../src/libebackend/e-cache.c:2278 #, c-format @@ -1121,20 +1122,20 @@ msgstr "Nem lehet nem karakterlánc típusú mező szerint rendezni" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1050 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1052 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1056 #, c-format msgid "Preloaded object for UID “%s” is invalid" msgstr "A(z) „%s” UID-hez előre betöltött objektum érvénytelen" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1058 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1060 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1064 #, c-format msgid "Received object for UID “%s” is invalid" msgstr "A(z) „%s” UID-hez kapott objektum érvénytelen" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1885 #: ../src/addressbook/libedata-book/e-book-meta-backend.c:2333 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3100 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3151 #, c-format msgid "Failed to create cache “%s”:" msgstr "Nem sikerült létrehozni a(z) „%s” gyorsítótárat:" @@ -1358,12 +1359,12 @@ msgid "Alphabetic index was set for incorrect locale" msgstr "A helytelen területi beállításhoz betűrendes index kényszerítve" -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:143 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:165 #, c-format msgid "Given URL “%s” doesn’t reference CalDAV calendar" msgstr "A megadott „%s” URL nem egy CalDAV naptárra hivatkozik" -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1579 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1616 msgid "Failed to parse response data" msgstr "A válaszadatok feldolgozása sikertelen" @@ -1855,13 +1856,13 @@ msgid "Cannot add timezone with invalid component" msgstr "Az időzóna nem vehető fel érvénytelen összetevővel" -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1107 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1111 #, c-format msgid "Received object for UID “%s” doesn’t contain any expected component" msgstr "" "A(z) „%s” UID-hez kapott objektum nem tartalmazza egyik várt összetevőt sem" -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3896 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3955 msgid "attachment.dat" msgstr "melléklet.dat" @@ -2131,7 +2132,7 @@ msgstr[1] "Új üzenetek szűrése itt: „%s : %s”" #: ../src/camel/camel-folder.c:1030 -#: ../src/camel/providers/local/camel-maildir-folder.c:330 +#: ../src/camel/providers/local/camel-maildir-folder.c:331 msgid "Moving messages" msgstr "Levelek áthelyezése" @@ -3279,7 +3280,7 @@ msgstr "A művelet befejezéséhez hálózati kapcsolattal kell rendelkeznie (%s)" #: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:993 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3111 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3117 #: ../src/camel/providers/nntp/camel-nntp-store.c:351 #: ../src/camel/providers/nntp/camel-nntp-store.c:1346 #: ../src/camel/providers/nntp/camel-nntp-store.c:2158 @@ -3461,7 +3462,7 @@ #: ../src/camel/providers/imapx/camel-imapx-server.c:2793 #: ../src/camel/providers/imapx/camel-imapx-server.c:2881 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3144 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3150 msgid "Failed to get capabilities" msgstr "Nem sikerült a képességek lekérése" @@ -3508,157 +3509,157 @@ msgid "Failed to authenticate" msgstr "Sikertelen hitelesítés" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3166 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3172 msgid "Failed to issue NAMESPACE" msgstr "Nem sikerült a NAMESPACE kiadása" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3184 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3190 msgid "Failed to enable QResync" msgstr "Nem sikerült a QResync engedélyezése" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3216 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3222 msgid "Failed to issue NOTIFY" msgstr "Nem sikerült a NOTIFY kiadása" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3694 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3700 msgid "Failed to select mailbox" msgstr "Nem sikerült a postafiók kiválasztása" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3797 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3803 msgid "Cannot issue command, no stream available" msgstr "Nem adható ki parancs, nem érhető el folyam" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4061 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4067 #, c-format msgid "Cannot get message with message ID %s: %s" msgstr "Nem lehet letölteni a(z) %s azonosítójú levelet: %s" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4062 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4068 msgid "No such message available." msgstr "Nincs ilyen üzenet." -#: ../src/camel/providers/imapx/camel-imapx-server.c:4110 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4135 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4174 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4116 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4141 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4180 msgid "Error fetching message" msgstr "Hiba a levél lekérésekor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4152 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4911 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4158 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4917 msgid "Error performing NOOP" msgstr "Hiba a NOOP végrehajtásakor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4167 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4173 msgid "Failed to close the tmp stream" msgstr "Az ideiglenes adatfolyam lezárása meghiúsult" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4198 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4204 msgid "Failed to copy the tmp file" msgstr "Az ideiglenes fájl másolása meghiúsult" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4434 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4440 msgid "Error moving messages" msgstr "Hiba az üzenetek mozgatásakor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4434 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4440 msgid "Error copying messages" msgstr "Hiba a levelek másolásakor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4704 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4725 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4710 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4731 msgid "Cannot create spool file: " msgstr "Nem lehet létrehozni a várólistafájlt: " -#: ../src/camel/providers/imapx/camel-imapx-server.c:4811 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4817 msgid "Error appending message" msgstr "Hiba az üzenet hozzáfűzésekor" #. Translators: The first “%s” is replaced with an account name and the second “%s” #. is replaced with a full path name. The spaces around “:” are intentional, as #. the whole “%s : %s” is meant as an absolute identification of the folder. -#: ../src/camel/providers/imapx/camel-imapx-server.c:5064 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5070 #, c-format msgid "Scanning for changed messages in “%s : %s”" msgstr "Megváltozott levelek keresése ebben: „%s : %s”" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5068 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5074 msgid "Error scanning changes" msgstr "Hiba a változások beolvasásakor" #. Translators: The first “%s” is replaced with an account name and the second “%s” #. is replaced with a full path name. The spaces around “:” are intentional, as #. the whole “%s : %s” is meant as an absolute identification of the folder. -#: ../src/camel/providers/imapx/camel-imapx-server.c:5089 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5095 #, c-format msgid "Fetching summary information for new messages in “%s : %s”" msgstr "Összefoglaló adatok letöltése az új levelekhez ebben: „%s : %s”" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5107 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5113 msgid "Error fetching message info" msgstr "Hiba a levél információinak lekérésekor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5213 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5219 msgid "Error running STATUS" msgstr "Hiba a STATUS futtatásakor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5759 -#: ../src/camel/providers/imapx/camel-imapx-server.c:5789 -#: ../src/camel/providers/imapx/camel-imapx-server.c:5824 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5765 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5795 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5830 msgid "Error syncing changes" msgstr "Hiba a változások szinkronizálásakor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5962 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5968 msgid "Error expunging message" msgstr "Hiba a levél törlésekor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6034 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6040 msgid "Error fetching folders" msgstr "Hiba a mappák lekérésekor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6045 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6051 msgid "Error fetching subscribed folders" msgstr "Hiba a feliratkozott mappák lekérésekor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6067 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6073 msgid "Error creating folder" msgstr "Hiba a mappa létrehozásakor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6123 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6129 msgid "Error deleting folder" msgstr "Hiba a mappa törlésekor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6169 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6175 msgid "Error renaming folder" msgstr "Hiba a mappa átnevezésekor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6201 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6207 msgid "Error subscribing to folder" msgstr "Hiba a mappára feliratkozáskor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6237 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6243 msgid "Error unsubscribing from folder" msgstr "Hiba a mappáról leiratkozáskor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6277 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6283 msgid "IMAP server does not support quotas" msgstr "Az IMAP kiszolgáló nem támogatja a kvótákat" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6289 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6295 msgid "Error retrieving quota information" msgstr "Hiba a kvótainformációk lekérésekor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6352 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6358 msgid "Search failed" msgstr "A keresés sikertelen" #. Blocks, until the DONE is issued or on inactivity timeout, error, ... -#: ../src/camel/providers/imapx/camel-imapx-server.c:6470 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6476 msgid "Error running IDLE" msgstr "Hiba az IDLE futtatásakor" #. create a dummy "." parent inbox, use to scan, then put back at the top level #: ../src/camel/providers/imapx/camel-imapx-store.c:354 -#: ../src/camel/providers/local/camel-maildir-folder.c:478 +#: ../src/camel/providers/local/camel-maildir-folder.c:476 #: ../src/camel/providers/local/camel-maildir-store.c:345 #: ../src/camel/providers/local/camel-maildir-store.c:824 #: ../src/camel/providers/local/camel-maildir-store.c:830 @@ -3818,7 +3819,7 @@ #. * for folders being under $HOME. The first %s is replaced #. * with a relative path under $HOME, the second %s is #. * replaced with a protocol name, like mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:187 +#: ../src/camel/providers/local/camel-local-folder.c:190 #, c-format msgid "~%s (%s)" msgstr "~%s (%s)" @@ -3832,8 +3833,8 @@ #. * folders being under /var/mail. The first %s is replaced #. * with a relative path under /var/mail, the second %s is #. * replaced with a protocol name, like mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:197 -#: ../src/camel/providers/local/camel-local-folder.c:206 +#: ../src/camel/providers/local/camel-local-folder.c:200 +#: ../src/camel/providers/local/camel-local-folder.c:209 #, c-format msgid "mailbox: %s (%s)" msgstr "postafiók: %s (%s)" @@ -3842,19 +3843,19 @@ #. * The first %s is replaced with a folder's full path, #. * the second %s is replaced with a protocol name, like #. * mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:215 +#: ../src/camel/providers/local/camel-local-folder.c:218 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../src/camel/providers/local/camel-local-folder.c:505 +#: ../src/camel/providers/local/camel-local-folder.c:511 msgid "_Index message body data" msgstr "_Levéltörzs adatainak indexelése" #. Translators: The first %s is replaced with a message ID, #. * the second %s is replaced with the folder path, #. * the third %s is replaced with a detailed error string -#: ../src/camel/providers/local/camel-local-folder.c:737 +#: ../src/camel/providers/local/camel-local-folder.c:749 #, c-format msgid "" "Cannot get message %s from folder %s\n" @@ -3981,28 +3982,28 @@ msgstr "Az átnevezés nem sikerült „%s”: %s" #: ../src/camel/providers/local/camel-maildir-folder.c:107 -#: ../src/camel/providers/local/camel-maildir-folder.c:344 -#: ../src/camel/providers/local/camel-mbox-folder.c:128 -#: ../src/camel/providers/local/camel-mbox-folder.c:336 -#: ../src/camel/providers/local/camel-mh-folder.c:157 +#: ../src/camel/providers/local/camel-maildir-folder.c:345 +#: ../src/camel/providers/local/camel-mbox-folder.c:133 +#: ../src/camel/providers/local/camel-mbox-folder.c:348 +#: ../src/camel/providers/local/camel-mh-folder.c:159 msgid "No such message" msgstr "Nincs ilyen üzenet" -#: ../src/camel/providers/local/camel-maildir-folder.c:232 +#: ../src/camel/providers/local/camel-maildir-folder.c:239 #, c-format msgid "Cannot append message to maildir folder: %s: " msgstr "Nem lehet a levelet a maildir mappához fűzni: %s: " -#: ../src/camel/providers/local/camel-maildir-folder.c:282 -#: ../src/camel/providers/local/camel-maildir-folder.c:292 -#: ../src/camel/providers/local/camel-mbox-folder.c:395 -#: ../src/camel/providers/local/camel-mh-folder.c:169 -#: ../src/camel/providers/local/camel-mh-folder.c:179 +#: ../src/camel/providers/local/camel-maildir-folder.c:286 +#: ../src/camel/providers/local/camel-maildir-folder.c:296 +#: ../src/camel/providers/local/camel-mbox-folder.c:407 +#: ../src/camel/providers/local/camel-mh-folder.c:171 +#: ../src/camel/providers/local/camel-mh-folder.c:181 #, c-format msgid "Cannot get message %s from folder %s: " msgstr "Nem sikerült betölteni a(z) %s levelet a(z) %s mappából: " -#: ../src/camel/providers/local/camel-maildir-folder.c:362 +#: ../src/camel/providers/local/camel-maildir-folder.c:363 #, c-format msgid "Cannot transfer message to destination folder: %s" msgstr "Nem lehet átvinni az üzenetet a cél mappába: %s" @@ -4088,21 +4089,21 @@ msgid "Storing folder" msgstr "Mappa tárolása" -#: ../src/camel/providers/local/camel-mbox-folder.c:194 +#: ../src/camel/providers/local/camel-mbox-folder.c:205 #, c-format msgid "Cannot open mailbox: %s: " msgstr "Nem lehet megnyitni a postafiókot: %s: " -#: ../src/camel/providers/local/camel-mbox-folder.c:257 +#: ../src/camel/providers/local/camel-mbox-folder.c:266 #, c-format msgid "Cannot append message to mbox file: %s: " msgstr "Nem sikerült a levelet az mbox fájlhoz hozzáfűzni: %s: " -#: ../src/camel/providers/local/camel-mbox-folder.c:387 +#: ../src/camel/providers/local/camel-mbox-folder.c:399 msgid "The folder appears to be irrecoverably corrupted." msgstr "A mappa javíthatatlanul sérültnek néz ki." -#: ../src/camel/providers/local/camel-mbox-folder.c:444 +#: ../src/camel/providers/local/camel-mbox-folder.c:454 #: ../src/camel/providers/local/camel-spool-folder.c:65 #, c-format msgid "Cannot create folder lock on %s: %s" @@ -4246,7 +4247,7 @@ msgid "Writing to temporary mailbox failed: %s: %s" msgstr "Az írás meghiúsult az ideiglenes postafiókba: %s: %s" -#: ../src/camel/providers/local/camel-mh-folder.c:114 +#: ../src/camel/providers/local/camel-mh-folder.c:119 #, c-format msgid "Cannot append message to mh folder: %s: " msgstr "Nem lehet a levelet az mh mappához fűzni: %s: " @@ -5329,7 +5330,7 @@ msgstr "Nem sikerült a hitelesítési adatok keresése: " #: ../src/libebackend/e-server-side-source.c:1395 -#: ../src/libedataserver/e-source.c:1597 +#: ../src/libedataserver/e-source.c:1583 #, c-format msgid "Data source “%s” does not support creating remote resources" msgstr "A(z) „%s” adatforrás nem támogatja távoli erőforrások létrehozását" @@ -5343,7 +5344,7 @@ "erőforrás létrehozásához" #: ../src/libebackend/e-server-side-source.c:1437 -#: ../src/libedataserver/e-source.c:1710 +#: ../src/libedataserver/e-source.c:1696 #, c-format msgid "Data source “%s” does not support deleting remote resources" msgstr "A(z) „%s” adatforrás nem támogatja távoli erőforrások törlését" @@ -5357,7 +5358,7 @@ "erőforrás törléséhez" #: ../src/libebackend/e-server-side-source.c:1482 -#: ../src/libedataserver/e-source.c:1806 +#: ../src/libedataserver/e-source.c:1792 #: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080 #, c-format msgid "Data source “%s” does not support OAuth 2.0 authentication" @@ -5591,17 +5592,17 @@ msgid "Source file is missing a [%s] group" msgstr "A forrásfájlból hiányzik egy [%s] csoport" -#: ../src/libedataserver/e-source.c:1377 +#: ../src/libedataserver/e-source.c:1363 #, c-format msgid "Data source “%s” is not removable" msgstr "A(z) „%s” adatforrás nem távolítható el" -#: ../src/libedataserver/e-source.c:1500 +#: ../src/libedataserver/e-source.c:1486 #, c-format msgid "Data source “%s” is not writable" msgstr "A(z) „%s” adatforrás nem írható" -#: ../src/libedataserver/e-source.c:2196 +#: ../src/libedataserver/e-source.c:2173 msgid "Unnamed" msgstr "Névtelen" @@ -6510,6 +6511,10 @@ msgid "On This Computer" msgstr "Ezen a számítógépen" +#: ../src/services/evolution-source-registry/builtin/system-proxy.source.in.h:1 +msgid "Default Proxy Settings" +msgstr "Alapértelmezett proxybeállítások" + #: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1 msgid "Search Folders" msgstr "Keresés mappákban" @@ -6738,4 +6743,3 @@ #, c-format msgid "No sources had been found\n" msgstr "Nem találhatók források\n" - diff -Nru evolution-data-server-3.28.1/po/id.po evolution-data-server-3.28.2/po/id.po --- evolution-data-server-3.28.1/po/id.po 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/po/id.po 2018-05-07 08:03:27.000000000 +0000 @@ -12,8 +12,8 @@ "Project-Id-Version: evolution-data-server master\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution-data-server&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2018-02-27 14:01+0000\n" -"PO-Revision-Date: 2018-02-28 17:05+0700\n" +"POT-Creation-Date: 2018-04-01 15:05+0000\n" +"PO-Revision-Date: 2018-04-09 13:31+0700\n" "Last-Translator: Kukuh Syafaat \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -136,8 +136,9 @@ #: ../src/calendar/libecal/e-cal-client.c:7061 #: ../src/calendar/libedata-cal/e-cal-cache.c:1742 #: ../src/camel/providers/imapx/camel-imapx-server.c:3029 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3039 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3051 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3035 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3045 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3057 #: ../src/camel/providers/nntp/camel-nntp-store.c:422 #: ../src/libebackend/e-server-side-source.c:501 #: ../src/libedataserver/e-client.c:188 @@ -148,7 +149,7 @@ msgstr "Kesalahan tidak dikenal" #: ../src/addressbook/backends/google/e-book-backend-google.c:924 -#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1005 +#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1017 msgid "Object to save is not a valid vCard" msgstr "Objek yang akan disimpan bukan vCard yang valid" @@ -270,7 +271,7 @@ msgid "Given URL “%s” doesn’t reference WebDAV address book" msgstr "URL yang diberikan \"%s\" tidak mengacu pada buku alamat WebDAV" -#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:929 +#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:941 msgid "Received object is not a valid vCard" msgstr "Objek yang diterima bukan vCard yang valid" @@ -1103,7 +1104,7 @@ #: ../src/calendar/libedata-cal/e-cal-cache.c:2333 #: ../src/calendar/libedata-cal/e-cal-cache.c:2396 #: ../src/calendar/libedata-cal/e-cal-cache.c:2567 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1331 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1335 #: ../src/libebackend/e-cache.c:1385 ../src/libebackend/e-cache.c:2238 #: ../src/libebackend/e-cache.c:2278 #, c-format @@ -1127,20 +1128,20 @@ msgstr "Tak bisa mengurut berdasarkan ruas yang bukan bertipe string" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1050 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1052 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1056 #, c-format msgid "Preloaded object for UID “%s” is invalid" msgstr "Objek pramuat untuk UID \"%s\" tidak valid" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1058 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1060 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1064 #, c-format msgid "Received object for UID “%s” is invalid" msgstr "Objek yang diterima untuk UID \"%s\" tidak valid" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1885 #: ../src/addressbook/libedata-book/e-book-meta-backend.c:2333 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3100 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3151 #, c-format msgid "Failed to create cache “%s”:" msgstr "Gagal membuat singgahan \"%s\":" @@ -1370,7 +1371,7 @@ msgid "Given URL “%s” doesn’t reference CalDAV calendar" msgstr "URL yang diberikan \"%s\" tidak mengacu pada kalender CalDAV" -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1605 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1616 msgid "Failed to parse response data" msgstr "Gagal mengurai data tanggapan" @@ -1864,14 +1865,14 @@ msgid "Cannot add timezone with invalid component" msgstr "Tidak dapat menambah zona waktu dengan komponen yang tidak valid" -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1107 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1111 #, c-format msgid "Received object for UID “%s” doesn’t contain any expected component" msgstr "" "Objek yang diterima untuk UID \"%s\" tidak mengandung komponen yang " "diharapkan" -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3896 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3955 msgid "attachment.dat" msgstr "attachment.dat" @@ -2138,7 +2139,7 @@ msgstr[0] "Menyaring pesan baru dalam \"%s : %s\"" #: ../src/camel/camel-folder.c:1030 -#: ../src/camel/providers/local/camel-maildir-folder.c:330 +#: ../src/camel/providers/local/camel-maildir-folder.c:331 msgid "Moving messages" msgstr "Memindahkan pesan" @@ -3270,7 +3271,7 @@ msgstr "Anda mesti daring untuk menuntaskan operasi ini (%s)" #: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:993 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3111 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3117 #: ../src/camel/providers/nntp/camel-nntp-store.c:351 #: ../src/camel/providers/nntp/camel-nntp-store.c:1346 #: ../src/camel/providers/nntp/camel-nntp-store.c:2158 @@ -3451,7 +3452,7 @@ #: ../src/camel/providers/imapx/camel-imapx-server.c:2793 #: ../src/camel/providers/imapx/camel-imapx-server.c:2881 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3144 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3150 msgid "Failed to get capabilities" msgstr "Gagal memperoleh kapabilitas" @@ -3496,157 +3497,157 @@ msgid "Failed to authenticate" msgstr "Gagal mengotentikasi" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3166 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3172 msgid "Failed to issue NAMESPACE" msgstr "Gagal menerbitkan NAMESPACE" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3184 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3190 msgid "Failed to enable QResync" msgstr "Gagal memfungsikan QResync" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3216 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3222 msgid "Failed to issue NOTIFY" msgstr "Gagal menerbitkan NOTIFY" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3694 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3700 msgid "Failed to select mailbox" msgstr "Gagal memilih kotak surat" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3797 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3803 msgid "Cannot issue command, no stream available" msgstr "Tak bisa menerbitkan perintah, tak ada stream yang tersedia" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4061 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4067 #, c-format msgid "Cannot get message with message ID %s: %s" msgstr "Tidak dapat memperoleh pesan dengan ID %s: %s" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4062 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4068 msgid "No such message available." msgstr "Tidak ada pesan yang tersedia." -#: ../src/camel/providers/imapx/camel-imapx-server.c:4110 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4135 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4174 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4116 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4141 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4180 msgid "Error fetching message" msgstr "Galat saat mengambil pesan" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4152 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4911 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4158 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4917 msgid "Error performing NOOP" msgstr "Galat saat melaksanakan NOOP" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4167 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4173 msgid "Failed to close the tmp stream" msgstr "Gagal menutup stream tmp" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4198 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4204 msgid "Failed to copy the tmp file" msgstr "Galat menyalin berkas tmp" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4434 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4440 msgid "Error moving messages" msgstr "Galat saat memindah pesan" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4434 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4440 msgid "Error copying messages" msgstr "Galat saat menyalin pesan" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4704 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4725 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4710 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4731 msgid "Cannot create spool file: " msgstr "Tidak bisa membuat berkas spool: " -#: ../src/camel/providers/imapx/camel-imapx-server.c:4811 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4817 msgid "Error appending message" msgstr "Galat saat menambahkan pesan di belakang" #. Translators: The first “%s” is replaced with an account name and the second “%s” #. is replaced with a full path name. The spaces around “:” are intentional, as #. the whole “%s : %s” is meant as an absolute identification of the folder. -#: ../src/camel/providers/imapx/camel-imapx-server.c:5064 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5070 #, c-format msgid "Scanning for changed messages in “%s : %s”" msgstr "Memindai pesan-pesan yang berubah dalam \"%s : %s\"" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5068 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5074 msgid "Error scanning changes" msgstr "Galat saat memindai perubahan" #. Translators: The first “%s” is replaced with an account name and the second “%s” #. is replaced with a full path name. The spaces around “:” are intentional, as #. the whole “%s : %s” is meant as an absolute identification of the folder. -#: ../src/camel/providers/imapx/camel-imapx-server.c:5089 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5095 #, c-format msgid "Fetching summary information for new messages in “%s : %s”" msgstr "Mengambil ringkasan informasi untuk pesan baru dalam \"%s : %s\"" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5107 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5113 msgid "Error fetching message info" msgstr "Galat saat mengambil info pesan" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5213 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5219 msgid "Error running STATUS" msgstr "Galat saat menjalankan STATUS" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5759 -#: ../src/camel/providers/imapx/camel-imapx-server.c:5789 -#: ../src/camel/providers/imapx/camel-imapx-server.c:5824 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5765 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5795 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5830 msgid "Error syncing changes" msgstr "Galat saat menyelaraskan perubahan" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5962 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5968 msgid "Error expunging message" msgstr "Galat saat menghapus pesan-pesan lama" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6034 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6040 msgid "Error fetching folders" msgstr "Galat saat mengambil folder" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6045 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6051 msgid "Error fetching subscribed folders" msgstr "Galat saat mengambil folder yang dilanggani" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6067 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6073 msgid "Error creating folder" msgstr "Galat saat membuat folder" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6123 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6129 msgid "Error deleting folder" msgstr "Galat saat menghapus folder" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6169 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6175 msgid "Error renaming folder" msgstr "Galat saat mengubah nama folder" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6201 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6207 msgid "Error subscribing to folder" msgstr "Galat saat berlangganan ke folder" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6237 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6243 msgid "Error unsubscribing from folder" msgstr "Galat saat berhenti langganan dari folder" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6277 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6283 msgid "IMAP server does not support quotas" msgstr "Server IMAP tidak mendukung kuota" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6289 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6295 msgid "Error retrieving quota information" msgstr "Galat saat mengambil informasi kuota" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6352 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6358 msgid "Search failed" msgstr "Pencarian gagal" #. Blocks, until the DONE is issued or on inactivity timeout, error, ... -#: ../src/camel/providers/imapx/camel-imapx-server.c:6470 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6476 msgid "Error running IDLE" msgstr "Galat saat menjalankan IDLE" #. create a dummy "." parent inbox, use to scan, then put back at the top level #: ../src/camel/providers/imapx/camel-imapx-store.c:354 -#: ../src/camel/providers/local/camel-maildir-folder.c:478 +#: ../src/camel/providers/local/camel-maildir-folder.c:476 #: ../src/camel/providers/local/camel-maildir-store.c:345 #: ../src/camel/providers/local/camel-maildir-store.c:824 #: ../src/camel/providers/local/camel-maildir-store.c:830 @@ -3805,7 +3806,7 @@ #. * for folders being under $HOME. The first %s is replaced #. * with a relative path under $HOME, the second %s is #. * replaced with a protocol name, like mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:187 +#: ../src/camel/providers/local/camel-local-folder.c:190 #, c-format msgid "~%s (%s)" msgstr "~%s (%s)" @@ -3819,8 +3820,8 @@ #. * folders being under /var/mail. The first %s is replaced #. * with a relative path under /var/mail, the second %s is #. * replaced with a protocol name, like mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:197 -#: ../src/camel/providers/local/camel-local-folder.c:206 +#: ../src/camel/providers/local/camel-local-folder.c:200 +#: ../src/camel/providers/local/camel-local-folder.c:209 #, c-format msgid "mailbox: %s (%s)" msgstr "kotak surat: %s (%s)" @@ -3829,19 +3830,19 @@ #. * The first %s is replaced with a folder's full path, #. * the second %s is replaced with a protocol name, like #. * mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:215 +#: ../src/camel/providers/local/camel-local-folder.c:218 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../src/camel/providers/local/camel-local-folder.c:505 +#: ../src/camel/providers/local/camel-local-folder.c:511 msgid "_Index message body data" msgstr "_Indeks data isi pesan" #. Translators: The first %s is replaced with a message ID, #. * the second %s is replaced with the folder path, #. * the third %s is replaced with a detailed error string -#: ../src/camel/providers/local/camel-local-folder.c:737 +#: ../src/camel/providers/local/camel-local-folder.c:749 #, c-format msgid "" "Cannot get message %s from folder %s\n" @@ -3968,28 +3969,28 @@ msgstr "Tidak bisa mengubah nama \"%s\": %s" #: ../src/camel/providers/local/camel-maildir-folder.c:107 -#: ../src/camel/providers/local/camel-maildir-folder.c:344 -#: ../src/camel/providers/local/camel-mbox-folder.c:128 -#: ../src/camel/providers/local/camel-mbox-folder.c:336 -#: ../src/camel/providers/local/camel-mh-folder.c:157 +#: ../src/camel/providers/local/camel-maildir-folder.c:345 +#: ../src/camel/providers/local/camel-mbox-folder.c:133 +#: ../src/camel/providers/local/camel-mbox-folder.c:348 +#: ../src/camel/providers/local/camel-mh-folder.c:159 msgid "No such message" msgstr "Tidak ada pesan semacam itu" -#: ../src/camel/providers/local/camel-maildir-folder.c:232 +#: ../src/camel/providers/local/camel-maildir-folder.c:239 #, c-format msgid "Cannot append message to maildir folder: %s: " msgstr "Tidak dapat menambahkan pesan ke folder maildir: %s: " -#: ../src/camel/providers/local/camel-maildir-folder.c:282 -#: ../src/camel/providers/local/camel-maildir-folder.c:292 -#: ../src/camel/providers/local/camel-mbox-folder.c:395 -#: ../src/camel/providers/local/camel-mh-folder.c:169 -#: ../src/camel/providers/local/camel-mh-folder.c:179 +#: ../src/camel/providers/local/camel-maildir-folder.c:286 +#: ../src/camel/providers/local/camel-maildir-folder.c:296 +#: ../src/camel/providers/local/camel-mbox-folder.c:407 +#: ../src/camel/providers/local/camel-mh-folder.c:171 +#: ../src/camel/providers/local/camel-mh-folder.c:181 #, c-format msgid "Cannot get message %s from folder %s: " msgstr "Tidak dapat memperoleh pesan %s dari folder %s: " -#: ../src/camel/providers/local/camel-maildir-folder.c:362 +#: ../src/camel/providers/local/camel-maildir-folder.c:363 #, c-format msgid "Cannot transfer message to destination folder: %s" msgstr "Tidak dapat mengirim pesan menuju folder tujuan: %s" @@ -4075,21 +4076,21 @@ msgid "Storing folder" msgstr "Menyimpan folder" -#: ../src/camel/providers/local/camel-mbox-folder.c:194 +#: ../src/camel/providers/local/camel-mbox-folder.c:205 #, c-format msgid "Cannot open mailbox: %s: " msgstr "Tidak dapat membuka mailbox: %s: " -#: ../src/camel/providers/local/camel-mbox-folder.c:257 +#: ../src/camel/providers/local/camel-mbox-folder.c:266 #, c-format msgid "Cannot append message to mbox file: %s: " msgstr "Tidak dapat menambahkan pesan pada berkas mbox: %s: " -#: ../src/camel/providers/local/camel-mbox-folder.c:387 +#: ../src/camel/providers/local/camel-mbox-folder.c:399 msgid "The folder appears to be irrecoverably corrupted." msgstr "Folder tampaknya tidak bisa diperbaiki." -#: ../src/camel/providers/local/camel-mbox-folder.c:444 +#: ../src/camel/providers/local/camel-mbox-folder.c:454 #: ../src/camel/providers/local/camel-spool-folder.c:65 #, c-format msgid "Cannot create folder lock on %s: %s" @@ -4235,7 +4236,7 @@ msgid "Writing to temporary mailbox failed: %s: %s" msgstr "Gagal menulis ke mailbox sementara: %s: %s" -#: ../src/camel/providers/local/camel-mh-folder.c:114 +#: ../src/camel/providers/local/camel-mh-folder.c:119 #, c-format msgid "Cannot append message to mh folder: %s: " msgstr "Tidak dapat menambahkan pesan pada folder mh: %s: " @@ -6490,6 +6491,10 @@ msgid "On This Computer" msgstr "Pada Komputer Ini" +#: ../src/services/evolution-source-registry/builtin/system-proxy.source.in.h:1 +msgid "Default Proxy Settings" +msgstr "Pengaturan Proksi Bawaan" + #: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1 msgid "Search Folders" msgstr "Cari Folder" diff -Nru evolution-data-server-3.28.1/po/tr.po evolution-data-server-3.28.2/po/tr.po --- evolution-data-server-3.28.1/po/tr.po 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/po/tr.po 2018-05-07 08:03:27.000000000 +0000 @@ -7,17 +7,17 @@ # İşbaran Akçayır , 2015. # Hanifi Çakmak , 2017. # Emin Tufan Çetin , 2017, 2018. -# Muhammet Kara , 2011, 2014, 2015, 2017, 2018. +# Muhammet Kara , 2011, 2014, 2015, 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: evolution-data-server.HEAD.tr\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution-data-server&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2018-02-25 15:51+0000\n" -"PO-Revision-Date: 2018-02-25 18:53+0300\n" -"Last-Translator: Muhammet Kara \n" -"Language-Team: Türkçe \n" +"POT-Creation-Date: 2018-04-01 15:05+0000\n" +"PO-Revision-Date: 2018-05-03 10:09+0300\n" +"Last-Translator: Muhammet Kara \n" +"Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -114,7 +114,7 @@ #: ../src/addressbook/libebook/e-book-client.c:3422 #: ../src/addressbook/libebook/e-book-client.c:3640 #: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877 -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:200 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:222 #: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:274 #: ../src/calendar/backends/http/e-cal-backend-http.c:204 #: ../src/calendar/libecal/e-cal.c:2334 @@ -139,8 +139,9 @@ #: ../src/calendar/libecal/e-cal-client.c:7061 #: ../src/calendar/libedata-cal/e-cal-cache.c:1742 #: ../src/camel/providers/imapx/camel-imapx-server.c:3029 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3039 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3051 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3035 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3045 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3057 #: ../src/camel/providers/nntp/camel-nntp-store.c:422 #: ../src/libebackend/e-server-side-source.c:501 #: ../src/libedataserver/e-client.c:188 @@ -151,7 +152,7 @@ msgstr "Bilinmeyen hata" #: ../src/addressbook/backends/google/e-book-backend-google.c:924 -#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1005 +#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1017 msgid "Object to save is not a valid vCard" msgstr "Kaydedilecek nesne geçerli bir vCard değil" @@ -273,7 +274,7 @@ msgid "Given URL “%s” doesn’t reference WebDAV address book" msgstr "Verilen URL “%s”, WebDAV adres defterine ait değil" -#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:929 +#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:941 msgid "Received object is not a valid vCard" msgstr "Alınan nesne geçerli bir vCard değil" @@ -1104,7 +1105,7 @@ #: ../src/calendar/libedata-cal/e-cal-cache.c:2333 #: ../src/calendar/libedata-cal/e-cal-cache.c:2396 #: ../src/calendar/libedata-cal/e-cal-cache.c:2567 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1331 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1335 #: ../src/libebackend/e-cache.c:1385 ../src/libebackend/e-cache.c:2238 #: ../src/libebackend/e-cache.c:2278 #, c-format @@ -1127,20 +1128,20 @@ msgstr "Metin biçiminde olmayan alan sıralanamaz" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1050 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1052 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1056 #, c-format msgid "Preloaded object for UID “%s” is invalid" msgstr "UID “%s” için önceden yüklenmiş nesne geçersiz" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1058 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1060 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1064 #, c-format msgid "Received object for UID “%s” is invalid" msgstr "UID “%s” için alınan nesne geçersiz" #: ../src/addressbook/libedata-book/e-book-meta-backend.c:1885 #: ../src/addressbook/libedata-book/e-book-meta-backend.c:2333 -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3100 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3151 #, c-format msgid "Failed to create cache “%s”:" msgstr "“%s” önbelleği oluşturulamadı:" @@ -1363,12 +1364,12 @@ msgid "Alphabetic index was set for incorrect locale" msgstr "Alfabetik indeks geçersiz bir yerele ayarlanmış" -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:143 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:165 #, c-format msgid "Given URL “%s” doesn’t reference CalDAV calendar" msgstr "Verilen URL “%s”, CalDAV takvimine ait değil" -#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1579 +#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1616 msgid "Failed to parse response data" msgstr "Yanıt verisi ayrıştırılamadı" @@ -1862,12 +1863,12 @@ msgid "Cannot add timezone with invalid component" msgstr "Geçersiz bileşenle saat dilimi eklenemez" -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1107 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1111 #, c-format msgid "Received object for UID “%s” doesn’t contain any expected component" msgstr "UID “%s” için alınan nesne herhangi bir beklenen bileşeni içermiyor" -#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3896 +#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3955 msgid "attachment.dat" msgstr "ek.dat" @@ -2134,7 +2135,7 @@ msgstr[0] "“%s : %s” içindeki yeni ileti filtreleniyor" #: ../src/camel/camel-folder.c:1030 -#: ../src/camel/providers/local/camel-maildir-folder.c:330 +#: ../src/camel/providers/local/camel-maildir-folder.c:331 msgid "Moving messages" msgstr "İletiler taşınıyor" @@ -3272,7 +3273,7 @@ "Bu işlemi tamamlayabilmek için çevirim içi çalışıyor olmanız gerekir (%s)" #: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:993 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3111 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3117 #: ../src/camel/providers/nntp/camel-nntp-store.c:351 #: ../src/camel/providers/nntp/camel-nntp-store.c:1346 #: ../src/camel/providers/nntp/camel-nntp-store.c:2158 @@ -3453,7 +3454,7 @@ #: ../src/camel/providers/imapx/camel-imapx-server.c:2793 #: ../src/camel/providers/imapx/camel-imapx-server.c:2881 -#: ../src/camel/providers/imapx/camel-imapx-server.c:3144 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3150 msgid "Failed to get capabilities" msgstr "Yetenekler alınamadı" @@ -3498,157 +3499,157 @@ msgid "Failed to authenticate" msgstr "Kimlik doğrulama başarısız oldu" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3166 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3172 msgid "Failed to issue NAMESPACE" msgstr "NAMESPACE verilmesi başarısız oldu" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3184 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3190 msgid "Failed to enable QResync" msgstr "QResync etkinleştirme başarısız oldu" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3216 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3222 msgid "Failed to issue NOTIFY" msgstr "NOTIFY verilmesi başarısız oldu" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3694 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3700 msgid "Failed to select mailbox" msgstr "Posta kutusu seçme başarısız oldu" -#: ../src/camel/providers/imapx/camel-imapx-server.c:3797 +#: ../src/camel/providers/imapx/camel-imapx-server.c:3803 msgid "Cannot issue command, no stream available" msgstr "Komut verilemiyor, kullanılabilir akış yok" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4061 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4067 #, c-format msgid "Cannot get message with message ID %s: %s" msgstr "%s ileti ID'sine sahip ileti alınamıyor: %s" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4062 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4068 msgid "No such message available." msgstr "Böyle bir ileti yok." -#: ../src/camel/providers/imapx/camel-imapx-server.c:4110 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4135 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4174 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4116 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4141 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4180 msgid "Error fetching message" msgstr "İleti alınırken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4152 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4911 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4158 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4917 msgid "Error performing NOOP" msgstr "NOOP İşlemi başarısız" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4167 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4173 msgid "Failed to close the tmp stream" msgstr "Tmp akışı kapatılamadı" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4198 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4204 msgid "Failed to copy the tmp file" msgstr "Tmp dosyası kopyalanamadı" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4434 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4440 msgid "Error moving messages" msgstr "İletiler taşınırken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4434 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4440 msgid "Error copying messages" msgstr "İletiler kopyalanırken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:4704 -#: ../src/camel/providers/imapx/camel-imapx-server.c:4725 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4710 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4731 msgid "Cannot create spool file: " msgstr "Kuyruk dosyası oluşturulamadı: " -#: ../src/camel/providers/imapx/camel-imapx-server.c:4811 +#: ../src/camel/providers/imapx/camel-imapx-server.c:4817 msgid "Error appending message" msgstr "İleti eklenirken hata" #. Translators: The first “%s” is replaced with an account name and the second “%s” #. is replaced with a full path name. The spaces around “:” are intentional, as #. the whole “%s : %s” is meant as an absolute identification of the folder. -#: ../src/camel/providers/imapx/camel-imapx-server.c:5064 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5070 #, c-format msgid "Scanning for changed messages in “%s : %s”" msgstr "“%s : %s” içerisindeki değiştirilen iletiler taranıyor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5068 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5074 msgid "Error scanning changes" msgstr "Değişiklikler taranırken hata" #. Translators: The first “%s” is replaced with an account name and the second “%s” #. is replaced with a full path name. The spaces around “:” are intentional, as #. the whole “%s : %s” is meant as an absolute identification of the folder. -#: ../src/camel/providers/imapx/camel-imapx-server.c:5089 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5095 #, c-format msgid "Fetching summary information for new messages in “%s : %s”" msgstr "“%s : %s” içindeki yeni iletilerin özet bilgisi getiriliyor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5107 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5113 msgid "Error fetching message info" msgstr "İleti bilgisi getirilirken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5213 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5219 msgid "Error running STATUS" msgstr "STATUS çalıştırılırken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5759 -#: ../src/camel/providers/imapx/camel-imapx-server.c:5789 -#: ../src/camel/providers/imapx/camel-imapx-server.c:5824 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5765 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5795 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5830 msgid "Error syncing changes" msgstr "Değişiklikler eşlenirken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:5962 +#: ../src/camel/providers/imapx/camel-imapx-server.c:5968 msgid "Error expunging message" msgstr "İleti silinirken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6034 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6040 msgid "Error fetching folders" msgstr "Klasörler alınırken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6045 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6051 msgid "Error fetching subscribed folders" msgstr "Abone olunan klasörler getirilirken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6067 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6073 msgid "Error creating folder" msgstr "Klasör oluştururken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6123 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6129 msgid "Error deleting folder" msgstr "Klasör silinirken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6169 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6175 msgid "Error renaming folder" msgstr "Klasör yeniden adlandırılırken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6201 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6207 msgid "Error subscribing to folder" msgstr "Klasöre abone olunurken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6237 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6243 msgid "Error unsubscribing from folder" msgstr "Klasör aboneliği iptal edilirken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6277 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6283 msgid "IMAP server does not support quotas" msgstr "IMAP sunucusu kotaları desteklemiyor" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6289 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6295 msgid "Error retrieving quota information" msgstr "Kota bilgisi getirilirken hata" -#: ../src/camel/providers/imapx/camel-imapx-server.c:6352 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6358 msgid "Search failed" msgstr "Arama başarısız" #. Blocks, until the DONE is issued or on inactivity timeout, error, ... -#: ../src/camel/providers/imapx/camel-imapx-server.c:6470 +#: ../src/camel/providers/imapx/camel-imapx-server.c:6476 msgid "Error running IDLE" msgstr "IDLE çalıştırılırken hata" #. create a dummy "." parent inbox, use to scan, then put back at the top level #: ../src/camel/providers/imapx/camel-imapx-store.c:354 -#: ../src/camel/providers/local/camel-maildir-folder.c:478 +#: ../src/camel/providers/local/camel-maildir-folder.c:476 #: ../src/camel/providers/local/camel-maildir-store.c:345 #: ../src/camel/providers/local/camel-maildir-store.c:824 #: ../src/camel/providers/local/camel-maildir-store.c:830 @@ -3808,7 +3809,7 @@ #. * for folders being under $HOME. The first %s is replaced #. * with a relative path under $HOME, the second %s is #. * replaced with a protocol name, like mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:187 +#: ../src/camel/providers/local/camel-local-folder.c:190 #, c-format msgid "~%s (%s)" msgstr "~%s (%s)" @@ -3822,8 +3823,8 @@ #. * folders being under /var/mail. The first %s is replaced #. * with a relative path under /var/mail, the second %s is #. * replaced with a protocol name, like mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:197 -#: ../src/camel/providers/local/camel-local-folder.c:206 +#: ../src/camel/providers/local/camel-local-folder.c:200 +#: ../src/camel/providers/local/camel-local-folder.c:209 #, c-format msgid "mailbox: %s (%s)" msgstr "posta kutusu: %s (%s)" @@ -3832,19 +3833,19 @@ #. * The first %s is replaced with a folder's full path, #. * the second %s is replaced with a protocol name, like #. * mbox/maldir/... -#: ../src/camel/providers/local/camel-local-folder.c:215 +#: ../src/camel/providers/local/camel-local-folder.c:218 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../src/camel/providers/local/camel-local-folder.c:505 +#: ../src/camel/providers/local/camel-local-folder.c:511 msgid "_Index message body data" msgstr "_İleti gövdelerini indeksle" #. Translators: The first %s is replaced with a message ID, #. * the second %s is replaced with the folder path, #. * the third %s is replaced with a detailed error string -#: ../src/camel/providers/local/camel-local-folder.c:737 +#: ../src/camel/providers/local/camel-local-folder.c:749 #, c-format msgid "" "Cannot get message %s from folder %s\n" @@ -3971,28 +3972,28 @@ msgstr "“%s” yeniden adlandırılamadı: %s" #: ../src/camel/providers/local/camel-maildir-folder.c:107 -#: ../src/camel/providers/local/camel-maildir-folder.c:344 -#: ../src/camel/providers/local/camel-mbox-folder.c:128 -#: ../src/camel/providers/local/camel-mbox-folder.c:336 -#: ../src/camel/providers/local/camel-mh-folder.c:157 +#: ../src/camel/providers/local/camel-maildir-folder.c:345 +#: ../src/camel/providers/local/camel-mbox-folder.c:133 +#: ../src/camel/providers/local/camel-mbox-folder.c:348 +#: ../src/camel/providers/local/camel-mh-folder.c:159 msgid "No such message" msgstr "İleti bulunmuyor" -#: ../src/camel/providers/local/camel-maildir-folder.c:232 +#: ../src/camel/providers/local/camel-maildir-folder.c:239 #, c-format msgid "Cannot append message to maildir folder: %s: " msgstr "Maildir klasörüne ileti eklenemiyor: %s: " -#: ../src/camel/providers/local/camel-maildir-folder.c:282 -#: ../src/camel/providers/local/camel-maildir-folder.c:292 -#: ../src/camel/providers/local/camel-mbox-folder.c:395 -#: ../src/camel/providers/local/camel-mh-folder.c:169 -#: ../src/camel/providers/local/camel-mh-folder.c:179 +#: ../src/camel/providers/local/camel-maildir-folder.c:286 +#: ../src/camel/providers/local/camel-maildir-folder.c:296 +#: ../src/camel/providers/local/camel-mbox-folder.c:407 +#: ../src/camel/providers/local/camel-mh-folder.c:171 +#: ../src/camel/providers/local/camel-mh-folder.c:181 #, c-format msgid "Cannot get message %s from folder %s: " msgstr "%s iletisi %s klasöründen alınamıyor: " -#: ../src/camel/providers/local/camel-maildir-folder.c:362 +#: ../src/camel/providers/local/camel-maildir-folder.c:363 #, c-format msgid "Cannot transfer message to destination folder: %s" msgstr "İleti hedef klasöre aktarılamıyor: %s" @@ -4078,21 +4079,21 @@ msgid "Storing folder" msgstr "Klasör saklanıyor" -#: ../src/camel/providers/local/camel-mbox-folder.c:194 +#: ../src/camel/providers/local/camel-mbox-folder.c:205 #, c-format msgid "Cannot open mailbox: %s: " msgstr "Posta kutusu açılamadı: %s: " -#: ../src/camel/providers/local/camel-mbox-folder.c:257 +#: ../src/camel/providers/local/camel-mbox-folder.c:266 #, c-format msgid "Cannot append message to mbox file: %s: " msgstr "İleti mbox dosyasına eklenemedi: %s: " -#: ../src/camel/providers/local/camel-mbox-folder.c:387 +#: ../src/camel/providers/local/camel-mbox-folder.c:399 msgid "The folder appears to be irrecoverably corrupted." msgstr "Klasör onarılamayacak şekilde bozulmuş gibi görünüyor." -#: ../src/camel/providers/local/camel-mbox-folder.c:444 +#: ../src/camel/providers/local/camel-mbox-folder.c:454 #: ../src/camel/providers/local/camel-spool-folder.c:65 #, c-format msgid "Cannot create folder lock on %s: %s" @@ -4237,7 +4238,7 @@ msgid "Writing to temporary mailbox failed: %s: %s" msgstr "Geçici posta kutusuna yazma işlemi başarısız: %s: %s" -#: ../src/camel/providers/local/camel-mh-folder.c:114 +#: ../src/camel/providers/local/camel-mh-folder.c:119 #, c-format msgid "Cannot append message to mh folder: %s: " msgstr "mh klasörüne ileti eklenemiyor: %s: " @@ -5306,7 +5307,7 @@ msgstr "Kimlik bilgilerini arama başarısız oldu:" #: ../src/libebackend/e-server-side-source.c:1395 -#: ../src/libedataserver/e-source.c:1597 +#: ../src/libedataserver/e-source.c:1583 #, c-format msgid "Data source “%s” does not support creating remote resources" msgstr "Veri kaynağı “%s” uzak kaynakların oluşturulmasını desteklemiyor" @@ -5319,7 +5320,7 @@ "“%s” veri kaynağının uzak kaynakları oluşturacak bir toplama arka ucu yok" #: ../src/libebackend/e-server-side-source.c:1437 -#: ../src/libedataserver/e-source.c:1710 +#: ../src/libedataserver/e-source.c:1696 #, c-format msgid "Data source “%s” does not support deleting remote resources" msgstr "Veri kaynağı “%s” uzak kaynakların silinmesini desteklemiyor" @@ -5331,7 +5332,7 @@ msgstr "“%s” veri kaynağının uzak kaynakları silecek bir toplama arka ucu yok" #: ../src/libebackend/e-server-side-source.c:1482 -#: ../src/libedataserver/e-source.c:1806 +#: ../src/libedataserver/e-source.c:1792 #: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080 #, c-format msgid "Data source “%s” does not support OAuth 2.0 authentication" @@ -5560,17 +5561,17 @@ msgid "Source file is missing a [%s] group" msgstr "Kaynak dosyası [%s] grubu içermiyor" -#: ../src/libedataserver/e-source.c:1377 +#: ../src/libedataserver/e-source.c:1363 #, c-format msgid "Data source “%s” is not removable" msgstr "Veri kaynağı “%s” kaldırılabilir değil" -#: ../src/libedataserver/e-source.c:1500 +#: ../src/libedataserver/e-source.c:1486 #, c-format msgid "Data source “%s” is not writable" msgstr "Ver kaynağı “%s” yazılabilir değil" -#: ../src/libedataserver/e-source.c:2196 +#: ../src/libedataserver/e-source.c:2173 msgid "Unnamed" msgstr "Adsız" @@ -6474,6 +6475,10 @@ msgid "On This Computer" msgstr "Bu Bilgisayarda" +#: ../src/services/evolution-source-registry/builtin/system-proxy.source.in.h:1 +msgid "Default Proxy Settings" +msgstr "Öntanımlı Vekil Sunucu Ayarları" + #: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1 msgid "Search Folders" msgstr "Arama Klasörleri" diff -Nru evolution-data-server-3.28.1/src/calendar/libedata-cal/e-cal-meta-backend.c evolution-data-server-3.28.2/src/calendar/libedata-cal/e-cal-meta-backend.c --- evolution-data-server-3.28.1/src/calendar/libedata-cal/e-cal-meta-backend.c 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/src/calendar/libedata-cal/e-cal-meta-backend.c 2018-05-07 08:03:27.000000000 +0000 @@ -2048,6 +2048,10 @@ if (!existing_comp) existing_comp = master_comp; + /* Pick the first instance in case there's no master component */ + if (!existing_comp) + existing_comp = instances->data; + /* Remember old and new components */ if (out_old_comp && existing_comp) old_comp = e_cal_component_clone (existing_comp); @@ -2069,11 +2073,17 @@ case E_CAL_OBJ_MOD_THIS: if (rid) { if (existing_comp != master_comp) { + /* When it's the last detached instance, then remove all */ + if (instances && instances->data == existing_comp && !instances->next) { + mod = E_CAL_OBJ_MOD_ALL; + break; + } + instances = g_slist_remove (instances, existing_comp); g_clear_object (&existing_comp); } - if (existing_comp == master_comp && mod == E_CAL_OBJ_MOD_ONLY_THIS) { + if (existing_comp == master_comp && master_comp && mod == E_CAL_OBJ_MOD_ONLY_THIS) { success = FALSE; g_propagate_error (error, e_data_cal_create_error (ObjectNotFound, NULL)); } else { @@ -2093,11 +2103,12 @@ itt = icaltime_convert_to_zone (itt, icaltimezone_get_utc_timezone ()); } - e_cal_util_remove_instances (e_cal_component_get_icalcomponent (master_comp), itt, mod); + if (master_comp) + e_cal_util_remove_instances (e_cal_component_get_icalcomponent (master_comp), itt, mod); } - if (success && out_new_comp) - new_comp = e_cal_component_clone (master_comp); + if (success && out_new_comp && (master_comp || existing_comp)) + new_comp = e_cal_component_clone (master_comp ? master_comp : existing_comp); } else { mod = E_CAL_OBJ_MOD_ALL; } @@ -2180,11 +2191,51 @@ if (*offline_flag == E_CACHE_IS_ONLINE) { gchar *ical_string = NULL; - g_warn_if_fail (e_cal_cache_get_component_as_string (cal_cache, uid, NULL, &ical_string, cancellable, NULL)); + /* Use the master object, if exists */ + if (e_cal_cache_get_component_as_string (cal_cache, uid, NULL, &ical_string, cancellable, NULL)) { + success = e_cal_meta_backend_remove_component_sync (meta_backend, conflict_resolution, uid, extra, ical_string, cancellable, &local_error); - success = e_cal_meta_backend_remove_component_sync (meta_backend, conflict_resolution, uid, extra, ical_string, cancellable, &local_error); + g_free (ical_string); + } else { + /* If no master object is available, then delete with the first instance */ + GSList *link; - g_free (ical_string); + for (link = instances; link && success; link = g_slist_next (link)) { + ECalComponent *comp = link->data; + ECalComponentId *id; + gchar *comp_extra = NULL; + + if (!comp) + continue; + + id = e_cal_component_get_id (comp); + if (!id) + continue; + + if (!e_cal_cache_get_component_extra (cal_cache, id->uid, id->rid, &comp_extra, cancellable, NULL)) { + comp_extra = NULL; + if (g_cancellable_set_error_if_cancelled (cancellable, &local_error)) { + success = FALSE; + e_cal_component_free_id (id); + break; + } + + g_warn_if_reached (); + } + + ical_string = e_cal_component_get_as_string (comp); + + /* This pretends the first instance is the master object and the implementations should count with it */ + success = e_cal_meta_backend_remove_component_sync (meta_backend, conflict_resolution, id->uid, comp_extra, ical_string, cancellable, &local_error); + + e_cal_component_free_id (id); + g_clear_pointer (&ical_string, g_free); + g_free (comp_extra); + + /* Stop with the first instance */ + break; + } + } if (local_error) { if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_HOST_NOT_FOUND)) @@ -2346,10 +2397,20 @@ cal_backend = E_CAL_BACKEND (meta_backend); registry = e_cal_backend_get_registry (cal_backend); - /* just to check whether component exists in a cache */ + /* Just to check whether component exists in the cache */ is_in_cache = e_cal_cache_contains (cal_cache, id->uid, NULL, E_CACHE_EXCLUDE_DELETED) || (id->rid && *id->rid && e_cal_cache_contains (cal_cache, id->uid, id->rid, E_CACHE_EXCLUDE_DELETED)); + /* For cases when there's no master object in the cache */ + if (!is_in_cache) { + GSList *icalstrings = NULL; + + if (e_cal_cache_get_components_by_uid_as_string (cal_cache, id->uid, &icalstrings, cancellable, NULL)) { + is_in_cache = icalstrings && icalstrings->data; + g_slist_free_full (icalstrings, g_free); + } + } + mod = e_cal_component_is_instance (comp) ? E_CAL_OBJ_MOD_THIS : E_CAL_OBJ_MOD_ALL; switch (method) { diff -Nru evolution-data-server-3.28.1/src/camel/camel-mime-parser.c evolution-data-server-3.28.2/src/camel/camel-mime-parser.c --- evolution-data-server-3.28.1/src/camel/camel-mime-parser.c 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/src/camel/camel-mime-parser.c 2018-05-07 08:03:27.000000000 +0000 @@ -1320,6 +1320,12 @@ if (s->outptr - 1 > s->outbuf && (s->outptr[-2] == '\r' || s->outptr[-2] == '\n')) s->outptr[-2] = 0; + if (s->outbuf == s->outptr || !*s->outbuf) { + s->check_header_folded = FALSE; + s->midline = FALSE; + goto header_done; + } + h (printf ("header not folded '%s' at %d\n", s->outbuf, (gint) s->header_start)); header_raw_append_parse (&h->headers, s->outbuf, s->header_start); @@ -1341,9 +1347,9 @@ s->midline = TRUE; s->check_header_folded = inptr == inend; inptr = inend; - header_append (s, start, inptr); + header_append (s, start, inptr + (s->check_header_folded ? -1 : 0)); } else { - h (printf ("got line part: '%.*s'\n", inptr - 1 - start, start)); + h (printf ("got line part: '%.*s'\n", (gint) (inptr - 1 - start), start)); /* got a line, strip and add it, process it */ s->midline = FALSE; s->check_header_folded = FALSE; diff -Nru evolution-data-server-3.28.1/src/camel/camel-url-scanner.c evolution-data-server-3.28.2/src/camel/camel-url-scanner.c --- evolution-data-server-3.28.1/src/camel/camel-url-scanner.c 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/src/camel/camel-url-scanner.c 2018-05-07 08:03:27.000000000 +0000 @@ -235,7 +235,7 @@ * punctuation, so strip any trailing * punctuation off. Also strip off any closing * double-quotes. */ - while (inptr > pos && strchr (",.:;?!-|}])\"", inptr[-1])) + while (inptr > pos && strchr (",.:;?!-|}])\">", inptr[-1])) inptr--; } diff -Nru evolution-data-server-3.28.1/src/camel/providers/imapx/camel-imapx-server.c evolution-data-server-3.28.2/src/camel/providers/imapx/camel-imapx-server.c --- evolution-data-server-3.28.1/src/camel/providers/imapx/camel-imapx-server.c 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/src/camel/providers/imapx/camel-imapx-server.c 2018-05-07 08:03:27.000000000 +0000 @@ -315,6 +315,10 @@ gint64 fetch_changes_last_progress; /* when was called last progress */ struct _status_info *copyuid_status; + + GHashTable *list_responses_hash; /* ghar *mailbox-name ~> CamelIMAPXListResponse *, both owned by list_responses */ + GSList *list_responses; + GSList *lsub_responses; }; enum { @@ -1396,7 +1400,6 @@ GError **error) { CamelIMAPXListResponse *response; - CamelIMAPXStore *imapx_store; const gchar *mailbox_name; gchar separator; @@ -1418,11 +1421,23 @@ if (camel_imapx_mailbox_is_inbox (mailbox_name)) is->priv->inbox_separator = separator; - imapx_store = camel_imapx_server_ref_store (is); - camel_imapx_store_handle_lsub_response (imapx_store, is, response); + if (is->priv->list_responses_hash) { + CamelIMAPXListResponse *list_response; - g_clear_object (&imapx_store); - g_clear_object (&response); + is->priv->lsub_responses = g_slist_prepend (is->priv->lsub_responses, response); + + list_response = g_hash_table_lookup (is->priv->list_responses_hash, camel_imapx_list_response_get_mailbox_name (response)); + if (list_response) + camel_imapx_list_response_add_attribute (list_response, CAMEL_IMAPX_LIST_ATTR_SUBSCRIBED); + } else { + CamelIMAPXStore *imapx_store; + + imapx_store = camel_imapx_server_ref_store (is); + camel_imapx_store_handle_lsub_response (imapx_store, is, response); + + g_clear_object (&imapx_store); + g_clear_object (&response); + } return TRUE; } @@ -1434,7 +1449,6 @@ GError **error) { CamelIMAPXListResponse *response; - CamelIMAPXStore *imapx_store; const gchar *mailbox_name; gchar separator; @@ -1452,11 +1466,18 @@ if (camel_imapx_mailbox_is_inbox (mailbox_name)) is->priv->inbox_separator = separator; - imapx_store = camel_imapx_server_ref_store (is); - camel_imapx_store_handle_list_response (imapx_store, is, response); + if (is->priv->list_responses_hash) { + is->priv->list_responses = g_slist_prepend (is->priv->list_responses, response); + g_hash_table_insert (is->priv->list_responses_hash, (gpointer) camel_imapx_list_response_get_mailbox_name (response), response); + } else { + CamelIMAPXStore *imapx_store; - g_clear_object (&imapx_store); - g_clear_object (&response); + imapx_store = camel_imapx_server_ref_store (is); + camel_imapx_store_handle_list_response (imapx_store, is, response); + + g_clear_object (&imapx_store); + g_clear_object (&response); + } return TRUE; } @@ -6029,10 +6050,16 @@ g_return_val_if_fail (CAMEL_IS_IMAPX_SERVER (is), FALSE); g_return_val_if_fail (pattern != NULL, FALSE); + g_warn_if_fail (is->priv->list_responses_hash == NULL); + g_warn_if_fail (is->priv->list_responses == NULL); + g_warn_if_fail (is->priv->lsub_responses == NULL); + if (is->priv->list_return_opts != NULL) { ic = camel_imapx_command_new (is, CAMEL_IMAPX_JOB_LIST, "LIST \"\" %s RETURN (%t)", pattern, is->priv->list_return_opts); } else { + is->priv->list_responses_hash = g_hash_table_new (camel_strcase_hash, camel_strcase_equal); + ic = camel_imapx_command_new (is, CAMEL_IMAPX_JOB_LIST, "LIST \"\" %s", pattern); } @@ -6041,10 +6068,7 @@ camel_imapx_command_unref (ic); - if (!success) - return FALSE; - - if (!is->priv->list_return_opts) { + if (success && !is->priv->list_return_opts) { ic = camel_imapx_command_new (is, CAMEL_IMAPX_JOB_LSUB, "LSUB \"\" %s", pattern); @@ -6053,6 +6077,39 @@ camel_imapx_command_unref (ic); } + if (is->priv->list_responses_hash) { + CamelIMAPXStore *imapx_store; + GSList *link; + + imapx_store = camel_imapx_server_ref_store (is); + if (imapx_store) { + /* Preserve order in which these had been received from the server */ + is->priv->list_responses = g_slist_reverse (is->priv->list_responses); + is->priv->lsub_responses = g_slist_reverse (is->priv->lsub_responses); + + for (link = is->priv->list_responses; link; link = g_slist_next (link)) { + CamelIMAPXListResponse *response = link->data; + + camel_imapx_store_handle_list_response (imapx_store, is, response); + } + + for (link = is->priv->lsub_responses; link; link = g_slist_next (link)) { + CamelIMAPXListResponse *response = link->data; + + camel_imapx_store_handle_lsub_response (imapx_store, is, response); + } + + g_clear_object (&imapx_store); + } + + g_hash_table_destroy (is->priv->list_responses_hash); + is->priv->list_responses_hash = NULL; + g_slist_free_full (is->priv->list_responses, g_object_unref); + is->priv->list_responses = NULL; + g_slist_free_full (is->priv->lsub_responses, g_object_unref); + is->priv->lsub_responses = NULL; + } + return success; } diff -Nru evolution-data-server-3.28.1/src/libebackend/e-backend.c evolution-data-server-3.28.2/src/libebackend/e-backend.c --- evolution-data-server-3.28.1/src/libebackend/e-backend.c 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/src/libebackend/e-backend.c 2018-05-07 08:03:27.000000000 +0000 @@ -122,6 +122,28 @@ g_object_unref (backend); } +static GSocketConnectable * +backend_ref_connectable_internal (EBackend *backend) +{ + GSocketConnectable *connectable; + + g_return_val_if_fail (E_IS_BACKEND (backend), NULL); + + connectable = e_backend_ref_connectable (backend); + + if (!connectable) { + gchar *host = NULL; + guint16 port = 0; + + if (e_backend_get_destination_address (backend, &host, &port) && host) + connectable = g_network_address_new (host, port); + + g_free (host); + } + + return connectable; +} + static gboolean backend_update_online_state_timeout_cb (gpointer user_data) { @@ -138,7 +160,7 @@ if (!backend) return FALSE; - connectable = e_backend_ref_connectable (backend); + connectable = backend_ref_connectable_internal (backend); g_mutex_lock (&backend->priv->update_online_state_lock); g_source_unref (backend->priv->update_online_state); @@ -156,16 +178,6 @@ cancellable = NULL; } - if (!connectable) { - gchar *host = NULL; - guint16 port = 0; - - if (e_backend_get_destination_address (backend, &host, &port) && host) - connectable = g_network_address_new (host, port); - - g_free (host); - } - if (connectable == NULL) { backend->priv->network_monitor_cancellable = cancellable; g_mutex_unlock (&backend->priv->network_monitor_cancellable_lock); @@ -233,7 +245,15 @@ gboolean network_available, EBackend *backend) { - backend_update_online_state (backend); + if (network_available) { + backend_update_online_state (backend); + } else { + GSocketConnectable *connectable; + + connectable = backend_ref_connectable_internal (backend); + e_backend_set_online (backend, !connectable); + g_clear_object (&connectable); + } } static ESourceAuthenticationResult diff -Nru evolution-data-server-3.28.1/src/libedataserver/CMakeLists.txt evolution-data-server-3.28.2/src/libedataserver/CMakeLists.txt --- evolution-data-server-3.28.1/src/libedataserver/CMakeLists.txt 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/src/libedataserver/CMakeLists.txt 2018-05-07 08:03:27.000000000 +0000 @@ -253,7 +253,7 @@ ${GCR_BASE_CFLAGS} ${GIO_UNIX_CFLAGS} ${ICU_CFLAGS} - ${OAUTH2_CFLAGS} + ${OAUTH2_JSON_GLIB_CFLAGS} ${LIBGDATA_CFLAGS} ) @@ -268,7 +268,7 @@ ${GCR_BASE_INCLUDE_DIRS} ${GIO_UNIX_INCLUDE_DIRS} ${ICU_INCLUDE_DIRS} - ${OAUTH2_INCLUDE_DIRS} + ${OAUTH2_JSON_GLIB_INCLUDE_DIRS} ${LIBGDATA_INCLUDE_DIRS} ) @@ -278,7 +278,7 @@ ${GCR_BASE_LDFLAGS} ${GIO_UNIX_LDFLAGS} ${ICU_LDFLAGS} - ${OAUTH2_LDFLAGS} + ${OAUTH2_JSON_GLIB_LDFLAGS} ${LIBGDATA_LDFLAGS} ) diff -Nru evolution-data-server-3.28.1/src/libedataserver/e-alphabet-index-private.cpp evolution-data-server-3.28.2/src/libedataserver/e-alphabet-index-private.cpp --- evolution-data-server-3.28.1/src/libedataserver/e-alphabet-index-private.cpp 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/src/libedataserver/e-alphabet-index-private.cpp 2018-05-07 08:03:27.000000000 +0000 @@ -36,6 +36,7 @@ using icu::AlphabeticIndex; using icu::Locale; +using icu::UnicodeString; struct _EAlphabetIndex { AlphabeticIndex *priv; diff -Nru evolution-data-server-3.28.1/src/libedataserver/e-transliterator-private.cpp evolution-data-server-3.28.2/src/libedataserver/e-transliterator-private.cpp --- evolution-data-server-3.28.1/src/libedataserver/e-transliterator-private.cpp 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/src/libedataserver/e-transliterator-private.cpp 2018-05-07 08:03:27.000000000 +0000 @@ -35,6 +35,7 @@ #include using icu::Transliterator; +using icu::UnicodeString; struct _ETransliterator { Transliterator *priv; diff -Nru evolution-data-server-3.28.1/src/libedataserverui/CMakeLists.txt evolution-data-server-3.28.2/src/libedataserverui/CMakeLists.txt --- evolution-data-server-3.28.1/src/libedataserverui/CMakeLists.txt 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/src/libedataserverui/CMakeLists.txt 2018-05-07 08:03:27.000000000 +0000 @@ -56,7 +56,8 @@ ${GCR_BASE_CFLAGS} ${GCR_CFLAGS} ${GTK_CFLAGS} - ${OAUTH2_CFLAGS} + ${OAUTH2_JSON_GLIB_CFLAGS} + ${OAUTH2_WEBKIT2GTK_CFLAGS} ) target_include_directories(edataserverui PUBLIC @@ -72,7 +73,8 @@ ${GCR_BASE_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} - ${OAUTH2_INCLUDE_DIRS} + ${OAUTH2_JSON_GLIB_INCLUDE_DIRS} + ${OAUTH2_WEBKIT2GTK_INCLUDE_DIRS} ) target_link_libraries(edataserverui @@ -85,7 +87,8 @@ ${GCR_BASE_LDFLAGS} ${GCR_LDFLAGS} ${GTK_LDFLAGS} - ${OAUTH2_LDFLAGS} + ${OAUTH2_JSON_GLIB_LDFLAGS} + ${OAUTH2_WEBKIT2GTK_LDFLAGS} ) install(TARGETS edataserverui diff -Nru evolution-data-server-3.28.1/tests/libedata-cal/components/invite-5.ics evolution-data-server-3.28.2/tests/libedata-cal/components/invite-5.ics --- evolution-data-server-3.28.1/tests/libedata-cal/components/invite-5.ics 1970-01-01 00:00:00.000000000 +0000 +++ evolution-data-server-3.28.2/tests/libedata-cal/components/invite-5.ics 2018-05-07 08:03:27.000000000 +0000 @@ -0,0 +1,22 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Ximian//NONSGML Evolution Calendar//EN +VERSION:2.0 +METHOD:REQUEST +BEGIN:VEVENT +UID:invite-detached +DTSTAMP:20170308T180113Z +DTSTART;VALUE=DATE:20180425 +DTEND;VALUE=DATE:20180426 +RRULE:FREQ=WEEKLY;UNTIL=20180627T220000Z;BYDAY=WE +SEQUENCE:0 +ORGANIZER;CN=Organizer:MAILTO:organizer@no.where +ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED; + RSVP=TRUE;CN=User;LANGUAGE=en:MAILTO:user@no.where +SUMMARY:Recurring invite +TRANSP:OPAQUE +CLASS:PUBLIC +CREATED:20170308T180033Z +LAST-MODIFIED:20170308T180058Z +END:VEVENT +END:VCALENDAR diff -Nru evolution-data-server-3.28.1/tests/libedata-cal/components/invite-6.ics evolution-data-server-3.28.2/tests/libedata-cal/components/invite-6.ics --- evolution-data-server-3.28.1/tests/libedata-cal/components/invite-6.ics 1970-01-01 00:00:00.000000000 +0000 +++ evolution-data-server-3.28.2/tests/libedata-cal/components/invite-6.ics 2018-05-07 08:03:27.000000000 +0000 @@ -0,0 +1,22 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Ximian//NONSGML Evolution Calendar//EN +VERSION:2.0 +METHOD:REQUEST +BEGIN:VEVENT +UID:invite-detached +RECURRENCE-ID:20180502T000000Z +DTSTAMP:20170308T180122Z +DTSTART:20180502T130000Z +DTEND:20180502T133000Z +SEQUENCE:2 +ORGANIZER;CN=Organizer:MAILTO:organizer@no.where +ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED; + RSVP=TRUE;CN=User;LANGUAGE=en:MAILTO:user@no.where +SUMMARY:Detached instance of recurring invite +TRANSP:OPAQUE +CLASS:PUBLIC +CREATED:20170308T180034Z +LAST-MODIFIED:20170308T180059Z +END:VEVENT +END:VCALENDAR diff -Nru evolution-data-server-3.28.1/tests/libedata-cal/components/invite-7.ics evolution-data-server-3.28.2/tests/libedata-cal/components/invite-7.ics --- evolution-data-server-3.28.1/tests/libedata-cal/components/invite-7.ics 1970-01-01 00:00:00.000000000 +0000 +++ evolution-data-server-3.28.2/tests/libedata-cal/components/invite-7.ics 2018-05-07 08:03:27.000000000 +0000 @@ -0,0 +1,38 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Ximian//NONSGML Evolution Calendar//EN +VERSION:2.0 +METHOD:REQUEST +BEGIN:VEVENT +UID:invite-detached +RECURRENCE-ID:20180502T000000Z +DTSTAMP:20170308T180122Z +DTSTART:20180502T130000Z +DTEND:20180502T133000Z +SEQUENCE:2 +ORGANIZER;CN=Organizer:MAILTO:organizer@no.where +ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED; + RSVP=TRUE;CN=User;LANGUAGE=en:MAILTO:user@no.where +SUMMARY:Detached instance of recurring invite +TRANSP:OPAQUE +CLASS:PUBLIC +CREATED:20170308T180034Z +LAST-MODIFIED:20170308T180059Z +END:VEVENT +BEGIN:VEVENT +UID:invite-detached +RECURRENCE-ID:20180509T000000Z +DTSTAMP:20170308T180113Z +DTSTART:20180509T140000Z +DTEND:20180509T143000Z +SEQUENCE:3 +ORGANIZER;CN=Organizer:MAILTO:organizer@no.where +ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED; + RSVP=TRUE;CN=User;LANGUAGE=en:MAILTO:user@no.where +SUMMARY:Another detached instance of recurring invite +TRANSP:OPAQUE +CLASS:PUBLIC +CREATED:20170308T180033Z +LAST-MODIFIED:20170308T180058Z +END:VEVENT +END:VCALENDAR diff -Nru evolution-data-server-3.28.1/tests/libedata-cal/test-cal-meta-backend.c evolution-data-server-3.28.2/tests/libedata-cal/test-cal-meta-backend.c --- evolution-data-server-3.28.1/tests/libedata-cal/test-cal-meta-backend.c 2018-04-09 09:13:18.000000000 +0000 +++ evolution-data-server-3.28.2/tests/libedata-cal/test-cal-meta-backend.c 2018-05-07 08:03:27.000000000 +0000 @@ -2257,6 +2257,708 @@ } static void +test_receive_and_remove (ECalMetaBackend *meta_backend) +{ + ECalMetaBackendTest *test_backend; + ECalCache *cal_cache; + gchar *calobj; + GSList *old_components = NULL, *new_components = NULL, *ids; + GError *error = NULL; + + g_assert_nonnull (meta_backend); + + test_backend = E_CAL_META_BACKEND_TEST (meta_backend); + cal_cache = e_cal_meta_backend_ref_cache (meta_backend); + g_assert_nonnull (cal_cache); + + /* Receive master component */ + calobj = tcu_new_icalstring_from_test_case ("invite-5"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 1); + g_assert_cmpint (test_backend->save_count, ==, 1); + g_assert_cmpint (test_backend->remove_count, ==, 0); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", NULL, + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", NULL, + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + calobj = NULL; + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->get_object_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, "invite-detached", NULL, &calobj, &error); + g_assert_no_error (error); + g_assert_nonnull (calobj); + g_assert_nonnull (strstr (calobj, "SUMMARY:Recurring invite\r\n")); + g_assert_null (strstr (calobj, "SUMMARY:Detached instance of recurring invite\r\n")); + g_free (calobj); + + /* Delete master component, with no detached instances now */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", NULL)); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_ALL, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_null (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 1); + g_assert_cmpint (test_backend->save_count, ==, 1); + g_assert_cmpint (test_backend->remove_count, ==, 1); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", NULL, + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", NULL, + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Receive the master component again */ + calobj = tcu_new_icalstring_from_test_case ("invite-5"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 2); + g_assert_cmpint (test_backend->save_count, ==, 2); + g_assert_cmpint (test_backend->remove_count, ==, 1); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", NULL, + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", NULL, + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Then receive the detached instance */ + calobj = tcu_new_icalstring_from_test_case ("invite-6"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 3); + g_assert_cmpint (test_backend->save_count, ==, 3); + g_assert_cmpint (test_backend->remove_count, ==, 1); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + calobj = NULL; + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->get_object_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, "invite-detached", NULL, &calobj, &error); + g_assert_no_error (error); + g_assert_nonnull (calobj); + g_assert_nonnull (strstr (calobj, "SUMMARY:Recurring invite\r\n")); + g_assert_nonnull (strstr (calobj, "SUMMARY:Detached instance of recurring invite\r\n")); + g_free (calobj); + + /* Remove only the detached instance */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", "20180502T000000Z")); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_THIS, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_nonnull (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 4); + g_assert_cmpint (test_backend->save_count, ==, 4); + g_assert_cmpint (test_backend->remove_count, ==, 1); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free_full (new_components, g_object_unref); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", NULL, + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", NULL, + NULL); + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + calobj = NULL; + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->get_object_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, "invite-detached", NULL, &calobj, &error); + g_assert_no_error (error); + g_assert_nonnull (calobj); + g_assert_nonnull (strstr (calobj, "SUMMARY:Recurring invite\r\n")); + g_assert_null (strstr (calobj, "SUMMARY:Detached instance of recurring invite\r\n")); + g_free (calobj); + + /* Receive the detached instance again */ + calobj = tcu_new_icalstring_from_test_case ("invite-6"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 5); + g_assert_cmpint (test_backend->save_count, ==, 5); + g_assert_cmpint (test_backend->remove_count, ==, 1); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", NULL, + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", NULL, + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + calobj = NULL; + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->get_object_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, "invite-detached", NULL, &calobj, &error); + g_assert_no_error (error); + g_assert_nonnull (calobj); + g_assert_nonnull (strstr (calobj, "SUMMARY:Recurring invite\r\n")); + g_assert_nonnull (strstr (calobj, "SUMMARY:Detached instance of recurring invite\r\n")); + g_free (calobj); + + /* Remove the master object, which should delete both */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", NULL)); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_ALL, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_null (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 5); + g_assert_cmpint (test_backend->save_count, ==, 5); + g_assert_cmpint (test_backend->remove_count, ==, 2); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", NULL, + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", NULL, + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + calobj = NULL; + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->get_object_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, "invite-detached", NULL, &calobj, &error); + g_assert_error (error, E_DATA_CAL_ERROR, ObjectNotFound); + g_assert_null (calobj); + g_clear_error (&error); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->get_object_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, "invite-detached", "20180502T000000Z", &calobj, &error); + g_assert_error (error, E_DATA_CAL_ERROR, ObjectNotFound); + g_assert_null (calobj); + g_clear_error (&error); + + /* Receive only the detached instance, with no master object in the cache */ + calobj = tcu_new_icalstring_from_test_case ("invite-6"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 8); + g_assert_cmpint (test_backend->save_count, ==, 6); + g_assert_cmpint (test_backend->remove_count, ==, 2); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + + /* Remove the master object with mode THIS, which is not in the cache, but should remove all anyway */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", NULL)); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_THIS, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_null (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 8); + g_assert_cmpint (test_backend->save_count, ==, 6); + g_assert_cmpint (test_backend->remove_count, ==, 3); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + calobj = tcu_new_icalstring_from_test_case ("invite-6"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + /* Remove the master object with mode ALL, which is not in the cache, but should remove all */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", NULL)); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_ALL, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_null (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 9); + g_assert_cmpint (test_backend->save_count, ==, 7); + g_assert_cmpint (test_backend->remove_count, ==, 4); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Receive only the detached instance, with no master object in the cache */ + calobj = tcu_new_icalstring_from_test_case ("invite-6"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 10); + g_assert_cmpint (test_backend->save_count, ==, 8); + g_assert_cmpint (test_backend->remove_count, ==, 4); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + + /* Remove the detached instance with mode THIS */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", "20180502T000000Z")); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_THIS, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_null (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 10); + g_assert_cmpint (test_backend->save_count, ==, 8); + g_assert_cmpint (test_backend->remove_count, ==, 5); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Receive only the detached instance, with no master object in the cache */ + calobj = tcu_new_icalstring_from_test_case ("invite-6"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 11); + g_assert_cmpint (test_backend->save_count, ==, 9); + g_assert_cmpint (test_backend->remove_count, ==, 5); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + + /* Remove the detached instance with mode ALL */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", "20180502T000000Z")); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_ALL, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_null (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 11); + g_assert_cmpint (test_backend->save_count, ==, 9); + g_assert_cmpint (test_backend->remove_count, ==, 6); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Receive only two detached instances, with no master object in the cache */ + calobj = tcu_new_icalstring_from_test_case ("invite-7"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 13); + g_assert_cmpint (test_backend->save_count, ==, 11); + g_assert_cmpint (test_backend->remove_count, ==, 6); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + + /* Remove the detached instance with mode THIS */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", "20180502T000000Z")); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_THIS, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_null (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 14); + g_assert_cmpint (test_backend->save_count, ==, 12); + g_assert_cmpint (test_backend->remove_count, ==, 6); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", "20180509T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Receive the removed component again */ + calobj = tcu_new_icalstring_from_test_case ("invite-6"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + /* Remove both detached instances with mode THIS */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", "20180502T000000Z")); + ids = g_slist_prepend (ids, e_cal_component_id_new ("invite-detached", "20180509T000000Z")); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_THIS, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 2); + g_assert_cmpint (g_slist_length (new_components), ==, 2); + g_assert_null (new_components->data); + g_assert_null (new_components->next->data); + g_assert_cmpint (test_backend->load_count, ==, 16); + g_assert_cmpint (test_backend->save_count, ==, 14); + g_assert_cmpint (test_backend->remove_count, ==, 7); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Receive only two detached instances, with no master object in the cache */ + calobj = tcu_new_icalstring_from_test_case ("invite-7"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 18); + g_assert_cmpint (test_backend->save_count, ==, 16); + g_assert_cmpint (test_backend->remove_count, ==, 7); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + + /* Remove the second detached instance with mode ALL */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", "20180509T000000Z")); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_ALL, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_null (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 18); + g_assert_cmpint (test_backend->save_count, ==, 16); + g_assert_cmpint (test_backend->remove_count, ==, 8); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Receive only two detached instances, with no master object in the cache */ + calobj = tcu_new_icalstring_from_test_case ("invite-7"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 20); + g_assert_cmpint (test_backend->save_count, ==, 18); + g_assert_cmpint (test_backend->remove_count, ==, 8); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", NULL, + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", NULL, + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Receive the master object */ + calobj = tcu_new_icalstring_from_test_case ("invite-5"); + g_assert_nonnull (calobj); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->receive_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, calobj, &error); + g_assert_no_error (error); + g_free (calobj); + + g_assert_cmpint (test_backend->load_count, ==, 21); + g_assert_cmpint (test_backend->save_count, ==, 19); + g_assert_cmpint (test_backend->remove_count, ==, 8); + + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Remove the second detached instance with mode THIS */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", "20180509T000000Z")); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_THIS, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_nonnull (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 22); + g_assert_cmpint (test_backend->save_count, ==, 20); + g_assert_cmpint (test_backend->remove_count, ==, 8); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free_full (new_components, g_object_unref); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_vcalendar_contains (test_backend->vcalendar, FALSE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, FALSE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + /* Remove the first detached instance with mode ALL, which will drop whole series */ + ids = g_slist_prepend (NULL, e_cal_component_id_new ("invite-detached", "20180502T000000Z")); + + E_CAL_BACKEND_SYNC_GET_CLASS (meta_backend)->remove_objects_sync (E_CAL_BACKEND_SYNC (meta_backend), + NULL, NULL, ids, E_CAL_OBJ_MOD_ALL, &old_components, &new_components, &error); + g_assert_no_error (error); + g_assert_cmpint (g_slist_length (old_components), ==, 1); + g_assert_cmpint (g_slist_length (new_components), ==, 1); + g_assert_null (new_components->data); + g_assert_cmpint (test_backend->load_count, ==, 22); + g_assert_cmpint (test_backend->save_count, ==, 20); + g_assert_cmpint (test_backend->remove_count, ==, 9); + + g_slist_free_full (old_components, g_object_unref); + g_slist_free (new_components); + g_slist_free_full (ids, (GDestroyNotify) e_cal_component_free_id); + old_components = NULL; + new_components = NULL; + + ecmb_test_vcalendar_contains (test_backend->vcalendar, TRUE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + ecmb_test_cache_contains (cal_cache, TRUE, FALSE, + "invite-detached", NULL, + "invite-detached", "20180502T000000Z", + "invite-detached", "20180509T000000Z", + NULL); + + ecmb_test_cache_and_server_equal (cal_cache, test_backend->vcalendar, E_CACHE_INCLUDE_DELETED); + + g_object_unref (cal_cache); +} + +static void test_get_object (ECalMetaBackend *meta_backend) { ECalMetaBackendTest *test_backend; @@ -2670,6 +3372,7 @@ main_loop_wrapper (test_modify_objects) main_loop_wrapper (test_remove_objects) main_loop_wrapper (test_receive_objects) +main_loop_wrapper (test_receive_and_remove) main_loop_wrapper (test_get_object) main_loop_wrapper (test_get_object_list) main_loop_wrapper (test_refresh) @@ -2734,6 +3437,8 @@ tcu_fixture_setup, test_remove_objects_tcu, tcu_fixture_teardown); g_test_add ("/ECalMetaBackend/ReceiveObjects", TCUFixture, &closure_events, tcu_fixture_setup, test_receive_objects_tcu, tcu_fixture_teardown); + g_test_add ("/ECalMetaBackend/ReceiveAndRemove", TCUFixture, &closure_events, + tcu_fixture_setup, test_receive_and_remove_tcu, tcu_fixture_teardown); g_test_add ("/ECalMetaBackend/GetObject", TCUFixture, &closure_events, tcu_fixture_setup, test_get_object_tcu, tcu_fixture_teardown); g_test_add ("/ECalMetaBackend/GetObjectList", TCUFixture, &closure_events,