Konstantina Chremmou 67d1ddd1d1 Merge remote-tracking branch 'upstream/master' into feature/hyperman ... Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com> # Conflicts: # Branding/Branding.resx # Jenkinsfile # XenAdmin/Alerts/Types/GuiOldAlert.cs # XenAdmin/Alerts/Types/LicenseAlert.cs # XenAdmin/Commands/RestartToolstackCommand.cs # XenAdmin/Diagnostics/Problems/HostProblem/HostNotSafeToUpgradeWarning.cs # XenAdmin/Dialogs/AllowUpdatesDialog.cs # XenAdmin/Dialogs/OptionsPages/ConfirmationOptionsPage.cs # XenAdmin/Dialogs/RepairSRDialog.cs # XenAdmin/Dialogs/UpsellDialog.cs # XenAdmin/Plugins/UI/TabPageCredentialsDialog.cs # XenAdmin/Program.cs # XenAdmin/Wizards/ConversionWizard/ConversionNetworkPage.cs # XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs # XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs # XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs # XenCenterLib/XSVersionAttribute.cs # XenModel/BrandManager.cs # XenModel/Messages.Designer.cs # XenModel/Messages.resx		2021-05-25 15:51:42 +01:00
..
BugToolPageDestination.cs	Merge remote-tracking branch 'upstream/master' into feature/hyperman	2021-05-25 15:51:42 +01:00
BugToolPageDestination.Designer.cs	CA-236150 - Funny label on status report wizard	2017-02-15 13:51:19 +00:00
BugToolPageDestination.ja.resx	L10N:CA-205538 & other translation checkins	2017-04-19 14:36:03 +05:30
BugToolPageDestination.resx	CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.	2021-03-31 11:50:32 +01:00
BugToolPageDestination.zh-CN.resx	L10N:CA-205538 & other translation checkins	2017-04-19 14:36:03 +05:30
BugToolPageRetrieveData.cs	CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.	2021-03-31 11:50:32 +01:00
BugToolPageRetrieveData.Designer.cs	CA-303195: Rewrote the logic for compiling and retrieving server status data. The changes include:	2019-01-15 17:12:09 +00:00
BugToolPageRetrieveData.ja.resx	L10N : Translation and resx resync	2019-01-21 10:27:48 +00:00
BugToolPageRetrieveData.resx	CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.	2021-03-31 11:50:32 +01:00
BugToolPageRetrieveData.zh-CN.resx	L10N : Translation and resx resync	2019-01-21 10:27:48 +00:00
BugToolPageSelectCapabilities.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
BugToolPageSelectCapabilities.Designer.cs	CA-272847: Compilation time is way overestimated (when creating a ser… (#2316)	2018-11-19 12:27:31 +00:00
BugToolPageSelectCapabilities.ja.resx	L10N : Translation and resx resync	2018-11-22 23:48:28 +00:00
BugToolPageSelectCapabilities.resx	CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.	2021-03-31 11:50:32 +01:00
BugToolPageSelectCapabilities.zh-CN.resx	L10N : Translation and resx resync	2018-11-22 23:48:28 +00:00
BugToolWizard.cs	Refactored three button dialog (#2627)	2020-04-22 14:47:03 +01:00
BugToolWizard.Designer.cs	CP-4816: Initial commit to git repo	2013-06-24 12:41:48 +01:00
BugToolWizard.ja.resx	L10N : Dundee translation checkins Iteration 01	2016-03-21 16:45:35 +05:30
BugToolWizard.resx	CP-4816: Initial commit to git repo	2013-06-24 12:41:48 +01:00
BugToolWizard.zh-CN.resx	L10N:Translations check-ins	2016-12-21 16:20:30 +00:00
GenericSelectHostsPage.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
GenericSelectHostsPage.Designer.cs	Changed the order of the Select All and Clear All buttons, as in most cases in	2013-11-04 08:44:46 +00:00
GenericSelectHostsPage.ja.resx	L10N : Translation and resx resync	2019-01-21 10:27:48 +00:00
GenericSelectHostsPage.resx	Brought the Select/Clear All buttons closer to the bottom of the server list	2019-01-15 17:12:09 +00:00
GenericSelectHostsPage.zh-CN.resx	L10N : Translation and resx resync	2019-01-21 10:27:48 +00:00