diff -Nru evolution-3.26.2/CMakeLists.txt evolution-3.26.3/CMakeLists.txt --- evolution-3.26.2/CMakeLists.txt 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/CMakeLists.txt 2017-12-11 11:08:06.000000000 +0000 @@ -4,7 +4,7 @@ cmake_policy(VERSION 3.1) project(evolution - VERSION 3.26.2 + VERSION 3.26.3 LANGUAGES C) set(PROJECT_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution") set(PROJECT_URL "http://wiki.gnome.org/Apps/Evolution/") diff -Nru evolution-3.26.2/data/evolution.desktop.in.in evolution-3.26.3/data/evolution.desktop.in.in --- evolution-3.26.2/data/evolution.desktop.in.in 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/data/evolution.desktop.in.in 2017-12-11 11:08:06.000000000 +0000 @@ -17,7 +17,7 @@ X-GNOME-Bugzilla-Version=@BASE_VERSION@.x X-GNOME-Bugzilla-OtherBinaries=evolution-addressbook-factory;evolution-calendar-factory;evolution-source-registry;evolution-user-prompter; X-GNOME-UsesNotifications=true -MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto; +MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;x-scheme-handler/webcal; [Desktop Action new-window] _Name=New Window diff -Nru evolution-3.26.2/debian/changelog evolution-3.26.3/debian/changelog --- evolution-3.26.2/debian/changelog 2017-12-09 13:01:11.000000000 +0000 +++ evolution-3.26.3/debian/changelog 2017-12-11 14:22:44.000000000 +0000 @@ -1,14 +1,9 @@ -evolution (3.26.2-1ubuntu1) bionic; urgency=medium +evolution (3.26.3-1) unstable; urgency=medium - * Build-depend on libical3-dev | libical-dev (>= 2.0.0). + * New upstream release + * Bump e-d-s dependencies and build-dependencies to 3.26.3 - -- Matthias Klose Sat, 09 Dec 2017 14:01:11 +0100 - -evolution (3.26.2-1build1) bionic; urgency=medium - - * No-change rebuild for libical soname change. - - -- Matthias Klose Sat, 09 Dec 2017 11:51:55 +0000 + -- Jeremy Bicha Mon, 11 Dec 2017 09:22:44 -0500 evolution (3.26.2-1) unstable; urgency=medium diff -Nru evolution-3.26.2/debian/control evolution-3.26.3/debian/control --- evolution-3.26.2/debian/control 2017-12-09 13:01:01.000000000 +0000 +++ evolution-3.26.3/debian/control 2017-12-11 14:08:43.000000000 +0000 @@ -20,13 +20,13 @@ libgtk-3-dev (>= 3.10.0), libgail-3-dev (>= 3.0.2), libgdk-pixbuf2.0-dev (>= 2.24.0), - libcamel1.2-dev (>= 3.26.2), - libebook1.2-dev (>= 3.26.2), - libecal1.2-dev (>= 3.26.2), - libedataserver1.2-dev (>= 3.26.2), - libedataserverui1.2-dev (>= 3.26.2), - libebackend1.2-dev (>= 3.26.2), - evolution-data-server-dev (>= 3.26.2), + libcamel1.2-dev (>= 3.26.3), + libebook1.2-dev (>= 3.26.3), + libecal1.2-dev (>= 3.26.3), + libedataserver1.2-dev (>= 3.26.3), + libedataserverui1.2-dev (>= 3.26.3), + libebackend1.2-dev (>= 3.26.3), + evolution-data-server-dev (>= 3.26.3), evolution-data-server-dev (<< 3.27), libwebkit2gtk-4.0-dev (>= 2.13.90), libgcr-3-dev (>= 3.4), @@ -52,7 +52,7 @@ libnss3-dev, psmisc, libytnef0-dev, - libical3-dev | libical-dev (>= 2.0.0), + libical-dev (>= 2.0.0), libpst-dev (>= 0.6.54), libsm-dev, libice-dev, @@ -71,7 +71,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-common (= ${source:Version}), - evolution-data-server (>= 3.26.2), + evolution-data-server (>= 3.26.3), evolution-data-server (<< 3.27), dbus, psmisc diff -Nru evolution-3.26.2/NEWS evolution-3.26.3/NEWS --- evolution-3.26.2/NEWS 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/NEWS 2017-12-11 11:08:06.000000000 +0000 @@ -1,3 +1,31 @@ +Evolution 3.26.3 2017-12-11 +--------------------------- + +Bug Fixes: + Bug 789648 - Problem viewing .eml attachment (Milan Crha) + Bug 700778 - TNEF attachment not processed properly (Milan Crha) + Bug 790263 - [alarm-notify] URLs in Location field should be clickable (Milan Crha) + Bug 790326 - [evolution-backup] Allow running without GUI/DISPLAY (Milan Crha) + Bug 789526 - Incorrect message selected after Delete in real Trash folder (Milan Crha) + Bug 789571 - Handle webcal:// URI to add new On The Web calendar (Milan Crha) + Bug 790069 - Free/Busy Publishing should not include X-SUMMARY and X-LOCATION (Milan Crha) + Bug 790291 - Disallow shrinking message list to zero width (Milan Crha) + Bug 680268 - Handle meeting invitation with detached instances (Milan Crha) + Bug 790311 - Print of message attachment shows main message headers (Milan Crha) + Bug 790944 - Attachment filename in multipart/mixed can be lost (Milan Crha) + Bug 790666 - Comma in Full Name breaks meeting organizer validity check (Milan Crha) + Bug 790952 - Skip extra leading forward slashes in mailto: from Chrome (Milan Crha) + Bug 791203 - Add file extension to pasted image in Plain Text mode (Milan Crha) + +Miscellaneous: + Workaround bug 674885 (type initialisation deadlock in GObject) (Milan Crha) + [Calendar] set_style_from_attendee(): Prevent crash when attendee has no mail set (Milan Crha) + Drag&drop of multiple messages from message list to composer fails (Milan Crha) + [Composer] Better care of autosave snapshot after WebKitWebProcess crash (Milan Crha) + +Translations: + Kjartan Maraas (nb) + Evolution 3.26.2 2017-10-30 --------------------------- diff -Nru evolution-3.26.2/po/nb.po evolution-3.26.3/po/nb.po --- evolution-3.26.2/po/nb.po 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/po/nb.po 2017-12-11 11:08:06.000000000 +0000 @@ -4,13 +4,14 @@ # Terance Edward Sola , 2005. # Torstein Adolf Winterseth , 2010. # Alexander Strand -#: ../src/shell/main.c:519 +#: ../src/shell/main.c:516 msgid "" msgstr "" "Project-Id-Version: evolution 3.26.x\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-07-27 20:03+0000\n" -"PO-Revision-Date: 2017-07-31 10:30+0200\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +"product=evolution&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2017-10-23 10:08+0000\n" +"PO-Revision-Date: 2017-11-05 12:49+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" "Language: nb\n" @@ -88,7 +89,7 @@ #: ../data/evolution.desktop.in.in.h:9 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845 -#: ../src/e-util/e-send-options.c:544 +#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469 #: ../src/modules/calendar/e-cal-shell-view-actions.c:197 #: ../src/modules/calendar/e-cal-shell-view.c:582 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:21 @@ -99,12 +100,13 @@ #: ../src/mail/importers/elm-importer.c:330 #: ../src/mail/importers/kmail-importer.c:251 #: ../src/mail/importers/pine-importer.c:423 -#: ../src/modules/mail/e-mail-shell-view.c:1247 +#: ../src/modules/mail/e-mail-shell-view.c:1249 #: ../src/smime/gui/certificate-manager.c:1682 msgid "Mail" msgstr "E-post" #: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368 +#: ../src/e-util/e-webdav-browser.c:459 #: ../src/modules/calendar/e-cal-shell-content.c:1719 #: ../src/modules/calendar/e-memo-shell-view-actions.c:194 #: ../src/modules/calendar/e-memo-shell-view-actions.c:209 @@ -113,9 +115,10 @@ msgstr "Notater" #: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696 -#: ../src/calendar/gui/print.c:2408 +#: ../src/calendar/gui/print.c:2418 #: ../src/calendar/importers/icalendar-importer.c:77 -#: ../src/calendar/importers/icalendar-importer.c:1114 +#: ../src/calendar/importers/icalendar-importer.c:1110 +#: ../src/e-util/e-webdav-browser.c:460 #: ../src/modules/calendar/e-calendar-preferences.ui.h:65 #: ../src/modules/calendar/e-cal-shell-content.c:1679 #: ../src/modules/calendar/e-task-shell-view-actions.c:218 @@ -2808,7 +2811,7 @@ msgstr "" #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 -#: ../src/shell/main.c:320 +#: ../src/shell/main.c:317 msgid "Start in offline mode" msgstr "Start i frakoblet modus" @@ -3022,11 +3025,11 @@ msgid "As Sent Folder for Wi_de View" msgstr "Som sendt-mappe for _vertikal visning" -#: ../data/views/memos/galview.xml.h:1 +#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2439 msgid "_Memos" msgstr "_Notater" -#: ../data/views/tasks/galview.xml.h:1 +#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443 #: ../src/plugins/pst-import/pst-importer.c:571 msgid "_Tasks" msgstr "_Oppgaver" @@ -3104,7 +3107,8 @@ msgstr "Denne adresseboken vil bli slettet for godt." #: ../src/addressbook/addressbook.error.xml.h:13 -#: ../src/calendar/calendar.error.xml.h:7 ../src/mail/mail.error.xml.h:69 +#: ../src/calendar/calendar.error.xml.h:7 ../src/e-util/e-system.error.xml.h:27 +#: ../src/mail/mail.error.xml.h:69 msgid "Do _Not Delete" msgstr "Ikke s_lett" @@ -3122,6 +3126,7 @@ #: ../src/addressbook/addressbook.error.xml.h:16 #: ../src/calendar/calendar.error.xml.h:65 +#: ../src/e-util/e-system.error.xml.h:28 msgid "_Delete From Server" msgstr "_Slett fra tjener" @@ -3398,7 +3403,7 @@ #: ../src/e-util/e-source-selector-dialog.c:370 #: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3 #: ../src/e-util/e-timezone-dialog.ui.h:2 -#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4096 +#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4132 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267 #: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194 #: ../src/mail/e-mail-tag-editor.c:168 ../src/mail/em-folder-selector.c:318 @@ -3433,7 +3438,7 @@ #: ../src/composer/e-composer-actions.c:348 #: ../src/e-util/e-attachment-store.c:833 #: ../src/e-util/e-mail-signature-script-dialog.c:370 -#: ../src/e-util/e-web-view.c:4097 +#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4133 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268 #: ../src/shell/e-shell-content.c:640 ../src/shell/e-shell-utils.c:140 #: ../src/smime/gui/certificate-manager.c:666 @@ -3509,7 +3514,7 @@ msgstr "_Hjemmeside:" #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30 -#: ../src/calendar/gui/e-comp-editor-event.c:727 +#: ../src/calendar/gui/e-comp-editor-event.c:725 #: ../src/modules/itip-formatter/itip-view.c:2045 msgid "_Calendar:" msgstr "_Kalender:" @@ -3663,7 +3668,7 @@ #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927 -#: ../src/calendar/gui/e-cal-model.c:3825 +#: ../src/calendar/gui/e-cal-model.c:3805 msgid "Other" msgstr "Andre" @@ -3692,7 +3697,7 @@ #: ../src/e-util/e-mail-signature-manager.c:368 #: ../src/e-util/e-name-selector-dialog.c:1037 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25 -#: ../src/mail/e-mail-config-identity-page.c:870 +#: ../src/mail/e-mail-config-identity-page.c:871 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438 #: ../src/mail/em-folder-properties.c:1037 #: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:62 @@ -3890,7 +3895,7 @@ #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:747 -#: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349 +#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1349 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18 msgid "_OK" msgstr "_OK" @@ -4094,22 +4099,22 @@ msgstr "Kopier _e-postadresse" #: ../src/addressbook/gui/widgets/eab-contact-display.c:187 -#: ../src/e-util/e-web-view.c:368 +#: ../src/e-util/e-web-view.c:370 msgid "Copy the email address to the clipboard" msgstr "Kopier e-postadresser til utklippstavlen" #: ../src/addressbook/gui/widgets/eab-contact-display.c:192 -#: ../src/e-util/e-web-view.c:380 +#: ../src/e-util/e-web-view.c:382 msgid "_Send New Message To..." msgstr "_Send ny melding til …" #: ../src/addressbook/gui/widgets/eab-contact-display.c:194 -#: ../src/e-util/e-web-view.c:382 +#: ../src/e-util/e-web-view.c:384 msgid "Send a mail message to this address" msgstr "Send en e-postmelding til denne adressen" #: ../src/addressbook/gui/widgets/eab-contact-display.c:321 -#: ../src/e-util/e-web-view.c:1349 +#: ../src/e-util/e-web-view.c:1374 #, c-format msgid "Click to mail %s" msgstr "Klikk for å sende melding til %s" @@ -4277,7 +4282,7 @@ #: ../src/calendar/gui/e-cal-model-tasks.c:556 #: ../src/calendar/gui/e-task-table.c:209 #: ../src/calendar/gui/e-task-table.c:224 -#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3586 +#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3596 #: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966 msgid "Cancelled" msgstr "Avbrutt" @@ -4513,6 +4518,7 @@ #: ../src/calendar/gui/e-comp-editor.c:2005 #: ../src/e-util/e-accounts-window.c:1727 ../src/e-util/e-focus-tracker.c:783 #: ../src/e-util/evolution-source-viewer.c:806 +#: ../src/e-util/e-webdav-browser.c:2688 #: ../src/mail/e-mail-account-manager.c:737 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1093 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1524 @@ -4718,7 +4724,7 @@ #. Zoom-out button #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417 -#: ../src/mail/e-mail-reader.c:2415 +#: ../src/mail/e-mail-reader.c:2465 msgid "Zoom _Out" msgstr "Zoom _ut" @@ -4792,8 +4798,8 @@ #: ../src/addressbook/importers/evolution-ldif-importer.c:547 #: ../src/addressbook/importers/evolution-vcard-importer.c:247 #: ../src/calendar/importers/icalendar-importer.c:479 -#: ../src/calendar/importers/icalendar-importer.c:976 -#: ../src/calendar/importers/icalendar-importer.c:1016 +#: ../src/calendar/importers/icalendar-importer.c:972 +#: ../src/calendar/importers/icalendar-importer.c:1012 #: ../src/shell/shell.error.xml.h:1 msgid "Importing..." msgstr "Importerer …" @@ -4994,7 +5000,7 @@ msgstr "Starttid" #: ../src/calendar/alarm-notify/alarm-notify.ui.h:1 -#: ../src/calendar/alarm-notify/alarm-queue.c:1988 +#: ../src/calendar/alarm-notify/alarm-queue.c:2002 msgid "Appointments" msgstr "Avtaler" @@ -5008,11 +5014,12 @@ #: ../src/calendar/alarm-notify/alarm-notify.ui.h:4 #: ../src/calendar/gui/e-comp-editor-page-general.c:1363 -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2238 #: ../src/calendar/gui/e-comp-editor.c:2070 #: ../src/e-util/e-accounts-window.c:1719 #: ../src/e-util/e-html-editor-actions.c:922 -#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/filter.ui.h:24 +#: ../src/e-util/e-mail-signature-manager.c:358 +#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:24 #: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171 #: ../src/mail/e-mail-label-manager.c:380 #: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:66 @@ -5034,8 +5041,8 @@ msgstr "_Lukk" #: ../src/calendar/alarm-notify/alarm-notify.ui.h:7 -#: ../src/calendar/alarm-notify/alarm-queue.c:1955 -#: ../src/calendar/alarm-notify/alarm-queue.c:1965 +#: ../src/calendar/alarm-notify/alarm-queue.c:1969 +#: ../src/calendar/alarm-notify/alarm-queue.c:1979 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249 #: ../src/modules/itip-formatter/itip-view.c:1678 #: ../src/modules/itip-formatter/itip-view.c:1789 @@ -5070,47 +5077,47 @@ msgid "minutes" msgstr "minutter" -#: ../src/calendar/alarm-notify/alarm-queue.c:1756 -#: ../src/calendar/alarm-notify/alarm-queue.c:1936 +#: ../src/calendar/alarm-notify/alarm-queue.c:1770 +#: ../src/calendar/alarm-notify/alarm-queue.c:1950 msgid "No summary available." msgstr "Sammendrag er ikke tilgjengelig." -#: ../src/calendar/alarm-notify/alarm-queue.c:1765 -#: ../src/calendar/alarm-notify/alarm-queue.c:1767 +#: ../src/calendar/alarm-notify/alarm-queue.c:1779 +#: ../src/calendar/alarm-notify/alarm-queue.c:1781 msgid "No description available." msgstr "Ingen beskrivelse tilgjengelig." -#: ../src/calendar/alarm-notify/alarm-queue.c:1775 +#: ../src/calendar/alarm-notify/alarm-queue.c:1789 msgid "No location information available." msgstr "Stedsinformasjon er ikke tilgjengelig." -#: ../src/calendar/alarm-notify/alarm-queue.c:1780 -#: ../src/calendar/alarm-notify/alarm-queue.c:1927 -#: ../src/calendar/alarm-notify/alarm-queue.c:2278 +#: ../src/calendar/alarm-notify/alarm-queue.c:1794 +#: ../src/calendar/alarm-notify/alarm-queue.c:1941 +#: ../src/calendar/alarm-notify/alarm-queue.c:2292 msgid "Evolution Reminders" msgstr "Evolution påminnelser" -#: ../src/calendar/alarm-notify/alarm-queue.c:1823 +#: ../src/calendar/alarm-notify/alarm-queue.c:1837 #, c-format msgid "You have %d reminder" msgid_plural "You have %d reminders" msgstr[0] "Du har %d påminnelse" msgstr[1] "Du har %d påminnelser" -#: ../src/calendar/alarm-notify/alarm-queue.c:2096 +#: ../src/calendar/alarm-notify/alarm-queue.c:2110 msgid "Warning" msgstr "Advarsel" -#: ../src/calendar/alarm-notify/alarm-queue.c:2097 +#: ../src/calendar/alarm-notify/alarm-queue.c:2111 #: ../src/mail/mail-dialogs.ui.h:20 msgid "_No" msgstr "_Nei" -#: ../src/calendar/alarm-notify/alarm-queue.c:2098 +#: ../src/calendar/alarm-notify/alarm-queue.c:2112 msgid "_Yes" msgstr "_Ja" -#: ../src/calendar/alarm-notify/alarm-queue.c:2102 +#: ../src/calendar/alarm-notify/alarm-queue.c:2116 #, c-format msgid "" "An Evolution Calendar reminder is about to trigger. This reminder is " @@ -5126,7 +5133,7 @@ "\n" "Er du sikker på at du vil kjøre dette programmet?" -#: ../src/calendar/alarm-notify/alarm-queue.c:2117 +#: ../src/calendar/alarm-notify/alarm-queue.c:2131 msgid "Do not ask me about this program again." msgstr "Ikke spør meg om dette programmet igjen." @@ -5979,7 +5986,7 @@ msgstr "Eksisterer ikke" #: ../src/calendar/gui/caltypes.xml.in.h:19 -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2003 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2002 msgid "Recurrence" msgstr "Gjeninntreffelse" @@ -6272,7 +6279,7 @@ #: ../src/calendar/gui/e-cal-model-tasks.c:633 #: ../src/calendar/gui/e-task-table.c:205 #: ../src/calendar/gui/e-task-table.c:220 -#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3580 +#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3590 msgid "In Progress" msgstr "Under arbeid" @@ -6283,7 +6290,7 @@ #: ../src/calendar/gui/e-meeting-store.c:225 #: ../src/calendar/gui/e-task-table.c:207 #: ../src/calendar/gui/e-task-table.c:222 -#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3583 +#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3593 #: ../src/calendar/gui/tasktypes.xml.in.h:13 #: ../src/plugins/save-calendar/csv-format.c:377 msgid "Completed" @@ -6294,7 +6301,7 @@ #: ../src/calendar/gui/e-cal-model-tasks.c:550 #: ../src/calendar/gui/e-task-table.c:203 #: ../src/calendar/gui/e-task-table.c:218 -#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3577 +#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3587 #: ../src/calendar/gui/tasktypes.xml.in.h:11 msgid "Not Started" msgstr "Ikke startet" @@ -6306,7 +6313,7 @@ #: ../src/calendar/gui/e-cal-component-preview.c:327 #: ../src/calendar/gui/e-task-table.c:548 #: ../src/calendar/gui/tasktypes.xml.in.h:19 -#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:322 +#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:323 msgid "High" msgstr "Høy" @@ -6314,19 +6321,19 @@ #: ../src/calendar/gui/e-cal-model.c:1890 #: ../src/calendar/gui/e-task-table.c:549 #: ../src/calendar/gui/tasktypes.xml.in.h:20 -#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:321 +#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:322 msgid "Normal" msgstr "Normal" #: ../src/calendar/gui/e-cal-component-preview.c:331 #: ../src/calendar/gui/e-task-table.c:550 #: ../src/calendar/gui/tasktypes.xml.in.h:21 -#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:320 +#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:321 msgid "Low" msgstr "Lav" #: ../src/calendar/gui/e-cal-component-preview.c:350 -#: ../src/mail/e-mail-config-service-page.c:536 +#: ../src/mail/e-mail-config-service-page.c:531 msgid "Description:" msgstr "Beskrivelse:" @@ -6548,7 +6555,7 @@ #. Translators: It will display "Location: LocationOfTheAppointment" #: ../src/calendar/gui/e-calendar-view.c:1851 #: ../src/calendar/gui/e-meeting-time-sel.c:2731 -#: ../src/calendar/gui/e-to-do-pane.c:343 ../src/calendar/gui/print.c:3531 +#: ../src/calendar/gui/e-to-do-pane.c:343 ../src/calendar/gui/print.c:3541 #, c-format msgid "Location: %s" msgstr "Sted: %s" @@ -6637,8 +6644,8 @@ #: ../src/calendar/gui/e-meeting-list-view.c:197 #: ../src/calendar/gui/e-meeting-store.c:132 #: ../src/calendar/gui/e-meeting-store.c:167 -#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247 -#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49 +#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1257 +#: ../src/calendar/gui/print.c:1274 ../src/e-util/e-charset.c:49 #: ../src/modules/itip-formatter/itip-view.c:3412 #: ../src/modules/itip-formatter/itip-view.c:6082 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97 @@ -6691,7 +6698,7 @@ msgid "No" msgstr "Nei" -#: ../src/calendar/gui/e-cal-model.c:3820 +#: ../src/calendar/gui/e-cal-model.c:3800 #: ../src/calendar/gui/e-meeting-list-view.c:219 #: ../src/calendar/gui/e-meeting-store.c:194 #: ../src/calendar/gui/e-meeting-store.c:217 @@ -6699,7 +6706,7 @@ msgid "Accepted" msgstr "Godtatt" -#: ../src/calendar/gui/e-cal-model.c:3821 +#: ../src/calendar/gui/e-cal-model.c:3801 #: ../src/calendar/gui/e-meeting-list-view.c:220 #: ../src/calendar/gui/e-meeting-store.c:196 #: ../src/calendar/gui/e-meeting-store.c:219 @@ -6707,7 +6714,7 @@ msgid "Declined" msgstr "Avslått" -#: ../src/calendar/gui/e-cal-model.c:3822 +#: ../src/calendar/gui/e-cal-model.c:3802 #: ../src/calendar/gui/e-meeting-list-view.c:221 #: ../src/calendar/gui/e-meeting-store.c:198 #: ../src/calendar/gui/e-meeting-store.c:221 @@ -6715,7 +6722,7 @@ msgid "Tentative" msgstr "Tentativ" -#: ../src/calendar/gui/e-cal-model.c:3823 +#: ../src/calendar/gui/e-cal-model.c:3803 #: ../src/calendar/gui/e-meeting-list-view.c:222 #: ../src/calendar/gui/e-meeting-store.c:200 #: ../src/calendar/gui/e-meeting-store.c:223 @@ -6723,13 +6730,13 @@ msgid "Delegated" msgstr "Delegert" -#: ../src/calendar/gui/e-cal-model.c:3824 +#: ../src/calendar/gui/e-cal-model.c:3804 msgid "Needs action" msgstr "Krever handling" #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form: #. * Status: Accepted: X Declined: Y ... -#: ../src/calendar/gui/e-cal-model.c:3879 +#: ../src/calendar/gui/e-cal-model.c:3859 #: ../src/calendar/gui/e-meeting-list-view.c:687 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9 #: ../src/calendar/gui/e-task-table.etspec.h:11 @@ -6778,15 +6785,15 @@ msgid "Modifying a task" msgstr "Endrer en oppgave" -#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1812 +#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1813 msgid "Removing an event" msgstr "Fjerner en hendelse" -#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1816 +#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1817 msgid "Removing a memo" msgstr "Fjerner et notat" -#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1820 +#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1821 msgid "Removing a task" msgstr "Fjerner en oppgave" @@ -6998,119 +7005,119 @@ msgid "End time is not a valid time" msgstr "Slutttid er ikke en gyldig tid" -#: ../src/calendar/gui/e-comp-editor-event.c:586 +#: ../src/calendar/gui/e-comp-editor-event.c:584 #: ../src/calendar/gui/e-comp-editor-memo.c:126 #: ../src/calendar/gui/e-comp-editor-task.c:591 msgid "_Categories" msgstr "_Kategorier" -#: ../src/calendar/gui/e-comp-editor-event.c:588 +#: ../src/calendar/gui/e-comp-editor-event.c:586 #: ../src/calendar/gui/e-comp-editor-memo.c:128 #: ../src/calendar/gui/e-comp-editor-task.c:593 msgid "Toggles whether to display categories" msgstr "Slår av/på visning av kategorier" -#: ../src/calendar/gui/e-comp-editor-event.c:594 +#: ../src/calendar/gui/e-comp-editor-event.c:592 #: ../src/calendar/gui/e-comp-editor-task.c:599 msgid "Time _Zone" msgstr "Tids_sone" -#: ../src/calendar/gui/e-comp-editor-event.c:596 +#: ../src/calendar/gui/e-comp-editor-event.c:594 #: ../src/calendar/gui/e-comp-editor-task.c:601 msgid "Toggles whether the time zone is displayed" msgstr "Slår av/på visning av tidssone" -#: ../src/calendar/gui/e-comp-editor-event.c:602 +#: ../src/calendar/gui/e-comp-editor-event.c:600 msgid "All _Day Event" msgstr "Avtale som varer hele _dagen" -#: ../src/calendar/gui/e-comp-editor-event.c:604 +#: ../src/calendar/gui/e-comp-editor-event.c:602 msgid "Toggles whether to have All Day Event" msgstr "Slår av/på hendelser som varer hele dagen" -#: ../src/calendar/gui/e-comp-editor-event.c:610 +#: ../src/calendar/gui/e-comp-editor-event.c:608 msgid "Show Time as _Busy" msgstr "Vis tiden som _opptatt" -#: ../src/calendar/gui/e-comp-editor-event.c:612 +#: ../src/calendar/gui/e-comp-editor-event.c:610 msgid "Toggles whether to show time as busy" msgstr "Slår av/på visning av tid som opptatt" -#: ../src/calendar/gui/e-comp-editor-event.c:621 +#: ../src/calendar/gui/e-comp-editor-event.c:619 msgid "Pu_blic" msgstr "O_ffentlig" -#: ../src/calendar/gui/e-comp-editor-event.c:623 +#: ../src/calendar/gui/e-comp-editor-event.c:621 msgid "Classify as public" msgstr "Klassifiser som offentlig" -#: ../src/calendar/gui/e-comp-editor-event.c:628 +#: ../src/calendar/gui/e-comp-editor-event.c:626 msgid "_Private" msgstr "_Privat" -#: ../src/calendar/gui/e-comp-editor-event.c:630 +#: ../src/calendar/gui/e-comp-editor-event.c:628 msgid "Classify as private" msgstr "Klassifiser som privat" -#: ../src/calendar/gui/e-comp-editor-event.c:635 +#: ../src/calendar/gui/e-comp-editor-event.c:633 msgid "_Confidential" msgstr "_Konfidensiell" -#: ../src/calendar/gui/e-comp-editor-event.c:637 +#: ../src/calendar/gui/e-comp-editor-event.c:635 msgid "Classify as confidential" msgstr "Klassifiser som konfidensiell" -#: ../src/calendar/gui/e-comp-editor-event.c:738 +#: ../src/calendar/gui/e-comp-editor-event.c:736 msgctxt "ECompEditor" msgid "_Start time:" msgstr "_Starttid:" -#: ../src/calendar/gui/e-comp-editor-event.c:743 +#: ../src/calendar/gui/e-comp-editor-event.c:741 msgctxt "ECompEditor" msgid "_End time:" msgstr "S_lutt-tid:" -#: ../src/calendar/gui/e-comp-editor-event.c:753 +#: ../src/calendar/gui/e-comp-editor-event.c:751 msgctxt "ECompEditor" msgid "All da_y event" msgstr "Avtale som varer hele _dagen" -#: ../src/calendar/gui/e-comp-editor-event.c:806 +#: ../src/calendar/gui/e-comp-editor-event.c:804 #: ../src/calendar/gui/e-comp-editor-memo.c:213 #: ../src/calendar/gui/e-comp-editor-task.c:765 msgctxt "ECompEditorPage" msgid "General" msgstr "Generelt" -#: ../src/calendar/gui/e-comp-editor-event.c:809 +#: ../src/calendar/gui/e-comp-editor-event.c:807 #: ../src/calendar/gui/e-comp-editor-task.c:782 msgctxt "ECompEditorPage" msgid "Reminders" msgstr "Påminnelser" -#: ../src/calendar/gui/e-comp-editor-event.c:812 +#: ../src/calendar/gui/e-comp-editor-event.c:810 msgctxt "ECompEditorPage" msgid "Recurrence" msgstr "Gjeninntreffelse" -#: ../src/calendar/gui/e-comp-editor-event.c:815 +#: ../src/calendar/gui/e-comp-editor-event.c:813 #: ../src/calendar/gui/e-comp-editor-memo.c:216 #: ../src/calendar/gui/e-comp-editor-task.c:785 msgctxt "ECompEditorPage" msgid "Attachments" msgstr "Vedlegg" -#: ../src/calendar/gui/e-comp-editor-event.c:825 +#: ../src/calendar/gui/e-comp-editor-event.c:823 msgctxt "ECompEditorPage" msgid "Schedule" msgstr "Planlegg" -#: ../src/calendar/gui/e-comp-editor-event.c:857 +#: ../src/calendar/gui/e-comp-editor-event.c:855 #, c-format msgid "Meeting — %s" msgstr "Møte – %s" -#: ../src/calendar/gui/e-comp-editor-event.c:858 +#: ../src/calendar/gui/e-comp-editor-event.c:856 #, c-format msgid "Appointment — %s" msgstr "Avtale – %s" @@ -7451,117 +7458,117 @@ msgstr "gjentakelser" #. Translators: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1485 -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2015 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1484 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2014 msgctxt "ECompEditorPageRecur" msgid "This appointment rec_urs" msgstr "Denne avtalen _gjeninntreffer" #. Translators: Entire string is for example: 'This task recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1490 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1489 msgctxt "ECompEditorPageRecur" msgid "This task rec_urs" msgstr "Denne oppgaven _gjeninntreffer" #. Translators: Entire string is for example: 'This memo recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1495 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1494 msgctxt "ECompEditorPageRecur" msgid "This memo rec_urs" msgstr "Dette notatet _gjeninntreffer" #. Translators: Entire string is for example: 'This component recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1500 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1499 msgctxt "ECompEditorPageRecur" msgid "This component rec_urs" msgstr "Denne komponenten _gjeninntreffer" -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1861 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1860 msgid "Recurrence exception date is invalid" msgstr "Dato for gjeninntreffelse er ugyldig" -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1909 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1908 msgid "End time of the recurrence is before the start" msgstr "Slutt for gjentakelse er før hendelsens start" -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1952 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1951 msgid "R_ecurrence" msgstr "Gj_eninntreffelse" -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1954 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1953 msgid "Set or unset recurrence" msgstr "Sett eller fjern gjeninntreffelse" #. Translators: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2054 msgctxt "ECompEditorPageRecur" msgid "Every" msgstr "Hver" #. Translators: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2089 msgctxt "ECompEditorPageRecur" msgid "day(s)" msgstr "dag(er)" #. Translators: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2091 msgctxt "ECompEditorPageRecur" msgid "week(s)" msgstr "uke(r)" #. Translators: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2093 msgctxt "ECompEditorPageRecur" msgid "month(s)" msgstr "måned(er)" #. Translators: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2095 msgctxt "ECompEditorPageRecur" msgid "year(s)" msgstr "år" #. Translators: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2124 msgctxt "ECompEditorPageRecur" msgid "for" msgstr "i" #. Translators: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2126 msgctxt "ECompEditorPageRecur" msgid "until" msgstr "til" #. Translators: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2128 msgctxt "ECompEditorPageRecur" msgid "forever" msgstr "alltid" -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2144 msgid "This appointment contains recurrences that Evolution cannot edit." msgstr "" "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution." -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2162 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2161 msgid "Exceptions" msgstr "Unntak" -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2230 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777 -#: ../src/mail/e-mail-config-identity-page.c:852 +#: ../src/mail/e-mail-config-identity-page.c:853 #: ../src/mail/mail-config.ui.h:65 msgid "A_dd" msgstr "L_egg til" -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2246 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785 #: ../src/mail/mail-config.ui.h:67 msgid "Re_move" msgstr "Fjer_n" -#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2255 +#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2254 msgid "Preview" msgstr "Forhåndsvis" @@ -7959,15 +7966,15 @@ #. copy menu item #: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773 #: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110 -#: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134 +#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:134 #: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838 msgid "_Copy" msgstr "_Kopier" #: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173 #: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282 -#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409 -#: ../src/e-util/e-web-view.c:1977 ../src/mail/e-mail-browser.c:136 +#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:411 +#: ../src/e-util/e-web-view.c:2003 ../src/mail/e-mail-browser.c:136 #: ../src/shell/e-shell-window-actions.c:840 msgid "Copy the selection" msgstr "Kopier utvalget" @@ -7981,7 +7988,7 @@ #: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166 #: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276 -#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1986 +#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2012 #: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:847 msgid "Cut the selection" msgstr "Klipp ut utvalget" @@ -8005,19 +8012,19 @@ #: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180 #: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288 -#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1995 +#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2021 #: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:875 msgid "Paste the clipboard" msgstr "Lim inn fra utklippstavlen" #: ../src/calendar/gui/e-comp-editor.c:2026 -#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2317 +#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2367 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1235 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1249 msgid "_Print..." msgstr "S_kriv ut …" -#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2324 +#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2374 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1242 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1744 #: ../src/modules/calendar/e-memo-shell-view-actions.c:813 @@ -8026,7 +8033,7 @@ msgstr "Forhånds_vis …" #: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788 -#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417 +#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:419 #: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:950 msgid "Select _All" msgstr "Velg _alle" @@ -8080,17 +8087,17 @@ #. String to use in 12-hour time format for times in the morning. #: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-to-do-pane.c:239 -#: ../src/calendar/gui/e-week-view.c:1726 ../src/calendar/gui/print.c:1070 -#: ../src/calendar/gui/print.c:1089 ../src/calendar/gui/print.c:2626 -#: ../src/calendar/gui/print.c:2646 +#: ../src/calendar/gui/e-week-view.c:1726 ../src/calendar/gui/print.c:1080 +#: ../src/calendar/gui/print.c:1099 ../src/calendar/gui/print.c:2636 +#: ../src/calendar/gui/print.c:2656 msgid "am" msgstr "am" #. String to use in 12-hour time format for times in the afternoon. #: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-to-do-pane.c:243 -#: ../src/calendar/gui/e-week-view.c:1729 ../src/calendar/gui/print.c:1075 -#: ../src/calendar/gui/print.c:1091 ../src/calendar/gui/print.c:2631 -#: ../src/calendar/gui/print.c:2648 +#: ../src/calendar/gui/e-week-view.c:1729 ../src/calendar/gui/print.c:1085 +#: ../src/calendar/gui/print.c:1101 ../src/calendar/gui/print.c:2641 +#: ../src/calendar/gui/print.c:2658 msgid "pm" msgstr "pm" @@ -8103,7 +8110,7 @@ #: ../src/calendar/gui/e-day-view.c:3045 #: ../src/calendar/gui/e-day-view-top-item.c:841 #: ../src/calendar/gui/e-week-view-main-item.c:205 -#: ../src/calendar/gui/print.c:2093 +#: ../src/calendar/gui/print.c:2103 msgid "%A %d %B" msgstr "%A %d %B" @@ -8166,51 +8173,51 @@ #: ../src/calendar/gui/e-meeting-list-view.c:179 #: ../src/calendar/gui/e-meeting-store.c:107 #: ../src/calendar/gui/e-meeting-store.c:124 -#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1243 +#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1253 msgid "Individual" msgstr "Individuell" #: ../src/calendar/gui/e-meeting-list-view.c:180 #: ../src/calendar/gui/e-meeting-store.c:109 -#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1244 +#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1254 #: ../src/e-util/e-table-config.ui.h:1 msgid "Group" msgstr "Gruppe" #: ../src/calendar/gui/e-meeting-list-view.c:181 #: ../src/calendar/gui/e-meeting-store.c:111 -#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1245 +#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1255 msgid "Resource" msgstr "Ressurs" #: ../src/calendar/gui/e-meeting-list-view.c:182 #: ../src/calendar/gui/e-meeting-store.c:113 -#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1246 +#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1256 msgid "Room" msgstr "Rom" #: ../src/calendar/gui/e-meeting-list-view.c:193 #: ../src/calendar/gui/e-meeting-store.c:142 -#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1260 +#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1270 msgid "Chair" msgstr "Styremedlem" #: ../src/calendar/gui/e-meeting-list-view.c:194 #: ../src/calendar/gui/e-meeting-store.c:144 #: ../src/calendar/gui/e-meeting-store.c:161 -#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1261 +#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1271 msgid "Required Participant" msgstr "Obligatorisk deltaker" #: ../src/calendar/gui/e-meeting-list-view.c:195 #: ../src/calendar/gui/e-meeting-store.c:146 -#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1262 +#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1272 msgid "Optional Participant" msgstr "Valgfri deltaker" #: ../src/calendar/gui/e-meeting-list-view.c:196 #: ../src/calendar/gui/e-meeting-store.c:148 -#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1263 +#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1273 msgid "Non-Participant" msgstr "Ikke-deltaker" @@ -8231,6 +8238,7 @@ #: ../src/calendar/gui/e-task-table.etspec.h:3 #: ../src/e-util/e-accounts-window.c:1370 #: ../src/e-util/e-attachment-tree-view.c:205 +#: ../src/e-util/e-webdav-browser.c:2381 #: ../src/mail/e-mail-account-tree-view.c:158 msgid "Type" msgstr "Type" @@ -8338,7 +8346,7 @@ "Sted: %s" #: ../src/calendar/gui/e-meeting-time-sel.c:2729 -#: ../src/calendar/gui/print.c:3520 +#: ../src/calendar/gui/print.c:3530 #, c-format msgid "Summary: %s" msgstr "Sammendrag: %s" @@ -8493,7 +8501,7 @@ msgstr "Fullført: %s" #. strftime format of a weekday and a date. -#: ../src/calendar/gui/e-to-do-pane.c:1328 ../src/e-util/e-cell-date-edit.c:328 +#: ../src/calendar/gui/e-to-do-pane.c:1329 ../src/e-util/e-cell-date-edit.c:328 #: ../src/e-util/e-datetime-format.c:206 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1842 #: ../src/modules/itip-formatter/itip-view.c:253 @@ -8501,47 +8509,47 @@ msgstr "I dag" #. strftime format of a weekday and a date. -#: ../src/calendar/gui/e-to-do-pane.c:1330 +#: ../src/calendar/gui/e-to-do-pane.c:1331 #: ../src/e-util/e-datetime-format.c:217 #: ../src/modules/itip-formatter/itip-view.c:281 msgid "Tomorrow" msgstr "I morgen" -#: ../src/calendar/gui/e-to-do-pane.c:1892 +#: ../src/calendar/gui/e-to-do-pane.c:1893 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1449 msgid "New _Appointment..." msgstr "Ny _avtale …" -#: ../src/calendar/gui/e-to-do-pane.c:1900 +#: ../src/calendar/gui/e-to-do-pane.c:1901 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1435 msgid "New _Meeting..." msgstr "Nytt _møte …" -#: ../src/calendar/gui/e-to-do-pane.c:1908 +#: ../src/calendar/gui/e-to-do-pane.c:1909 msgid "New _Task..." msgstr "Ny _oppgave …" -#: ../src/calendar/gui/e-to-do-pane.c:1916 +#: ../src/calendar/gui/e-to-do-pane.c:1917 msgid "_New Assigned Task..." msgstr "_Ny tildelt oppgave …" -#: ../src/calendar/gui/e-to-do-pane.c:1929 +#: ../src/calendar/gui/e-to-do-pane.c:1930 msgid "_Open..." msgstr "_Åpne …" -#: ../src/calendar/gui/e-to-do-pane.c:1943 +#: ../src/calendar/gui/e-to-do-pane.c:1944 msgid "_Delete This Instance..." msgstr "Slett denne _hendelsen …" -#: ../src/calendar/gui/e-to-do-pane.c:1951 +#: ../src/calendar/gui/e-to-do-pane.c:1952 msgid "D_elete All Instances..." msgstr "Sl_ett alle instanser …" -#: ../src/calendar/gui/e-to-do-pane.c:1959 +#: ../src/calendar/gui/e-to-do-pane.c:1960 msgid "_Delete..." msgstr "_Slett …" -#: ../src/calendar/gui/e-to-do-pane.c:2249 +#: ../src/calendar/gui/e-to-do-pane.c:2250 msgid "To Do" msgstr "Oppgaver" @@ -8549,36 +8557,36 @@ #. * month name. You can change the order but don't #. * change the specifiers or add anything. #: ../src/calendar/gui/e-week-view-main-item.c:222 -#: ../src/calendar/gui/print.c:2072 +#: ../src/calendar/gui/print.c:2082 msgid "%d %B" msgstr "%d %B" -#: ../src/calendar/gui/itip-utils.c:793 ../src/calendar/gui/itip-utils.c:855 -#: ../src/calendar/gui/itip-utils.c:989 +#: ../src/calendar/gui/itip-utils.c:796 ../src/calendar/gui/itip-utils.c:858 +#: ../src/calendar/gui/itip-utils.c:992 msgid "An organizer must be set." msgstr "En organisator må oppgis." -#: ../src/calendar/gui/itip-utils.c:846 +#: ../src/calendar/gui/itip-utils.c:849 msgid "At least one attendee is necessary" msgstr "Minst en deltaker kreves" -#: ../src/calendar/gui/itip-utils.c:1077 ../src/calendar/gui/itip-utils.c:1238 +#: ../src/calendar/gui/itip-utils.c:1080 ../src/calendar/gui/itip-utils.c:1241 msgid "Event information" msgstr "Hendelsesinformasjon" -#: ../src/calendar/gui/itip-utils.c:1080 ../src/calendar/gui/itip-utils.c:1241 +#: ../src/calendar/gui/itip-utils.c:1083 ../src/calendar/gui/itip-utils.c:1244 msgid "Task information" msgstr "Oppgaveinformasjon" -#: ../src/calendar/gui/itip-utils.c:1083 ../src/calendar/gui/itip-utils.c:1244 +#: ../src/calendar/gui/itip-utils.c:1086 ../src/calendar/gui/itip-utils.c:1247 msgid "Memo information" msgstr "Informasjon om notat" -#: ../src/calendar/gui/itip-utils.c:1086 ../src/calendar/gui/itip-utils.c:1262 +#: ../src/calendar/gui/itip-utils.c:1089 ../src/calendar/gui/itip-utils.c:1265 msgid "Free/Busy information" msgstr "Ledig/opptatt-informasjon" -#: ../src/calendar/gui/itip-utils.c:1089 +#: ../src/calendar/gui/itip-utils.c:1092 msgid "Calendar information" msgstr "Kalenderinformasjon" @@ -8586,7 +8594,7 @@ #. * line of a meeting request or update email. #. * The full subject line would be: #. * "Accepted: Meeting Name". -#: ../src/calendar/gui/itip-utils.c:1126 +#: ../src/calendar/gui/itip-utils.c:1129 msgctxt "Meeting" msgid "Accepted" msgstr "Godtatt" @@ -8595,7 +8603,7 @@ #. * line of a meeting request or update email. #. * The full subject line would be: #. * "Tentatively Accepted: Meeting Name". -#: ../src/calendar/gui/itip-utils.c:1133 +#: ../src/calendar/gui/itip-utils.c:1136 msgctxt "Meeting" msgid "Tentatively Accepted" msgstr "Akseptert tentativt" @@ -8607,7 +8615,7 @@ #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Declined: Meeting Name". -#: ../src/calendar/gui/itip-utils.c:1140 ../src/calendar/gui/itip-utils.c:1188 +#: ../src/calendar/gui/itip-utils.c:1143 ../src/calendar/gui/itip-utils.c:1191 msgctxt "Meeting" msgid "Declined" msgstr "Avslått" @@ -8616,7 +8624,7 @@ #. * line of a meeting request or update email. #. * The full subject line would be: #. * "Delegated: Meeting Name". -#: ../src/calendar/gui/itip-utils.c:1147 +#: ../src/calendar/gui/itip-utils.c:1150 msgctxt "Meeting" msgid "Delegated" msgstr "Delegert" @@ -8624,7 +8632,7 @@ #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Updated: Meeting Name". -#: ../src/calendar/gui/itip-utils.c:1160 +#: ../src/calendar/gui/itip-utils.c:1163 msgctxt "Meeting" msgid "Updated" msgstr "Oppdatert" @@ -8632,7 +8640,7 @@ #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Cancel: Meeting Name". -#: ../src/calendar/gui/itip-utils.c:1167 +#: ../src/calendar/gui/itip-utils.c:1170 msgctxt "Meeting" msgid "Cancel" msgstr "Avbryt" @@ -8640,7 +8648,7 @@ #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Refresh: Meeting Name". -#: ../src/calendar/gui/itip-utils.c:1174 +#: ../src/calendar/gui/itip-utils.c:1177 msgctxt "Meeting" msgid "Refresh" msgstr "Oppdater" @@ -8648,168 +8656,168 @@ #. Translators: This is part of the subject line of a #. * meeting request or update email. The full subject #. * line would be: "Counter-proposal: Meeting Name". -#: ../src/calendar/gui/itip-utils.c:1181 +#: ../src/calendar/gui/itip-utils.c:1184 msgctxt "Meeting" msgid "Counter-proposal" msgstr "Motforslag" -#: ../src/calendar/gui/itip-utils.c:1259 +#: ../src/calendar/gui/itip-utils.c:1262 #, c-format msgid "Free/Busy information (%s to %s)" msgstr "Ledig/opptatt-informasjon (%s til %s)" -#: ../src/calendar/gui/itip-utils.c:1267 +#: ../src/calendar/gui/itip-utils.c:1270 msgid "iCalendar information" msgstr "iCalendar-informasjon" -#: ../src/calendar/gui/itip-utils.c:1296 +#: ../src/calendar/gui/itip-utils.c:1299 #, c-format msgid "Unable to book a resource, the new event collides with some other." msgstr "" "Klarer ikke å bestille en ressurs. Den nye hendelsen er i konflikt med en " "annen." -#: ../src/calendar/gui/itip-utils.c:1301 +#: ../src/calendar/gui/itip-utils.c:1304 msgid "Unable to book a resource, error: " msgstr "Kan ikke bestille en ressurs. Feil: " -#: ../src/calendar/gui/itip-utils.c:1472 +#: ../src/calendar/gui/itip-utils.c:1475 msgid "You must be an attendee of the event." msgstr "Du må være en deltager i hendelsen." -#: ../src/calendar/gui/itip-utils.c:2153 +#: ../src/calendar/gui/itip-utils.c:2220 msgid "Sending an event" msgstr "Sender en hendelse" -#: ../src/calendar/gui/itip-utils.c:2157 +#: ../src/calendar/gui/itip-utils.c:2224 msgid "Sending a memo" msgstr "Sender et notat" -#: ../src/calendar/gui/itip-utils.c:2161 +#: ../src/calendar/gui/itip-utils.c:2228 msgid "Sending a task" msgstr "Sender en oppgave" -#: ../src/calendar/gui/print.c:661 +#: ../src/calendar/gui/print.c:665 msgid "1st" msgstr "1" -#: ../src/calendar/gui/print.c:661 +#: ../src/calendar/gui/print.c:665 msgid "2nd" msgstr "2" -#: ../src/calendar/gui/print.c:661 +#: ../src/calendar/gui/print.c:665 msgid "3rd" msgstr "3" -#: ../src/calendar/gui/print.c:661 +#: ../src/calendar/gui/print.c:665 msgid "4th" msgstr "4" -#: ../src/calendar/gui/print.c:661 +#: ../src/calendar/gui/print.c:665 msgid "5th" msgstr "5" -#: ../src/calendar/gui/print.c:662 +#: ../src/calendar/gui/print.c:666 msgid "6th" msgstr "6" -#: ../src/calendar/gui/print.c:662 +#: ../src/calendar/gui/print.c:666 msgid "7th" msgstr "7" -#: ../src/calendar/gui/print.c:662 +#: ../src/calendar/gui/print.c:666 msgid "8th" msgstr "8" -#: ../src/calendar/gui/print.c:662 +#: ../src/calendar/gui/print.c:666 msgid "9th" msgstr "9" -#: ../src/calendar/gui/print.c:662 +#: ../src/calendar/gui/print.c:666 msgid "10th" msgstr "10" -#: ../src/calendar/gui/print.c:663 +#: ../src/calendar/gui/print.c:667 msgid "11th" msgstr "11" -#: ../src/calendar/gui/print.c:663 +#: ../src/calendar/gui/print.c:667 msgid "12th" msgstr "12" -#: ../src/calendar/gui/print.c:663 +#: ../src/calendar/gui/print.c:667 msgid "13th" msgstr "13" -#: ../src/calendar/gui/print.c:663 +#: ../src/calendar/gui/print.c:667 msgid "14th" msgstr "14" -#: ../src/calendar/gui/print.c:663 +#: ../src/calendar/gui/print.c:667 msgid "15th" msgstr "15" -#: ../src/calendar/gui/print.c:664 +#: ../src/calendar/gui/print.c:668 msgid "16th" msgstr "16" -#: ../src/calendar/gui/print.c:664 +#: ../src/calendar/gui/print.c:668 msgid "17th" msgstr "17" -#: ../src/calendar/gui/print.c:664 +#: ../src/calendar/gui/print.c:668 msgid "18th" msgstr "18" -#: ../src/calendar/gui/print.c:664 +#: ../src/calendar/gui/print.c:668 msgid "19th" msgstr "19" -#: ../src/calendar/gui/print.c:664 +#: ../src/calendar/gui/print.c:668 msgid "20th" msgstr "20" -#: ../src/calendar/gui/print.c:665 +#: ../src/calendar/gui/print.c:669 msgid "21st" msgstr "21" -#: ../src/calendar/gui/print.c:665 +#: ../src/calendar/gui/print.c:669 msgid "22nd" msgstr "22" -#: ../src/calendar/gui/print.c:665 +#: ../src/calendar/gui/print.c:669 msgid "23rd" msgstr "23" -#: ../src/calendar/gui/print.c:665 +#: ../src/calendar/gui/print.c:669 msgid "24th" msgstr "24" -#: ../src/calendar/gui/print.c:665 +#: ../src/calendar/gui/print.c:669 msgid "25th" msgstr "25" -#: ../src/calendar/gui/print.c:666 +#: ../src/calendar/gui/print.c:670 msgid "26th" msgstr "26" -#: ../src/calendar/gui/print.c:666 +#: ../src/calendar/gui/print.c:670 msgid "27th" msgstr "27" -#: ../src/calendar/gui/print.c:666 +#: ../src/calendar/gui/print.c:670 msgid "28th" msgstr "28" -#: ../src/calendar/gui/print.c:666 +#: ../src/calendar/gui/print.c:670 msgid "29th" msgstr "29" -#: ../src/calendar/gui/print.c:666 +#: ../src/calendar/gui/print.c:670 msgid "30th" msgstr "30" -#: ../src/calendar/gui/print.c:667 +#: ../src/calendar/gui/print.c:671 msgid "31st" msgstr "31" @@ -8817,114 +8825,114 @@ #. Translators: These are workday abbreviations, #. * e.g. Su=Sunday and Th=thursday #. G_DATE_MONDAY -#: ../src/calendar/gui/print.c:727 +#: ../src/calendar/gui/print.c:731 msgid "Mo" msgstr "Ma." #. G_DATE_TUESDAY -#: ../src/calendar/gui/print.c:728 +#: ../src/calendar/gui/print.c:732 msgid "Tu" msgstr "Ti." #. G_DATE_WEDNESDAY -#: ../src/calendar/gui/print.c:729 +#: ../src/calendar/gui/print.c:733 msgid "We" msgstr "On." #. G_DATE_THURSDAY -#: ../src/calendar/gui/print.c:730 +#: ../src/calendar/gui/print.c:734 msgid "Th" msgstr "To." #. G_DATE_FRIDAY -#: ../src/calendar/gui/print.c:731 +#: ../src/calendar/gui/print.c:735 msgid "Fr" msgstr "Fr." #. G_DATE_SATURDAY -#: ../src/calendar/gui/print.c:732 +#: ../src/calendar/gui/print.c:736 msgid "Sa" msgstr "Lø." #. G_DATE_SUNDAY -#: ../src/calendar/gui/print.c:733 +#: ../src/calendar/gui/print.c:737 msgid "Su" msgstr "Sø." #. Translators: This is part of "START to END" text, #. * where START and END are date/times. -#: ../src/calendar/gui/print.c:3313 +#: ../src/calendar/gui/print.c:3323 msgid " to " msgstr " til " #. Translators: This is part of "START to END #. * (Completed COMPLETED)", where COMPLETED is a #. * completed date/time. -#: ../src/calendar/gui/print.c:3323 +#: ../src/calendar/gui/print.c:3333 msgid " (Completed " msgstr " (Fullført " #. Translators: This is part of "Completed COMPLETED", #. * where COMPLETED is a completed date/time. -#: ../src/calendar/gui/print.c:3329 +#: ../src/calendar/gui/print.c:3339 msgid "Completed " msgstr "Fullført " #. Translators: This is part of "START (Due DUE)", #. * where START and DUE are dates/times. -#: ../src/calendar/gui/print.c:3339 +#: ../src/calendar/gui/print.c:3349 msgid " (Due " msgstr " (Ferdig " #. Translators: This is part of "Due DUE", #. * where DUE is a date/time due the event #. * should be finished. -#: ../src/calendar/gui/print.c:3346 +#: ../src/calendar/gui/print.c:3356 msgid "Due " msgstr "Ferdig " -#: ../src/calendar/gui/print.c:3490 +#: ../src/calendar/gui/print.c:3500 msgid "Appointment" msgstr "Avtale" -#: ../src/calendar/gui/print.c:3492 ../src/e-util/e-send-options.c:551 +#: ../src/calendar/gui/print.c:3502 ../src/e-util/e-send-options.c:551 msgid "Task" msgstr "Oppgave" -#: ../src/calendar/gui/print.c:3494 +#: ../src/calendar/gui/print.c:3504 msgid "Memo" msgstr "Notat" -#: ../src/calendar/gui/print.c:3550 +#: ../src/calendar/gui/print.c:3560 msgid "Attendees: " msgstr "Deltakere: " -#: ../src/calendar/gui/print.c:3594 +#: ../src/calendar/gui/print.c:3604 #, c-format msgid "Status: %s" msgstr "Status: %s" -#: ../src/calendar/gui/print.c:3610 +#: ../src/calendar/gui/print.c:3620 #, c-format msgid "Priority: %s" msgstr "Prioritet: %s" -#: ../src/calendar/gui/print.c:3628 +#: ../src/calendar/gui/print.c:3638 #, c-format msgid "Percent Complete: %i" msgstr "Prosent fullført: %i" -#: ../src/calendar/gui/print.c:3642 +#: ../src/calendar/gui/print.c:3652 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: ../src/calendar/gui/print.c:3656 +#: ../src/calendar/gui/print.c:3666 #, c-format msgid "Categories: %s" msgstr "Kategorier: %s" -#: ../src/calendar/gui/print.c:3667 +#: ../src/calendar/gui/print.c:3677 msgid "Contacts: " msgstr "Kontakter: " @@ -8976,183 +8984,183 @@ msgstr "L_ag en ny oppgaveliste" #: ../src/calendar/importers/icalendar-importer.c:501 -#: ../src/calendar/importers/icalendar-importer.c:944 +#: ../src/calendar/importers/icalendar-importer.c:940 msgid "Opening calendar" msgstr "Åpner kalender" -#: ../src/calendar/importers/icalendar-importer.c:652 +#: ../src/calendar/importers/icalendar-importer.c:648 msgid "iCalendar files (.ics)" msgstr "iCalendar-filer (.ics)" -#: ../src/calendar/importers/icalendar-importer.c:653 +#: ../src/calendar/importers/icalendar-importer.c:649 msgid "Evolution iCalendar importer" msgstr "Evolution iCalendar-import" -#: ../src/calendar/importers/icalendar-importer.c:745 +#: ../src/calendar/importers/icalendar-importer.c:741 msgid "Reminder!" msgstr "Påminnelse!" -#: ../src/calendar/importers/icalendar-importer.c:830 +#: ../src/calendar/importers/icalendar-importer.c:826 msgid "vCalendar files (.vcs)" msgstr "vCalendar-filer (.vcs)" -#: ../src/calendar/importers/icalendar-importer.c:831 +#: ../src/calendar/importers/icalendar-importer.c:827 msgid "Evolution vCalendar importer" msgstr "Evolution vCalendar-import" -#: ../src/calendar/importers/icalendar-importer.c:1107 +#: ../src/calendar/importers/icalendar-importer.c:1103 msgid "Calendar Events" msgstr "Hendlelser i kalenderen" -#: ../src/calendar/importers/icalendar-importer.c:1150 +#: ../src/calendar/importers/icalendar-importer.c:1146 msgid "GNOME Calendar" msgstr "GNOME kalender" -#: ../src/calendar/importers/icalendar-importer.c:1151 +#: ../src/calendar/importers/icalendar-importer.c:1147 msgid "Evolution Calendar intelligent importer" msgstr "Intelligent import for Evolution kalender" -#: ../src/calendar/importers/icalendar-importer.c:1222 -#: ../src/calendar/importers/icalendar-importer.c:1536 +#: ../src/calendar/importers/icalendar-importer.c:1218 +#: ../src/calendar/importers/icalendar-importer.c:1532 msgctxt "iCalImp" msgid "Meeting" msgstr "Møte" -#: ../src/calendar/importers/icalendar-importer.c:1222 -#: ../src/calendar/importers/icalendar-importer.c:1536 +#: ../src/calendar/importers/icalendar-importer.c:1218 +#: ../src/calendar/importers/icalendar-importer.c:1532 msgctxt "iCalImp" msgid "Event" msgstr "Hendelse" -#: ../src/calendar/importers/icalendar-importer.c:1225 -#: ../src/calendar/importers/icalendar-importer.c:1537 +#: ../src/calendar/importers/icalendar-importer.c:1221 +#: ../src/calendar/importers/icalendar-importer.c:1533 msgctxt "iCalImp" msgid "Task" msgstr "Oppgave" -#: ../src/calendar/importers/icalendar-importer.c:1228 -#: ../src/calendar/importers/icalendar-importer.c:1538 +#: ../src/calendar/importers/icalendar-importer.c:1224 +#: ../src/calendar/importers/icalendar-importer.c:1534 msgctxt "iCalImp" msgid "Memo" msgstr "Notat" -#: ../src/calendar/importers/icalendar-importer.c:1237 +#: ../src/calendar/importers/icalendar-importer.c:1233 msgctxt "iCalImp" msgid "has recurrences" msgstr "har gjeninntreffelse" -#: ../src/calendar/importers/icalendar-importer.c:1242 +#: ../src/calendar/importers/icalendar-importer.c:1238 msgctxt "iCalImp" msgid "is an instance" msgstr "er en instans" -#: ../src/calendar/importers/icalendar-importer.c:1247 +#: ../src/calendar/importers/icalendar-importer.c:1243 msgctxt "iCalImp" msgid "has reminders" msgstr "har påminnelser" -#: ../src/calendar/importers/icalendar-importer.c:1252 +#: ../src/calendar/importers/icalendar-importer.c:1248 msgctxt "iCalImp" msgid "has attachments" msgstr "har vedlegg" #. Translators: Appointment's classification -#: ../src/calendar/importers/icalendar-importer.c:1265 +#: ../src/calendar/importers/icalendar-importer.c:1261 msgctxt "iCalImp" msgid "Public" msgstr "Offentlig" #. Translators: Appointment's classification -#: ../src/calendar/importers/icalendar-importer.c:1268 +#: ../src/calendar/importers/icalendar-importer.c:1264 msgctxt "iCalImp" msgid "Private" msgstr "Privat" #. Translators: Appointment's classification -#: ../src/calendar/importers/icalendar-importer.c:1271 +#: ../src/calendar/importers/icalendar-importer.c:1267 msgctxt "iCalImp" msgid "Confidential" msgstr "Konfidensiell" #. Translators: Appointment's classification section name -#: ../src/calendar/importers/icalendar-importer.c:1275 +#: ../src/calendar/importers/icalendar-importer.c:1271 msgctxt "iCalImp" msgid "Classification" msgstr "Klassifisering" #. Translators: Appointment's summary #. Translators: Column header for a component summary -#: ../src/calendar/importers/icalendar-importer.c:1280 -#: ../src/calendar/importers/icalendar-importer.c:1580 +#: ../src/calendar/importers/icalendar-importer.c:1276 +#: ../src/calendar/importers/icalendar-importer.c:1576 msgctxt "iCalImp" msgid "Summary" msgstr "Sammendrag" #. Translators: Appointment's location -#: ../src/calendar/importers/icalendar-importer.c:1286 +#: ../src/calendar/importers/icalendar-importer.c:1282 msgctxt "iCalImp" msgid "Location" msgstr "Plassering" #. Translators: Appointment's start time #. Translators: Column header for a component start date/time -#: ../src/calendar/importers/icalendar-importer.c:1294 -#: ../src/calendar/importers/icalendar-importer.c:1575 +#: ../src/calendar/importers/icalendar-importer.c:1290 +#: ../src/calendar/importers/icalendar-importer.c:1571 msgctxt "iCalImp" msgid "Start" msgstr "Start" #. Translators: 'Due' like the time due a task should be finished -#: ../src/calendar/importers/icalendar-importer.c:1305 +#: ../src/calendar/importers/icalendar-importer.c:1301 msgctxt "iCalImp" msgid "Due" msgstr "Ferdig" #. Translators: Appointment's end time -#: ../src/calendar/importers/icalendar-importer.c:1317 +#: ../src/calendar/importers/icalendar-importer.c:1313 msgctxt "iCalImp" msgid "End" msgstr "Slutt" #. Translators: Appointment's categories -#: ../src/calendar/importers/icalendar-importer.c:1327 +#: ../src/calendar/importers/icalendar-importer.c:1323 msgctxt "iCalImp" msgid "Categories" msgstr "Kategorier" #. Translators: Appointment's complete value (either percentage, or a date/time of a completion) -#: ../src/calendar/importers/icalendar-importer.c:1351 +#: ../src/calendar/importers/icalendar-importer.c:1347 msgctxt "iCalImp" msgid "Completed" msgstr "Fullført" #. Translators: Appointment's URL -#: ../src/calendar/importers/icalendar-importer.c:1359 +#: ../src/calendar/importers/icalendar-importer.c:1355 msgctxt "iCalImp" msgid "URL" msgstr "URL" #. Translators: Appointment's organizer -#: ../src/calendar/importers/icalendar-importer.c:1370 -#: ../src/calendar/importers/icalendar-importer.c:1373 +#: ../src/calendar/importers/icalendar-importer.c:1366 +#: ../src/calendar/importers/icalendar-importer.c:1369 msgctxt "iCalImp" msgid "Organizer" msgstr "Organisator" #. Translators: Appointment's attendees -#: ../src/calendar/importers/icalendar-importer.c:1393 -#: ../src/calendar/importers/icalendar-importer.c:1396 +#: ../src/calendar/importers/icalendar-importer.c:1389 +#: ../src/calendar/importers/icalendar-importer.c:1392 msgctxt "iCalImp" msgid "Attendees" msgstr "Deltakere" -#: ../src/calendar/importers/icalendar-importer.c:1410 +#: ../src/calendar/importers/icalendar-importer.c:1406 msgctxt "iCalImp" msgid "Description" msgstr "Beskrivelse" #. Translators: Column header for a component type; it can be Event, Task or Memo -#: ../src/calendar/importers/icalendar-importer.c:1570 +#: ../src/calendar/importers/icalendar-importer.c:1566 msgctxt "iCalImp" msgid "Type" msgstr "Type" @@ -10868,6 +10876,7 @@ #: ../src/composer/e-composer-from-header.c:108 #: ../src/e-util/e-mail-signature-script-dialog.c:416 +#: ../src/e-util/e-webdav-browser.c:2408 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2 #: ../src/mail/e-mail-config-identity-page.c:550 #: ../src/mail/e-mail-config-summary-page.c:332 @@ -10932,7 +10941,7 @@ msgid "Click here to select folders to post to" msgstr "Klikk her for å velge mapper å poste til" -#: ../src/composer/e-msg-composer.c:854 +#: ../src/composer/e-msg-composer.c:859 #, c-format msgid "" "Cannot sign outgoing message: No signing certificate set for this account" @@ -10940,7 +10949,7 @@ "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for " "denne kontoen" -#: ../src/composer/e-msg-composer.c:863 +#: ../src/composer/e-msg-composer.c:868 #, c-format msgid "" "Cannot encrypt outgoing message: No encryption certificate set for this " @@ -10949,11 +10958,11 @@ "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for " "denne kontoen" -#: ../src/composer/e-msg-composer.c:1622 ../src/composer/e-msg-composer.c:2294 +#: ../src/composer/e-msg-composer.c:1627 ../src/composer/e-msg-composer.c:2299 msgid "Compose Message" msgstr "Skriv melding" -#: ../src/composer/e-msg-composer.c:4657 +#: ../src/composer/e-msg-composer.c:4662 msgid "The composer contains a non-text message body, which cannot be edited." msgstr "" "Redigering inneholder en meldingskropp som ikke er tekst, og som ikke kan " @@ -11250,11 +11259,11 @@ msgid "This message was sent by %s on behalf of %s" msgstr "Denne meldingen ble sendt av %s på vegne av %s" -#: ../src/em-format/e-mail-formatter-image.c:168 +#: ../src/em-format/e-mail-formatter-image.c:178 msgid "Regular Image" msgstr "Vanlig bilde" -#: ../src/em-format/e-mail-formatter-image.c:169 +#: ../src/em-format/e-mail-formatter-image.c:179 msgid "Display part as an image" msgstr "Vis del som et bilde" @@ -11267,6 +11276,7 @@ msgstr "Formater del som en RFC822-melding" #: ../src/em-format/e-mail-formatter-print.c:51 +#: ../src/e-util/e-webdav-browser.c:2352 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92 #: ../src/mail/e-mail-label-tree-view.c:96 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64 @@ -11809,6 +11819,7 @@ #: ../src/e-util/e-attachment-dialog.c:354 #: ../src/e-util/e-html-editor-image-dialog.c:508 #: ../src/e-util/e-html-editor-link-dialog.c:241 +#: ../src/e-util/e-webdav-browser.c:2447 msgid "_Description:" msgstr "_Beskrivelse:" @@ -11960,7 +11971,7 @@ msgstr "Månedskalender" #. This is a strftime() format. %B = Month name. -#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2218 +#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2221 msgctxt "CalItem" msgid "%B" msgstr "%B" @@ -12071,7 +12082,7 @@ msgstr "oppsprettliste" #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137 -#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2066 +#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2067 msgid "?" msgstr "?" @@ -12361,7 +12372,7 @@ #: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135 #: ../src/mail/e-mail-config-security-page.c:404 #: ../src/mail/e-mail-config-security-page.c:568 -#: ../src/mail/e-mail-reader.c:4043 ../src/mail/mail-config.ui.h:76 +#: ../src/mail/e-mail-reader.c:4093 ../src/mail/mail-config.ui.h:76 msgid "Default" msgstr "Forvalgt" @@ -12377,41 +12388,41 @@ msgid "Click this button to show a calendar" msgstr "Klikk på denne knappen for å vise en kalender" -#: ../src/e-util/e-dateedit.c:626 +#: ../src/e-util/e-dateedit.c:627 msgid "Drop-down combination box to select time" msgstr "Kombinasjonsboks med nedtrekksmeny for å velge tid" -#: ../src/e-util/e-dateedit.c:627 +#: ../src/e-util/e-dateedit.c:628 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9 msgid "Time" msgstr "Tid" -#: ../src/e-util/e-dateedit.c:701 +#: ../src/e-util/e-dateedit.c:702 msgid "No_w" msgstr "N_å" -#: ../src/e-util/e-dateedit.c:708 +#: ../src/e-util/e-dateedit.c:709 msgid "_Today" msgstr "I _dag" #. Note that we don't show this here, since by default a 'None' date #. * is not permitted. -#: ../src/e-util/e-dateedit.c:717 +#: ../src/e-util/e-dateedit.c:718 msgid "_None" msgstr "I_ngen" #. Translators: "None" for date field of a date edit, shown when #. * there is no date set. -#: ../src/e-util/e-dateedit.c:1846 ../src/e-util/e-dateedit.c:2094 +#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2125 msgctxt "date" msgid "None" msgstr "Ingen" -#: ../src/e-util/e-dateedit.c:1986 +#: ../src/e-util/e-dateedit.c:2017 msgid "Invalid Date Value" msgstr "Ugyldig datoverdi" -#: ../src/e-util/e-dateedit.c:2031 +#: ../src/e-util/e-dateedit.c:2062 msgid "Invalid Time Value" msgstr "Ugyldig verdi for tid" @@ -12480,7 +12491,7 @@ msgid "Use locale default" msgstr "Bruk forvalg for locale" -#: ../src/e-util/e-datetime-format.c:573 +#: ../src/e-util/e-datetime-format.c:592 msgid "Format:" msgstr "Format:" @@ -12786,6 +12797,7 @@ #: ../src/e-util/e-mail-identity-combo-box.c:694 #: ../src/e-util/e-mail-signature-combo-box.c:422 #: ../src/libemail-engine/camel-null-store.c:29 +#: ../src/mail/e-mail-autoconfig.c:644 #: ../src/mail/e-mail-config-summary-page.c:141 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629 msgid "None" @@ -13767,6 +13779,7 @@ #: ../src/e-util/e-html-editor-table-dialog.c:686 #: ../src/e-util/e-html-editor-text-dialog.c:248 +#: ../src/e-util/e-webdav-browser.c:2418 msgid "_Color:" msgstr "_Farge:" @@ -13800,7 +13813,7 @@ msgstr "Fil_type:" #: ../src/e-util/e-import-assistant.c:343 -#: ../src/e-util/e-import-assistant.c:923 +#: ../src/e-util/e-import-assistant.c:948 msgid "Choose the destination for this import" msgstr "Velg mål det skal importeres til" @@ -13838,37 +13851,37 @@ msgstr "Fra %s:" #. Install a custom "Cancel Import" button. -#: ../src/e-util/e-import-assistant.c:781 +#: ../src/e-util/e-import-assistant.c:808 msgid "_Cancel Import" msgstr "A_vbryt import" -#: ../src/e-util/e-import-assistant.c:922 +#: ../src/e-util/e-import-assistant.c:947 msgid "Preview data to be imported" msgstr "Forhåndsvis data som skal importeres" -#: ../src/e-util/e-import-assistant.c:928 -#: ../src/e-util/e-import-assistant.c:941 -#: ../src/e-util/e-import-assistant.c:1294 -#: ../src/e-util/e-import-assistant.c:1370 -#: ../src/e-util/e-import-assistant.c:1379 +#: ../src/e-util/e-import-assistant.c:953 +#: ../src/e-util/e-import-assistant.c:966 +#: ../src/e-util/e-import-assistant.c:1319 +#: ../src/e-util/e-import-assistant.c:1395 +#: ../src/e-util/e-import-assistant.c:1404 msgid "Import Data" msgstr "Importer data" -#: ../src/e-util/e-import-assistant.c:936 +#: ../src/e-util/e-import-assistant.c:961 msgid "Select what type of file you want to import from the list." msgstr "Velg hvilken type fil du vil importere fra listen." -#: ../src/e-util/e-import-assistant.c:1284 -#: ../src/e-util/e-import-assistant.c:1319 +#: ../src/e-util/e-import-assistant.c:1309 +#: ../src/e-util/e-import-assistant.c:1344 msgid "Evolution Import Assistant" msgstr "Importeringsassistent for Evolution" -#: ../src/e-util/e-import-assistant.c:1301 -#: ../src/e-util/e-import-assistant.c:1357 +#: ../src/e-util/e-import-assistant.c:1326 +#: ../src/e-util/e-import-assistant.c:1382 msgid "Import Location" msgstr "Importer adresse" -#: ../src/e-util/e-import-assistant.c:1312 +#: ../src/e-util/e-import-assistant.c:1337 msgid "" "Welcome to the Evolution Import Assistant.\n" "With this assistant you will be guided through the process of importing " @@ -13878,19 +13891,19 @@ "Gjennom denne veiviseren vil du ledes gjennom import av eksterne filer til " "Evolution." -#: ../src/e-util/e-import-assistant.c:1329 +#: ../src/e-util/e-import-assistant.c:1354 msgid "Importer Type" msgstr "Type import" -#: ../src/e-util/e-import-assistant.c:1339 +#: ../src/e-util/e-import-assistant.c:1364 msgid "Select Information to Import" msgstr "Velg informasjon som skal importeres" -#: ../src/e-util/e-import-assistant.c:1348 +#: ../src/e-util/e-import-assistant.c:1373 msgid "Select a File" msgstr "Velg en fil" -#: ../src/e-util/e-import-assistant.c:1365 +#: ../src/e-util/e-import-assistant.c:1390 msgid "Click “Apply” to begin importing the file into Evolution." msgstr "Klikk på «Bruk» for å starte import av filen til Evolution." @@ -14107,15 +14120,15 @@ msgid "Evolution Preferences" msgstr "Evolution brukervalg" -#: ../src/e-util/e-print.c:158 +#: ../src/e-util/e-print.c:164 msgid "An error occurred while printing" msgstr "En feil oppsto under utskrift" -#: ../src/e-util/e-print.c:165 +#: ../src/e-util/e-print.c:171 msgid "The printing system reported the following details about the error:" msgstr "Utskriftssystemet rapporterte følgende detaljer om feilen:" -#: ../src/e-util/e-print.c:171 +#: ../src/e-util/e-print.c:177 msgid "" "The printing system did not report any additional details about the error." msgstr "Utskriftssystemet rapporterte ingen detaljer om feilen." @@ -14410,7 +14423,7 @@ msgid "Name:" msgstr "Navn:" -#: ../src/e-util/e-source-config.c:814 +#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1748 msgid "Name cannot be empty" msgstr "Navnet kan ikke være tomt" @@ -14612,6 +14625,16 @@ "å åpne et nytt vindu. Vennligst rapporter en feil i GNOME bugzilla hvis " "problemet vedvarer." +#: ../src/e-util/e-system.error.xml.h:25 +msgid "Are you sure you want to delete remote collection “{0}”?" +msgstr "Er du sikker på at du vil slette ekstern samling «{0}»?" + +#: ../src/e-util/e-system.error.xml.h:26 +msgid "" +"This will permanently remove the collection “{0}” from the server. Are you " +"sure you want to proceed?" +msgstr "Dette vil fjerne kalender «{0}» fra samlingen permanent. Er du sikker på at du vil fortsette?" + #: ../src/e-util/e-table-click-to-add.c:687 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140 @@ -14885,95 +14908,234 @@ msgstr "Flagg" #: ../src/e-util/evolution-source-viewer.c:729 -#: ../src/mail/e-mail-config-identity-page.c:1229 +#: ../src/mail/e-mail-config-identity-page.c:1230 msgid "Identity" msgstr "Identitet" -#: ../src/e-util/e-web-view.c:346 +#: ../src/e-util/e-webdav-browser.c:447 +msgid "Address book" +msgstr "Adressebok" + +#: ../src/e-util/e-webdav-browser.c:458 +msgid "Events" +msgstr "Hendelser" + +#: ../src/e-util/e-webdav-browser.c:473 +msgid "Collection" +msgstr "Samling" + +#: ../src/e-util/e-webdav-browser.c:514 +msgid "Loading…" +msgstr "Laster …" + +#: ../src/e-util/e-webdav-browser.c:1383 +msgid "Searching collection children…" +msgstr "Søker barn av samling …" + +#: ../src/e-util/e-webdav-browser.c:1385 +msgid "Failed to search for collection children" +msgstr "Klarte ikke å søke etter barn av samling" + +#: ../src/e-util/e-webdav-browser.c:1419 +msgid "Searching for user home, please wait…" +msgstr "Søker etter hjem for bruker. Vennligst vent …" + +#: ../src/e-util/e-webdav-browser.c:1421 +msgid "Failed to search for user home" +msgstr "Klarte ikke å søke etter hjem for bruker" + +#: ../src/e-util/e-webdav-browser.c:1763 +msgid "At least one component type should be set" +msgstr "Minst en komponenttype skal være satt" + +#: ../src/e-util/e-webdav-browser.c:1781 +msgid "Failed to get selected collection HREF" +msgstr "Klarte ikke å finne HREF for valgt samling" + +#: ../src/e-util/e-webdav-browser.c:1812 +msgid "Saving changes…" +msgstr "Lagrer endringer …" + +#: ../src/e-util/e-webdav-browser.c:1813 +msgid "Failed to save changes" +msgstr "Klarte ikke å lagre endringer" + +#: ../src/e-util/e-webdav-browser.c:1815 +msgid "Creating new book…" +msgstr "Lager ny bok …" + +#: ../src/e-util/e-webdav-browser.c:1816 +msgid "Failed to create new book" +msgstr "Klarte ikke å lage ny bok" + +#: ../src/e-util/e-webdav-browser.c:1818 +msgid "Creating new calendar…" +msgstr "Lager ny kalender …" + +#: ../src/e-util/e-webdav-browser.c:1819 +msgid "Failed to create new calendar" +msgstr "Klarte ikke å lage ny kalender" + +#: ../src/e-util/e-webdav-browser.c:1821 +msgid "Creating new collection…" +msgstr "Lager ny samling …" + +#: ../src/e-util/e-webdav-browser.c:1822 +msgid "Failed to create new collection" +msgstr "Klarte ikke å lage ny samling" + +#: ../src/e-util/e-webdav-browser.c:1961 +msgid "It is not allowed to create book under another book or calendar" +msgstr "Det er ikke tillatt å lage en bok under en annen bok eller kalender" + +#. if (button == webdav_browser->priv->create_calendar_button) +#: ../src/e-util/e-webdav-browser.c:1963 +msgid "It is not allowed to create calendar under another book or calendar" +msgstr "Det er ikke tillatt å lage en kalender under en annen bok eller kalender" + +#: ../src/e-util/e-webdav-browser.c:2189 +msgid "Deleting book…" +msgstr "Sletter bok …" + +#: ../src/e-util/e-webdav-browser.c:2190 +msgid "Failed to delete book" +msgstr "Klarte ikke å slette bok" + +#: ../src/e-util/e-webdav-browser.c:2193 +msgid "Deleting calendar…" +msgstr "Sletter kalender …" + +#: ../src/e-util/e-webdav-browser.c:2194 +msgid "Failed to delete calendar" +msgstr "Klarte ikke å slette kalender" + +#: ../src/e-util/e-webdav-browser.c:2197 +msgid "Deleting collection…" +msgstr "Slett samling …" + +#: ../src/e-util/e-webdav-browser.c:2198 +msgid "Failed to delete collection" +msgstr "Klarte ikke å slette samling" + +#: ../src/e-util/e-webdav-browser.c:2429 +msgid "For Components:" +msgstr "For komponenter:" + +#: ../src/e-util/e-webdav-browser.c:2435 +msgid "_Events" +msgstr "H_endelser" + +#: ../src/e-util/e-webdav-browser.c:2625 +msgid "WebDAV server:" +msgstr "WebDAV-tjener:" + +#: ../src/e-util/e-webdav-browser.c:2660 +msgid "Create _Book" +msgstr "Lag _bok" + +#: ../src/e-util/e-webdav-browser.c:2667 +msgid "Create _Calendar" +msgstr "Lag _kalender" + +#: ../src/e-util/e-webdav-browser.c:2674 +msgid "Create Collectio_n" +msgstr "Lag samli_ng" + +#. widget = gtk_button_new_with_mnemonic (_("_Permissions")); +#. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); +#. webdav_browser->priv->permissions_button = widget; +#: ../src/e-util/e-webdav-browser.c:2699 +#: ../src/mail/em-subscription-editor.c:1976 +#: ../src/modules/mail/e-mail-shell-view-actions.c:1652 +#: ../src/modules/mail/e-mail-shell-view-actions.c:1723 +msgid "_Refresh" +msgstr "Oppdate_r" + +#: ../src/e-util/e-web-view.c:348 msgid "_Copy Link Location" msgstr "_Kopier adressen til lenke" -#: ../src/e-util/e-web-view.c:348 +#: ../src/e-util/e-web-view.c:350 msgid "Copy the link to the clipboard" msgstr "Kopier lenken til utklippstavlen" -#: ../src/e-util/e-web-view.c:356 +#: ../src/e-util/e-web-view.c:358 msgid "_Open Link in Browser" msgstr "_Åpne lenke i nettleser" -#: ../src/e-util/e-web-view.c:358 +#: ../src/e-util/e-web-view.c:360 msgid "Open the link in a web browser" msgstr "Åpne lenken i en nettleser" -#: ../src/e-util/e-web-view.c:366 +#: ../src/e-util/e-web-view.c:368 msgid "_Copy Email Address" msgstr "_Kopier e-postadresse" -#: ../src/e-util/e-web-view.c:373 +#: ../src/e-util/e-web-view.c:375 msgid "Copy _Raw Email Address" msgstr "Kopier _rå e-postadresse" -#: ../src/e-util/e-web-view.c:375 +#: ../src/e-util/e-web-view.c:377 msgid "Copy the raw email address to the clipboard" msgstr "Kopier rå e-postadresse til utklippstavlen" -#: ../src/e-util/e-web-view.c:390 +#: ../src/e-util/e-web-view.c:392 msgid "_Copy Image" msgstr "_Kopier bilde" -#: ../src/e-util/e-web-view.c:392 +#: ../src/e-util/e-web-view.c:394 msgid "Copy the image to the clipboard" msgstr "Kopier bildet til utklippstavlen" -#: ../src/e-util/e-web-view.c:397 +#: ../src/e-util/e-web-view.c:399 msgid "Save _Image..." msgstr "Lagre b_ilde …" -#: ../src/e-util/e-web-view.c:399 +#: ../src/e-util/e-web-view.c:401 msgid "Save the image to a file" msgstr "Lagre bildet til en fil" -#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1999 +#: ../src/e-util/e-web-view.c:421 ../src/e-util/e-web-view.c:2025 msgid "Select all text and images" msgstr "Velg all tekst og alle bilder" -#: ../src/e-util/e-web-view.c:1354 +#: ../src/e-util/e-web-view.c:1379 #, c-format msgid "Click to call %s" msgstr "Klikk for å ringe %s" -#: ../src/e-util/e-web-view.c:1356 +#: ../src/e-util/e-web-view.c:1381 msgid "Click to hide/unhide addresses" msgstr "Klikk for å skjule/vise adresser" -#: ../src/e-util/e-web-view.c:1367 +#: ../src/e-util/e-web-view.c:1392 #, c-format msgid "Go to the section %s of the message" msgstr "Gå til %s-del av meldingen" -#: ../src/e-util/e-web-view.c:1369 +#: ../src/e-util/e-web-view.c:1394 msgid "Go to the beginning of the message" msgstr "Gå til begynnelsen av meldingen" -#: ../src/e-util/e-web-view.c:1373 +#: ../src/e-util/e-web-view.c:1398 #, c-format msgid "Click to open %s" msgstr "Klikk for å åpne %s" -#: ../src/e-util/e-web-view.c:3906 +#: ../src/e-util/e-web-view.c:3942 msgid "Copying image to clipboard" msgstr "Kopierer bilde til utklippstavlen" -#: ../src/e-util/e-web-view.c:4094 +#: ../src/e-util/e-web-view.c:4130 msgid "Save Image" msgstr "Lagre bilde" -#: ../src/e-util/e-web-view.c:4135 +#: ../src/e-util/e-web-view.c:4171 #, c-format msgid "Saving image to “%s”" msgstr "Lagrer bilde til «%s»" -#: ../src/e-util/e-web-view.c:4230 +#: ../src/e-util/e-web-view.c:4266 #, c-format msgid "Cannot get URI “%s”, do not know how to download it." msgstr "Kan ikke hente URI «%s». Vet ikke hvordan den skal lastes ned." @@ -15298,8 +15460,8 @@ #: ../src/mail/em-folder-properties.c:1150 #: ../src/mail/em-folder-tree-model.c:1237 #: ../src/mail/importers/kmail-libs.c:139 -#: ../src/modules/mail/e-mail-shell-view-private.c:1026 -#: ../src/modules/mail/e-mail-shell-view-private.c:1037 +#: ../src/modules/mail/e-mail-shell-view-private.c:1041 +#: ../src/modules/mail/e-mail-shell-view-private.c:1052 msgid "Inbox" msgstr "Innboks" @@ -15307,7 +15469,7 @@ #: ../src/libemail-engine/e-mail-session.c:126 #: ../src/mail/em-folder-tree-model.c:1230 #: ../src/mail/importers/kmail-libs.c:145 -#: ../src/modules/mail/e-mail-shell-view-private.c:1024 +#: ../src/modules/mail/e-mail-shell-view-private.c:1039 msgid "Drafts" msgstr "Skisser" @@ -15315,7 +15477,7 @@ #: ../src/libemail-engine/e-mail-session.c:127 #: ../src/mail/em-folder-tree-model.c:1241 #: ../src/mail/importers/kmail-libs.c:141 -#: ../src/modules/mail/e-mail-shell-view-private.c:1028 +#: ../src/modules/mail/e-mail-shell-view-private.c:1043 msgid "Outbox" msgstr "Utboks" @@ -15323,7 +15485,7 @@ #: ../src/libemail-engine/e-mail-session.c:128 #: ../src/mail/em-folder-tree-model.c:1245 #: ../src/mail/importers/kmail-libs.c:143 -#: ../src/modules/mail/e-mail-shell-view-private.c:1030 +#: ../src/modules/mail/e-mail-shell-view-private.c:1045 msgid "Sent" msgstr "Sendt" @@ -15331,7 +15493,7 @@ #: ../src/libemail-engine/e-mail-session.c:129 #: ../src/mail/em-folder-tree-model.c:1233 #: ../src/mail/importers/kmail-libs.c:147 -#: ../src/modules/mail/e-mail-shell-view-private.c:1032 +#: ../src/modules/mail/e-mail-shell-view-private.c:1047 #: ../src/plugins/templates/e-templates-store.c:2212 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1 msgid "Templates" @@ -15430,7 +15592,9 @@ "Edit→Message Filters.\n" "Original error was: %s" msgstr "" -"Klarte ikke å filtrere valgte meldinger. En årsak kan være at mappelokasjonen som er satt i ett eller flere filtre er ugyldig. Vennligst sjekk dine filtre i «Rediger→Meldingsfiltre».\n" +"Klarte ikke å filtrere valgte meldinger. En årsak kan være at " +"mappelokasjonen som er satt i ett eller flere filtre er ugyldig. Vennligst " +"sjekk dine filtre i «Rediger→Meldingsfiltre».\n" "Opprinnelig feil var: %s" #: ../src/libemail-engine/mail-ops.c:226 @@ -15446,7 +15610,9 @@ "Filters.\n" "Original error was: %s" msgstr "" -"Klarte ikke å bruke utgående filtre. En årsak kan være at mappelokasjonen som er satt i ett eller flere filtre er ugyldig. Vennligst sjekk dine filtre i «Rediger→Meldingsfiltre».\n" +"Klarte ikke å bruke utgående filtre. En årsak kan være at mappelokasjonen " +"som er satt i ett eller flere filtre er ugyldig. Vennligst sjekk dine filtre " +"i «Rediger→Meldingsfiltre».\n" "Opprinnelig feil var: %s" #: ../src/libemail-engine/mail-ops.c:994 @@ -15517,24 +15683,18 @@ msgid "Trying to movemail a non-mbox source “%s”" msgstr "Prøver å bruke movemail på en kilde, «%s», som ikke er i mbox-format" -#. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the original message. -#: ../src/libemail-engine/mail-tools.c:193 -#, c-format -msgid "[Fwd: %s]" -msgstr "[Fwd: %s]" - #. Translators: This is a subject attribution for forwarded messages, used when there could not be used any subject. #. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message. -#: ../src/libemail-engine/mail-tools.c:196 +#: ../src/libemail-engine/mail-tools.c:195 msgid "No Subject" msgstr "Uten emne" -#: ../src/libemail-engine/mail-tools.c:271 +#: ../src/libemail-engine/mail-tools.c:270 #, c-format msgid "Forwarded message — %s" msgstr "Videresendt melding – %s" -#: ../src/libemail-engine/mail-tools.c:273 +#: ../src/libemail-engine/mail-tools.c:272 msgid "Forwarded message" msgstr "Videresendt melding" @@ -15592,14 +15752,61 @@ msgid "De_fault" msgstr "_Forvalgt" -#: ../src/mail/e-mail-autoconfig.c:620 +#: ../src/mail/e-mail-autoconfig.c:634 +#, c-format +msgid "Host: %s:%d" +msgstr "Vert: %s:%d" + +#: ../src/mail/e-mail-autoconfig.c:638 +#, c-format +msgid "User: %s" +msgstr "Bruker: %s" + +#: ../src/mail/e-mail-autoconfig.c:642 +#, c-format +msgid "Security method: %s" +msgstr "Sikkerhetsmetode: %s" + +#: ../src/mail/e-mail-autoconfig.c:643 +#: ../src/mail/e-mail-config-summary-page.c:144 +msgid "TLS" +msgstr "TLS" + +#: ../src/mail/e-mail-autoconfig.c:644 +#: ../src/mail/e-mail-config-summary-page.c:147 +msgid "STARTTLS" +msgstr "STARTTLS" + +#: ../src/mail/e-mail-autoconfig.c:648 +#, c-format +msgid "Authentication mechanism: %s" +msgstr "Autentiseringsmekanisme: %s" + +#: ../src/mail/e-mail-autoconfig.c:783 msgid "No email address provided" msgstr "Ingen e-postadresse ble oppgitt" -#: ../src/mail/e-mail-autoconfig.c:629 +#: ../src/mail/e-mail-autoconfig.c:792 msgid "Missing domain in email address" msgstr "Mangler domene i e-postadresse" +#: ../src/mail/e-mail-autoconfig.c:1097 +#: ../src/modules/config-lookup/e-srv-config-lookup.c:78 +#: ../src/modules/config-lookup/e-srv-config-lookup.c:79 +msgid "IMAP server" +msgstr "IMAP-tjener" + +#: ../src/mail/e-mail-autoconfig.c:1104 +#: ../src/modules/config-lookup/e-srv-config-lookup.c:80 +#: ../src/modules/config-lookup/e-srv-config-lookup.c:81 +msgid "POP3 server" +msgstr "POP3-tjener" + +#: ../src/mail/e-mail-autoconfig.c:1111 +#: ../src/modules/config-lookup/e-srv-config-lookup.c:82 +msgid "SMTP server" +msgstr "SMTP-tjener" + #: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:812 #: ../src/shell/e-shell-window-actions.c:819 #: ../src/shell/e-shell-window-actions.c:826 @@ -15611,20 +15818,20 @@ msgstr "(Uten emne)" #. GtkAssistant's back button label. -#: ../src/mail/e-mail-config-assistant.c:47 +#: ../src/mail/e-mail-config-assistant.c:48 msgid "Go _Back" msgstr "Gå til_bake" #. GtkAssistant sinks the floating button reference. -#: ../src/mail/e-mail-config-assistant.c:116 +#: ../src/mail/e-mail-config-assistant.c:123 msgid "_Skip Lookup" msgstr "_Hopp over oppslag" -#: ../src/mail/e-mail-config-assistant.c:665 +#: ../src/mail/e-mail-config-assistant.c:718 msgid "Evolution Account Assistant" msgstr "Evolution kontoassistent" -#: ../src/mail/e-mail-config-assistant.c:972 +#: ../src/mail/e-mail-config-assistant.c:1025 msgid "_Revise Details" msgstr "Gå gjennom detalje_r" @@ -15860,33 +16067,33 @@ msgid "A_liases:" msgstr "A_lias:" -#: ../src/mail/e-mail-config-identity-page.c:861 +#: ../src/mail/e-mail-config-identity-page.c:862 msgid "Edi_t" msgstr "R_ediger" -#: ../src/mail/e-mail-config-identity-page.c:884 +#: ../src/mail/e-mail-config-identity-page.c:885 msgid "_Look up mail server details based on the entered e-mail address" msgstr "S_lå opp detaljer om e-posttjener basert på oppgitt e-postadresse" #. This is only a warning, not a blocker #. complete = complete && correct; -#: ../src/mail/e-mail-config-identity-page.c:933 +#: ../src/mail/e-mail-config-identity-page.c:934 msgid "Full Name should not be empty" msgstr "Fullt navn bør ikke være tomt" -#: ../src/mail/e-mail-config-identity-page.c:940 +#: ../src/mail/e-mail-config-identity-page.c:941 msgid "Email Address cannot be empty" msgstr "E-postadressen kan ikke være tomt" -#: ../src/mail/e-mail-config-identity-page.c:945 +#: ../src/mail/e-mail-config-identity-page.c:946 msgid "Email Address is not a valid email" msgstr "E-postadressen er ikke en gyldig e-postadresse" -#: ../src/mail/e-mail-config-identity-page.c:957 +#: ../src/mail/e-mail-config-identity-page.c:958 msgid "Reply To is not a valid email" msgstr "Svar til er ikke en e-postadresse" -#: ../src/mail/e-mail-config-identity-page.c:968 +#: ../src/mail/e-mail-config-identity-page.c:969 #: ../src/mail/e-mail-config-summary-page.c:638 msgid "Account Name cannot be empty" msgstr "Navn på konto kan ikke være tomt" @@ -16032,18 +16239,10 @@ msgid "Sending Email" msgstr "Utgående e-post" -#: ../src/mail/e-mail-config-service-page.c:504 +#: ../src/mail/e-mail-config-service-page.c:499 msgid "Server _Type:" msgstr "Tjener_type:" -#: ../src/mail/e-mail-config-summary-page.c:144 -msgid "TLS" -msgstr "TLS" - -#: ../src/mail/e-mail-config-summary-page.c:147 -msgid "STARTTLS" -msgstr "STARTTLS" - #: ../src/mail/e-mail-config-summary-page.c:306 msgid "" "This is a summary of the settings which will be used to access your mail." @@ -16355,620 +16554,620 @@ msgid "C_opy" msgstr "K_opier" -#: ../src/mail/e-mail-reader.c:479 +#: ../src/mail/e-mail-reader.c:528 msgid "Deleting message note..." msgstr "Sletter meldingsnotat …" -#: ../src/mail/e-mail-reader.c:1301 ../src/mail/e-mail-reader.c:1513 -#: ../src/mail/e-mail-reader.c:1553 +#: ../src/mail/e-mail-reader.c:1351 ../src/mail/e-mail-reader.c:1563 +#: ../src/mail/e-mail-reader.c:1603 msgid "_Do not ask me again." msgstr "_Ikke spør meg igjen." -#: ../src/mail/e-mail-reader.c:1559 +#: ../src/mail/e-mail-reader.c:1609 msgid "_Always ignore Reply-To: for mailing lists." msgstr "_Alltid ignorer Reply-To: for e-postlister." -#: ../src/mail/e-mail-reader.c:1762 +#: ../src/mail/e-mail-reader.c:1812 msgid "Failed to retrieve message:" msgstr "Klarte ikke å hente melding:" -#: ../src/mail/e-mail-reader.c:1807 ../src/mail/e-mail-reader.c:3166 +#: ../src/mail/e-mail-reader.c:1857 ../src/mail/e-mail-reader.c:3216 #, c-format msgid "Retrieving message “%s”" msgstr "Henter melding «%s»" -#: ../src/mail/e-mail-reader.c:1995 +#: ../src/mail/e-mail-reader.c:2045 msgid "A_dd Sender to Address Book" msgstr "L_egg til avsender i adressebok" -#: ../src/mail/e-mail-reader.c:1997 +#: ../src/mail/e-mail-reader.c:2047 msgid "Add sender to address book" msgstr "Legg til avsender i adressebok" -#: ../src/mail/e-mail-reader.c:2002 +#: ../src/mail/e-mail-reader.c:2052 msgid "_Archive..." msgstr "_Arkiv …" -#: ../src/mail/e-mail-reader.c:2004 +#: ../src/mail/e-mail-reader.c:2054 msgid "Move selected messages to the Archive folder for the account" msgstr "Flytt valgte meldinger til arkivmappen for kontoen" -#: ../src/mail/e-mail-reader.c:2009 +#: ../src/mail/e-mail-reader.c:2059 msgid "Check for _Junk" msgstr "Sjekk etter _uønsket e-post" -#: ../src/mail/e-mail-reader.c:2011 +#: ../src/mail/e-mail-reader.c:2061 msgid "Filter the selected messages for junk status" msgstr "Filtrer valgte meldinger etter uønsket e-poststatus" -#: ../src/mail/e-mail-reader.c:2016 +#: ../src/mail/e-mail-reader.c:2066 msgid "_Copy to Folder..." msgstr "K_opier til mappe …" -#: ../src/mail/e-mail-reader.c:2018 +#: ../src/mail/e-mail-reader.c:2068 msgid "Copy selected messages to another folder" msgstr "Kopier valgte meldinger til en annen mappe" -#: ../src/mail/e-mail-reader.c:2023 +#: ../src/mail/e-mail-reader.c:2073 msgid "_Delete Message" msgstr "_Slett melding" -#: ../src/mail/e-mail-reader.c:2025 +#: ../src/mail/e-mail-reader.c:2075 msgid "Mark the selected messages for deletion" msgstr "Merk valgte meldinger for sletting" -#: ../src/mail/e-mail-reader.c:2030 +#: ../src/mail/e-mail-reader.c:2080 msgid "_Add note..." msgstr "L_egg til notat …" -#: ../src/mail/e-mail-reader.c:2032 +#: ../src/mail/e-mail-reader.c:2082 msgid "Add a note for the selected message" msgstr "Legg til et notat fra valgt melding" -#: ../src/mail/e-mail-reader.c:2037 +#: ../src/mail/e-mail-reader.c:2087 msgid "Delete no_te" msgstr "Slett no_tat" -#: ../src/mail/e-mail-reader.c:2039 +#: ../src/mail/e-mail-reader.c:2089 msgid "Delete the note for the selected message" msgstr " Slett notat for valgt melding" -#: ../src/mail/e-mail-reader.c:2044 +#: ../src/mail/e-mail-reader.c:2094 msgid "_Edit note..." msgstr "R_ediger notat …" -#: ../src/mail/e-mail-reader.c:2046 +#: ../src/mail/e-mail-reader.c:2096 msgid "Edit a note for the selected message" msgstr "Rediger et notat for valgt melding" -#: ../src/mail/e-mail-reader.c:2051 +#: ../src/mail/e-mail-reader.c:2101 msgid "Create a Filter Rule for Mailing _List..." msgstr "Lag filterregel for e-post_liste …" -#: ../src/mail/e-mail-reader.c:2053 +#: ../src/mail/e-mail-reader.c:2103 msgid "Create a rule to filter messages to this mailing list" msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten" -#: ../src/mail/e-mail-reader.c:2058 +#: ../src/mail/e-mail-reader.c:2108 msgid "Create a Filter Rule for _Recipients..." msgstr "Lag en filterregel for mottake_re …" -#: ../src/mail/e-mail-reader.c:2060 +#: ../src/mail/e-mail-reader.c:2110 msgid "Create a rule to filter messages to these recipients" msgstr "Lag en regel for å filtrere meldinger til disse mottakerene" -#: ../src/mail/e-mail-reader.c:2065 +#: ../src/mail/e-mail-reader.c:2115 msgid "Create a Filter Rule for Se_nder..." msgstr "Lag en filterregel for avse_nder …" -#: ../src/mail/e-mail-reader.c:2067 +#: ../src/mail/e-mail-reader.c:2117 msgid "Create a rule to filter messages from this sender" msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen" -#: ../src/mail/e-mail-reader.c:2072 +#: ../src/mail/e-mail-reader.c:2122 msgid "Create a Filter Rule for _Subject..." msgstr "Lag en filterregel for e_mne …" -#: ../src/mail/e-mail-reader.c:2074 +#: ../src/mail/e-mail-reader.c:2124 msgid "Create a rule to filter messages with this subject" msgstr "Lag en regel for filtrering av meldinger med dette emnet" -#: ../src/mail/e-mail-reader.c:2079 +#: ../src/mail/e-mail-reader.c:2129 msgid "A_pply Filters" msgstr "_Påfør filtre" -#: ../src/mail/e-mail-reader.c:2081 +#: ../src/mail/e-mail-reader.c:2131 msgid "Apply filter rules to the selected messages" msgstr "Aktiver filterregler på de valgte meldingene" -#: ../src/mail/e-mail-reader.c:2086 +#: ../src/mail/e-mail-reader.c:2136 msgid "_Find in Message..." msgstr "_Finn i melding …" -#: ../src/mail/e-mail-reader.c:2088 +#: ../src/mail/e-mail-reader.c:2138 msgid "Search for text in the body of the displayed message" msgstr "Søk etter tekst i kroppen av vist melding" -#: ../src/mail/e-mail-reader.c:2093 +#: ../src/mail/e-mail-reader.c:2143 msgid "_Clear Flag" msgstr "F_jern flagg" -#: ../src/mail/e-mail-reader.c:2095 +#: ../src/mail/e-mail-reader.c:2145 msgid "Remove the follow-up flag from the selected messages" msgstr "Fjern flagg for oppfølging fra valgte meldinger" -#: ../src/mail/e-mail-reader.c:2100 +#: ../src/mail/e-mail-reader.c:2150 msgid "_Flag Completed" msgstr "Merk som _fullført" -#: ../src/mail/e-mail-reader.c:2102 +#: ../src/mail/e-mail-reader.c:2152 msgid "Set the follow-up flag to completed on the selected messages" msgstr "Sett flagg for oppfølging til fullført på valgte meldinger" -#: ../src/mail/e-mail-reader.c:2107 +#: ../src/mail/e-mail-reader.c:2157 msgid "Follow _Up..." msgstr "Følg _opp …" -#: ../src/mail/e-mail-reader.c:2109 +#: ../src/mail/e-mail-reader.c:2159 msgid "Flag the selected messages for follow-up" msgstr "Merk valgte meldinger for oppfølging" -#: ../src/mail/e-mail-reader.c:2114 +#: ../src/mail/e-mail-reader.c:2164 #: ../src/modules/mail/e-mail-attachment-handler.c:430 msgid "_Attached" msgstr "L_agt ved" -#: ../src/mail/e-mail-reader.c:2116 ../src/mail/e-mail-reader.c:2123 +#: ../src/mail/e-mail-reader.c:2166 ../src/mail/e-mail-reader.c:2173 #: ../src/modules/mail/e-mail-attachment-handler.c:432 msgid "Forward the selected message to someone as an attachment" msgstr "Videresend den valgte meldingen til noen som et vedlegg" -#: ../src/mail/e-mail-reader.c:2121 +#: ../src/mail/e-mail-reader.c:2171 msgid "Forward As _Attached" msgstr "Videresend s_om vedlegg" -#: ../src/mail/e-mail-reader.c:2128 +#: ../src/mail/e-mail-reader.c:2178 #: ../src/modules/mail/e-mail-attachment-handler.c:437 msgid "_Inline" msgstr "_I meldingen" -#: ../src/mail/e-mail-reader.c:2130 ../src/mail/e-mail-reader.c:2137 +#: ../src/mail/e-mail-reader.c:2180 ../src/mail/e-mail-reader.c:2187 #: ../src/modules/mail/e-mail-attachment-handler.c:439 msgid "Forward the selected message in the body of a new message" msgstr "Videresend den valgte meldingen i kroppen av en ny melding" -#: ../src/mail/e-mail-reader.c:2135 +#: ../src/mail/e-mail-reader.c:2185 msgid "Forward As _Inline" msgstr "V_ideresend som vedlegg" -#: ../src/mail/e-mail-reader.c:2142 +#: ../src/mail/e-mail-reader.c:2192 #: ../src/modules/mail/e-mail-attachment-handler.c:444 msgid "_Quoted" msgstr "_Sitert" -#: ../src/mail/e-mail-reader.c:2144 ../src/mail/e-mail-reader.c:2151 +#: ../src/mail/e-mail-reader.c:2194 ../src/mail/e-mail-reader.c:2201 #: ../src/modules/mail/e-mail-attachment-handler.c:446 msgid "Forward the selected message quoted like a reply" msgstr "Videresend den valgte meldingen sitert som et svar" -#: ../src/mail/e-mail-reader.c:2149 +#: ../src/mail/e-mail-reader.c:2199 msgid "Forward As _Quoted" msgstr "Videresend s_om sitat" -#: ../src/mail/e-mail-reader.c:2156 +#: ../src/mail/e-mail-reader.c:2206 msgid "_Load Images" msgstr "_Last bilder" -#: ../src/mail/e-mail-reader.c:2158 +#: ../src/mail/e-mail-reader.c:2208 msgid "Force images in HTML mail to be loaded" msgstr "Tvungen lasting av bilder i HTML e-post" -#: ../src/mail/e-mail-reader.c:2163 ../src/mail/e-mail-reader.c:2553 +#: ../src/mail/e-mail-reader.c:2213 ../src/mail/e-mail-reader.c:2603 msgid "_Ignore Subthread" msgstr "_Ignorer undertråd" -#: ../src/mail/e-mail-reader.c:2165 +#: ../src/mail/e-mail-reader.c:2215 msgid "Mark new mails in a subthread as read automatically" msgstr "Merk nye meldinger i en undertråd som lest automatisk" -#: ../src/mail/e-mail-reader.c:2170 ../src/mail/e-mail-reader.c:2557 +#: ../src/mail/e-mail-reader.c:2220 ../src/mail/e-mail-reader.c:2607 msgid "_Ignore Thread" msgstr "Overse _tråd" -#: ../src/mail/e-mail-reader.c:2172 +#: ../src/mail/e-mail-reader.c:2222 msgid "Mark new mails in this thread as read automatically" msgstr "Merk nye meldinger i denne tråden som lest automatisk" -#: ../src/mail/e-mail-reader.c:2177 +#: ../src/mail/e-mail-reader.c:2227 msgid "_Important" msgstr "V_iktig" -#: ../src/mail/e-mail-reader.c:2179 +#: ../src/mail/e-mail-reader.c:2229 msgid "Mark the selected messages as important" msgstr "Merk valgte meldinger som viktige" -#: ../src/mail/e-mail-reader.c:2184 +#: ../src/mail/e-mail-reader.c:2234 msgid "_Junk" msgstr "_Uønsket e-post" -#: ../src/mail/e-mail-reader.c:2186 +#: ../src/mail/e-mail-reader.c:2236 msgid "Mark the selected messages as junk" msgstr "Merk valgte meldinger som uønsket e-post" -#: ../src/mail/e-mail-reader.c:2191 +#: ../src/mail/e-mail-reader.c:2241 msgid "_Not Junk" msgstr "_Ikke uønsket e-post" -#: ../src/mail/e-mail-reader.c:2193 +#: ../src/mail/e-mail-reader.c:2243 msgid "Mark the selected messages as not being junk" msgstr "Merk valgte meldinger som ønsket e-post" -#: ../src/mail/e-mail-reader.c:2198 +#: ../src/mail/e-mail-reader.c:2248 msgid "_Read" msgstr "_Lest" -#: ../src/mail/e-mail-reader.c:2200 +#: ../src/mail/e-mail-reader.c:2250 msgid "Mark the selected messages as having been read" msgstr "Merk valgte meldinger som lest" -#: ../src/mail/e-mail-reader.c:2205 ../src/mail/e-mail-reader.c:2577 +#: ../src/mail/e-mail-reader.c:2255 ../src/mail/e-mail-reader.c:2627 msgid "Do not _Ignore Subthread" msgstr "Ikke _ignorer undertråd" -#: ../src/mail/e-mail-reader.c:2207 +#: ../src/mail/e-mail-reader.c:2257 msgid "Do not mark new mails in a subthread as read automatically" msgstr "Ikke merk nye meldinger i en undertråd som lest automatisk" -#: ../src/mail/e-mail-reader.c:2212 ../src/mail/e-mail-reader.c:2581 +#: ../src/mail/e-mail-reader.c:2262 ../src/mail/e-mail-reader.c:2631 msgid "Do not _Ignore Thread" msgstr "_Ikke ignorter tråd" -#: ../src/mail/e-mail-reader.c:2214 +#: ../src/mail/e-mail-reader.c:2264 msgid "Do not mark new mails in this thread as read automatically" msgstr "Ikke merk nye meldinger i denne tråden som lest automatisk" -#: ../src/mail/e-mail-reader.c:2219 +#: ../src/mail/e-mail-reader.c:2269 msgid "Uni_mportant" msgstr "_Ikke viktig" -#: ../src/mail/e-mail-reader.c:2221 +#: ../src/mail/e-mail-reader.c:2271 msgid "Mark the selected messages as unimportant" msgstr "Merk valgte meldinger som uviktige" -#: ../src/mail/e-mail-reader.c:2226 +#: ../src/mail/e-mail-reader.c:2276 msgid "_Unread" msgstr "_Ulest" -#: ../src/mail/e-mail-reader.c:2228 +#: ../src/mail/e-mail-reader.c:2278 msgid "Mark the selected messages as not having been read" msgstr "Merk valgte meldinger som ulest" -#: ../src/mail/e-mail-reader.c:2233 +#: ../src/mail/e-mail-reader.c:2283 #: ../src/modules/mail/e-mail-attachment-handler.c:416 msgid "_Edit as New Message..." msgstr "R_ediger som ny melding …" -#: ../src/mail/e-mail-reader.c:2235 +#: ../src/mail/e-mail-reader.c:2285 #: ../src/modules/mail/e-mail-attachment-handler.c:418 msgid "Open the selected messages in the composer for editing" msgstr "Åpne valgte meldinger i redigeringskomponenten" -#: ../src/mail/e-mail-reader.c:2240 +#: ../src/mail/e-mail-reader.c:2290 msgid "Compose _New Message" msgstr "Skriv _ny melding" -#: ../src/mail/e-mail-reader.c:2242 +#: ../src/mail/e-mail-reader.c:2292 msgid "Open a window for composing a mail message" msgstr "Åpne et vindu for å skrive en e-post melding" -#: ../src/mail/e-mail-reader.c:2247 +#: ../src/mail/e-mail-reader.c:2297 msgid "_Open in New Window" msgstr "_Åpne i _nytt vindu" -#: ../src/mail/e-mail-reader.c:2249 +#: ../src/mail/e-mail-reader.c:2299 msgid "Open the selected messages in a new window" msgstr "Åpne valgte meldinger i et nytt vindu" -#: ../src/mail/e-mail-reader.c:2254 +#: ../src/mail/e-mail-reader.c:2304 msgid "_Move to Folder..." msgstr "Fl_ytt til mappe …" -#: ../src/mail/e-mail-reader.c:2256 +#: ../src/mail/e-mail-reader.c:2306 msgid "Move selected messages to another folder" msgstr "Flytt valgte meldinger til en annen mappe" -#: ../src/mail/e-mail-reader.c:2261 +#: ../src/mail/e-mail-reader.c:2311 msgid "_Next Message" msgstr "_Neste melding" -#: ../src/mail/e-mail-reader.c:2263 +#: ../src/mail/e-mail-reader.c:2313 msgid "Display the next message" msgstr "Vis neste melding" -#: ../src/mail/e-mail-reader.c:2268 +#: ../src/mail/e-mail-reader.c:2318 msgid "Next _Important Message" msgstr "Neste v_iktige melding" -#: ../src/mail/e-mail-reader.c:2270 +#: ../src/mail/e-mail-reader.c:2320 msgid "Display the next important message" msgstr "Vis neste viktige melding" -#: ../src/mail/e-mail-reader.c:2275 +#: ../src/mail/e-mail-reader.c:2325 msgid "Next _Thread" msgstr "Neste _tråd" -#: ../src/mail/e-mail-reader.c:2277 +#: ../src/mail/e-mail-reader.c:2327 msgid "Display the next thread" msgstr "Vis neste tråd" -#: ../src/mail/e-mail-reader.c:2282 +#: ../src/mail/e-mail-reader.c:2332 msgid "Next _Unread Message" msgstr "Neste _uleste melding" -#: ../src/mail/e-mail-reader.c:2284 +#: ../src/mail/e-mail-reader.c:2334 msgid "Display the next unread message" msgstr "Vis neste uleste melding" -#: ../src/mail/e-mail-reader.c:2289 +#: ../src/mail/e-mail-reader.c:2339 msgid "_Previous Message" msgstr "_Forrige melding" -#: ../src/mail/e-mail-reader.c:2291 +#: ../src/mail/e-mail-reader.c:2341 msgid "Display the previous message" msgstr "Vis forrige melding" -#: ../src/mail/e-mail-reader.c:2296 +#: ../src/mail/e-mail-reader.c:2346 msgid "Pr_evious Important Message" msgstr "Forrig_e viktige melding" -#: ../src/mail/e-mail-reader.c:2298 +#: ../src/mail/e-mail-reader.c:2348 msgid "Display the previous important message" msgstr "Vis forrige viktige melding" -#: ../src/mail/e-mail-reader.c:2303 +#: ../src/mail/e-mail-reader.c:2353 msgid "Previous T_hread" msgstr "Forrige trå_d" -#: ../src/mail/e-mail-reader.c:2305 +#: ../src/mail/e-mail-reader.c:2355 msgid "Display the previous thread" msgstr "Vis forrige tråd" -#: ../src/mail/e-mail-reader.c:2310 +#: ../src/mail/e-mail-reader.c:2360 msgid "P_revious Unread Message" msgstr "Fo_rrige uleste melding" -#: ../src/mail/e-mail-reader.c:2312 +#: ../src/mail/e-mail-reader.c:2362 msgid "Display the previous unread message" msgstr "Vis forrige uleste melding" -#: ../src/mail/e-mail-reader.c:2319 +#: ../src/mail/e-mail-reader.c:2369 msgid "Print this message" msgstr "Skriv ut denne meldingen" -#: ../src/mail/e-mail-reader.c:2326 +#: ../src/mail/e-mail-reader.c:2376 msgid "Preview the message to be printed" msgstr "Forhåndsvis meldingen som skal skrives ut" -#: ../src/mail/e-mail-reader.c:2331 +#: ../src/mail/e-mail-reader.c:2381 #: ../src/modules/mail/e-mail-attachment-handler.c:451 msgid "Re_direct" msgstr "Om_diriger" -#: ../src/mail/e-mail-reader.c:2333 +#: ../src/mail/e-mail-reader.c:2383 #: ../src/modules/mail/e-mail-attachment-handler.c:453 msgid "Redirect (bounce) the selected message to someone" msgstr "Omdiriger (bounce) den valgte meldingen til noen" -#: ../src/mail/e-mail-reader.c:2338 +#: ../src/mail/e-mail-reader.c:2388 msgid "Remo_ve Attachments" msgstr "Fjern _vedlegg" -#: ../src/mail/e-mail-reader.c:2340 +#: ../src/mail/e-mail-reader.c:2390 msgid "Remove attachments" msgstr "Fjern vedlegg" -#: ../src/mail/e-mail-reader.c:2345 +#: ../src/mail/e-mail-reader.c:2395 msgid "Remove Du_plicate Messages" msgstr "Fjern du_plikatmeldinger" -#: ../src/mail/e-mail-reader.c:2347 +#: ../src/mail/e-mail-reader.c:2397 msgid "Checks selected messages for duplicates" msgstr "Sjekk valgte meldinger for duplikater" -#: ../src/mail/e-mail-reader.c:2352 ../src/mail/mail.error.xml.h:28 +#: ../src/mail/e-mail-reader.c:2402 ../src/mail/mail.error.xml.h:28 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1477 #: ../src/modules/mail/e-mail-attachment-handler.c:395 msgid "Reply to _All" msgstr "Svar til _alle" -#: ../src/mail/e-mail-reader.c:2354 +#: ../src/mail/e-mail-reader.c:2404 #: ../src/modules/mail/e-mail-attachment-handler.c:397 msgid "Compose a reply to all the recipients of the selected message" msgstr "Skriv et svar til alle mottakere av den valgte meldingen" -#: ../src/mail/e-mail-reader.c:2359 ../src/mail/mail.error.xml.h:26 +#: ../src/mail/e-mail-reader.c:2409 ../src/mail/mail.error.xml.h:26 #: ../src/modules/mail/e-mail-attachment-handler.c:402 msgid "Reply to _List" msgstr "Svar til _listen" -#: ../src/mail/e-mail-reader.c:2361 +#: ../src/mail/e-mail-reader.c:2411 #: ../src/modules/mail/e-mail-attachment-handler.c:404 msgid "Compose a reply to the mailing list of the selected message" msgstr "Skriv et svar til e-postlisten for den valgte meldingen" -#: ../src/mail/e-mail-reader.c:2366 +#: ../src/mail/e-mail-reader.c:2416 #: ../src/modules/mail/e-mail-attachment-handler.c:409 msgid "_Reply to Sender" msgstr "Sva_r til avsender" -#: ../src/mail/e-mail-reader.c:2368 +#: ../src/mail/e-mail-reader.c:2418 #: ../src/modules/mail/e-mail-attachment-handler.c:411 msgid "Compose a reply to the sender of the selected message" msgstr "Skriv et svar til avsender av den valgte meldingen" -#: ../src/mail/e-mail-reader.c:2373 +#: ../src/mail/e-mail-reader.c:2423 msgid "_Save as mbox..." msgstr "Lagre _som mbox …" -#: ../src/mail/e-mail-reader.c:2375 +#: ../src/mail/e-mail-reader.c:2425 msgid "Save selected messages as an mbox file" msgstr "Lagre valgte meldinger som en mbox-fil" -#: ../src/mail/e-mail-reader.c:2380 +#: ../src/mail/e-mail-reader.c:2430 msgid "_Message Source" msgstr "_Meldingskilde" -#: ../src/mail/e-mail-reader.c:2382 +#: ../src/mail/e-mail-reader.c:2432 msgid "Show the raw email source of the message" msgstr "Vis e-post meldingen i sin råe form" -#: ../src/mail/e-mail-reader.c:2394 +#: ../src/mail/e-mail-reader.c:2444 msgid "_Undelete Message" msgstr "_Angre sletting av melding" -#: ../src/mail/e-mail-reader.c:2396 +#: ../src/mail/e-mail-reader.c:2446 msgid "Undelete the selected messages" msgstr "Angre sletting av valgte meldinger" -#: ../src/mail/e-mail-reader.c:2401 +#: ../src/mail/e-mail-reader.c:2451 msgid "_Normal Size" msgstr "_Normal størrelse" -#: ../src/mail/e-mail-reader.c:2403 +#: ../src/mail/e-mail-reader.c:2453 msgid "Reset the text to its original size" msgstr "Ta teksten tilbake til sin opprinnelige størrelse" -#: ../src/mail/e-mail-reader.c:2408 +#: ../src/mail/e-mail-reader.c:2458 msgid "_Zoom In" msgstr "_Zoom inn" -#: ../src/mail/e-mail-reader.c:2410 +#: ../src/mail/e-mail-reader.c:2460 msgid "Increase the text size" msgstr "Større tekst" -#: ../src/mail/e-mail-reader.c:2417 +#: ../src/mail/e-mail-reader.c:2467 msgid "Decrease the text size" msgstr "Mindre skrift" -#: ../src/mail/e-mail-reader.c:2424 +#: ../src/mail/e-mail-reader.c:2474 msgid "Cre_ate" msgstr "L_ag" -#: ../src/mail/e-mail-reader.c:2431 +#: ../src/mail/e-mail-reader.c:2481 msgid "Ch_aracter Encoding" msgstr "Tegn_koding" -#: ../src/mail/e-mail-reader.c:2438 +#: ../src/mail/e-mail-reader.c:2488 #: ../src/modules/mail/e-mail-attachment-handler.c:423 msgid "F_orward As" msgstr "Videresend s_om" -#: ../src/mail/e-mail-reader.c:2445 +#: ../src/mail/e-mail-reader.c:2495 msgid "_Group Reply" msgstr "_Gruppesvar" -#: ../src/mail/e-mail-reader.c:2452 +#: ../src/mail/e-mail-reader.c:2502 msgid "_Go To" msgstr "_Gå til" -#: ../src/mail/e-mail-reader.c:2459 +#: ../src/mail/e-mail-reader.c:2509 msgid "Mar_k As" msgstr "Mer_k som" -#: ../src/mail/e-mail-reader.c:2466 +#: ../src/mail/e-mail-reader.c:2516 msgid "_Message" msgstr "_Melding" -#: ../src/mail/e-mail-reader.c:2473 +#: ../src/mail/e-mail-reader.c:2523 msgid "_Zoom" msgstr "_Zoom" -#: ../src/mail/e-mail-reader.c:2483 +#: ../src/mail/e-mail-reader.c:2533 msgid "Create a Search Folder from Mailing _List..." msgstr "Lag en søkemappe fra e-post_liste …" -#: ../src/mail/e-mail-reader.c:2485 +#: ../src/mail/e-mail-reader.c:2535 msgid "Create a search folder for this mailing list" msgstr "Lag en søkemappe for denne e-postlisten" -#: ../src/mail/e-mail-reader.c:2490 +#: ../src/mail/e-mail-reader.c:2540 msgid "Create a Search Folder from Recipien_ts..." msgstr "Lag en søkemappe fra mo_ttakere …" -#: ../src/mail/e-mail-reader.c:2492 +#: ../src/mail/e-mail-reader.c:2542 msgid "Create a search folder for these recipients" msgstr "Lag en søkemappe for disse mottakerene" -#: ../src/mail/e-mail-reader.c:2497 +#: ../src/mail/e-mail-reader.c:2547 msgid "Create a Search Folder from Sen_der..." msgstr "Lag en søkemappe fra avsen_der …" -#: ../src/mail/e-mail-reader.c:2499 +#: ../src/mail/e-mail-reader.c:2549 msgid "Create a search folder for this sender" msgstr "Lag en søkemappe for denne avsenderen" -#: ../src/mail/e-mail-reader.c:2504 +#: ../src/mail/e-mail-reader.c:2554 msgid "Create a Search Folder from S_ubject..." msgstr "Lag en søkemappe fra _emne …" -#: ../src/mail/e-mail-reader.c:2506 +#: ../src/mail/e-mail-reader.c:2556 msgid "Create a search folder for this subject" msgstr "Lag en søkemappe for dette emnet" -#: ../src/mail/e-mail-reader.c:2545 +#: ../src/mail/e-mail-reader.c:2595 msgid "Mark for Follo_w Up..." msgstr "Merk for oppføl_ging …" -#: ../src/mail/e-mail-reader.c:2561 +#: ../src/mail/e-mail-reader.c:2611 msgid "Mark as _Important" msgstr "Merk som v_iktig" -#: ../src/mail/e-mail-reader.c:2565 +#: ../src/mail/e-mail-reader.c:2615 msgid "Mark as _Junk" msgstr "Merk som _uønsket e-post" -#: ../src/mail/e-mail-reader.c:2569 +#: ../src/mail/e-mail-reader.c:2619 msgid "Mark as _Not Junk" msgstr "Merk som _gyldig melding" -#: ../src/mail/e-mail-reader.c:2573 +#: ../src/mail/e-mail-reader.c:2623 msgid "Mar_k as Read" msgstr "Mer_k som lest" -#: ../src/mail/e-mail-reader.c:2585 +#: ../src/mail/e-mail-reader.c:2635 msgid "Mark as Uni_mportant" msgstr "_Merk som uviktig" -#: ../src/mail/e-mail-reader.c:2589 +#: ../src/mail/e-mail-reader.c:2639 msgid "Mark as _Unread" msgstr "Merk som _ulest" -#: ../src/mail/e-mail-reader.c:2633 +#: ../src/mail/e-mail-reader.c:2683 msgid "_Caret Mode" msgstr "Markør_modus" -#: ../src/mail/e-mail-reader.c:2635 +#: ../src/mail/e-mail-reader.c:2685 msgid "Show a blinking cursor in the body of displayed messages" msgstr "Vis en blinkende markør i kroppen av meldinger som vises" -#: ../src/mail/e-mail-reader.c:2641 +#: ../src/mail/e-mail-reader.c:2691 msgid "All Message _Headers" msgstr "Alle meldings_hoder" -#: ../src/mail/e-mail-reader.c:2643 +#: ../src/mail/e-mail-reader.c:2693 msgid "Show messages with all email headers" msgstr "Vis meldinger med alle meldingshoder" -#: ../src/mail/e-mail-reader.c:3172 +#: ../src/mail/e-mail-reader.c:3222 msgid "Retrieving message" msgstr "Henter melding" -#: ../src/mail/e-mail-reader.c:4222 +#: ../src/mail/e-mail-reader.c:4272 #: ../src/modules/mail/e-mail-attachment-handler.c:388 msgid "_Forward" msgstr "_Videresend" -#: ../src/mail/e-mail-reader.c:4223 +#: ../src/mail/e-mail-reader.c:4273 #: ../src/modules/mail/e-mail-attachment-handler.c:390 msgid "Forward the selected message to someone" msgstr "Videresend den valgte meldingen til noen" @@ -16977,52 +17176,52 @@ #. * (if possible and if that configuration option is enabled), or else #. * it will reply to all. The word "Group" was chosen because it covers #. * either of those, without too strongly implying one or the other. -#: ../src/mail/e-mail-reader.c:4242 +#: ../src/mail/e-mail-reader.c:4292 msgid "Group Reply" msgstr "Gruppesvar" -#: ../src/mail/e-mail-reader.c:4243 +#: ../src/mail/e-mail-reader.c:4293 msgid "Reply to the mailing list, or to all recipients" msgstr "Svar til e-postlisten eller til alle mottakere" -#: ../src/mail/e-mail-reader.c:4309 ../src/mail/filtertypes.xml.in.h:67 +#: ../src/mail/e-mail-reader.c:4359 ../src/mail/filtertypes.xml.in.h:67 msgid "Delete" msgstr "Slett" -#: ../src/mail/e-mail-reader.c:4321 +#: ../src/mail/e-mail-reader.c:4371 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1281 msgid "Next" msgstr "Neste" -#: ../src/mail/e-mail-reader.c:4325 +#: ../src/mail/e-mail-reader.c:4375 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1274 msgid "Previous" msgstr "Forrige" -#: ../src/mail/e-mail-reader.c:4334 ../src/mail/mail-dialogs.ui.h:9 +#: ../src/mail/e-mail-reader.c:4384 ../src/mail/mail-dialogs.ui.h:9 msgid "Reply" msgstr "Svar" -#: ../src/mail/e-mail-reader.c:5407 +#: ../src/mail/e-mail-reader.c:5457 #, c-format msgid "Allow remote content for anyone from %s" msgstr "Tillat eksternt innhold for alle fra %s" -#: ../src/mail/e-mail-reader.c:5409 +#: ../src/mail/e-mail-reader.c:5459 #, c-format msgid "Allow remote content for %s" msgstr "Tillat eksternt innhold for %s" -#: ../src/mail/e-mail-reader.c:5426 +#: ../src/mail/e-mail-reader.c:5476 #, c-format msgid "Allow remote content from %s" msgstr "Tillat eksternt innhold fra %s" -#: ../src/mail/e-mail-reader.c:5443 +#: ../src/mail/e-mail-reader.c:5493 msgid "Do not show this message again" msgstr "Ikke vis denne meldingen igjen" -#: ../src/mail/e-mail-reader.c:5491 +#: ../src/mail/e-mail-reader.c:5541 msgid "Load remote content" msgstr "Last eksternt innhold" @@ -17106,12 +17305,12 @@ msgid "Flag to Follow Up" msgstr "Merk for oppfølging" -#: ../src/mail/e-mail-ui-session.c:821 +#: ../src/mail/e-mail-ui-session.c:820 #, c-format msgid "%s authentication failed" msgstr "%s autentisering feilet" -#: ../src/mail/e-mail-ui-session.c:871 +#: ../src/mail/e-mail-ui-session.c:870 #, c-format msgid "No data source found for UID “%s”" msgstr "Fant ingen datakilde for UID «%s»" @@ -17181,22 +17380,16 @@ msgid "-----Original Message-----" msgstr "-----Opprinnelig melding-----" -#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the subject of the original message. -#: ../src/mail/em-composer-utils.c:2562 -#, c-format -msgid "Re: %s" -msgstr "Re: %s" - -#: ../src/mail/em-composer-utils.c:3103 +#: ../src/mail/em-composer-utils.c:3102 msgid "an unknown sender" msgstr "en ukjent avsender" #. FIXME GTK_WINDOW (composer) -#: ../src/mail/em-composer-utils.c:3581 +#: ../src/mail/em-composer-utils.c:3580 msgid "Posting destination" msgstr "Destinasjon for post" -#: ../src/mail/em-composer-utils.c:3586 +#: ../src/mail/em-composer-utils.c:3585 msgid "Choose folders to post the message to." msgstr "Velg mapper meldingen skal postes til." @@ -17323,7 +17516,7 @@ msgid "Create a new folder" msgstr "Lag en ny mappe" -#: ../src/mail/em-folder-tree.c:683 +#: ../src/mail/em-folder-tree.c:682 msgid "Folder names cannot contain “/”" msgstr "Mappenavn kan ikke inneholde tegnet «/»" @@ -17345,37 +17538,37 @@ #. * Do not translate the "folder-display|" part. Remove it #. * from your translation. #. -#: ../src/mail/em-folder-tree.c:877 +#: ../src/mail/em-folder-tree.c:876 #, c-format msgctxt "folder-display" msgid "%s (%u%s)" msgstr "%s (%u%s)" -#: ../src/mail/em-folder-tree.c:1742 +#: ../src/mail/em-folder-tree.c:1731 msgid "Mail Folder Tree" msgstr "Tre for e-postmapper" -#: ../src/mail/em-folder-tree.c:2290 ../src/mail/em-folder-utils.c:83 +#: ../src/mail/em-folder-tree.c:2279 ../src/mail/em-folder-utils.c:83 #, c-format msgid "Moving folder %s" msgstr "Flytter mappe %s" -#: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85 +#: ../src/mail/em-folder-tree.c:2282 ../src/mail/em-folder-utils.c:85 #, c-format msgid "Copying folder %s" msgstr "Kopierer mappe %s" -#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2508 +#: ../src/mail/em-folder-tree.c:2289 ../src/mail/message-list.c:2509 #, c-format msgid "Moving messages into folder %s" msgstr "Flytter meldinger til mappe %s" -#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2510 +#: ../src/mail/em-folder-tree.c:2293 ../src/mail/message-list.c:2511 #, c-format msgid "Copying messages into folder %s" msgstr "Kopierer meldinger til mappe %s" -#: ../src/mail/em-folder-tree.c:2323 +#: ../src/mail/em-folder-tree.c:2312 #, c-format msgid "Cannot drop message(s) into toplevel store" msgstr "Kan ikke slippe melding(er) toppnivå for lageret" @@ -17387,7 +17580,7 @@ msgstr "UTEN TREFF" #: ../src/mail/em-folder-tree-model.c:1326 -#: ../src/mail/em-folder-tree-model.c:1702 +#: ../src/mail/em-folder-tree-model.c:1703 msgid "Loading..." msgstr "Laster …" @@ -17426,7 +17619,9 @@ msgstr "Fjern abonnement på _alle" #: ../src/mail/em-subscription-editor.c:1339 -#: ../src/modules/mail/e-mail-shell-view-private.c:1003 +#: ../src/modules/mail/e-mail-shell-view-private.c:942 +#: ../src/modules/mail/e-mail-shell-view-private.c:974 +#: ../src/modules/mail/e-mail-shell-view-private.c:1018 #, c-format msgid "%d unread, " msgid_plural "%d unread, " @@ -17434,7 +17629,7 @@ msgstr[1] "%d uleste, " #: ../src/mail/em-subscription-editor.c:1343 -#: ../src/modules/mail/e-mail-shell-view-private.c:1013 +#: ../src/modules/mail/e-mail-shell-view-private.c:1028 #, c-format msgid "%d total" msgid_plural "%d total" @@ -17490,12 +17685,6 @@ msgid "Refresh the folder list" msgstr "Oppdater mappelisten" -#: ../src/mail/em-subscription-editor.c:1976 -#: ../src/modules/mail/e-mail-shell-view-actions.c:1652 -#: ../src/modules/mail/e-mail-shell-view-actions.c:1723 -msgid "_Refresh" -msgstr "Oppdate_r" - #: ../src/mail/em-subscription-editor.c:1987 msgid "Stop the current operation" msgstr "Stopp aktiv operasjon" @@ -17928,7 +18117,7 @@ msgstr "Importer e-post og kontakter fra KMail." #: ../src/mail/importers/kmail-libs.c:150 -#: ../src/modules/mail/e-mail-shell-view-private.c:1034 +#: ../src/modules/mail/e-mail-shell-view-private.c:1049 msgid "Trash" msgstr "Papirkurv" @@ -19208,13 +19397,16 @@ #: ../src/mail/mail.error.xml.h:158 msgid "This message cannot be sent because there is no mail account configured" -msgstr "Denne meldingen kan ikke sendes fordi du ikke har konfigurert en e-postkonto" +msgstr "" +"Denne meldingen kan ikke sendes fordi du ikke har konfigurert en e-postkonto" #: ../src/mail/mail.error.xml.h:159 msgid "" "There had not been found any active mail account to send the message. Create " "or enable one first, please." -msgstr "Fant ingen aktive e-postkontoer å sende meldingen med. Lag eller aktiver en konto først er du snill." +msgstr "" +"Fant ingen aktive e-postkontoer å sende meldingen med. Lag eller aktiver en " +"konto først er du snill." #: ../src/mail/mail.error.xml.h:160 msgid "Mail Deletion Failed" @@ -19439,7 +19631,9 @@ msgid "" "These messages will be shown in the Trash folder, where they can be " "permanently deleted later." -msgstr "Disse meldingene vil vises i papirkurven, hvor de kan slettes permanent senere." +msgstr "" +"Disse meldingene vil vises i papirkurven, hvor de kan slettes permanent " +"senere." #: ../src/mail/mail.error.xml.h:216 msgid "_Empty Junk" @@ -19501,87 +19695,87 @@ msgid "New Search Folder" msgstr "Ny søkemappe" -#: ../src/mail/message-list.c:300 +#: ../src/mail/message-list.c:301 msgid "Unseen" msgstr "Ulest" -#: ../src/mail/message-list.c:301 +#: ../src/mail/message-list.c:302 msgid "Seen" msgstr "Lest" -#: ../src/mail/message-list.c:302 +#: ../src/mail/message-list.c:303 msgid "Answered" msgstr "Besvart" -#: ../src/mail/message-list.c:303 +#: ../src/mail/message-list.c:304 msgid "Forwarded" msgstr "Videresendt" -#: ../src/mail/message-list.c:304 +#: ../src/mail/message-list.c:305 msgid "Multiple Unseen Messages" msgstr "Flere uleste meldinger" -#: ../src/mail/message-list.c:305 +#: ../src/mail/message-list.c:306 msgid "Multiple Messages" msgstr "Flere meldinger" -#: ../src/mail/message-list.c:318 +#: ../src/mail/message-list.c:319 msgid "Lowest" msgstr "Lavest" -#: ../src/mail/message-list.c:319 +#: ../src/mail/message-list.c:320 msgid "Lower" msgstr "Lavere" -#: ../src/mail/message-list.c:323 +#: ../src/mail/message-list.c:324 msgid "Higher" msgstr "Høyere" -#: ../src/mail/message-list.c:324 +#: ../src/mail/message-list.c:325 msgid "Highest" msgstr "Høyest" -#: ../src/mail/message-list.c:470 ../src/mail/message-list.c:6289 +#: ../src/mail/message-list.c:471 ../src/mail/message-list.c:6297 msgid "Generating message list" msgstr "Genererer meldingsliste" #. strftime format of a time, #. * in 12-hour format, without seconds. -#: ../src/mail/message-list.c:2074 +#: ../src/mail/message-list.c:2075 #: ../src/modules/itip-formatter/itip-view.c:267 msgid "Today %l:%M %p" msgstr "I dag %l:%M %p" -#: ../src/mail/message-list.c:2083 +#: ../src/mail/message-list.c:2084 msgid "Yesterday %l:%M %p" msgstr "I går %l:%M %p" -#: ../src/mail/message-list.c:2095 +#: ../src/mail/message-list.c:2096 msgid "%a %l:%M %p" msgstr "%a %H.%M" -#: ../src/mail/message-list.c:2103 +#: ../src/mail/message-list.c:2104 msgid "%b %d %l:%M %p" msgstr "%d %b %H.%M" -#: ../src/mail/message-list.c:2105 +#: ../src/mail/message-list.c:2106 msgid "%b %d %Y" msgstr "%d %b %Y" -#: ../src/mail/message-list.c:3062 +#: ../src/mail/message-list.c:3063 msgid "Select all visible messages" msgstr "Velg alle synlige meldinger" -#: ../src/mail/message-list.c:3781 ../src/mail/message-list.etspec.h:17 +#: ../src/mail/message-list.c:3782 ../src/mail/message-list.etspec.h:17 msgid "Messages" msgstr "Meldinger" #. default follow-up flag name to use when clicked in the message list column -#: ../src/mail/message-list.c:5213 +#: ../src/mail/message-list.c:5207 msgid "Follow-up" msgstr "Følg opp" -#: ../src/mail/message-list.c:6228 +#: ../src/mail/message-list.c:6236 msgid "" "No message satisfies your search criteria. Change search criteria by " "selecting a new Show message filter from the drop down list above or by " @@ -19593,7 +19787,7 @@ "starte et nytt søk enten ved å tømme det med Søk->Tøm menyoppføringen eller " "ved å endre spørringen over." -#: ../src/mail/message-list.c:6236 +#: ../src/mail/message-list.c:6244 msgid "There are no messages in this folder." msgstr "Det er ingen meldinger i denne mappen." @@ -19717,6 +19911,20 @@ msgid "Task List Properties" msgstr "Egenskaper for oppgaveliste" +#: ../src/modules/accounts-window/e-webdav-browser-page.c:174 +msgid "_Back" +msgstr "Til_bake" + +#: ../src/modules/accounts-window/e-webdav-browser-page.c:195 +msgid "_Browse" +msgstr "_Bla gjennom" + +#: ../src/modules/accounts-window/e-webdav-browser-page.c:197 +msgid "" +"Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete " +"address books, calendars, memo lists or task lists there" +msgstr "Bla gjennom WebDAV (CalDAV eller CardDAV) tjenere og lag, rediger eller slett adressebøker, kalendere, notatlister eller oppgavelister der" + #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list #: ../src/modules/addressbook/autocompletion-config.c:124 #: ../src/modules/mail/em-mailer-prefs.c:1562 @@ -21763,11 +21971,11 @@ msgstr[0] "%d oppgave" msgstr[1] "%d oppgaver" -#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319 +#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:324 msgid "Convert to M_eeting" msgstr "Konverter til _møte" -#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321 +#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326 msgid "Convert the message to a meeting request" msgstr "Konverter meldinigen til en møteforespørsel" @@ -21779,6 +21987,21 @@ msgid "Convert to the mail message" msgstr "Konverter til en e-postmelding" +#: ../src/modules/config-lookup/e-srv-config-lookup.c:83 +#: ../src/modules/config-lookup/e-srv-config-lookup.c:84 +msgid "CalDAV server" +msgstr "CalDAV-tjener" + +#: ../src/modules/config-lookup/e-srv-config-lookup.c:85 +#: ../src/modules/config-lookup/e-srv-config-lookup.c:86 +msgid "CardDAV server" +msgstr "CardDAV-tjener" + +#: ../src/modules/config-lookup/e-srv-config-lookup.c:87 +#: ../src/modules/config-lookup/e-srv-config-lookup.c:88 +msgid "LDAP server" +msgstr "LDAP-tjener" + #: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162 msgid "ITIP" msgstr "ITIP" @@ -23142,58 +23365,58 @@ msgid "Account Search" msgstr "Søk i konto" -#: ../src/modules/mail/e-mail-shell-view-private.c:931 +#: ../src/modules/mail/e-mail-shell-view-private.c:935 #, c-format msgid "%d selected, " msgid_plural "%d selected, " msgstr[0] "%d valgt, " msgstr[1] "%d valgt, " -#: ../src/modules/mail/e-mail-shell-view-private.c:940 -#: ../src/modules/mail/e-mail-shell-view-private.c:957 +#: ../src/modules/mail/e-mail-shell-view-private.c:950 +#: ../src/modules/mail/e-mail-shell-view-private.c:967 #, c-format msgid "%d deleted" msgid_plural "%d deleted" msgstr[0] "%d slettet" msgstr[1] "%d slettet" -#: ../src/modules/mail/e-mail-shell-view-private.c:966 -#: ../src/modules/mail/e-mail-shell-view-private.c:972 +#: ../src/modules/mail/e-mail-shell-view-private.c:981 +#: ../src/modules/mail/e-mail-shell-view-private.c:987 #, c-format msgid "%d junk" msgid_plural "%d junk" msgstr[0] "%d uønsket e-post" msgstr[1] "%d uønsket e-poster" -#: ../src/modules/mail/e-mail-shell-view-private.c:979 +#: ../src/modules/mail/e-mail-shell-view-private.c:994 #, c-format msgid "%d draft" msgid_plural "%d drafts" msgstr[0] "%d skisse" msgstr[1] "%d skisser" -#: ../src/modules/mail/e-mail-shell-view-private.c:985 +#: ../src/modules/mail/e-mail-shell-view-private.c:1000 #, c-format msgid "%d unsent" msgid_plural "%d unsent" msgstr[0] "%d usendt" msgstr[1] "%d usendte" -#: ../src/modules/mail/e-mail-shell-view-private.c:991 +#: ../src/modules/mail/e-mail-shell-view-private.c:1006 #, c-format msgid "%d sent" msgid_plural "%d sent" msgstr[0] "%d sendt" msgstr[1] "%d sendt" -#: ../src/modules/mail/e-mail-shell-view-private.c:1008 +#: ../src/modules/mail/e-mail-shell-view-private.c:1023 #, c-format msgid "%d unread" msgid_plural "%d unread" msgstr[0] "%d ulest" msgstr[1] "%d uleste" -#: ../src/modules/mail/e-mail-shell-view-private.c:1526 +#: ../src/modules/mail/e-mail-shell-view-private.c:1541 msgid "Send / Receive" msgstr "Send / motta" @@ -25196,7 +25419,7 @@ msgid "Delete view: %s" msgstr "Slett visning: %s" -#: ../src/shell/e-shell-window-actions.c:1801 +#: ../src/shell/e-shell-window-actions.c:1804 msgid "Execute these search parameters" msgstr "Kjør disse søkeparameterene" @@ -25208,13 +25431,13 @@ msgstr "Ny" #. Translators: This is used for the main window title. -#: ../src/shell/e-shell-window-private.c:721 +#: ../src/shell/e-shell-window-private.c:756 #, c-format msgid "%s — Evolution" msgstr "%s – Evolution" #. Preview/Alpha/Beta version warning message -#: ../src/shell/main.c:195 +#: ../src/shell/main.c:192 #, no-c-format msgid "" "Hi. Thanks for taking the time to download this preview release\n" @@ -25249,7 +25472,7 @@ "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n" "spenning på at du tilbyr din hjelp!\n" -#: ../src/shell/main.c:219 +#: ../src/shell/main.c:216 msgid "" "Thanks\n" "The Evolution Team\n" @@ -25257,13 +25480,13 @@ "Takk\n" "Evolution utviklerene\n" -#: ../src/shell/main.c:225 +#: ../src/shell/main.c:222 msgid "Do not tell me again" msgstr "Ikke gi beskjed igjen" #. Translators: Do NOT translate the five component #. * names, they MUST remain in English! -#: ../src/shell/main.c:314 +#: ../src/shell/main.c:311 msgid "" "Start Evolution showing the specified component. Available options are " "“mail”, “calendar”, “contacts”, “tasks”, and “memos”" @@ -25271,39 +25494,39 @@ "Start Evolution med oppgitt komponent. Tilgjengelige valg er «mail», " "«calendar», «contacts», «tasks» og «memos»" -#: ../src/shell/main.c:318 +#: ../src/shell/main.c:315 msgid "Apply the given geometry to the main window" msgstr "Bruk oppgitt geometri på hovedvinduet" -#: ../src/shell/main.c:322 +#: ../src/shell/main.c:319 msgid "Start in online mode" msgstr "Start i tilkoblet modus" -#: ../src/shell/main.c:324 +#: ../src/shell/main.c:321 msgid "Ignore network availability" msgstr "Ignorer nettverkstilgjengelighet" -#: ../src/shell/main.c:327 +#: ../src/shell/main.c:324 msgid "Forcibly shut down Evolution" msgstr "Tvungen nedstenging av Evolution" -#: ../src/shell/main.c:330 +#: ../src/shell/main.c:327 msgid "Disable loading of any plugins." msgstr "Slå av lasting av tillegg." -#: ../src/shell/main.c:332 +#: ../src/shell/main.c:329 msgid "Disable preview pane of Mail, Contacts and Tasks." msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver." -#: ../src/shell/main.c:336 +#: ../src/shell/main.c:333 msgid "Import URIs or filenames given as rest of arguments." msgstr "Importer URIer eller filnavn gitt som argumenter." -#: ../src/shell/main.c:338 +#: ../src/shell/main.c:335 msgid "Request a running Evolution process to quit" msgstr "Be en kjørende Evolution-prosess om å stenge ned" -#: ../src/shell/main.c:415 +#: ../src/shell/main.c:412 #, c-format msgid "" "Cannot start Evolution. Another Evolution instance may be unresponsive. " @@ -25312,11 +25535,11 @@ "Kan ikke starte Evolution. En annen instans kjører sannsynligvis og svarer " "ikke. Systemfeil: %s" -#: ../src/shell/main.c:466 ../src/shell/main.c:471 +#: ../src/shell/main.c:463 ../src/shell/main.c:468 msgid "— The Evolution PIM and Email Client" msgstr "– Evolution personlig informasjonshåndterer og e-postklient" -#: ../src/shell/main.c:533 +#: ../src/shell/main.c:530 #, c-format msgid "" "%s: --online and --offline cannot be used together.\n" @@ -25325,7 +25548,7 @@ "%s: --online og --offline kan ikke brukes samtidig.\n" " Bruk «%s --help» for mer informasjon.\n" -#: ../src/shell/main.c:539 +#: ../src/shell/main.c:536 #, c-format msgid "" "%s: --force-online and --offline cannot be used together.\n" diff -Nru evolution-3.26.2/src/calendar/alarm-notify/alarm-notify-dialog.c evolution-3.26.3/src/calendar/alarm-notify/alarm-notify-dialog.c --- evolution-3.26.2/src/calendar/alarm-notify/alarm-notify-dialog.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/calendar/alarm-notify/alarm-notify-dialog.c 2017-12-11 11:08:06.000000000 +0000 @@ -27,6 +27,8 @@ #include #include +#include + #include "e-util/e-util.h" #include "alarm-notify-dialog.h" @@ -274,6 +276,20 @@ g_free (an); } +static gboolean +location_activate_link_cb (GtkWidget *label, + const gchar *uri, + gpointer user_data) +{ + GtkWidget *toplevel; + + toplevel = gtk_widget_get_toplevel (label); + + e_show_uri (GTK_IS_WINDOW (toplevel) ? GTK_WINDOW (toplevel) : NULL, uri); + + return TRUE; +} + /** * notified_alarms_dialog_new: * @@ -383,6 +399,9 @@ GTK_IMAGE (image), "stock_alarm", GTK_ICON_SIZE_DIALOG); g_signal_connect ( + an->location, "activate-link", + G_CALLBACK (location_activate_link_cb), an); + g_signal_connect ( an->edit_btn, "clicked", G_CALLBACK (edit_pressed_cb), an); g_signal_connect ( @@ -557,10 +576,19 @@ { GtkTextTagTable *table = gtk_text_tag_table_new (); GtkTextBuffer *buffer = gtk_text_buffer_new (table); + gchar *location_markup; + gtk_text_buffer_set_text (buffer, description, -1); e_buffer_tagger_disconnect (GTK_TEXT_VIEW (an->description)); gtk_text_view_set_buffer (GTK_TEXT_VIEW (an->description), buffer); - gtk_label_set_text (GTK_LABEL (an->location), location); + + location_markup = location ? camel_text_to_html (location, CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES, 0) : NULL; + if (location_markup) + gtk_label_set_markup (GTK_LABEL (an->location), location_markup); + else + gtk_label_set_text (GTK_LABEL (an->location), location); + g_free (location_markup); + e_buffer_tagger_connect (GTK_TEXT_VIEW (an->description)); e_buffer_tagger_update_tags (GTK_TEXT_VIEW (an->description)); g_object_unref (table); diff -Nru evolution-3.26.2/src/calendar/alarm-notify/alarm-notify.ui evolution-3.26.3/src/calendar/alarm-notify/alarm-notify.ui --- evolution-3.26.2/src/calendar/alarm-notify/alarm-notify.ui 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/calendar/alarm-notify/alarm-notify.ui 2017-12-11 11:08:06.000000000 +0000 @@ -239,6 +239,7 @@ location of appointment True 80 + True 0 diff -Nru evolution-3.26.2/src/calendar/alarm-notify/notify-main.c evolution-3.26.3/src/calendar/alarm-notify/notify-main.c --- evolution-3.26.2/src/calendar/alarm-notify/notify-main.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/calendar/alarm-notify/notify-main.c 2017-12-11 11:08:06.000000000 +0000 @@ -64,6 +64,11 @@ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); + /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */ + g_type_ensure (G_TYPE_DBUS_CONNECTION); + g_type_ensure (G_TYPE_DBUS_PROXY); + g_type_ensure (G_BUS_TYPE_SESSION); + gtk_init (&argc, &argv); e_xml_initialize_in_main (); diff -Nru evolution-3.26.2/src/calendar/gui/e-comp-editor-page-general.c evolution-3.26.3/src/calendar/gui/e-comp-editor-page-general.c --- evolution-3.26.2/src/calendar/gui/e-comp-editor-page-general.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/calendar/gui/e-comp-editor-page-general.c 2017-12-11 11:08:06.000000000 +0000 @@ -820,7 +820,7 @@ cn = icalparameter_get_cn (param); if (cn && *cn) { - value = g_strdup_printf ("%s <%s>", cn, itip_strip_mailto (organizer)); + value = camel_internet_address_format_address (cn, itip_strip_mailto (organizer)); } } diff -Nru evolution-3.26.2/src/calendar/gui/e-day-view.c evolution-3.26.3/src/calendar/gui/e-day-view.c --- evolution-3.26.2/src/calendar/gui/e-day-view.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/calendar/gui/e-day-view.c 2017-12-11 11:08:06.000000000 +0000 @@ -3308,8 +3308,8 @@ for (l = attendees; l; l = l->next) { ECalComponentAttendee *attendee = l->data; - if ((g_str_equal (itip_strip_mailto (attendee->value), address)) - || (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) { + if ((attendee->value && g_strcmp0 (itip_strip_mailto (attendee->value), address) == 0) + || (attendee->sentby && g_strcmp0 (itip_strip_mailto (attendee->sentby), address) == 0)) { at = attendee; break; } diff -Nru evolution-3.26.2/src/calendar/gui/e-week-view.c evolution-3.26.3/src/calendar/gui/e-week-view.c --- evolution-3.26.2/src/calendar/gui/e-week-view.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/calendar/gui/e-week-view.c 2017-12-11 11:08:06.000000000 +0000 @@ -2586,8 +2586,8 @@ for (l = attendees; l; l = l->next) { ECalComponentAttendee *attendee = l->data; - if ((g_str_equal (itip_strip_mailto (attendee->value), address)) - || (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) { + if ((attendee->value && g_strcmp0 (itip_strip_mailto (attendee->value), address) == 0) + || (attendee->sentby && g_strcmp0 (itip_strip_mailto (attendee->sentby), address) == 0)) { at = attendee; break; } diff -Nru evolution-3.26.2/src/calendar/gui/itip-utils.c evolution-3.26.3/src/calendar/gui/itip-utils.c --- evolution-3.26.2/src/calendar/gui/itip-utils.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/calendar/gui/itip-utils.c 2017-12-11 11:08:06.000000000 +0000 @@ -185,12 +185,8 @@ name = e_source_mail_identity_get_name (extension); address = e_source_mail_identity_get_address (extension); - if (address) { - if (name && *name) - g_ptr_array_add (identities, g_strdup_printf ("%s <%s>", name, address)); - else - g_ptr_array_add (identities, g_strdup_printf ("%s", address)); - } + if (address) + g_ptr_array_add (identities, camel_internet_address_format_address (name, address)); aliases = e_source_mail_identity_dup_aliases (extension); if (aliases && *aliases) { @@ -208,10 +204,7 @@ if (!alias_name || !*alias_name) alias_name = name; - if (alias_name && *alias_name) - g_ptr_array_add (identities, g_strdup_printf ("%s <%s>", alias_name, alias_address)); - else - g_ptr_array_add (identities, g_strdup_printf ("%s", alias_address)); + g_ptr_array_add (identities, camel_internet_address_format_address (alias_name, alias_address)); } } } @@ -269,12 +262,8 @@ name = e_source_mail_identity_get_name (mail_identity); address = e_source_mail_identity_get_address (mail_identity); - if (address != NULL) { - if (name && *name) - identity = g_strdup_printf ("%s <%s>", name, address); - else - identity = g_strdup_printf ("%s", address); - } + if (address) + identity = camel_internet_address_format_address (name, address); g_object_unref (source); diff -Nru evolution-3.26.2/src/composer/e-composer-actions.c evolution-3.26.3/src/composer/e-composer-actions.c --- evolution-3.26.2/src/composer/e-composer-actions.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/composer/e-composer-actions.c 2017-12-11 11:08:06.000000000 +0000 @@ -58,8 +58,10 @@ action_close_cb (GtkAction *action, EMsgComposer *composer) { - if (e_msg_composer_can_close (composer, TRUE)) + if (e_msg_composer_can_close (composer, TRUE)) { + e_composer_emit_before_destroy (composer); gtk_widget_destroy (GTK_WIDGET (composer)); + } } static void diff -Nru evolution-3.26.2/src/composer/e-composer-private.h evolution-3.26.3/src/composer/e-composer-private.h --- evolution-3.26.2/src/composer/e-composer-private.h 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/composer/e-composer-private.h 2017-12-11 11:08:06.000000000 +0000 @@ -142,6 +142,7 @@ (EMsgComposer *composer, GtkSelectionData *selection); void e_composer_update_signature (EMsgComposer *composer); +void e_composer_emit_before_destroy (EMsgComposer *composer); G_END_DECLS diff -Nru evolution-3.26.2/src/composer/e-msg-composer.c evolution-3.26.3/src/composer/e-msg-composer.c --- evolution-3.26.2/src/composer/e-msg-composer.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/composer/e-msg-composer.c 2017-12-11 11:08:06.000000000 +0000 @@ -101,6 +101,7 @@ SAVE_TO_DRAFTS, SAVE_TO_OUTBOX, PRINT, + BEFORE_DESTROY, LAST_SIGNAL }; @@ -2746,6 +2747,23 @@ GTK_TYPE_PRINT_OPERATION_ACTION, CAMEL_TYPE_MIME_MESSAGE, E_TYPE_ACTIVITY); + + signals[BEFORE_DESTROY] = g_signal_new ( + "before-destroy", + G_OBJECT_CLASS_TYPE (class), + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0, + G_TYPE_NONE); +} + +void +e_composer_emit_before_destroy (EMsgComposer *composer) +{ + g_return_if_fail (E_IS_MSG_COMPOSER (composer)); + + g_signal_emit (composer, signals[BEFORE_DESTROY], 0); } static void @@ -4016,6 +4034,7 @@ if (e_msg_composer_is_exiting (composer) && !e_content_editor_get_changed (cnt_editor)) { + e_composer_emit_before_destroy (composer); gtk_widget_destroy (GTK_WIDGET (composer)); } else if (e_msg_composer_is_exiting (composer)) { gtk_widget_set_sensitive (GTK_WIDGET (composer), TRUE); @@ -4446,8 +4465,12 @@ buf = g_strdup (mailto); - /* Parse recipients (everything after ':' until '?' or eos). */ + /* Parse recipients (everything after ':' and up to three leading forward slashes until '?' or eos). */ p = buf + 7; + + while (*p == '/' && p - buf < 10) + p++; + len = strcspn (p, "?"); if (len) { content = g_strndup (p, len); @@ -5362,7 +5385,8 @@ if (!gtk_action_group_get_sensitive (composer->priv->async_actions)) return FALSE; - if (!e_content_editor_get_changed (cnt_editor)) + if (!e_content_editor_get_changed (cnt_editor) || + e_content_editor_is_malfunction (cnt_editor)) return TRUE; window = gtk_widget_get_window (widget); diff -Nru evolution-3.26.2/src/em-format/e-mail-parser-application-mbox.c evolution-3.26.3/src/em-format/e-mail-parser-application-mbox.c --- evolution-3.26.2/src/em-format/e-mail-parser-application-mbox.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/em-format/e-mail-parser-application-mbox.c 2017-12-11 11:08:06.000000000 +0000 @@ -40,6 +40,47 @@ NULL }; +static void +empe_app_mbox_add_message (EMailParser *parser, + CamelMimeMessage *message, + gint nth_message, + GString *part_id, + GCancellable *cancellable, + GQueue *out_mail_parts) +{ + GQueue work_queue = G_QUEUE_INIT; + CamelMimePart *opart; + gint old_len; + + old_len = part_id->len; + + g_string_append_printf (part_id, ".mbox.%d", nth_message); + + opart = camel_mime_part_new (); + camel_medium_set_content (CAMEL_MEDIUM (opart), CAMEL_DATA_WRAPPER (message)); + camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (opart), "message/rfc822"); + + e_mail_parser_parse_part_as ( + parser, opart, part_id, "message/rfc822", + cancellable, &work_queue); + + /* Wrap every message as attachment */ + e_mail_parser_wrap_as_attachment (parser, opart, part_id, &work_queue); + + /* Inline all messages in mbox */ + if (!g_queue_is_empty (&work_queue)) { + EMailPart *pp = g_queue_peek_head (&work_queue); + + pp->force_inline = TRUE; + } + + e_queue_transfer (&work_queue, out_mail_parts); + + g_string_truncate (part_id, old_len); + + g_object_unref (opart); +} + static gboolean empe_app_mbox_parse (EMailParserExtension *extension, EMailParser *parser, @@ -51,7 +92,6 @@ CamelMimeParser *mime_parser; CamelStream *mem_stream; CamelMimeParserState state; - gint old_len; gint messages; GError *error = NULL; @@ -90,67 +130,51 @@ return TRUE; } - g_object_unref (mem_stream); - - old_len = part_id->len; - /* Extract messages from the mbox. */ messages = 0; state = camel_mime_parser_step (mime_parser, NULL, NULL); while (state == CAMEL_MIME_PARSER_STATE_FROM) { - GQueue work_queue = G_QUEUE_INIT; CamelMimeMessage *message; - CamelMimePart *opart; message = camel_mime_message_new (); - opart = CAMEL_MIME_PART (message); if (!camel_mime_part_construct_from_parser_sync ( - opart, mime_parser, NULL, NULL)) { + CAMEL_MIME_PART (message), mime_parser, NULL, NULL)) { g_object_unref (message); break; } - g_string_append_printf (part_id, ".mbox.%d", messages); + empe_app_mbox_add_message (parser, message, messages, part_id, cancellable, out_mail_parts); + messages++; - opart = camel_mime_part_new (); - camel_medium_set_content (CAMEL_MEDIUM (opart), CAMEL_DATA_WRAPPER (message)); - camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (opart), "message/rfc822"); + g_object_unref (message); - e_mail_parser_parse_part_as ( - parser, opart, part_id, "message/rfc822", - cancellable, &work_queue); + /* Skip past CAMEL_MIME_PARSER_STATE_FROM_END. */ + camel_mime_parser_step (mime_parser, NULL, NULL); - /* Wrap every message as attachment */ - e_mail_parser_wrap_as_attachment ( - parser, opart, part_id, &work_queue); + state = camel_mime_parser_step (mime_parser, NULL, NULL); + } - /* Inline all messages in mbox */ - if (!g_queue_is_empty (&work_queue)) { - EMailPart *p = g_queue_peek_head (&work_queue); + if (!messages) { + CamelMimeMessage *message; - p->force_inline = TRUE; - } + g_seekable_seek (G_SEEKABLE (mem_stream), 0, G_SEEK_SET, cancellable, NULL); - e_queue_transfer (&work_queue, out_mail_parts); + message = camel_mime_message_new (); - g_string_truncate (part_id, old_len); + if (camel_data_wrapper_construct_from_stream_sync (CAMEL_DATA_WRAPPER (message), mem_stream, NULL, NULL)) { + empe_app_mbox_add_message (parser, message, messages, part_id, cancellable, out_mail_parts); + messages++; + } g_object_unref (message); - g_object_unref (opart); - - /* Skip past CAMEL_MIME_PARSER_STATE_FROM_END. */ - camel_mime_parser_step (mime_parser, NULL, NULL); - - state = camel_mime_parser_step (mime_parser, NULL, NULL); - - messages++; } g_object_unref (mime_parser); + g_object_unref (mem_stream); - return TRUE; + return messages > 0; } static void diff -Nru evolution-3.26.2/src/em-format/e-mail-parser.c evolution-3.26.3/src/em-format/e-mail-parser.c --- evolution-3.26.2/src/em-format/e-mail-parser.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/em-format/e-mail-parser.c 2017-12-11 11:08:06.000000000 +0000 @@ -494,6 +494,63 @@ return g_object_ref (part_list); } +GQueue * +e_mail_parser_get_parsers_for_part (EMailParser *parser, + CamelMimePart *part) +{ + CamelContentType *ct; + gchar *mime_type; + GQueue *parsers; + + g_return_val_if_fail (E_IS_MAIL_PARSER (parser), NULL); + g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL); + + ct = camel_mime_part_get_content_type (part); + if (!ct) { + mime_type = (gchar *) "application/vnd.evolution.error"; + } else { + gchar *tmp; + tmp = camel_content_type_simple (ct); + mime_type = g_ascii_strdown (tmp, -1); + g_free (tmp); + } + + parsers = e_mail_parser_get_parsers (parser, mime_type); + + if (ct) + g_free (mime_type); + + return parsers; +} + +GQueue * +e_mail_parser_get_parsers (EMailParser *parser, + const gchar *mime_type) +{ + EMailExtensionRegistry *reg; + EMailParserClass *parser_class; + gchar *as_mime_type; + GQueue *parsers; + + g_return_val_if_fail (E_IS_MAIL_PARSER (parser), NULL); + + if (mime_type) + as_mime_type = g_ascii_strdown (mime_type, -1); + else + as_mime_type = NULL; + + parser_class = E_MAIL_PARSER_GET_CLASS (parser); + reg = E_MAIL_EXTENSION_REGISTRY (parser_class->extension_registry); + + parsers = e_mail_extension_registry_get_for_mime_type (reg, as_mime_type); + if (!parsers) + parsers = e_mail_extension_registry_get_fallback (reg, as_mime_type); + + g_free (as_mime_type); + + return parsers; +} + gboolean e_mail_parser_parse_part (EMailParser *parser, CamelMimePart *part, @@ -536,26 +593,9 @@ { GQueue *parsers; GList *iter; - EMailExtensionRegistry *reg; - EMailParserClass *parser_class; - gchar *as_mime_type; gboolean mime_part_handled = FALSE; - if (mime_type) - as_mime_type = g_ascii_strdown (mime_type, -1); - else - as_mime_type = NULL; - - parser_class = E_MAIL_PARSER_GET_CLASS (parser); - reg = E_MAIL_EXTENSION_REGISTRY (parser_class->extension_registry); - - parsers = e_mail_extension_registry_get_for_mime_type (reg, as_mime_type); - if (!parsers) { - parsers = e_mail_extension_registry_get_fallback (reg, as_mime_type); - } - - if (as_mime_type) - g_free (as_mime_type); + parsers = e_mail_parser_get_parsers (parser, mime_type); if (parsers == NULL) { e_mail_parser_wrap_as_attachment ( @@ -710,7 +750,7 @@ empa->snoop_mime_type = snoop_mime_type; first_part = g_queue_peek_head (parts_queue); - if (first_part != NULL) { + if (first_part != NULL && !E_IS_MAIL_PART_ATTACHMENT (first_part)) { const gchar *id = e_mail_part_get_id (first_part); empa->part_id_with_attachment = g_strdup (id); first_part->is_hidden = TRUE; diff -Nru evolution-3.26.2/src/em-format/e-mail-parser.h evolution-3.26.3/src/em-format/e-mail-parser.h --- evolution-3.26.2/src/em-format/e-mail-parser.h 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/em-format/e-mail-parser.h 2017-12-11 11:08:06.000000000 +0000 @@ -79,6 +79,11 @@ GAsyncResult *result, GError **error); +GQueue * e_mail_parser_get_parsers_for_part + (EMailParser *parser, + CamelMimePart *part); +GQueue * e_mail_parser_get_parsers (EMailParser *parser, + const gchar *mime_type); gboolean e_mail_parser_parse_part (EMailParser *parser, CamelMimePart *part, GString *part_id, diff -Nru evolution-3.26.2/src/em-format/e-mail-parser-multipart-mixed.c evolution-3.26.3/src/em-format/e-mail-parser-multipart-mixed.c --- evolution-3.26.2/src/em-format/e-mail-parser-multipart-mixed.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/em-format/e-mail-parser-multipart-mixed.c 2017-12-11 11:08:06.000000000 +0000 @@ -140,12 +140,81 @@ g_string_append_printf (part_id, ".mixed.%d", i); - handled = e_mail_parser_parse_part ( - parser, subpart, part_id, cancellable, &work_queue); + handled = FALSE; + ct = camel_mime_part_get_content_type (subpart); + if (ct) + ct = camel_content_type_ref (ct); - mail_part = g_queue_peek_head (&work_queue); + if (!e_mail_parser_get_parsers_for_part (parser, subpart)) { + const gchar *snoop_type; + CamelContentType *snoop_ct = NULL; + + snoop_type = e_mail_part_snoop_type (subpart); + if (snoop_type) + snoop_ct = camel_content_type_decode (snoop_type); + + if (snoop_ct && snoop_ct->type && snoop_ct->subtype && ( + !ct || g_ascii_strcasecmp (snoop_ct->type, ct->type) != 0 || + g_ascii_strcasecmp (snoop_ct->subtype, ct->subtype) != 0)) { + CamelStream *mem_stream; + + mem_stream = camel_stream_mem_new (); + if (camel_data_wrapper_decode_to_stream_sync ( + camel_medium_get_content (CAMEL_MEDIUM (subpart)), + mem_stream, cancellable, NULL)) { + CamelMimePart *opart; + CamelDataWrapper *dw; + + g_seekable_seek (G_SEEKABLE (mem_stream), 0, G_SEEK_SET, cancellable, NULL); + + opart = camel_mime_part_new (); + + dw = camel_data_wrapper_new (); + camel_data_wrapper_set_mime_type (dw, snoop_type); + if (camel_data_wrapper_construct_from_stream_sync (dw, mem_stream, cancellable, NULL)) { + const gchar *disposition; + + camel_medium_set_content (CAMEL_MEDIUM (opart), dw); + + /* Copy Content-Disposition header, if available */ + disposition = camel_medium_get_header (CAMEL_MEDIUM (subpart), "Content-Disposition"); + if (disposition) + camel_medium_set_header (CAMEL_MEDIUM (opart), "Content-Disposition", disposition); + + /* Copy also any existing parameters of the Content-Type, like 'name' or 'charset'. */ + if (ct && ct->params) { + CamelHeaderParam *param; + for (param = ct->params; param; param = param->next) { + camel_content_type_set_param (snoop_ct, param->name, param->value); + } + } + + camel_data_wrapper_set_mime_type_field (CAMEL_DATA_WRAPPER (opart), snoop_ct); + + handled = e_mail_parser_parse_part (parser, opart, part_id, cancellable, &work_queue); + if (handled) { + camel_content_type_unref (ct); + ct = camel_content_type_ref (snoop_ct); + } + } + + g_object_unref (opart); + g_object_unref (dw); + } - ct = camel_mime_part_get_content_type (subpart); + g_object_unref (mem_stream); + } + + if (snoop_ct) + camel_content_type_unref (snoop_ct); + } + + if (!handled) { + handled = e_mail_parser_parse_part ( + parser, subpart, part_id, cancellable, &work_queue); + } + + mail_part = g_queue_peek_head (&work_queue); /* Display parts with CID as attachments * (unless they already are attachments). @@ -178,6 +247,9 @@ e_queue_transfer (&work_queue, out_mail_parts); g_string_truncate (part_id, len); + + if (ct) + camel_content_type_unref (ct); } return TRUE; diff -Nru evolution-3.26.2/src/em-format/e-mail-part-headers.c evolution-3.26.3/src/em-format/e-mail-part-headers.c --- evolution-3.26.2/src/em-format/e-mail-part-headers.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/em-format/e-mail-part-headers.c 2017-12-11 11:08:06.000000000 +0000 @@ -59,26 +59,19 @@ mail_part_headers_build_print_model (EMailPartHeaders *part) { GtkListStore *list_store; - EMailPartList *part_list; - CamelMimeMessage *message; + CamelMimePart *mime_part; const CamelNameValueArray *headers; gint default_position = 0; guint ii, length = 0; - /* If the part list is NULL, it means the function was called - * too early. The part must be added to a part list first so - * we have access to the CamelMimeMessage. */ - part_list = e_mail_part_ref_part_list (E_MAIL_PART (part)); - g_return_val_if_fail (part_list != NULL, NULL); - list_store = gtk_list_store_new ( E_MAIL_PART_HEADERS_PRINT_MODEL_NUM_COLUMNS, G_TYPE_BOOLEAN, /* INCLUDE */ G_TYPE_STRING, /* HEADER_NAME */ G_TYPE_STRING); /* HEADER_VALUE */ - message = e_mail_part_list_get_message (part_list); - headers = camel_medium_get_headers (CAMEL_MEDIUM (message)); + mime_part = e_mail_part_ref_mime_part (E_MAIL_PART (part)); + headers = camel_medium_get_headers (CAMEL_MEDIUM (mime_part)); length = camel_name_value_array_get_length (headers); for (ii = 0; ii < length; ii++) { @@ -124,7 +117,7 @@ -1); } - g_object_unref (part_list); + g_object_unref (mime_part); /* Stash the print model internally. */ diff -Nru evolution-3.26.2/src/e-util/e-content-editor.c evolution-3.26.3/src/e-util/e-content-editor.c --- evolution-3.26.2/src/e-util/e-content-editor.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/e-util/e-content-editor.c 2017-12-11 11:08:06.000000000 +0000 @@ -45,6 +45,22 @@ e_content_editor_default_init (EContentEditorInterface *iface) { /** + * EContentEditor:is-malfunction + * + * Determines whether the composer is malfunction. If it does, then + * the result of calling functions like get_content() is undefined. + */ + g_object_interface_install_property ( + iface, + g_param_spec_boolean ( + "is-malfunction", + "Is Malfunction", + NULL, + FALSE, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + + /** * EContentEditor:can-copy * * Determines whether it's possible to copy to clipboard. The action @@ -595,6 +611,18 @@ } gboolean +e_content_editor_is_malfunction (EContentEditor *editor) +{ + gboolean value = FALSE; + + g_return_val_if_fail (E_IS_CONTENT_EDITOR (editor), FALSE); + + g_object_get (G_OBJECT (editor), "is-malfunction", &value, NULL); + + return value; +} + +gboolean e_content_editor_can_cut (EContentEditor *editor) { gboolean value = FALSE; diff -Nru evolution-3.26.2/src/e-util/e-content-editor.h evolution-3.26.3/src/e-util/e-content-editor.h --- evolution-3.26.2/src/e-util/e-content-editor.h 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/e-util/e-content-editor.h 2017-12-11 11:08:06.000000000 +0000 @@ -446,6 +446,7 @@ ESpellChecker * e_content_editor_ref_spell_checker (EContentEditor *editor); +gboolean e_content_editor_is_malfunction (EContentEditor *editor); gboolean e_content_editor_can_cut (EContentEditor *editor); gboolean e_content_editor_can_copy (EContentEditor *editor); gboolean e_content_editor_can_paste (EContentEditor *editor); diff -Nru evolution-3.26.2/src/e-util/e-misc-utils.c evolution-3.26.3/src/e-util/e-misc-utils.c --- evolution-3.26.2/src/e-util/e-misc-utils.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/e-util/e-misc-utils.c 2017-12-11 11:08:06.000000000 +0000 @@ -3472,6 +3472,7 @@ e_util_save_image_from_clipboard (GtkClipboard *clipboard) { GdkPixbuf *pixbuf = NULL; + gchar *tmpl; gchar *filename = NULL; gchar *uri = NULL; GError *error = NULL; @@ -3482,8 +3483,13 @@ pixbuf = gtk_clipboard_wait_for_image (clipboard); g_return_val_if_fail (pixbuf != NULL, FALSE); + tmpl = g_strconcat (_("Image"), "-XXXXXX.png", NULL); + /* Reserve a temporary file. */ - filename = e_mktemp (NULL); + filename = e_mktemp (tmpl); + + g_free (tmpl); + if (filename == NULL) { g_set_error ( &error, G_FILE_ERROR, diff -Nru evolution-3.26.2/src/e-util/e-source-config.c evolution-3.26.3/src/e-util/e-source-config.c --- evolution-3.26.2/src/e-util/e-source-config.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/e-util/e-source-config.c 2017-12-11 11:08:06.000000000 +0000 @@ -1121,6 +1121,30 @@ return page; } +void +e_source_config_select_page (ESourceConfig *config, + ESource *scratch_source) +{ + Candidate *candidate; + GPtrArray *array; + gint index; + + g_return_if_fail (E_IS_SOURCE_CONFIG (config)); + g_return_if_fail (E_IS_SOURCE (scratch_source)); + + array = config->priv->candidates; + + for (index = 0; index < array->len; index++) { + candidate = g_ptr_array_index (array, index); + if (e_source_equal (scratch_source, candidate->scratch_source)) { + gtk_combo_box_set_active (GTK_COMBO_BOX (config->priv->type_combo), index); + return; + } + } + + g_warn_if_reached (); +} + const gchar * e_source_config_get_backend_extension_name (ESourceConfig *config) { @@ -1194,6 +1218,27 @@ return config->priv->collection_source; } +GSList * /* (transfer full) (element-type #ESource) */ +e_source_config_list_candidates (ESourceConfig *config) +{ + GSList *candidates = NULL; + GPtrArray *array; + gint index; + + g_return_val_if_fail (E_IS_SOURCE_CONFIG (config), NULL); + + array = config->priv->candidates; + + for (index = 0; index < array->len; index++) { + Candidate *candidate; + + candidate = g_ptr_array_index (array, index); + candidates = g_slist_prepend (candidates, g_object_ref (candidate->scratch_source)); + } + + return g_slist_reverse (candidates); +} + ESourceRegistry * e_source_config_get_registry (ESourceConfig *config) { diff -Nru evolution-3.26.2/src/e-util/e-source-config.h evolution-3.26.3/src/e-util/e-source-config.h --- evolution-3.26.2/src/e-util/e-source-config.h 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/e-util/e-source-config.h 2017-12-11 11:08:06.000000000 +0000 @@ -83,6 +83,8 @@ GtkWidget *widget); GtkWidget * e_source_config_get_page (ESourceConfig *config, ESource *scratch_source); +void e_source_config_select_page (ESourceConfig *config, + ESource *scratch_source); const gchar * e_source_config_get_backend_extension_name (ESourceConfig *config); GList * e_source_config_list_eligible_collections @@ -92,6 +94,7 @@ (ESourceConfig *config); ESource * e_source_config_get_collection_source (ESourceConfig *config); +GSList * e_source_config_list_candidates (ESourceConfig *config); /* ESource * */ ESourceRegistry * e_source_config_get_registry (ESourceConfig *config); void e_source_config_resize_window (ESourceConfig *config); diff -Nru evolution-3.26.2/src/mail/em-utils.c evolution-3.26.3/src/mail/em-utils.c --- evolution-3.26.2/src/mail/em-utils.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/mail/em-utils.c 2017-12-11 11:08:06.000000000 +0000 @@ -742,22 +742,27 @@ } /** - * em_utils_selection_get_uidlist: - * @data: selection data + * em_utils_selection_uidlist_foreach_sync: + * @selection_data: a #GtkSelectionData with x-uid-list content * @session: an #EMailSession - * @move: do we delete the messages. + * @func: a function to call for each UID and its folder + * @user_data: user data for @func + * @cancellable: optional #GCancellable object, or %NULL + * @error: return location for a #GError, or %NULL * - * Convert a uid list into a copy/move operation. + * Calls @func for each folder and UID provided in @selection_data. * * Warning: Could take some time to run. + * + * Since: 3.26.3 **/ void -em_utils_selection_get_uidlist (GtkSelectionData *selection_data, - EMailSession *session, - CamelFolder *dest, - gint move, - GCancellable *cancellable, - GError **error) +em_utils_selection_uidlist_foreach_sync (GtkSelectionData *selection_data, + EMailSession *session, + EMUtilsUIDListFunc func, + gpointer user_data, + GCancellable *cancellable, + GError **error) { /* format: "uri1\0uid1\0uri2\0uid2\0...\0urin\0uidn\0" */ gchar *inptr, *inend; @@ -768,10 +773,12 @@ GHashTable *uids_by_uri; GHashTableIter iter; gpointer key, value; + gboolean can_continue = TRUE; GError *local_error = NULL; g_return_if_fail (selection_data != NULL); g_return_if_fail (E_IS_MAIL_SESSION (session)); + g_return_if_fail (func != NULL); data = gtk_selection_data_get_data (selection_data); length = gtk_selection_data_get_length (selection_data); @@ -823,14 +830,12 @@ const gchar *uri = key; GPtrArray *uids = value; - if (!local_error) { + if (!local_error && can_continue) { /* FIXME e_mail_session_uri_to_folder_sync() may block. */ folder = e_mail_session_uri_to_folder_sync ( session, uri, 0, cancellable, &local_error); if (folder) { - /* FIXME camel_folder_transfer_messages_to_sync() may block. */ - camel_folder_transfer_messages_to_sync ( - folder, uids, dest, move, NULL, cancellable, &local_error); + can_continue = func (folder, uids, user_data, cancellable, &local_error); g_object_unref (folder); } } @@ -845,6 +850,55 @@ g_propagate_error (error, local_error); } +struct UIDListData { + CamelFolder *dest; + gboolean move; +}; + +static gboolean +uidlist_move_uids_cb (CamelFolder *folder, + const GPtrArray *uids, + gpointer user_data, + GCancellable *cancellable, + GError **error) +{ + struct UIDListData *uld = user_data; + + g_return_val_if_fail (uld != NULL, FALSE); + + /* FIXME camel_folder_transfer_messages_to_sync() may block. */ + return camel_folder_transfer_messages_to_sync ( + folder, (GPtrArray *) uids, uld->dest, uld->move, NULL, cancellable, error); +} + +/** + * em_utils_selection_get_uidlist: + * @data: selection data + * @session: an #EMailSession + * @move: do we delete the messages. + * + * Convert a uid list into a copy/move operation. + * + * Warning: Could take some time to run. + **/ +void +em_utils_selection_get_uidlist (GtkSelectionData *selection_data, + EMailSession *session, + CamelFolder *dest, + gint move, + GCancellable *cancellable, + GError **error) +{ + struct UIDListData uld; + + g_return_if_fail (CAMEL_IS_FOLDER (dest)); + + uld.dest = dest; + uld.move = move; + + em_utils_selection_uidlist_foreach_sync (selection_data, session, uidlist_move_uids_cb, &uld, cancellable, error); +} + /** * em_utils_build_export_basename: * @folder: a #CamelFolder where the message belongs diff -Nru evolution-3.26.2/src/mail/em-utils.h evolution-3.26.3/src/mail/em-utils.h --- evolution-3.26.2/src/mail/em-utils.h 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/mail/em-utils.h 2017-12-11 11:08:06.000000000 +0000 @@ -57,6 +57,20 @@ void em_utils_selection_set_urilist (GtkSelectionData *data, CamelFolder *folder, GPtrArray *uids); void em_utils_selection_get_urilist (GtkSelectionData *data, CamelFolder *folder); +/* Return TRUE to continue, FALSE to stop further processing */ +typedef gboolean (* EMUtilsUIDListFunc) (CamelFolder *folder, + const GPtrArray *uids, + gpointer user_data, + GCancellable *cancellable, + GError **error); + +void em_utils_selection_uidlist_foreach_sync (GtkSelectionData *selection_data, + EMailSession *session, + EMUtilsUIDListFunc func, + gpointer user_data, + GCancellable *cancellable, + GError **error); + /* FIXME: should this have an override charset? */ gchar * em_utils_message_to_html (CamelSession *session, CamelMimeMessage *msg, diff -Nru evolution-3.26.2/src/mail/message-list.c evolution-3.26.3/src/mail/message-list.c --- evolution-3.26.2/src/mail/message-list.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/mail/message-list.c 2017-12-11 11:08:06.000000000 +0000 @@ -2807,6 +2807,22 @@ } static void +message_list_get_preferred_width (GtkWidget *widget, + gint *out_minimum_width, + gint *out_natural_width) +{ + /* Chain up to parent's method. */ + GTK_WIDGET_CLASS (message_list_parent_class)->get_preferred_width (widget, out_minimum_width, out_natural_width); + + if (out_minimum_width && *out_minimum_width < 50) + *out_minimum_width = 50; + + if (out_natural_width && out_minimum_width && + *out_natural_width < *out_minimum_width) + *out_natural_width = *out_minimum_width; +} + +static void message_list_set_session (MessageList *message_list, EMailSession *session) { @@ -3493,6 +3509,7 @@ message_list_class_init (MessageListClass *class) { GObjectClass *object_class; + GtkWidgetClass *widget_class; if (!ml_drag_info[0].atom) { gint ii; @@ -3512,6 +3529,9 @@ g_type_class_add_private (class, sizeof (MessageListPrivate)); + widget_class = GTK_WIDGET_CLASS (class); + widget_class->get_preferred_width = message_list_get_preferred_width; + object_class = G_OBJECT_CLASS (class); object_class->set_property = message_list_set_property; object_class->get_property = message_list_get_property; @@ -6139,10 +6159,12 @@ e_table_item_thaw (table_item); - if (!saveuid && message_list->cursor_uid && g_hash_table_lookup (message_list->uid_nodemap, message_list->cursor_uid)) { + if ((!saveuid || !g_hash_table_lookup (message_list->uid_nodemap, saveuid)) && + message_list->cursor_uid && g_hash_table_lookup (message_list->uid_nodemap, message_list->cursor_uid)) { /* this makes sure a visible node is selected, like when * collapsing all nodes and a children had been selected - */ + */ + g_free (saveuid); saveuid = g_strdup (message_list->cursor_uid); } diff -Nru evolution-3.26.2/src/modules/backup-restore/evolution-backup-tool.c evolution-3.26.3/src/modules/backup-restore/evolution-backup-tool.c --- evolution-3.26.2/src/modules/backup-restore/evolution-backup-tool.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/backup-restore/evolution-backup-tool.c 2017-12-11 11:08:06.000000000 +0000 @@ -888,9 +888,13 @@ &argc, &argv, NULL, options, GETTEXT_PACKAGE, &error); if (error != NULL) { - g_printerr ("%s\n", error->message); - g_error_free (error); - exit (EXIT_FAILURE); + if (gui_arg) + g_printerr ("Failed to initialize gtk+. Do not use --gui, to run without it. Reported error: %s\n", error->message); + + g_clear_error (&error); + + if (gui_arg) + exit (EXIT_FAILURE); } if (opt_remaining != NULL) { diff -Nru evolution-3.26.2/src/modules/calendar/e-cal-base-shell-backend.c evolution-3.26.3/src/modules/calendar/e-cal-base-shell-backend.c --- evolution-3.26.2/src/modules/calendar/e-cal-base-shell-backend.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/calendar/e-cal-base-shell-backend.c 2017-12-11 11:08:06.000000000 +0000 @@ -42,6 +42,100 @@ G_DEFINE_ABSTRACT_TYPE (ECalBaseShellBackend, e_cal_base_shell_backend, E_TYPE_SHELL_BACKEND) +static void +cal_base_shell_backend_handle_webcal_uri (EShellBackend *shell_backend, + const gchar *uri) +{ + EShell *shell; + ESourceRegistry *registry; + ESourceConfig *source_config; + const gchar *extension_name; + GtkWidget *config; + GtkWidget *dialog; + GtkWindow *window, *active_window; + GSList *candidates, *link; + + g_return_if_fail (E_IS_SHELL_BACKEND (shell_backend)); + g_return_if_fail (uri != NULL); + + shell = e_shell_backend_get_shell (shell_backend); + + active_window = e_shell_get_active_window (shell); + registry = e_shell_get_registry (shell); + config = e_cal_source_config_new (registry, NULL, E_CAL_CLIENT_SOURCE_TYPE_EVENTS); + source_config = E_SOURCE_CONFIG (config); + + extension_name = e_source_config_get_backend_extension_name (source_config); + + dialog = e_source_config_dialog_new (source_config); + window = GTK_WINDOW (dialog); + + if (active_window) + gtk_window_set_transient_for (window, active_window); + gtk_window_set_icon_name (window, "x-office-calendar"); + gtk_window_set_title (window, _("New Calendar")); + + gtk_widget_show (dialog); + + /* Can do this only after the dialog is shown, thus the list + of candidates is populated. */ + candidates = e_source_config_list_candidates (source_config); + + for (link = candidates; link; link = g_slist_next (link)) { + ESource *candidate = link->data; + + if (e_source_has_extension (candidate, extension_name)) { + const gchar *backend_name; + + backend_name = e_source_backend_get_backend_name ( + e_source_get_extension (candidate, extension_name)); + if (g_strcmp0 (backend_name, "webcal") == 0) { + ESourceWebdav *webdav_extension; + SoupURI *soup_uri; + + soup_uri = soup_uri_new (uri); + if (!soup_uri) { + /* Just a fallback when the passed-in URI is invalid, + to have set something in the UI. */ + soup_uri = soup_uri_new (NULL); + soup_uri_set_path (soup_uri, uri); + } + + /* https everywhere */ + soup_uri_set_scheme (soup_uri, "https"); + + if (soup_uri_get_path (soup_uri)) { + gchar *basename; + + basename = g_path_get_basename (soup_uri_get_path (soup_uri)); + if (basename && g_utf8_strlen (basename, -1) > 3) { + gchar *dot; + + dot = strrchr (basename, '.'); + if (dot && strlen (dot) <= 4) + *dot = '\0'; + + if (*basename) + e_source_set_display_name (candidate, basename); + } + + g_free (basename); + } + + webdav_extension = e_source_get_extension (candidate, E_SOURCE_EXTENSION_WEBDAV_BACKEND); + e_source_webdav_set_soup_uri (webdav_extension, soup_uri); + + e_source_config_select_page (source_config, candidate); + + soup_uri_free (soup_uri); + break; + } + } + } + + g_slist_free_full (candidates, g_object_unref); +} + static gboolean cal_base_shell_backend_handle_uri_cb (EShellBackend *shell_backend, const gchar *uri) @@ -51,6 +145,11 @@ g_return_val_if_fail (E_IS_CAL_BASE_SHELL_BACKEND (shell_backend), FALSE); g_return_val_if_fail (uri != NULL, FALSE); + if (g_str_has_prefix (uri, "webcal:")) { + cal_base_shell_backend_handle_webcal_uri (shell_backend, uri); + return TRUE; + } + klass = E_CAL_BASE_SHELL_BACKEND_GET_CLASS (shell_backend); g_return_val_if_fail (klass != NULL, FALSE); diff -Nru evolution-3.26.2/src/modules/composer-autosave/e-autosave-utils.c evolution-3.26.3/src/modules/composer-autosave/e-autosave-utils.c --- evolution-3.26.2/src/modules/composer-autosave/e-autosave-utils.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/composer-autosave/e-autosave-utils.c 2017-12-11 11:08:06.000000000 +0000 @@ -556,3 +556,31 @@ return g_object_get_data (G_OBJECT (composer), SNAPSHOT_FILE_KEY); } + +void +e_composer_prevent_snapshot_file_delete (EMsgComposer *composer) +{ + GFile *snapshot_file; + + g_return_if_fail (E_IS_MSG_COMPOSER (composer)); + + snapshot_file = g_object_steal_data (G_OBJECT (composer), SNAPSHOT_FILE_KEY); + if (snapshot_file) { + g_object_set_data_full (G_OBJECT (composer), SNAPSHOT_FILE_KEY, + snapshot_file, g_object_unref); + } +} + +void +e_composer_allow_snapshot_file_delete (EMsgComposer *composer) +{ + GFile *snapshot_file; + + g_return_if_fail (E_IS_MSG_COMPOSER (composer)); + + snapshot_file = g_object_steal_data (G_OBJECT (composer), SNAPSHOT_FILE_KEY); + if (snapshot_file) { + g_object_set_data_full (G_OBJECT (composer), SNAPSHOT_FILE_KEY, + snapshot_file, (GDestroyNotify) delete_snapshot_file); + } +} diff -Nru evolution-3.26.2/src/modules/composer-autosave/e-autosave-utils.h evolution-3.26.3/src/modules/composer-autosave/e-autosave-utils.h --- evolution-3.26.2/src/modules/composer-autosave/e-autosave-utils.h 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/composer-autosave/e-autosave-utils.h 2017-12-11 11:08:06.000000000 +0000 @@ -41,6 +41,10 @@ GAsyncResult *result, GError **error); GFile * e_composer_get_snapshot_file (EMsgComposer *composer); +void e_composer_prevent_snapshot_file_delete + (EMsgComposer *composer); +void e_composer_allow_snapshot_file_delete + (EMsgComposer *composer); G_END_DECLS diff -Nru evolution-3.26.2/src/modules/composer-autosave/e-composer-autosave.c evolution-3.26.3/src/modules/composer-autosave/e-composer-autosave.c --- evolution-3.26.2/src/modules/composer-autosave/e-composer-autosave.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/composer-autosave/e-composer-autosave.c 2017-12-11 11:08:06.000000000 +0000 @@ -35,6 +35,9 @@ /* Prevent error dialogs from piling up. */ gboolean error_shown; + + GFile *malfunction_snapshot_file; + gboolean editor_is_malfunction; }; G_DEFINE_DYNAMIC_TYPE ( @@ -95,6 +98,10 @@ EExtensible *extensible; autosave = E_COMPOSER_AUTOSAVE (user_data); + + if (autosave->priv->editor_is_malfunction) + return FALSE; + extensible = e_extension_get_extensible (E_EXTENSION (autosave)); /* Cancel the previous snapshot if it's still in @@ -126,7 +133,9 @@ editor = e_msg_composer_get_editor (E_MSG_COMPOSER (extensible)); cnt_editor = e_html_editor_get_content_editor (editor); - if (autosave->priv->timeout_id == 0 && e_content_editor_get_changed (cnt_editor)) { + if (autosave->priv->timeout_id == 0 && + !autosave->priv->editor_is_malfunction && + e_content_editor_get_changed (cnt_editor)) { autosave->priv->timeout_id = e_named_timeout_add_seconds ( AUTOSAVE_INTERVAL, composer_autosave_timeout_cb, autosave); @@ -134,6 +143,74 @@ } static void +composer_autosave_editor_is_malfunction_cb (EComposerAutosave *autosave) +{ + EHTMLEditor *editor; + EContentEditor *cnt_editor; + EExtensible *extensible; + + extensible = e_extension_get_extensible (E_EXTENSION (autosave)); + + editor = e_msg_composer_get_editor (E_MSG_COMPOSER (extensible)); + cnt_editor = e_html_editor_get_content_editor (editor); + + g_clear_object (&autosave->priv->malfunction_snapshot_file); + autosave->priv->editor_is_malfunction = e_content_editor_is_malfunction (cnt_editor); + + if (autosave->priv->editor_is_malfunction) { + e_composer_prevent_snapshot_file_delete (E_MSG_COMPOSER (extensible)); + autosave->priv->malfunction_snapshot_file = e_composer_get_snapshot_file (E_MSG_COMPOSER (extensible)); + if (autosave->priv->malfunction_snapshot_file) + g_object_ref (autosave->priv->malfunction_snapshot_file); + } else { + e_composer_allow_snapshot_file_delete (E_MSG_COMPOSER (extensible)); + composer_autosave_changed_cb (autosave); + } +} + +static void +composer_autosave_recovered_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + EMsgComposer *composer; + GError *local_error = NULL; + + composer = e_composer_load_snapshot_finish (E_SHELL (source_object), result, &local_error); + + if (local_error != NULL) { + /* FIXME Show an alert dialog here explaining + * why we could not recover the message. + * Will need a new error XML entry. */ + g_warn_if_fail (composer == NULL); + g_warning ("%s: %s", G_STRFUNC, local_error->message); + g_error_free (local_error); + } else { + gtk_widget_show (GTK_WIDGET (composer)); + g_object_unref (composer); + } +} + +static void +composer_autosave_msg_composer_before_destroy_cb (EMsgComposer *composer, + gpointer user_data) +{ + EComposerAutosave *autosave = user_data; + + g_return_if_fail (autosave != NULL); + + if (autosave->priv->malfunction_snapshot_file) { + if (e_alert_run_dialog_for_args (GTK_WINDOW (composer), "mail-composer:recover-autosave", NULL) == GTK_RESPONSE_YES) { + e_composer_load_snapshot ( + e_msg_composer_get_shell (composer), autosave->priv->malfunction_snapshot_file, NULL, + composer_autosave_recovered_cb, NULL); + } else { + g_file_delete (autosave->priv->malfunction_snapshot_file, NULL, NULL); + } + } +} + +static void composer_autosave_dispose (GObject *object) { EComposerAutosavePrivate *priv; @@ -150,6 +227,8 @@ g_clear_object (&priv->cancellable); + g_clear_object (&priv->malfunction_snapshot_file); + /* Chain up to parent's dispose() method. */ G_OBJECT_CLASS (e_composer_autosave_parent_class)->dispose (object); } @@ -168,6 +247,14 @@ editor = e_msg_composer_get_editor (E_MSG_COMPOSER (extensible)); cnt_editor = e_html_editor_get_content_editor (editor); + g_signal_connect ( + extensible, "before-destroy", + G_CALLBACK (composer_autosave_msg_composer_before_destroy_cb), object); + + e_signal_connect_notify_swapped ( + cnt_editor, "notify::is-malfunction", + G_CALLBACK (composer_autosave_editor_is_malfunction_cb), object); + /* Do not use e_signal_connect_notify_swapped() here, this module relies on "false" change notifications. */ g_signal_connect_swapped ( @@ -205,6 +292,8 @@ { autosave->priv = E_COMPOSER_AUTOSAVE_GET_PRIVATE (autosave); autosave->priv->cancellable = g_cancellable_new (); + autosave->priv->malfunction_snapshot_file = NULL; + autosave->priv->editor_is_malfunction = FALSE; } void diff -Nru evolution-3.26.2/src/modules/composer-autosave/e-composer-registry.c evolution-3.26.3/src/modules/composer-autosave/e-composer-registry.c --- evolution-3.26.2/src/modules/composer-autosave/e-composer-registry.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/composer-autosave/e-composer-registry.c 2017-12-11 11:08:06.000000000 +0000 @@ -62,7 +62,7 @@ * why we could not recover the message. * Will need a new error XML entry. */ g_warn_if_fail (composer == NULL); - g_warning ("%s", local_error->message); + g_warning ("%s: %s", G_STRFUNC, local_error->message); g_error_free (local_error); goto exit; } diff -Nru evolution-3.26.2/src/modules/itip-formatter/itip-view.c evolution-3.26.3/src/modules/itip-formatter/itip-view.c --- evolution-3.26.2/src/modules/itip-formatter/itip-view.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/itip-formatter/itip-view.c 2017-12-11 11:08:06.000000000 +0000 @@ -138,7 +138,7 @@ time_t end_time; gint current; - gint total; + gboolean with_detached_instances; gchar *calendar_uid; @@ -4694,12 +4694,28 @@ } static void +remove_alarms_in_component (icalcomponent *clone) +{ + icalcomponent *alarm_comp; + icalcompiter alarm_iter; + + alarm_iter = icalcomponent_begin_component (clone, ICAL_VALARM_COMPONENT); + while ((alarm_comp = icalcompiter_deref (&alarm_iter)) != NULL) { + icalcompiter_next (&alarm_iter); + + icalcomponent_remove_component (clone, alarm_comp); + icalcomponent_free (alarm_comp); + } +} + +static void update_item (ItipView *view, ItipViewResponse response) { struct icaltimetype stamp; icalproperty *prop; - icalcomponent *clone; + icalcomponent *toplevel_clone, *clone; + gboolean remove_alarms; ECalComponent *clone_comp; gchar *str; @@ -4721,20 +4737,31 @@ icalproperty_set_x_name (prop, "X-MICROSOFT-CDO-REPLYTIME"); icalcomponent_add_property (view->priv->ical_comp, prop); + toplevel_clone = icalcomponent_new_clone (view->priv->top_level); clone = icalcomponent_new_clone (view->priv->ical_comp); - icalcomponent_add_component (view->priv->top_level, clone); - icalcomponent_set_method (view->priv->top_level, view->priv->method); + icalcomponent_add_component (toplevel_clone, clone); + icalcomponent_set_method (toplevel_clone, view->priv->method); + + remove_alarms = !itip_view_get_inherit_alarm_check_state (view); + + if (remove_alarms) + remove_alarms_in_component (clone); + + if (view->priv->with_detached_instances) { + icalcomponent *icomp; + icalcomponent_kind use_kind = icalcomponent_isa (view->priv->ical_comp); - if (!itip_view_get_inherit_alarm_check_state (view)) { - icalcomponent *alarm_comp; - icalcompiter alarm_iter; - - alarm_iter = icalcomponent_begin_component (clone, ICAL_VALARM_COMPONENT); - while ((alarm_comp = icalcompiter_deref (&alarm_iter)) != NULL) { - icalcompiter_next (&alarm_iter); + for (icomp = icalcomponent_get_first_component (view->priv->main_comp, use_kind); + icomp; + icomp = icalcomponent_get_next_component (view->priv->main_comp, use_kind)) { + if (icomp != view->priv->ical_comp) { + icalcomponent *di_clone = icalcomponent_new_clone (icomp); - icalcomponent_remove_component (clone, alarm_comp); - icalcomponent_free (alarm_comp); + if (remove_alarms) + remove_alarms_in_component (di_clone); + + icalcomponent_add_component (toplevel_clone, di_clone); + } } } @@ -4834,14 +4861,14 @@ e_cal_client_receive_objects ( view->priv->current_client, - view->priv->top_level, + toplevel_clone, view->priv->cancellable, receive_objects_ready_cb, view); cleanup: - icalcomponent_remove_component (view->priv->top_level, clone); g_object_unref (clone_comp); + icalcomponent_free (toplevel_clone); } /* TODO These operations should be available in e-cal-component.c */ @@ -5429,6 +5456,7 @@ icalcompiter alarm_iter; ECalComponent *comp; gboolean use_default_reminder; + gint total; if (!view->priv->vcalendar) { set_itip_error ( @@ -5496,6 +5524,57 @@ return FALSE; } + view->priv->with_detached_instances = FALSE; + + total = icalcomponent_count_components (view->priv->main_comp, ICAL_VEVENT_COMPONENT); + total += icalcomponent_count_components (view->priv->main_comp, ICAL_VTODO_COMPONENT); + total += icalcomponent_count_components (view->priv->main_comp, ICAL_VFREEBUSY_COMPONENT); + total += icalcomponent_count_components (view->priv->main_comp, ICAL_VJOURNAL_COMPONENT); + + if (total > 1) { + icalcomponent *icomp, *master_comp = NULL; + gint orig_total = total; + const gchar *expected_uid = NULL; + + for (icomp = icalcomponent_get_first_component (view->priv->main_comp, ICAL_ANY_COMPONENT); + icomp; + icomp = icalcomponent_get_next_component (view->priv->main_comp, ICAL_ANY_COMPONENT)) { + icalcomponent_kind icomp_kind; + const gchar *uid; + + icomp_kind = icalcomponent_isa (icomp); + + if (icomp_kind != ICAL_VEVENT_COMPONENT && + icomp_kind != ICAL_VJOURNAL_COMPONENT && + icomp_kind != ICAL_VTODO_COMPONENT) + continue; + + uid = icalcomponent_get_uid (icomp); + + if (!master_comp) { + struct icaltimetype rid; + + rid = icalcomponent_get_recurrenceid (icomp); + if (!icaltime_is_valid_time (rid) || icaltime_is_null_time (rid)) + master_comp = icomp; + } + + /* Maybe it's an event with detached instances */ + if (!expected_uid) { + expected_uid = uid; + } else if (g_strcmp0 (uid, expected_uid) == 0) { + total--; + } else { + total = orig_total; + break; + } + } + + view->priv->with_detached_instances = orig_total != total; + if (view->priv->with_detached_instances && master_comp && master_comp != view->priv->ical_comp) + view->priv->ical_comp = master_comp; + } + switch (icalcomponent_isa (view->priv->ical_comp)) { case ICAL_VEVENT_COMPONENT: view->priv->type = E_CAL_CLIENT_SOURCE_TYPE_EVENTS; @@ -5526,22 +5605,15 @@ return FALSE; } - view->priv->total = icalcomponent_count_components (view->priv->main_comp, ICAL_VEVENT_COMPONENT); - view->priv->total += icalcomponent_count_components (view->priv->main_comp, ICAL_VTODO_COMPONENT); - view->priv->total += icalcomponent_count_components (view->priv->main_comp, ICAL_VFREEBUSY_COMPONENT); - view->priv->total += icalcomponent_count_components (view->priv->main_comp, ICAL_VJOURNAL_COMPONENT); - - if (view->priv->total > 1) { - + if (total > 1) { set_itip_error ( view, _("The calendar attached contains multiple items"), _("To process all of these items, the file should be saved and the calendar imported"), TRUE); - } - if (view->priv->total > 0) { + if (total > 0) { view->priv->current = 1; } else { view->priv->current = 0; diff -Nru evolution-3.26.2/src/modules/mail/e-mail-attachment-handler.c evolution-3.26.3/src/modules/mail/e-mail-attachment-handler.c --- evolution-3.26.2/src/modules/mail/e-mail-attachment-handler.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/mail/e-mail-attachment-handler.c 2017-12-11 11:08:06.000000000 +0000 @@ -27,6 +27,7 @@ #include "mail/e-mail-backend.h" #include "mail/e-mail-reader.h" #include "mail/em-composer-utils.h" +#include "mail/em-utils.h" #define E_MAIL_ATTACHMENT_HANDLER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ @@ -533,6 +534,33 @@ gtk_drag_finish (drag_context, success, FALSE, time); } +static gboolean +gather_x_uid_list_messages_cb (CamelFolder *folder, + const GPtrArray *uids, + gpointer user_data, + GCancellable *cancellable, + GError **error) +{ + GSList **pmessages = user_data; + guint ii; + + g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE); + g_return_val_if_fail (uids != NULL, FALSE); + g_return_val_if_fail (pmessages != NULL, FALSE); + + for (ii = 0; ii < uids->len; ii++) { + CamelMimeMessage *message; + + message = camel_folder_get_message_sync (folder, uids->pdata[ii], cancellable, error); + if (!message) + return FALSE; + + *pmessages = g_slist_prepend (*pmessages, message); + } + + return TRUE; +} + static void mail_attachment_handler_x_uid_list (EAttachmentView *view, GdkDragContext *drag_context, @@ -546,20 +574,14 @@ static GdkAtom atom = GDK_NONE; EMailAttachmentHandlerPrivate *priv; CamelDataWrapper *wrapper; - CamelMimeMessage *message; CamelMultipart *multipart; CamelMimePart *mime_part; - CamelFolder *folder = NULL; EAttachment *attachment; EAttachmentStore *store; EMailSession *session; - GPtrArray *uids; - const gchar *data; - const gchar *cp, *end; + GSList *messages = NULL, *link; gchar *description; gpointer parent; - gint length; - guint ii; GError *local_error = NULL; if (G_UNLIKELY (atom == GDK_NONE)) @@ -574,124 +596,73 @@ parent = gtk_widget_get_toplevel (GTK_WIDGET (view)); parent = gtk_widget_is_toplevel (parent) ? parent : NULL; - uids = g_ptr_array_new (); - - data = (const gchar *) gtk_selection_data_get_data (selection_data); - length = gtk_selection_data_get_length (selection_data); - - /* The UID list is delimited by NUL characters. - * Brilliant. So we can't use g_strsplit(). */ - - cp = data; - end = data + length; - - while (cp < end) { - const gchar *start = cp; - - while (cp < end && *cp != '\0') - cp++; - - /* Skip the first string. */ - if (start > data) - g_ptr_array_add (uids, g_strndup (start, cp - start)); - - cp++; - } - - if (uids->len == 0) - goto exit; - session = e_mail_backend_get_session (priv->backend); - /* The first string is the folder URI. */ - /* FIXME Not passing a GCancellable here. */ - folder = e_mail_session_uri_to_folder_sync ( - session, data, 0, NULL, &local_error); - if (folder == NULL) + em_utils_selection_uidlist_foreach_sync (selection_data, session, + gather_x_uid_list_messages_cb, &messages, NULL, &local_error); + + if (local_error || !messages) goto exit; /* Handle one message. */ - if (uids->len == 1) { - const gchar *message_uid; - - message_uid = g_ptr_array_index (uids, 0); - - /* FIXME Not passing a GCancellable here. */ - message = camel_folder_get_message_sync ( - folder, message_uid, NULL, &local_error); - if (message == NULL) - goto exit; - - attachment = e_attachment_new_for_message (message); + if (!messages->next) { + attachment = e_attachment_new_for_message (messages->data); e_attachment_store_add_attachment (store, attachment); e_attachment_load_async ( attachment, (GAsyncReadyCallback) call_attachment_load_handle_error, parent ? g_object_ref (parent) : NULL); g_object_unref (attachment); + } else { + gint n_messages = g_slist_length (messages); - g_object_unref (message); - goto exit; - } - - /* Build a multipart/digest message out of the UIDs. */ - - multipart = camel_multipart_new (); - wrapper = CAMEL_DATA_WRAPPER (multipart); - camel_data_wrapper_set_mime_type (wrapper, "multipart/digest"); - camel_multipart_set_boundary (multipart, NULL); + messages = g_slist_reverse (messages); - for (ii = 0; ii < uids->len; ii++) { - /* FIXME Not passing a GCancellable here. */ - message = camel_folder_get_message_sync ( - folder, uids->pdata[ii], NULL, &local_error); - if (message == NULL) { - g_object_unref (multipart); - goto exit; + /* Build a multipart/digest message out of the UIDs. */ + multipart = camel_multipart_new (); + wrapper = CAMEL_DATA_WRAPPER (multipart); + camel_data_wrapper_set_mime_type (wrapper, "multipart/digest"); + camel_multipart_set_boundary (multipart, NULL); + + for (link = messages; link; link = g_slist_next (link)) { + mime_part = camel_mime_part_new (); + wrapper = CAMEL_DATA_WRAPPER (link->data); + camel_mime_part_set_disposition (mime_part, "inline"); + camel_medium_set_content ( + CAMEL_MEDIUM (mime_part), wrapper); + camel_mime_part_set_content_type (mime_part, "message/rfc822"); + camel_multipart_add_part (multipart, mime_part); + g_object_unref (mime_part); } mime_part = camel_mime_part_new (); - wrapper = CAMEL_DATA_WRAPPER (message); - camel_mime_part_set_disposition (mime_part, "inline"); - camel_medium_set_content ( - CAMEL_MEDIUM (mime_part), wrapper); - camel_mime_part_set_content_type (mime_part, "message/rfc822"); - camel_multipart_add_part (multipart, mime_part); - g_object_unref (mime_part); + wrapper = CAMEL_DATA_WRAPPER (multipart); + camel_medium_set_content (CAMEL_MEDIUM (mime_part), wrapper); - g_object_unref (message); - } - - mime_part = camel_mime_part_new (); - wrapper = CAMEL_DATA_WRAPPER (multipart); - camel_medium_set_content (CAMEL_MEDIUM (mime_part), wrapper); - - description = g_strdup_printf ( - ngettext ( - "%d attached message", - "%d attached messages", - uids->len), - uids->len); - camel_mime_part_set_description (mime_part, description); - g_free (description); + description = g_strdup_printf ( + ngettext ( + "%d attached message", + "%d attached messages", + n_messages), + n_messages); + camel_mime_part_set_description (mime_part, description); + g_free (description); - attachment = e_attachment_new (); - e_attachment_set_mime_part (attachment, mime_part); - e_attachment_store_add_attachment (store, attachment); - e_attachment_load_async ( - attachment, (GAsyncReadyCallback) - call_attachment_load_handle_error, parent ? g_object_ref (parent) : NULL); - g_object_unref (attachment); + attachment = e_attachment_new (); + e_attachment_set_mime_part (attachment, mime_part); + e_attachment_store_add_attachment (store, attachment); + e_attachment_load_async ( + attachment, (GAsyncReadyCallback) + call_attachment_load_handle_error, parent ? g_object_ref (parent) : NULL); + g_object_unref (attachment); - g_object_unref (mime_part); - g_object_unref (multipart); + g_object_unref (mime_part); + g_object_unref (multipart); + } -exit: + exit: if (local_error != NULL) { - const gchar *folder_name = data; - - if (folder != NULL) - folder_name = camel_folder_get_display_name (folder); + const gchar *folder_name = (const gchar *) gtk_selection_data_get_data (selection_data); e_alert_run_dialog_for_args ( parent, "mail-composer:attach-nomessages", @@ -700,10 +671,7 @@ g_clear_error (&local_error); } - if (folder != NULL) - g_object_unref (folder); - - g_ptr_array_free (uids, TRUE); + g_slist_free_full (messages, g_object_unref); g_signal_stop_emission_by_name (view, "drag-data-received"); } diff -Nru evolution-3.26.2/src/modules/tnef-attachment/e-mail-parser-tnef-attachment.c evolution-3.26.3/src/modules/tnef-attachment/e-mail-parser-tnef-attachment.c --- evolution-3.26.2/src/modules/tnef-attachment/e-mail-parser-tnef-attachment.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/tnef-attachment/e-mail-parser-tnef-attachment.c 2017-12-11 11:08:06.000000000 +0000 @@ -73,25 +73,24 @@ NULL }; -gint verbose = 0; -gint saveRTF = 0; -gint saveintermediate = 0; -gboolean loaded = FALSE; -void processTnef (TNEFStruct *tnef, const gchar *tmpdir); -void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir); -void saveVCard (TNEFStruct *tnef, const gchar *tmpdir); -void saveVTask (TNEFStruct *tnef, const gchar *tmpdir); +static gint verbose = 0; +static gint saveRTF = 0; +static gint saveintermediate = 0; +static void processTnef (TNEFStruct *tnef, const gchar *tmpdir); +static void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir); +static void saveVCard (TNEFStruct *tnef, const gchar *tmpdir); +static void saveVTask (TNEFStruct *tnef, const gchar *tmpdir); /* Other Prototypes */ -void fprintProperty (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]); -void fprintUserProp (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]); -void quotedfprint (FILE *fptr, variableLength *vl); -void cstylefprint (FILE *fptr, variableLength *vl); -void printRtf (FILE *fptr, variableLength *vl); -void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef); -guchar getRruleCount (guchar a, guchar b); -guchar getRruleMonthNum (guchar a, guchar b); -gchar * getRruleDayname (guchar a); +static void fprintProperty (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]); +static void fprintUserProp (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]); +static void quotedfprint (FILE *fptr, variableLength *vl); +static void cstylefprint (FILE *fptr, variableLength *vl); +static void printRtf (FILE *fptr, variableLength *vl); +static void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef); +static guchar getRruleCount (guchar a, guchar b); +static guchar getRruleMonthNum (guchar a, guchar b); +static gchar * getRruleDayname (guchar a); static gchar * sanitize_filename (const gchar *filename) @@ -133,22 +132,26 @@ out = camel_stream_fs_new_with_name (name, O_RDWR | O_CREAT, 0666, NULL); if (out == NULL) { - g_free (name); - return FALSE; + g_free (tmpdir); + g_free (name); + return FALSE; } content = camel_medium_get_content ((CamelMedium *) part); if (content == NULL) { - g_free (name); g_object_unref (out); + g_free (tmpdir); + g_free (name); return FALSE; } - if (camel_data_wrapper_decode_to_stream_sync (content, out, NULL, NULL) == -1 - || camel_stream_close (out, NULL, NULL) == -1) { + if (camel_data_wrapper_decode_to_stream_sync (content, out, cancellable, NULL) == -1 + || camel_stream_flush (out, cancellable, NULL) == -1 + || camel_stream_close (out, cancellable, NULL) == -1) { g_object_unref (out); + g_free (tmpdir); g_free (name); return FALSE; } - g_object_unref (out); + g_clear_object (&out); /* Extracting the winmail.dat */ TNEFInitialize (&tnef); @@ -163,9 +166,9 @@ dir = opendir (tmpdir); if (dir == NULL) { - g_object_unref (out); - g_free (name); - return FALSE; + g_free (tmpdir); + g_free (name); + return FALSE; } mainpart = camel_mime_part_new (); @@ -220,18 +223,9 @@ g_string_append_printf (part_id, ".tnef"); if (camel_multipart_get_number (mp) > 0) { - - CamelMimePart *part = camel_mime_part_new (); - - camel_medium_set_content ( - (CamelMedium *) part, - CAMEL_DATA_WRAPPER (mp)); - e_mail_parser_parse_part_as ( - parser, part, part_id, "multipart/mixed", + parser, mainpart, part_id, "multipart/mixed", cancellable, &work_queue); - - g_object_unref (part); } g_string_truncate (part_id, len); @@ -277,7 +271,7 @@ e_mail_parser_tnef_attachment_register_type (type_module); } -void +static void processTnef (TNEFStruct *tnef, const gchar *tmpdir) { @@ -456,7 +450,7 @@ g_free (ifilename); } -void +static void saveVCard (TNEFStruct *tnef, const gchar *tmpdir) { @@ -751,11 +745,11 @@ g_free (ifilename); } -guchar getRruleCount (guchar a, guchar b) { +static guchar getRruleCount (guchar a, guchar b) { return ((a << 8) | b); } -guchar getRruleMonthNum (guchar a, guchar b) { +static guchar getRruleMonthNum (guchar a, guchar b) { switch (a) { case 0x00: switch (b) { @@ -825,7 +819,7 @@ return (0); } -gchar * getRruleDayname (guchar a) { +static gchar * getRruleDayname (guchar a) { static gchar daystring[25]; *daystring = 0; @@ -859,7 +853,7 @@ return (daystring); } -void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) +static void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) { variableLength *filename; @@ -939,7 +933,7 @@ fprintf (fptr, "\n"); } -void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { +static void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { gchar *ifilename; variableLength *filename; gchar *charptr, *charptr2; @@ -1187,7 +1181,7 @@ g_free (ifilename); } -void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) { +static void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) { variableLength *vl; variableLength *filename; gint index; @@ -1313,7 +1307,7 @@ g_free (ifilename); } -void fprintProperty (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { +static void fprintProperty (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { variableLength *vl; if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (proptype, propid))) != MAPI_UNDEFINED) { if (vl->size > 0) { @@ -1325,7 +1319,7 @@ } } -void fprintUserProp (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { +static void fprintUserProp (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { variableLength *vl; if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (proptype, propid))) != MAPI_UNDEFINED) { if (vl->size > 0) { @@ -1337,7 +1331,7 @@ } } -void quotedfprint (FILE *fptr, variableLength *vl) { +static void quotedfprint (FILE *fptr, variableLength *vl) { gint index; for (index = 0; index < vl->size - 1; index++) { @@ -1350,7 +1344,7 @@ } } -void cstylefprint (FILE *fptr, variableLength *vl) { +static void cstylefprint (FILE *fptr, variableLength *vl) { gint index; for (index = 0; index < vl->size - 1; index++) { @@ -1370,7 +1364,7 @@ } } -void printRtf (FILE *fptr, variableLength *vl) { +static void printRtf (FILE *fptr, variableLength *vl) { gint index; gchar *byte; gint brace_ct; diff -Nru evolution-3.26.2/src/modules/webkit-editor/e-webkit-editor.c evolution-3.26.3/src/modules/webkit-editor/e-webkit-editor.c --- evolution-3.26.2/src/modules/webkit-editor/e-webkit-editor.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/modules/webkit-editor/e-webkit-editor.c 2017-12-11 11:08:06.000000000 +0000 @@ -38,6 +38,7 @@ enum { PROP_0, PROP_WEB_EXTENSION, /* for test purposes */ + PROP_IS_MALFUNCTION, PROP_CAN_COPY, PROP_CAN_CUT, PROP_CAN_PASTE, @@ -143,6 +144,7 @@ EThreeState start_bottom; EThreeState top_signature; + gboolean is_malfunction; }; static const GdkRGBA black = { 0, 0, 0, 1 }; @@ -253,6 +255,14 @@ } static gboolean +webkit_editor_is_malfunction (EWebKitEditor *wk_editor) +{ + g_return_val_if_fail (E_IS_WEBKIT_EDITOR (wk_editor), FALSE); + + return wk_editor->priv->is_malfunction; +} + +static gboolean webkit_editor_can_copy (EWebKitEditor *wk_editor) { g_return_val_if_fail (E_IS_WEBKIT_EDITOR (wk_editor), FALSE); @@ -5517,6 +5527,12 @@ E_WEBKIT_EDITOR (object))); return; + case PROP_IS_MALFUNCTION: + g_value_set_boolean ( + value, webkit_editor_is_malfunction ( + E_WEBKIT_EDITOR (object))); + return; + case PROP_CAN_COPY: g_value_set_boolean ( value, webkit_editor_can_copy ( @@ -6118,6 +6134,9 @@ g_return_if_fail (E_IS_WEBKIT_EDITOR (wk_editor)); + wk_editor->priv->is_malfunction = TRUE; + g_object_notify (G_OBJECT (wk_editor), "is-malfunction"); + widget = GTK_WIDGET (wk_editor); while (widget) { if (E_IS_ALERT_SINK (widget)) { @@ -6336,6 +6355,8 @@ G_PARAM_STATIC_STRINGS)); g_object_class_override_property ( + object_class, PROP_IS_MALFUNCTION, "is-malfunction"); + g_object_class_override_property ( object_class, PROP_CAN_COPY, "can-copy"); g_object_class_override_property ( object_class, PROP_CAN_CUT, "can-cut"); @@ -6399,6 +6420,7 @@ /* To be able to cancel any pending calls when 'dispose' is called. */ wk_editor->priv->cancellable = g_cancellable_new (); + wk_editor->priv->is_malfunction = FALSE; wk_editor->priv->spell_check_enabled = TRUE; wk_editor->priv->spell_checker = e_spell_checker_new (); wk_editor->priv->old_settings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref); diff -Nru evolution-3.26.2/src/plugins/publish-calendar/publish-format-fb.c evolution-3.26.3/src/plugins/publish-calendar/publish-format-fb.c --- evolution-3.26.2/src/plugins/publish-calendar/publish-format-fb.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/plugins/publish-calendar/publish-format-fb.c 2017-12-11 11:08:06.000000000 +0000 @@ -102,6 +102,18 @@ for (iter = objects; iter; iter = iter->next) { ECalComponent *comp = iter->data; icalcomponent *icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp)); + icalproperty *prop; + + if (!icalcomp) + continue; + + for (prop = icalcomponent_get_first_property (icalcomp, ICAL_FREEBUSY_PROPERTY); + prop; + prop = icalcomponent_get_next_property (icalcomp, ICAL_FREEBUSY_PROPERTY)) { + icalproperty_remove_parameter_by_name (prop, "X-SUMMARY"); + icalproperty_remove_parameter_by_name (prop, "X-LOCATION"); + } + icalcomponent_add_component (top_level, icalcomp); } diff -Nru evolution-3.26.2/src/shell/main.c evolution-3.26.3/src/shell/main.c --- evolution-3.26.2/src/shell/main.c 2017-10-30 08:43:32.000000000 +0000 +++ evolution-3.26.3/src/shell/main.c 2017-12-11 11:08:06.000000000 +0000 @@ -456,6 +456,11 @@ /* Initialize timezone specific global variables */ tzset (); + /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */ + g_type_ensure (G_TYPE_DBUS_CONNECTION); + g_type_ensure (G_TYPE_DBUS_PROXY); + g_type_ensure (G_BUS_TYPE_SESSION); + /* The contact maps feature uses clutter-gtk. */ #ifdef ENABLE_CONTACT_MAPS success = gtk_clutter_init_with_args (