Renaming "Cached host keys" to "Caches", as it removes all other kinds of caches as well since 31bb8358

(cherry picked from commit 0a0fe506828b1dd112e02af895aee43a1bec04e8)

# Conflicts:
#	source/forms/Cleanup.cpp

Source commit: 8fdb4c676f4cd02885d96c10eadca38d563aec83

source/core/Configuration.cpp

@@ -813,7 +813,7 @@ void __fastcall TConfiguration::CleanupCaches()
   }
   catch (Exception & E)
   {
-    throw ExtException(&E, LoadStr(CLEANUP_HOSTKEYS_ERROR));
+    throw ExtException(&E, LoadStr(CLEANUP_CACHES_ERROR));
   }
 }
 //---------------------------------------------------------------------------

source/forms/Cleanup.cpp

@@ -69,7 +69,7 @@ void __fastcall TCleanupDialog::FindData()
 
   if (Configuration->HasAnyCache())
   {
-    AddRegistryLocation(CLEANUP_HOSTKEYS, L"...", Configuration->CleanupCaches);
+    AddRegistryLocation(CLEANUP_CACHES, L"...", Configuration->CleanupCaches);
   }
 
   UnicodeString IniFilePath = ExpandEnvironmentVariables(Configuration->IniFileStorageNameForReading);

source/resource/TextsCore.h

@@ -49,7 +49,7 @@
 #define LIST_LINE_ERROR         114
 #define RIGHTS_ERROR            115
 #define CLEANUP_CONFIG_ERROR    116
-#define CLEANUP_HOSTKEYS_ERROR  117
+#define CLEANUP_CACHES_ERROR    117
 #define CLEANUP_SEEDFILE_ERROR  118
 #define CLEANUP_SESSIONS_ERROR  119
 #define DETECT_RETURNVAR_ERROR  120

source/resource/TextsCore1.rc

@@ -18,7 +18,7 @@ BEGIN
   LIST_LINE_ERROR, "Unexpected directory listing line '%s'."
   RIGHTS_ERROR, "Invalid rights description '%s'"
   CLEANUP_CONFIG_ERROR, "Error cleaning up general configuration."
-  CLEANUP_HOSTKEYS_ERROR, "Error cleaning up sites."
+  CLEANUP_CACHES_ERROR, "Error cleaning up caches."
   CLEANUP_SEEDFILE_ERROR, "Error cleaning up random seed file."
   CLEANUP_SESSIONS_ERROR, "Error cleaning up cached host keys."
   DETECT_RETURNVAR_ERROR, "Error detecting variable containing return code of last command."

source/resource/TextsWin.h

@@ -357,7 +357,7 @@
 #define PROGRESS_CALCULATE_SIZE 1696
 #define CLEANUP_CONFIG          1700
 #define CLEANUP_SESSIONS        1701
-#define CLEANUP_HOSTKEYS        1702
+#define CLEANUP_CACHES          1702
 #define CLEANUP_INIFILE         1703
 #define CLEANUP_SEEDFILE        1704
 #define SELECT_LOCAL_DIRECTORY  1705

source/resource/TextsWin1.rc

@@ -362,7 +362,7 @@ BEGIN
         PROGRESS_CALCULATE_SIZE, "Calculating directory size"
         CLEANUP_CONFIG, "General configuration"
         CLEANUP_SESSIONS, "Sites"
-        CLEANUP_HOSTKEYS, "Cached host keys"
+        CLEANUP_CACHES, "Caches"
         CLEANUP_INIFILE, "Configuration INI file"
         CLEANUP_SEEDFILE, "Random seed file"
         SELECT_LOCAL_DIRECTORY, "Select local directory."