Merge branch 'master' into dev

# Conflicts:
#	deployment/winscpsetup.iss

Source commit: 0fbeea55c144f247bb5a09a4de26cfb995d3bdb3

deployment/winscpsetup.iss

@@ -509,8 +509,6 @@ begin
       if (InstalledMajor <> ExistingMajor) or
          ((ExistingMajor = 1) and (ExistingMinor <= 1)) then
       begin
-        // Still on 1.x, so this won't be used when upgrading,
-        // but it will be useful, if downgrading from future version with a different major version.
         if InstalledMajor <> ExistingMajor then
         begin
           Log('Existing extension has different major version, allowing installation, and will require restart, if it is locked.')

translations/version.ini

@@ -33,7 +33,7 @@ SK=72
 CH=142
 SQ=3
 TR=68
-SL=28
+SL=31
 LV=16
 UK=45
 BG=17
@@ -92,7 +92,7 @@ SK=2005,2025,Marián Hikaník,Patrik Lenart
 CH=2005,2025,Mark Lin,Walter Cheuk,Hong-Yi Chen
 SQ=2005,2019,
 TR=2004,2025,Kaya Zeren,Fatih Savas,Kerem Emik,Süleyman Şentürk
-SL=2006,2019,Aleksander Hegler,Renato Lukac
+SL=2006,2025,Žiga Vodnjov Frelih,Aleksander Hegler,Renato Lukac
 LV=2004,2019,Henrijs Kons,Vairis Caune
 UK=2006,2025,Oleksii Petrov,Ivanka Skakun,Martyniv Alex,Oleg Butuzov
 BG=2004,2021,ССТАНЕВ,Plamen Penev