From 184f0ba3cca869dc8c175f82d0691ecb56dd8632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Fri, 29 Jun 2007 19:49:42 +0000
Subject: [PATCH] installer: drop support for zh_CN.po until it contains any
 translation

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18944 a592a061-630c-0410-9148-cb99ea01b6c8
---
 .../packaging/AltInstaller/ChangeLog.txt      |  4 +--
 .../AltInstaller/LanguageSettings.nsh         | 26 +++++++++----------
 .../packaging/AltInstaller/io_ui_language.ini |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt
index 5e347e807c..5e1ddee689 100644
--- a/development/Win32/packaging/AltInstaller/ChangeLog.txt
+++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt
@@ -1,9 +1,7 @@
 Version LyX 1.5xx-xx-07-2007
 - LyX 1.5xx-xx-07-2007
-  - new "Chinese (Taiwan)" translation of LyX's menus
 
-- support to set "Chinese (Taiwan)" (simplified Chinese) and
-  "Chinese (Taiwan)" as LyX's menu language
+- support to set "Chinese" as LyX's menu language
 
 
 Version LyX 1.5rc2-27-06-2007
diff --git a/development/Win32/packaging/AltInstaller/LanguageSettings.nsh b/development/Win32/packaging/AltInstaller/LanguageSettings.nsh
index 1c108cff92..eaad0572d5 100644
--- a/development/Win32/packaging/AltInstaller/LanguageSettings.nsh
+++ b/development/Win32/packaging/AltInstaller/LanguageSettings.nsh
@@ -28,11 +28,11 @@
   ${endif}
 
 # currently no dictionary available
-#  ${if} ${LangISOCode} = 1028
-#   StrCpy ${LangCdeSys} "zh"
-#   StrCpy ${LangNmeSys} "Chinese"
-#   StrCpy ${LangSysEnc} "936"
-#  ${endif}
+  ${if} ${LangISOCode} = 1028
+   StrCpy ${LangCdeSys} "zh_TW"
+   StrCpy ${LangNmeSys} "Chinese"
+   StrCpy ${LangSysEnc} "936"
+  ${endif}
 
   ${if} ${LangISOCode} = 1029
    StrCpy ${LangNme} "Ceština"
@@ -284,7 +284,7 @@
 
 # currently no dictionary available
   ${if} ${LangISOCode} = 2052
-   StrCpy ${LangCdeSys} "zh_CN"
+   StrCpy ${LangCdeSys} "zh_TW"
    StrCpy ${LangNmeSys} "Chinese"
    StrCpy ${LangSysEnc} "936"
   ${endif}
@@ -353,8 +353,8 @@
 
 # currently no dictionary available
   ${if} ${LangISOCode} = 3076
-   StrCpy ${LangCdeSys} "zh_CN"
-   StrCpy ${LangNmeSys} "Chinese (China)"
+   StrCpy ${LangCdeSys} "zh_TW"
+   StrCpy ${LangNmeSys} "Chinese"
    StrCpy ${LangSysEnc} "936"
   ${endif}
 
@@ -456,12 +456,12 @@
    StrCpy ${LangEnc} "cp-1250"
   ${endif}
 
-  ${if} ${Name} == "Chinese (China)"
-   StrCpy ${LangCde} "zh_CN"
-   StrCpy ${LangEnc} "cp-936"
-  ${endif}
+#  ${if} ${Name} == "Chinese (China)"
+#   StrCpy ${LangCde} "zh_CN"
+#   StrCpy ${LangEnc} "cp-936"
+#  ${endif}
   
-  ${if} ${Name} == "Chinese (Taiwan)"
+  ${if} ${Name} == "Chinese"
    StrCpy ${LangCde} "zh_TW"
    StrCpy ${LangEnc} "cp-936"
   ${endif}
diff --git a/development/Win32/packaging/AltInstaller/io_ui_language.ini b/development/Win32/packaging/AltInstaller/io_ui_language.ini
index 40452dcc1d..49467bb90e 100644
--- a/development/Win32/packaging/AltInstaller/io_ui_language.ini
+++ b/development/Win32/packaging/AltInstaller/io_ui_language.ini
@@ -11,7 +11,7 @@ Text=" Available Languages "
 
 [Field 2]
 Type=Droplist
-ListItems=Ceština|Chinese (China)|Chinese (Taiwan)|Dansk|Deutsch|English|Español|Euskara|Français|Galego|Hebrew|Italiano|Japanese|Korean|Magyar|Nederlands|Norsk|Nynorsk|Polski|Româna|Russian|Slovenskı|Slovenšcina|Suomi|Türkçe
+ListItems=Ceština|Chinese|Dansk|Deutsch|English|Español|Euskara|Français|Galego|Hebrew|Italiano|Japanese|Korean|Magyar|Nederlands|Norsk|Nynorsk|Polski|Româna|Russian|Slovenskı|Slovenšcina|Suomi|Türkçe
 Left=20
 Right=130
 Top=15