Fix merge conflict resolution

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>

Author: t1m0thyj

packages/zowe-explorer/l10n/bundle.l10n.json

@@ -928,9 +928,7 @@
     ]
   },
   "Favorites": "Favorites",
-  "VSAM Favorites": "VSAM Favorites",
-  "Member Favorites": "Member Favorites",
-  "Migrated Favorites": "Migrated Favorites",
+  "Favorites changes": "Favorites changes",
   "Fetching data set...": "Fetching data set...",
   "Fetching spool file...": "Fetching spool file...",
   "File does not exist. It may have been deleted.": "File does not exist. It may have been deleted.",
@@ -1036,6 +1034,7 @@
   "Fixed an issue where a recalled PDS is expandable after it is migrated through Zowe Explorer. <a>#3294</a>": "Fixed an issue where a recalled PDS is expandable after it is migrated through Zowe Explorer. <a>#3294</a>",
   "Fixed an issue where a TypeError occurred when applying VS Code proxy settings to an invalid session. <a>#3425</a>": "Fixed an issue where a TypeError occurred when applying VS Code proxy settings to an invalid session. <a>#3425</a>",
   "Fixed an issue where adding an item to favorites was still incorrectly showing the \"Add to Favorites\" icon on it. <a>#3712</a>": "Fixed an issue where adding an item to favorites was still incorrectly showing the \"Add to Favorites\" icon on it. <a>#3712</a>",
+  "Fixed an issue where additional error details were not displayed, particularly using SSH profiles. <a>zowex/#766</a>": "Fixed an issue where additional error details were not displayed, particularly using SSH profiles. <a>zowex/#766</a>",
   "Fixed an issue where an error appeared when moving an empty PDS across LPARs. <a>#4001</a>": "Fixed an issue where an error appeared when moving an empty PDS across LPARs. <a>#4001</a>",
   "Fixed an issue where an incorrect profile name is shown in the output for the \"Issue Unix Command\" function when an SSH profile is required to issue commands. <a>#3646</a>": "Fixed an issue where an incorrect profile name is shown in the output for the \"Issue Unix Command\" function when an SSH profile is required to issue commands. <a>#3646</a>",
   "Fixed an issue where an invalid session on a profile caused an unexpected Profile auth error login dialog to appear. <a>#3524</a>": "Fixed an issue where an invalid session on a profile caused an unexpected Profile auth error login dialog to appear. <a>#3524</a>",

packages/zowe-explorer/l10n/poeditor.json

@@ -1155,9 +1155,7 @@
   "Failed to update Zowe schema: insufficient permissions or read-only file. {0}": "",
   "Failed to upload changes for {0}: {1}": "",
   "Favorites": "",
-  "VSAM Favorites": "",
-  "Member Favorites": "",
-  "Migrated Favorites": "",
+  "Favorites changes": "",
   "Fetching data set...": "",
   "Fetching spool file...": "",
   "File does not exist. It may have been deleted.": "",
@@ -1230,6 +1228,7 @@
   "Fixed an issue where a recalled PDS is expandable after it is migrated through Zowe Explorer. <a>#3294</a>": "",
   "Fixed an issue where a TypeError occurred when applying VS Code proxy settings to an invalid session. <a>#3425</a>": "",
   "Fixed an issue where adding an item to favorites was still incorrectly showing the \"Add to Favorites\" icon on it. <a>#3712</a>": "",
+  "Fixed an issue where additional error details were not displayed, particularly using SSH profiles. <a>zowex/#766</a>": "",
   "Fixed an issue where an error appeared when moving an empty PDS across LPARs. <a>#4001</a>": "",
   "Fixed an issue where an incorrect profile name is shown in the output for the \"Issue Unix Command\" function when an SSH profile is required to issue commands. <a>#3646</a>": "",
   "Fixed an issue where an invalid session on a profile caused an unexpected Profile auth error login dialog to appear. <a>#3524</a>": "",

packages/zowe-explorer/src/tools/ZoweLogger.ts

@@ -14,7 +14,7 @@
 import * as vscode from "vscode";
 import * as loggerConfig from "../../log4jsconfig.json";
 import * as path from "path";
-import { Gui, imperative, MessageSeverity, ZoweVsCodeExtension } from "@zowe/zowe-explorer-api";
+import { Gui, handleError, imperative, MessageSeverity, ZoweVsCodeExtension } from "@zowe/zowe-explorer-api";
 import type { Config, LayoutFunction, LayoutsParam, LoggingEvent } from "log4js";
 
 export class ZoweLogger {
@@ -49,7 +49,7 @@ export class ZoweLogger {
         for (const appenderName of Object.keys(loggerConfigCopy.log4jsConfig.appenders)) {
             loggerConfigCopy.log4jsConfig.appenders[appenderName].filename = path.join(
                 logsPath,
-                loggerConfigCopy.log4jsConfig.appenders[appenderName].filename
+                loggerConfigCopy.log4jsConfig.appenders[appenderName].filename,
             );
             loggerConfigCopy.log4jsConfig.categories[appenderName].level = zeLogLevel;
         }