New upstream version 3.54.1

2024-10-18 16:14:44 +02:00
parent a87d214471 b13b5ac15b
commit 078cf44447
8 changed files with 4197 additions and 3432 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.15)
 cmake_policy(VERSION 3.15)

 project(evolution
-	VERSION 3.54.0
+	VERSION 3.54.1
 	LANGUAGES C)
 set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution/issues/")
 set(PROJECT_URL "https://gitlab.gnome.org/GNOME/evolution/-/wikis/home")
--- a/15
+++ b/15
@ -1,3 +1,18 @@
+Evolution 3.54.1 2024-10-18
+---------------------------
+
+Bug Fixes:
+	I#2878 - Missing sender's S/MIME certificate import button
+
+Miscellaneous:
+	libgnomecanvas: Add few checks for argument validity
+	WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice
+
+Translations:
+	Ekaterine Papava (ka)
+	Jürgen Benvenuti (de)
+	Piotr Drąg (pl)
+
 Evolution 3.54.0 2024-09-13
 ---------------------------

--- a/po/de.po
+++ b/po/de.po
--- a/po/ka.po
+++ b/po/ka.po
@ -1,14 +1,14 @@
 # Georgian translation for evolution.
 # Copyright (C) 2023 Evolution authors.
 # This file is distributed under the same license as the Evolution package.
-# Ekaterine Papava <papava.e@gtu.ge>, 2023-2024.
+# Ekaterine Papava <papava.e@gtu.ge>, 2023-2025.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues/\n"
-"POT-Creation-Date: 2024-08-20 12:01+0000\n"
-"PO-Revision-Date: 2024-08-23 06:56+0200\n"
+"POT-Creation-Date: 2024-10-06 16:33+0000\n"
+"PO-Revision-Date: 2024-10-18 06:10+0200\n"
 "Last-Translator: Ekaterine Papava <papava.e@gtu.ge>\n"
 "Language-Team: Georgian <(nothing)>\n"
 "Language: ka\n"
@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.5\n"

 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@ -3632,7 +3632,7 @@ msgstr "შეტყობინების შედგენა"
 #: ../src/calendar/gui/e-comp-editor.c:2292
 #: ../src/e-util/e-html-editor-actions.c:1195
 #: ../src/e-util/e-mail-signature-editor.c:343 ../src/mail/e-mail-browser.c:202
-#: ../src/mail/e-mail-notes.c:1124 ../src/shell/e-shell-window-actions.c:1130
+#: ../src/mail/e-mail-notes.c:1124 ../src/shell/e-shell-window-actions.c:1135
 msgid "_File"
 msgstr "_ფაილი"

@ -3661,7 +3661,7 @@ msgstr "_ბეჭდვა"
 #: ../src/mail/e-mail-notes.c:1110 ../src/mail/em-filter-editor.c:45
 #: ../src/mail/em-folder-properties.c:1519
 #: ../src/mail/em-subscription-editor.c:1734
-#: ../src/shell/e-shell-window-actions.c:946
+#: ../src/shell/e-shell-window-actions.c:951
 #: ../src/smime/gui/certificate-manager.c:2124
 msgid "_Close"
 msgstr "_დახურვა"
@ -3684,7 +3684,7 @@ msgstr "_დახურვა"
 #: ../src/plugins/sender-validation/sender-validation.c:694
 #: ../src/plugins/sender-validation/sender-validation.c:805
 #: ../src/plugins/templates/templates.c:475
-#: ../src/shell/e-shell-window-actions.c:1123 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:1128 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "ჩასწორება"

@ -3697,7 +3697,7 @@ msgstr "ამ_ოჭრა"
 #: ../src/calendar/gui/e-comp-editor.c:2206 ../src/e-util/e-focus-tracker.c:798
 #: ../src/e-util/e-html-editor-actions.c:1144 ../src/e-util/e-text.c:2064
 #: ../src/e-util/e-web-view.c:493 ../src/mail/e-mail-browser.c:165
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:967
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:972
 msgid "_Copy"
 msgstr "კოპირება"

@ -3705,7 +3705,7 @@ msgstr "კოპირება"
 #: ../data/ui/evolution-mail-viewer.ui.h:10
 #: ../src/calendar/gui/e-comp-editor.c:2234 ../src/e-util/e-focus-tracker.c:803
 #: ../src/e-util/e-html-editor-actions.c:1158 ../src/e-util/e-text.c:2076
-#: ../src/mail/e-mail-browser.c:179 ../src/shell/e-shell-window-actions.c:1002
+#: ../src/mail/e-mail-browser.c:179 ../src/shell/e-shell-window-actions.c:1007
 msgid "_Paste"
 msgstr "_ჩასმა"

@ -3720,7 +3720,7 @@ msgstr ""
 #: ../data/ui/evolution-mail-viewer.ui.h:13
 #: ../src/calendar/gui/e-comp-editor.c:2320
 #: ../src/e-util/e-html-editor-actions.c:1237 ../src/mail/e-mail-browser.c:216
-#: ../src/shell/e-shell-window-actions.c:1173
+#: ../src/shell/e-shell-window-actions.c:1178
 #: ../src/smime/gui/certificate-manager.c:1588 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "ხ_ედი"
@ -4799,14 +4799,14 @@ msgstr "_დღეობა:"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1052
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:1912
+#: ../src/calendar/gui/e-calendar-view.c:1914
 msgid "Anniversary"
 msgstr "აღნიშვნა"

 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:51
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1051
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:1911
+#: ../src/calendar/gui/e-calendar-view.c:1913
 msgid "Birthday"
 msgstr "დაბადების დღე"

@ -5099,7 +5099,7 @@ msgstr "არასწორი კონტაქტი."
 #: ../src/calendar/gui/e-comp-editor.c:2299
 #: ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell-window-actions.c:1137
+#: ../src/shell/e-shell-window-actions.c:1142
 msgid "_Help"
 msgstr "და_ხმარება"

@ -5314,7 +5314,7 @@ msgstr ""
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
 #: ../src/modules/rss/evolution/e-rss-preferences.c:1744
 msgid "Name"
-msgstr ""
+msgstr "სახელი"

 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
 #: ../src/calendar/gui/caltypes.xml.in.h:2
@ -5838,7 +5838,7 @@ msgstr ""
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:700
 #: ../src/modules/calendar/e-task-shell-view-actions.c:884
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1644
-#: ../src/shell/e-shell-window-actions.c:981
+#: ../src/shell/e-shell-window-actions.c:986
 #: ../src/smime/gui/certificate-manager.c:1598 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_წაშლა"
@ -6149,7 +6149,7 @@ msgstr "გა_დიდება"
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:432
 #: ../src/e-util/e-html-editor-actions.c:2326
 #: ../src/e-util/e-html-editor-find-dialog.c:235
-#: ../src/shell/e-shell-window-actions.c:1058
+#: ../src/shell/e-shell-window-actions.c:1063
 msgid "_Find"
 msgstr "_ძებნა"

@ -6388,8 +6388,8 @@ msgid ""
 msgstr ""

 #: ../src/calendar/calendar.error.xml.h:11
-msgid "_Delete and Sent Notice"
-msgstr ""
+msgid "_Delete and Send Notice"
+msgstr "წაშლა და გა_ფრთხილების გაგზავნა"

 #: ../src/calendar/calendar.error.xml.h:12
 msgid "Delete _without Notice"
@ -7649,7 +7649,7 @@ msgstr ""
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at %s"
-msgstr ""
+msgstr "%s %s"

 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
@ -7899,9 +7899,9 @@ msgid "Pasting iCalendar data"
 msgstr ""

 #: ../src/calendar/gui/e-calendar-view.c:1239
-#: ../src/calendar/gui/e-calendar-view.c:1242
-#: ../src/calendar/gui/e-calendar-view.c:1245
+#: ../src/calendar/gui/e-calendar-view.c:1243
 #: ../src/calendar/gui/e-calendar-view.c:1246
+#: ../src/calendar/gui/e-calendar-view.c:1247
 msgid "%d %b %Y"
 msgstr "%d %b %Y"

@ -7910,15 +7910,15 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:1241
-#: ../src/calendar/gui/e-day-view.c:3282
-#: ../src/calendar/gui/e-day-view-top-item.c:845
-#: ../src/calendar/gui/e-week-view-main-item.c:223
-#, c-format
+#: ../src/calendar/gui/e-calendar-view.c:1242
+#: ../src/calendar/gui/e-day-view.c:3284
+#: ../src/calendar/gui/e-day-view-top-item.c:847
+#: ../src/calendar/gui/e-week-view-main-item.c:225
+#, no-c-format
 msgid "%d %b"
 msgstr "%d %b"

-#: ../src/calendar/gui/e-calendar-view.c:1252
+#: ../src/calendar/gui/e-calendar-view.c:1253
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"

@ -7928,17 +7928,17 @@ msgstr "%A %d %b %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:1254
-#: ../src/calendar/gui/e-day-view.c:3266
-#: ../src/calendar/gui/e-day-view-top-item.c:841
-#: ../src/calendar/gui/e-week-view-main-item.c:209
-#, c-format
+#: ../src/calendar/gui/e-calendar-view.c:1256
+#: ../src/calendar/gui/e-day-view.c:3267
+#: ../src/calendar/gui/e-day-view-top-item.c:842
+#: ../src/calendar/gui/e-week-view-main-item.c:210
+#, no-c-format
 msgid "%a %d %b"
 msgstr "%a %d %b"

-#: ../src/calendar/gui/e-calendar-view.c:1255
 #: ../src/calendar/gui/e-calendar-view.c:1257
-#: ../src/calendar/gui/e-calendar-view.c:1258
+#: ../src/calendar/gui/e-calendar-view.c:1259
+#: ../src/calendar/gui/e-calendar-view.c:1260
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"

@ -7946,7 +7946,7 @@ msgstr "%a %d %b %Y"
 #. The string is used for Birthday & Anniversary events where the first year is
 #. know, constructing a summary which also shows how many years the birthday or
 #. anniversary is for. Example: "Birthday: John Doe (13)"
-#: ../src/calendar/gui/e-calendar-view.c:1931
+#: ../src/calendar/gui/e-calendar-view.c:1933
 #, c-format
 msgctxt "BirthdaySummary"
 msgid "%s (%d)"
@ -8451,7 +8451,7 @@ msgstr ""
 #: ../src/calendar/gui/e-comp-editor-memo.c:320
 #: ../src/calendar/gui/e-comp-editor-task.c:914
 msgid "_List:"
-msgstr ""
+msgstr "_სია:"

 #: ../src/calendar/gui/e-comp-editor-memo.c:392
 #, c-format
@ -9305,27 +9305,27 @@ msgstr "მიმდინარე ფანჯრის დახურვა"
 #: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:305
 #: ../src/e-util/e-focus-tracker.c:799 ../src/e-util/e-web-view.c:495
 #: ../src/e-util/e-web-view.c:2167 ../src/mail/e-mail-browser.c:167
-#: ../src/shell/e-shell-window-actions.c:969
+#: ../src/shell/e-shell-window-actions.c:974
 msgid "Copy the selection"
 msgstr "მონიშნულის კოპირება"

 #. cut menu item
 #: ../src/calendar/gui/e-comp-editor.c:2213 ../src/e-util/e-focus-tracker.c:793
 #: ../src/e-util/e-html-editor-actions.c:1151 ../src/e-util/e-text.c:2050
-#: ../src/mail/e-mail-browser.c:172 ../src/shell/e-shell-window-actions.c:974
+#: ../src/mail/e-mail-browser.c:172 ../src/shell/e-shell-window-actions.c:979
 msgid "Cu_t"
 msgstr "ამო_ჭრა"

 #: ../src/calendar/gui/e-comp-editor.c:2215 ../src/e-util/e-focus-tracker.c:189
 #: ../src/e-util/e-focus-tracker.c:245 ../src/e-util/e-focus-tracker.c:299
 #: ../src/e-util/e-focus-tracker.c:794 ../src/e-util/e-web-view.c:2176
-#: ../src/mail/e-mail-browser.c:174 ../src/shell/e-shell-window-actions.c:976
+#: ../src/mail/e-mail-browser.c:174 ../src/shell/e-shell-window-actions.c:981
 msgid "Cut the selection"
-msgstr ""
+msgstr "მონიშნულის ამოჭრა"

 #: ../src/calendar/gui/e-comp-editor.c:2222 ../src/e-util/e-focus-tracker.c:210
 #: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:809
-#: ../src/shell/e-shell-window-actions.c:983
+#: ../src/shell/e-shell-window-actions.c:988
 msgid "Delete the selection"
 msgstr ""

@ -9336,7 +9336,7 @@ msgstr ""
 #: ../src/calendar/gui/e-comp-editor.c:2236 ../src/e-util/e-focus-tracker.c:203
 #: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:311
 #: ../src/e-util/e-focus-tracker.c:804 ../src/e-util/e-web-view.c:2185
-#: ../src/mail/e-mail-browser.c:181 ../src/shell/e-shell-window-actions.c:1004
+#: ../src/mail/e-mail-browser.c:181 ../src/shell/e-shell-window-actions.c:1009
 msgid "Paste the clipboard"
 msgstr ""

@ -9357,13 +9357,13 @@ msgstr ""

 #: ../src/calendar/gui/e-comp-editor.c:2255 ../src/e-util/e-focus-tracker.c:813
 #: ../src/e-util/e-html-editor-actions.c:1172 ../src/e-util/e-web-view.c:510
-#: ../src/mail/e-mail-browser.c:186 ../src/shell/e-shell-window-actions.c:1079
+#: ../src/mail/e-mail-browser.c:186 ../src/shell/e-shell-window-actions.c:1084
 msgid "Select _All"
 msgstr "ყველაფრის _მონიშვნა"

 #: ../src/calendar/gui/e-comp-editor.c:2257 ../src/e-util/e-focus-tracker.c:217
 #: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:814
-#: ../src/mail/e-mail-browser.c:188 ../src/shell/e-shell-window-actions.c:1081
+#: ../src/mail/e-mail-browser.c:188 ../src/shell/e-shell-window-actions.c:1086
 msgid "Select all text"
 msgstr "მთელი ტექსტის არჩევა"

@ -9406,7 +9406,7 @@ msgid "%A %d %B"
 msgstr "%A %d %B"

 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3987
+#: ../src/calendar/gui/e-day-view.c:3989
 #, c-format
 msgid "Week %d"
 msgstr "კვირა %d"
@ -9439,7 +9439,7 @@ msgstr "არცერთი"
 #: ../src/calendar/gui/e-timezone-entry.c:494
 #: ../src/modules/calendar/e-calendar-preferences.c:416
 msgid "Select…"
-msgstr ""
+msgstr "აირჩიეთ…"

 #: ../src/calendar/gui/e-estimated-duration-entry.c:64
 msgctxt "estimated-duration"
@ -9898,7 +9898,7 @@ msgstr "%s (%s)"
 #. strftime format %d = day of month, %B = full
 #. * 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:217
+#: ../src/calendar/gui/e-week-view-main-item.c:218
 #: ../src/calendar/gui/print.c:2128
 msgid "%d %B"
 msgstr "%d %B"
@ -12026,12 +12026,12 @@ msgid "Open New Message window"
 msgstr "ახალი შეტყოვიბინების ფანჯრის გახსნა"

 #: ../src/composer/e-composer-actions.c:347
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:1021
 msgid "_Preferences"
 msgstr "გამართვა"

 #: ../src/composer/e-composer-actions.c:349
-#: ../src/shell/e-shell-window-actions.c:1018
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "Configure Evolution"
 msgstr "Evolution-ის მორგება"

@ -13182,7 +13182,7 @@ msgstr ""
 #: ../src/e-util/e-activity.c:253
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"

 #. Translators: This is a running activity whose
 #. *              percent complete is known.
@ -13890,7 +13890,7 @@ msgstr "ნაგულისხმები"

 #: ../src/e-util/e-config-lookup.c:818
 msgid "Running…"
-msgstr ""
+msgstr "გაშვებულია…"

 #: ../src/e-util/e-dateedit.c:572
 msgid "Date and Time"
@ -14984,7 +14984,7 @@ msgstr "_ასლი"

 #: ../src/e-util/e-html-editor-actions.c:2338
 msgid "_Link"
-msgstr ""
+msgstr "ბმუ_ლი"

 #. Translators: 'Rule' here means a horizontal line in an HTML text
 #: ../src/e-util/e-html-editor-actions.c:2342
@ -15474,7 +15474,7 @@ msgstr ""
 #: ../src/e-util/e-html-editor-text-dialog.c:239
 #: ../src/e-util/e-webdav-browser.c:2593
 msgid "_Color:"
-msgstr ""
+msgstr "_ფერი:"

 #: ../src/e-util/e-html-editor-table-dialog.c:692
 msgid "Image:"
@ -15505,7 +15505,7 @@ msgstr ""
 #: ../src/e-util/e-import-assistant.c:319
 #: ../src/e-util/e-import-assistant.c:518
 msgid "File _type:"
-msgstr ""
+msgstr "ფაილის _ტიპი:"

 #: ../src/e-util/e-import-assistant.c:347
 msgid "Pre_view:"
@ -15854,7 +15854,7 @@ msgstr "უცნობი (%s)"
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"

 #: ../src/e-util/e-misc-utils.c:4768
 #, c-format
@ -15893,7 +15893,7 @@ msgstr ""

 #: ../src/e-util/e-name-selector-dialog.c:323
 msgid "_Search:"
-msgstr ""
+msgstr "ძ_ებნა:"

 #: ../src/e-util/e-name-selector-dialog.c:349
 #: ../src/e-util/e-name-selector-dialog.c:1298
@ -16292,7 +16292,7 @@ msgstr "სახელი:"

 #: ../src/e-util/e-source-config.c:806 ../src/e-util/e-webdav-browser.c:1885
 msgid "Name cannot be empty"
-msgstr ""
+msgstr "სახელი ცარიელი ვერ იქნება"

 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
@ -16675,7 +16675,7 @@ msgid "Format Column_s…"
 msgstr ""

 #: ../src/e-util/e-table-header-item.c:1666
-#: ../src/shell/e-shell-window-actions.c:1310
+#: ../src/shell/e-shell-window-actions.c:1315
 msgid "Custo_mize Current View…"
 msgstr ""

@ -17610,9 +17610,9 @@ msgstr ""
 msgid "SMTP server"
 msgstr "SMTP სერვერი"

-#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:941
-#: ../src/shell/e-shell-window-actions.c:948
-#: ../src/shell/e-shell-window-actions.c:955
+#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:946
+#: ../src/shell/e-shell-window-actions.c:953
+#: ../src/shell/e-shell-window-actions.c:960
 msgid "Close this window"
 msgstr "ამ ფანჯრის დახურვა"

@ -17967,7 +17967,7 @@ msgstr ""
 #, c-format
 msgctxt "PGPKeyDescription"
 msgid "%s — %s"
-msgstr ""
+msgstr "%s — %s"

 #: ../src/mail/e-mail-config-security-page.c:391
 #: ../src/mail/e-mail-config-security-page.c:505
@ -18076,11 +18076,11 @@ msgstr ""
 #: ../src/mail/e-mail-config-security-page.c:757
 #: ../src/mail/e-mail-config-security-page.c:855
 msgid "Select"
-msgstr ""
+msgstr "არჩევა"

 #: ../src/mail/e-mail-config-security-page.c:766
 #: ../src/mail/e-mail-config-security-page.c:864
-#: ../src/shell/e-shell-window-actions.c:1044
+#: ../src/shell/e-shell-window-actions.c:1049
 msgid "_Clear"
 msgstr "გასუფთავება"

@ -21691,7 +21691,7 @@ msgstr ""

 #: ../src/mail/mail.error.xml.h:174
 msgid "{0}"
-msgstr ""
+msgstr "{0}"

 #: ../src/mail/mail.error.xml.h:175
 msgid "Message is not available in offline mode."
@ -22304,12 +22304,12 @@ msgid "Show M_enu Bar"
 msgstr ""

 #: ../src/modules/appearance-settings/evolution-appearance-settings.c:523
-#: ../src/shell/e-shell-window-actions.c:1241
+#: ../src/shell/e-shell-window-actions.c:1246
 msgid "Show _Tool Bar"
 msgstr ""

 #: ../src/modules/appearance-settings/evolution-appearance-settings.c:536
-#: ../src/shell/e-shell-window-actions.c:1217
+#: ../src/shell/e-shell-window-actions.c:1222
 msgid "Show Side _Bar"
 msgstr ""

@ -23270,7 +23270,7 @@ msgstr ""
 #: ../src/modules/cal-config-weather/e-weather-location-entry.c:609
 #, c-format
 msgid "%s, %s"
-msgstr ""
+msgstr "%s, %s"

 #. Translators: Please indicate whether your locale uses the
 #. * metric or imperial measurement system by changing this to
@ -24935,7 +24935,7 @@ msgstr ""
 #, c-format
 msgctxt "cal-itip"
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"

 #: ../src/modules/itip-formatter/itip-view.c:476
 #: ../src/modules/itip-formatter/itip-view.c:477
@ -25899,7 +25899,7 @@ msgstr "არცერთი"
 #: ../src/modules/mail/e-mail-shell-backend.c:1554
 msgctxt "label"
 msgid "All"
-msgstr ""
+msgstr "ყველა"

 #. Translators: Meaning "any configured addressbook included in autocompletion" in the filter dialog
 #: ../src/modules/mail/e-mail-shell-backend.c:1842
@ -28379,304 +28379,304 @@ msgstr "ვებგვერდი"
 msgid "Saving user interface state"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:354
+#: ../src/shell/e-shell-window-actions.c:359
 msgid "Categories Editor"
 msgstr "კატეგორიების რედაქტორი"

-#: ../src/shell/e-shell-window-actions.c:674
+#: ../src/shell/e-shell-window-actions.c:679
 msgid "Bug Buddy is not installed."
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:675
+#: ../src/shell/e-shell-window-actions.c:680
 msgid "Bug Buddy could not be run."
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:920
 msgid "Collect_ion Account"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:917
+#: ../src/shell/e-shell-window-actions.c:922
 msgid "Create a new collection account"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:925
+#: ../src/shell/e-shell-window-actions.c:930
 msgid "_About"
 msgstr "_შესახებ"

-#: ../src/shell/e-shell-window-actions.c:927
+#: ../src/shell/e-shell-window-actions.c:932
 msgid "Show information about Evolution"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:932
+#: ../src/shell/e-shell-window-actions.c:937
 msgid "_Accounts"
 msgstr "_ანგარიშები"

-#: ../src/shell/e-shell-window-actions.c:934
+#: ../src/shell/e-shell-window-actions.c:939
 msgid "Configure Evolution Accounts"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:939
-#: ../src/shell/e-shell-window-actions.c:953
+#: ../src/shell/e-shell-window-actions.c:944
+#: ../src/shell/e-shell-window-actions.c:958
 msgid "_Close Window"
 msgstr "_დახურე ფანჯარა"

-#: ../src/shell/e-shell-window-actions.c:960
+#: ../src/shell/e-shell-window-actions.c:965
 msgid "_Contents"
 msgstr "_შინაარსი"

-#: ../src/shell/e-shell-window-actions.c:962
+#: ../src/shell/e-shell-window-actions.c:967
 msgid "Open the Evolution User Guide"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:988
+#: ../src/shell/e-shell-window-actions.c:993
 msgid "I_mport…"
 msgstr "_შემოტანა…"

-#: ../src/shell/e-shell-window-actions.c:990
+#: ../src/shell/e-shell-window-actions.c:995
 msgid "Import data from other programs"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:995
+#: ../src/shell/e-shell-window-actions.c:1000
 msgid "New _Window"
 msgstr "ახალი _ფანჯარა"

-#: ../src/shell/e-shell-window-actions.c:997
+#: ../src/shell/e-shell-window-actions.c:1002
 msgid "Create a new window displaying this view"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:1014
 msgid "Available Cate_gories"
 msgstr "ხელმისაწვდომი _კატეგორიები"

-#: ../src/shell/e-shell-window-actions.c:1011
+#: ../src/shell/e-shell-window-actions.c:1016
 msgid "Manage available categories"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1028
 msgid "_Quit"
 msgstr "_გასვლა"

-#: ../src/shell/e-shell-window-actions.c:1025
+#: ../src/shell/e-shell-window-actions.c:1030
 msgid "Exit the program"
 msgstr "პროგრამიდან გასვლა"

-#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/shell/e-shell-window-actions.c:1035
 msgid "_Saved Searches"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:1042
 msgid "_Advanced Search…"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1039
+#: ../src/shell/e-shell-window-actions.c:1044
 msgid "Construct a more advanced search"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1046
+#: ../src/shell/e-shell-window-actions.c:1051
 msgid "Clear the current search parameters"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1051
+#: ../src/shell/e-shell-window-actions.c:1056
 msgid "_Edit Saved Searches…"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1053
+#: ../src/shell/e-shell-window-actions.c:1058
 msgid "Manage your saved searches"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1060
+#: ../src/shell/e-shell-window-actions.c:1065
 msgid "Click here to change the search type"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1065
+#: ../src/shell/e-shell-window-actions.c:1070
 msgid "_Find Now"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1067
+#: ../src/shell/e-shell-window-actions.c:1072
 msgid "Execute the current search parameters"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1072
+#: ../src/shell/e-shell-window-actions.c:1077
 msgid "_Save Search…"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1074
+#: ../src/shell/e-shell-window-actions.c:1079
 msgid "Save the current search parameters"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1086
+#: ../src/shell/e-shell-window-actions.c:1091
 msgid "_Keyboard Shortcuts"
 msgstr "კლავიატურის მალსახმობები"

-#: ../src/shell/e-shell-window-actions.c:1088
+#: ../src/shell/e-shell-window-actions.c:1093
 msgid "Show keyboard shortcuts"
 msgstr "კლავიატურის მალსახმობების ჩვენება"

-#: ../src/shell/e-shell-window-actions.c:1093
+#: ../src/shell/e-shell-window-actions.c:1098
 msgid "Show _WebKit GPU information"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1095
+#: ../src/shell/e-shell-window-actions.c:1100
 msgid "Show WebKit GPU information page in the preview panel"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1100
+#: ../src/shell/e-shell-window-actions.c:1105
 msgid "Submit _Bug Report…"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1102
+#: ../src/shell/e-shell-window-actions.c:1107
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1107
+#: ../src/shell/e-shell-window-actions.c:1112
 msgid "_Work Offline"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1109
+#: ../src/shell/e-shell-window-actions.c:1114
 msgid "Put Evolution into offline mode"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1114
+#: ../src/shell/e-shell-window-actions.c:1119
 msgid "_Work Online"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1116
+#: ../src/shell/e-shell-window-actions.c:1121
 msgid "Put Evolution into online mode"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1144
+#: ../src/shell/e-shell-window-actions.c:1149
 msgid "Lay_out"
 msgstr "_განლაგება"

 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1152
+#: ../src/shell/e-shell-window-actions.c:1157
 msgid "_New"
 msgstr "_ახალი"

-#: ../src/shell/e-shell-window-actions.c:1159
+#: ../src/shell/e-shell-window-actions.c:1164
 msgid "_Search"
 msgstr "ძებნა"

-#: ../src/shell/e-shell-window-actions.c:1166
+#: ../src/shell/e-shell-window-actions.c:1171
 msgid "_Switcher Appearance"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1180
+#: ../src/shell/e-shell-window-actions.c:1185
 msgid "_Window"
 msgstr "_ფანჯარა"

-#: ../src/shell/e-shell-window-actions.c:1209
+#: ../src/shell/e-shell-window-actions.c:1214
 msgid "Show _Menu Bar"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1211
+#: ../src/shell/e-shell-window-actions.c:1216
 msgid "Show the menu bar"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1219
+#: ../src/shell/e-shell-window-actions.c:1224
 msgid "Show the side bar"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1225
+#: ../src/shell/e-shell-window-actions.c:1230
 msgid "Show _Buttons"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1227
+#: ../src/shell/e-shell-window-actions.c:1232
 msgid "Show the switcher buttons"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1233
+#: ../src/shell/e-shell-window-actions.c:1238
 msgid "Show _Status Bar"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1235
+#: ../src/shell/e-shell-window-actions.c:1240
 msgid "Show the status bar"
 msgstr "სტატუსის ზოლის ჩვენება"

-#: ../src/shell/e-shell-window-actions.c:1243
+#: ../src/shell/e-shell-window-actions.c:1248
 msgid "Show the tool bar"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1265
+#: ../src/shell/e-shell-window-actions.c:1270
 msgid "_Icons Only"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1267
+#: ../src/shell/e-shell-window-actions.c:1272
 msgid "Display window buttons with icons only"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1272
+#: ../src/shell/e-shell-window-actions.c:1277
 msgid "_Text Only"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1274
+#: ../src/shell/e-shell-window-actions.c:1279
 msgid "Display window buttons with text only"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1279
+#: ../src/shell/e-shell-window-actions.c:1284
 msgid "Icons _and Text"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1281
+#: ../src/shell/e-shell-window-actions.c:1286
 msgid "Display window buttons with icons and text"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1286
+#: ../src/shell/e-shell-window-actions.c:1291
 msgid "Tool_bar Style"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1288
+#: ../src/shell/e-shell-window-actions.c:1293
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1296
+#: ../src/shell/e-shell-window-actions.c:1301
 msgid "Delete Current View"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1303
+#: ../src/shell/e-shell-window-actions.c:1308
 msgid "Save Custom View…"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1305
+#: ../src/shell/e-shell-window-actions.c:1310
 msgid "Save current custom view"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1319
+#: ../src/shell/e-shell-window-actions.c:1324
 msgid "C_urrent View"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1329
+#: ../src/shell/e-shell-window-actions.c:1334
 msgid "Custom View"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1331
+#: ../src/shell/e-shell-window-actions.c:1336
 msgid "Current view is a customized view"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1339
+#: ../src/shell/e-shell-window-actions.c:1344
 msgid "Page Set_up…"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1341
+#: ../src/shell/e-shell-window-actions.c:1346
 msgid "Change the page settings for your current printer"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1716
+#: ../src/shell/e-shell-window-actions.c:1721
 #, c-format
 msgid "Switch to %s"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1840
+#: ../src/shell/e-shell-window-actions.c:1845
 #, c-format
 msgid "Select view: %s"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1857
+#: ../src/shell/e-shell-window-actions.c:1862
 #, c-format
 msgid "Delete view: %s"
 msgstr ""

-#: ../src/shell/e-shell-window-actions.c:1972
+#: ../src/shell/e-shell-window-actions.c:1977
 msgid "Execute these search parameters"
 msgstr ""

--- a/po/pl.po
+++ b/po/pl.po
--- a/src/em-format/e-mail-formatter-secure-button.c
+++ b/src/em-format/e-mail-formatter-secure-button.c
@ -272,7 +272,8 @@ add_cert_table (GString *html,

 				ec = e_cert_new (CERT_DupCertificate (info->cert_data));

-				if (!secure_button_smime_cert_exists (info->email, ec)) {
+				if (validity->sign.status == CAMEL_CIPHER_VALIDITY_SIGN_NEED_PUBLIC_KEY ||
+				    !secure_button_smime_cert_exists (info->email, ec)) {
 					e_util_markup_append_escaped (html,
 						"&nbsp;<button type=\"button\" class=\"secure-button-import-certificate\" id=\"%s.%p\" value=\"%p:%p:%p\">%s</button>",
 						e_mail_part_get_id (part), info->cert_data, part, validity, info->cert_data, _("Import Certificate"));
--- a/src/libgnomecanvas/gnome-canvas.c
+++ b/src/libgnomecanvas/gnome-canvas.c
@ -1041,6 +1041,7 @@ gnome_canvas_item_i2c_matrix (GnomeCanvasItem *item,
                              cairo_matrix_t *matrix)
 {
 	cairo_matrix_t i2w, w2c;
+	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));

 	gnome_canvas_item_i2w_matrix (item, &i2w);
 	gnome_canvas_w2c_matrix (item->canvas, &w2c);
@ -1215,6 +1216,8 @@ gnome_canvas_item_get_bounds (GnomeCanvasItem *item,
 void
 gnome_canvas_item_request_update (GnomeCanvasItem *item)
 {
+	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
+
 	if (item->flags & GNOME_CANVAS_ITEM_NEED_UPDATE)
 		return;

@ -3173,12 +3176,14 @@ gnome_canvas_get_item_at (GnomeCanvas *canvas,
 static void
 gnome_canvas_request_update (GnomeCanvas *canvas)
 {
+	g_return_if_fail (GNOME_IS_CANVAS (canvas));
 	GNOME_CANVAS_GET_CLASS (canvas)->request_update (canvas);
 }

 static void
 gnome_canvas_request_update_real (GnomeCanvas *canvas)
 {
+	g_return_if_fail (GNOME_IS_CANVAS (canvas));
 	if (canvas->need_update)
 		return;

--- a/src/modules/webkit-editor/e-webkit-editor.c
+++ b/src/modules/webkit-editor/e-webkit-editor.c
@ -5724,6 +5724,24 @@ webkit_editor_button_press_event (GtkWidget *widget,
 	       GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_press_event (widget, event);
 }

+static gboolean
+webkit_editor_button_release_event (GtkWidget *widget,
+				    GdkEventButton *event)
+{
+	if (event->button == 2) {
+		/* WebKitGTK 2.46.1 changed the middle-click paste behavior and moved
+		   the paste handler from the button-press event into the button-release
+		   event, which causes double paste of the clipboard content. As the paste
+		   is handled in the webkit_editor_button_press_event() above, make sure
+		   the release handler is not called here regardless whether the user
+		   uses the changed WebkitGTK or not. */
+		return TRUE;
+	}
+
+	/* Chain up to parent's method. */
+	return GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_release_event (widget, event);
+}
+
 static gboolean
 webkit_editor_key_press_event (GtkWidget *widget,
                               GdkEventKey *event)
@ -5814,6 +5832,7 @@ e_webkit_editor_class_init (EWebKitEditorClass *class)

 	widget_class = GTK_WIDGET_CLASS (class);
 	widget_class->button_press_event = webkit_editor_button_press_event;
+	widget_class->button_release_event = webkit_editor_button_release_event;
 	widget_class->key_press_event = webkit_editor_key_press_event;

 	g_object_class_override_property (