Try to correctly handle dialects correctly for stuff like installmanual

and release notes. I also tried to make sure not to break any other stuff while
doing so...

CVS version numbers

english/po/langs.pot: 1.9 -> 1.10 
english/releases/sarge/release.data: 1.10 -> 1.11 
english/template/debian/language_names.wml: 1.216 -> 1.217 
english/template/debian/languages.wml: 1.134 -> 1.135

1 files changed, 14 insertions, 0 deletions

diff --git a/english/template/debian/languages.wml b/english/template/debian/languages.wml
index b0ea4c15846..99eca56ea49 100644
--- a/english/template/debian/languages.wml
+++ b/english/template/debian/languages.wml
@@ -29,6 +29,7 @@ my %langs = (
   norwegian  => "no",
   polish     => "pl",
   portuguese => "pt",
+  portuguese_br => "pt-br",
   romanian   => "ro",
   russian    => "ru",
   slovak     => "sk",
@@ -37,6 +38,9 @@ my %langs = (
   turkish    => "tr",
   ukrainian  => "uk",
   chinese    => "zh",
+  chinese_cn => "zh-cn",
+  chinese_hk => "zh-hk",
+  chinese_tw => "zh-tw",
 );
 
 # language directory name => native name of the language
@@ -46,6 +50,10 @@ my %selflang = (
   bulgarian  => 'Български',
   catalan    => 'català',
   chinese    => '中文',
+#FIXME
+  chinese_cn => '中文',
+  chinese_hk => '中文',
+  chinese_tw => '中文',
   croatian   => 'hrvatski',
   czech	     => 'česky',
   danish     => 'dansk',
@@ -65,6 +73,8 @@ my %selflang = (
   norwegian  => 'norsk (bokmål)',
   polish     => 'polski',
   portuguese => 'Português',
+#FIXME
+  portuguese_br => 'Português',
   romanian   => 'română',
   russian    => 'Русский',
   slovak     => 'slovensky',
@@ -83,6 +93,10 @@ my %translit = (
   arabic   => "Arabiya",
   bulgarian=> "Bəlgarski",
   chinese  => "Zhongzu", # Not printed due to Chinese-specific code; kept for sort order
+#FIXME
+  chinese_cn => "Zhongzu",
+  chinese_hk => "Zhongzu",
+  chinese_tw => "Zhongzu",
   greek    => "Ellinika",
   japanese => "Nihongo",
   korean   => "Hangul", # Not sure. "Hanguk-Mal" (=Spoken Korean)?