Merge pull request #6 from rubberduck-vba/next

Hosch250 · Hosch250 · commit bdfd709d66b1 · 2015-07-19T20:06:21.000-05:00
Pull from next
diff --git a/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs b/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs
@@ -37,7 +37,8 @@ private void LoadLanguageList()
             {
                 new DisplayLanguageSetting("en-US"),
                 new DisplayLanguageSetting("fr-CA"),
-                new DisplayLanguageSetting("sv-SV")
+                new DisplayLanguageSetting("sv-SV"),
+                new DisplayLanguageSetting("de-DE"),
             };
 
             LanguageList.Items.AddRange(settings.Where(item => item.Exists).ToArray());

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ private void LoadLanguageList()`
`37`	`37`	`{`
`38`	`38`	`new DisplayLanguageSetting("en-US"),`
`39`	`39`	`new DisplayLanguageSetting("fr-CA"),`
`40`		`- new DisplayLanguageSetting("sv-SV")`
	`40`	`+ new DisplayLanguageSetting("sv-SV"),`
	`41`	`+ new DisplayLanguageSetting("de-DE"),`
`41`	`42`	`};`
`42`	`43`
`43`	`44`	`LanguageList.Items.AddRange(settings.Where(item => item.Exists).ToArray());`