From 1b19ab4f0267e32057bd9a040a6dd032592dab5b Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 2 Jan 2018 17:07:25 -0500
Subject: [PATCH] Revert "Use unicode file format with BOM for Languages.cpp"

This reverts commit 3dc241ed54a9d31f4cc55916840839c47e3007c4.
---
 locale/LanguageNames.h | 56 ------------------------------------
 src/Languages.cpp      | 64 +-----------------------------------------
 2 files changed, 1 insertion(+), 119 deletions(-)
 delete mode 100644 locale/LanguageNames.h

diff --git a/locale/LanguageNames.h b/locale/LanguageNames.h
deleted file mode 100644
index 33f4734a5..000000000
--- a/locale/LanguageNames.h
+++ /dev/null
@@ -1,56 +0,0 @@
-localLanguageName["af"] = L"Afrikaans";
-localLanguageName["ar"] = L"العربية";
-localLanguageName["be"] = L"Беларуская";
-localLanguageName["bg"] = L"Български";
-localLanguageName["bn"] = L"বাংলা";
-localLanguageName["bs"] = L"Bosanski";
-localLanguageName["ca"] = L"Català";
-localLanguageName["ca_ES@valencia"] = L"Valencià";
-localLanguageName["cs"] = L"Čeština";
-localLanguageName["cy"] = L"Cymraeg";
-localLanguageName["da"] = L"Dansk";
-localLanguageName["de"] = L"Deutsch";
-localLanguageName["el"] = L"Ελληνικά";
-localLanguageName["en"] = L"English";
-localLanguageName["es"] = L"Español";
-localLanguageName["eu"] = L"Euskara";
-localLanguageName["eu_ES"] = L"Euskara (Espainiako)";
-localLanguageName["fa"] = L"فارسی";
-localLanguageName["fi"] = L"Suomi";
-localLanguageName["fr"] = L"Français";
-localLanguageName["ga"] = L"Gaeilge";
-localLanguageName["gl"] = L"Galego";
-localLanguageName["he"] = L"עברית";
-localLanguageName["hi"] = L"हिन्दी";
-localLanguageName["hr"] = L"Hrvatski";
-localLanguageName["hu"] = L"Magyar";
-localLanguageName["hy"] = L"Հայերեն";
-localLanguageName["id"] = L"Bahasa Indonesia";
-localLanguageName["it"] = L"Italiano";
-localLanguageName["ja"] = L"日本語";
-localLanguageName["ka"] = L"ქართული";
-localLanguageName["km"] = L"ខេមរភាសា";
-localLanguageName["ko"] = L"한국어";
-localLanguageName["lt"] = L"Lietuvių";
-localLanguageName["mk"] = L"Македонски";
-localLanguageName["my"] = L"မြန်မာစာ";
-localLanguageName["nb"] = L"Norsk";
-localLanguageName["nl"] = L"Nederlands";
-localLanguageName["oc"] = L"Occitan";
-localLanguageName["pl"] = L"Polski";
-localLanguageName["pt"] = L"Português";
-localLanguageName["pt_BR"] = L"Português (Brasil)";
-localLanguageName["ro"] = L"Română";
-localLanguageName["ru"] = L"Русский";
-localLanguageName["sk"] = L"Slovenčina";
-localLanguageName["sl"] = L"Slovenščina";
-localLanguageName["sr_RS"] = L"Српски";
-localLanguageName["sr_RS@latin"] = L"Srpski";
-localLanguageName["sv"] = L"Svenska";
-localLanguageName["ta"] = L"தமிழ்";
-localLanguageName["tg"] = L"Тоҷикӣ";
-localLanguageName["tr"] = L"Türkçe";
-localLanguageName["uk"] = L"Українська";
-localLanguageName["vi"] = L"Tiếng Việt";
-localLanguageName["zh_CN"] = L"中文";
-localLanguageName["zh_TW"] = L"中文";
diff --git a/src/Languages.cpp b/src/Languages.cpp
index 956f07ce8..8ef98b1cf 100644
--- a/src/Languages.cpp
+++ b/src/Languages.cpp
@@ -1,4 +1,4 @@
-/**********************************************************************
+/**********************************************************************
 
   Audacity: A Digital Audio Editor
 
@@ -133,7 +133,6 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
    LangHash reverseHash;
    LangHash tempHash;
 
-#ifdef EXPERIMENTAL_LANGUAGES_DOT_TEXT
    {
       // The list of locales and associated self-names of languages
       // is stored in an external resource file which is easier
@@ -153,67 +152,6 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
          localLanguageName[code] = name;
       }
    }
-#else
-//#include "../locale/LanguageNames.h"
-localLanguageName["af"] = L"Afrikaans";
-localLanguageName["ar"] = L"العربية";
-localLanguageName["be"] = L"Беларуская";
-localLanguageName["bg"] = L"Български";
-localLanguageName["bn"] = L"বাংলা";
-localLanguageName["bs"] = L"Bosanski";
-localLanguageName["ca"] = L"Català";
-localLanguageName["ca_ES@valencia"] = L"Valencià";
-localLanguageName["cs"] = L"Čeština";
-localLanguageName["cy"] = L"Cymraeg";
-localLanguageName["da"] = L"Dansk";
-localLanguageName["de"] = L"Deutsch";
-localLanguageName["el"] = L"Ελληνικά";
-localLanguageName["en"] = L"English";
-localLanguageName["es"] = L"Español";
-localLanguageName["eu"] = L"Euskara";
-localLanguageName["eu_ES"] = L"Euskara (Espainiako)";
-localLanguageName["fa"] = L"فارسی";
-localLanguageName["fi"] = L"Suomi";
-localLanguageName["fr"] = L"Français";
-localLanguageName["ga"] = L"Gaeilge";
-localLanguageName["gl"] = L"Galego";
-localLanguageName["he"] = L"עברית";
-localLanguageName["hi"] = L"हिन्दी";
-localLanguageName["hr"] = L"Hrvatski";
-localLanguageName["hu"] = L"Magyar";
-localLanguageName["hy"] = L"Հայերեն";
-localLanguageName["id"] = L"Bahasa Indonesia";
-localLanguageName["it"] = L"Italiano";
-localLanguageName["ja"] = L"日本語";
-localLanguageName["ka"] = L"ქართული";
-localLanguageName["km"] = L"ខេមរភាសា";
-localLanguageName["ko"] = L"한국어";
-localLanguageName["lt"] = L"Lietuvių";
-localLanguageName["mk"] = L"Македонски";
-localLanguageName["my"] = L"မြန်မာစာ";
-localLanguageName["nb"] = L"Norsk";
-localLanguageName["nl"] = L"Nederlands";
-localLanguageName["oc"] = L"Occitan";
-localLanguageName["pl"] = L"Polski";
-localLanguageName["pt"] = L"Português";
-localLanguageName["pt_BR"] = L"Português (Brasil)";
-localLanguageName["ro"] = L"Română";
-localLanguageName["ru"] = L"Русский";
-localLanguageName["sk"] = L"Slovenčina";
-localLanguageName["sl"] = L"Slovenščina";
-localLanguageName["sr_RS"] = L"Српски";
-localLanguageName["sr_RS@latin"] = L"Srpski";
-localLanguageName["sv"] = L"Svenska";
-localLanguageName["ta"] = L"தமிழ்";
-localLanguageName["tg"] = L"Тоҷикӣ";
-localLanguageName["tr"] = L"Türkçe";
-localLanguageName["uk"] = L"Українська";
-localLanguageName["vi"] = L"Tiếng Việt";
-localLanguageName["zh_CN"] = L"中文";
-localLanguageName["zh_TW"] = L"中文";
-
-
-#endif
 
    wxArrayString audacityPathList = wxGetApp().audacityPathList;