Changing branding from Visual Studio Online to Visual Studio Team Ser…

…vices (strings only - still need to change all VSO references in code)

plugin.idea/META-INF/plugin.xml

@@ -5,31 +5,31 @@
 
 <idea-plugin version="2">
     <id>com.microsoft.vso.idea</id>
-    <name>Visual Studio Team Foundation (Preview)</name>
+    <name>Visual Studio Team Services (Preview)</name>
     <version>0.92.0</version>
     <vendor url="http://java.visualstudio.com/">Microsoft Corporation</vendor>
     <description><![CDATA[
     <b>Preview</b>
     <br />
-      Visual Studio Team Foundation is a plugin to enable working with Git repositories on Visual Studio Online or Team Foundation Server 2015.
+      Visual Studio Team Services is a plugin to enable working with Git repositories on Visual Studio Team Services or Team Foundation Server 2015.
       <br />
       <a href="https://github.com/Microsoft/vso-intellij">GitHub</a> | <a href="https://github.com/Microsoft/vso-intellij/issues">Issues</a> | Twitter <a href="https://twitter.com/JavaALM">@JavaALM</a>
       <br />
       <br />
       <b>Features</b>
       <br />
       <ul>
-        <li>Supports authenticating with Visual Studio Online and Team Foundation Server 2015 to work with source code in Git repositories.</li>
-        <li>Checkout code from Git repositories on Visual Studio Online and Team Foundation Server 2015.</li>
-        <li>Import IntelliJ projects into Git repositories on Visual Studio Online and Team Foundation Server 2015.</li>
+        <li>Supports authenticating with Visual Studio Team Services and Team Foundation Server 2015 to work with source code in Git repositories.</li>
+        <li>Checkout code from Git repositories on Visual Studio Team Services and Team Foundation Server 2015.</li>
+        <li>Import IntelliJ projects into Git repositories on Visual Studio Team Services and Team Foundation Server 2015.</li>
         <li>Create pull requests.</li>
         <li>Quickly browse to file history or commit details on the web from the IntelliJ project.</li>
       </ul>
       <br />
       <br />
       <b>For More Information</b>
       <br />
-      See <a href="https://java.visualstudio.com/">Visual Studio Online – Java</a>
+      See <a href="https://java.visualstudio.com/">Visual Studio Team Services – Java</a>
       <br />
       <br />
       <i>Compiled with Java 1.6</i>

plugin.idea/resources/com/microsoft/alm/plugin/idea/ui/tfplugin.properties

@@ -10,10 +10,10 @@
 #   Exclamation points should be escaped (i.e. use \! where you need a !)
 
 #Login form
-LoginForm.VSO.Authenticating=Authenticating with Visual Studio Online...
+LoginForm.VSO.Authenticating=Authenticating with Team Services...
 LoginForm.TFS.Authenticating=Authenticating with the server...
 LoginForm.Errors.NotConnected=Click ''Sign in...'' or ''Connect...'' to continue.
-LoginForm.Errors.VSO.SigninFailed=Authenticating to Visual Studio Online failed. Verify credentials for your Microsoft account and try ''Sign in...'' again.
+LoginForm.Errors.VSO.SigninFailed=Authenticating to Team Services failed. Verify credentials for your Microsoft account and try ''Sign in...'' again.
 LoginForm.Errors.TFS.ConnectFailed=Connecting to Team Foundation Server ''{0}'' failed. Verify access to the server URL and try ''Connect...'' again.
 LoginForm.TFS.Errors.NoServerName=The server URL cannot be empty.
 LoginForm.TFS.Errors.InvalidServerUrl=The Server URL ''{0}'' is not valid. Specify a valid server URL and try ''Connect...'' again.
@@ -31,7 +31,7 @@ PAT.TokenDesc=VSO IntelliJ Plugin
 
 #Checkout dialog ui and models
 CheckoutDialog.TfsTab=Team Foundation Server
-CheckoutDialog.VsoTab=Visual Studio Online
+CheckoutDialog.VsoTab=Team Services
 CheckoutDialog.CloneButton=Clone
 CheckoutDialog.Title=Checkout from VSO or TFS
 CheckoutDialog.FilterHint=Type name to filter
@@ -53,14 +53,14 @@ UserAccountPanel.SignOut=Sign out
 ImportDialog.Title=Import project into VSO or TFS
 ImportDialog.ImportButton=Import
 ImportDialog.TfsTab=Team Foundation Server
-ImportDialog.VsoTab=Visual Studio Online
+ImportDialog.VsoTab=Team Services
 ImportDialog.FilterHint=Type name to filter
 ImportDialog.Errors.ProjectNotSelected=Select a team project to import new repository into.
 ImportDialog.Errors.RepoNameEmpty=Repository name to import into cannot be empty.
 ImportDialog.VSO.ServerName=Microsoft account
 Import.Failed=Import Failed
 Import.Succeeded=Import Succeeded
-Import.ImportingProject=Importing project into Team Foundation Git repository
+Import.ImportingProject=Importing project into Team Services Git repository
 Import.GitInit=Initializing a new local Git repository for project {0}...
 Import.Errors.GitInit=Failed to create a local git repository for project ''{0}'' \: {1}.
 Import.SelectFiles=Select files to add to Git repository and perform first commit\:
@@ -92,8 +92,8 @@ Feedback.Notification=Thank you\! Your feedback has been sent.
 #actions
 Actions.OpenInBrowser.Title=Open in Browser
 Actions.OpenInBrowser.Message=Open corresponding link in external browser
-Actions.Import.Title=Import into Team Foundation Git...
-Actions.Import.Message=Import current project into remote repository on Team Foundation Git
+Actions.Import.Title=Import into Team Services Git...
+Actions.Import.Message=Import current project into remote repository on Team Services Git
 
 #pull request
 Actions.CreatePullRequest.Title=Create Pull Request
@@ -127,9 +127,9 @@ CreatePullRequestDialog.SanityCheckFailed.Title=Create Pull Request Warning
 CreatePullRequestDialog.NoValidTargetWarning.Message=No remote branch was identified for the pull request to target.  First perform a Git fetch (VCS -> Git -> Fetch) and create a local branch (VCS -> Git -> Branches... -> +New Branch).  Then retry creating a pull request.
 
 #providers
-Providers.TfGitCheckoutProvider=Team Foundation Git
+Providers.TfGitCheckoutProvider=Team Services Git
 
-Plugin.Error.GitExeNotConfigured="The Team Foundation Git plugin requires Git settings to be configured, fix the Git Version Control settings to point to a valid Git executable."
+Plugin.Error.GitExeNotConfigured="The Team Services Git plugin requires Git settings to be configured, fix the Git Version Control settings to point to a valid Git executable."
 
 #KEEP FORMS AT THE BOTTOM (this is where the designer will add items)
 #NOTE: form items do not have corresponding Bundle properties
@@ -142,7 +142,7 @@ TfsLoginForm.Connect=Connect...
 VsoCheckoutForm.SelectRepository=Select repository\:
 VsoCheckoutForm.ParentDirectory=Parent directory\:
 VsoCheckoutForm.DirectoryName=Directory name\:
-VsoLoginForm.Header=Visual Studio Online
+VsoLoginForm.Header=Team Services
 VsoLoginForm.Description=Cloud-based collaboration services for version control, agile planning, continuous delivery, and application analytics - for IntelliJ IDEA, Eclipse, Visual Studio, Xcode or any other IDE or code editor.
 VsoLoginForm.CreateAccount=Create an account...
 VsoLoginForm.LearnMore=Learn more...

plugin.idea/src/com/microsoft/alm/plugin/idea/actions/InstrumentedAction.java

@@ -11,7 +11,7 @@
 import javax.swing.Icon;
 
 /**
- * Represents an base class for all Actions performed by the Team Foundation plugin for IntelliJ.
+ * Represents an base class for all Actions performed by the Visual Studio Team Services plugin for IntelliJ.
  *
  * @see javax.swing.Action
  */

plugin.idea/src/com/microsoft/alm/plugin/idea/ui/checkout/VsoCheckoutPageModel.java

@@ -80,7 +80,7 @@ public void run() {
                                     setAuthenticating(false);
                                     //Log exception
                                     if (throwable != null) {
-                                        logger.warn("Authenticating with Visual Studio Online failed", throwable);
+                                        logger.warn("Authenticating with Team Services failed", throwable);
                                     }
                                     //try to load the repos
                                     loadReposFromAllAccounts();

plugin.idea/src/com/microsoft/alm/plugin/idea/ui/vcsimport/VsoImportPageModel.java

@@ -73,7 +73,7 @@ public void run() {
                             setAuthenticating(false);
                             //Log exception
                             if (throwable != null) {
-                                logger.warn("Authenticating with Visual Studio Online failed", throwable);
+                                logger.warn("Authenticating with Team Services failed", throwable);
                             }
                             //try to load the team projects
                             loadProjectsFromAllAccounts();