ffs 13.9

1 files changed, 12 insertions, 11 deletions

diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 3fc79ca..f312a97 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -62,7 +62,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  #include "gui_status_handler.h"
  #include "small_dlgs.h"
  #include "rename_dlg.h"
-@@ -619,7 +618,7 @@ void MainDialog::create(const Zstring& g
+@@ -598,7 +597,7 @@ void MainDialog::create(const Zstring& g
  
          //showAboutDialog(mainDlg); => dialog centered incorrectly (Centos)
          //mainDlg->CallAfter([mainDlg] { showAboutDialog(mainDlg); }); => dialog centered incorrectly (Windows, Centos)
@@ -71,7 +71,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      }
  
  
-@@ -1012,7 +1011,6 @@ imgFileManagerSmall_([]
+@@ -991,7 +990,6 @@ imgFileManagerSmall_([]
  
      setImage(*m_menuItemHelp,            loadImage("help",         dipToScreen(getMenuIconDipSize())));
      setImage(*m_menuItemAbout,           loadImage("about",        dipToScreen(getMenuIconDipSize())));
@@ -79,7 +79,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  
      fixMenuIcons(*m_menuFile);
      fixMenuIcons(*m_menuActions);
-@@ -1112,9 +1110,6 @@ imgFileManagerSmall_([]
+@@ -1091,9 +1089,6 @@ imgFileManagerSmall_([]
      //mainly to update row label sizes...
      updateGui();
  
@@ -89,10 +89,11 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      //asynchronous call to wxWindow::Dimensions(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode
      Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this);
      wxCommandEvent evtDummy;           //call once before onLayoutWindowAsync()
-@@ -6343,56 +6338,6 @@ void MainDialog::onMenuExportFileList(wx
+@@ -6335,57 +6330,6 @@ void MainDialog::onMenuExportFileList(wx
+     }
  }
  
- 
+-
 -void MainDialog::onMenuCheckVersion(wxCommandEvent& event)
 -{
 -    checkForUpdateNow(*this, globalCfg_.lastOnlineVersion);
@@ -122,7 +123,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 -
 -    if (automaticUpdateCheckDue(globalCfg_.lastUpdateCheck))
 -    {
--        flashStatusInfo(_("Searching for program updates..."));
+-        flashStatusInfo(_("Searching for software updates..."));
 -
 -        guiQueue_.processAsync([resultPrep = automaticUpdateCheckPrepare(*this) /*prepare on main thread*/]
 -        { return automaticUpdateCheckRunAsync(resultPrep.ref()); }, //run on worker thread: (long-running part of the check)
@@ -135,7 +136,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 -            showNewVersionReminder();
 -
 -            if (globalCfg_.lastUpdateCheck == lastUpdateCheckOld)
--                flashStatusInfo(_("Update check failed!"));
+-                flashStatusInfo(_("Software update check failed!"));
 -        });
 -    }
 -    else
@@ -192,7 +193,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 +    return trimCpy(response);
  
      if (response.empty() ||
-     !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
+     !std::all_of(response.begin(), response.end(), [](const char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
 @@ -205,58 +197,6 @@ bool fff::haveNewerVersionOnline(const s
  }
  
@@ -209,7 +210,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 -        else
 -            showNotificationDialog(&parent, DialogInfoType::info, PopupDialogCfg().
 -                                   setIcon(loadImage("update_check")).
--                                   setTitle(_("Check for Program Updates")).
+-                                   setTitle(_("Check for Software Updates")).
 -                                   setMainInstructions(_("FreeFileSync is up-to-date.")));
 -    }
 -    catch (const SysError& e)
@@ -219,7 +220,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 -            lastOnlineVersion = getUnknownVersionTag();
 -
 -            switch (showConfirmationDialog(&parent, DialogInfoType::error, PopupDialogCfg().
--                                           setTitle(_("Check for Program Updates")).
+-                                           setTitle(_("Check for Software Updates")).
 -                                           setMainInstructions(_("Cannot find current FreeFileSync version number online. A newer version is likely available. Check manually now?")).
 -                                           setDetailInstructions(e.toString()), _("&Check"), _("&Retry")))
 -            {
@@ -235,7 +236,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 -        }
 -        else
 -            switch (showConfirmationDialog(&parent, DialogInfoType::error, PopupDialogCfg().
--                                           setTitle(_("Check for Program Updates")).
+-                                           setTitle(_("Check for Software Updates")).
 -                                           setMainInstructions(replaceCpy(_("Unable to connect to %x."), L"%x", L"freefilesync.org")).
 -                                           setDetailInstructions(e.toString()), _("&Retry")))
 -            {