Merge pull request #71 from PlasticSCM/1003107-light-rebranding-user-…

…facing-strings

Rebrand user facing strings to Unity Version Control

PlasticSourceControl.uplugin

@@ -2,14 +2,14 @@
 	"FileVersion": 3,
 	"Version": 80,
 	"VersionName": "1.8.0+dev",
-	"FriendlyName": "Plastic SCM",
-	"Description": "Plastic source control management",
+	"FriendlyName": "Unity Version Control",
+	"Description": "Unity Version Control (formerly Plastic SCM)",
 	"Category": "Source Control",
 	"CreatedBy": "Unity Technologies",
-	"CreatedByURL": "https://unity.com/products/plastic-scm",
+	"CreatedByURL": "https://unity.com/solutions/version-control",
 	"DocsURL": "https://github.com/PlasticSCM/UEPlasticPlugin",
 	"MarketplaceURL": "",
-	"SupportURL": "https://plasticscm.com/support",
+	"SupportURL": "https://support.unity.com/hc/en-us/requests/new?ticket_form_id=65905",
 	"EnabledByDefault": true,
 	"CanContainContent": false,
 	"IsBetaVersion": false,

Source/PlasticSourceControl/Private/PlasticSourceControlChangelist.h

@@ -10,7 +10,7 @@
 #include "ISourceControlChangelist.h"
 
 /**
- * Unique Identifier of a changelist under source control: a "name" in Plastic SCM
+ * Unique Identifier of a changelist under source control: a "name" in Unity Version Control
  */
 class FPlasticSourceControlChangelist : public ISourceControlChangelist
 {

Source/PlasticSourceControl/Private/PlasticSourceControlConsole.cpp

@@ -12,7 +12,7 @@ void FPlasticSourceControlConsole::Register()
 	{
 		CmConsoleCommand = MakeUnique<FAutoConsoleCommand>(
 			TEXT("cm"),
-			TEXT("PlasticSCM Command Line Interface.\n")
+			TEXT("Unity Version Control (formerly Plastic SCM) Command Line Interface (cm).\n")
 			TEXT("Run any 'cm' command directly from the Unreal Editor Console.\n")
 			TEXT("Type 'cm showcommands' to get a command list."),
 			FConsoleCommandWithArgsDelegate::CreateRaw(this, &FPlasticSourceControlConsole::ExecutePlasticConsoleCommand));

Source/PlasticSourceControl/Private/PlasticSourceControlConsole.h

@@ -18,7 +18,7 @@ class FPlasticSourceControlConsole
 	void Unregister();
 
 private:
-	// PlasticSCM Command Line Interface: Run 'cm' commands directly from the Unreal Editor Console.
+	// Unity Version Control Command Line Interface: Run 'cm' commands directly from the Unreal Editor Console.
 	void ExecutePlasticConsoleCommand(const TArray<FString>& a_args);
 
 	/** Console command for interacting with 'cm' CLI directly */

Source/PlasticSourceControl/Private/PlasticSourceControlMenu.cpp

@@ -51,7 +51,7 @@ void FPlasticSourceControlMenu::Register()
 	if (UToolMenus* ToolMenus = UToolMenus::Get())
 	{
 		UToolMenu* SourceControlMenu = ToolMenus->ExtendMenu("StatusBar.ToolBar.SourceControl");
-		FToolMenuSection& Section = SourceControlMenu->AddSection("PlasticSourceControlActions", LOCTEXT("PlasticSourceControlMenuHeadingActions", "Plastic SCM"), FToolMenuInsert(NAME_None, EToolMenuInsertType::First));
+		FToolMenuSection& Section = SourceControlMenu->AddSection("PlasticSourceControlActions", LOCTEXT("PlasticSourceControlMenuHeadingActions", "Unity Version Control"), FToolMenuInsert(NAME_None, EToolMenuInsertType::First));
 
 		AddMenuExtension(Section);
 	}
@@ -506,8 +506,8 @@ void FPlasticSourceControlMenu::AddMenuExtension(FToolMenuSection& Menu)
 #if ENGINE_MAJOR_VERSION == 5
 		"PlasticProjectSettings",
 #endif
-		LOCTEXT("PlasticProjectSettings",			"Project Settings - Source Control - Plastic SCM"),
-		LOCTEXT("PlasticProjectSettingsTooltip",	"Open the Plastic SCM section in the Project Settings."),
+		LOCTEXT("PlasticProjectSettings",			"Project Settings - Source Control - Unity Version Control"),
+		LOCTEXT("PlasticProjectSettingsTooltip",	"Open the Unity Version Control (formerly Plastic SCM) section in the Project Settings."),
 #if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1
 		FSlateIcon(FAppStyle::GetAppStyleSetName(), "ProjectSettings.TabIcon"),
 #else
@@ -542,8 +542,8 @@ void FPlasticSourceControlMenu::AddMenuExtension(FToolMenuSection& Menu)
 #if ENGINE_MAJOR_VERSION == 5
 		"PlasticSupportURL",
 #endif
-		LOCTEXT("PlasticSupportURL",		"Plastic SCM Support"),
-		LOCTEXT("PlasticSupportURLTooltip",	"Visit official support for Plastic SCM."),
+		LOCTEXT("PlasticSupportURL",		"Unity Version Control Support"),
+		LOCTEXT("PlasticSupportURLTooltip",	"Submit a support request for Unity Version Control (formerly Plastic SCM)."),
 #if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1
 		FSlateIcon(FAppStyle::GetAppStyleSetName(), "Icons.Support"),
 #elif ENGINE_MAJOR_VERSION == 5

Source/PlasticSourceControl/Private/PlasticSourceControlMenu.h

@@ -9,7 +9,7 @@
 class FMenuBuilder;
 struct FToolMenuSection;
 
-/** Plastic SCM extension of the Source Control toolbar menu */
+/** Unity Version Control extension of the Source Control toolbar menu */
 class FPlasticSourceControlMenu
 {
 public:

Source/PlasticSourceControl/Private/PlasticSourceControlModule.h

@@ -8,7 +8,7 @@
 #include "PlasticSourceControlProvider.h"
 
 /**
- * PlasticSourceControl is the official Plastic SCM Source Control Plugin for Unreal Engine
+ * PlasticSourceControl is the official Unity Version Control Plugin for Unreal Engine
  *
  * Written and contributed by Sebastien Rombauts (sebastien.rombauts@gmail.com) for Codice Software
  */

Source/PlasticSourceControl/Private/PlasticSourceControlOperations.cpp

@@ -155,7 +155,7 @@ bool FPlasticConnectWorker::Execute(FPlasticSourceControlCommand& InCommand)
 				}
 				else
 				{
-					const FText ErrorText(LOCTEXT("FailedToConnect", "Failed to connect to the Plastic SCM server."));
+					const FText ErrorText(LOCTEXT("FailedToConnect", "Failed to connect to the Unity Version Control server."));
 					Operation->SetErrorText(ErrorText);
 					InCommand.ErrorMessages.Add(ErrorText.ToString());
 				}
@@ -164,17 +164,17 @@ bool FPlasticConnectWorker::Execute(FPlasticSourceControlCommand& InCommand)
 		else
 		{
 #if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 2
-			const FText ErrorText(LOCTEXT("NotAPlasticRepository", "Failed to enable Plastic SCM revision control. You need to create a Plastic SCM workspace for the project first."));
+			const FText ErrorText(LOCTEXT("NotAPlasticRepository", "Failed to enable revision control. You need to create a Unity Version Control workspace for the project first."));
 #else
-			const FText ErrorText(LOCTEXT("NotAPlasticRepository", "Failed to enable Plastic SCM source control. You need to create a Plastic SCM workspace for the project first."));
+			const FText ErrorText(LOCTEXT("NotAPlasticRepository", "Failed to enable source control. You need to create a Unity Version Control workspace for the project first."));
 #endif
 			Operation->SetErrorText(ErrorText);
 			InCommand.ErrorMessages.Add(ErrorText.ToString());
 		}
 	}
 	else
 	{
-		const FText ErrorText(LOCTEXT("PlasticScmCliUnavaillable", "Failed to launch Plastic SCM 'cm' command line tool. You need to install it and make sure that 'cm' is on the Path and correctly configured."));
+		const FText ErrorText(LOCTEXT("PlasticScmCliUnavaillable", "Failed to launch Unity Version Control 'cm' command line tool. You need to install it and make sure that 'cm' is on the Path and correctly configured."));
 		Operation->SetErrorText(ErrorText);
 		InCommand.ErrorMessages.Add(ErrorText.ToString());
 	}
@@ -598,9 +598,9 @@ bool FPlasticRevertWorker::Execute(FPlasticSourceControlCommand& InCommand)
 #endif
 	if (bIsSoftRevert && GetProvider().GetPlasticScmVersion() < PlasticSourceControlVersions::UndoCheckoutKeepChanges)
 	{
-		// If a soft revert is requested but not supported by the version of Plastic SCM, warn the user and stop
+		// If a soft revert is requested but not supported by the version of Unity Version Control, warn the user and stop
 		FText FailureText = FText::FormatOrdered(
-			LOCTEXT("Plastic version Error", "Plastic SCM {0} cannot keep changes when undoing the checkout of the selected files. Update to version {1} or above."),
+			LOCTEXT("PlasticUndoKeepChangesVersionError", "Unity Version Control {0} cannot keep changes when undoing the checkout of the selected files. Update to version {1} or above."),
 			FText::FromString(*GetProvider().GetPlasticScmVersion().String),
 			FText::FromString(*PlasticSourceControlVersions::UndoCheckoutKeepChanges.String));
 
@@ -1110,7 +1110,7 @@ bool FPlasticCopyWorker::Execute(FPlasticSourceControlCommand& InCommand)
 		if (bIsMoveOperation)
 		{
 			UE_LOG(LogSourceControl, Log, TEXT("Moving %s to %s..."), *Origin, *Destination);
-			// In case of rename, we have to undo what the Editor (created a redirector and added the dest asset), and then redo it with Plastic SCM
+			// In case of rename, we have to undo what the Editor (created a redirector and added the dest asset), and then redo it with Unity Version Control
 			// - revert the 'cm add' that was applied to the destination by the Editor
 			{
 				TArray<FString> DestinationFiles;
@@ -1971,7 +1971,7 @@ bool FPlasticUnshelveWorker::Execute(FPlasticSourceControlCommand& InCommand)
 			{
 				// On old version, don't unshelve the files if they are not all selected (since we couldn't apply only a selection of files from a shelve)
 				UE_LOG(LogSourceControl, Error,
-					TEXT("Plastic SCM %s cannot unshelve a selection of files from a shelve. Unshelve them all at once or update to %s or above."),
+					TEXT("Unity Version Control %s cannot unshelve a selection of files from a shelve. Unshelve them all at once or update to %s or above."),
 					*GetProvider().GetPlasticScmVersion().String,
 					*PlasticSourceControlVersions::ShelvesetApplySelection.String
 				);
@@ -2100,7 +2100,7 @@ bool FPlasticDeleteShelveWorker::UpdateStates()
 
 		if (FilesToRemove.Num() > 0)
 		{
-			// NOTE: for now, Plastic SCM cannot delete a selection of files from a shelve, so FilesToRemove and this specific case aren't really needed (yet)
+			// NOTE: for now, Unity Version Control cannot delete a selection of files from a shelve, so FilesToRemove and this specific case aren't really needed (yet)
 			return ChangelistState->ShelvedFiles.RemoveAll([this](FSourceControlStateRef& State) -> bool
 				{
 					return Algo::AnyOf(FilesToRemove, [&State](const FString& File) {

Source/PlasticSourceControl/Private/PlasticSourceControlProjectSettings.h

@@ -6,26 +6,26 @@
 #include "Engine/DeveloperSettings.h"
 #include "PlasticSourceControlProjectSettings.generated.h"
 
-/** Project Settings for Plastic SCM Source Control. Saved in Config/DefaultEditor.ini */
-UCLASS(config = Editor, defaultconfig, meta = (DisplayName = "Source Control - Plastic SCM"))
+/** Project Settings for Unity Version Control (formerly Plastic SCM). Saved in Config/DefaultEditor.ini */
+UCLASS(config = Editor, defaultconfig, meta = (DisplayName = "Source Control - Unity Version Control"))
 class UPlasticSourceControlProjectSettings : public UDeveloperSettings
 {
 	GENERATED_BODY()
 
 public:
-	/** Map Plastic SCM user names (typically e-mail addresses or company domain names) to display names for brevity. */
-	UPROPERTY(config, EditAnywhere, Category = "Plastic SCM")
+	/** Map Unity Version Control user names (typically e-mail addresses or company domain names) to display names for brevity. */
+	UPROPERTY(config, EditAnywhere, Category = "Unity Version Control")
 	TMap<FString, FString> UserNameToDisplayName;
 
 	/** Hide the domain part of an username e-mail address (eg @gmail.com) if the UserNameToDisplayName map didn't match (enabled by default). */
-	UPROPERTY(config, EditAnywhere, Category = "Plastic SCM")
+	UPROPERTY(config, EditAnywhere, Category = "Unity Version Control")
 	bool bHideEmailDomainInUsername = true;
 
 	/** If enabled, you'll be prompted to check out changed files (enabled by default). Checkout is needed to work with Changelists. */
-	UPROPERTY(config, EditAnywhere, Category = "Plastic SCM")
+	UPROPERTY(config, EditAnywhere, Category = "Unity Version Control")
 	bool bPromptForCheckoutOnChange = true;
 
-	/** If a non-null value is set, limit the maximum number of revisions requested to Plastic SCM to display in the "History" window. */
-	UPROPERTY(config, EditAnywhere, Category = "Plastic SCM", meta=(ClampMin=0))
+	/** If a non-null value is set, limit the maximum number of revisions requested to Unity Version Control to display in the "History" window. */
+	UPROPERTY(config, EditAnywhere, Category = "Unity Version Control", meta=(ClampMin=0))
 	int32 LimitNumberOfRevisionsInHistory = 50;
 };

Source/PlasticSourceControl/Private/PlasticSourceControlProvider.cpp

@@ -36,14 +36,14 @@ FPlasticSourceControlProvider::FPlasticSourceControlProvider()
 
 void FPlasticSourceControlProvider::Init(bool bForceConnection)
 {
-	// Init() is called multiple times at startup: do not check Plastic SCM each time
+	// Init() is called multiple times at startup: do not check Unity Version Control each time
 	if (!bPlasticAvailable)
 	{
 		const TSharedPtr<IPlugin> Plugin = IPluginManager::Get().FindPlugin(TEXT("PlasticSourceControl"));
 		if (Plugin.IsValid())
 		{
 			PluginVersion = Plugin->GetDescriptor().VersionName;
-			UE_LOG(LogSourceControl, Log, TEXT("Plastic SCM plugin '%s'"), *PluginVersion);
+			UE_LOG(LogSourceControl, Log, TEXT("Unity Version Control (formerly Plastic SCM) plugin '%s'"), *PluginVersion);
 		}
 
 		CheckPlasticAvailability();
@@ -96,7 +96,7 @@ void FPlasticSourceControlProvider::CheckPlasticAvailability()
 		// Find the path to the root Plastic directory (if any, else uses the ProjectDir)
 		const FString PathToProjectDir = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir());
 
-		// Launch the Plastic SCM cli shell on the background to issue all commands during this session
+		// Launch the Unity Version Control cli shell on the background to issue all commands during this session
 		bPlasticAvailable = PlasticSourceControlShell::Launch(PathToPlasticBinary, PathToProjectDir);
 		if (!bPlasticAvailable)
 		{
@@ -117,7 +117,7 @@ void FPlasticSourceControlProvider::CheckPlasticAvailability()
 
 		bUsesLocalReadOnlyState = PlasticSourceControlUtils::GetConfigSetFilesAsReadOnly();
 
-		// Get user name (from the global Plastic SCM client config)
+		// Get user name (from the global Unity Version Control client config)
 		PlasticSourceControlUtils::GetUserName(UserName);
 
 		// Register Console Commands
@@ -229,7 +229,7 @@ FText FPlasticSourceControlProvider::GetStatusText() const
 	}
 	Args.Add(TEXT("ErrorText"), FormattedError);
 
-	return FText::Format(LOCTEXT("PlasticStatusText", "{ErrorText}Plastic SCM {PlasticScmVersion}  (plugin v{PluginVersion})\nWorkspace: {WorkspaceName}  ({WorkspacePath})\n{BranchName}\nChangeset: {ChangesetNumber}\nUser: '{UserName}'  {DisplayName}"), Args);
+	return FText::Format(LOCTEXT("PlasticStatusText", "{ErrorText}Unity Version Control (formerly Plastic SCM) {PlasticScmVersion}\t(plugin v{PluginVersion})\nWorkspace: {WorkspaceName}  ({WorkspacePath})\n{BranchName}\nChangeset: {ChangesetNumber}\nUser: '{UserName}'  {DisplayName}"), Args);
 }
 
 /** Quick check if source control is enabled. Specifically, it returns true if a source control provider is set (regardless of whether the provider is available) and false if no provider is set. So all providers except the stub DefaultSourceProvider will return true. */
@@ -435,7 +435,7 @@ bool FPlasticSourceControlProvider::UsesLocalReadOnlyState() const
 
 bool FPlasticSourceControlProvider::UsesChangelists() const
 {
-	// Note: We don't want to show ChangeList column (Plastic SCM term would be ChangeSet) BUT we need this to display the changelists in the source control menu
+	// We don't want to show ChangeList column anymore (Unity Version Control term would be ChangeSet) BUT we need this to display the changelists in the source control menu
 	return true;
 }
 
@@ -544,7 +544,7 @@ void FPlasticSourceControlProvider::UpdateWorkspaceStatus(const class FPlasticSo
 					FFormatNamedArguments Args;
 					Args.Add(TEXT("PlasticScmVersion"), FText::FromString(PlasticScmVersion.String));
 					Args.Add(TEXT("OldestSupportedPlasticScmVersion"), FText::FromString(PlasticSourceControlUtils::GetOldestSupportedPlasticScmVersion().String));
-					const FText UnsuportedVersionWarning = FText::Format(LOCTEXT("Plastic_UnsuportedVersion", "Plastic SCM {PlasticScmVersion} is not supported anymore by this plugin.\nPlastic SCM {OldestSupportedPlasticScmVersion} or a more recent version is required.\nPlease upgrade to the latest version."), Args);
+					const FText UnsuportedVersionWarning = FText::Format(LOCTEXT("Plastic_UnsuportedVersion", "Unity Version Control {PlasticScmVersion} is not supported anymore by this plugin.\nUnity Version Control {OldestSupportedPlasticScmVersion} or a more recent version is required.\nPlease upgrade to the latest version."), Args);
 					FMessageLog("SourceControl").Warning(UnsuportedVersionWarning);
 					FMessageDialog::Open(EAppMsgType::Ok, UnsuportedVersionWarning);
 				}

Source/PlasticSourceControl/Private/PlasticSourceControlProvider.h

@@ -134,13 +134,13 @@ class FPlasticSourceControlProvider : public ISourceControlProvider
 		return (ChangesetNumber == -1);
 	}
 
-	/** Version of the Plastic SCM executable used */
+	/** Version of the Unity Version Control executable used */
 	inline const FSoftwareVersion& GetPlasticScmVersion() const
 	{
 		return PlasticScmVersion;
 	}
 
-	/** Version of the Plastic SCM plugin */
+	/** Version of the Unity Version Control plugin */
 	const FString& GetPluginVersion() const
 	{
 		return PluginVersion;
@@ -203,7 +203,7 @@ class FPlasticSourceControlProvider : public ISourceControlProvider
 	/** Indicates if source control integration is available or not. */
 	bool bServerAvailable = false;
 
-	/** Whether Plastic SCM is configured to uses local read-only state to signal whether a file is editable ("SetFilesAsReadOnly" in client.conf) */
+	/** Whether Unity Version Control is configured to uses local read-only state to signal whether a file is editable ("SetFilesAsReadOnly" in client.conf) */
 	bool bUsesLocalReadOnlyState = false;
 
 	/** Critical section for thread safety of error messages that occurred after last Plastic command */
@@ -226,10 +226,10 @@ class FPlasticSourceControlProvider : public ISourceControlProvider
 	/** Update workspace status on Connect and UpdateStatus operations */
 	void UpdateWorkspaceStatus(const class FPlasticSourceControlCommand& InCommand);
 
-	/** Version of the Plastic SCM executable used */
+	/** Version of the Unity Version Control executable used */
 	FSoftwareVersion PlasticScmVersion;
 
-	/** Version of the Plastic SCM plugin */
+	/** Version of the Unity Version Control plugin */
 	FString PluginVersion;
 
 	/** Path to the root of the Plastic workspace: can be the GameDir itself, or any parent directory (found by the "Connect" operation) */