Release v1.4.18

6 files changed, 19 insertions, 60 deletions

diff --git a/.gitignore b/.gitignore
index cb07cc837..17d0954bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,8 @@
-*.a
-*.glade#
-*.gmo
-*.la
-*.lo
-*.mo
-*.o
-*.pc
-*.so
-*.swp
-*.kate-swp
-*.tar.gz
-po/stamp-it
 *~
-.clang-format
-.cproject
-.deps
-.intltool-merge-cache
-.libs
-.project
-.settings
-CMakeFiles
-CMakeCache.txt
-Makefile
-Makefile.in
-_configs.sed
-aclocal.m4
-autom4te.cache
 build
-buildflags.h
-/build-ubuntu
-cmake_install.cmake
-cmake_uninstall.cmake
-config.guess
-config.h
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-install_manifest.txt
-libtool
-ltmain.sh
-missing
-release
-rfbint.h
-stamp-h1
+builddir
 tags
-nbproject
-
-plugins/libvncserver/rfb/rfbconfig.h
-plugins/telepathy/org.freedesktop.Telepathy.Client.Remmina.service
 data/desktop/org.remmina.Remmina.desktop
-data/desktop/remmina-file.desktop
-data/desktop/remmina-file-wrapper
-src/remmina
-src/remmina
 
 *.snap
 parts
@@ -69,5 +16,4 @@ snap/gui
 flatpak/appdir/
 flatpak/repo/
 
-
 compile_commands.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 142535808..8b46364c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,17 @@
-## v1.4.16
+## v1.4.18
+[full changelog](https://gitlab.com/Remmina/Remmina/compare/v1.4.17...v1.4.18)
+
+* [SNAP] Removing unsupported architectures [!2268](https://gitlab.com/Remmina/Remmina/merge_requests/2268) *@antenore*
+* Try more shells as launcher if default isn't found [!2269](https://gitlab.com/Remmina/Remmina/merge_requests/2269) *@cirelli94*
+* Minor fixes for v1.4.17 [!2270](https://gitlab.com/Remmina/Remmina/merge_requests/2270) *@antenore*
+* SSH session improvements [!2271](https://gitlab.com/Remmina/Remmina/merge_requests/2271) *@antenore*
+* Fixes - Auto-start file created on tray icon disabled [!2272](https://gitlab.com/Remmina/Remmina/merge_requests/2272) *@antenore*
+* RDP: Remove older usage of ClientHostname *@giox069*
+* Fix libfreerdp version check *@giox069*
+* Explicitly set user resolution to a multiple of 4 [!2273](https://gitlab.com/Remmina/Remmina/merge_requests/2273) *@antenore*
+* Code refactoring - ASAN exceptions [!2274](https://gitlab.com/Remmina/Remmina/merge_requests/2274) *@antenore*
+
+## v1.4.17
 [full changelog](https://gitlab.com/Remmina/Remmina/compare/v1.4.16...v1.4.17)
 
 * Fix build with musl libc [!2259](https://gitlab.com/Remmina/Remmina/merge_requests/2259) *@ncopa*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84bf1a0d7..7a5e125c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,7 +277,7 @@ endif()
 set(WITH_LIBRARY_VERSIONING "ON")
 set(REMMINA_VERSION_MAJOR "1")
 set(REMMINA_VERSION_MINOR "4")
-set(REMMINA_VERSION_REVISION "17")
+set(REMMINA_VERSION_REVISION "18")
 # set(REMMINA_VERSION_SUFFIX "1") set(REMMINA_VERSION
 # "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}.${REMMINA_VERSION_SUFFIX}")
 set(REMMINA_VERSION
diff --git a/Doxyfile b/Doxyfile
index 88660a73d..742422928 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Remmina - The GTK+ Remote Desktop Client"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v1.4.17
+PROJECT_NUMBER         = v1.4.18
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/data/desktop/org.remmina.Remmina.appdata.xml b/data/desktop/org.remmina.Remmina.appdata.xml
index 387fe6dc2..61d73ea12 100644
--- a/data/desktop/org.remmina.Remmina.appdata.xml
+++ b/data/desktop/org.remmina.Remmina.appdata.xml
@@ -16,7 +16,7 @@
   <summary xml:lang="fr">Client de contrôle de bureau à distance</summary>
   <content_rating type="oars-1.1" />
   <releases>
-      <release version="1.4.17" date="2021-05-21"/>
+      <release version="1.4.18" date="2021-05-21"/>
   </releases>
   <description>
     <p>
diff --git a/po/remmina.pot b/po/remmina.pot
index 44ffa898a..d5ca4920e 100644
--- a/po/remmina.pot
+++ b/po/remmina.pot
@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Remmina v1.4.17\n"
+"Project-Id-Version: Remmina v1.4.18\n"
 "Report-Msgid-Bugs-To: l10n@lists.remmina.org\n"
 "POT-Creation-Date: 2021-06-03 06:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"