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 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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" />