Merge remote-tracking branch 'upstream/dev' into feature/unsaved-changes

This commit is contained in:
Michael Shamoon
2021-01-25 23:16:18 -08:00
parent 0a8771829e
commit 09d6d25074
20 changed files with 198 additions and 177 deletions

View File

@@ -71,7 +71,7 @@ export class SettingsService {
getLanguageOptions(): LanguageOption[] {
return [
{code: "en-us", name: $localize`English`, englishName: "English"},
{code: "en-US", name: $localize`English (US)`, englishName: "English (US)"},
{code: "de", name: $localize`German`, englishName: "German"},
{code: "nl", name: $localize`Dutch`, englishName: "Dutch"},
{code: "fr", name: $localize`French`, englishName: "French"}