From 8136fc4a2b4bff8a23156640cf23e70bb726b78f Mon Sep 17 00:00:00 2001
From: jau228 <jau228@hotmail.com>
Date: Thu, 6 Aug 2015 16:40:35 -0600
Subject: [PATCH 01/13] move strings from xaml to the resource file

---
 src/GitHub.VisualStudio/Resources.Designer.cs | 38 ++++++++++++++++++-
 src/GitHub.VisualStudio/Resources.resx        | 12 ++++++
 .../UI/Views/GitHubConnectContent.xaml        | 13 ++++---
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/GitHub.VisualStudio/Resources.Designer.cs b/src/GitHub.VisualStudio/Resources.Designer.cs
index 4e277b0c76..54f211bc3c 100644
--- a/src/GitHub.VisualStudio/Resources.Designer.cs
+++ b/src/GitHub.VisualStudio/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.0
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -59,5 +59,41 @@ internal Resources() {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Clone.
+        /// </summary>
+        internal static string cloneLinkContent {
+            get {
+                return ResourceManager.GetString("cloneLinkContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Create.
+        /// </summary>
+        internal static string createLinkContent {
+            get {
+                return ResourceManager.GetString("createLinkContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Login.
+        /// </summary>
+        internal static string loginContent {
+            get {
+                return ResourceManager.GetString("loginContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sign out.
+        /// </summary>
+        internal static string signOutContent {
+            get {
+                return ResourceManager.GetString("signOutContent", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/GitHub.VisualStudio/Resources.resx b/src/GitHub.VisualStudio/Resources.resx
index 1af7de150c..7588984a33 100644
--- a/src/GitHub.VisualStudio/Resources.resx
+++ b/src/GitHub.VisualStudio/Resources.resx
@@ -117,4 +117,16 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="cloneLinkContent" xml:space="preserve">
+    <value>Clone</value>
+  </data>
+  <data name="createLinkContent" xml:space="preserve">
+    <value>Create</value>
+  </data>
+  <data name="loginContent" xml:space="preserve">
+    <value>Login</value>
+  </data>
+  <data name="signOutContent" xml:space="preserve">
+    <value>Sign out</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml b/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml
index 4f9a5e9be2..4369b935c6 100644
--- a/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml
@@ -9,6 +9,7 @@
              xmlns:vsui="clr-namespace:GitHub.VisualStudio.UI.Views.Controls"
              xmlns:helpers="clr-namespace:GitHub.Helpers;assembly=GitHub.UI"
              xmlns:mtcw="clr-namespace:Microsoft.TeamFoundation.Controls.WPF;assembly=Microsoft.TeamFoundation.Controls"
+             xmlns:prop="clr-namespace:GitHub.VisualStudio"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300" d:DesignBackground="White"
              KeyboardNavigation.TabNavigation="Local">
@@ -27,14 +28,14 @@
     </UserControl.Resources>
     <Grid>
         <WrapPanel Orientation="Horizontal" Grid.Row="0" Margin="6,0,0,6">
-            <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="0" x:Name="cloneLink" Click="cloneLink_Click">Clone</Button>
+            <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="0" x:Name="cloneLink" Click="cloneLink_Click" Content="{x:Static prop:Resources.cloneLinkContent}"/>
             <Label Margin="3 0 3 0">|</Label>
-            <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="1" x:Name="createLink" Click="createLink_Click">Create</Button>
+            <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="1" x:Name="createLink" Click="createLink_Click" Content="{x:Static prop:Resources.createLinkContent}"/>
             <Label Margin="3 0 3 0">|</Label>
-            <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="2" x:Name="signOut" Click="signOut_Click"
-                    Visibility="{Binding ShowLogout, Converter={StaticResource BooleanToVisibilityConverter}}">Sign out</Button>
-            <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="2" x:Name="login" Click="login_Click"
-                    Visibility="{Binding ShowLogin, Converter={StaticResource BooleanToVisibilityConverter}}">Login</Button>
+            <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="2" x:Name="signOut" Click="signOut_Click" Content="{x:Static prop:Resources.signOutContent}"
+                    Visibility="{Binding ShowLogout, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+            <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="2" x:Name="login" Click="login_Click" Content="{x:Static prop:Resources.loginContent}"
+                    Visibility="{Binding ShowLogin, Converter={StaticResource BooleanToVisibilityConverter}}"/>
         </WrapPanel>
       </Grid>
 </UserControl>

From 93f8a7a9c8ca083a8f34acc5deb61d33aa1b0b47 Mon Sep 17 00:00:00 2001
From: jau228 <jau228@hotmail.com>
Date: Thu, 6 Aug 2015 16:47:07 -0600
Subject: [PATCH 02/13] move strings from xaml to the resource file

---
 src/GitHub.VisualStudio/Resources.Designer.cs | 36 +++++++++++++++++++
 src/GitHub.VisualStudio/Resources.resx        | 12 +++++++
 .../UI/Views/GitHubInvitationContent.xaml     | 15 ++++----
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/GitHub.VisualStudio/Resources.Designer.cs b/src/GitHub.VisualStudio/Resources.Designer.cs
index 54f211bc3c..ba2c8704b4 100644
--- a/src/GitHub.VisualStudio/Resources.Designer.cs
+++ b/src/GitHub.VisualStudio/Resources.Designer.cs
@@ -69,6 +69,15 @@ internal static string cloneLinkContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Get Started.
+        /// </summary>
+        internal static string connect_ClickContent {
+            get {
+                return ResourceManager.GetString("connect_ClickContent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Create.
         /// </summary>
@@ -78,6 +87,15 @@ internal static string createLinkContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Login.
+        /// </summary>
+        internal static string login_ClickContent {
+            get {
+                return ResourceManager.GetString("login_ClickContent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Login.
         /// </summary>
@@ -87,6 +105,15 @@ internal static string loginContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to or.
+        /// </summary>
+        internal static string orText {
+            get {
+                return ResourceManager.GetString("orText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Sign out.
         /// </summary>
@@ -95,5 +122,14 @@ internal static string signOutContent {
                 return ResourceManager.GetString("signOutContent", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sign up.
+        /// </summary>
+        internal static string signup_ClickContent {
+            get {
+                return ResourceManager.GetString("signup_ClickContent", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/GitHub.VisualStudio/Resources.resx b/src/GitHub.VisualStudio/Resources.resx
index 7588984a33..6ac2503d05 100644
--- a/src/GitHub.VisualStudio/Resources.resx
+++ b/src/GitHub.VisualStudio/Resources.resx
@@ -120,13 +120,25 @@
   <data name="cloneLinkContent" xml:space="preserve">
     <value>Clone</value>
   </data>
+  <data name="connect_ClickContent" xml:space="preserve">
+    <value>Get Started</value>
+  </data>
   <data name="createLinkContent" xml:space="preserve">
     <value>Create</value>
   </data>
   <data name="loginContent" xml:space="preserve">
     <value>Login</value>
   </data>
+  <data name="login_ClickContent" xml:space="preserve">
+    <value>Login</value>
+  </data>
+  <data name="orText" xml:space="preserve">
+    <value>or</value>
+  </data>
   <data name="signOutContent" xml:space="preserve">
     <value>Sign out</value>
   </data>
+  <data name="signup_ClickContent" xml:space="preserve">
+    <value>Sign up</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/GitHub.VisualStudio/UI/Views/GitHubInvitationContent.xaml b/src/GitHub.VisualStudio/UI/Views/GitHubInvitationContent.xaml
index d012aa375a..4d99a35e46 100644
--- a/src/GitHub.VisualStudio/UI/Views/GitHubInvitationContent.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/GitHubInvitationContent.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
              xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
+             xmlns:prop="clr-namespace:GitHub.VisualStudio"
              mc:Ignorable="d"
              DataContext="{Binding ViewModel}" d:DesignWidth="230" d:DesignHeight="120"
              KeyboardNavigation.TabNavigation="Local"
@@ -65,14 +66,14 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" KeyboardNavigation.TabIndex="0" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Left" x:Name="login" Click="login_Click"
-                    Visibility="{Binding ShowLogin, Converter={StaticResource BooleanToVisibilityConverter}}">Login</Button>
+            <Button Grid.Column="0" KeyboardNavigation.TabIndex="0" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Left" x:Name="login" Click="login_Click" Content="{x:Static prop:Resources.login_ClickContent}"
+                    Visibility="{Binding ShowLogin, Converter={StaticResource BooleanToVisibilityConverter}}"/>
             <TextBlock Grid.Column="1" Margin="3,0,3,0"
-                    Visibility="{Binding ShowLogin, Converter={StaticResource BooleanToVisibilityConverter}}">or</TextBlock>
-            <Button Grid.Column="2" KeyboardNavigation.TabIndex="1" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Left" x:Name="signup" Click="signup_Click"
-                    Visibility="{Binding ShowSignup, Converter={StaticResource BooleanToVisibilityConverter}}">Sign up</Button>
-            <Button Grid.Column="3" KeyboardNavigation.TabIndex="2" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Right" x:Name="connect" Click="connect_Click"
-                    Visibility="{Binding ShowGetStarted, Converter={StaticResource BooleanToVisibilityConverter}}">Get Started</Button>
+                    Visibility="{Binding ShowLogin, Converter={StaticResource BooleanToVisibilityConverter}}" Text="{x:Static prop:Resources.orText}"/>
+            <Button Grid.Column="2" KeyboardNavigation.TabIndex="1" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Left" x:Name="signup" Click="signup_Click" Content="{x:Static prop:Resources.signup_ClickContent}"
+                    Visibility="{Binding ShowSignup, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+            <Button Grid.Column="3" KeyboardNavigation.TabIndex="2" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Right" x:Name="connect" Click="connect_Click" Content="{x:Static prop:Resources.connect_ClickContent}"
+                    Visibility="{Binding ShowGetStarted, Converter={StaticResource BooleanToVisibilityConverter}}"/>
             <Rectangle Grid.Column="4" Width="16" Height="16" Margin="8,0,0,0" Fill="{StaticResource ConnectArrowBrush}"
                     Visibility="{Binding ShowGetStarted, Converter={StaticResource BooleanToVisibilityConverter}}"/>
         </Grid>

From be9fd1edd3f97fd633baddf611e1717af93075ef Mon Sep 17 00:00:00 2001
From: jau228 <jau228@hotmail.com>
Date: Fri, 7 Aug 2015 10:29:47 -0600
Subject: [PATCH 03/13] add CA1701 to the ruleset to suppress error

---
 src/GitHub.VisualStudio/Resources.Designer.cs | 171 ++++++++++++++++++
 src/GitHub.VisualStudio/Resources.resx        |  57 ++++++
 .../UI/Views/Controls/LoginControl.xaml       |  47 +++--
 src/common/GitHubVS.ruleset                   |   3 +-
 4 files changed, 252 insertions(+), 26 deletions(-)

diff --git a/src/GitHub.VisualStudio/Resources.Designer.cs b/src/GitHub.VisualStudio/Resources.Designer.cs
index ba2c8704b4..43129a8594 100644
--- a/src/GitHub.VisualStudio/Resources.Designer.cs
+++ b/src/GitHub.VisualStudio/Resources.Designer.cs
@@ -78,6 +78,24 @@ internal static string connect_ClickContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Could not connect to github.com.
+        /// </summary>
+        internal static string couldNotConnectToGitHubText {
+            get {
+                return ResourceManager.GetString("couldNotConnectToGitHubText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Could not connect to the server..
+        /// </summary>
+        internal static string couldNotConnectToTheServerText {
+            get {
+                return ResourceManager.GetString("couldNotConnectToTheServerText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Create.
         /// </summary>
@@ -87,6 +105,141 @@ internal static string createLinkContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Don’t have an account? .
+        /// </summary>
+        internal static string dontHaveAnAccountText {
+            get {
+                return ResourceManager.GetString("dontHaveAnAccountText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Don’t have GitHub Enterprise? .
+        /// </summary>
+        internal static string dontHaveGitHubEnterpriseText {
+            get {
+                return ResourceManager.GetString("dontHaveGitHubEnterpriseText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please check your internet connection and try again..
+        /// </summary>
+        internal static string dotComConnectionFailedMessageMessage {
+            get {
+                return ResourceManager.GetString("dotComConnectionFailedMessageMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to (forgot your password?).
+        /// </summary>
+        internal static string dotComForgotPasswordLinkContent {
+            get {
+                return ResourceManager.GetString("dotComForgotPasswordLinkContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Log in.
+        /// </summary>
+        internal static string dotComLogInButtonContent {
+            get {
+                return ResourceManager.GetString("dotComLogInButtonContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Check your username and password, then try again.
+        /// </summary>
+        internal static string dotComLoginFailedMessageMessage {
+            get {
+                return ResourceManager.GetString("dotComLoginFailedMessageMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Password.
+        /// </summary>
+        internal static string dotComPasswordPromptText {
+            get {
+                return ResourceManager.GetString("dotComPasswordPromptText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Username or email.
+        /// </summary>
+        internal static string dotComUserNameOrEmailPromptText {
+            get {
+                return ResourceManager.GetString("dotComUserNameOrEmailPromptText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The host isn&apos;t available or is not a GitHub Enterprise server. Check the address and try again..
+        /// </summary>
+        internal static string enterpriseConnectingFailedMessage {
+            get {
+                return ResourceManager.GetString("enterpriseConnectingFailedMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Log in.
+        /// </summary>
+        internal static string enterpriseLogInButtonContent {
+            get {
+                return ResourceManager.GetString("enterpriseLogInButtonContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Check your username and password, then try again.
+        /// </summary>
+        internal static string enterpriseLoginFailedMessageMessage {
+            get {
+                return ResourceManager.GetString("enterpriseLoginFailedMessageMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Password.
+        /// </summary>
+        internal static string enterprisePasswordPromptText {
+            get {
+                return ResourceManager.GetString("enterprisePasswordPromptText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to GitHub Enterprise server address.
+        /// </summary>
+        internal static string enterpriseUrlPromptText {
+            get {
+                return ResourceManager.GetString("enterpriseUrlPromptText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Username or email.
+        /// </summary>
+        internal static string enterpriseUserNameOrEmailPromptText {
+            get {
+                return ResourceManager.GetString("enterpriseUserNameOrEmailPromptText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Learn more.
+        /// </summary>
+        internal static string learnMoreLinkContent {
+            get {
+                return ResourceManager.GetString("learnMoreLinkContent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Login.
         /// </summary>
@@ -105,6 +258,15 @@ internal static string loginContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Login failed..
+        /// </summary>
+        internal static string loginFailedText {
+            get {
+                return ResourceManager.GetString("loginFailedText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to or.
         /// </summary>
@@ -114,6 +276,15 @@ internal static string orText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Sign up.
+        /// </summary>
+        internal static string pricingLinkContent {
+            get {
+                return ResourceManager.GetString("pricingLinkContent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Sign out.
         /// </summary>
diff --git a/src/GitHub.VisualStudio/Resources.resx b/src/GitHub.VisualStudio/Resources.resx
index 6ac2503d05..75de2c5739 100644
--- a/src/GitHub.VisualStudio/Resources.resx
+++ b/src/GitHub.VisualStudio/Resources.resx
@@ -123,18 +123,75 @@
   <data name="connect_ClickContent" xml:space="preserve">
     <value>Get Started</value>
   </data>
+  <data name="couldNotConnectToGitHubText" xml:space="preserve">
+    <value>Could not connect to github.com</value>
+  </data>
+  <data name="couldNotConnectToTheServerText" xml:space="preserve">
+    <value>Could not connect to the server.</value>
+  </data>
   <data name="createLinkContent" xml:space="preserve">
     <value>Create</value>
   </data>
+  <data name="dontHaveAnAccountText" xml:space="preserve">
+    <value>Don’t have an account? </value>
+  </data>
+  <data name="dontHaveGitHubEnterpriseText" xml:space="preserve">
+    <value>Don’t have GitHub Enterprise? </value>
+  </data>
+  <data name="dotComConnectionFailedMessageMessage" xml:space="preserve">
+    <value>Please check your internet connection and try again.</value>
+  </data>
+  <data name="dotComForgotPasswordLinkContent" xml:space="preserve">
+    <value>(forgot your password?)</value>
+  </data>
+  <data name="dotComLogInButtonContent" xml:space="preserve">
+    <value>Log in</value>
+  </data>
+  <data name="dotComLoginFailedMessageMessage" xml:space="preserve">
+    <value>Check your username and password, then try again</value>
+  </data>
+  <data name="dotComPasswordPromptText" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="dotComUserNameOrEmailPromptText" xml:space="preserve">
+    <value>Username or email</value>
+  </data>
+  <data name="enterpriseConnectingFailedMessage" xml:space="preserve">
+    <value>The host isn't available or is not a GitHub Enterprise server. Check the address and try again.</value>
+  </data>
+  <data name="enterpriseLogInButtonContent" xml:space="preserve">
+    <value>Log in</value>
+  </data>
+  <data name="enterpriseLoginFailedMessageMessage" xml:space="preserve">
+    <value>Check your username and password, then try again</value>
+  </data>
+  <data name="enterprisePasswordPromptText" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="enterpriseUrlPromptText" xml:space="preserve">
+    <value>GitHub Enterprise server address</value>
+  </data>
+  <data name="enterpriseUserNameOrEmailPromptText" xml:space="preserve">
+    <value>Username or email</value>
+  </data>
+  <data name="learnMoreLinkContent" xml:space="preserve">
+    <value>Learn more</value>
+  </data>
   <data name="loginContent" xml:space="preserve">
     <value>Login</value>
   </data>
+  <data name="loginFailedText" xml:space="preserve">
+    <value>Login failed.</value>
+  </data>
   <data name="login_ClickContent" xml:space="preserve">
     <value>Login</value>
   </data>
   <data name="orText" xml:space="preserve">
     <value>or</value>
   </data>
+  <data name="pricingLinkContent" xml:space="preserve">
+    <value>Sign up</value>
+  </data>
   <data name="signOutContent" xml:space="preserve">
     <value>Sign out</value>
   </data>
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
index cb475378df..baf98c012e 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
@@ -7,6 +7,7 @@
              xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive"
              xmlns:helpers="clr-namespace:GitHub.Helpers;assembly=GitHub.UI"
              xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
+             xmlns:prop="clr-namespace:GitHub.VisualStudio"
              mc:Ignorable="d"
              d:DesignWidth="414"
              d:DesignHeight="440"
@@ -77,11 +78,11 @@
                 <DockPanel Style="{StaticResource TabDockPanel}">
                     <StackPanel DockPanel.Dock="Bottom" Margin="0">
                         <Border Style="{StaticResource LoginButtonBorder}">
-                            <ui:OcticonCircleButton x:Name="dotComLogInButton" Icon="check" Content="Log in" IsDefault="True" />
+                            <ui:OcticonCircleButton x:Name="dotComLogInButton" Icon="check" Content="{x:Static prop:Resources.dotComLogInButtonContent}" IsDefault="True" />
                         </Border>
 
-                        <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0">
-                            Don’t have an account? <Hyperlink x:Name="pricingLink" ToolTip="https://github.com/pricing">Sign up</Hyperlink>
+                        <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0" Text="{x:Static prop:Resources.dontHaveAnAccountText}">
+                            <Hyperlink x:Name="pricingLink" ToolTip="https://github.com/pricing"><TextBlock Text="{x:Static prop:Resources.pricingLinkContent}"/></Hyperlink>
                         </TextBlock>
                     </StackPanel>
 
@@ -90,25 +91,23 @@
                         <StackPanel Style="{StaticResource FormFieldStackPanel}">
                             <ui:PromptTextBox
                                 x:Name="dotComUserNameOrEmail"
-                                PromptText="Username or email"
+                                PromptText="{x:Static prop:Resources.dotComUserNameOrEmailPromptText}"
                                 Margin="0,0,0,10" />
                             
-                            <ui:SecurePasswordBox x:Name="dotComPassword" PromptText="Password" />
+                            <ui:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static prop:Resources.dotComPasswordPromptText}" />
 
                             <uirx:ErrorMessageDisplay
                                 x:Name="dotComLoginFailedMessage"
-                                Message="Check your username and password, then try again">
-                                <TextBlock TextWrapping="Wrap">
-                                    Login failed. (<Hyperlink x:Name="dotComForgotPasswordLink">forgot your password?</Hyperlink>)
+                                Message="{x:Static prop:Resources.dotComLoginFailedMessageMessage}">
+                                <TextBlock TextWrapping="Wrap" Text="{x:Static prop:Resources.loginFailedText}">
+                                    <Hyperlink x:Name="dotComForgotPasswordLink"><TextBlock Text="{x:Static prop:Resources.dotComForgotPasswordLinkContent}"/></Hyperlink>
                                 </TextBlock>
                             </uirx:ErrorMessageDisplay>
 
                             <uirx:ErrorMessageDisplay
                                 x:Name="dotComConnectionFailedMessage"
-                                Message="Please check your internet connection and try again.">
-                                <TextBlock TextWrapping="Wrap">
-                                    Could not connect to github.com
-                                </TextBlock>
+                                Message="{x:Static prop:Resources.dotComConnectionFailedMessageMessage}">
+                                <TextBlock TextWrapping="Wrap" Text="{x:Static prop:Resources.couldNotConnectToGitHubText}"/>
                             </uirx:ErrorMessageDisplay>
 
                             <uirx:ValidationMessage
@@ -128,11 +127,11 @@
                 <DockPanel Style="{StaticResource TabDockPanel}">
                     <StackPanel DockPanel.Dock="Bottom">
                         <Border Style="{StaticResource LoginButtonBorder}">
-                            <ui:OcticonCircleButton x:Name="enterpriseLogInButton" Icon="check" Content="Log in" IsDefault="True" />
+                            <ui:OcticonCircleButton x:Name="enterpriseLogInButton" Icon="check" Content="{x:Static prop:Resources.enterpriseLogInButtonContent}" IsDefault="True" />
                         </Border>
                         
-                        <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0">
-                            Don’t have GitHub Enterprise? <Hyperlink x:Name="learnMoreLink" ToolTip="enterprise.github.com">Learn more</Hyperlink>
+                        <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0" Text="{x:Static prop:Resources.dontHaveGitHubEnterpriseText}">
+                            <Hyperlink x:Name="learnMoreLink" ToolTip="enterprise.github.com"><TextBlock Text="{x:Static prop:Resources.learnMoreLinkContent}"></TextBlock></Hyperlink>
                         </TextBlock>
                     </StackPanel>
                     
@@ -142,12 +141,12 @@
                         
                         <ui:PromptTextBox
                             x:Name="enterpriseUserNameOrEmail"
-                            PromptText="Username or email"
+                            PromptText="{x:Static prop:Resources.enterpriseUserNameOrEmailPromptText}"
                             Margin="0,0,0,10" />
 
-                        <ui:SecurePasswordBox x:Name="enterprisePassword" PromptText="Password" Margin="0,0,0,10" />
+                        <ui:SecurePasswordBox x:Name="enterprisePassword" PromptText="{x:Static prop:Resources.enterprisePasswordPromptText}" Margin="0,0,0,10" />
                         
-                        <ui:PromptTextBox x:Name="enterpriseUrl"  PromptText="GitHub Enterprise server address" />
+                        <ui:PromptTextBox x:Name="enterpriseUrl"  PromptText="{x:Static prop:Resources.enterpriseUrlPromptText}" />
 
                         <uirx:ValidationMessage
                             x:Name="enterpriseUserNameOrEmailValidationMessage"
@@ -164,18 +163,16 @@
 
                         <uirx:ErrorMessageDisplay
                             x:Name="enterpriseLoginFailedMessage"
-                            Message="Check your username and password, then try again">
-                            <TextBlock TextWrapping="Wrap">
-                                Login failed (<Hyperlink x:Name="enterpriseForgotPasswordLink">forgot your password?</Hyperlink>)
+                            Message="{x:Static prop:Resources.enterpriseLoginFailedMessageMessage}">
+                            <TextBlock TextWrapping="Wrap" Text="{x:Static prop:Resources.loginFailedText}">
+                                <Hyperlink x:Name="enterpriseForgotPasswordLink"><TextBlock Text="{x:Static prop:Resources.dotComForgotPasswordLinkContent}"/></Hyperlink>
                             </TextBlock>
                         </uirx:ErrorMessageDisplay>
 
                         <uirx:ErrorMessageDisplay
                             x:Name="enterpriseConnectingFailedMessage"
-                            Message="The host isn't available or is not a GitHub Enterprise server. Check the address and try again.">
-                            <TextBlock TextWrapping="Wrap">
-                                Could not connect to the server.
-                            </TextBlock>
+                            Message="{x:Static prop:Resources.enterpriseConnectingFailedMessage}">
+                            <TextBlock TextWrapping="Wrap" Text="{x:Static prop:Resources.couldNotConnectToTheServerText}"/>
                         </uirx:ErrorMessageDisplay>
                     </StackPanel>
                 </DockPanel>
diff --git a/src/common/GitHubVS.ruleset b/src/common/GitHubVS.ruleset
index bfce382cdc..01a247bf88 100644
--- a/src/common/GitHubVS.ruleset
+++ b/src/common/GitHubVS.ruleset
@@ -37,6 +37,7 @@
         <Rule Id="CA1501" Action="None" />
         <Rule Id="CA1502" Action="None" />
         <Rule Id="CA1506" Action="None" />
+		<Rule Id="CA1701" Action="None" />
         <Rule Id="CA1702" Action="None" />
         <Rule Id="CA1704" Action="None" />
         <Rule Id="CA1707" Action="None" />
@@ -67,6 +68,6 @@
         <Rule Id="CA2210" Action="None" />
         <Rule Id="CA2211" Action="None" />
         <Rule Id="CA2213" Action="None" />
-        <Rule Id="CA2227" Action="None" />
+        <Rule Id="CA2227" Action="None" />		
   </Rules>
 </RuleSet>

From 42cd53afdf9f7c62f6127fe0535baff64695a926 Mon Sep 17 00:00:00 2001
From: jau228 <jau228@hotmail.com>
Date: Fri, 7 Aug 2015 14:33:54 -0600
Subject: [PATCH 04/13] move strings from xaml to the resource file

---
 src/GitHub.VisualStudio/Resources.Designer.cs | 315 ++++++++++++++++++
 src/GitHub.VisualStudio/Resources.resx        | 105 ++++++
 .../UI/Views/Controls/LoginControl.xaml       |   2 +-
 .../Controls/RepositoryCloneControl.xaml      |  13 +-
 .../Controls/RepositoryCreationControl.xaml   |  36 +-
 .../Controls/RepositoryPublishControl.xaml    |  30 +-
 .../UI/Views/Controls/TwoFactorControl.xaml   |  21 +-
 7 files changed, 471 insertions(+), 51 deletions(-)

diff --git a/src/GitHub.VisualStudio/Resources.Designer.cs b/src/GitHub.VisualStudio/Resources.Designer.cs
index 43129a8594..f3fccce480 100644
--- a/src/GitHub.VisualStudio/Resources.Designer.cs
+++ b/src/GitHub.VisualStudio/Resources.Designer.cs
@@ -60,6 +60,51 @@ internal Resources() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid authentication code.
+        /// </summary>
+        internal static string authenticationFailedLabelContent {
+            get {
+                return ResourceManager.GetString("authenticationFailedLabelContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Try entering the code again or clicking the resend button to get a new authentication code..
+        /// </summary>
+        internal static string authenticationFailedLabelMessage {
+            get {
+                return ResourceManager.GetString("authenticationFailedLabelMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Authentication code sent!.
+        /// </summary>
+        internal static string authenticationSentLabelContent {
+            get {
+                return ResourceManager.GetString("authenticationSentLabelContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to If you do not receive the authentication code, contact support@github.com..
+        /// </summary>
+        internal static string authenticationSentLabelMessage {
+            get {
+                return ResourceManager.GetString("authenticationSentLabelMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Browse.
+        /// </summary>
+        internal static string browsePathButtonContent {
+            get {
+                return ResourceManager.GetString("browsePathButtonContent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Clone.
         /// </summary>
@@ -105,6 +150,33 @@ internal static string createLinkContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Create.
+        /// </summary>
+        internal static string createRepositoryButtonText {
+            get {
+                return ResourceManager.GetString("createRepositoryButtonText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Description (Optional).
+        /// </summary>
+        internal static string descriptionOptionalText {
+            get {
+                return ResourceManager.GetString("descriptionOptionalText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Description.
+        /// </summary>
+        internal static string descriptionText {
+            get {
+                return ResourceManager.GetString("descriptionText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Don’t have an account? .
         /// </summary>
@@ -231,6 +303,42 @@ internal static string enterpriseUserNameOrEmailPromptText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to An error occurred while loading repositories.
+        /// </summary>
+        internal static string ErrorMessageDisplayContent {
+            get {
+                return ResourceManager.GetString("ErrorMessageDisplayContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Some or all repositories may not have loaded. Close the dialog and try again..
+        /// </summary>
+        internal static string ErrorMessageDisplayMessage {
+            get {
+                return ResourceManager.GetString("ErrorMessageDisplayMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Search repositories.
+        /// </summary>
+        internal static string filterTextPromptText {
+            get {
+                return ResourceManager.GetString("filterTextPromptText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Git ignore.
+        /// </summary>
+        internal static string ignoreTemplateListText {
+            get {
+                return ResourceManager.GetString("ignoreTemplateListText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Learn more.
         /// </summary>
@@ -240,6 +348,24 @@ internal static string learnMoreLinkContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to License.
+        /// </summary>
+        internal static string licenseListText {
+            get {
+                return ResourceManager.GetString("licenseListText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Local path.
+        /// </summary>
+        internal static string localPathText {
+            get {
+                return ResourceManager.GetString("localPathText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Login.
         /// </summary>
@@ -267,6 +393,51 @@ internal static string loginFailedText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Log in.
+        /// </summary>
+        internal static string loginLabelPrefixText {
+            get {
+                return ResourceManager.GetString("loginLabelPrefixText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Private Repository.
+        /// </summary>
+        internal static string makePrivateContent {
+            get {
+                return ResourceManager.GetString("makePrivateContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Name.
+        /// </summary>
+        internal static string nameText {
+            get {
+                return ResourceManager.GetString("nameText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No repositories.
+        /// </summary>
+        internal static string noRepositoriesMessageText {
+            get {
+                return ResourceManager.GetString("noRepositoriesMessageText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open the two-factor authentication app on your device to view your authentication code..
+        /// </summary>
+        internal static string openTwoFactorAuthAppText {
+            get {
+                return ResourceManager.GetString("openTwoFactorAuthAppText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to or.
         /// </summary>
@@ -276,6 +447,15 @@ internal static string orText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to for $7/month.
+        /// </summary>
+        internal static string perMonthText {
+            get {
+                return ResourceManager.GetString("perMonthText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Sign up.
         /// </summary>
@@ -285,6 +465,78 @@ internal static string pricingLinkContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to private repositories..
+        /// </summary>
+        internal static string privateRepositoriesText {
+            get {
+                return ResourceManager.GetString("privateRepositoriesText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Private repositories require a.
+        /// </summary>
+        internal static string privateRepoText {
+            get {
+                return ResourceManager.GetString("privateRepoText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Publish.
+        /// </summary>
+        internal static string publishText {
+            get {
+                return ResourceManager.GetString("publishText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Read more.
+        /// </summary>
+        internal static string readMoreText {
+            get {
+                return ResourceManager.GetString("readMoreText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to This repository does not have a remote. Fill out the form to publish it to GitHub..
+        /// </summary>
+        internal static string RepoDoesNotHaveRemoteText {
+            get {
+                return ResourceManager.GetString("RepoDoesNotHaveRemoteText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Repository Name.
+        /// </summary>
+        internal static string RepoNameText {
+            get {
+                return ResourceManager.GetString("RepoNameText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Resend.
+        /// </summary>
+        internal static string resendCodeButtonContent {
+            get {
+                return ResourceManager.GetString("resendCodeButtonContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Send the code to your registered SMS Device again.
+        /// </summary>
+        internal static string resendCodeButtonToolTip {
+            get {
+                return ResourceManager.GetString("resendCodeButtonToolTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Sign out.
         /// </summary>
@@ -302,5 +554,68 @@ internal static string signup_ClickContent {
                 return ResourceManager.GetString("signup_ClickContent", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Two-factor authentication.
+        /// </summary>
+        internal static string twoFactorAuthText {
+            get {
+                return ResourceManager.GetString("twoFactorAuthText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Manage plans.
+        /// </summary>
+        internal static string upgradeAccountLinkContent {
+            get {
+                return ResourceManager.GetString("upgradeAccountLinkContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to manage plans.
+        /// </summary>
+        internal static string upgradeAccountLinkToolTip {
+            get {
+                return ResourceManager.GetString("upgradeAccountLinkToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to micro plan.
+        /// </summary>
+        internal static string upgradeToMicroLinkContent {
+            get {
+                return ResourceManager.GetString("upgradeToMicroLinkContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to upgrade.
+        /// </summary>
+        internal static string upgradeToMicroLinkToolTip {
+            get {
+                return ResourceManager.GetString("upgradeToMicroLinkToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Verify.
+        /// </summary>
+        internal static string verifyText {
+            get {
+                return ResourceManager.GetString("verifyText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You&apos;re using.
+        /// </summary>
+        internal static string youreUsingText {
+            get {
+                return ResourceManager.GetString("youreUsingText", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/GitHub.VisualStudio/Resources.resx b/src/GitHub.VisualStudio/Resources.resx
index 75de2c5739..5aeb48330f 100644
--- a/src/GitHub.VisualStudio/Resources.resx
+++ b/src/GitHub.VisualStudio/Resources.resx
@@ -117,6 +117,21 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="authenticationFailedLabelContent" xml:space="preserve">
+    <value>Invalid authentication code</value>
+  </data>
+  <data name="authenticationFailedLabelMessage" xml:space="preserve">
+    <value>Try entering the code again or clicking the resend button to get a new authentication code.</value>
+  </data>
+  <data name="authenticationSentLabelContent" xml:space="preserve">
+    <value>Authentication code sent!</value>
+  </data>
+  <data name="authenticationSentLabelMessage" xml:space="preserve">
+    <value>If you do not receive the authentication code, contact support@github.com.</value>
+  </data>
+  <data name="browsePathButtonContent" xml:space="preserve">
+    <value>Browse</value>
+  </data>
   <data name="cloneLinkContent" xml:space="preserve">
     <value>Clone</value>
   </data>
@@ -132,6 +147,15 @@
   <data name="createLinkContent" xml:space="preserve">
     <value>Create</value>
   </data>
+  <data name="createRepositoryButtonText" xml:space="preserve">
+    <value>Create</value>
+  </data>
+  <data name="descriptionOptionalText" xml:space="preserve">
+    <value>Description (Optional)</value>
+  </data>
+  <data name="descriptionText" xml:space="preserve">
+    <value>Description</value>
+  </data>
   <data name="dontHaveAnAccountText" xml:space="preserve">
     <value>Don’t have an account? </value>
   </data>
@@ -174,28 +198,109 @@
   <data name="enterpriseUserNameOrEmailPromptText" xml:space="preserve">
     <value>Username or email</value>
   </data>
+  <data name="ErrorMessageDisplayContent" xml:space="preserve">
+    <value>An error occurred while loading repositories</value>
+  </data>
+  <data name="ErrorMessageDisplayMessage" xml:space="preserve">
+    <value>Some or all repositories may not have loaded. Close the dialog and try again.</value>
+  </data>
+  <data name="filterTextPromptText" xml:space="preserve">
+    <value>Search repositories</value>
+  </data>
+  <data name="ignoreTemplateListText" xml:space="preserve">
+    <value>Git ignore</value>
+  </data>
   <data name="learnMoreLinkContent" xml:space="preserve">
     <value>Learn more</value>
   </data>
+  <data name="licenseListText" xml:space="preserve">
+    <value>License</value>
+  </data>
+  <data name="localPathText" xml:space="preserve">
+    <value>Local path</value>
+  </data>
   <data name="loginContent" xml:space="preserve">
     <value>Login</value>
   </data>
   <data name="loginFailedText" xml:space="preserve">
     <value>Login failed.</value>
   </data>
+  <data name="loginLabelPrefixText" xml:space="preserve">
+    <value>Log in</value>
+  </data>
   <data name="login_ClickContent" xml:space="preserve">
     <value>Login</value>
   </data>
+  <data name="makePrivateContent" xml:space="preserve">
+    <value>Private Repository</value>
+  </data>
+  <data name="nameText" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="noRepositoriesMessageText" xml:space="preserve">
+    <value>No repositories</value>
+  </data>
+  <data name="openTwoFactorAuthAppText" xml:space="preserve">
+    <value>Open the two-factor authentication app on your device to view your authentication code.</value>
+  </data>
   <data name="orText" xml:space="preserve">
     <value>or</value>
   </data>
+  <data name="perMonthText" xml:space="preserve">
+    <value>for $7/month</value>
+  </data>
   <data name="pricingLinkContent" xml:space="preserve">
     <value>Sign up</value>
   </data>
+  <data name="privateRepositoriesText" xml:space="preserve">
+    <value>private repositories.</value>
+  </data>
+  <data name="privateRepoText" xml:space="preserve">
+    <value>Private repositories require a</value>
+  </data>
+  <data name="publishText" xml:space="preserve">
+    <value>Publish</value>
+  </data>
+  <data name="readMoreText" xml:space="preserve">
+    <value>Read more</value>
+  </data>
+  <data name="RepoDoesNotHaveRemoteText" xml:space="preserve">
+    <value>This repository does not have a remote. Fill out the form to publish it to GitHub.</value>
+  </data>
+  <data name="RepoNameText" xml:space="preserve">
+    <value>Repository Name</value>
+  </data>
+  <data name="resendCodeButtonContent" xml:space="preserve">
+    <value>_Resend</value>
+  </data>
+  <data name="resendCodeButtonToolTip" xml:space="preserve">
+    <value>Send the code to your registered SMS Device again</value>
+  </data>
   <data name="signOutContent" xml:space="preserve">
     <value>Sign out</value>
   </data>
   <data name="signup_ClickContent" xml:space="preserve">
     <value>Sign up</value>
   </data>
+  <data name="twoFactorAuthText" xml:space="preserve">
+    <value>Two-factor authentication</value>
+  </data>
+  <data name="upgradeAccountLinkContent" xml:space="preserve">
+    <value>Manage plans</value>
+  </data>
+  <data name="upgradeAccountLinkToolTip" xml:space="preserve">
+    <value>manage plans</value>
+  </data>
+  <data name="upgradeToMicroLinkContent" xml:space="preserve">
+    <value>micro plan</value>
+  </data>
+  <data name="upgradeToMicroLinkToolTip" xml:space="preserve">
+    <value>upgrade</value>
+  </data>
+  <data name="verifyText" xml:space="preserve">
+    <value>Verify</value>
+  </data>
+  <data name="youreUsingText" xml:space="preserve">
+    <value>You're using</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
index baf98c012e..b0508bdb81 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
@@ -44,7 +44,7 @@
                 Margin="0,0,0,10"
                 Style="{DynamicResource GitHubH1TextBlock}"
                 IsHitTestVisible="False"
-                Text="Log in" />
+                Text="{x:Static prop:Resources.loginLabelPrefixText}" />
             
             <ui:HorizontalShadowDivider />
         </StackPanel>
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml
index 3c4374aa39..b2ff1d06ec 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml
@@ -9,6 +9,7 @@
              xmlns:helpers="clr-namespace:GitHub.Helpers;assembly=GitHub.UI"
              xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
              xmlns:GitHub="clr-namespace:GitHub.VisualStudio.Helpers"
+             xmlns:prop="clr-namespace:GitHub.VisualStudio"
              mc:Ignorable="d"
              d:DesignWidth="414"
              d:DesignHeight="440"
@@ -43,7 +44,7 @@
         <ui:FilterTextBox
 		    x:Name="filterText" 
             DockPanel.Dock="Top"
-		    PromptText="Search repositories" 
+		    PromptText="{x:Static prop:Resources.filterTextPromptText}" 
 		    Margin="10" />
         
         <ui:GitHubProgressBar
@@ -65,8 +66,8 @@
                 Icon="stop"
                 Visibility="Visible"
                 Margin="8,0"
-                Content="An error occurred while loading repositories"
-                Message="Some or all repositories may not have loaded. Close the dialog and try again." />
+                Content="{x:Static prop:Resources.ErrorMessageDisplayContent}"
+                Message="{x:Static prop:Resources.ErrorMessageDisplayMessage}" />
 		</StackPanel>
 
         <ui:OcticonCircleButton
@@ -104,7 +105,7 @@
                     VerticalContentAlignment="Center"
                     Padding="0"
                     Margin="4,0,4,0"
-                    Style="{StaticResource GitHubBlueLinkButton}">Browse</Button>
+                    Style="{StaticResource GitHubBlueLinkButton}" Content="{x:Static prop:Resources.browsePathButtonContent}"/>
             </Grid>
         </Border>
 
@@ -216,9 +217,7 @@
                     Margin="0,-70,0,0">
                     <TextBlock
                         HorizontalAlignment="Center"
-                        Style="{DynamicResource GitHubH2TextBlock}">
-                        No repositories
-                    </TextBlock>
+                        Style="{DynamicResource GitHubH2TextBlock}" Text="{x:Static prop:Resources.noRepositoriesMessageText}"/>
                 </StackPanel>
             </Grid>
 		</Border>
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml
index 2dee57c56b..7541898e64 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml
@@ -9,6 +9,7 @@
              xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
              xmlns:GitHub="clr-namespace:GitHub.VisualStudio.Helpers"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:prop="clr-namespace:GitHub.VisualStudio"
              mc:Ignorable="d"
              d:DesignWidth="414"
              d:DesignHeight="440"
@@ -40,7 +41,7 @@
             x:Name="createRepositoryButton"
             HorizontalAlignment="Center"
             Icon="check">
-            <TextBlock>Create</TextBlock>
+            <TextBlock Text="{x:Static prop:Resources.createRepositoryButtonText}"/>
         </ui:OcticonCircleButton>
 
         <StackPanel>
@@ -101,7 +102,7 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
-                <Label Grid.Column="0" Grid.Row="0" Target="{Binding ElementName=nameText}">Name</Label>
+                <Label Grid.Column="0" Grid.Row="0" Target="{Binding ElementName=nameText}" Content="{x:Static prop:Resources.nameText}"/>
                 <ui:PromptTextBox x:Name="nameText" Grid.Column="1" Grid.Row="0" MaxLength="{x:Static GitHub:Constants.MaxRepositoryNameLength}"/>
 
                 <StackPanel Grid.Column="1" Grid.Row="1">
@@ -117,10 +118,10 @@
                         Fill="#f39c12" />
                 </StackPanel>
 
-                <Label Grid.Column="0" Grid.Row="2" Target="{Binding ElementName=description}">Description</Label>
+                <Label Grid.Column="0" Grid.Row="2" Target="{Binding ElementName=description}" Content="{x:Static prop:Resources.descriptionText}"/>
                 <ui:PromptTextBox x:Name="description" Grid.Column="1" Grid.Row="2"/>
 
-                <Label Grid.Column="0" Grid.Row="3" Target="{Binding ElementName=localPathText}">Local path</Label>
+                <Label Grid.Column="0" Grid.Row="3" Target="{Binding ElementName=localPathText}" Content="{x:Static prop:Resources.localPathText}"/>
                 <Grid Grid.Column="1" Grid.Row="3">
 
                     <Grid.ColumnDefinitions>
@@ -136,7 +137,7 @@
                         Grid.Row="0"
                         Padding="0"
                         Margin="3,0,0,0"
-                        Style="{StaticResource GitHubBlueLinkButton}">Browse</Button>
+                        Style="{StaticResource GitHubBlueLinkButton}" Content="{x:Static prop:Resources.browsePathButtonContent}"/>
                 </Grid>
 
                 <uirx:ValidationMessage
@@ -145,7 +146,7 @@
                     Grid.Row="4"
                     ValidatesControl="{Binding ElementName=localPathText}" />
 
-                <Label Grid.Column="0" Grid.Row="5" Target="{Binding ElementName=ignoreTemplateList}">Git ignore</Label>
+                <Label Grid.Column="0" Grid.Row="5" Target="{Binding ElementName=ignoreTemplateList}" Content="{x:Static prop:Resources.ignoreTemplateListText}"/>
                 <uirx:FilteredComboBox
                     x:Name="ignoreTemplateList"
                     Grid.Column="1"
@@ -166,7 +167,7 @@
                     </ComboBox.ItemTemplate>
                 </uirx:FilteredComboBox>
 
-                <Label Grid.Column="0" Grid.Row="6" Target="{Binding ElementName=licenseList}">License</Label>
+                <Label Grid.Column="0" Grid.Row="6" Target="{Binding ElementName=licenseList}" Content="{x:Static prop:Resources.licenseListText}"/>
                 <uirx:FilteredComboBox
                     x:Name="licenseList"
                     Grid.Column="1"
@@ -217,35 +218,34 @@
                     x:Name="makePrivate"
                     Grid.Column="1"
                     Grid.Row="9"
-                    Content="Private Repository"
+                    Content="{x:Static prop:Resources.makePrivateContent}"
                     Style="{DynamicResource BlueRoundedCheckBox}"
                     Padding="8,0,0,0" />
                 <Grid Grid.Column="1" Grid.Row="10">
                     <Label x:Name="upgradeToMicroPlanWarning"  HorizontalAlignment="Left" Visibility="Collapsed">
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                            <TextBlock>Private repositories require a</TextBlock>
+                            <TextBlock Text="{x:Static prop:Resources.privateRepoText}"/>
                             <ui:OcticonLinkButton 
                             x:Name="upgradeToMicroLink"
                             FontSize="12"
                             Icon="link_external" 
-                            Content="micro plan"
-                            ToolTip="upgrade"
+                            Content="{x:Static prop:Resources.upgradeToMicroLinkContent}"
+                            ToolTip="{x:Static prop:Resources.upgradeToMicroLinkToolTip}"
                             Margin="5,0"/>
-                            <TextBlock>for $7/month</TextBlock>
+                            <TextBlock Text="{x:Static prop:Resources.perMonthText}"/>
                         </StackPanel>
                     </Label>
                     <Label x:Name="upgradePlanWarning"  HorizontalAlignment="Left" Visibility="Collapsed">
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                            <TextBlock>You're using 
-                                <Run x:Name="ownedPrivateReposText"/>/<Run  x:Name="privateReposInPlanText"/>
-                                private repositories.
-                            </TextBlock>
+                            <TextBlock Text="{x:Static prop:Resources.youreUsingText}"/> 
+                                <TextBlock><Run x:Name="ownedPrivateReposText"/>/<Run  x:Name="privateReposInPlanText"/></TextBlock>
+                            <TextBlock Text="{x:Static prop:Resources.privateRepositoriesText}"/>
                             <ui:OcticonLinkButton 
                             x:Name="upgradeAccountLink"
                             FontSize="12"
                             Icon="link_external" 
-                            Content="Manage plans"
-                            ToolTip="manage plans"
+                            Content="{x:Static prop:Resources.upgradeToMicroLinkContent}"
+                            ToolTip="{x:Static prop:Resources.upgradeToMicroLinkToolTip}"
                             Margin="5,0"/>
                         </StackPanel>
                     </Label>
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml
index 263921c77f..b152213541 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml
@@ -10,6 +10,7 @@
              xmlns:GitHub="clr-namespace:GitHub.VisualStudio.Helpers"
              xmlns:converters="clr-namespace:GitHub.VisualStudio.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:prop="clr-namespace:GitHub.VisualStudio"
              mc:Ignorable="d" 
              d:DesignHeight="440"
              d:DesignWidth="414"
@@ -56,7 +57,7 @@
                     TextWrapping="Wrap"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Stretch"
-                    Text="This repository does not have a remote. Fill out the form to publish it to GitHub."
+                    Text="{x:Static prop:Resources.RepoDoesNotHaveRemoteText}"
                     Foreground="{DynamicResource VsBrush.GrayText}"
                     TextTrimming="CharacterEllipsis"
                     ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}"/>
@@ -101,7 +102,7 @@
             <TextBlock Margin="7,4,0,0"
                        IsHitTestVisible="False"
                        Visibility="{Binding ElementName=nameText, Path=Text.Length, Converter={StaticResource CountToVisibilityConverter}}"
-                       Text="Repository Name"
+                       Text="{x:Static prop:Resources.RepoNameText}"
                        Foreground="{DynamicResource VsBrush.GrayText}" />
         </Grid>
 
@@ -117,39 +118,38 @@
             <TextBlock Margin="7,12,0,0"
                        IsHitTestVisible="False"
                        Visibility="{Binding ElementName=description, Path=Text.Length, Converter={StaticResource CountToVisibilityConverter}}"
-                       Text="Description (Optional)"
+                       Text="{x:Static prop:Resources.descriptionOptionalText}"
                        Foreground="{DynamicResource VsBrush.GrayText}" />
         </Grid>
 
         <CheckBox x:Name="makePrivate"
                   Margin="0,8,0,0"
-                  Style="{StaticResource VSStyledCheckBox}">Private Repository</CheckBox>
+                  Style="{StaticResource VSStyledCheckBox}" Content="{x:Static prop:Resources.makePrivateContent}"/>
         
         <Label x:Name="upgradeToMicroPlanWarning" HorizontalAlignment="Left" Visibility="Collapsed">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                <TextBlock>Private repositories require a</TextBlock>
+                <TextBlock Text="{x:Static prop:Resources.privateRepoText}"/>
                 <ui:OcticonLinkButton
                     x:Name="upgradeToMicroLink"
                     FontSize="12"
                     Icon="link_external" 
-                    Content="micro plan"
-                    ToolTip="upgrade"
+                    Content="{x:Static prop:Resources.upgradeToMicroLinkContent}"
+                    ToolTip="{x:Static prop:Resources.upgradeToMicroLinkToolTip}"
                     Margin="5,0"/>
-                <TextBlock>for $7/month</TextBlock>
+                <TextBlock Text="{x:Static prop:Resources.perMonthText}"/>
             </StackPanel>
         </Label>
         <Label x:Name="upgradePlanWarning"  HorizontalAlignment="Left" Visibility="Collapsed">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                <TextBlock>You're using 
-                        <Run x:Name="ownedPrivateReposText"/>/<Run  x:Name="privateReposInPlanText"/>
-                        private repositories.
-                </TextBlock>
+                <TextBlock Text="{x:Static prop:Resources.youreUsingText}"/>
+                <TextBlock><Run x:Name="ownedPrivateReposText"/>/<Run  x:Name="privateReposInPlanText"/></TextBlock> 
+                <TextBlock Text="{x:Static prop:Resources.privateRepositoriesText}"/>
                 <ui:OcticonLinkButton 
                     x:Name="upgradeAccountLink"
                     FontSize="12"
                     Icon="link_external" 
-                    Content="Manage plans"
-                    ToolTip="manage plans"
+                    Content="{x:Static prop:Resources.upgradeAccountLinkContent}"
+                    ToolTip="{x:Static prop:Resources.upgradeAccountLinkToolTip}"
                     Margin="5,0"/>
             </StackPanel>
         </Label>
@@ -160,7 +160,7 @@
             x:Name="publishRepositoryButton"
             Margin="0,8,0,0"
             HorizontalAlignment="Left">
-            <TextBlock>Publish</TextBlock>
+            <TextBlock Text="{x:Static prop:Resources.publishText}"/>
         </Button>
 
     </StackPanel>
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml
index 89e1baec2b..adf81ca5b5 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml
@@ -9,6 +9,7 @@
     xmlns:helpers="clr-namespace:GitHub.Helpers;assembly=GitHub.UI"
     xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
     xmlns:GitHub="clr-namespace:GitHub.VisualStudio.Helpers"
+    xmlns:prop="clr-namespace:GitHub.VisualStudio"
     mc:Ignorable="d"
     d:DesignWidth="414"
     d:DesignHeight="440"
@@ -29,7 +30,7 @@
         <ui:OcticonImage Icon="logo_github" Style="{DynamicResource GitHubLogo}" />
         <WrapPanel Orientation="Vertical" HorizontalAlignment="Center" Margin="0,0,0,12">
             <TextBlock 
-                Text="Two-factor authentication" 
+                Text="{x:Static prop:Resources.twoFactorAuthText}" 
                 Padding="0" 
                 Margin="0,0,12,0"
                 Style="{DynamicResource GitHubH1TextBlock}"
@@ -43,8 +44,8 @@
             HorizontalAlignment="Center"
             TextWrapping="Wrap"
             Style="{DynamicResource GitHubDescriptionTextBlock}">
-            <Run x:Name="description">Open the two-factor authentication app on your device to view your authentication code.</Run>
-            <Hyperlink x:Name="twoFactorReadMoreLink" ToolTip="https://help.github.com/articles/about-two-factor-authentication">Read more</Hyperlink>
+            <Run x:Name="description" Text="{x:Static prop:Resources.openTwoFactorAuthAppText}"/>
+            <Hyperlink x:Name="twoFactorReadMoreLink" ToolTip="https://help.github.com/articles/about-two-factor-authentication"><TextBlock Text="{x:Static prop:Resources.readMoreText}"/></Hyperlink>
         </TextBlock>
         <uirx:TwoFactorInput
             x:Name="authenticationCode"
@@ -52,14 +53,14 @@
         <Grid Margin="0,12,0,0" Height="18">
             <uirx:ErrorMessageDisplay
                 x:Name="authenticationFailedLabel"
-                Message="Try entering the code again or clicking the resend button to get a new authentication code."
-                Content="Invalid authentication code" />
+                Message="{x:Static prop:Resources.authenticationFailedLabelMessage}"
+                Content="{x:Static prop:Resources.authenticationFailedLabelContent}" />
             <uirx:ErrorMessageDisplay
                 x:Name="authenticationSentLabel"
                 Icon="check"
                 IconFill="{DynamicResource GitHubAccentBrush}"
-                Message="If you do not receive the authentication code, contact support@github.com."
-                Content="Authentication code sent!" />
+                Message="{x:Static prop:Resources.authenticationSentLabelMessage}"
+                Content="{x:Static prop:Resources.authenticationSentLabelContent}" />
         </Grid>
         <StackPanel
             Orientation="Horizontal"
@@ -70,15 +71,15 @@
                 TabIndex="2" 
                 Icon="check"
                 IsDefault="True"
-                Content="Verify" />
+                Content="{x:Static prop:Resources.verifyText}" />
             <ui:OcticonLinkButton 
                 x:Name="resendCodeButton"
                 TabIndex="3"
-                ToolTip="Send the code to your registered SMS Device again"
+                ToolTip="{x:Static prop:Resources.resendCodeButtonToolTip}"
                 FontSize="12"
                 Icon="sync"
                 Margin="18,0,0,0"
-                Content="_Resend" />
+                Content="{x:Static prop:Resources.resendCodeButtonContent}" />
         </StackPanel>
     </StackPanel>
 </uirx:SimpleViewUserControl>

From d102a1d70f5662776cbb9d867eff621b82fa545f Mon Sep 17 00:00:00 2001
From: jau228 <jau228@users.noreply.github.com>
Date: Mon, 10 Aug 2015 10:49:07 -0600
Subject: [PATCH 05/13] Align the tag and removed extra space/tab

---
 src/common/GitHubVS.ruleset | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/GitHubVS.ruleset b/src/common/GitHubVS.ruleset
index 01a247bf88..0e1443d4ba 100644
--- a/src/common/GitHubVS.ruleset
+++ b/src/common/GitHubVS.ruleset
@@ -37,7 +37,7 @@
         <Rule Id="CA1501" Action="None" />
         <Rule Id="CA1502" Action="None" />
         <Rule Id="CA1506" Action="None" />
-		<Rule Id="CA1701" Action="None" />
+	<Rule Id="CA1701" Action="None" />
         <Rule Id="CA1702" Action="None" />
         <Rule Id="CA1704" Action="None" />
         <Rule Id="CA1707" Action="None" />
@@ -68,6 +68,6 @@
         <Rule Id="CA2210" Action="None" />
         <Rule Id="CA2211" Action="None" />
         <Rule Id="CA2213" Action="None" />
-        <Rule Id="CA2227" Action="None" />		
+        <Rule Id="CA2227" Action="None" />
   </Rules>
 </RuleSet>

From 9c03a6a1c7d3f44f16d7df6594686e4076ba5108 Mon Sep 17 00:00:00 2001
From: jau228 <jau228@hotmail.com>
Date: Mon, 10 Aug 2015 14:18:50 -0600
Subject: [PATCH 06/13] move strings from TeamExplorer folder cs files to the
 resource file

---
 src/GitHub.VisualStudio/Resources.Designer.cs | 108 ++++++++++++++++++
 src/GitHub.VisualStudio/Resources.resx        |  36 ++++++
 .../Connect/GitHubInvitationSection.cs        |   6 +-
 .../TeamExplorer/Home/GraphsNavigationItem.cs |   2 +-
 .../TeamExplorer/Home/IssuesNavigationItem.cs |   2 +-
 .../Home/PullRequestsNavigationItem.cs        |   2 +-
 .../TeamExplorer/Home/PulseNavigationItem.cs  |   2 +-
 .../TeamExplorer/Home/WikiNavigationItem.cs   |   2 +-
 .../TeamExplorer/Sync/GitHubPublishSection.cs |   4 +-
 .../Controls/RepositoryCloneControl.xaml      |   4 +-
 10 files changed, 156 insertions(+), 12 deletions(-)

diff --git a/src/GitHub.VisualStudio/Resources.Designer.cs b/src/GitHub.VisualStudio/Resources.Designer.cs
index f3fccce480..8d9bea2f93 100644
--- a/src/GitHub.VisualStudio/Resources.Designer.cs
+++ b/src/GitHub.VisualStudio/Resources.Designer.cs
@@ -105,6 +105,15 @@ internal static string browsePathButtonContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Clone.
+        /// </summary>
+        internal static string cloneButtonText {
+            get {
+                return ResourceManager.GetString("cloneButtonText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Clone.
         /// </summary>
@@ -330,6 +339,60 @@ internal static string filterTextPromptText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Connect….
+        /// </summary>
+        internal static string GitHubInvitationSectionConnectLabel {
+            get {
+                return ResourceManager.GetString("GitHubInvitationSectionConnectLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Powerful collaboration, code review, and code management for open source and private projects..
+        /// </summary>
+        internal static string GitHubInvitationSectionDescription {
+            get {
+                return ResourceManager.GetString("GitHubInvitationSectionDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sign up.
+        /// </summary>
+        internal static string GitHubInvitationSectionSignUpLabel {
+            get {
+                return ResourceManager.GetString("GitHubInvitationSectionSignUpLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Powerful collaboration, code review, and code management for open source and private projects..
+        /// </summary>
+        internal static string GitHubPublishSectionDescription {
+            get {
+                return ResourceManager.GetString("GitHubPublishSectionDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Publish to GitHub.
+        /// </summary>
+        internal static string GitHubPublishSectionTitle {
+            get {
+                return ResourceManager.GetString("GitHubPublishSectionTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Graphs.
+        /// </summary>
+        internal static string GraphsNavigationItemText {
+            get {
+                return ResourceManager.GetString("GraphsNavigationItemText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Git ignore.
         /// </summary>
@@ -339,6 +402,15 @@ internal static string ignoreTemplateListText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Issues.
+        /// </summary>
+        internal static string IssuesNavigationItemText {
+            get {
+                return ResourceManager.GetString("IssuesNavigationItemText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Learn more.
         /// </summary>
@@ -447,6 +519,15 @@ internal static string orText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Path.
+        /// </summary>
+        internal static string pathText {
+            get {
+                return ResourceManager.GetString("pathText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to for $7/month.
         /// </summary>
@@ -492,6 +573,24 @@ internal static string publishText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Pull Requests.
+        /// </summary>
+        internal static string PullRequestsNavigationItemText {
+            get {
+                return ResourceManager.GetString("PullRequestsNavigationItemText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Pulse.
+        /// </summary>
+        internal static string PulseNavigationItemText {
+            get {
+                return ResourceManager.GetString("PulseNavigationItemText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Read more.
         /// </summary>
@@ -609,6 +708,15 @@ internal static string verifyText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Wiki.
+        /// </summary>
+        internal static string WikiNavigationItemText {
+            get {
+                return ResourceManager.GetString("WikiNavigationItemText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to You&apos;re using.
         /// </summary>
diff --git a/src/GitHub.VisualStudio/Resources.resx b/src/GitHub.VisualStudio/Resources.resx
index 5aeb48330f..dc4aeb1c6c 100644
--- a/src/GitHub.VisualStudio/Resources.resx
+++ b/src/GitHub.VisualStudio/Resources.resx
@@ -303,4 +303,40 @@
   <data name="youreUsingText" xml:space="preserve">
     <value>You're using</value>
   </data>
+  <data name="cloneButtonText" xml:space="preserve">
+    <value>Clone</value>
+  </data>
+  <data name="GitHubInvitationSectionConnectLabel" xml:space="preserve">
+    <value>Connect…</value>
+  </data>
+  <data name="GitHubInvitationSectionDescription" xml:space="preserve">
+    <value>Powerful collaboration, code review, and code management for open source and private projects.</value>
+  </data>
+  <data name="GitHubInvitationSectionSignUpLabel" xml:space="preserve">
+    <value>Sign up</value>
+  </data>
+  <data name="GitHubPublishSectionDescription" xml:space="preserve">
+    <value>Powerful collaboration, code review, and code management for open source and private projects.</value>
+  </data>
+  <data name="GitHubPublishSectionTitle" xml:space="preserve">
+    <value>Publish to GitHub</value>
+  </data>
+  <data name="GraphsNavigationItemText" xml:space="preserve">
+    <value>Graphs</value>
+  </data>
+  <data name="IssuesNavigationItemText" xml:space="preserve">
+    <value>Issues</value>
+  </data>
+  <data name="pathText" xml:space="preserve">
+    <value>Path</value>
+  </data>
+  <data name="PullRequestsNavigationItemText" xml:space="preserve">
+    <value>Pull Requests</value>
+  </data>
+  <data name="PulseNavigationItemText" xml:space="preserve">
+    <value>Pulse</value>
+  </data>
+  <data name="WikiNavigationItemText" xml:space="preserve">
+    <value>Wiki</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs b/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs
index 3d71b4ac4f..37c65aa355 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs
@@ -27,11 +27,11 @@ public GitHubInvitationSection(IConnectionManager cm, Lazy<IVisualStudioBrowser>
             lazyBrowser = browser;
             CanConnect = true;
             CanSignUp = true;
-            ConnectLabel = "Connect…";
-            SignUpLabel = "Sign up";
+            ConnectLabel = Resources.GitHubInvitationSectionConnectLabel;
+            SignUpLabel = Resources.GitHubInvitationSectionSignUpLabel;
             Name = "GitHub";
             Provider = "GitHub, Inc.";
-            Description = "Powerful collaboration, code review, and code management for open source and private projects.";
+            Description = Resources.GitHubInvitationSectionDescription;
             Icon = GetDrawingForIcon(GetBrushForIcon());
 
             IsVisible = cm.Connections.Count == 0;
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItem.cs b/src/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItem.cs
index 3319d8eb10..91076a56d1 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItem.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItem.cs
@@ -23,7 +23,7 @@ public GraphsNavigationItem(ISimpleApiClientFactory apiFactory, Lazy<IVisualStud
             : base(apiFactory, holder, Octicon.graph)
         {
             this.browser = browser;
-            Text = "Graphs";
+            Text = Resources.GraphsNavigationItemText;
             ArgbColor = Colors.LightBlueNavigationItem.ToInt32();
         }
 
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Home/IssuesNavigationItem.cs b/src/GitHub.VisualStudio/TeamExplorer/Home/IssuesNavigationItem.cs
index ad2dbaec9f..8f425b1c00 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Home/IssuesNavigationItem.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Home/IssuesNavigationItem.cs
@@ -23,7 +23,7 @@ public IssuesNavigationItem(ISimpleApiClientFactory apiFactory, Lazy<IVisualStud
             : base(apiFactory, holder, Octicon.issue_opened)
         {
             this.browser = browser;
-            Text = "Issues";
+            Text = Resources.IssuesNavigationItemText;
             ArgbColor = Colors.LightBlueNavigationItem.ToInt32();
         }
 
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Home/PullRequestsNavigationItem.cs b/src/GitHub.VisualStudio/TeamExplorer/Home/PullRequestsNavigationItem.cs
index 33e18eb8de..a58c02d868 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Home/PullRequestsNavigationItem.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Home/PullRequestsNavigationItem.cs
@@ -23,7 +23,7 @@ public PullRequestsNavigationItem(ISimpleApiClientFactory apiFactory, Lazy<IVisu
             : base(apiFactory, holder, Octicon.git_pull_request)
         {
             this.browser = browser;
-            Text = "Pull Requests";
+            Text = Resources.PullRequestsNavigationItemText;
             ArgbColor = Colors.RedNavigationItem.ToInt32();
         }
 
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Home/PulseNavigationItem.cs b/src/GitHub.VisualStudio/TeamExplorer/Home/PulseNavigationItem.cs
index cd2190a050..8d308278db 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Home/PulseNavigationItem.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Home/PulseNavigationItem.cs
@@ -23,7 +23,7 @@ public PulseNavigationItem(ISimpleApiClientFactory apiFactory, Lazy<IVisualStudi
             : base(apiFactory, holder, Octicon.pulse)
         {
             this.browser = browser;
-            Text = "Pulse";
+            Text = Resources.PulseNavigationItemText;
             ArgbColor = Colors.LightBlueNavigationItem.ToInt32();
         }
 
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Home/WikiNavigationItem.cs b/src/GitHub.VisualStudio/TeamExplorer/Home/WikiNavigationItem.cs
index b4e6028b15..5b18490965 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Home/WikiNavigationItem.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Home/WikiNavigationItem.cs
@@ -23,7 +23,7 @@ public WikiNavigationItem(ISimpleApiClientFactory apiFactory, Lazy<IVisualStudio
             : base(apiFactory, holder, Octicon.book)
         {
             this.browser = browser;
-            Text = "Wiki";
+            Text = Resources.WikiNavigationItemText;
             ArgbColor = Colors.BlueNavigationItem.ToInt32();
         }
 
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Sync/GitHubPublishSection.cs b/src/GitHub.VisualStudio/TeamExplorer/Sync/GitHubPublishSection.cs
index 17ea6c096c..6d5c1ee15b 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Sync/GitHubPublishSection.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Sync/GitHubPublishSection.cs
@@ -36,10 +36,10 @@ public GitHubPublishSection(ISimpleApiClientFactory apiFactory, ITeamExplorerSer
 
             lazyBrowser = browser;
             this.hosts = hosts;
-            Title = "Publish to GitHub";
+            Title = Resources.GitHubPublishSectionTitle;
             Name = "GitHub";
             Provider = "GitHub, Inc";
-            Description = "Powerful collaboration, code review, and code management for open source and private projects.";
+            Description = Resources.GitHubPublishSectionDescription;
             ShowLogin = false;
             ShowSignup = false;
             ShowGetStarted = false;
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml
index b2ff1d06ec..ec1390bdb0 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml
@@ -77,7 +77,7 @@
 			x:Name="cloneButton"
 			HorizontalAlignment="Center"
 			Icon="check">
-            <TextBlock>Clone</TextBlock>
+            <TextBlock Text="{x:Static prop:Resources.cloneButtonText}"/>
         </ui:OcticonCircleButton>
 
         <Border DockPanel.Dock="Bottom" Style="{StaticResource repositoryBorderStyle}">
@@ -91,7 +91,7 @@
                     Grid.Column="0"
                     Grid.Row="3"
                     Margin="4,0"
-                    Target="{Binding ElementName=clonePath}">Path</Label>
+                    Target="{Binding ElementName=clonePath}" Content="{x:Static prop:Resources.pathText}"/>
 
                 <ui:PromptTextBox x:Name="clonePath" Grid.Column="1" Margin="0,2" />
                 <uirx:ValidationMessage

From 5181585674b6e03a4d8d84226d98067c5e9a8c14 Mon Sep 17 00:00:00 2001
From: Joe Au <jau228@users.noreply.github.com>
Date: Wed, 12 Aug 2015 08:59:37 -0600
Subject: [PATCH 07/13] line up the tag

---
 src/common/GitHubVS.ruleset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/GitHubVS.ruleset b/src/common/GitHubVS.ruleset
index 0e1443d4ba..ebf59de5c0 100644
--- a/src/common/GitHubVS.ruleset
+++ b/src/common/GitHubVS.ruleset
@@ -37,7 +37,7 @@
         <Rule Id="CA1501" Action="None" />
         <Rule Id="CA1502" Action="None" />
         <Rule Id="CA1506" Action="None" />
-	<Rule Id="CA1701" Action="None" />
+        <Rule Id="CA1701" Action="None" />
         <Rule Id="CA1702" Action="None" />
         <Rule Id="CA1704" Action="None" />
         <Rule Id="CA1707" Action="None" />

From 8fe153f0e7f542a2e263bd7938c8fb7ded9b899a Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Tue, 8 Sep 2015 18:47:10 +0200
Subject: [PATCH 08/13] Set the fontFamily so the xaml designer is happy

For some reason the ContentPresenter throws in the xaml designer if the
font family isn't set.
---
 src/GitHub.UI.Reactive/Assets/Controls/ErrorMessageDisplay.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/GitHub.UI.Reactive/Assets/Controls/ErrorMessageDisplay.xaml b/src/GitHub.UI.Reactive/Assets/Controls/ErrorMessageDisplay.xaml
index f6dd3621c8..f7292b143b 100644
--- a/src/GitHub.UI.Reactive/Assets/Controls/ErrorMessageDisplay.xaml
+++ b/src/GitHub.UI.Reactive/Assets/Controls/ErrorMessageDisplay.xaml
@@ -29,6 +29,7 @@
                                 Fill="{TemplateBinding IconFill}" />
                         </Viewbox>
                         <ContentPresenter
+                            TextElement.FontFamily="{TemplateBinding FontFamily}"
                             Grid.Column="1"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"

From 6f9f8a33db22ffaa8285f063339e32f1a874e9b7 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Tue, 8 Sep 2015 18:48:42 +0200
Subject: [PATCH 09/13] Resources need to be public. Consolidate strings.

Resources need to be public so that xaml can get to them.
Clear duplicate strings and consolidate everything.
Remove unused blocks.
---
 .../GitHub.VisualStudio.csproj                |   4 +-
 src/GitHub.VisualStudio/Resources.Designer.cs | 349 ++++-----------
 src/GitHub.VisualStudio/Resources.resx        |  83 +---
 .../Connect/GitHubInvitationSection.cs        |   6 +-
 .../TeamExplorer/Sync/GitHubPublishSection.cs |   2 +-
 .../UI/Views/Controls/LoginControl.xaml       |  28 +-
 .../Controls/RepositoryCloneControl.xaml      | 423 +++++++++---------
 .../Controls/RepositoryCloneControl.xaml.cs   |   2 +-
 .../Controls/RepositoryCreationControl.xaml   |  34 +-
 .../RepositoryCreationControl.xaml.cs         |   7 -
 .../Controls/RepositoryPublishControl.xaml    |  28 --
 .../Controls/RepositoryPublishControl.xaml.cs |   7 -
 .../UI/Views/GitHubConnectContent.xaml        |   8 +-
 .../UI/Views/GitHubInvitationContent.xaml     |   6 +-
 14 files changed, 361 insertions(+), 626 deletions(-)

diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
index 8e56b49879..7fc7004aa1 100644
--- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
+++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -281,9 +281,9 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="VSPackage.resx">
       <MergeWithCTO>true</MergeWithCTO>
diff --git a/src/GitHub.VisualStudio/Resources.Designer.cs b/src/GitHub.VisualStudio/Resources.Designer.cs
index 8d9bea2f93..15452f5c94 100644
--- a/src/GitHub.VisualStudio/Resources.Designer.cs
+++ b/src/GitHub.VisualStudio/Resources.Designer.cs
@@ -22,7 +22,7 @@ namespace GitHub.VisualStudio {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@ internal Resources() {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitHub.VisualStudio.Resources", typeof(Resources).Assembly);
@@ -51,7 +51,7 @@ internal Resources() {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -63,7 +63,7 @@ internal Resources() {
         /// <summary>
         ///   Looks up a localized string similar to Invalid authentication code.
         /// </summary>
-        internal static string authenticationFailedLabelContent {
+        public static string authenticationFailedLabelContent {
             get {
                 return ResourceManager.GetString("authenticationFailedLabelContent", resourceCulture);
             }
@@ -72,7 +72,7 @@ internal static string authenticationFailedLabelContent {
         /// <summary>
         ///   Looks up a localized string similar to Try entering the code again or clicking the resend button to get a new authentication code..
         /// </summary>
-        internal static string authenticationFailedLabelMessage {
+        public static string authenticationFailedLabelMessage {
             get {
                 return ResourceManager.GetString("authenticationFailedLabelMessage", resourceCulture);
             }
@@ -81,7 +81,7 @@ internal static string authenticationFailedLabelMessage {
         /// <summary>
         ///   Looks up a localized string similar to Authentication code sent!.
         /// </summary>
-        internal static string authenticationSentLabelContent {
+        public static string authenticationSentLabelContent {
             get {
                 return ResourceManager.GetString("authenticationSentLabelContent", resourceCulture);
             }
@@ -90,52 +90,43 @@ internal static string authenticationSentLabelContent {
         /// <summary>
         ///   Looks up a localized string similar to If you do not receive the authentication code, contact support@github.com..
         /// </summary>
-        internal static string authenticationSentLabelMessage {
+        public static string authenticationSentLabelMessage {
             get {
                 return ResourceManager.GetString("authenticationSentLabelMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Browse.
+        ///   Looks up a localized string similar to Powerful collaboration, code review, and code management for open source and private projects..
         /// </summary>
-        internal static string browsePathButtonContent {
+        public static string BlurbText {
             get {
-                return ResourceManager.GetString("browsePathButtonContent", resourceCulture);
+                return ResourceManager.GetString("BlurbText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Clone.
+        ///   Looks up a localized string similar to Browse.
         /// </summary>
-        internal static string cloneButtonText {
+        public static string browsePathButtonContent {
             get {
-                return ResourceManager.GetString("cloneButtonText", resourceCulture);
+                return ResourceManager.GetString("browsePathButtonContent", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Clone.
         /// </summary>
-        internal static string cloneLinkContent {
-            get {
-                return ResourceManager.GetString("cloneLinkContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Get Started.
-        /// </summary>
-        internal static string connect_ClickContent {
+        public static string CloneLink {
             get {
-                return ResourceManager.GetString("connect_ClickContent", resourceCulture);
+                return ResourceManager.GetString("CloneLink", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Could not connect to github.com.
         /// </summary>
-        internal static string couldNotConnectToGitHubText {
+        public static string couldNotConnectToGitHubText {
             get {
                 return ResourceManager.GetString("couldNotConnectToGitHubText", resourceCulture);
             }
@@ -144,7 +135,7 @@ internal static string couldNotConnectToGitHubText {
         /// <summary>
         ///   Looks up a localized string similar to Could not connect to the server..
         /// </summary>
-        internal static string couldNotConnectToTheServerText {
+        public static string couldNotConnectToTheServerText {
             get {
                 return ResourceManager.GetString("couldNotConnectToTheServerText", resourceCulture);
             }
@@ -153,25 +144,16 @@ internal static string couldNotConnectToTheServerText {
         /// <summary>
         ///   Looks up a localized string similar to Create.
         /// </summary>
-        internal static string createLinkContent {
-            get {
-                return ResourceManager.GetString("createLinkContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Create.
-        /// </summary>
-        internal static string createRepositoryButtonText {
+        public static string CreateLink {
             get {
-                return ResourceManager.GetString("createRepositoryButtonText", resourceCulture);
+                return ResourceManager.GetString("CreateLink", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Description (Optional).
         /// </summary>
-        internal static string descriptionOptionalText {
+        public static string descriptionOptionalText {
             get {
                 return ResourceManager.GetString("descriptionOptionalText", resourceCulture);
             }
@@ -180,7 +162,7 @@ internal static string descriptionOptionalText {
         /// <summary>
         ///   Looks up a localized string similar to Description.
         /// </summary>
-        internal static string descriptionText {
+        public static string descriptionText {
             get {
                 return ResourceManager.GetString("descriptionText", resourceCulture);
             }
@@ -189,7 +171,7 @@ internal static string descriptionText {
         /// <summary>
         ///   Looks up a localized string similar to Don’t have an account? .
         /// </summary>
-        internal static string dontHaveAnAccountText {
+        public static string dontHaveAnAccountText {
             get {
                 return ResourceManager.GetString("dontHaveAnAccountText", resourceCulture);
             }
@@ -198,7 +180,7 @@ internal static string dontHaveAnAccountText {
         /// <summary>
         ///   Looks up a localized string similar to Don’t have GitHub Enterprise? .
         /// </summary>
-        internal static string dontHaveGitHubEnterpriseText {
+        public static string dontHaveGitHubEnterpriseText {
             get {
                 return ResourceManager.GetString("dontHaveGitHubEnterpriseText", resourceCulture);
             }
@@ -207,178 +189,70 @@ internal static string dontHaveGitHubEnterpriseText {
         /// <summary>
         ///   Looks up a localized string similar to Please check your internet connection and try again..
         /// </summary>
-        internal static string dotComConnectionFailedMessageMessage {
+        public static string dotComConnectionFailedMessageMessage {
             get {
                 return ResourceManager.GetString("dotComConnectionFailedMessageMessage", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to (forgot your password?).
-        /// </summary>
-        internal static string dotComForgotPasswordLinkContent {
-            get {
-                return ResourceManager.GetString("dotComForgotPasswordLinkContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Log in.
-        /// </summary>
-        internal static string dotComLogInButtonContent {
-            get {
-                return ResourceManager.GetString("dotComLogInButtonContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Check your username and password, then try again.
-        /// </summary>
-        internal static string dotComLoginFailedMessageMessage {
-            get {
-                return ResourceManager.GetString("dotComLoginFailedMessageMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Password.
-        /// </summary>
-        internal static string dotComPasswordPromptText {
-            get {
-                return ResourceManager.GetString("dotComPasswordPromptText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Username or email.
-        /// </summary>
-        internal static string dotComUserNameOrEmailPromptText {
-            get {
-                return ResourceManager.GetString("dotComUserNameOrEmailPromptText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to The host isn&apos;t available or is not a GitHub Enterprise server. Check the address and try again..
         /// </summary>
-        internal static string enterpriseConnectingFailedMessage {
+        public static string enterpriseConnectingFailedMessage {
             get {
                 return ResourceManager.GetString("enterpriseConnectingFailedMessage", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Log in.
-        /// </summary>
-        internal static string enterpriseLogInButtonContent {
-            get {
-                return ResourceManager.GetString("enterpriseLogInButtonContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Check your username and password, then try again.
-        /// </summary>
-        internal static string enterpriseLoginFailedMessageMessage {
-            get {
-                return ResourceManager.GetString("enterpriseLoginFailedMessageMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Password.
-        /// </summary>
-        internal static string enterprisePasswordPromptText {
-            get {
-                return ResourceManager.GetString("enterprisePasswordPromptText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to GitHub Enterprise server address.
         /// </summary>
-        internal static string enterpriseUrlPromptText {
+        public static string enterpriseUrlPromptText {
             get {
                 return ResourceManager.GetString("enterpriseUrlPromptText", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Username or email.
-        /// </summary>
-        internal static string enterpriseUserNameOrEmailPromptText {
-            get {
-                return ResourceManager.GetString("enterpriseUserNameOrEmailPromptText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An error occurred while loading repositories.
-        /// </summary>
-        internal static string ErrorMessageDisplayContent {
-            get {
-                return ResourceManager.GetString("ErrorMessageDisplayContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Some or all repositories may not have loaded. Close the dialog and try again..
-        /// </summary>
-        internal static string ErrorMessageDisplayMessage {
-            get {
-                return ResourceManager.GetString("ErrorMessageDisplayMessage", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Search repositories.
         /// </summary>
-        internal static string filterTextPromptText {
+        public static string filterTextPromptText {
             get {
                 return ResourceManager.GetString("filterTextPromptText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connect….
-        /// </summary>
-        internal static string GitHubInvitationSectionConnectLabel {
-            get {
-                return ResourceManager.GetString("GitHubInvitationSectionConnectLabel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Powerful collaboration, code review, and code management for open source and private projects..
+        ///   Looks up a localized string similar to (forgot your password?).
         /// </summary>
-        internal static string GitHubInvitationSectionDescription {
+        public static string ForgotPasswordLink {
             get {
-                return ResourceManager.GetString("GitHubInvitationSectionDescription", resourceCulture);
+                return ResourceManager.GetString("ForgotPasswordLink", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sign up.
+        ///   Looks up a localized string similar to Get Started.
         /// </summary>
-        internal static string GitHubInvitationSectionSignUpLabel {
+        public static string GetStartedLink {
             get {
-                return ResourceManager.GetString("GitHubInvitationSectionSignUpLabel", resourceCulture);
+                return ResourceManager.GetString("GetStartedLink", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Powerful collaboration, code review, and code management for open source and private projects..
+        ///   Looks up a localized string similar to Connect….
         /// </summary>
-        internal static string GitHubPublishSectionDescription {
+        public static string GitHubInvitationSectionConnectLabel {
             get {
-                return ResourceManager.GetString("GitHubPublishSectionDescription", resourceCulture);
+                return ResourceManager.GetString("GitHubInvitationSectionConnectLabel", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Publish to GitHub.
         /// </summary>
-        internal static string GitHubPublishSectionTitle {
+        public static string GitHubPublishSectionTitle {
             get {
                 return ResourceManager.GetString("GitHubPublishSectionTitle", resourceCulture);
             }
@@ -387,7 +261,7 @@ internal static string GitHubPublishSectionTitle {
         /// <summary>
         ///   Looks up a localized string similar to Graphs.
         /// </summary>
-        internal static string GraphsNavigationItemText {
+        public static string GraphsNavigationItemText {
             get {
                 return ResourceManager.GetString("GraphsNavigationItemText", resourceCulture);
             }
@@ -396,7 +270,7 @@ internal static string GraphsNavigationItemText {
         /// <summary>
         ///   Looks up a localized string similar to Git ignore.
         /// </summary>
-        internal static string ignoreTemplateListText {
+        public static string ignoreTemplateListText {
             get {
                 return ResourceManager.GetString("ignoreTemplateListText", resourceCulture);
             }
@@ -405,7 +279,7 @@ internal static string ignoreTemplateListText {
         /// <summary>
         ///   Looks up a localized string similar to Issues.
         /// </summary>
-        internal static string IssuesNavigationItemText {
+        public static string IssuesNavigationItemText {
             get {
                 return ResourceManager.GetString("IssuesNavigationItemText", resourceCulture);
             }
@@ -414,7 +288,7 @@ internal static string IssuesNavigationItemText {
         /// <summary>
         ///   Looks up a localized string similar to Learn more.
         /// </summary>
-        internal static string learnMoreLinkContent {
+        public static string learnMoreLinkContent {
             get {
                 return ResourceManager.GetString("learnMoreLinkContent", resourceCulture);
             }
@@ -423,61 +297,70 @@ internal static string learnMoreLinkContent {
         /// <summary>
         ///   Looks up a localized string similar to License.
         /// </summary>
-        internal static string licenseListText {
+        public static string licenseListText {
             get {
                 return ResourceManager.GetString("licenseListText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Local path.
+        ///   Looks up a localized string similar to Some or all repositories may not have loaded. Close the dialog and try again..
         /// </summary>
-        internal static string localPathText {
+        public static string loadingFailedMessageContent {
             get {
-                return ResourceManager.GetString("localPathText", resourceCulture);
+                return ResourceManager.GetString("loadingFailedMessageContent", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Login.
+        ///   Looks up a localized string similar to An error occurred while loading repositories.
         /// </summary>
-        internal static string login_ClickContent {
+        public static string loadingFailedMessageMessage {
             get {
-                return ResourceManager.GetString("login_ClickContent", resourceCulture);
+                return ResourceManager.GetString("loadingFailedMessageMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Login.
+        ///   Looks up a localized string similar to Local path.
+        /// </summary>
+        public static string localPathText {
+            get {
+                return ResourceManager.GetString("localPathText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Check your username and password, then try again.
         /// </summary>
-        internal static string loginContent {
+        public static string LoginFailedMessage {
             get {
-                return ResourceManager.GetString("loginContent", resourceCulture);
+                return ResourceManager.GetString("LoginFailedMessage", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Login failed..
         /// </summary>
-        internal static string loginFailedText {
+        public static string LoginFailedText {
             get {
-                return ResourceManager.GetString("loginFailedText", resourceCulture);
+                return ResourceManager.GetString("LoginFailedText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Log in.
+        ///   Looks up a localized string similar to Login.
         /// </summary>
-        internal static string loginLabelPrefixText {
+        public static string LoginLink {
             get {
-                return ResourceManager.GetString("loginLabelPrefixText", resourceCulture);
+                return ResourceManager.GetString("LoginLink", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Private Repository.
         /// </summary>
-        internal static string makePrivateContent {
+        public static string makePrivateContent {
             get {
                 return ResourceManager.GetString("makePrivateContent", resourceCulture);
             }
@@ -486,7 +369,7 @@ internal static string makePrivateContent {
         /// <summary>
         ///   Looks up a localized string similar to Name.
         /// </summary>
-        internal static string nameText {
+        public static string nameText {
             get {
                 return ResourceManager.GetString("nameText", resourceCulture);
             }
@@ -495,7 +378,7 @@ internal static string nameText {
         /// <summary>
         ///   Looks up a localized string similar to No repositories.
         /// </summary>
-        internal static string noRepositoriesMessageText {
+        public static string noRepositoriesMessageText {
             get {
                 return ResourceManager.GetString("noRepositoriesMessageText", resourceCulture);
             }
@@ -504,7 +387,7 @@ internal static string noRepositoriesMessageText {
         /// <summary>
         ///   Looks up a localized string similar to Open the two-factor authentication app on your device to view your authentication code..
         /// </summary>
-        internal static string openTwoFactorAuthAppText {
+        public static string openTwoFactorAuthAppText {
             get {
                 return ResourceManager.GetString("openTwoFactorAuthAppText", resourceCulture);
             }
@@ -513,43 +396,34 @@ internal static string openTwoFactorAuthAppText {
         /// <summary>
         ///   Looks up a localized string similar to or.
         /// </summary>
-        internal static string orText {
+        public static string orText {
             get {
                 return ResourceManager.GetString("orText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Path.
-        /// </summary>
-        internal static string pathText {
-            get {
-                return ResourceManager.GetString("pathText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to for $7/month.
+        ///   Looks up a localized string similar to Password.
         /// </summary>
-        internal static string perMonthText {
+        public static string PasswordPrompt {
             get {
-                return ResourceManager.GetString("perMonthText", resourceCulture);
+                return ResourceManager.GetString("PasswordPrompt", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sign up.
+        ///   Looks up a localized string similar to Path.
         /// </summary>
-        internal static string pricingLinkContent {
+        public static string pathText {
             get {
-                return ResourceManager.GetString("pricingLinkContent", resourceCulture);
+                return ResourceManager.GetString("pathText", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to private repositories..
         /// </summary>
-        internal static string privateRepositoriesText {
+        public static string privateRepositoriesText {
             get {
                 return ResourceManager.GetString("privateRepositoriesText", resourceCulture);
             }
@@ -558,7 +432,7 @@ internal static string privateRepositoriesText {
         /// <summary>
         ///   Looks up a localized string similar to Private repositories require a.
         /// </summary>
-        internal static string privateRepoText {
+        public static string privateRepoText {
             get {
                 return ResourceManager.GetString("privateRepoText", resourceCulture);
             }
@@ -567,7 +441,7 @@ internal static string privateRepoText {
         /// <summary>
         ///   Looks up a localized string similar to Publish.
         /// </summary>
-        internal static string publishText {
+        public static string publishText {
             get {
                 return ResourceManager.GetString("publishText", resourceCulture);
             }
@@ -576,7 +450,7 @@ internal static string publishText {
         /// <summary>
         ///   Looks up a localized string similar to Pull Requests.
         /// </summary>
-        internal static string PullRequestsNavigationItemText {
+        public static string PullRequestsNavigationItemText {
             get {
                 return ResourceManager.GetString("PullRequestsNavigationItemText", resourceCulture);
             }
@@ -585,7 +459,7 @@ internal static string PullRequestsNavigationItemText {
         /// <summary>
         ///   Looks up a localized string similar to Pulse.
         /// </summary>
-        internal static string PulseNavigationItemText {
+        public static string PulseNavigationItemText {
             get {
                 return ResourceManager.GetString("PulseNavigationItemText", resourceCulture);
             }
@@ -594,7 +468,7 @@ internal static string PulseNavigationItemText {
         /// <summary>
         ///   Looks up a localized string similar to Read more.
         /// </summary>
-        internal static string readMoreText {
+        public static string readMoreText {
             get {
                 return ResourceManager.GetString("readMoreText", resourceCulture);
             }
@@ -603,7 +477,7 @@ internal static string readMoreText {
         /// <summary>
         ///   Looks up a localized string similar to This repository does not have a remote. Fill out the form to publish it to GitHub..
         /// </summary>
-        internal static string RepoDoesNotHaveRemoteText {
+        public static string RepoDoesNotHaveRemoteText {
             get {
                 return ResourceManager.GetString("RepoDoesNotHaveRemoteText", resourceCulture);
             }
@@ -612,16 +486,16 @@ internal static string RepoDoesNotHaveRemoteText {
         /// <summary>
         ///   Looks up a localized string similar to Repository Name.
         /// </summary>
-        internal static string RepoNameText {
+        public static string RepoNameText {
             get {
                 return ResourceManager.GetString("RepoNameText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to _Resend.
+        ///   Looks up a localized string similar to Resend.
         /// </summary>
-        internal static string resendCodeButtonContent {
+        public static string resendCodeButtonContent {
             get {
                 return ResourceManager.GetString("resendCodeButtonContent", resourceCulture);
             }
@@ -630,7 +504,7 @@ internal static string resendCodeButtonContent {
         /// <summary>
         ///   Looks up a localized string similar to Send the code to your registered SMS Device again.
         /// </summary>
-        internal static string resendCodeButtonToolTip {
+        public static string resendCodeButtonToolTip {
             get {
                 return ResourceManager.GetString("resendCodeButtonToolTip", resourceCulture);
             }
@@ -639,70 +513,43 @@ internal static string resendCodeButtonToolTip {
         /// <summary>
         ///   Looks up a localized string similar to Sign out.
         /// </summary>
-        internal static string signOutContent {
+        public static string SignOutLink {
             get {
-                return ResourceManager.GetString("signOutContent", resourceCulture);
+                return ResourceManager.GetString("SignOutLink", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Sign up.
         /// </summary>
-        internal static string signup_ClickContent {
+        public static string SignUpLink {
             get {
-                return ResourceManager.GetString("signup_ClickContent", resourceCulture);
+                return ResourceManager.GetString("SignUpLink", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Two-factor authentication.
         /// </summary>
-        internal static string twoFactorAuthText {
+        public static string twoFactorAuthText {
             get {
                 return ResourceManager.GetString("twoFactorAuthText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Manage plans.
-        /// </summary>
-        internal static string upgradeAccountLinkContent {
-            get {
-                return ResourceManager.GetString("upgradeAccountLinkContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to manage plans.
-        /// </summary>
-        internal static string upgradeAccountLinkToolTip {
-            get {
-                return ResourceManager.GetString("upgradeAccountLinkToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to micro plan.
-        /// </summary>
-        internal static string upgradeToMicroLinkContent {
-            get {
-                return ResourceManager.GetString("upgradeToMicroLinkContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to upgrade.
+        ///   Looks up a localized string similar to Username or email.
         /// </summary>
-        internal static string upgradeToMicroLinkToolTip {
+        public static string UserNameOrEmailPromptText {
             get {
-                return ResourceManager.GetString("upgradeToMicroLinkToolTip", resourceCulture);
+                return ResourceManager.GetString("UserNameOrEmailPromptText", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Verify.
         /// </summary>
-        internal static string verifyText {
+        public static string verifyText {
             get {
                 return ResourceManager.GetString("verifyText", resourceCulture);
             }
@@ -711,7 +558,7 @@ internal static string verifyText {
         /// <summary>
         ///   Looks up a localized string similar to Wiki.
         /// </summary>
-        internal static string WikiNavigationItemText {
+        public static string WikiNavigationItemText {
             get {
                 return ResourceManager.GetString("WikiNavigationItemText", resourceCulture);
             }
@@ -720,7 +567,7 @@ internal static string WikiNavigationItemText {
         /// <summary>
         ///   Looks up a localized string similar to You&apos;re using.
         /// </summary>
-        internal static string youreUsingText {
+        public static string youreUsingText {
             get {
                 return ResourceManager.GetString("youreUsingText", resourceCulture);
             }
diff --git a/src/GitHub.VisualStudio/Resources.resx b/src/GitHub.VisualStudio/Resources.resx
index dc4aeb1c6c..9d4b8e7361 100644
--- a/src/GitHub.VisualStudio/Resources.resx
+++ b/src/GitHub.VisualStudio/Resources.resx
@@ -132,10 +132,7 @@
   <data name="browsePathButtonContent" xml:space="preserve">
     <value>Browse</value>
   </data>
-  <data name="cloneLinkContent" xml:space="preserve">
-    <value>Clone</value>
-  </data>
-  <data name="connect_ClickContent" xml:space="preserve">
+  <data name="GetStartedLink" xml:space="preserve">
     <value>Get Started</value>
   </data>
   <data name="couldNotConnectToGitHubText" xml:space="preserve">
@@ -144,10 +141,7 @@
   <data name="couldNotConnectToTheServerText" xml:space="preserve">
     <value>Could not connect to the server.</value>
   </data>
-  <data name="createLinkContent" xml:space="preserve">
-    <value>Create</value>
-  </data>
-  <data name="createRepositoryButtonText" xml:space="preserve">
+  <data name="CreateLink" xml:space="preserve">
     <value>Create</value>
   </data>
   <data name="descriptionOptionalText" xml:space="preserve">
@@ -165,43 +159,31 @@
   <data name="dotComConnectionFailedMessageMessage" xml:space="preserve">
     <value>Please check your internet connection and try again.</value>
   </data>
-  <data name="dotComForgotPasswordLinkContent" xml:space="preserve">
+  <data name="ForgotPasswordLink" xml:space="preserve">
     <value>(forgot your password?)</value>
   </data>
-  <data name="dotComLogInButtonContent" xml:space="preserve">
-    <value>Log in</value>
+  <data name="LoginLink" xml:space="preserve">
+    <value>Login</value>
   </data>
-  <data name="dotComLoginFailedMessageMessage" xml:space="preserve">
+  <data name="LoginFailedMessage" xml:space="preserve">
     <value>Check your username and password, then try again</value>
   </data>
-  <data name="dotComPasswordPromptText" xml:space="preserve">
+  <data name="PasswordPrompt" xml:space="preserve">
     <value>Password</value>
   </data>
-  <data name="dotComUserNameOrEmailPromptText" xml:space="preserve">
+  <data name="UserNameOrEmailPromptText" xml:space="preserve">
     <value>Username or email</value>
   </data>
   <data name="enterpriseConnectingFailedMessage" xml:space="preserve">
     <value>The host isn't available or is not a GitHub Enterprise server. Check the address and try again.</value>
   </data>
-  <data name="enterpriseLogInButtonContent" xml:space="preserve">
-    <value>Log in</value>
-  </data>
-  <data name="enterpriseLoginFailedMessageMessage" xml:space="preserve">
-    <value>Check your username and password, then try again</value>
-  </data>
-  <data name="enterprisePasswordPromptText" xml:space="preserve">
-    <value>Password</value>
-  </data>
   <data name="enterpriseUrlPromptText" xml:space="preserve">
     <value>GitHub Enterprise server address</value>
   </data>
-  <data name="enterpriseUserNameOrEmailPromptText" xml:space="preserve">
-    <value>Username or email</value>
-  </data>
-  <data name="ErrorMessageDisplayContent" xml:space="preserve">
+  <data name="loadingFailedMessageMessage" xml:space="preserve">
     <value>An error occurred while loading repositories</value>
   </data>
-  <data name="ErrorMessageDisplayMessage" xml:space="preserve">
+  <data name="loadingFailedMessageContent" xml:space="preserve">
     <value>Some or all repositories may not have loaded. Close the dialog and try again.</value>
   </data>
   <data name="filterTextPromptText" xml:space="preserve">
@@ -219,18 +201,9 @@
   <data name="localPathText" xml:space="preserve">
     <value>Local path</value>
   </data>
-  <data name="loginContent" xml:space="preserve">
-    <value>Login</value>
-  </data>
-  <data name="loginFailedText" xml:space="preserve">
+  <data name="LoginFailedText" xml:space="preserve">
     <value>Login failed.</value>
   </data>
-  <data name="loginLabelPrefixText" xml:space="preserve">
-    <value>Log in</value>
-  </data>
-  <data name="login_ClickContent" xml:space="preserve">
-    <value>Login</value>
-  </data>
   <data name="makePrivateContent" xml:space="preserve">
     <value>Private Repository</value>
   </data>
@@ -246,12 +219,6 @@
   <data name="orText" xml:space="preserve">
     <value>or</value>
   </data>
-  <data name="perMonthText" xml:space="preserve">
-    <value>for $7/month</value>
-  </data>
-  <data name="pricingLinkContent" xml:space="preserve">
-    <value>Sign up</value>
-  </data>
   <data name="privateRepositoriesText" xml:space="preserve">
     <value>private repositories.</value>
   </data>
@@ -271,51 +238,33 @@
     <value>Repository Name</value>
   </data>
   <data name="resendCodeButtonContent" xml:space="preserve">
-    <value>_Resend</value>
+    <value>Resend</value>
   </data>
   <data name="resendCodeButtonToolTip" xml:space="preserve">
     <value>Send the code to your registered SMS Device again</value>
   </data>
-  <data name="signOutContent" xml:space="preserve">
+  <data name="SignOutLink" xml:space="preserve">
     <value>Sign out</value>
   </data>
-  <data name="signup_ClickContent" xml:space="preserve">
+  <data name="SignUpLink" xml:space="preserve">
     <value>Sign up</value>
   </data>
   <data name="twoFactorAuthText" xml:space="preserve">
     <value>Two-factor authentication</value>
   </data>
-  <data name="upgradeAccountLinkContent" xml:space="preserve">
-    <value>Manage plans</value>
-  </data>
-  <data name="upgradeAccountLinkToolTip" xml:space="preserve">
-    <value>manage plans</value>
-  </data>
-  <data name="upgradeToMicroLinkContent" xml:space="preserve">
-    <value>micro plan</value>
-  </data>
-  <data name="upgradeToMicroLinkToolTip" xml:space="preserve">
-    <value>upgrade</value>
-  </data>
   <data name="verifyText" xml:space="preserve">
     <value>Verify</value>
   </data>
   <data name="youreUsingText" xml:space="preserve">
     <value>You're using</value>
   </data>
-  <data name="cloneButtonText" xml:space="preserve">
+  <data name="CloneLink" xml:space="preserve">
     <value>Clone</value>
   </data>
   <data name="GitHubInvitationSectionConnectLabel" xml:space="preserve">
     <value>Connect…</value>
   </data>
-  <data name="GitHubInvitationSectionDescription" xml:space="preserve">
-    <value>Powerful collaboration, code review, and code management for open source and private projects.</value>
-  </data>
-  <data name="GitHubInvitationSectionSignUpLabel" xml:space="preserve">
-    <value>Sign up</value>
-  </data>
-  <data name="GitHubPublishSectionDescription" xml:space="preserve">
+  <data name="BlurbText" xml:space="preserve">
     <value>Powerful collaboration, code review, and code management for open source and private projects.</value>
   </data>
   <data name="GitHubPublishSectionTitle" xml:space="preserve">
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs b/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs
index 37c65aa355..472e8cdbd3 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs
@@ -27,11 +27,11 @@ public GitHubInvitationSection(IConnectionManager cm, Lazy<IVisualStudioBrowser>
             lazyBrowser = browser;
             CanConnect = true;
             CanSignUp = true;
-            ConnectLabel = Resources.GitHubInvitationSectionConnectLabel;
-            SignUpLabel = Resources.GitHubInvitationSectionSignUpLabel;
+            ConnectLabel = Resources.GetStartedLink;
+            SignUpLabel = Resources.SignUpLink;
             Name = "GitHub";
             Provider = "GitHub, Inc.";
-            Description = Resources.GitHubInvitationSectionDescription;
+            Description = Resources.BlurbText;
             Icon = GetDrawingForIcon(GetBrushForIcon());
 
             IsVisible = cm.Connections.Count == 0;
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Sync/GitHubPublishSection.cs b/src/GitHub.VisualStudio/TeamExplorer/Sync/GitHubPublishSection.cs
index 5d598394ac..5f36e56946 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Sync/GitHubPublishSection.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Sync/GitHubPublishSection.cs
@@ -39,7 +39,7 @@ public GitHubPublishSection(ISimpleApiClientFactory apiFactory, ITeamExplorerSer
             Title = Resources.GitHubPublishSectionTitle;
             Name = "GitHub";
             Provider = "GitHub, Inc";
-            Description = Resources.GitHubPublishSectionDescription;
+            Description = Resources.BlurbText;
             ShowLogin = false;
             ShowSignup = false;
             ShowGetStarted = false;
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
index b0508bdb81..7bef48a8ab 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
@@ -44,7 +44,7 @@
                 Margin="0,0,0,10"
                 Style="{DynamicResource GitHubH1TextBlock}"
                 IsHitTestVisible="False"
-                Text="{x:Static prop:Resources.loginLabelPrefixText}" />
+                Text="{x:Static prop:Resources.LoginLink}" />
             
             <ui:HorizontalShadowDivider />
         </StackPanel>
@@ -78,11 +78,11 @@
                 <DockPanel Style="{StaticResource TabDockPanel}">
                     <StackPanel DockPanel.Dock="Bottom" Margin="0">
                         <Border Style="{StaticResource LoginButtonBorder}">
-                            <ui:OcticonCircleButton x:Name="dotComLogInButton" Icon="check" Content="{x:Static prop:Resources.dotComLogInButtonContent}" IsDefault="True" />
+                            <ui:OcticonCircleButton x:Name="dotComLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" />
                         </Border>
 
                         <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0" Text="{x:Static prop:Resources.dontHaveAnAccountText}">
-                            <Hyperlink x:Name="pricingLink" ToolTip="https://github.com/pricing"><TextBlock Text="{x:Static prop:Resources.pricingLinkContent}"/></Hyperlink>
+                            <Hyperlink x:Name="pricingLink" ToolTip="https://github.com/pricing"><TextBlock Text="{x:Static prop:Resources.SignUpLink}"/></Hyperlink>
                         </TextBlock>
                     </StackPanel>
 
@@ -91,16 +91,16 @@
                         <StackPanel Style="{StaticResource FormFieldStackPanel}">
                             <ui:PromptTextBox
                                 x:Name="dotComUserNameOrEmail"
-                                PromptText="{x:Static prop:Resources.dotComUserNameOrEmailPromptText}"
+                                PromptText="{x:Static prop:Resources.UserNameOrEmailPromptText}"
                                 Margin="0,0,0,10" />
                             
-                            <ui:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static prop:Resources.dotComPasswordPromptText}" />
+                            <ui:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static prop:Resources.PasswordPrompt}" />
 
                             <uirx:ErrorMessageDisplay
                                 x:Name="dotComLoginFailedMessage"
-                                Message="{x:Static prop:Resources.dotComLoginFailedMessageMessage}">
-                                <TextBlock TextWrapping="Wrap" Text="{x:Static prop:Resources.loginFailedText}">
-                                    <Hyperlink x:Name="dotComForgotPasswordLink"><TextBlock Text="{x:Static prop:Resources.dotComForgotPasswordLinkContent}"/></Hyperlink>
+                                Message="{x:Static prop:Resources.LoginFailedMessage}">
+                                <TextBlock TextWrapping="Wrap" Text="{x:Static prop:Resources.LoginFailedText}">
+                                    <Hyperlink x:Name="dotComForgotPasswordLink"><TextBlock Text="{x:Static prop:Resources.ForgotPasswordLink}"/></Hyperlink>
                                 </TextBlock>
                             </uirx:ErrorMessageDisplay>
 
@@ -127,7 +127,7 @@
                 <DockPanel Style="{StaticResource TabDockPanel}">
                     <StackPanel DockPanel.Dock="Bottom">
                         <Border Style="{StaticResource LoginButtonBorder}">
-                            <ui:OcticonCircleButton x:Name="enterpriseLogInButton" Icon="check" Content="{x:Static prop:Resources.enterpriseLogInButtonContent}" IsDefault="True" />
+                            <ui:OcticonCircleButton x:Name="enterpriseLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" />
                         </Border>
                         
                         <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0" Text="{x:Static prop:Resources.dontHaveGitHubEnterpriseText}">
@@ -141,10 +141,10 @@
                         
                         <ui:PromptTextBox
                             x:Name="enterpriseUserNameOrEmail"
-                            PromptText="{x:Static prop:Resources.enterpriseUserNameOrEmailPromptText}"
+                            PromptText="{x:Static prop:Resources.UserNameOrEmailPromptText}"
                             Margin="0,0,0,10" />
 
-                        <ui:SecurePasswordBox x:Name="enterprisePassword" PromptText="{x:Static prop:Resources.enterprisePasswordPromptText}" Margin="0,0,0,10" />
+                        <ui:SecurePasswordBox x:Name="enterprisePassword" PromptText="{x:Static prop:Resources.PasswordPrompt}" Margin="0,0,0,10" />
                         
                         <ui:PromptTextBox x:Name="enterpriseUrl"  PromptText="{x:Static prop:Resources.enterpriseUrlPromptText}" />
 
@@ -163,9 +163,9 @@
 
                         <uirx:ErrorMessageDisplay
                             x:Name="enterpriseLoginFailedMessage"
-                            Message="{x:Static prop:Resources.enterpriseLoginFailedMessageMessage}">
-                            <TextBlock TextWrapping="Wrap" Text="{x:Static prop:Resources.loginFailedText}">
-                                <Hyperlink x:Name="enterpriseForgotPasswordLink"><TextBlock Text="{x:Static prop:Resources.dotComForgotPasswordLinkContent}"/></Hyperlink>
+                            Message="{x:Static prop:Resources.LoginFailedMessage}">
+                            <TextBlock TextWrapping="Wrap" Text="{x:Static prop:Resources.LoginFailedText}">
+                                <Hyperlink x:Name="enterpriseForgotPasswordLink"><TextBlock Text="{x:Static prop:Resources.ForgotPasswordLink}"/></Hyperlink>
                             </TextBlock>
                         </uirx:ErrorMessageDisplay>
 
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml
index ec1390bdb0..916bcffe69 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml
@@ -1,225 +1,234 @@
 <uirx:SimpleViewUserControl x:Class="GitHub.VisualStudio.UI.Views.Controls.RepositoryCloneControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
-             xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive"
-             xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views.Controls"
-             xmlns:helpers="clr-namespace:GitHub.Helpers;assembly=GitHub.UI"
-             xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
-             xmlns:GitHub="clr-namespace:GitHub.VisualStudio.Helpers"
-             xmlns:prop="clr-namespace:GitHub.VisualStudio"
-             mc:Ignorable="d"
-             d:DesignWidth="414"
-             d:DesignHeight="440"
-             Background="Transparent">
-    <d:DesignProperties.DataContext>
-        <Binding>
-            <Binding.Source>
-                <sampleData:RepositoryCloneViewModelDesigner />
-            </Binding.Source>
-        </Binding>
-    </d:DesignProperties.DataContext>
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                            xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
+                            xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive"
+                            xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views.Controls"
+                            xmlns:helpers="clr-namespace:GitHub.Helpers;assembly=GitHub.UI"
+                            xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
+                            xmlns:GitHub="clr-namespace:GitHub.VisualStudio.Helpers"
+                            xmlns:prop="clr-namespace:GitHub.VisualStudio"
+                            mc:Ignorable="d"
+                            d:DesignWidth="414"
+                            d:DesignHeight="440"
+                            Background="Transparent">
+  <d:DesignProperties.DataContext>
+    <Binding>
+      <Binding.Source>
+        <sampleData:RepositoryCloneViewModelDesigner />
+      </Binding.Source>
+    </Binding>
+  </d:DesignProperties.DataContext>
 
-    <UserControl.Resources>
-        <ResourceDictionary>
-          <ResourceDictionary.MergedDictionaries>
-            <GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
-            <GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
-          </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
+  <UserControl.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
+        <GitHub:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </UserControl.Resources>
 
-    <DockPanel LastChildFill="True">
-        <DockPanel.Resources>
-            <Style x:Key="repositoryBorderStyle" TargetType="Border">
-                <Setter Property="BorderBrush" Value="#EAEAEA" />
-                <Setter Property="BorderThickness" Value="0,0,0,1" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="Height" Value="30" />
-                <Setter Property="Margin" Value="0" />
-            </Style>
-        </DockPanel.Resources>
-        <ui:FilterTextBox
-		    x:Name="filterText" 
-            DockPanel.Dock="Top"
-		    PromptText="{x:Static prop:Resources.filterTextPromptText}" 
-		    Margin="10" />
-        
-        <ui:GitHubProgressBar
-            x:Name="loadingProgressBar"
-            DockPanel.Dock="Top"
-            Foreground="{DynamicResource GitHubAccentBrush}"
-            Style="{DynamicResource GitHubProgressBar}"
-            HorizontalContentAlignment="Stretch"
-            Visibility="Visible"
-            IsIndeterminate="True"
-            Margin="0" />
-        <StackPanel
-            x:Name="loadingFailedMessage"
-            DockPanel.Dock="Top"
-            VerticalAlignment="Center"
-            HorizontalAlignment="Center"
-            Margin="0,4,0,4">
-			<uirx:ErrorMessageDisplay
-                Icon="stop"
-                Visibility="Visible"
-                Margin="8,0"
-                Content="{x:Static prop:Resources.ErrorMessageDisplayContent}"
-                Message="{x:Static prop:Resources.ErrorMessageDisplayMessage}" />
-		</StackPanel>
+  <DockPanel LastChildFill="True">
+    <DockPanel.Resources>
+      <Style x:Key="repositoryBorderStyle"
+             TargetType="Border">
+        <Setter Property="BorderBrush"
+                Value="#EAEAEA" />
+        <Setter Property="BorderThickness"
+                Value="0,0,0,1" />
+        <Setter Property="VerticalAlignment"
+                Value="Center" />
+        <Setter Property="Height"
+                Value="30" />
+        <Setter Property="Margin"
+                Value="0" />
+      </Style>
+    </DockPanel.Resources>
+    
+    <ui:FilterTextBox x:Name="filterText"
+                      DockPanel.Dock="Top"
+                      PromptText="{x:Static prop:Resources.filterTextPromptText}"
+                      Margin="10" />
 
-        <ui:OcticonCircleButton
-            DockPanel.Dock="Bottom"
-			IsDefault="True"
-            Margin="12"
-			x:Name="cloneButton"
-			HorizontalAlignment="Center"
-			Icon="check">
-            <TextBlock Text="{x:Static prop:Resources.cloneButtonText}"/>
-        </ui:OcticonCircleButton>
+    <ui:GitHubProgressBar x:Name="loadingProgressBar"
+                          DockPanel.Dock="Top"
+                          Foreground="{DynamicResource GitHubAccentBrush}"
+                          Style="{DynamicResource GitHubProgressBar}"
+                          HorizontalContentAlignment="Stretch"
+                          Visibility="Visible"
+                          IsIndeterminate="True"
+                          Margin="0" />
+    
+    <StackPanel x:Name="loadingFailedPanel"
+                DockPanel.Dock="Top"
+                VerticalAlignment="Center"
+                HorizontalAlignment="Center"
+                Margin="0,4,0,4">
+      <uirx:ErrorMessageDisplay x:Name="loadingFailedMessage"
+                                Icon="stop"
+                                Visibility="Visible"
+                                Margin="8,0"
+                                Content="{x:Static prop:Resources.loadingFailedMessageContent}"
+                                Message="{x:Static prop:Resources.loadingFailedMessageMessage}" />
+    </StackPanel>
 
-        <Border DockPanel.Dock="Bottom" Style="{StaticResource repositoryBorderStyle}">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Label
-                    Grid.Column="0"
-                    Grid.Row="3"
-                    Margin="4,0"
-                    Target="{Binding ElementName=clonePath}" Content="{x:Static prop:Resources.pathText}"/>
+    <ui:OcticonCircleButton DockPanel.Dock="Bottom"
+                            IsDefault="True"
+                            Margin="12"
+                            x:Name="cloneButton"
+                            HorizontalAlignment="Center"
+                            Icon="check">
+      <TextBlock Text="{x:Static prop:Resources.CloneLink}" />
+    </ui:OcticonCircleButton>
 
-                <ui:PromptTextBox x:Name="clonePath" Grid.Column="1" Margin="0,2" />
-                <uirx:ValidationMessage
-                    x:Name="pathValidationMessage"
-                    Grid.Column="1"
-                    Grid.Row="4"
-                    ValidatesControl="{Binding ElementName=clonePath}" />
-                <Button
-                    x:Name="browsePathButton"
-                    Grid.Column="2"
-                    VerticalContentAlignment="Center"
-                    Padding="0"
-                    Margin="4,0,4,0"
-                    Style="{StaticResource GitHubBlueLinkButton}" Content="{x:Static prop:Resources.browsePathButtonContent}"/>
-            </Grid>
-        </Border>
+    <Border DockPanel.Dock="Bottom"
+            Style="{StaticResource repositoryBorderStyle}">
+      <Grid>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="*" />
+          <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Label Grid.Column="0"
+               Grid.Row="3"
+               Margin="4,0"
+               Target="{Binding ElementName=clonePath}"
+               Content="{x:Static prop:Resources.pathText}" />
 
-        <Border
-            x:Name="repositoriesListPane"
+        <ui:PromptTextBox x:Name="clonePath"
+                          Grid.Column="1"
+                          Margin="0,2" />
+        <uirx:ValidationMessage x:Name="pathValidationMessage"
+                                Grid.Column="1"
+                                Grid.Row="4"
+                                ValidatesControl="{Binding ElementName=clonePath}" />
+        <Button x:Name="browsePathButton"
+                Grid.Column="2"
+                VerticalContentAlignment="Center"
+                Padding="0"
+                Margin="4,0,4,0"
+                Style="{StaticResource GitHubBlueLinkButton}"
+                Content="{x:Static prop:Resources.browsePathButtonContent}" />
+      </Grid>
+    </Border>
+
+    <Border x:Name="repositoriesListPane"
             FocusManager.IsFocusScope="True"
             FocusVisualStyle="{x:Null}"
             BorderBrush="#EAEAEA"
             BorderThickness="0,1"
             Margin="0">
-            <Border.Resources>
-                <Style TargetType="{x:Type ui:TrimmedTextBlock}" BasedOn="{StaticResource GitHubTextBlock}">
-                    <Style.Triggers>
-                        <Trigger Property="IsTextTrimmed" Value="True">
-                            <Setter Property="ToolTip" Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=Text}" />
-                        </Trigger>
-                    </Style.Triggers>
-                </Style>
-                <Style x:Key="cloneRepoHeaderStyle" TargetType="TextBlock">
-                    <Setter Property="Foreground" Value="{DynamicResource GHTextBrush}" />
-                    <Setter Property="Margin" Value="0,6,12,6" />
+      <Border.Resources>
+        <Style TargetType="{x:Type ui:TrimmedTextBlock}"
+               BasedOn="{StaticResource GitHubTextBlock}">
+          <Style.Triggers>
+            <Trigger Property="IsTextTrimmed"
+                     Value="True">
+              <Setter Property="ToolTip"
+                      Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=Text}" />
+            </Trigger>
+          </Style.Triggers>
+        </Style>
+        <Style x:Key="cloneRepoHeaderStyle"
+               TargetType="TextBlock">
+          <Setter Property="Foreground"
+                  Value="{DynamicResource GHTextBrush}" />
+          <Setter Property="Margin"
+                  Value="0,6,12,6" />
+        </Style>
+      </Border.Resources>
+      <Grid Margin="0">
+        <ListBox x:Name="repositoryList"
+                 HorizontalContentAlignment="Stretch"
+                 ItemsSource="{Binding FilteredRepositories}"
+                 Style="{DynamicResource LightListBox}">
+          <ListBox.GroupStyle>
+            <GroupStyle HidesIfEmpty="true">
+              <GroupStyle.ContainerStyle>
+                <Style TargetType="{x:Type GroupItem}">
+                  <Setter Property="Template">
+                    <Setter.Value>
+                      <ControlTemplate TargetType="{x:Type GroupItem}">
+                        <StackPanel Orientation="Vertical"
+                                    Margin="0">
+                          <Border Background="#F8F8F8"
+                                  Style="{StaticResource repositoryBorderStyle}">
+                            <StackPanel Orientation="Horizontal"
+                                        VerticalAlignment="Center"
+                                        Margin="0">
+                              <Image x:Name="avatar"
+                                     Width="16"
+                                     Height="16"
+                                     Margin="10,0,6,0"
+                                     RenderOptions.BitmapScalingMode="HighQuality"
+                                     Source="{Binding Items[0].Owner.Avatar}" />
+                              <TextBlock Text="{Binding Path=Name}"
+                                         Style="{StaticResource cloneRepoHeaderStyle}" />
+                            </StackPanel>
+                          </Border>
+                          <ItemsPresenter Margin="0" />
+                        </StackPanel>
+                      </ControlTemplate>
+                    </Setter.Value>
+                  </Setter>
                 </Style>
-            </Border.Resources>
-            <Grid Margin="0">
-                <ListBox
-				    x:Name="repositoryList"
-				    HorizontalContentAlignment="Stretch"
-                    ItemsSource="{Binding FilteredRepositories}"
-				    Style="{DynamicResource LightListBox}">
-                    <ListBox.GroupStyle>
-                        <GroupStyle HidesIfEmpty="true">
-                            <GroupStyle.ContainerStyle>
-                                <Style TargetType="{x:Type GroupItem}">
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="{x:Type GroupItem}">
-                                                <StackPanel Orientation="Vertical" Margin="0">
-                                                    <Border
-													Background="#F8F8F8"
-													Style="{StaticResource repositoryBorderStyle}">
-                                                        <StackPanel
-														Orientation="Horizontal"
-														VerticalAlignment="Center"
-														Margin="0">
-                                                            <Image
-															x:Name="avatar"
-															Width="16"
-															Height="16"
-															Margin="10,0,6,0"
-															RenderOptions.BitmapScalingMode="HighQuality"
-															Source="{Binding Items[0].Owner.Avatar}" />
-                                                            <TextBlock
-															Text="{Binding Path=Name}"
-															Style="{StaticResource cloneRepoHeaderStyle}" />
-                                                        </StackPanel>
-                                                    </Border>
-                                                    <ItemsPresenter Margin="0" />
-                                                </StackPanel>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                            </GroupStyle.ContainerStyle>
-                        </GroupStyle>
-                    </ListBox.GroupStyle>
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <Border Style="{StaticResource repositoryBorderStyle}">
-                                <StackPanel
-								Orientation="Horizontal"
-								VerticalAlignment="Center"
-								Margin="0">
-                                    <ui:OcticonImage
-									x:Name="iconPath" 
-									Width="16"
-									Height="16" 
-									Margin="32,0,6,0" 
-									VerticalAlignment="Center"
-									Icon="{Binding Icon}"
-									Foreground="#D0D0D0" />
+              </GroupStyle.ContainerStyle>
+            </GroupStyle>
+          </ListBox.GroupStyle>
+          <ListBox.ItemTemplate>
+            <DataTemplate>
+              <Border Style="{StaticResource repositoryBorderStyle}">
+                <StackPanel Orientation="Horizontal"
+                            VerticalAlignment="Center"
+                            Margin="0">
+                  <ui:OcticonImage x:Name="iconPath"
+                                   Width="16"
+                                   Height="16"
+                                   Margin="32,0,6,0"
+                                   VerticalAlignment="Center"
+                                   Icon="{Binding Icon}"
+                                   Foreground="#D0D0D0" />
 
-                                    <ui:TrimmedTextBlock
-                                    x:Name="label"
-									VerticalAlignment="Center"
-									Text="{Binding Name}"
-									Foreground="#666"
-									TextTrimming="CharacterEllipsis" />
-                                </StackPanel>
-                            </Border>
-                            <DataTemplate.Triggers>
-                                <MultiDataTrigger>
-                                    <MultiDataTrigger.Conditions>
-                                        <Condition Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" Value="True" />
-                                        <Condition Binding="{Binding Path=(Selector.IsSelectionActive), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" Value="True" />
-                                    </MultiDataTrigger.Conditions>
-                                    <MultiDataTrigger.Setters>
-                                        <Setter Property="Foreground" Value="White" TargetName="iconPath" />
-                                        <Setter Property="Foreground" Value="White" TargetName="label" />
-                                    </MultiDataTrigger.Setters>
-                                </MultiDataTrigger>
-                            </DataTemplate.Triggers>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
-                <StackPanel
-                    x:Name="noRepositoriesMessage"
+                  <ui:TrimmedTextBlock x:Name="label"
+                                       VerticalAlignment="Center"
+                                       Text="{Binding Name}"
+                                       Foreground="#666"
+                                       TextTrimming="CharacterEllipsis" />
+                </StackPanel>
+              </Border>
+              <DataTemplate.Triggers>
+                <MultiDataTrigger>
+                  <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}"
+                               Value="True" />
+                    <Condition Binding="{Binding Path=(Selector.IsSelectionActive), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}"
+                               Value="True" />
+                  </MultiDataTrigger.Conditions>
+                  <MultiDataTrigger.Setters>
+                    <Setter Property="Foreground"
+                            Value="White"
+                            TargetName="iconPath" />
+                    <Setter Property="Foreground"
+                            Value="White"
+                            TargetName="label" />
+                  </MultiDataTrigger.Setters>
+                </MultiDataTrigger>
+              </DataTemplate.Triggers>
+            </DataTemplate>
+          </ListBox.ItemTemplate>
+        </ListBox>
+        <StackPanel x:Name="noRepositoriesMessage"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Center"
                     Margin="0,-70,0,0">
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        Style="{DynamicResource GitHubH2TextBlock}" Text="{x:Static prop:Resources.noRepositoriesMessageText}"/>
-                </StackPanel>
-            </Grid>
-		</Border>
-    </DockPanel>
+          <TextBlock HorizontalAlignment="Center"
+                     Style="{DynamicResource GitHubH2TextBlock}"
+                     Text="{x:Static prop:Resources.noRepositoriesMessageText}" />
+        </StackPanel>
+      </Grid>
+    </Border>
+  </DockPanel>
 </uirx:SimpleViewUserControl>
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml.cs b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml.cs
index e7009d73f9..d976156d30 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml.cs
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml.cs
@@ -33,7 +33,7 @@ public RepositoryCloneControl()
             this.WhenActivated(d =>
             {
                 d(this.OneWayBind(ViewModel, vm => vm.IsLoading, v => v.loadingProgressBar.Visibility));
-                d(this.OneWayBind(ViewModel, vm => vm.LoadingFailed, v => v.loadingFailedMessage.Visibility));
+                d(this.OneWayBind(ViewModel, vm => vm.LoadingFailed, v => v.loadingFailedPanel.Visibility));
                 d(this.OneWayBind(ViewModel, vm => vm.NoRepositoriesFound, v => v.noRepositoriesMessage.Visibility));
                 d(this.OneWayBind(ViewModel, vm => vm.FilteredRepositories, v => v.repositoryList.ItemsSource, CreateRepositoryListCollectionView));
                 d(this.Bind(ViewModel, vm => vm.SelectedRepository, v => v.repositoryList.SelectedItem));
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml
index 7541898e64..42d5081a30 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml
@@ -41,7 +41,7 @@
             x:Name="createRepositoryButton"
             HorizontalAlignment="Center"
             Icon="check">
-            <TextBlock Text="{x:Static prop:Resources.createRepositoryButtonText}"/>
+            <TextBlock Text="{x:Static prop:Resources.CreateLink}"/>
         </ui:OcticonCircleButton>
 
         <StackPanel>
@@ -221,37 +221,9 @@
                     Content="{x:Static prop:Resources.makePrivateContent}"
                     Style="{DynamicResource BlueRoundedCheckBox}"
                     Padding="8,0,0,0" />
-                <Grid Grid.Column="1" Grid.Row="10">
-                    <Label x:Name="upgradeToMicroPlanWarning"  HorizontalAlignment="Left" Visibility="Collapsed">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                            <TextBlock Text="{x:Static prop:Resources.privateRepoText}"/>
-                            <ui:OcticonLinkButton 
-                            x:Name="upgradeToMicroLink"
-                            FontSize="12"
-                            Icon="link_external" 
-                            Content="{x:Static prop:Resources.upgradeToMicroLinkContent}"
-                            ToolTip="{x:Static prop:Resources.upgradeToMicroLinkToolTip}"
-                            Margin="5,0"/>
-                            <TextBlock Text="{x:Static prop:Resources.perMonthText}"/>
-                        </StackPanel>
-                    </Label>
-                    <Label x:Name="upgradePlanWarning"  HorizontalAlignment="Left" Visibility="Collapsed">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                            <TextBlock Text="{x:Static prop:Resources.youreUsingText}"/> 
-                                <TextBlock><Run x:Name="ownedPrivateReposText"/>/<Run  x:Name="privateReposInPlanText"/></TextBlock>
-                            <TextBlock Text="{x:Static prop:Resources.privateRepositoriesText}"/>
-                            <ui:OcticonLinkButton 
-                            x:Name="upgradeAccountLink"
-                            FontSize="12"
-                            Icon="link_external" 
-                            Content="{x:Static prop:Resources.upgradeToMicroLinkContent}"
-                            ToolTip="{x:Static prop:Resources.upgradeToMicroLinkToolTip}"
-                            Margin="5,0"/>
-                        </StackPanel>
-                    </Label>
-                </Grid>
             </Grid>
-            <uirx:UserErrorMessages
+
+          <uirx:UserErrorMessages
                 x:Name="userErrorMessages"
                 HorizontalAlignment="Center"
                 HorizontalContentAlignment="Stretch"
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml.cs b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml.cs
index efcd661024..4340522a5e 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml.cs
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCreationControl.xaml.cs
@@ -50,18 +50,11 @@ public RepositoryCreationControl()
                 d(this.Bind(ViewModel, vm => vm.KeepPrivate, v => v.makePrivate.IsChecked));
                 d(this.OneWayBind(ViewModel, vm => vm.CanKeepPrivate, v => v.makePrivate.IsEnabled));
 
-                //d(this.OneWayBind(ViewModel, vm => vm.ShowUpgradeToMicroPlanWarning, v => v.upgradeToMicroPlanWarning.Visibility));
-                //d(this.OneWayBind(ViewModel, vm => vm.ShowUpgradePlanWarning, v => v.upgradePlanWarning.Visibility));
-                d(this.OneWayBind(ViewModel, vm => vm.SelectedAccount.OwnedPrivateRepos, v => v.ownedPrivateReposText.Text));
-                d(this.OneWayBind(ViewModel, vm => vm.SelectedAccount.PrivateReposInPlan, v => v.privateReposInPlanText.Text));
-
                 d(this.OneWayBind(ViewModel, vm => vm.Accounts, v => v.accountsComboBox.ItemsSource));
                 d(this.Bind(ViewModel, vm => vm.SelectedAccount, v => v.accountsComboBox.SelectedItem));
 
                 d(this.BindCommand(ViewModel, vm => vm.CreateRepository, v => v.createRepositoryButton));
                 d(this.OneWayBind(ViewModel, vm => vm.IsCreating, v => v.createRepositoryButton.ShowSpinner));
-                //d(this.BindCommand(ViewModel, vm => vm.UpgradeAccountPlan, v => v.upgradeToMicroLink));
-                //d(this.BindCommand(ViewModel, vm => vm.UpgradeAccountPlan, v => v.upgradeAccountLink));
 
                 d(this.BindCommand(ViewModel, vm => vm.BrowseForDirectory, v => v.browsePathButton));
 
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml
index b152213541..031ee6900d 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml
@@ -125,34 +125,6 @@
         <CheckBox x:Name="makePrivate"
                   Margin="0,8,0,0"
                   Style="{StaticResource VSStyledCheckBox}" Content="{x:Static prop:Resources.makePrivateContent}"/>
-        
-        <Label x:Name="upgradeToMicroPlanWarning" HorizontalAlignment="Left" Visibility="Collapsed">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                <TextBlock Text="{x:Static prop:Resources.privateRepoText}"/>
-                <ui:OcticonLinkButton
-                    x:Name="upgradeToMicroLink"
-                    FontSize="12"
-                    Icon="link_external" 
-                    Content="{x:Static prop:Resources.upgradeToMicroLinkContent}"
-                    ToolTip="{x:Static prop:Resources.upgradeToMicroLinkToolTip}"
-                    Margin="5,0"/>
-                <TextBlock Text="{x:Static prop:Resources.perMonthText}"/>
-            </StackPanel>
-        </Label>
-        <Label x:Name="upgradePlanWarning"  HorizontalAlignment="Left" Visibility="Collapsed">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                <TextBlock Text="{x:Static prop:Resources.youreUsingText}"/>
-                <TextBlock><Run x:Name="ownedPrivateReposText"/>/<Run  x:Name="privateReposInPlanText"/></TextBlock> 
-                <TextBlock Text="{x:Static prop:Resources.privateRepositoriesText}"/>
-                <ui:OcticonLinkButton 
-                    x:Name="upgradeAccountLink"
-                    FontSize="12"
-                    Icon="link_external" 
-                    Content="{x:Static prop:Resources.upgradeAccountLinkContent}"
-                    ToolTip="{x:Static prop:Resources.upgradeAccountLinkToolTip}"
-                    Margin="5,0"/>
-            </StackPanel>
-        </Label>
        
         <Button
             Style="{StaticResource VSStyledButton}"
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml.cs b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml.cs
index 69c641fcd9..ef6a0e01c5 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml.cs
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml.cs
@@ -59,17 +59,10 @@ public RepositoryPublishControl()
 
                 d(this.OneWayBind(ViewModel, vm => vm.CanKeepPrivate, v => v.makePrivate.IsEnabled));
 
-                //d(this.OneWayBind(ViewModel, vm => vm.ShowUpgradeToMicroPlanWarning, v => v.upgradeToMicroPlanWarning.Visibility));
-                //d(this.OneWayBind(ViewModel, vm => vm.ShowUpgradePlanWarning, v => v.upgradePlanWarning.Visibility));
-                d(this.OneWayBind(ViewModel, vm => vm.SelectedAccount.OwnedPrivateRepos, v => v.ownedPrivateReposText.Text));
-                d(this.OneWayBind(ViewModel, vm => vm.SelectedAccount.PrivateReposInPlan, v => v.privateReposInPlanText.Text));
-
                 d(this.OneWayBind(ViewModel, vm => vm.Accounts, v => v.accountsComboBox.ItemsSource));
                 d(this.Bind(ViewModel, vm => vm.SelectedAccount, v => v.accountsComboBox.SelectedItem));
 
                 d(this.BindCommand(ViewModel, vm => vm.PublishRepository, v => v.publishRepositoryButton));
-                //d(this.BindCommand(ViewModel, vm => vm.UpgradeAccountPlan, v => v.upgradeToMicroLink));
-                //d(this.BindCommand(ViewModel, vm => vm.UpgradeAccountPlan, v => v.upgradeAccountLink));
 
                 d(this.OneWayBind(ViewModel, vm => vm.IsPublishing, v => v.nameText.IsEnabled, x => x == false));
                 d(this.OneWayBind(ViewModel, vm => vm.IsPublishing, v => v.description.IsEnabled, x => x == false));
diff --git a/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml b/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml
index ce2fef3cdb..757cad90e7 100644
--- a/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml
@@ -146,13 +146,13 @@
   
   <DockPanel>
     <WrapPanel Orientation="Horizontal" Margin="6,0,0,6" DockPanel.Dock="Top">
-      <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="0" x:Name="cloneLink" Click="cloneLink_Click" Content="{x:Static prop:Resources.cloneLinkContent}"/>
+      <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="0" x:Name="cloneLink" Click="cloneLink_Click" Content="{x:Static prop:Resources.CloneLink}"/>
       <Separator Margin="3,0,3,0" Style="{StaticResource VerticalSeparator}" />
-      <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="1" x:Name="createLink" Click="createLink_Click" Content="{x:Static prop:Resources.createLinkContent}"/>
+      <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="1" x:Name="createLink" Click="createLink_Click" Content="{x:Static prop:Resources.CreateLink}"/>
       <Separator Margin="3,0,3,0" Style="{StaticResource VerticalSeparator}" />
-      <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="2" x:Name="signOut" Click="signOut_Click" Content="{x:Static prop:Resources.signOutContent}"
+      <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="2" x:Name="signOut" Click="signOut_Click" Content="{x:Static prop:Resources.SignOutLink}"
               Visibility="{Binding ShowLogout, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-      <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="2" x:Name="login" Click="login_Click" Content="{x:Static prop:Resources.loginContent}"
+      <Button Style="{StaticResource ActionLinkButton}" KeyboardNavigation.TabIndex="2" x:Name="login" Click="login_Click" Content="{x:Static prop:Resources.LoginLink}"
               Visibility="{Binding ShowLogin, Converter={StaticResource BooleanToVisibilityConverter}}"/>
     </WrapPanel>
  
diff --git a/src/GitHub.VisualStudio/UI/Views/GitHubInvitationContent.xaml b/src/GitHub.VisualStudio/UI/Views/GitHubInvitationContent.xaml
index 4d99a35e46..2d22d83c82 100644
--- a/src/GitHub.VisualStudio/UI/Views/GitHubInvitationContent.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/GitHubInvitationContent.xaml
@@ -66,13 +66,13 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" KeyboardNavigation.TabIndex="0" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Left" x:Name="login" Click="login_Click" Content="{x:Static prop:Resources.login_ClickContent}"
+            <Button Grid.Column="0" KeyboardNavigation.TabIndex="0" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Left" x:Name="login" Click="login_Click" Content="{x:Static prop:Resources.LoginLink}"
                     Visibility="{Binding ShowLogin, Converter={StaticResource BooleanToVisibilityConverter}}"/>
             <TextBlock Grid.Column="1" Margin="3,0,3,0"
                     Visibility="{Binding ShowLogin, Converter={StaticResource BooleanToVisibilityConverter}}" Text="{x:Static prop:Resources.orText}"/>
-            <Button Grid.Column="2" KeyboardNavigation.TabIndex="1" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Left" x:Name="signup" Click="signup_Click" Content="{x:Static prop:Resources.signup_ClickContent}"
+            <Button Grid.Column="2" KeyboardNavigation.TabIndex="1" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Left" x:Name="signup" Click="signup_Click" Content="{x:Static prop:Resources.SignUpLink}"
                     Visibility="{Binding ShowSignup, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-            <Button Grid.Column="3" KeyboardNavigation.TabIndex="2" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Right" x:Name="connect" Click="connect_Click" Content="{x:Static prop:Resources.connect_ClickContent}"
+            <Button Grid.Column="3" KeyboardNavigation.TabIndex="2" Style="{StaticResource ActionLinkButton}" HorizontalAlignment="Right" x:Name="connect" Click="connect_Click" Content="{x:Static prop:Resources.GetStartedLink}"
                     Visibility="{Binding ShowGetStarted, Converter={StaticResource BooleanToVisibilityConverter}}"/>
             <Rectangle Grid.Column="4" Width="16" Height="16" Margin="8,0,0,0" Fill="{StaticResource ConnectArrowBrush}"
                     Visibility="{Binding ShowGetStarted, Converter={StaticResource BooleanToVisibilityConverter}}"/>

From 64d872f1a11d517094d05b6baf7d055de21cbd33 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Wed, 9 Sep 2015 11:00:13 +0200
Subject: [PATCH 10/13] Add new strings and kill unused ones

---
 src/GitHub.VisualStudio/Resources.Designer.cs | 40 +------------------
 src/GitHub.VisualStudio/Resources.resx        | 14 +------
 .../Connect/GitHubInvitationSection.cs        |  2 +-
 .../UI/Views/Controls/LoginControl.xaml       |  2 +-
 .../UI/Views/Controls/TwoFactorControl.xaml   |  2 +-
 .../UI/Views/GitHubConnectContent.xaml        |  8 +++-
 6 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/src/GitHub.VisualStudio/Resources.Designer.cs b/src/GitHub.VisualStudio/Resources.Designer.cs
index 15452f5c94..2e41ed6249 100644
--- a/src/GitHub.VisualStudio/Resources.Designer.cs
+++ b/src/GitHub.VisualStudio/Resources.Designer.cs
@@ -288,9 +288,9 @@ public static string IssuesNavigationItemText {
         /// <summary>
         ///   Looks up a localized string similar to Learn more.
         /// </summary>
-        public static string learnMoreLinkContent {
+        public static string learnMoreLink {
             get {
-                return ResourceManager.GetString("learnMoreLinkContent", resourceCulture);
+                return ResourceManager.GetString("learnMoreLink", resourceCulture);
             }
         }
         
@@ -420,24 +420,6 @@ public static string pathText {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to private repositories..
-        /// </summary>
-        public static string privateRepositoriesText {
-            get {
-                return ResourceManager.GetString("privateRepositoriesText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Private repositories require a.
-        /// </summary>
-        public static string privateRepoText {
-            get {
-                return ResourceManager.GetString("privateRepoText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Publish.
         /// </summary>
@@ -465,15 +447,6 @@ public static string PulseNavigationItemText {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Read more.
-        /// </summary>
-        public static string readMoreText {
-            get {
-                return ResourceManager.GetString("readMoreText", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to This repository does not have a remote. Fill out the form to publish it to GitHub..
         /// </summary>
@@ -563,14 +536,5 @@ public static string WikiNavigationItemText {
                 return ResourceManager.GetString("WikiNavigationItemText", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You&apos;re using.
-        /// </summary>
-        public static string youreUsingText {
-            get {
-                return ResourceManager.GetString("youreUsingText", resourceCulture);
-            }
-        }
     }
 }
diff --git a/src/GitHub.VisualStudio/Resources.resx b/src/GitHub.VisualStudio/Resources.resx
index 9d4b8e7361..080a796302 100644
--- a/src/GitHub.VisualStudio/Resources.resx
+++ b/src/GitHub.VisualStudio/Resources.resx
@@ -192,7 +192,7 @@
   <data name="ignoreTemplateListText" xml:space="preserve">
     <value>Git ignore</value>
   </data>
-  <data name="learnMoreLinkContent" xml:space="preserve">
+  <data name="learnMoreLink" xml:space="preserve">
     <value>Learn more</value>
   </data>
   <data name="licenseListText" xml:space="preserve">
@@ -219,18 +219,9 @@
   <data name="orText" xml:space="preserve">
     <value>or</value>
   </data>
-  <data name="privateRepositoriesText" xml:space="preserve">
-    <value>private repositories.</value>
-  </data>
-  <data name="privateRepoText" xml:space="preserve">
-    <value>Private repositories require a</value>
-  </data>
   <data name="publishText" xml:space="preserve">
     <value>Publish</value>
   </data>
-  <data name="readMoreText" xml:space="preserve">
-    <value>Read more</value>
-  </data>
   <data name="RepoDoesNotHaveRemoteText" xml:space="preserve">
     <value>This repository does not have a remote. Fill out the form to publish it to GitHub.</value>
   </data>
@@ -255,9 +246,6 @@
   <data name="verifyText" xml:space="preserve">
     <value>Verify</value>
   </data>
-  <data name="youreUsingText" xml:space="preserve">
-    <value>You're using</value>
-  </data>
   <data name="CloneLink" xml:space="preserve">
     <value>Clone</value>
   </data>
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs b/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs
index 472e8cdbd3..366029b945 100644
--- a/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs
+++ b/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubInvitationSection.cs
@@ -27,7 +27,7 @@ public GitHubInvitationSection(IConnectionManager cm, Lazy<IVisualStudioBrowser>
             lazyBrowser = browser;
             CanConnect = true;
             CanSignUp = true;
-            ConnectLabel = Resources.GetStartedLink;
+            ConnectLabel = Resources.GitHubInvitationSectionConnectLabel;
             SignUpLabel = Resources.SignUpLink;
             Name = "GitHub";
             Provider = "GitHub, Inc.";
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
index 7bef48a8ab..03fb684f09 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml
@@ -131,7 +131,7 @@
                         </Border>
                         
                         <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0" Text="{x:Static prop:Resources.dontHaveGitHubEnterpriseText}">
-                            <Hyperlink x:Name="learnMoreLink" ToolTip="enterprise.github.com"><TextBlock Text="{x:Static prop:Resources.learnMoreLinkContent}"></TextBlock></Hyperlink>
+                            <Hyperlink x:Name="learnMoreLink" ToolTip="enterprise.github.com"><TextBlock Text="{x:Static prop:Resources.learnMoreLink}"></TextBlock></Hyperlink>
                         </TextBlock>
                     </StackPanel>
                     
diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml
index adf81ca5b5..9b286401d3 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/TwoFactorControl.xaml
@@ -45,7 +45,7 @@
             TextWrapping="Wrap"
             Style="{DynamicResource GitHubDescriptionTextBlock}">
             <Run x:Name="description" Text="{x:Static prop:Resources.openTwoFactorAuthAppText}"/>
-            <Hyperlink x:Name="twoFactorReadMoreLink" ToolTip="https://help.github.com/articles/about-two-factor-authentication"><TextBlock Text="{x:Static prop:Resources.readMoreText}"/></Hyperlink>
+            <Hyperlink x:Name="twoFactorReadMoreLink" ToolTip="https://help.github.com/articles/about-two-factor-authentication"><TextBlock Text="{x:Static prop:Resources.learnMoreLink}"/></Hyperlink>
         </TextBlock>
         <uirx:TwoFactorInput
             x:Name="authenticationCode"
diff --git a/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml b/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml
index 757cad90e7..961fa56b2d 100644
--- a/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/GitHubConnectContent.xaml
@@ -199,7 +199,9 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                   </Grid.RowDefinitions>
-                  <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,6,0">Name:</TextBlock>
+                  <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,6,0">
+                    <Run Text="{x:Static prop:Resources.nameText}"/>:
+                  </TextBlock>
                   <TextBlock Grid.Row="0" Grid.Column="1">
                     <TextBlock.Text>
                       <MultiBinding Converter="{StaticResource FormatRepositoryNameConverter}" ConverterParameter="FormatRepositoryName">
@@ -208,7 +210,9 @@
                       </MultiBinding>
                     </TextBlock.Text>
                   </TextBlock>
-                  <TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,6,0">Path:</TextBlock>
+                  <TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,6,0">
+                    <Run Text="{x:Static prop:Resources.pathText}"/>:
+                  </TextBlock>
                   <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=LocalPath}" />
                 </Grid>
               </ToolTip>

From f8a84042dfebfded198541e2e343f2df8e0dc082 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Tue, 15 Sep 2015 20:09:05 +0200
Subject: [PATCH 11/13] Fix merge

---
 .../UI/Views/Controls/RepositoryPublishControl.xaml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml
index 83e2d364d5..10658bbaaf 100644
--- a/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml
+++ b/src/GitHub.VisualStudio/UI/Views/Controls/RepositoryPublishControl.xaml
@@ -138,7 +138,7 @@
               </Style>
             </TextBlock.Resources>
             <TextBlock.Inlines>
-              <Run Content="{x:Static prop:Resources.makePrivateContent}"/>
+              <Run Text="{x:Static prop:Resources.makePrivateContent}"/>
             </TextBlock.Inlines>
           </TextBlock>
         </CheckBox>

From c205c55a84c37815975ec51ec95b6fc5acabb2e8 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Tue, 15 Sep 2015 20:02:25 +0200
Subject: [PATCH 12/13] why is this marked as binary?

---
 src/GitHub.App/GitHub.App.csproj     |   2 +-
 src/GitHub.App/GlobalSuppressions.cs | Bin 1390 -> 856 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
index 7da5a6de73..864cd68843 100644
--- a/src/GitHub.App/GitHub.App.csproj
+++ b/src/GitHub.App/GitHub.App.csproj
@@ -128,6 +128,7 @@
     <Compile Include="Extensions\EnvironmentExtensions.cs" />
     <Compile Include="Extensions\RepositoryModelExtensions.cs" />
     <Compile Include="Extensions\ValidationExtensions.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Infrastructure\LoggingConfiguration.cs" />
     <Compile Include="Services\AvatarProvider.cs" />
     <Compile Include="Services\ImageDownloader.cs" />
@@ -155,7 +156,6 @@
     <Compile Include="Caches\LoginCache.cs" />
     <Compile Include="Caches\SharedCache.cs" />
     <Compile Include="Factories\SqlitePersistentBlobCacheFactory.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Info\GitHubUrls.cs" />
     <Compile Include="Infrastructure\ExportWrappers.cs" />
     <Compile Include="Models\Account.cs" />
diff --git a/src/GitHub.App/GlobalSuppressions.cs b/src/GitHub.App/GlobalSuppressions.cs
index 3210fb0c913df0c5a3ba5b4200225a3569fdfbc0..ee1265bc206bc66ee03143dddebb40a167ec32db 100644
GIT binary patch
literal 856
zcma))O>fjN5QgvjD@NhcN@)t^K(&a&vIyuQsA?)CggDGPvx%u=Tb{|H{CmdPO=%Ga
z4$g-^-g)0=JhJs2G!qLA)d!264=mPjwGAz8Ji3W3zg?}qBQp&<H?5%=V@$+c>%flA
zirShKIP9gmrL+%eKyRohq1bL-U0+?TYfKNd9;U<_ZUj|dR~r)|!8<61c}ZvPF?A$)
z>XVhv<F5K@=~t~joZ3l*LU$Cy<7D;Xj+i71(%E@&{^LJQe!)RApZvXf`FgD~VN8Y^
zNxHyIA4b={rzVnf)NVscWW-H+;uQI&J(+wOLy^oX{|d5H;A+{$+3)2g-1nAYZykZY
zN2V5b6J++Vzy}F1p!K5TZ}yNSP}KKs6k?Db1uzj{jLxc<o|Rl7rtnikRC)jH@%zHj
zfgJFun>Kg`veHw69uEXwj~*Km(yZCp1Nmb`;7G>qty#99Z-H||=aL8>2jYl^N{}h)
z^VsAPNK7^{M-PB)3;5K+qv4FCgk-y3E{wD0L35C*%vTPSME=bx&sizn(FvCjgA&VX
z#d2Mj=4pSj+oNb!C~p36RSNJ?OBXY#Z()QsC<y^ir)cW<8M1}&+(W(jBRV%#tKaxT
BD6jwk

literal 1390
zcmaKs-D}i96vgke;QuhJFBWWyK1s!gqWJM36uSsTe28hfjb@XwnJE3|)!(_(*<^RI
zgw15;ew};nnf?1`w80wdY-PbN?2cWu+SXRsTh2?)JL~<lv5K{@H|($QIm1#~>oE<M
zSN7N*`R^;|1CR22caKxgKH4qMhI3gz-LI-q+f!R`q8b~o*V{En3OmQP;k)O(CU1vF
zjqfuuF2HhT&+VnX;5j9}#OtSLR%JyFcnowFu|?0HVlT+kgQh0WYtOajJ4Yp-rRNj6
zxb=EZj%XijB!6LF*wyx%iiwk!T4G2&s$OlM`Q2hY^epU&Tg6k{A`}xxbarIloXZnC
zq4v^ls5J0(&Ds(X?)REs%{&5l?s(_vgoF76s`Pk>MNM3cXw}>wnoOACP*0KW8mf(a
zX_Cr&<J|_{>RhWP-Qt(9rONV4T}TDJ{lHogUCb(+?^uq#*I)RxWF7W!Hst6WK}}v|
z*TjRPQB1(9j@9YLRi-&gNfXi)k@6J}(r@CsWH-1vD(vFC;$%0Ev?$((t&+4$ohn|p
zLz+^a5}(>N8<~<+C;iS9r@eGg&DfamEWMACda9Ao?anN5k?T)PXT2!D=C*>JXvfsi
zbSiF(V#Hj+qnnv-q!cDrvUNi9kjB#O9?2fbq^eSX(pyHiI8a>hJ3G}*_b)R%$2y@{
z*hj~=uinhWJF4oYEM|-by9CV$sw-zy`j93%{N_r{O#feT`-;vyr~B1WL;sEXcTDOQ
F?teMF?mPeh


From 00faa3718774ed64a4af5195032c0203dc08f871 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Tue, 15 Sep 2015 20:06:45 +0200
Subject: [PATCH 13/13] Add more strings

---
 src/GitHub.App/GitHub.App.csproj              |  11 +
 src/GitHub.App/Resources.Designer.cs          | 288 ++++++++++++++++++
 src/GitHub.App/Resources.resx                 | 195 ++++++++++++
 .../ViewModels/LoginControlViewModel.cs       |   2 +-
 .../ViewModels/LoginTabViewModel.cs           |  13 +-
 .../LoginToGitHubForEnterpriseViewModel.cs    |   6 +-
 .../ViewModels/RepositoryCloneViewModel.cs    |   5 +-
 .../ViewModels/RepositoryCreationViewModel.cs |  18 +-
 .../ViewModels/RepositoryPublishViewModel.cs  |  10 +-
 .../ViewModels/TwoFactorDialogViewModel.cs    |   9 +-
 10 files changed, 524 insertions(+), 33 deletions(-)
 create mode 100644 src/GitHub.App/Resources.Designer.cs
 create mode 100644 src/GitHub.App/Resources.resx

diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
index 864cd68843..ccc90ff1e6 100644
--- a/src/GitHub.App/GitHub.App.csproj
+++ b/src/GitHub.App/GitHub.App.csproj
@@ -130,6 +130,11 @@
     <Compile Include="Extensions\ValidationExtensions.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Infrastructure\LoggingConfiguration.cs" />
+    <Compile Include="Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Services\AvatarProvider.cs" />
     <Compile Include="Services\ImageDownloader.cs" />
     <Compile Include="Services\GitClient.cs" />
@@ -263,6 +268,12 @@
       <Name>Rothko</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/src/GitHub.App/Resources.Designer.cs b/src/GitHub.App/Resources.Designer.cs
new file mode 100644
index 0000000000..d29a014386
--- /dev/null
+++ b/src/GitHub.App/Resources.Designer.cs
@@ -0,0 +1,288 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace GitHub {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitHub.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select a containing folder for your new repository..
+        /// </summary>
+        public static string BrowseForDirectory {
+            get {
+                return ResourceManager.GetString("BrowseForDirectory", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Clone a {0} Repository.
+        /// </summary>
+        public static string CloneTitle {
+            get {
+                return ResourceManager.GetString("CloneTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Create a {0} Repository.
+        /// </summary>
+        public static string CreateTitle {
+            get {
+                return ResourceManager.GetString("CreateTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please enter an Enterprise URL.
+        /// </summary>
+        public static string EnterpriseUrlValidatorEmpty {
+            get {
+                return ResourceManager.GetString("EnterpriseUrlValidatorEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please enter a valid Enterprise URL.
+        /// </summary>
+        public static string EnterpriseUrlValidatorInvalid {
+            get {
+                return ResourceManager.GetString("EnterpriseUrlValidatorInvalid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Not an Enterprise server. Please enter an Enterprise URL.
+        /// </summary>
+        public static string EnterpriseUrlValidatorNotAGitHubHost {
+            get {
+                return ResourceManager.GetString("EnterpriseUrlValidatorNotAGitHubHost", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Make sure to use your password and not a Personal Access token to log in..
+        /// </summary>
+        public static string LoginFailedForbiddenMessage {
+            get {
+                return ResourceManager.GetString("LoginFailedForbiddenMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Check your username and password, then try again.
+        /// </summary>
+        public static string LoginFailedMessage {
+            get {
+                return ResourceManager.GetString("LoginFailedMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connect To GitHub.
+        /// </summary>
+        public static string LoginTitle {
+            get {
+                return ResourceManager.GetString("LoginTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please enter your password.
+        /// </summary>
+        public static string PasswordValidatorEmpty {
+            get {
+                return ResourceManager.GetString("PasswordValidatorEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Publish repository.
+        /// </summary>
+        public static string PublishTitle {
+            get {
+                return ResourceManager.GetString("PublishTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Publish repository to {0}.
+        /// </summary>
+        public static string PublishToTitle {
+            get {
+                return ResourceManager.GetString("PublishToTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Repository &apos;{0}/{1}&apos; already exists..
+        /// </summary>
+        public static string RepositoryCreationFailedAlreadyExists {
+            get {
+                return ResourceManager.GetString("RepositoryCreationFailedAlreadyExists", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Change the repository name or select a different account and try again..
+        /// </summary>
+        public static string RepositoryCreationFailedAlreadyExistsMessage {
+            get {
+                return ResourceManager.GetString("RepositoryCreationFailedAlreadyExistsMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Exceeded private repositories quota..
+        /// </summary>
+        public static string RepositoryCreationFailedQuota {
+            get {
+                return ResourceManager.GetString("RepositoryCreationFailedQuota", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Repository with same name already exists at this location.
+        /// </summary>
+        public static string RepositoryNameValidatorAlreadyExists {
+            get {
+                return ResourceManager.GetString("RepositoryNameValidatorAlreadyExists", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please enter a repository name.
+        /// </summary>
+        public static string RepositoryNameValidatorEmpty {
+            get {
+                return ResourceManager.GetString("RepositoryNameValidatorEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Repository name must be fewer than 100 characters.
+        /// </summary>
+        public static string RepositoryNameValidatorTooLong {
+            get {
+                return ResourceManager.GetString("RepositoryNameValidatorTooLong", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Will be created as {0}.
+        /// </summary>
+        public static string SafeRepositoryNameWarning {
+            get {
+                return ResourceManager.GetString("SafeRepositoryNameWarning", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open the two-factor authentication app on your device to view your authentication code..
+        /// </summary>
+        public static string TwoFactorApp {
+            get {
+                return ResourceManager.GetString("TwoFactorApp", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to We sent you a message via SMS with your authentication code..
+        /// </summary>
+        public static string TwoFactorSms {
+            get {
+                return ResourceManager.GetString("TwoFactorSms", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Two-Factor authentication required.
+        /// </summary>
+        public static string TwoFactorTitle {
+            get {
+                return ResourceManager.GetString("TwoFactorTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Enter a login authentication code here.
+        /// </summary>
+        public static string TwoFactorUnknown {
+            get {
+                return ResourceManager.GetString("TwoFactorUnknown", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please enter your username or email address.
+        /// </summary>
+        public static string UsernameOrEmailValidatorEmpty {
+            get {
+                return ResourceManager.GetString("UsernameOrEmailValidatorEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Username or email address must not have spaces.
+        /// </summary>
+        public static string UsernameOrEmailValidatorSpaces {
+            get {
+                return ResourceManager.GetString("UsernameOrEmailValidatorSpaces", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/GitHub.App/Resources.resx b/src/GitHub.App/Resources.resx
new file mode 100644
index 0000000000..0bec3f4be7
--- /dev/null
+++ b/src/GitHub.App/Resources.resx
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="BrowseForDirectory" xml:space="preserve">
+    <value>Select a containing folder for your new repository.</value>
+  </data>
+  <data name="CloneTitle" xml:space="preserve">
+    <value>Clone a {0} Repository</value>
+  </data>
+  <data name="CreateTitle" xml:space="preserve">
+    <value>Create a {0} Repository</value>
+  </data>
+  <data name="EnterpriseUrlValidatorEmpty" xml:space="preserve">
+    <value>Please enter an Enterprise URL</value>
+  </data>
+  <data name="EnterpriseUrlValidatorInvalid" xml:space="preserve">
+    <value>Please enter a valid Enterprise URL</value>
+  </data>
+  <data name="EnterpriseUrlValidatorNotAGitHubHost" xml:space="preserve">
+    <value>Not an Enterprise server. Please enter an Enterprise URL</value>
+  </data>
+  <data name="LoginFailedForbiddenMessage" xml:space="preserve">
+    <value>Make sure to use your password and not a Personal Access token to log in.</value>
+  </data>
+  <data name="LoginFailedMessage" xml:space="preserve">
+    <value>Check your username and password, then try again</value>
+  </data>
+  <data name="LoginTitle" xml:space="preserve">
+    <value>Connect To GitHub</value>
+  </data>
+  <data name="PasswordValidatorEmpty" xml:space="preserve">
+    <value>Please enter your password</value>
+  </data>
+  <data name="PublishTitle" xml:space="preserve">
+    <value>Publish repository</value>
+  </data>
+  <data name="PublishToTitle" xml:space="preserve">
+    <value>Publish repository to {0}</value>
+  </data>
+  <data name="RepositoryCreationFailedAlreadyExists" xml:space="preserve">
+    <value>Repository '{0}/{1}' already exists.</value>
+  </data>
+  <data name="RepositoryCreationFailedAlreadyExistsMessage" xml:space="preserve">
+    <value>Change the repository name or select a different account and try again.</value>
+  </data>
+  <data name="RepositoryCreationFailedQuota" xml:space="preserve">
+    <value>Exceeded private repositories quota.</value>
+  </data>
+  <data name="RepositoryNameValidatorAlreadyExists" xml:space="preserve">
+    <value>Repository with same name already exists at this location</value>
+  </data>
+  <data name="RepositoryNameValidatorEmpty" xml:space="preserve">
+    <value>Please enter a repository name</value>
+  </data>
+  <data name="RepositoryNameValidatorTooLong" xml:space="preserve">
+    <value>Repository name must be fewer than 100 characters</value>
+  </data>
+  <data name="SafeRepositoryNameWarning" xml:space="preserve">
+    <value>Will be created as {0}</value>
+  </data>
+  <data name="TwoFactorApp" xml:space="preserve">
+    <value>Open the two-factor authentication app on your device to view your authentication code.</value>
+  </data>
+  <data name="TwoFactorSms" xml:space="preserve">
+    <value>We sent you a message via SMS with your authentication code.</value>
+  </data>
+  <data name="TwoFactorTitle" xml:space="preserve">
+    <value>Two-Factor authentication required</value>
+  </data>
+  <data name="TwoFactorUnknown" xml:space="preserve">
+    <value>Enter a login authentication code here</value>
+  </data>
+  <data name="UsernameOrEmailValidatorEmpty" xml:space="preserve">
+    <value>Please enter your username or email address</value>
+  </data>
+  <data name="UsernameOrEmailValidatorSpaces" xml:space="preserve">
+    <value>Username or email address must not have spaces</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/GitHub.App/ViewModels/LoginControlViewModel.cs b/src/GitHub.App/ViewModels/LoginControlViewModel.cs
index ac8b18630f..e45df7fb11 100644
--- a/src/GitHub.App/ViewModels/LoginControlViewModel.cs
+++ b/src/GitHub.App/ViewModels/LoginControlViewModel.cs
@@ -19,7 +19,7 @@ public LoginControlViewModel(
             ILoginToGitHubViewModel loginToGitHubViewModel,
             ILoginToGitHubForEnterpriseViewModel loginToGitHubEnterpriseViewModel)
         {
-            Title = "Connect To GitHub";
+            Title = Resources.LoginTitle;
             RepositoryHosts = hosts;
             GitHubLogin = loginToGitHubViewModel;
             EnterpriseLogin = loginToGitHubEnterpriseViewModel;
diff --git a/src/GitHub.App/ViewModels/LoginTabViewModel.cs b/src/GitHub.App/ViewModels/LoginTabViewModel.cs
index acea61985e..77ede2183f 100644
--- a/src/GitHub.App/ViewModels/LoginTabViewModel.cs
+++ b/src/GitHub.App/ViewModels/LoginTabViewModel.cs
@@ -26,11 +26,11 @@ protected LoginTabViewModel(IRepositoryHosts repositoryHosts, IVisualStudioBrows
             RepositoryHosts = repositoryHosts;
 
             UsernameOrEmailValidator = ReactivePropertyValidator.For(this, x => x.UsernameOrEmail)
-                .IfNullOrEmpty("Please enter your username or email address")
-                .IfMatch(@"\s", "Username or email address must not have spaces");
+                .IfNullOrEmpty(Resources.UsernameOrEmailValidatorEmpty)
+                .IfMatch(@"\s", Resources.UsernameOrEmailValidatorSpaces);
 
             PasswordValidator = ReactivePropertyValidator.For(this, x => x.Password)
-                .IfNullOrEmpty("Please enter your password");
+                .IfNullOrEmpty(Resources.PasswordValidatorEmpty);
 
             canLogin = this.WhenAny(
                 x => x.UsernameOrEmailValidator.ValidationResult.IsValid,
@@ -43,12 +43,11 @@ protected LoginTabViewModel(IRepositoryHosts repositoryHosts, IVisualStudioBrows
             {
                 if (ex.IsCriticalException()) return;
 
-                log.Info(string.Format(CultureInfo.InvariantCulture, "Error logging into '{0}' as '{1}'", BaseUri,
-                    UsernameOrEmail), ex);
+                log.Info(string.Format(CultureInfo.InvariantCulture, "Error logging into '{0}' as '{1}'", BaseUri, UsernameOrEmail), ex);
                 if (ex is Octokit.ForbiddenException)
                 {
                     ShowLogInFailedError = true;
-                    LoginFailedMessage = "Make sure to use your password and not a Personal Access token to log in.";
+                    LoginFailedMessage = Resources.LoginFailedForbiddenMessage;
                 }
                 else
                 {
@@ -80,7 +79,7 @@ protected LoginTabViewModel(IRepositoryHosts repositoryHosts, IVisualStudioBrows
         public IReactiveCommand<Unit> Reset { get; }
         public IReactiveCommand<Unit> NavigateForgotPassword { get; }
 
-        string loginFailedMessage = "Check your username and password, then try again";
+        string loginFailedMessage = Resources.LoginFailedMessage;
         public string LoginFailedMessage
         {
             get { return loginFailedMessage; }
diff --git a/src/GitHub.App/ViewModels/LoginToGitHubForEnterpriseViewModel.cs b/src/GitHub.App/ViewModels/LoginToGitHubForEnterpriseViewModel.cs
index ee7944dc80..4f391d7787 100644
--- a/src/GitHub.App/ViewModels/LoginToGitHubForEnterpriseViewModel.cs
+++ b/src/GitHub.App/ViewModels/LoginToGitHubForEnterpriseViewModel.cs
@@ -22,9 +22,9 @@ public class LoginToGitHubForEnterpriseViewModel : LoginTabViewModel, ILoginToGi
         public LoginToGitHubForEnterpriseViewModel(IRepositoryHosts hosts, IVisualStudioBrowser browser) : base(hosts, browser)
         {
             EnterpriseUrlValidator = ReactivePropertyValidator.For(this, x => x.EnterpriseUrl)
-                .IfNullOrEmpty("Please enter an Enterprise URL")
-                .IfNotUri("Please enter a valid Enterprise URL")
-                .IfGitHubDotComHost("Not an Enterprise server. Please enter an Enterprise URL");
+                .IfNullOrEmpty(Resources.EnterpriseUrlValidatorEmpty)
+                .IfNotUri(Resources.EnterpriseUrlValidatorInvalid)
+                .IfGitHubDotComHost(Resources.EnterpriseUrlValidatorNotAGitHubHost);
 
             canLogin = this.WhenAny(
                 x => x.UsernameOrEmailValidator.ValidationResult.IsValid,
diff --git a/src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs b/src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs
index 6a8821dcca..77d9646aad 100644
--- a/src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs
+++ b/src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs
@@ -56,7 +56,7 @@ public RepositoryCloneViewModel(
             this.operatingSystem = operatingSystem;
             this.vsServices = vsServices;
 
-            Title = string.Format(CultureInfo.CurrentCulture, "Clone a {0} Repository", repositoryHost.Title);
+            Title = string.Format(CultureInfo.CurrentCulture, Resources.CloneTitle, repositoryHost.Title);
             Repositories = new ReactiveList<IRepositoryModel>();
             loadRepositoriesCommand = ReactiveCommand.CreateAsyncObservable(OnLoadRepositories);
             isLoading = this.WhenAny(x => x.LoadingFailed, x => x.Value)
@@ -243,8 +243,7 @@ IObservable<Unit> ShowBrowseForDirectoryDialog()
                 // We store this in a local variable to prevent it changing underneath us while the
                 // folder dialog is open.
                 var localBaseRepositoryPath = BaseRepositoryPath;
-                var browseResult = operatingSystem.Dialog.BrowseForDirectory(localBaseRepositoryPath,
-                    "Select a containing folder for your new repository.");
+                var browseResult = operatingSystem.Dialog.BrowseForDirectory(localBaseRepositoryPath, Resources.BrowseForDirectory);
 
                 if (!browseResult.Success)
                     return;
diff --git a/src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs b/src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs
index f5019e61ff..8ac90ef2bf 100644
--- a/src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs
+++ b/src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs
@@ -58,7 +58,7 @@ public RepositoryCreationViewModel(
             this.operatingSystem = operatingSystem;
             this.repositoryCreationService = repositoryCreationService;
 
-            Title = string.Format(CultureInfo.CurrentCulture, "Create a {0} Repository", repositoryHost.Title);
+            Title = string.Format(CultureInfo.CurrentCulture, Resources.CreateTitle, repositoryHost.Title);
             SelectedGitIgnoreTemplate = GitIgnoreItem.None;
             SelectedLicense = LicenseItem.None;
 
@@ -88,15 +88,15 @@ public RepositoryCreationViewModel(
                 .WhereNotNull();
 
             RepositoryNameValidator = ReactivePropertyValidator.ForObservable(nonNullRepositoryName)
-                .IfNullOrEmpty("Please enter a repository name")
-                .IfTrue(x => x.Length > 100, "Repository name must be fewer than 100 characters")
-                .IfTrue(IsAlreadyRepoAtPath, "Repository with same name already exists at this location");
+                .IfNullOrEmpty(Resources.RepositoryNameValidatorEmpty)
+                .IfTrue(x => x.Length > 100, Resources.RepositoryNameValidatorTooLong)
+                .IfTrue(IsAlreadyRepoAtPath, Resources.RepositoryNameValidatorAlreadyExists);
 
             SafeRepositoryNameWarningValidator = ReactivePropertyValidator.ForObservable(nonNullRepositoryName)
                 .Add(repoName =>
                 {
                     var parsedReference = GetSafeRepositoryName(repoName);
-                    return parsedReference != repoName ? "Will be created as " + parsedReference : null;
+                    return parsedReference != repoName ? String.Format(CultureInfo.CurrentCulture, Resources.SafeRepositoryNameWarning, parsedReference) : null;
                 });
 
             this.WhenAny(x => x.BaseRepositoryPathValidator.ValidationResult, x => x.Value)
@@ -221,7 +221,7 @@ IObservable<Unit> ShowBrowseForDirectoryDialog()
                 // folder dialog is open.
                 var localBaseRepositoryPath = BaseRepositoryPath;
                 var browseResult = operatingSystem.Dialog.BrowseForDirectory(localBaseRepositoryPath,
-                    "Select a containing folder for your new repository.");
+                    Resources.BrowseForDirectory);
 
                 if (!browseResult.Success)
                     return;
@@ -319,14 +319,14 @@ PublishRepositoryUserError TranslateRepositoryCreateException(Exception ex)
             {
                 string message = string.Format(
                     CultureInfo.InvariantCulture,
-                    "Repository '{0}/{1}' already exists.",
+                    Resources.RepositoryCreationFailedAlreadyExists,
                     SelectedAccount.Login, RepositoryName);
-                return new PublishRepositoryUserError(message, "Change the repository name or select a different account and try again.");
+                return new PublishRepositoryUserError(message, Resources.RepositoryCreationFailedAlreadyExistsMessage);
             }
             var quotaExceededException = ex as PrivateRepositoryQuotaExceededException;
             if (quotaExceededException != null && SelectedAccount != null)
             {
-                return new PublishRepositoryUserError("Exceeded private repositories quota.", quotaExceededException.Message);
+                return new PublishRepositoryUserError(Resources.RepositoryCreationFailedQuota, quotaExceededException.Message);
             }
             return new PublishRepositoryUserError(ex.Message);
         }
diff --git a/src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs b/src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs
index 2c65d4ace1..df50a548c4 100644
--- a/src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs
+++ b/src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs
@@ -47,8 +47,8 @@ public RepositoryPublishViewModel(
             title = this.WhenAny(
                 x => x.SelectedHost,
                 x => x.Value != null ?
-                    string.Format(CultureInfo.CurrentCulture, "Publish repository to {0}", x.Value.Title) :
-                    "Publish repository"
+                    string.Format(CultureInfo.CurrentCulture, Resources.PublishToTitle, x.Value.Title) :
+                    Resources.PublishTitle
             )
             .ToProperty(this, x => x.Title);
 
@@ -179,14 +179,14 @@ void InitializeValidation()
                 .WhereNotNull();
 
             RepositoryNameValidator = ReactivePropertyValidator.ForObservable(nonNullRepositoryName)
-                .IfNullOrEmpty("Please enter a repository name")
-                .IfTrue(x => x.Length > 100, "Repository name must be fewer than 100 characters");
+                .IfNullOrEmpty(Resources.RepositoryNameValidatorEmpty)
+                .IfTrue(x => x.Length > 100, Resources.RepositoryNameValidatorTooLong);
 
             SafeRepositoryNameWarningValidator = ReactivePropertyValidator.ForObservable(nonNullRepositoryName)
                 .Add(repoName =>
                 {
                     var parsedReference = GetSafeRepositoryName(repoName);
-                    return parsedReference != repoName ? "Will be created as " + parsedReference : null;
+                    return parsedReference != repoName ? String.Format(CultureInfo.CurrentCulture, Resources.SafeRepositoryNameWarning, parsedReference) : null;
                 });
 
             this.WhenAny(x => x.SafeRepositoryNameWarningValidator.ValidationResult, x => x.Value)
diff --git a/src/GitHub.App/ViewModels/TwoFactorDialogViewModel.cs b/src/GitHub.App/ViewModels/TwoFactorDialogViewModel.cs
index 37696cfe29..d5c489f06a 100644
--- a/src/GitHub.App/ViewModels/TwoFactorDialogViewModel.cs
+++ b/src/GitHub.App/ViewModels/TwoFactorDialogViewModel.cs
@@ -32,7 +32,7 @@ public TwoFactorDialogViewModel(
             IVisualStudioBrowser browser,
             ITwoFactorChallengeHandler twoFactorChallengeHandler)
         {
-            Title = "Two-Factor authentication required";
+            Title = Resources.TwoFactorTitle;
             twoFactorChallengeHandler.SetViewModel(this);
 
             var canVerify = this.WhenAny(
@@ -59,12 +59,11 @@ public TwoFactorDialogViewModel(
                     switch (type)
                     {
                         case TwoFactorType.Sms:
-                            return "We sent you a message via SMS with your authentication code.";
+                            return Resources.TwoFactorSms;
                         case TwoFactorType.AuthenticatorApp:
-                            return "Open the two-factor authentication app on your device to view your " +
-                                "authentication code.";
+                            return Resources.TwoFactorApp;
                         case TwoFactorType.Unknown:
-                            return "Enter a login authentication code here";
+                            return Resources.TwoFactorUnknown;
 
                         default:
                             return null;