Merge commit 'local/master' into ubuntu-master

[deb/packages.git] / lib / Packages / I18N / Languages.pm

diff --git a/lib/Packages/I18N/Languages.pm b/lib/Packages/I18N/Languages.pm
index ae63ee787ef9403a44f36e2e00f329365fad1e0e..1ab8f489f6ff3704c788296c84de8fa215144bcb 100644 (file)
--- a/lib/Packages/I18N/Languages.pm
+++ b/lib/Packages/I18N/Languages.pm
@@ -10,42 +10,6 @@ use Exporter;
 our @ISA = qw( Exporter );
 our @EXPORT = qw( langcmp get_transliteration get_selfname );
 
-# language directory name => ISO 639 two-letter code for the language name
-my %langs = (
-            english    => "en",
-            arabic     => "ar",
-            armenian   => "hy",
-            bulgarian  => "bg",
-            catalan    => "ca",
-            chinese    => "zh",
-            croatian   => "hr",
-            czech      => "cs",
-            danish     => "da",
-            dutch      => "nl",
-            german     => "de",
-            greek      => "el",
-            esperanto  => "eo",
-            spanish    => "es",
-            finnish    => "fi",
-            french     => "fr",
-            hungarian  => "hu",
-            indonesian => "id",
-            italian    => "it",
-            japanese   => "ja",
-            korean     => "ko",
-            lithuanian => "lt",
-            norwegian  => "no",
-            persian    => "fa",
-            polish     => "pl",
-            portuguese => "pt",
-            romanian   => "ro",
-            russian    => "ru",
-            swedish    => "sv",
-            slovene    => "sl",
-            slovak     => "sk",
-            turkish    => "tr",
-            );
-
 # language directory name => native name of the language
 # non-ASCII letters must be escaped (using entities)!
 my %selflang = (
@@ -68,26 +32,27 @@ my %selflang = (
                id     => 'Indonesia',
                it     => 'Italiano',
                ja     => '日本語',
+               km     => 'Khmer',
                ko     => '한국어',
                lt     => 'Lietuvių',
                nl     => 'Nederlands',
                "no"   => 'norsk (bokmål)',
                pl     => 'polski',
                pt     => 'Português (pt)',
-               pt_PT  => 'Português (pt)',
-               pt_BR  => 'Português (br)',
+               'pt-pt'=> 'Português (pt)',
+               'pt-br'=> 'Português (br)',
                ro     => 'română',
                ru     => 'Русский',
                sk     => 'slovensky',
                sv     => 'svenska',
-               sv_SE  => 'svenska',
+               'sv-se'=> 'svenska',
                sl     => 'slovenščina',
                tr     => 'Türkçe',
                uk     => 'українська',
                zh     => '中文',
-               zh_CN  => '簡體中文',
-               zh_HK  => '正體中文',
-               zh_TW  => '正體中文',
+               'zh-cn'=> '中文',
+               'zh-hk'=> '正體中文',
+               'zh-tw'=> '中文',
                );
 
 # language directory name => Latin transliteration of the language name
@@ -104,10 +69,10 @@ my %translit = (
                ko => "Hangul", # Not sure. "Hanguk-Mal" (=Spoken Korean)?
                ru => "Russkij",
                uk => "ukrajins'ka",
-               zh => "Zhongzu", # Not printed due to Chinese-specific code; kept for sort order
-               zh_CN => "Simplified Chinese",
-               zh_HK => "Traditional Chinese",
-               zh_TW => "Traditional Chinese",
+               zh => "Zhongwen",
+               'zh-cn'=> "Zhongwen,简",
+               'zh-hk'=> "Zhongwen,HK",
+               'zh-tw'=> "Zhongwen,繁",
                );
 
 # second transliteration table, used for languages starting with a latin