[Commits] [SCM] claws-win32-installer branch, gtk3, updated. 3.18.0-1-65-ga3121a6
jonathan at claws-mail.org
jonathan at claws-mail.org
Mon Aug 2 22:37:36 CEST 2021
The branch, gtk3 has been updated
via a3121a653dda42dc8759028909b2a3e2d8a79f77 (commit)
via d8dad317c2965178db2d15dd4c2c3919a37ef0ab (commit)
via aecb51592471d486acda902cf831ebf3eeab4276 (commit)
via 332f68c8f55312125cf0b8172821c9ae31381f57 (commit)
via abf3f7d01e0d0863168ceec75ab501caec6c8f12 (commit)
via f6f1e38cd69657118b8287c87c72a52835be6929 (commit)
via d2eaa34f797d63f3104f626d6270bab27eea55da (commit)
via af11845d7e5a9ca05146a3e2b33dc2720b0b4a39 (commit)
via f8c40eca5b5c91dcb0fd9d01c4d2d12fa124690b (commit)
via 7470b310be8bb9b9b41b223cc03d58ae5eeecf52 (commit)
via 74f9361a4dd2895a02cfca0587228d8ca9058154 (commit)
via 8773971c5e4e87ce747077d6456dc553bc6915ac (commit)
via 77aab24164694d7b8ded673af429e0428ab8aa68 (commit)
via 8dfd098935bfc14269f75544d8f3f6f8e350dd72 (commit)
via 03bfe83ed5a7294e670268f75261d9dd4f3c55af (commit)
via f1864f923fbfcd5903f80e256d41d1a6a1df9d68 (commit)
via 5f656968f19cf043573eace12d82e65189302c43 (commit)
via 70c8d2628aa19832d36cabfbb8a227dcdc84627a (commit)
via 0157643100cbd80d7a76b1e582b4750a17e58f97 (commit)
via 630fa19574059ec8e4070b54c5e7d537c4b8c845 (commit)
via b76330cf9314168cf176597d4ba8bd25fa9c2bbe (commit)
via b7a7cad318948e618b2e831ab6fa39886754bdc9 (commit)
via 28c0fbc0bb842719b8b9d6633ee408e2c4bf6d42 (commit)
via dd3033a3f95ea52b831a8b3b755ecad3b79f4396 (commit)
via a9143a4a58b4420f36a44f909327a14cbf33c1b8 (commit)
via ad714df60bfb7decd56236e73dd7de5148a069f8 (commit)
via 5298714395a673fb7d1c12d7d82333b73c81e0ad (commit)
via bae4dbe7a49a0e1ce975bcfd712f8a78d4577e3a (commit)
via 9e2c848b583acf656ba77723cc0dd01aedf599be (commit)
via 4bf84374271b3de438bfee2194356cd68401c8e1 (commit)
from 851a27bb2df22b18d21ec0526497316dadb16595 (commit)
Summary of changes:
.gitignore | 2 +-
AUTHORS | 25 +
Makefile.am | 74 +-
README | 3 +-
configure.ac | 4 +-
packages/download.sh | 23 +
packages/mk-ca-bundle.pl | 609 +++
packages/packages.current | 109 +-
patches/atk-2.36.0/01-meson-build.patch | 4 -
patches/bzip2-1.0.8/01-g10-bzlib_h.patch | 4 -
patches/bzip2-1.0.8/02-g10-Makefile.patch | 4 -
patches/claws_mail/01-etpan-sasl-plugin-path.patch | 4 -
...ehtml.patch => 02-define-WIN32-for-litehtml.sh} | 0
patches/claws_mail/03-fancy-prefs.patch | 4 -
patches/claws_mail/04-validate-utf8.patch | 31 +
patches/claws_mail/05-ca-certificates.patch | 4398 ++++++++++++++++++++
patches/claws_mail/06-litehtml.patch | 672 +++
patches/claws_mail/07-hexpand.patch | 30 +
patches/claws_mail/08-lh-remote-content.patch | 32 +
.../claws_mail/{99-autogen.patch => 99-autogen.sh} | 0
patches/cyrus_sasl-2.1.27/01-md5-typedef.patch | 4 -
patches/cyrus_sasl-2.1.27/02-tchar.patch | 4 -
patches/cyrus_sasl-2.1.27/03-exports.patch | 4 -
.../cyrus_sasl-2.1.27/04-paths-relocation.patch | 4 -
.../{99-reautomagic.patch => 99-reautomagic.sh} | 2 +
.../01-fix-relocation.patch | 4 -
patches/fontconfig-2.13.93/01-no-fluff.patch | 22 -
patches/fontconfig/01-no-fluff.patch | 15 +
patches/gtk/01-theme.patch | 4 -
patches/gtk/02-csd.patch | 4 -
patches/gtk/03-keyboard-hook.patch | 4 -
patches/gtk/04-scrollbar-button.patch | 17 +
...eme-prepare.patch => 50-win71-theme-prepare.sh} | 10 +-
...-theme-Fix-levelbar-and-tweak-progressbar.patch | 4 -
...2-win32-theme-fix-disabled-GtkEntry-style.patch | 4 -
patches/gtk/53-win32-theme-Fix-notebook-tabs.patch | 4 -
...-win32-theme-Fix-unfocused-window-buttons.patch | 4 -
...-win32-theme-make-separator-visible-again.patch | 4 -
.../gtk/57-win32-theme-Draw-expander-arrow.patch | 4 -
.../gtk/60-win32-theme-claws-consolidated.patch | 114 +
.../gtk/61-win32-theme-Draw-submenu-arrow.patch | 27 -
.../gtk/62-win32-theme-Draw-menu-separator.patch | 22 -
.../63-win32-theme-Native-treeview-expander.patch | 22 -
.../64-win32-theme-Reduce-titlebar-headroom.patch | 20 -
...theme-Visible-treeview-inactive-selection.patch | 23 -
.../66-win32-theme-Native-combobox-height.patch | 21 -
patches/gtk/67-win32-theme-Credits.patch | 54 -
patches/gtk/69-win71-theme-finalize.patch | 26 -
patches/gtk/69-win71-theme-finalize.sh | 22 +
.../{99-autotools.patch => 99-autotools.sh} | 0
.../{99-autoreconf.patch => 99-autoreconf.sh} | 0
patches/icu4c-58.3/01-libnames.patch | 5 -
patches/icu4c-58.3/02-float128-clang.patch | 5 -
patches/icu4c-58.3/03-no-xlocale.patch | 5 -
.../{99-build.patch.in => 99-build.sh.in} | 0
patches/libetpan-1.9.4/01-no-tests.patch | 4 -
patches/libetpan-1.9.4/02-wsaewouldblock.patch | 4 -
patches/libetpan-1.9.4/03-sasl-set-path.patch | 4 -
patches/libetpan-1.9.4/04-closesocket.patch | 4 -
.../libetpan-1.9.4/05-no-unnecessary-linkage.patch | 4 -
patches/libetpan-1.9.4/06-libs.patch | 4 -
.../{99-autogen.patch => 99-autogen.sh} | 0
patches/pixman-0.40.0/01-no-tests.patch | 4 -
patches/regex/{01-setup.patch => 01-setup.sh} | 0
patches/w32pth-2.0.5/01-def-fix.patch | 4 -
.../{99-autogen.sh.patch => 99-autogen.sh} | 0
patches/ytnef-1.9.3/01-malloc.patch | 4 -
patches/ytnef-1.9.3/02-no-undefined.patch | 4 -
.../{99-autotools.patch => 99-autotools.sh} | 0
patches/zlib-1.2.11/01-no-strip.patch | 4 -
po/ar.po | 65 +-
po/claws-mail-win32.pot | 2 +-
po/cz.po | 50 +-
po/de.po | 33 +-
po/es.po | 47 +-
po/fr.po | 41 +-
po/it.po | 14 +-
po/pt.po | 41 +-
po/ru.po | 144 +-
src/Makefile.am | 6 +-
src/claws-mail.mk.in | 40 +-
src/gnupg-uninst.nsi | 2 -
src/sections-installer.nsi | 46 +-
src/sections-uninstaller.nsi | 72 +-
84 files changed, 6439 insertions(+), 728 deletions(-)
create mode 100755 packages/mk-ca-bundle.pl
mode change 100755 => 100644 patches/atk-2.36.0/01-meson-build.patch
mode change 100755 => 100644 patches/bzip2-1.0.8/01-g10-bzlib_h.patch
mode change 100755 => 100644 patches/bzip2-1.0.8/02-g10-Makefile.patch
mode change 100755 => 100644 patches/claws_mail/01-etpan-sasl-plugin-path.patch
rename patches/claws_mail/{02-define-WIN32-for-litehtml.patch => 02-define-WIN32-for-litehtml.sh} (100%)
mode change 100755 => 100644 patches/claws_mail/03-fancy-prefs.patch
create mode 100644 patches/claws_mail/04-validate-utf8.patch
create mode 100644 patches/claws_mail/05-ca-certificates.patch
create mode 100644 patches/claws_mail/06-litehtml.patch
create mode 100644 patches/claws_mail/07-hexpand.patch
create mode 100644 patches/claws_mail/08-lh-remote-content.patch
rename patches/claws_mail/{99-autogen.patch => 99-autogen.sh} (100%)
mode change 100755 => 100644 patches/cyrus_sasl-2.1.27/01-md5-typedef.patch
mode change 100755 => 100644 patches/cyrus_sasl-2.1.27/02-tchar.patch
mode change 100755 => 100644 patches/cyrus_sasl-2.1.27/03-exports.patch
mode change 100755 => 100644 patches/cyrus_sasl-2.1.27/04-paths-relocation.patch
rename patches/cyrus_sasl-2.1.27/{99-reautomagic.patch => 99-reautomagic.sh} (95%)
rename patches/{enchant-2.2.15 => enchant}/01-fix-relocation.patch (94%)
mode change 100755 => 100644
delete mode 100755 patches/fontconfig-2.13.93/01-no-fluff.patch
create mode 100644 patches/fontconfig/01-no-fluff.patch
mode change 100755 => 100644 patches/gtk/01-theme.patch
mode change 100755 => 100644 patches/gtk/02-csd.patch
mode change 100755 => 100644 patches/gtk/03-keyboard-hook.patch
create mode 100644 patches/gtk/04-scrollbar-button.patch
rename patches/gtk/{50-win71-theme-prepare.patch => 50-win71-theme-prepare.sh} (61%)
mode change 100755 => 100644 patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
mode change 100755 => 100644 patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
mode change 100755 => 100644 patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
mode change 100755 => 100644 patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
mode change 100755 => 100644 patches/gtk/55-win32-theme-make-separator-visible-again.patch
mode change 100755 => 100644 patches/gtk/57-win32-theme-Draw-expander-arrow.patch
create mode 100644 patches/gtk/60-win32-theme-claws-consolidated.patch
delete mode 100755 patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
delete mode 100755 patches/gtk/62-win32-theme-Draw-menu-separator.patch
delete mode 100755 patches/gtk/63-win32-theme-Native-treeview-expander.patch
delete mode 100755 patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
delete mode 100755 patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
delete mode 100755 patches/gtk/66-win32-theme-Native-combobox-height.patch
delete mode 100755 patches/gtk/67-win32-theme-Credits.patch
delete mode 100755 patches/gtk/69-win71-theme-finalize.patch
create mode 100755 patches/gtk/69-win71-theme-finalize.sh
rename patches/gumbo_parser-0.10.1/{99-autotools.patch => 99-autotools.sh} (100%)
rename patches/hunspell-1.7.0/{99-autoreconf.patch => 99-autoreconf.sh} (100%)
mode change 100755 => 100644 patches/icu4c-58.3/01-libnames.patch
mode change 100755 => 100644 patches/icu4c-58.3/02-float128-clang.patch
mode change 100755 => 100644 patches/icu4c-58.3/03-no-xlocale.patch
rename patches/icu4c-58.3/{99-build.patch.in => 99-build.sh.in} (100%)
mode change 100755 => 100644 patches/libetpan-1.9.4/01-no-tests.patch
mode change 100755 => 100644 patches/libetpan-1.9.4/02-wsaewouldblock.patch
mode change 100755 => 100644 patches/libetpan-1.9.4/03-sasl-set-path.patch
mode change 100755 => 100644 patches/libetpan-1.9.4/04-closesocket.patch
mode change 100755 => 100644 patches/libetpan-1.9.4/05-no-unnecessary-linkage.patch
mode change 100755 => 100644 patches/libetpan-1.9.4/06-libs.patch
rename patches/libetpan-1.9.4/{99-autogen.patch => 99-autogen.sh} (100%)
mode change 100755 => 100644 patches/pixman-0.40.0/01-no-tests.patch
rename patches/regex/{01-setup.patch => 01-setup.sh} (100%)
mode change 100755 => 100644 patches/w32pth-2.0.5/01-def-fix.patch
rename patches/w32pth-2.0.5/{99-autogen.sh.patch => 99-autogen.sh} (100%)
mode change 100755 => 100644 patches/ytnef-1.9.3/01-malloc.patch
mode change 100755 => 100644 patches/ytnef-1.9.3/02-no-undefined.patch
rename patches/ytnef-1.9.3/{99-autotools.patch => 99-autotools.sh} (100%)
mode change 100755 => 100644 patches/zlib-1.2.11/01-no-strip.patch
- Log -----------------------------------------------------------------
commit a3121a653dda42dc8759028909b2a3e2d8a79f77
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 02:18:02 2021 -0700
add icons for gtk inspector
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index a45be30..aae063c 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -273,8 +273,17 @@ SetOutPath "$INSTDIR"
### adwaita-icon-theme
!insertmacro SetPrefix adwaita_icon_theme
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\actions"
+File ${prefix}/share/icons/Adwaita/16x16/actions/bookmark-new-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/document-save-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/find-location-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/folder-new-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/actions/list-add-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/actions/list-remove-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/media-eject-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/media-playback-pause-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/media-record-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/object-select-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/view-list-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\categories"
File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-activities-symbolic.symbolic.png
@@ -288,6 +297,9 @@ File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-recent-symbolic.symbol
File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-symbols-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-travel-symbolic.symbolic.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\devices"
+File ${prefix}/share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\legacy"
File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-information.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/document-properties.png
@@ -312,6 +324,9 @@ File ${prefix}/share/icons/Adwaita/16x16/legacy/view-refresh.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\places"
File ${prefix}/share/icons/Adwaita/16x16/places/folder.png
+File ${prefix}/share/icons/Adwaita/16x16/places/user-desktop-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/places/user-home-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/places/user-trash-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\ui"
File ${prefix}/share/icons/Adwaita/16x16/ui/checkbox-checked-symbolic.symbolic.png
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 4748830..010df0e 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -130,8 +130,17 @@ RMDir "$INSTDIR\share\themes\win71"
#######################################
### adwaita-icon-theme
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\bookmark-new-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\document-save-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\find-location-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\folder-new-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-add-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-remove-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\media-eject-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\media-playback-pause-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\media-record-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\object-select-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\view-list-symbolic.symbolic.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\actions"
Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-activities-symbolic.symbolic.png"
@@ -146,6 +155,9 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-symbols-symbolic.sym
Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-travel-symbolic.symbolic.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\categories"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\devices\drive-harddisk-symbolic.symbolic.png"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\devices"
+
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\document-properties.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-clear.png"
@@ -169,6 +181,9 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\view-refresh.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\legacy"
Delete "$INSTDIR\share\icons\Adwaita\16x16\places\folder.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\places\user-desktop-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\places\user-home-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\places\user-trash-symbolic.symbolic.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\places"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-checked-symbolic.symbolic.png"
commit d8dad317c2965178db2d15dd4c2c3919a37ef0ab
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 01:23:15 2021 -0700
add adwaita emoji icons
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 93c89a1..a45be30 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -275,6 +275,19 @@ SetOutPath "$INSTDIR"
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\actions"
File ${prefix}/share/icons/Adwaita/16x16/actions/list-add-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/actions/list-remove-symbolic.symbolic.png
+
+SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\categories"
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-activities-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-body-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-flags-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-food-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-nature-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-objects-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-people-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-recent-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-symbols-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-travel-symbolic.symbolic.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\legacy"
File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-information.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/document-properties.png
@@ -296,8 +309,10 @@ File ${prefix}/share/icons/Adwaita/16x16/legacy/list-add.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/list-remove.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/system-help.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/view-refresh.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\places"
File ${prefix}/share/icons/Adwaita/16x16/places/folder.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\ui"
File ${prefix}/share/icons/Adwaita/16x16/ui/checkbox-checked-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/checkbox-mixed-symbolic.symbolic.png
@@ -325,20 +340,25 @@ File ${prefix}/share/icons/Adwaita/16x16/ui/window-maximize-symbolic.symbolic.pn
File ${prefix}/share/icons/Adwaita/16x16/ui/window-minimize-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/window-new-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/window-restore-symbolic.symbolic.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
File ${prefix}/share/icons/Adwaita/32x32/mimetypes/text-x-generic.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\256x256\legacy"
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-error.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-information.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-password.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-question.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-warning.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\cursors"
File ${prefix}/share/icons/Adwaita/cursors/dnd-copy.cur
File ${prefix}/share/icons/Adwaita/cursors/dnd-move.cur
File ${prefix}/share/icons/Adwaita/cursors/dnd-none.cur
+
SetOutPath "$INSTDIR\share\icons\Adwaita"
File ${prefix}/share/icons/Adwaita/index.theme
+
ExecShell "open" "$INSTDIR\gtk-update-icon-cache.exe" '-f "$INSTDIR\share\icons\Adwaita"' SW_HIDE
SetOutPath "$INSTDIR"
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 8f3dc75..4748830 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -132,7 +132,20 @@ RMDir "$INSTDIR\share\themes\win71"
### adwaita-icon-theme
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-add-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-remove-symbolic.symbolic.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16\actions"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\actions"
+
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-activities-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-body-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-flags-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-food-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-nature-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-objects-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-people-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-recent-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-symbols-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-travel-symbolic.symbolic.png"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\categories"
+
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\document-properties.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-clear.png"
@@ -153,9 +166,11 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\list-add.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\list-remove.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\system-help.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\view-refresh.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16\legacy"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\legacy"
+
Delete "$INSTDIR\share\icons\Adwaita\16x16\places\folder.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16\places"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\places"
+
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-checked-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-mixed-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-symbolic.symbolic.png"
@@ -182,26 +197,34 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-maximize-symbolic.symbolic.
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-minimize-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-new-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-restore-symbolic.symbolic.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16\ui"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\ui"
+
+RMDir "$INSTDIR\share\icons\Adwaita\16x16"
+
Delete "$INSTDIR\share\icons\Adwaita\32x32\mimetypes\text-x-generic.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
-RMDIR "$INSTDIR\share\icons\Adwaita\32x32"
+RMDir "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
+
+RMDir "$INSTDIR\share\icons\Adwaita\32x32"
+
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-error.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-password.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-question.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-warning.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\256x256\legacy"
-RMDIR "$INSTDIR\share\icons\Adwaita\256x256"
+RMDir "$INSTDIR\share\icons\Adwaita\256x256\legacy"
+
+RMDir "$INSTDIR\share\icons\Adwaita\256x256"
+
Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-copy.cur"
Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-move.cur"
Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-none.cur"
-RMDIR "$INSTDIR\share\icons\Adwaita\cursors"
+RMDir "$INSTDIR\share\icons\Adwaita\cursors"
+
Delete "$INSTDIR\share\icons\Adwaita\index.theme"
Delete "$INSTDIR\share\icons\Adwaita\icon-theme.cache"
-RMDIR "$INSTDIR\share\icons\Adwaita"
-RMDIR "$INSTDIR\share\icons"
+
+RMDir "$INSTDIR\share\icons\Adwaita"
+RMDir "$INSTDIR\share\icons"
#######################################
### gtk+
commit aecb51592471d486acda902cf831ebf3eeab4276
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 00:38:42 2021 -0700
Include gtk schemas in the installer
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 924e04b..93c89a1 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -260,6 +260,13 @@ File ${prefix}/share/themes/Emacs/gtk-3.0/gtk-keys.css
SetOutPath "$INSTDIR\share\locale\"
File /r ${prefix}/share/locale/
+
+SetOutPath "$INSTDIR\share\glib-2.0\schemas"
+File ${prefix}/share/glib-2.0/schemas/gschemas.compiled
+File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
+File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
+File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
+File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
SetOutPath "$INSTDIR"
#######################################
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 07d1c88..8f3dc75 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -224,6 +224,14 @@ RMDir "$INSTDIR\share\themes\Emacs"
RMDir "$INSTDIR\share\themes"
+Delete "$INSTDIR\share\glib-2.0\schemas\gschemas.compiled"
+Delete "$INSTDIR\share\glib-2.0\schemas\org.gtk.Settings.ColorChooser.gschema.xml"
+Delete "$INSTDIR\share\glib-2.0\schemas\org.gtk.Settings.Debug.gschema.xml"
+Delete "$INSTDIR\share\glib-2.0\schemas\org.gtk.Settings.EmojiChooser.gschema.xml"
+Delete "$INSTDIR\share\glib-2.0\schemas\org.gtk.Settings.FileChooser.gschema.xml"
+RMDir "$INSTDIR\share\glib-2.0\schemas"
+RMDir "$INSTDIR\share\glib-2.0"
+
#######################################
### gdk-pixbuf
Delete /REBOOTOK "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
commit 332f68c8f55312125cf0b8172821c9ae31381f57
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Jul 31 20:46:42 2021 -0700
Add litehtml remote content patch
diff --git a/patches/claws_mail/08-lh-remote-content.patch b/patches/claws_mail/08-lh-remote-content.patch
new file mode 100644
index 0000000..8bf3464
--- /dev/null
+++ b/patches/claws_mail/08-lh-remote-content.patch
@@ -0,0 +1,32 @@
+diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
+index 1e0d70f83..072192e47 100644
+--- a/src/plugins/litehtml_viewer/container_linux_images.cpp
++++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
+@@ -110,8 +110,15 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
+ if (pixbuf != NULL)
+ m_images.insert(std::make_pair(src, std::make_pair(pixbuf, last)));
+
++ unlock_images_cache();
+ return;
+ } else {
++ if (!lh_prefs_get()->enable_remote_content) {
++ debug_print("blocking download of image from '%s'\n", src);
++ unlock_images_cache();
++ return;
++ }
++
+ request = true;
+ m_images.insert(std::make_pair(url, std::make_pair((GdkPixbuf *)NULL, last)));
+ }
+@@ -125,11 +132,6 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
+ if (request) {
+ struct FetchCtx *ctx;
+
+- if (!lh_prefs_get()->enable_remote_content) {
+- debug_print("blocking download of image from '%s'\n", src);
+- return;
+- }
+-
+ debug_print("allowing download of image from '%s'\n", src);
+
+ ctx = g_new(struct FetchCtx, 1);
commit abf3f7d01e0d0863168ceec75ab501caec6c8f12
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Wed Jul 28 23:23:29 2021 -0700
Claws theme fixes
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 52315ed..9b8a947 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -1,5 +1,5 @@
--- a/gtk/theme/win32/gtk.css 2021-07-29 19:54:57.943852906 -0700
-+++ b/gtk/theme/win32/gtk.css 2021-07-29 20:10:14.150917901 -0700
++++ b/gtk/theme/win32/gtk.css 2021-07-29 23:42:22.453515376 -0700
@@ -1,3 +1,9 @@
+/* win71 theme
+ * Based on (internal) win32 theme from gtk+
@@ -20,7 +20,7 @@
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,45 @@
+@@ -272,3 +277,91 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -66,3 +66,49 @@
+ margin-top: 1px;
+ min-height: -gtk-win32-size(combobox, cysize);
+}
++
++/* Make the toolbar separators visible */
++toolbar.horizontal separator {
++ margin: 8px 3px;
++ min-width: 1px;
++ background-color: shade(@bg_color, 0.75);
++}
++
++/* Remove extra border in scrolled windows */
++scrolledwindow.frame {
++ border: 0px;
++}
++
++/* Remove extra border in textview */
++textview {
++ background-image: none;
++}
++
++/* Remove extra padding around scrollbars */
++scrollbar.vertical {
++ margin-left: -3px;
++}
++
++scrollbar.horizontal {
++ margin-top: -3px;
++}
++
++/* Make folderview and summaryview background white */
++box > box > paned > scrolledwindow,
++paned > box > notebook > stack > scrolledwindow {
++ background-color: white;
++}
++
++/* Shift folderview and summaryview vertical scrollbars up to
++ * fill the corner between the scrollbar and column headers */
++box > box > paned > scrolledwindow > scrollbar,
++paned > box > notebook > stack > scrolledwindow > scrollbar {
++ margin-top: -24px;
++}
++
++/* Make folderview and summaryview buttons closer together */
++box > box > paned > scrolledwindow button,
++paned > box > notebook > stack > scrolledwindow > widget > button {
++ margin-left: 0px;
++ margin-right: -1px;
++}
commit f6f1e38cd69657118b8287c87c72a52835be6929
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Jul 29 20:31:27 2021 -0700
consolidate claws theme patches
diff --git a/patches/gtk/50-win71-theme-prepare.sh b/patches/gtk/50-win71-theme-prepare.sh
index 82200a2..fe1337e 100755
--- a/patches/gtk/50-win71-theme-prepare.sh
+++ b/patches/gtk/50-win71-theme-prepare.sh
@@ -4,14 +4,12 @@
# Patches 51..57: Taken from Jamie Velasco / https://gitlab.gnome.org/GNOME/gtk/-/issues/687
# Original numbering changed from 0001..0007 to 51..57
-# Patches 61..66: Added by Thorsten Maerz for Claws-Mail
+# Further patches added by Thorsten Maerz for Claws-Mail
# These patches are meant to directly modify the compiled-in win32 theme
# To keep gtk unchanged, the original files are backed up first.
-# 69-win71-theme-finalize.patch copies the modified files to a new location,
+# The finalize.patch copies the modified files to a new location,
# adds a settings file and finally restores the old directory before build.
-WIN32_THEME_NAME=win32
-WIN32_THEME_DIR=gtk/theme/${WIN32_THEME_NAME}
-
-cp -a ${WIN32_THEME_DIR} ${WIN32_THEME_DIR}.org
+cd gtk/theme || exit 1
+cp -a win32 win32.bak || exit 1
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
new file mode 100644
index 0000000..52315ed
--- /dev/null
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -0,0 +1,68 @@
+--- a/gtk/theme/win32/gtk.css 2021-07-29 19:54:57.943852906 -0700
++++ b/gtk/theme/win32/gtk.css 2021-07-29 20:10:14.150917901 -0700
+@@ -1,3 +1,9 @@
++/* win71 theme
++ * Based on (internal) win32 theme from gtk+
++ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
++ * Additional changes from Thorsten Maerz <info at netztorte.de>
++ */
++
+ @import url("gtk-win32-base.css");
+
+ /* Menus */
+@@ -133,8 +139,7 @@
+ margin: calc(0px - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder))
+ calc(0px - -gtk-win32-size(window, cxframe) - -gtk-win32-size(window, cxpaddedborder));
+ margin-bottom: 0px;
+- padding: calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))
+- calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder));
++ padding: 0px 4px; /* Titlebar took too much space */
+ padding-bottom: 0px;
+ background: -gtk-win32-theme-part(window, 1, 1);
+ min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
+@@ -272,3 +277,45 @@
+ .maximized .titlebar button.maximize:disabled {
+ background-image: -gtk-win32-theme-part(window, 21, 4);
+ }
++
++/* Draw missing arrows for submenu entries */
++menu menuitem arrow, .menu menuitem arrow {
++ min-width: 16px;
++ min-height: 16px;
++}
++
++menu menuitem arrow, .menu menuitem arrow {
++ margin-left: 10px;
++ -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
++}
++
++/* Draw missing separator between menu entries */
++menu separator {
++ padding: 0px;
++ background-color: shade(@bg_color, 0.75);
++}
++
++/* Draw native +/- expanders in treeview (instead of arrows) */
++treeview.view.expander:checked {
++ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 2);
++}
++
++treeview.view.expander {
++ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
++}
++
++/* Unfocused treeview selections are hardly visible on MSWin
++ * Use background color instead of light grey (e.g. selected folder
++ * should stay visible, even when focus is changed to a different
++ * widget, e.g. a file selection widget for that folder).
++ * This isn't native MSWin behaviour, but rather resembles the
++ * behaviour of Posix based applications. */
++treeview.view:selected {
++ background-color: @selected_bg_color;
++}
++
++/* Combobox had too little height */
++combobox {
++ margin-top: 1px;
++ min-height: -gtk-win32-size(combobox, cysize);
++}
diff --git a/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch b/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
deleted file mode 100644
index 3439654..0000000
--- a/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Draw missing arrows for submenu entries
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -83,6 +83,16 @@
- border-width: 0;
- }
-
-+menu menuitem arrow, .menu menuitem arrow {
-+ min-width: 16px;
-+ min-height: 16px;
-+}
-+
-+menu menuitem arrow, .menu menuitem arrow {
-+ margin-left: 10px;
-+ -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
-+}
-+
- /* Listbox */
-
- /* We're cheating here, using part 6 (listview header group),
diff --git a/patches/gtk/62-win32-theme-Draw-menu-separator.patch b/patches/gtk/62-win32-theme-Draw-menu-separator.patch
deleted file mode 100644
index ba6fc95..0000000
--- a/patches/gtk/62-win32-theme-Draw-menu-separator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Draw missing separator between menu entries
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -93,6 +93,11 @@
- -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
- }
-
-+menu separator {
-+ padding: 0px;
-+ background-color: shade(@bg_color, 0.75);
-+}
-+
- /* Listbox */
-
- /* We're cheating here, using part 6 (listview header group),
diff --git a/patches/gtk/63-win32-theme-Native-treeview-expander.patch b/patches/gtk/63-win32-theme-Native-treeview-expander.patch
deleted file mode 100644
index 7caf9e9..0000000
--- a/patches/gtk/63-win32-theme-Native-treeview-expander.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Draw native +/- expanders in treeview (instead of arrows)
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -287,3 +287,11 @@
- .maximized .titlebar button.maximize:disabled {
- background-image: -gtk-win32-theme-part(window, 21, 4);
- }
-+
-+treeview.view.expander:checked {
-+ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 2);
-+}
-+
-+treeview.view.expander {
-+ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
-+}
diff --git a/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch b/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
deleted file mode 100644
index cf0e4cf..0000000
--- a/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Titlebar took too much space
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -148,8 +148,7 @@
- margin: calc(0px - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder))
- calc(0px - -gtk-win32-size(window, cxframe) - -gtk-win32-size(window, cxpaddedborder));
- margin-bottom: 0px;
-- padding: calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))
-- calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder));
-+ padding: 0px 4px;
- padding-bottom: 0px;
- background: -gtk-win32-theme-part(window, 1, 1);
- min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
diff --git a/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch b/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
deleted file mode 100644
index 6ebc701..0000000
--- a/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Unfocused treeview selections are hardly visible on MSWin
-Use background color instead of light grey (e.g. selected folder
-should stay visible, even when focus is changed to a different
-widget, e.g. a file selection widget for that folder).
-This isn't native MSWin behaviour, but rather resembles the
-behaviour of Posix based applications.
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -294,3 +294,7 @@
- treeview.view.expander {
- -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
- }
-+
-+treeview.view:selected {
-+ background-color: @selected_bg_color;
-+}
diff --git a/patches/gtk/66-win32-theme-Native-combobox-height.patch b/patches/gtk/66-win32-theme-Native-combobox-height.patch
deleted file mode 100644
index e253acb..0000000
--- a/patches/gtk/66-win32-theme-Native-combobox-height.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Combobox had too little height
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
---- a/gtk/theme/win32/gtk-win32-base.css
-+++ b/gtk/theme/win32/gtk-win32-base.css
-@@ -965,6 +965,10 @@
-
- /* Combobox */
-
-+combobox {
-+ margin-top: 1px;
-+ min-height: -gtk-win32-size(combobox, cysize);
-+}
- combobox entry {
- margin-right: calc( -2ex - -gtk-win32-part-width(combobox, 6, 1));
- background-image: -gtk-win32-theme-part(combobox, 4, 1);
diff --git a/patches/gtk/67-win32-theme-Credits.patch b/patches/gtk/67-win32-theme-Credits.patch
deleted file mode 100644
index 55f24f0..0000000
--- a/patches/gtk/67-win32-theme-Credits.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -1,3 +1,21 @@
-+/* win71 theme
-+ * Based on (internal) win32 theme from gtk+-3.24.26 source
-+ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
-+ * Additional changes from Thorsten Maerz <info at netztorte.de>
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/61-win32-theme-Draw-submenu-arrow.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/62-win32-theme-Draw-menu-separator.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/63-win32-theme-Native-treeview-expander.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/64-win32-theme-Reduce-titlebar-headroom.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/65-win32-theme-Visible-treeview-inactive-selection.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/66-win32-theme-Credits.patch
-+ */
-+
- @import url("gtk-win32-base.css");
-
- /* Menus */
-diff -u a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
---- a/gtk/theme/win32/gtk-win32-base.css
-+++ b/gtk/theme/win32/gtk-win32-base.css
-@@ -1,3 +1,21 @@
-+/* win71 theme
-+ * Based on (internal) win32 theme from gtk+-3.24.26 source
-+ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
-+ * Additional changes from Thorsten Maerz <info at netztorte.de>
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/61-win32-theme-Draw-submenu-arrow.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/62-win32-theme-Draw-menu-separator.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/63-win32-theme-Native-treeview-expander.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/64-win32-theme-Reduce-titlebar-headroom.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/65-win32-theme-Visible-treeview-inactive-selection.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/66-win32-theme-Credits.patch
-+ */
-+
- @define-color bg_color -gtk-win32-color(button, btnface);
- @define-color text_color -gtk-win32-color(button, btntext);
- @define-color selected_bg_color -gtk-win32-color(button, highlight);
diff --git a/patches/gtk/69-win71-theme-finalize.sh b/patches/gtk/69-win71-theme-finalize.sh
index fe69c5e..ba21182 100755
--- a/patches/gtk/69-win71-theme-finalize.sh
+++ b/patches/gtk/69-win71-theme-finalize.sh
@@ -3,19 +3,15 @@
# 69-win71-theme-finalize.patch
# Restore files backed up by 50-win71-theme-prepare.patch
-WIN32_THEME_NAME=win32
-WIN32_THEME_DIR=gtk/theme/${WIN32_THEME_NAME}
-CLAWS_THEME_NAME=win71
-CLAWS_THEME_DIR=gtk/theme/claws
+cd gtk/theme || exit 1
-mkdir ${CLAWS_THEME_DIR}
-mv ${WIN32_THEME_DIR} ${CLAWS_THEME_DIR}/
-mv ${WIN32_THEME_DIR}.org ${WIN32_THEME_DIR}
-mv ${CLAWS_THEME_DIR}/${WIN32_THEME_NAME} ${CLAWS_THEME_DIR}/${CLAWS_THEME_NAME}
+mkdir claws || exit 1
+mv -n win32 claws/win71 || exit 1
+mv -n win32.bak win32 || exit 1
-cat << GTK_INI_EOF > ${CLAWS_THEME_DIR}/settings.ini
+cat << GTK_INI_EOF > claws/settings.ini
[Settings]
-gtk-theme-name=${CLAWS_THEME_NAME}
+gtk-theme-name=win71
gtk-auto-mnemonics=true
gtk-button-images=true
;gtk-application-prefer-dark-theme=1
commit d2eaa34f797d63f3104f626d6270bab27eea55da
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Jul 29 19:52:45 2021 -0700
Add patch to horizontally expand toolbars
diff --git a/patches/claws_mail/07-hexpand.patch b/patches/claws_mail/07-hexpand.patch
new file mode 100644
index 0000000..01a4371
--- /dev/null
+++ b/patches/claws_mail/07-hexpand.patch
@@ -0,0 +1,30 @@
+From 9674154cb67aa8c9fe672a285730233ab7df68d8 Mon Sep 17 00:00:00 2001
+From: Jonathan Boeing <jonathan at claws-mail.org>
+Date: Thu, 29 Jul 2021 17:26:33 -0700
+Subject: [PATCH] Set hexpand on toolbars
+
+Depending on the Windows version and theme, a non-horizontally expanded
+toolbar has a sharp visual discontinuity between the toolbar button
+backgrounds and the background next to the toolbar.
+
+Enabling horizontal expansion gives a seamless background across the width
+of the window.
+---
+ src/toolbar.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/toolbar.c b/src/toolbar.c
+index 682b7b964..c2fe7de0c 100644
+--- a/src/toolbar.c
++++ b/src/toolbar.c
+@@ -2262,6 +2262,7 @@ Toolbar *toolbar_create(ToolbarType type,
+
+ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
+ gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
++ gtk_widget_set_hexpand(toolbar, TRUE);
+
+ for (cur = toolbar_list; cur != NULL; cur = cur->next) {
+
+--
+2.20.1
+
commit af11845d7e5a9ca05146a3e2b33dc2720b0b4a39
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Wed Jul 28 20:02:07 2021 -0700
Add litehtml rendering patches
diff --git a/patches/claws_mail/06-litehtml.patch b/patches/claws_mail/06-litehtml.patch
new file mode 100644
index 0000000..04b2a2a
--- /dev/null
+++ b/patches/claws_mail/06-litehtml.patch
@@ -0,0 +1,672 @@
+# Commits 6fce79c9 -> 8eaf132b from claws.git
+
+diff --git a/src/plugins/litehtml_viewer/container_linux.cpp b/src/plugins/litehtml_viewer/container_linux.cpp
+index ac0f40e0e..4a455696f 100644
+--- a/src/plugins/litehtml_viewer/container_linux.cpp
++++ b/src/plugins/litehtml_viewer/container_linux.cpp
+@@ -127,21 +127,12 @@ void container_linux::draw_background( litehtml::uint_ptr hdc, const litehtml::b
+ litehtml::tstring url;
+ make_url(bg.image.c_str(), bg.baseurl.c_str(), url);
+
+- const image *img_i = NULL;
+-
+ lock_images_cache();
+
+- for (auto ii = m_images.cbegin(); ii != m_images.cend(); ++ii) {
+- const image *i = &(*ii);
+- if (i->first == url) {
+- img_i = i;
+- break;
+- }
+- }
+-
+- if(img_i != NULL && img_i->second)
++ auto i = m_images.find(url);
++ if(i != m_images.end() && i->second.first)
+ {
+- GdkPixbuf *bgbmp = img_i->second;
++ GdkPixbuf *bgbmp = i->second.first;
+
+ GdkPixbuf *new_img;
+ if(bg.image_size.width != gdk_pixbuf_get_width(bgbmp) || bg.image_size.height != gdk_pixbuf_get_height(bgbmp))
+diff --git a/src/plugins/litehtml_viewer/container_linux.h b/src/plugins/litehtml_viewer/container_linux.h
+index f35ffeab1..05c66ce4f 100644
+--- a/src/plugins/litehtml_viewer/container_linux.h
++++ b/src/plugins/litehtml_viewer/container_linux.h
+@@ -20,6 +20,7 @@
+ #include <vector>
+ #include <list>
+ #include <string>
++#include <sys/time.h>
+
+ #include <cairo.h>
+ #include <gtk/gtk.h>
+@@ -54,8 +55,8 @@ struct cairo_clip_box
+
+ class container_linux : public litehtml::document_container
+ {
+- typedef std::pair<litehtml::tstring, GdkPixbuf*> image;
+- typedef std::list<image> images_map;
++ typedef std::pair<GdkPixbuf*, struct timeval> img_cache_entry;
++ typedef std::map<litehtml::tstring, img_cache_entry> images_map;
+
+ protected:
+ cairo_surface_t* m_temp_surface;
+@@ -92,10 +93,10 @@ public:
+
+ /* Trim down images cache to less than desired_size [bytes],
+ * starting from oldest stored. */
+- gint clear_images(gint desired_size);
++ gint clear_images(gsize desired_size);
+
+- void add_image_to_cache(const gchar *url, GdkPixbuf *image);
+- virtual void redraw(gboolean force_render) = 0;
++ void update_image_cache(const gchar *url, GdkPixbuf *image);
++ virtual void rerender() = 0;
+ virtual GdkPixbuf *get_local_image(const litehtml::tstring url) const = 0;
+
+ protected:
+diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
+index 5ef7c0ced..1e0d70f83 100644
+--- a/src/plugins/litehtml_viewer/container_linux_images.cpp
++++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
+@@ -20,12 +20,15 @@
+ #include "claws-features.h"
+ #endif
+
++#include <set>
+ #include "common/utils.h"
+
+ #include "container_linux.h"
+ #include "http.h"
+ #include "lh_prefs.h"
+
++typedef std::pair<litehtml::tstring, struct timeval> lru_entry;
++
+ static GdkPixbuf *lh_get_image(const litehtml::tchar_t* url)
+ {
+ GError *error = NULL;
+@@ -37,8 +40,8 @@ static GdkPixbuf *lh_get_image(const litehtml::tchar_t* url)
+
+ if (error || !image) {
+ if (error) {
+- g_warning("lh_get_image: Could not create pixbuf %s",
+- error->message);
++ g_warning("lh_get_image: Could not create pixbuf for '%s': %s",
++ url, error->message);
+ g_clear_error(&error);
+ }
+ goto theend;
+@@ -46,8 +49,8 @@ static GdkPixbuf *lh_get_image(const litehtml::tchar_t* url)
+
+ pixbuf = gdk_pixbuf_new_from_stream(image, NULL, &error);
+ if (error) {
+- g_warning("lh_get_image: Could not create pixbuf %s",
+- error->message);
++ g_warning("lh_get_image: Could not create pixbuf for '%s': %s",
++ url, error->message);
+ pixbuf = NULL;
+ g_clear_error(&error);
+ }
+@@ -80,10 +83,8 @@ static void get_image_callback(GObject *source, GAsyncResult *res, gpointer user
+
+ pixbuf = GDK_PIXBUF(g_task_propagate_pointer(G_TASK(res), NULL));
+
+- if (pixbuf != NULL) {
+- ctx->container->add_image_to_cache(ctx->url, pixbuf);
+- ctx->container->redraw(true);
+- }
++ ctx->container->update_image_cache(ctx->url, pixbuf);
++ ctx->container->rerender();
+
+ g_free(ctx->url);
+ g_free(ctx);
+@@ -93,33 +94,36 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
+ {
+ litehtml::tstring url;
+ make_url(src, baseurl, url);
+- bool found = false;
+-
+- lock_images_cache();
++ bool request = false;
++ struct timeval last;
+
+- for (auto ii = m_images.cbegin(); ii != m_images.cend(); ++ii) {
+- const image *i = &(*ii);
++ gettimeofday(&last, NULL);
+
+- if (!strcmp(i->first.c_str(), url.c_str())) {
+- found = true;
+- break;
+- }
+- }
+-
+- unlock_images_cache();
+-
+- if (!found) {
+- struct FetchCtx *ctx;
++ lock_images_cache();
+
++ auto i = m_images.find(url);
++ if(i == m_images.end()) {
+ /* Attached images can be loaded into cache right here. */
+ if (!strncmp(src, "cid:", 4)) {
+ GdkPixbuf *pixbuf = get_local_image(src);
+
+ if (pixbuf != NULL)
+- add_image_to_cache(src, pixbuf);
++ m_images.insert(std::make_pair(src, std::make_pair(pixbuf, last)));
+
+ return;
++ } else {
++ request = true;
++ m_images.insert(std::make_pair(url, std::make_pair((GdkPixbuf *)NULL, last)));
+ }
++ } else {
++ debug_print("found image cache entry: %p '%s'\n", i->second.first, url.c_str());
++ i->second.second = last;
++ }
++
++ unlock_images_cache();
++
++ if (request) {
++ struct FetchCtx *ctx;
+
+ if (!lh_prefs_get()->enable_remote_content) {
+ debug_print("blocking download of image from '%s'\n", src);
+@@ -132,11 +136,9 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
+ ctx->url = g_strdup(url.c_str());
+ ctx->container = this;
+
+- GTask *task = g_task_new(this, NULL, get_image_callback, ctx);
++ GTask *task = g_task_new(NULL, NULL, get_image_callback, ctx);
+ g_task_set_task_data(task, ctx, NULL);
+ g_task_run_in_thread(task, get_image_threaded);
+- } else {
+- debug_print("found image in cache: '%s'\n", url.c_str());
+ }
+ }
+
+@@ -144,43 +146,54 @@ void container_linux::get_image_size( const litehtml::tchar_t* src, const liteht
+ {
+ litehtml::tstring url;
+ make_url(src, baseurl, url);
+- bool found = false;
+- const image *img = NULL;
++ const GdkPixbuf *img = NULL;
+
+ lock_images_cache();
+
+- for (auto ii = m_images.cbegin(); ii != m_images.cend(); ++ii) {
+- const image *i = &(*ii);
+- if (i->first == url) {
+- img = i;
+- found = true;
+- break;
+- }
+- }
+-
+- if(img != NULL)
+- {
+- sz.width = gdk_pixbuf_get_width(img->second);
+- sz.height = gdk_pixbuf_get_height(img->second);
+- } else
+- {
+- sz.width = 0;
+- sz.height = 0;
++ auto i = m_images.find(url);
++ if (i != m_images.end() && i->second.first) {
++ img = i->second.first;
++ sz.width = gdk_pixbuf_get_width(img);
++ sz.height = gdk_pixbuf_get_height(img);
++ } else {
++ sz.width = 0;
++ sz.height = 0;
+ }
+
+ unlock_images_cache();
+ }
+
+-void container_linux::add_image_to_cache(const gchar *url, GdkPixbuf *image)
++void container_linux::update_image_cache(const gchar *url, GdkPixbuf *image)
+ {
+ g_return_if_fail(url != NULL);
+- g_return_if_fail(image != NULL);
+
+- debug_print("adding image to cache: '%s'\n", url);
++ debug_print("updating image cache: %p '%s'\n", image, url);
+ lock_images_cache();
+- m_images.push_back(std::make_pair(url, image));
++ auto i = m_images.find(url);
++ if(i == m_images.end()) {
++ g_warning("image '%s' was not found in pixbuf cache\n", url);
++ unlock_images_cache();
++ return;
++ }
++
++ if(i->second.first != NULL && i->second.first != image) {
++ g_warning("pixbuf pointer for image '%s' changed\n", url);
++ g_object_unref(i->second.first);
++ }
++
++ if(image == NULL) {
++ /* A null pixbuf pointer presumably means the download failed,
++ * so remove the cache entry to allow for future retries. */
++ debug_print("warning - new pixbuf for '%s' is null\n", url);
++ m_images.erase(i);
++ unlock_images_cache();
++ return;
++ }
++
++ i->second.first = image;
+ unlock_images_cache();
+ }
++
+ void container_linux::lock_images_cache(void)
+ {
+ g_rec_mutex_lock(&m_images_lock);
+@@ -196,10 +209,8 @@ void container_linux::clear_images()
+ lock_images_cache();
+
+ for(auto i = m_images.begin(); i != m_images.end(); ++i) {
+- image *img = &(*i);
+-
+- if (img->second) {
+- g_object_unref(img->second);
++ if (i->second.first) {
++ g_object_unref(i->second.first);
+ }
+ }
+
+@@ -208,54 +219,71 @@ void container_linux::clear_images()
+ unlock_images_cache();
+ }
+
+-gint container_linux::clear_images(gint desired_size)
++gint container_linux::clear_images(gsize desired_size)
+ {
+- gint size = 0;
++ gsize size = 0;
+ gint num = 0;
+
+ lock_images_cache();
+
+- /* First, remove all local images - the ones with "cid:"
+- * URL. We will remove their list elements later. */
+- for (auto i = m_images.rbegin(); i != m_images.rend(); ++i) {
+- image *img = &(*i);
+-
+- if (!strncmp(img->first.c_str(), "cid:", 4)) {
+- g_object_unref(img->second);
+- img->second = NULL;
++ /* First, remove all local images - the ones with "cid:" URL. */
++ for (auto i = m_images.begin(); i != m_images.end(); ++i) {
++ if (!strncmp(i->first.c_str(), "cid:", 4)) {
++ g_object_unref(i->second.first);
++ i = m_images.erase(i);
+ num++;
+ }
+ }
+
+- /* Now tally up size of all the stored GdkPixbufs and
+- * deallocate those which make the total size be above
+- * the desired_size limit. We will remove their list
+- * elements later. */
+- for (auto i = m_images.rbegin(); i != m_images.rend(); ++i) {
+- image *img = &(*i);
+- gint cursize;
++ /* Second, build an LRU list */
++ auto lru_comp_func = [](const lru_entry& l1, const lru_entry& l2) {
++ return timercmp(&l1.second, &l2.second, <);
++ };
++ std::set<lru_entry, decltype(lru_comp_func)> lru(lru_comp_func);
+
+- if (img->second == NULL)
++ for (auto i = m_images.begin(); i != m_images.end(); ++i) {
++ lru.insert(std::make_pair(i->first, i->second.second));
++ }
++
++ /*
++ for (auto l = lru.begin(); l != lru.end(); l++) {
++ debug_print("lru dump: %d %d %s\n", l->second.tv_sec, l->second.tv_usec, l->first.c_str());
++ }
++ */
++
++ /* Last, walk the LRU list and remove the oldest entries that push it over
++ * the desired size limit */
++ for (auto l = lru.rbegin(); l != lru.rend(); ++l) {
++ gsize cursize;
++
++ auto i = m_images.find(l->first);
++
++ if(i == m_images.end()) {
++ g_warning("failed to find '%s' in m_images\n", l->first.c_str());
+ continue;
++ }
+
+- cursize = gdk_pixbuf_get_byte_length(img->second);
++ if(i->second.first == NULL) {
++ /* This should mean that the download is still in progress */
++ debug_print("warning - trying to prune a null pixbuf for %s\n", i->first.c_str());
++ continue;
++ }
+
++ cursize = gdk_pixbuf_get_byte_length(i->second.first);
++ /*
++ debug_print("clear_images: desired_size %d - size %d - cursize %d - %d %d %s\n",
++ desired_size, size, cursize, l->second.tv_sec, l->second.tv_usec, l->first.c_str());
++ */
+ if (size + cursize > desired_size) {
+- g_object_unref(img->second);
+- img->second = NULL;
++ debug_print("pruning %s from image cache\n", i->first.c_str());
++ g_object_unref(i->second.first);
++ m_images.erase(i);
+ num++;
+ } else {
+ size += cursize;
+ }
+ }
+
+- /* Remove elements whose GdkPixbuf pointers point to NULL. */
+- m_images.remove_if([&](image _img) -> bool {
+- if (_img.second == NULL)
+- return true;
+- return false;
+- });
+-
+ unlock_images_cache();
+
+ return num;
+diff --git a/src/plugins/litehtml_viewer/http.cpp b/src/plugins/litehtml_viewer/http.cpp
+index f846aef8c..453a56c7b 100644
+--- a/src/plugins/litehtml_viewer/http.cpp
++++ b/src/plugins/litehtml_viewer/http.cpp
+@@ -33,15 +33,20 @@ struct Data {
+ };
+
+ static size_t write_data(char* ptr, size_t size, size_t nmemb, void* data_ptr) {
+- struct Data* data = (struct Data *) data_ptr;
+- size_t realsize = size * nmemb;
+-
+- g_memory_input_stream_add_data((GMemoryInputStream *)data->memory,
+- g_memdup(ptr, realsize), realsize,
+- g_free);
+- data->size += realsize;
++ struct Data* data = (struct Data *) data_ptr;
++ size_t realsize = size * nmemb;
++
++ g_memory_input_stream_add_data((GMemoryInputStream *)data->memory,
++#if !GLIB_CHECK_VERSION (2, 68, 0)
++ g_memdup(ptr, realsize),
++#else
++ g_memdup2(ptr, realsize),
++#endif
++ realsize,
++ g_free);
++ data->size += realsize;
+
+- return realsize;
++ return realsize;
+ }
+
+ http::http()
+diff --git a/src/plugins/litehtml_viewer/lh_widget.cpp b/src/plugins/litehtml_viewer/lh_widget.cpp
+index ae33dfb9e..7c73346c5 100644
+--- a/src/plugins/litehtml_viewer/lh_widget.cpp
++++ b/src/plugins/litehtml_viewer/lh_widget.cpp
+@@ -60,6 +60,9 @@ lh_widget::lh_widget()
+ {
+ GtkWidget *item;
+
++ m_force_render = false;
++ m_blank = false;
++
+ /* scrolled window */
+ m_scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(m_scrolled_window),
+@@ -193,11 +196,17 @@ void lh_widget::open_html(const gchar *contents)
+ adj = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(m_scrolled_window));
+ gtk_adjustment_set_value(adj, 0.0);
+- redraw(false);
++ m_blank = false;
+ }
+ lh_widget_statusbar_pop();
+ }
+
++void lh_widget::rerender()
++{
++ m_force_render = true;
++ gtk_widget_queue_draw(m_drawing_area);
++}
++
+ void lh_widget::draw(cairo_t *cr)
+ {
+ double x1, x2, y1, y2;
+@@ -220,7 +229,7 @@ void lh_widget::draw(cairo_t *cr)
+ m_html->draw((litehtml::uint_ptr)cr, 0, 0, &pos);
+ }
+
+-void lh_widget::redraw(gboolean force_render)
++void lh_widget::redraw()
+ {
+ GtkAllocation rect;
+ gint width;
+@@ -229,18 +238,16 @@ void lh_widget::redraw(gboolean force_render)
+ cairo_region_t *creg;
+ GdkDrawingContext *gdkctx;
+
+- paint_white();
+-
+ if (m_html == NULL)
+ return;
+
+ /* Get width of the viewport. */
+- gdkwin = gtk_viewport_get_view_window(GTK_VIEWPORT(m_viewport));
+- width = gdk_window_get_width(gdkwin);
+- m_height = gdk_window_get_height(gdkwin);
++ gtk_widget_get_allocation(GTK_WIDGET(m_viewport), &rect);
++ width = rect.width;
++ m_height = rect.height;
+
+ /* If the available width has changed, rerender the HTML content. */
+- if (m_rendered_width != width || force_render) {
++ if (m_rendered_width != width || std::atomic_exchange(&m_force_render, false)) {
+ debug_print("lh_widget::redraw: width changed: %d != %d\n",
+ m_rendered_width, width);
+
+@@ -268,12 +275,18 @@ void lh_widget::redraw(gboolean force_render)
+ g_warning("lh_widget::redraw: No GdkWindow to draw on!");
+ return;
+ }
+- creg = gdk_window_get_clip_region(gdkwin);
++ creg = cairo_region_create_rectangle(&rect);
+ gdkctx = gdk_window_begin_draw_frame(gdkwin, creg);
+ cr = gdk_drawing_context_get_cairo_context(gdkctx);
+ }
+
+- draw(cr);
++ if(!std::atomic_exchange(&m_blank, false)) {
++ draw(cr);
++ } else {
++ cairo_rectangle(cr, rect.x, rect.y, rect.width, rect.height);
++ cairo_set_source_rgb(cr, 255, 255, 255);
++ cairo_fill(cr);
++ }
+
+ /* Only destroy the used cairo context if we created it earlier. */
+ if (m_cairo_context == NULL) {
+@@ -282,40 +295,10 @@ void lh_widget::redraw(gboolean force_render)
+ }
+ }
+
+-void lh_widget::paint_white()
+-{
+- GdkWindow *gdkwin = gtk_widget_get_window(m_drawing_area);
+- cairo_region_t *creg;
+- cairo_t *cr;
+- GdkDrawingContext *gdkctx;
+-
+- if (gdkwin == NULL) {
+- g_warning("lh_widget::clear: No GdkWindow to draw on!");
+- return;
+- }
+-
+- creg = gdk_window_get_clip_region(gdkwin);
+- gdkctx = gdk_window_begin_draw_frame(gdkwin, creg);
+- cr = gdk_drawing_context_get_cairo_context(gdkctx);
+-
+- /* Paint white background. */
+- gint width, height;
+- width = gdk_window_get_width(gdkwin);
+- height = gdk_window_get_height(gdkwin);
+- cairo_rectangle(cr, 0, 0,
+- gdk_window_get_width(gdkwin),
+- gdk_window_get_height(gdkwin));
+- cairo_set_source_rgb(cr, 255, 255, 255);
+- cairo_fill(cr);
+-
+- gdk_window_end_draw_frame(gdkwin, gdkctx);
+- cairo_region_destroy(creg);
+-}
+-
+ void lh_widget::clear()
+ {
+ m_html = nullptr;
+- paint_white();
++ m_blank = true;
+ m_rendered_width = 0;
+ m_base_url.clear();
+ m_clicked_url.clear();
+@@ -324,7 +307,6 @@ void lh_widget::clear()
+ void lh_widget::set_cursor(const litehtml::tchar_t* cursor)
+ {
+ litehtml::element::ptr over_el = m_html->over_element();
+- gint x, y;
+
+ if (m_showing_url &&
+ (over_el == NULL || over_el != m_over_element)) {
+@@ -508,7 +490,7 @@ static gboolean draw_cb(GtkWidget *widget, cairo_t *cr,
+ {
+ lh_widget *w = (lh_widget *)user_data;
+ w->set_cairo_context(cr);
+- w->redraw(false);
++ w->redraw();
+ w->set_cairo_context(NULL);
+ return FALSE;
+ }
+@@ -520,13 +502,13 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
+ lh_widget *w = (lh_widget *)user_data;
+
+ if (w->m_html == NULL)
+- return false;
++ return FALSE;
+
+ //debug_print("lh_widget on_button_press_event\n");
+
+ if (event->type == GDK_2BUTTON_PRESS ||
+ event->type == GDK_3BUTTON_PRESS)
+- return true;
++ return TRUE;
+
+ /* Right-click */
+ if (event->button == 3) {
+@@ -535,7 +517,7 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
+ if (url != NULL)
+ w->popup_context_menu(url, event);
+
+- return true;
++ return TRUE;
+ }
+
+ if(w->m_html->on_lbutton_down((int) event->x, (int) event->y,
+@@ -546,7 +528,7 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
+ }
+ }
+
+- return true;
++ return TRUE;
+ }
+
+ static gboolean motion_notify_event(GtkWidget *widget, GdkEventButton *event,
+@@ -569,7 +551,7 @@ static gboolean motion_notify_event(GtkWidget *widget, GdkEventButton *event,
+ }
+ }
+
+- return true;
++ return TRUE;
+ }
+
+ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
+@@ -577,20 +559,19 @@ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
+ {
+ litehtml::position::vector redraw_boxes;
+ lh_widget *w = (lh_widget *)user_data;
+- GError* error = NULL;
+
+ if (w->m_html == NULL)
+- return false;
++ return FALSE;
+
+ //debug_print("lh_widget on_button_release_event\n");
+
+ if (event->type == GDK_2BUTTON_PRESS ||
+ event->type == GDK_3BUTTON_PRESS)
+- return true;
++ return TRUE;
+
+ /* Right-click */
+ if (event->button == 3)
+- return true;
++ return TRUE;
+
+ w->m_clicked_url.clear();
+
+@@ -609,7 +590,7 @@ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
+ open_uri(w->m_clicked_url.c_str(), prefs_common_get_uri_cmd());
+ }
+
+- return true;
++ return TRUE;
+ }
+
+ static void open_link_cb(GtkMenuItem *item, gpointer user_data)
+diff --git a/src/plugins/litehtml_viewer/lh_widget.h b/src/plugins/litehtml_viewer/lh_widget.h
+index 378d80a71..827fad49e 100644
+--- a/src/plugins/litehtml_viewer/lh_widget.h
++++ b/src/plugins/litehtml_viewer/lh_widget.h
+@@ -18,6 +18,7 @@
+ #include <gtk/gtk.h>
+ #include <glib.h>
+ #include <gio/gio.h>
++#include <atomic>
+
+ #include "procmime.h"
+
+@@ -54,7 +55,8 @@ class lh_widget : public container_linux
+ void draw_text(litehtml::uint_ptr hdc, const litehtml::tchar_t* text, litehtml::uint_ptr hFont, litehtml::web_color color, const litehtml::position& pos);
+
+ void draw(cairo_t *cr);
+- void redraw(gboolean force_render);
++ void rerender();
++ void redraw();
+ void open_html(const gchar *contents);
+ void clear();
+ void update_cursor(const litehtml::tchar_t* cursor);
+@@ -76,8 +78,6 @@ class lh_widget : public container_linux
+ litehtml::tstring m_base_url;
+
+ private:
+- void paint_white();
+-
+ gint m_rendered_width;
+ GtkWidget *m_drawing_area;
+ GtkWidget *m_scrolled_window;
+@@ -92,4 +92,6 @@ class lh_widget : public container_linux
+
+ litehtml::tchar_t *m_font_name;
+ int m_font_size;
++ std::atomic<bool> m_force_render;
++ std::atomic<bool> m_blank;
+ };
commit f8c40eca5b5c91dcb0fd9d01c4d2d12fa124690b
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Wed Jul 28 19:52:59 2021 -0700
Fix right scrollbar button
diff --git a/patches/gtk/04-scrollbar-button.patch b/patches/gtk/04-scrollbar-button.patch
new file mode 100644
index 0000000..1e724e6
--- /dev/null
+++ b/patches/gtk/04-scrollbar-button.patch
@@ -0,0 +1,17 @@
+# Fix off by one error on right scrollbar button
+
+--- a/gtk/theme/win32/gtk-win32-base.css 2021-07-27 20:41:30.602797036 -0700
++++ b/gtk/theme/win32/gtk-win32-base.css 2021-07-27 20:44:48.859483836 -0700
+@@ -609,10 +609,10 @@
+ background-image: -gtk-win32-theme-part(scrollbar, 1 , 14);
+ }
+ scrollbar.horizontal:hover button.down:active {
+-background-image: -gtk-win32-theme-part(scrollbar, 1 , 16);
++background-image: -gtk-win32-theme-part(scrollbar, 1 , 15);
+ }
+ scrollbar.horizontal:hover button.down:disabled {
+-background-image: -gtk-win32-theme-part(scrollbar, 1 , 17);
++background-image: -gtk-win32-theme-part(scrollbar, 1 , 16);
+ }
+
+ scrollbar trough {
commit 7470b310be8bb9b9b41b223cc03d58ae5eeecf52
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Wed Jul 28 19:51:38 2021 -0700
convert gtk3 patches
diff --git a/patches/gtk/01-theme.patch b/patches/gtk/01-theme.patch
old mode 100755
new mode 100644
index 22cf8f6..97ac52e
--- a/patches/gtk/01-theme.patch
+++ b/patches/gtk/01-theme.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
--- a/gtk/meson.build 2021-07-02 03:46:22.482498861 -0700
+++ b/gtk/meson.build 2021-07-02 03:49:19.252060379 -0700
@@ -1041,6 +1041,8 @@
diff --git a/patches/gtk/02-csd.patch b/patches/gtk/02-csd.patch
old mode 100755
new mode 100644
index 88a2700..c7c4c3a
--- a/patches/gtk/02-csd.patch
+++ b/patches/gtk/02-csd.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -f -p1 $* < $0
-exit $?
-
From 975e5ce8ac04632606917e321cddad4bcce31553 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph at gmail.com>
Date: Thu, 28 Sep 2017 12:02:03 +0200
diff --git a/patches/gtk/03-keyboard-hook.patch b/patches/gtk/03-keyboard-hook.patch
old mode 100755
new mode 100644
index fa0deb9..aebd160
--- a/patches/gtk/03-keyboard-hook.patch
+++ b/patches/gtk/03-keyboard-hook.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 0d860b1994961585b42ea2f25ab5bc8a0fb7331d Mon Sep 17 00:00:00 2001
From: Patrick Storz <eduard.braun2 at gmx.de>
Date: Sat, 29 Feb 2020 17:53:19 +0100
diff --git a/patches/gtk/50-win71-theme-prepare.patch b/patches/gtk/50-win71-theme-prepare.sh
similarity index 100%
rename from patches/gtk/50-win71-theme-prepare.patch
rename to patches/gtk/50-win71-theme-prepare.sh
diff --git a/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch b/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
old mode 100755
new mode 100644
index 0b90b93..35a60c3
--- a/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
+++ b/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 56ec8b1af54e43682fbe4c57a12b83de2f43e0af Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Thu, 20 Oct 2016 09:58:19 +0100
diff --git a/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch b/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
old mode 100755
new mode 100644
index e3a2f07..cd7e38a
--- a/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
+++ b/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 4627b31437db1b7d1b413bb6b9bd434e30c748d7 Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Thu, 20 Oct 2016 11:00:09 +0100
diff --git a/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch b/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
old mode 100755
new mode 100644
index 07a235f..13cdcf2
--- a/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
+++ b/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 39e3fcc4acfb049960eb16539535f3e8f7a44390 Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Fri, 21 Oct 2016 09:23:24 +0100
diff --git a/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch b/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
old mode 100755
new mode 100644
index 148fd93..0587fc8
--- a/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
+++ b/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 6441ce083826a8526bfd17d3807939e63f90ffba Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Fri, 21 Oct 2016 12:35:07 +0100
diff --git a/patches/gtk/55-win32-theme-make-separator-visible-again.patch b/patches/gtk/55-win32-theme-make-separator-visible-again.patch
old mode 100755
new mode 100644
index a4f8196..58f841c
--- a/patches/gtk/55-win32-theme-make-separator-visible-again.patch
+++ b/patches/gtk/55-win32-theme-make-separator-visible-again.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 33f0e49e56783712aa267b0b86a62ad6e6cb8f62 Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Tue, 25 Oct 2016 13:23:04 +0100
diff --git a/patches/gtk/57-win32-theme-Draw-expander-arrow.patch b/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
old mode 100755
new mode 100644
index ed151ad..9abbaa4
--- a/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
+++ b/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From be59f5bc95d9fd18fba250282021c96d2b9254f1 Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Mon, 31 Oct 2016 14:00:16 +0000
diff --git a/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch b/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
old mode 100755
new mode 100644
index 3894808..3439654
--- a/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
+++ b/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Draw missing arrows for submenu entries
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/62-win32-theme-Draw-menu-separator.patch b/patches/gtk/62-win32-theme-Draw-menu-separator.patch
old mode 100755
new mode 100644
index c8e9966..ba6fc95
--- a/patches/gtk/62-win32-theme-Draw-menu-separator.patch
+++ b/patches/gtk/62-win32-theme-Draw-menu-separator.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Draw missing separator between menu entries
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/63-win32-theme-Native-treeview-expander.patch b/patches/gtk/63-win32-theme-Native-treeview-expander.patch
old mode 100755
new mode 100644
index cd36b53..7caf9e9
--- a/patches/gtk/63-win32-theme-Native-treeview-expander.patch
+++ b/patches/gtk/63-win32-theme-Native-treeview-expander.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Draw native +/- expanders in treeview (instead of arrows)
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch b/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
old mode 100755
new mode 100644
index 114b3e0..cf0e4cf
--- a/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
+++ b/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Titlebar took too much space
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch b/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
old mode 100755
new mode 100644
index d358dd1..6ebc701
--- a/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
+++ b/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Unfocused treeview selections are hardly visible on MSWin
Use background color instead of light grey (e.g. selected folder
should stay visible, even when focus is changed to a different
diff --git a/patches/gtk/66-win32-theme-Native-combobox-height.patch b/patches/gtk/66-win32-theme-Native-combobox-height.patch
old mode 100755
new mode 100644
index 0aa2932..e253acb
--- a/patches/gtk/66-win32-theme-Native-combobox-height.patch
+++ b/patches/gtk/66-win32-theme-Native-combobox-height.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Combobox had too little height
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/67-win32-theme-Credits.patch b/patches/gtk/67-win32-theme-Credits.patch
old mode 100755
new mode 100644
index 84b9881..55f24f0
--- a/patches/gtk/67-win32-theme-Credits.patch
+++ b/patches/gtk/67-win32-theme-Credits.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
--- a/gtk/theme/win32/gtk.css
+++ b/gtk/theme/win32/gtk.css
diff --git a/patches/gtk/69-win71-theme-finalize.patch b/patches/gtk/69-win71-theme-finalize.sh
similarity index 100%
rename from patches/gtk/69-win71-theme-finalize.patch
rename to patches/gtk/69-win71-theme-finalize.sh
commit 74f9361a4dd2895a02cfca0587228d8ca9058154
Merge: 851a27b 8773971
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Thu Jul 29 01:12:42 2021 -0700
Merge branch 'master' into gtk3
diff --cc README
index b0ac7c0,0cce80d..a8d9df6
--- a/README
+++ b/README
@@@ -125,7 -123,8 +125,8 @@@ libgettextpo-de
meson
python3-distutils
wget
+ curl
-ruby
+gtk-3-examples
Building in a Docker container
@@@ -137,7 -136,7 +138,7 @@@ is sufficient
--------8<---------8<---------8<--------
FROM debian:buster
- RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils wget gtk-3-examples & apt-get clean
-RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils wget curl ruby & apt-get clean
++RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils wget curl gtk-3-examples & apt-get clean
--------8<---------8<---------8<--------
To build the image locally (run in the directory with Dockerfile
diff --cc packages/packages.current
index 0228ffa,9e9069b..754ac1c
--- a/packages/packages.current
+++ b/packages/packages.current
@@@ -1,81 -1,51 +1,54 @@@
# package name,version,type,url,sha256 hash,branch,ref
-claws_mail,3.18.0,file,https://www.claws-mail.org/releases/claws-mail-3.18.0.tar.xz,cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb,,
+claws_mail,4.0.0,file,https://www.claws-mail.org/releases/claws-mail-4.0.0.tar.xz,4af2bd26a5d91eacb2a9c09f67a6a46c2222b40817c1f525dc050bdc7b0ee475,,
++adwaita_icon_theme,3.38.0,file,https://download.gnome.org/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz,6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97,,
+ atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788,,
+ bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
+ bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
+ cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
+ certdata,20210506,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/4d343134c8a3a46520e41d31e7cb26f718d9daec/security/nss/lib/ckfw/builtins/certdata.txt,c8f6733d1ff4e6a4769c182971a1234f95ae079247a9c439a13423fe8ba5c24f,,
+ curl,7.78.0,file,https://curl.se/download/curl-7.78.0.tar.xz,be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5,,
+ cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
+ enchant,2.2.30,file,https://github.com/AbiWord/enchant/releases/download/v2.3.0/enchant-2.3.0.tar.gz,df68063b6c13b245fa7246b0e098a03e74f7a91c6d8947bc5c4f42ce55e2e41d,,
+ expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
+ fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
+ freetype,2.11.0,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.0.tar.xz,8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7,,
+ fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
+ gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
- libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
- libtasn1,4.17.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.17.0.tar.gz,ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5,,
- nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
-
- zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
-
-glib,2.66.8,file,https://download.gnome.org/sources/glib/2.66/glib-2.66.8.tar.xz,97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b,,
-glib_networking,2.66.0,file,https://download.gnome.org/sources/glib-networking/2.66/glib-networking-2.66.0.tar.xz,c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099,,
++glib,2.68.3,file,https://download.gnome.org/sources/glib/2.68/glib-2.68.3.tar.xz,e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138,,
++glib_networking,2.68.1,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.1.tar.xz,d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
-
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
-
- p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
-
- expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
-
- libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
- regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
- bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
- ytnef,1.9.3,file,https://www.claws-mail.org/win32/ytnef-1.9.3.tar.gz,41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f,,
- cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
-
- jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
-
- curl,7.77.0,file,https://curl.se/download/curl-7.77.0.tar.xz,0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b,,
-
- libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
- libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
-
- enchant,2.2.15,file,https://github.com/AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz,3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03,,
+ gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
-gtk,2.24.33,file,https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.tar.xz,ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da,,
++gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz,f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa,,
+ gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
+ harfbuzz,2.8.2,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.8.2/harfbuzz-2.8.2.tar.xz,d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
-
- sqlite,3.35.5,file,https://sqlite.org/2021/sqlite-autoconf-3350500.tar.gz,f52b72a5c319c3e516ed7a92e123139a6e87af08a2dc43d7757724f6132e6db0,,
-
- libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
-
- glib,2.68.3,file,https://download.gnome.org/sources/glib/2.68/glib-2.68.3.tar.xz,e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138,,
+ icu4c,58.3,file,https://github.com/unicode-org/icu/releases/download/release-58-3/icu4c-58_3-src.tgz,2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c,,
+ jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
+ libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
+libepoxy,1.5.8,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.8.tar.xz,cf05e4901778c434aef68bb7dc01bea2bce15440c0cecb777fb446f04db6fe0d,,
- adwaita_icon_theme,3.38.0,file,https://download.gnome.org/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz,6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97,,
- gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz,f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa,,
- gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
- pango,1.48.5,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.5.tar.xz,501e74496173c02dcd024ded7fbb3f09efd37e2a488e248aa40799424dbb3b2a,,
- atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788,,
- glib_networking,2.68.1,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.1.tar.xz,d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30,,
+ libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
+ libffi,3.4.2,file,https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz,540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620,,
+ libgpg_error,1.42,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2,fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23,,
+ libical,3.0.10,file,https://github.com/libical/libical/releases/download/v3.0.10/libical-3.0.10.tar.gz,f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4,,
+ libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
+ libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
+ libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
libsoup,2.72.0,file,https://download.gnome.org/sources/libsoup/2.72/libsoup-2.72.0.tar.xz,170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387,,
-
- fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
-
- harfbuzz,2.8.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.8.1/harfbuzz-2.8.1.tar.xz,4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300,,
-
- cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
+ libtasn1,4.17.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.17.0.tar.gz,ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5,,
+ libwebp,1.2.0,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz,2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c,,
+ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
+ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
+ nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
++p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
+ pango,1.48.7,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.7.tar.xz,28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-
- freetype,2.10.4,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz,86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784,,
-
- fontconfig,2.13.93,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.93.tar.xz,ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0,,
-
- libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
-
- libffi,3.3,file,https://mirrors.kernel.org/sourceware/libffi/libffi-3.3.tar.gz,72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056,,
-
+ regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
+ sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
w32pth,2.0.5,file,ftp://ftp.g10code.com/g10code/w32pth/w32pth-2.0.5.tar.bz2,5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06,,
-
- bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
-
- libgpg_error,1.42,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2,fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23,,
- libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
- gpgme,1.15.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.15.1.tar.bz2,eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad,,
-
- libwebp,1.2.0,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz,2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c,,
-
- icu4c,58.3,file,https://github.com/unicode-org/icu/releases/download/release-58-3/icu4c-58_3-src.tgz,2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c,,
-
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
-
- libical,3.0.10,file,https://github.com/libical/libical/releases/download/v3.0.10/libical-3.0.10.tar.gz,f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4,,
-
- gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
+ ytnef,1.9.3,file,https://www.claws-mail.org/win32/ytnef-1.9.3.tar.gz,41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f,,
+ zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
diff --cc po/ar.po
index 32722cd,bd93ae8..dd13cf2
--- a/po/ar.po
+++ b/po/ar.po
@@@ -28,8 -28,8 +28,10 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"åÐå ÇáÈÑãÌíÉ ãÑÎÕÉ ÈÑÎÕÉ Ìäæ ÇáÚãæãíÉ ÇáÚÇãÉ (GPL) æÇáÊí ÊãäÍß ÍÑíÉ ãÔÇÑßÉ "
--"æÊÚÏíá ÇáÈÑãÌíÇÊ ÇáÍÑÉ."
++"��� �������� ����� ����� ��� "
++"�������� ������ (GPL) ����� ���ï¿"
++"½ï¿½ ���� ������ ������ ������ï¿"
++"½ï¿½ï¿½ �����."
msgctxt "T_GPLShort"
msgid ""
@@@ -37,42 -37,42 +39,48 @@@
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"ÈÇÎÊÕÇÑ: ÊÓÊØíÚ ÊÔÛíá åÐå ÇáÈÑãÌíÉ áÃí ÛÑÖ. æíãßäß ÊæÒíÚåÇ ãÇ ÏãÊ ÊÚØí "
--"ÇáãÊáÞíä äÝÓ ÇáÍÞæÞ ÇáÊí ÍÕáÊ ÚáíåÇ."
++"�������: ������ ����� ��� ��ï¿"
++"½ï¿½ï¿½ï¿½ï¿½ï¿½ ��� ���. ������ ������ï¿"
++"½ �� ��� ���� �������� ��� ��ï¿"
++"½ï¿½ï¿½ï¿½ ���� ���� �����."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "ÎíÇÑÇÊ ÇáÊËÈíÊ"
++msgstr "������ �������"
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "æÕáÇÊ ÇáÈÏÁ"
++msgstr "����� �����"
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "ÇÎÊÑ Ãíä íÊÚíä ËÈíÊ ÇáæÕáÇÊ:"
++msgstr ""
++"���� ��� ����� ���� �������:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(ÝÞØ ÇáÈÑãÌíÇÊ ÓíÑÈØ ÅáíåÇ Ýí ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ.)"
++msgstr ""
++"(��� ��������� ����� ����� �ï¿"
++"½ ���� ����� ������.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "ÞÇÆãÉ ÇÈÏÃ"
++msgstr "����� ����"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
--msgstr "ÓØÍ ÇáãßÊÈ"
++msgstr "��� ������"
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ"
++msgstr "���� ����� ������"
#, fuzzy
msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
--msgstr "ÇäÞÑ åäÇ áÊÒæÑ ÕÝÍÉ ÇáãÔÑæÚ"
++msgstr ""
++"���� ��� ����� ���� �������"
msgctxt "T_FoundExisting"
msgid ""
@@@ -85,7 -85,7 +93,7 @@@ msgstr "
#, fuzzy
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "ãÑÍÈÇ Ýí ÊËÈíÊ Claws Mail"
++msgstr "����� �� ����� Claws Mail"
msgctxt "T_About"
msgid ""
@@@ -103,17 -103,17 +111,17 @@@ msgstr "
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "åÐå ÇáÅÕÏÇÑÉ ${VERSION} ãä Claws Mail"
++msgstr "��� �������� ${VERSION} �� Claws Mail"
#, fuzzy
msgctxt "T_AboutFileVersion"
msgid "File version ${PROD_VERSION}"
--msgstr "ÅÕÏÇÑÉ ÇáãáÝ ${PROD_VERSION}"
++msgstr "������ ����� ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"
++msgstr "����� ������� ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
@@@ -141,7 -141,7 +149,7 @@@ msgstr "
#, fuzzy
msgctxt "T_Menu_ClawsMail"
msgid "Run Claws Mail"
--msgstr "ÔÛá ÈÑãÌíÉ ÇáÈÑíÏ Claws"
++msgstr "��� ������ ������ Claws"
msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
@@@ -152,8 -152,8 +160,9 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "ÇáÅÕÏÇÑÉ $R1 ãËÈÊÉ ÈÇáÝÚá.\n"
--#~ "ÃÊÑíÏ ÇÓÊÈÏÇáåÇ ÈÇáÅÕÏÇÑÉ ${VERSION}¿"
++#~ "�������� $R1 ����� ������.\n"
++#~ "����� ��������� ��������� "
++#~ "${VERSION}�"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -162,10 -162,10 +171,12 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Êã ÊËÈíÊ ÅÕÏÇÑÉ ãä Gpg4Win Úáì åÐÇ ÇáäÙÇã ãä ÞÈá. áÇ ãÔÇßá Ýí ÇáÊËÈíÊ "
--#~ "æÇÓÊÈÏÇá Êáß ÇáÅÕÏÇÑÉ.\n"
++#~ "�� ����� ������ �� Gpg4Win ��� �ï¿"
++#~ "½ï¿½ ������ �� ���. �� ����� �� ï¿"
++#~ "½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ �������� ��� �����ï¿"
++#~ "½ï¿½ï¿½.\n"
#~ "\n"
--#~ "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Claws Mail¿"
++#~ "����� ������ ����� Claws Mail�"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -175,7 -175,7 +186,9 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Êã ÊËÈíÊ ÅÕÏÇÑÉ ãä Gpg4Win Úáì åÐÇ ÇáäÙÇã ãä ÞÈá. áÇ ãÔÇßá Ýí ÇáÊËÈíÊ "
--#~ "æÇÓÊÈÏÇá Êáß ÇáÅÕÏÇÑÉ.\n"
++#~ "�� ����� ������ �� Gpg4Win ��� �ï¿"
++#~ "½ï¿½ ������ �� ���. �� ����� �� ï¿"
++#~ "½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ �������� ��� �����ï¿"
++#~ "½ï¿½ï¿½.\n"
#~ "\n"
--#~ "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Claws Mail¿"
++#~ "����� ������ ����� Claws Mail�"
diff --cc po/cz.po
index 828ffc8,f5414b8..adf455f
--- a/po/cz.po
+++ b/po/cz.po
@@@ -28,7 -28,7 +28,7 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"ento program je licencovaný pod licencí GNU General Public License (GPL)."
++"ento program je licencovan� pod licenc� GNU General Public License (GPL)."
msgctxt "T_GPLShort"
msgid ""
@@@ -36,15 -36,15 +36,16 @@@
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"In aller Kürze: Sie haben das Recht, die Software zu jedem Zweck "
--"einzusetzen. Sie können die Software weitergeben, sofern Sie dem Empfänger "
--"dieselben Rechte einräumen, die auch Sie erhalten haben.Ve zkratce: mùžete "
--"spouštìt tentyo program pro jakýkoli úèrl. Mùžete distribuovat tento program "
--"se stejnými právy, které jste obdrželi."
++"In aller K�rze: Sie haben das Recht, die Software zu jedem Zweck "
++"einzusetzen. Sie k�nnen die Software weitergeben, sofern Sie dem "
++"Empf�nger dieselben Rechte einr�umen, die auch Sie erhalten haben.Ve "
++"zkratce: m��ete spou�t�t tentyo program pro jak�koli ��rl. "
++"M��ete distribuovat tento program se stejn�mi pr�vy, kter� jste "
++"obdr�eli."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "Možnosti instalace"
++msgstr "Mo�nosti instalace"
msgctxt "T_InstallOptLinks"
msgid "Start links"
@@@ -53,11 -53,11 +54,12 @@@ msgstr "Start odkazy
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Prosím vyberte, kam má Claws Mail nainstalovat odkazy:"
++msgstr "Pros�m vyberte, kam m� Claws Mail nainstalovat odkazy:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Jen odkazy progarmù budou vytvoøeny v panelu rychlého spuštìní.)"
++msgstr ""
++"(Jen odkazy progarm� budou vytvo�eny v panelu rychl�ho spu�t�n�.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
@@@ -69,12 -69,12 +71,12 @@@ msgstr "Plocha
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "Panel rychlého spuštìní"
++msgstr "Panel rychl�ho spu�t�n�"
#, fuzzy
msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
--msgstr "Kliknìte pro homepage projektu"
++msgstr "Klikn�te pro homepage projektu"
msgctxt "T_FoundExisting"
msgid ""
@@@ -87,7 -87,7 +89,7 @@@ msgstr "
#, fuzzy
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "Vítejte v instalaci programu Claws Mail"
++msgstr "V�tejte v instalaci programu Claws Mail"
msgctxt "T_About"
msgid ""
@@@ -115,7 -115,7 +117,7 @@@ msgstr "verze souboru ${PROD_VERSION}
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "datum vydání ${_BUILD_ISODATE}"
++msgstr "datum vyd�n� ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
@@@ -124,7 -124,7 +126,9 @@@ msgstr "
#, fuzzy
msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
--msgstr "Chcete nastavit Claws Mail jako váš pøednastavený poštovní program?"
++msgstr ""
++"Chcete nastavit Claws Mail jako v�� p�ednastaven� po�tovn� "
++"program?"
msgctxt "T_FoundGnupg"
msgid ""
@@@ -156,8 -156,8 +160,8 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "Verze $R1 byla nainstalována.\n"
--#~ "Chcete ji pøepsat verzí ${VERSION} reiben?"
++#~ "Verze $R1 byla nainstalov�na.\n"
++#~ "Chcete ji p�epsat verz� ${VERSION} reiben?"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -166,9 -166,9 +170,9 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Staší verze $R1 byla nainstalována. Dùraznì se doporuèuje odinstalovat "
--#~ "starší verzi pøed instalací nové verze.\n"
--#~ "Chcete pokraèovat v instalaci Claws Mail verze ${VERSION} ?"
++#~ "Sta�� verze $R1 byla nainstalov�na. D�razn� se doporu�uje "
++#~ "odinstalovat star�� verzi p�ed instalac� nov� verze.\n"
++#~ "Chcete pokra�ovat v instalaci Claws Mail verze ${VERSION} ?"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -178,7 -178,7 +182,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Jedna verze Gpg4Win již byla nainstalována. Nebude vadit, když se "
--#~ "nainstaluje a tudíž pøepíše touhle verzí.\n"
++#~ "Jedna verze Gpg4Win ji� byla nainstalov�na. Nebude vadit, kdy� se "
++#~ "nainstaluje a tud�� p�ep��e touhle verz�.\n"
#~ "\n"
--#~ "Chcete pokraèovat s instalací Claws Mail?"
++#~ "Chcete pokra�ovat s instalac� Claws Mail?"
diff --cc po/de.po
index 89cb221,1781cb6..bf486ea
--- a/po/de.po
+++ b/po/de.po
@@@ -33,9 -33,9 +33,9 @@@ msgid "
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"In aller Kürze: Sie haben das Recht, die Software zu jedem Zweck "
--"einzusetzen. Sie können die Software weitergeben, sofern Sie dem Empfänger "
--"dieselben Rechte einräumen, die auch Sie erhalten haben."
++"In aller K�rze: Sie haben das Recht, die Software zu jedem Zweck "
++"einzusetzen. Sie k�nnen die Software weitergeben, sofern Sie dem "
++"Empf�nger dieselben Rechte einr�umen, die auch Sie erhalten haben."
msgctxt "T_InstallOptions"
msgid "Install Options"
@@@ -48,20 -48,20 +48,21 @@@ msgstr "Startlinks
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Bitte wählen Sie, welche Verknüpfungen angelegt werden sollen:"
++msgstr "Bitte w�hlen Sie, welche Verkn�pfungen angelegt werden sollen:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
msgstr ""
--"(In der Schnellstartleiste werden nur Verknüpfungen für Programme angelegt.)"
++"(In der Schnellstartleiste werden nur Verkn�pfungen f�r Programme "
++"angelegt.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Startmenü"
++msgstr "Startmen�"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
--msgstr "Arbeitsfläche"
++msgstr "Arbeitsfl�che"
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
@@@ -120,7 -120,7 +121,7 @@@ msgstr "
#, fuzzy
msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
--msgstr "Möchten Sie Claws-Mail als Ihr E-Mail-Standardprogramm auswählen?"
++msgstr "M�chten Sie Claws-Mail als Ihr E-Mail-Standardprogramm ausw�hlen?"
msgctxt "T_FoundGnupg"
msgid ""
@@@ -153,10 -153,10 +154,10 @@@ msgstr "
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
#~ "Version $R1 ist hier bereits installiert.\n"
--#~ "Möchten Sie diese mit Version ${VERSION} überschreiben?\n"
++#~ "M�chten Sie diese mit Version ${VERSION} �berschreiben?\n"
#~ "\n"
--#~ "(Sie können in jedem Fall mit JA antworten, falls es sich um eine neuere "
--#~ "oder dieselbe Version handelt.)"
++#~ "(Sie k�nnen in jedem Fall mit JA antworten, falls es sich um eine "
++#~ "neuere oder dieselbe Version handelt.)"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -166,9 -166,9 +167,9 @@@
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
#~ "Eine alte Version $R1 ist hier bereits installiert. Es wird dringend "
--#~ "Empfohlen, bei einer großen Aktualisierung alte Versionen zu "
++#~ "Empfohlen, bei einer gro�en Aktualisierung alte Versionen zu "
#~ "deinstallieren.\n"
--#~ "Möchten Sie trotzdem fortfahren, Version ${VERSION} zu installieren?"
++#~ "M�chten Sie trotzdem fortfahren, Version ${VERSION} zu installieren?"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -179,6 -179,6 +180,6 @@@
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
#~ "Eine Version von Claws Mail ist hier bereits installiert. Es ist "
--#~ "problemlos möglich, die Installation fortzuführen.\n"
++#~ "problemlos m�glich, die Installation fortzuf�hren.\n"
#~ "\n"
--#~ "Möchten die die Installation von Claws Mail fortführen?"
++#~ "M�chten die die Installation von Claws Mail fortf�hren?"
diff --cc po/es.po
index e1687ca,97093dd..06f0412
--- a/po/es.po
+++ b/po/es.po
@@@ -25,7 -25,7 +25,7 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Este software está licenciado bajo los términos de la GNU General Public "
++"Este software est� licenciado bajo los t�rminos de la GNU General Public "
"License (GPL)."
msgctxt "T_GPLShort"
@@@ -34,30 -34,30 +34,31 @@@ msgid "
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"En resúmen: Se le permite ejecutar este software para cualquier propósito. "
--"Puede distribuirlo en tanto dé al receptor los mismos derechos que usted ha "
--"recibido."
++"En res�men: Se le permite ejecutar este software para cualquier "
++"prop�sito. Puede distribuirlo en tanto d� al receptor los mismos "
++"derechos que usted ha recibido."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "Opciones de instalación"
++msgstr "Opciones de instalaci�n"
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "Vínculos de inicio"
++msgstr "V�nculos de inicio"
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Por favor seleccione dónde debe Claws Mail instalar los vínculos:"
++msgstr "Por favor seleccione d�nde debe Claws Mail instalar los v�nculos:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Sólo las aplicaciones serán vinculadas en la barra de inicio rápido.)"
++msgstr ""
++"(S�lo las aplicaciones ser�n vinculadas en la barra de inicio r�pido.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Menú inicio"
++msgstr "Men� inicio"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
@@@ -65,7 -65,7 +66,7 @@@ msgstr "Escritorio
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "Barra de inicio rápido"
++msgstr "Barra de inicio r�pido"
#, fuzzy
msgctxt "T_MoreInfo"
@@@ -83,7 -83,7 +84,7 @@@ msgstr "
#, fuzzy
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "Bienvenido a la instalación de Claws Mail"
++msgstr "Bienvenido a la instalaci�n de Claws Mail"
msgctxt "T_About"
msgid ""
@@@ -101,17 -101,17 +102,17 @@@ msgstr "
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "Este es Claws Mail versión ${VERSION}"
++msgstr "Este es Claws Mail versi�n ${VERSION}"
#, fuzzy
msgctxt "T_AboutFileVersion"
msgid "File version ${PROD_VERSION}"
--msgstr "versión del archivo ${PROD_VERSION}"
++msgstr "versi�n del archivo ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "fecha de publicación ${_BUILD_ISODATE}"
++msgstr "fecha de publicaci�n ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
@@@ -150,8 -150,8 +151,8 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "La versión $R1 ya está instalada.\n"
--#~ "¿Desea sobreescribirla con la versión ${VERSION}?"
++#~ "La versi�n $R1 ya est� instalada.\n"
++#~ "�Desea sobreescribirla con la versi�n ${VERSION}?"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -160,10 -160,10 +161,10 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Una versión anterior 1.1.4 ya se encuentra instalada en este sistema. \n"
++#~ "Una versi�n anterior 1.1.4 ya se encuentra instalada en este sistema. \n"
#~ "Recomendamos muy especialmente desinstalar las versiones anteriores \n"
--#~ "cuando se trata de actualizaciones importantes. ¿Quiere continuar de \n"
--#~ "todas formas la instalación de Claws Mail 2.0.0?"
++#~ "cuando se trata de actualizaciones importantes. �Quiere continuar de \n"
++#~ "todas formas la instalaci�n de Claws Mail 2.0.0?"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -173,7 -173,7 +174,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Una versión de Gpg4Win ya se encuentra instalada en este sistema.No habrá "
--#~ "problema si instala y por ende, sobreescribe esta versión.\n"
++#~ "Una versi�n de Gpg4Win ya se encuentra instalada en este sistema.No "
++#~ "habr� problema si instala y por ende, sobreescribe esta versi�n.\n"
#~ "\n"
--#~ "¿Desea continuar con la instalación?"
++#~ "�Desea continuar con la instalaci�n?"
diff --cc po/fr.po
index 89ce85d,de07740..702d843
--- a/po/fr.po
+++ b/po/fr.po
@@@ -25,8 -25,8 +25,8 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Ce logiciel est publié selon les termes de la Licence publique générale GNU "
--"(GPL)."
++"Ce logiciel est publi� selon les termes de la Licence publique "
++"g�n�rale GNU (GPL)."
msgctxt "T_GPLShort"
msgid ""
@@@ -34,9 -34,9 +34,9 @@@
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"En bref : vous avez le droit d'utiliser ce logiciel à n'importe quelle fin. "
--"Vous pouvez le redistribuer pour autant que vous donniez aux destinataires "
--"les mêmes droits que ceux que vous avez."
++"En bref : vous avez le droit d'utiliser ce logiciel � n'importe quelle "
++"fin. Vous pouvez le redistribuer pour autant que vous donniez aux "
++"destinataires les m�mes droits que ceux que vous avez."
msgctxt "T_InstallOptions"
msgid "Install Options"
@@@ -44,20 -44,20 +44,21 @@@ msgstr "Options de l'installation
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "Liens de démarrage"
++msgstr "Liens de d�marrage"
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Veuillez choisir où Claws Mail doit installer des liens :"
++msgstr "Veuillez choisir o� Claws Mail doit installer des liens :"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Seuls les programmes seront intégrés à la barre de lancement rapide.)"
++msgstr ""
++"(Seuls les programmes seront int�gr�s � la barre de lancement rapide.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Menu Démarrer"
++msgstr "Menu D�marrer"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
@@@ -121,8 -121,8 +122,8 @@@ msgstr "
msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
msgstr ""
--"Voulez-vous faire de Claws Mail votre client de messagerie électronique par "
--"défaut ?"
++"Voulez-vous faire de Claws Mail votre client de messagerie �lectronique "
++"par d�faut ?"
msgctxt "T_FoundGnupg"
msgid ""
@@@ -138,7 -138,7 +139,7 @@@ msgstr "
#, fuzzy
msgctxt "T_Menu_Uninstall"
msgid "Uninstall"
--msgstr "Désinstaller"
++msgstr "D�sinstaller"
#, fuzzy
msgctxt "T_Menu_ClawsMail"
@@@ -154,7 -154,7 +155,7 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "La version $R1 est déjà installée.\n"
++#~ "La version $R1 est d�j� install�e.\n"
#~ "Voulez-vous la remplacer par la version ${VERSION} ?"
#, fuzzy
@@@ -164,10 -164,10 +165,10 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Une version ancienne $R1 est déjà installée. Il est fortement recommandé "
--#~ "de désinstaller les versions antérieures lors des mises à jour "
--#~ "importantes.\n"
--#~ "Souhaitez-vous tout de même pousuivre l'installation de Claws Mail "
++#~ "Une version ancienne $R1 est d�j� install�e. Il est fortement "
++#~ "recommand� de d�sinstaller les versions ant�rieures lors des mises "
++#~ "� jour importantes.\n"
++#~ "Souhaitez-vous tout de m�me pousuivre l'installation de Claws Mail "
#~ "${VERSION} ?"
#, fuzzy
@@@ -178,7 -178,7 +179,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Une version de Gpg4Win est déjà installée sur le système. Le remplacement "
--#~ "de cette version s'effectuera sans problème.\n"
++#~ "Une version de Gpg4Win est d�j� install�e sur le syst�me. Le "
++#~ "remplacement de cette version s'effectuera sans probl�me.\n"
#~ "\n"
#~ "Voulez-vous poursuivre l'installation de Claws Mail?"
diff --cc po/it.po
index 205d78f,111cea2..840d9ac
--- a/po/it.po
+++ b/po/it.po
@@@ -27,7 -27,7 +27,7 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Questo programma è fornito in accordo coi termini della GNU General Public "
++"Questo programma � fornito in accordo coi termini della GNU General Public "
"Licence (GPL)."
msgctxt "T_GPLShort"
@@@ -51,7 -51,7 +51,7 @@@ msgstr "Collegamento di avvio
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Prego, selezionare dove Claws Mail installerà il collegamento:"
++msgstr "Prego, selezionare dove Claws Mail installer� il collegamento:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
@@@ -103,7 -103,7 +103,7 @@@ msgstr "
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "Questa è la versione ${VERSION} di Claws Mail"
++msgstr "Questa � la versione ${VERSION} di Claws Mail"
#, fuzzy
msgctxt "T_AboutFileVersion"
@@@ -154,7 -154,7 +154,7 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "La versione $R1 è già stata installata. \n"
++#~ "La versione $R1 � gi� stata installata. \n"
#~ "Volete sovrascriverla con la versione ${VERSION}?"
#, fuzzy
@@@ -164,7 -164,7 +164,7 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Una vecchia versione $R1 è già stata installata. È raccomandato "
++#~ "Una vecchia versione $R1 � gi� stata installata. � raccomandato "
#~ "vivamente di disinstallare le versioni precedenti per gli aggiornamenti "
#~ "importanti. \n"
#~ "Volete comunque continuare ad installare Claws Mail $ {VERSIONE}?"
@@@ -177,7 -177,7 +177,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Nel sistema è già stata installata una versione di Gpg4Win. Si può "
++#~ "Nel sistema � gi� stata installata una versione di Gpg4Win. Si pu� "
#~ "installare e sovrascrive questa versione senza problemi.\n"
#~ "\n"
#~ "Volete continuare con l'installazione di Claws Mail?"
diff --cc po/pt.po
index 12eec5f,265723c..3461ed3
--- a/po/pt.po
+++ b/po/pt.po
@@@ -27,7 -27,7 +27,7 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Este software está licenciado sob os termos da GNU General Public License "
++"Este software est� licenciado sob os termos da GNU General Public License "
"(GPL)."
msgctxt "T_GPLShort"
@@@ -36,29 -36,29 +36,30 @@@ msgid "
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"Em suma: É permitido usar este software para quaisquer fins. Podes distribuí-"
--"lo desde que dês aos destinatários os mesmos direitos que recebeste."
++"Em suma: � permitido usar este software para quaisquer fins. Podes "
++"distribu�-lo desde que d�s aos destinat�rios os mesmos direitos que "
++"recebeste."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "Opções de instalação"
++msgstr "Op��es de instala��o"
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "Atalhos de início"
++msgstr "Atalhos de in�cio"
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Por favor selecciona onde o Claws Mail deverá instalar atalhos:"
++msgstr "Por favor selecciona onde o Claws Mail dever� instalar atalhos:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Apenas os programas terão atalhos na barra de início rápido.)"
++msgstr "(Apenas os programas ter�o atalhos na barra de in�cio r�pido.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Menu de Início"
++msgstr "Menu de In�cio"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
@@@ -66,7 -66,7 +67,7 @@@ msgstr "Ambiente de trabalho
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "Barra de Início Rápido"
++msgstr "Barra de In�cio R�pido"
#, fuzzy
msgctxt "T_MoreInfo"
@@@ -84,7 -84,7 +85,7 @@@ msgstr "
#, fuzzy
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "Bem-vindo à instalação do Claws Mail"
++msgstr "Bem-vindo � instala��o do Claws Mail"
msgctxt "T_About"
msgid ""
@@@ -102,17 -102,17 +103,17 @@@ msgstr "
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "Esta é a versão do Gpg4Win ${VERSION}"
++msgstr "Esta � a vers�o do Gpg4Win ${VERSION}"
#, fuzzy
msgctxt "T_AboutFileVersion"
msgid "File version ${PROD_VERSION}"
--msgstr "versão do ficheiro ${PROD_VERSION}"
++msgstr "vers�o do ficheiro ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "data de lançamento ${_BUILD_ISODATE}"
++msgstr "data de lan�amento ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
@@@ -153,8 -153,8 +154,8 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "A versão $R1 já está instalada.\n"
--#~ "Queres substituí-la com a versão ${VERSION}?"
++#~ "A vers�o $R1 j� est� instalada.\n"
++#~ "Queres substitu�-la com a vers�o ${VERSION}?"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -163,8 -163,8 +164,8 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Uma versão antiga $R1 já foi instalada. Recomenda-se vivamente "
--#~ "desinstalar versões anteriores em upgrades.\n"
++#~ "Uma vers�o antiga $R1 j� foi instalada. Recomenda-se vivamente "
++#~ "desinstalar vers�es anteriores em upgrades.\n"
#~ "Queres continuar a instalar o Claws Mail ${VERSION} mesmo assim?"
#, fuzzy
@@@ -175,7 -175,7 +176,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Uma versão do Gpg4Win já se encontra instalada neste sistema. Não existe "
--#~ "problema em instalar e daí substituir esta Versão.\n"
++#~ "Uma vers�o do Gpg4Win j� se encontra instalada neste sistema. N�o "
++#~ "existe problema em instalar e da� substituir esta Vers�o.\n"
#~ "\n"
#~ "Queres continuar a instalar o Gpg4Win?"
diff --cc po/ru.po
index 0eeb3f1,d33a529..9419b7f
--- a/po/ru.po
+++ b/po/ru.po
@@@ -26,9 -26,9 +26,13 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Èñïîëüçîâàíèå ýòîé ïðîãðàììû ðåãóëèðóåòñÿ ëèöåíçèåé GNU General Public "
--"License (GPL). Âû ìîæåòå ñâîáîäíî ðàñïðîñòðàíÿòü ýòó ïðîãðàììó è âíîñèòü â "
--"íåå èçìåíåíèÿ."
++"������������� ���� "
++"��������� ������������ "
++"��������� GNU General Public License (GPL). �� "
++"������ �������� "
++"�������������� ��� "
++"��������� � ������� � ��� "
++"���������."
msgctxt "T_GPLShort"
msgid ""
@@@ -36,41 -36,41 +40,52 @@@
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"Âêðàòöå: âû ìîæåòå èñïîëüçîâàòü ýòó ïðîãðàììó â ëþáûõ öåëÿõ. Âû ìîæåòå "
--"ðàñïðîñòðàíÿòü åå ïðè óñëîâèè, ÷òî íå áóäåòå îãðàíè÷èâàòü ïðàâà äðóãèõ "
--"ïîëüçîâàòåëåé ïðîãðàììû."
++"�������: �� ������ "
++"������������ ��� ��������� "
++"� ����� �����. �� ������ "
++"�������������� �� ��� "
++"�������, ��� �� ������ "
++"������������ ����� ������ "
++"������������� ���������."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "Ïàðàìåòðû Óñòàíîâêè"
++msgstr "��������� ���������"
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "ßðëûêè Claws Mail"
++msgstr "������ Claws Mail"
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Óêàæèòå, ãäå ñëåäóåò ñîçäàòü ÿðëûêè Claws Mail:"
++msgstr ""
++"�������, ��� ������� ������� "
++"������ Claws Mail:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Â ïàíåëè áûñòðîãî çàïóñêà áóäóò ññûëêè òîëüêî íà ïðîãðàììû)."
++msgstr ""
++"(� ������ �������� ������� "
++"����� ������ ������ �� "
++"���������)."
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Ìåíþ Ïóñê"
++msgstr "���� ����"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
--msgstr "Ðàáî÷èé Ñòîë"
++msgstr "������� ����"
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "Ïàíåëü Áûñòðîãî Çàïóñêà"
++msgstr "������ �������� �������"
msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
--msgstr "Îòêðûòü äîìàøíþþ ñòðàíèöó ïðîåêòà"
++msgstr ""
++"������� �������� �������� "
++"�������"
msgctxt "T_FoundExisting"
msgid ""
@@@ -82,7 -82,7 +97,9 @@@ msgstr "
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "Äîáðî ïîæàëîâàòü â ïðîãðàììó óñòàíîâêè ${PRETTY_PACKAGE}"
++msgstr ""
++"����� ���������� � "
++"��������� ��������� ${PRETTY_PACKAGE}"
msgctxt "T_About"
msgid ""
@@@ -96,39 -96,39 +113,50 @@@
"Robustness and stability.\r\n"
"It is Free Software, released under the GNU GPL v3 or later."
msgstr ""
--"Claws Mail - ýòî ïî÷òîâûé êëèåíò (è êëèåíò íîâîñòíûõ ëåíò), íà áàçå GTK+, ñî "
--"ñëåäóþùèìè îñîáåííîñòÿìè: \r\n"
--"Âîçìîæíîñòü áûñòðîãî îòâåòà\r\n"
--"Èçÿùíûé è èçîùðåííûé èíòåðôåéñ\r\n"
--"Èíòóèòèâíîå óïðàâëåíèå è ëåãêàÿ íàñòðîéêà\r\n"
--"Áîëüøîå êîëè÷åñòâî âîçìîæíîñòåé\r\n"
--"Ðàñøèðÿåìîñòü\r\n"
--"Íàäåæíîñòü è ñòàáèëüíîñòü ðàáîòû.\r\n"
--"Ýòî Áåñïëàòíîå Ïðîãðàììíîå îáåñïå÷åíèå, âûïóùåííîå ïîä ëèöåíçèåé GNU GPL v3 "
--"èëè áîëåå ïîçäíåé."
++"Claws Mail - ��� �������� ������ (� "
++"������ ��������� ����), �� "
++"���� GTK+, �� ���������� "
++"�������������: \r\n"
++"����������� �������� ������"
++"\r\n"
++"������� � ���������� "
++"���������\r\n"
++"����������� ���������� � "
++"������ ���������\r\n"
++"������� ���������� "
++"������������\r\n"
++"�������������\r\n"
++"���������� � ������������ "
++"������.\r\n"
++"��� ���������� ����������� "
++"�����������, ���������� ��� "
++"��������� GNU GPL v3 ��� ����� "
++"�������."
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "Ýòî Claws Mail âåðñèè ${VERSION}"
++msgstr "��� Claws Mail ������ ${VERSION}"
#, fuzzy
msgctxt "T_AboutFileVersion"
msgid "File version ${PROD_VERSION}"
--msgstr "âåðñèÿ ôàéëà ${PROD_VERSION}"
++msgstr "������ ����� ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "äàòà âûïóñêà ${_BUILD_ISODATE}"
++msgstr "���� ������� ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
--msgstr "Êëèåíò ïî óìîë÷àíèþ"
++msgstr "������ �� ���������"
msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
--msgstr "Õîòèòå èñïîëüçîâàòü Claws Mail ïðè îáðàùåíèè ê ññûëêàì 'mailto:'?"
++msgstr ""
++"������ ������������ Claws Mail ��� "
++"��������� � ������� 'mailto:'?"
#, fuzzy
msgctxt "T_FoundGnupg"
@@@ -141,36 -141,36 +169,47 @@@ msgid "
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
--"Áûë îáíàðóæåí óñòàíîâëåííûé ïàêåò GnuPG2 â ïàïêå óñòàíîâêè.\n"
--"Ïîæàëóéñòà, îáðàòèòå âíèìàíèå, óòèëèòû GnuPG è GPA áîëåå íå ïîñòàâëÿþòñÿ ñ "
--"Claws Mail. Âàì ñëåäóåò óäàëèòü òåêóùåþ âåðñèþ Claws Mail ñåé÷àñ, è, åñëè âû "
--"æåëàåòå èñïîëüçîâàòü óòèëèòû äàëüøå, óñòàíîâèòü èõ íîâûå âåðñèè ñ Gpg4win:\n"
++"��� ��������� "
++"������������� ����� GnuPG2 � "
++"����� ���������.\n"
++"����������, �������� "
++"��������, ������� GnuPG � GPA "
++"����� �� ������������ � Claws Mail. "
++"��� ������� ������� ������� "
++"������ Claws Mail ������, �, ���� �� "
++"������� ������������ "
++"������� ������, ���������� "
++"�� ����� ������ � Gpg4win:\n"
"http://www.gpg4win.org/\n"
"\n"
--"Åñëè âû ïðîäîëæèòå ñåé÷àñ, óòèëèòû áóäóò îñòàâëåíû íà äèñêå, è âàì ïðèäåòñÿ "
--"óäàëÿòü èõ âðó÷íóþ.\n"
++"���� �� ���������� ������, "
++"������� ����� ��������� �� "
++"�����, � ��� �������� "
++"������� �� �������.\n"
"\n"
--"Õîòèòå ïðîäîëæèòü óñòàíîâêó Claws Mail?"
++"������ ���������� "
++"��������� Claws Mail?"
msgctxt "T_Menu_Uninstall"
msgid "Uninstall"
--msgstr "Óäàëèòü"
++msgstr "�������"
msgctxt "T_Menu_ClawsMail"
msgid "Run Claws Mail"
--msgstr "Çàïóñòèòü Claws Mail"
++msgstr "��������� Claws Mail"
msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
--msgstr "Ñïðàâî÷íèê Claws Mail"
++msgstr "���������� Claws Mail"
#~ msgctxt "T_FoundExistingVersion"
#~ msgid ""
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "Âåðñèÿ $R1 óæå óñòàíîâëåíà.\n"
--#~ "Ïåðåçàïèñàòü å¸ âåðñèåé ${VERSION}?"
++#~ "������ $R1 ��� �����������.\n"
++#~ "������������ �� ������� "
++#~ "${VERSION}?"
#~ msgctxt "T_FoundExistingOldVersion"
#~ msgid ""
@@@ -178,9 -178,9 +217,14 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Ïðåäûäóùàÿ âåðñèÿ $R1 óæå óñòàíîâëåíà íà ýòîì êîìïüþòåðå. Íàñòîÿòåëüíî "
--#~ "ðåêîìåíäóåòñÿ óäàëèòü ïðåäûäóùóþ âåðñèþ ïåðåä óñòàíîâêîé íîâîé.\n"
--#~ "Âñå ðàâíî ïðîäîëæèòü óñòàíîâêó Claws Mail ${VERSION}?"
++#~ "���������� ������ $R1 ��� "
++#~ "����������� �� ���� "
++#~ "����������. ������������ "
++#~ "������������� ������� "
++#~ "���������� ������ ����� "
++#~ "���������� �����.\n"
++#~ "��� ����� ���������� "
++#~ "��������� Claws Mail ${VERSION}?"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -190,7 -190,7 +234,9 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Gpg4Win óæå óñòàíîâëåíà íà ýòîì êîìïüþòåðå. Äàëüíåéøàÿ óñòàíîâêà "
--#~ "ïåðåçàïèøåò ýòó âåðñèþ íîâîé.\n"
++#~ "Gpg4Win ��� ����������� �� ���� "
++#~ "����������. ���������� "
++#~ "��������� ����������� ��� "
++#~ "������ �����.\n"
#~ "\n"
--#~ "Ïðîäîëæèòü óñòàíîâêó Gpg4Win?"
++#~ "���������� ��������� Gpg4Win?"
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list