diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 38 | ||||
| -rw-r--r-- | lib/ephy-langs.c | 2 |
3 files changed, 27 insertions, 20 deletions
@@ -1,3 +1,10 @@ +2003-06-22 Christian Persch <chpe@cvs.gnome.org> + + * lib/ephy-langs.c: + * embed/mozilla/mozilla-embed-single.cpp: + + Add two missing font language groups, and reorder encodings list. + 2003-06-22 Marco Pesenti Gritti <marco@it.gnome.org> * lib/ephy-state.c: (ephy_states_load), (ephy_states_save), diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index e5c69ab33..cdb392b43 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -102,6 +102,7 @@ struct } encodings[] = { + /* translators: access keys need only be unique within the same LG_group */ { N_("Arabic (_IBM-864)"), "IBM864", LG_ARABIC }, { N_("Arabic (I_BM-864-I)"), "IBM864i", LG_ARABIC }, { N_("Arabic (ISO-_8859-6)"), "ISO-8859-6", LG_ARABIC }, @@ -109,15 +110,14 @@ encodings[] = { N_("Arabic (IS_O-8859-6-I)"), "ISO-8859-6-I", LG_ARABIC }, { N_("Arabic (_MacArabic)"), "x-mac-arabic", LG_ARABIC }, { N_("Arabic (_Windows-1256)"), "windows-1256", LG_ARABIC }, - { N_("_Armenian (ARMSCII-8)"), "armscii-8", LG_OTHER }, { N_("Baltic (_ISO-8859-13)"), "ISO-8859-13", LG_BALTIC }, { N_("Baltic (I_SO-8859-4)"), "ISO-8859-4", LG_BALTIC }, { N_("Baltic (_Windows-1257)"), "windows-1257", LG_BALTIC }, - { N_("_Celtic (ISO-8859-14)"), "ISO-8859-14", LG_OTHER }, { N_("Central European (_IBM-852)"), "IBM852", LG_CENTRAL_EUROPEAN }, { N_("Central European (I_SO-8859-2)"), "ISO-8859-2", LG_CENTRAL_EUROPEAN }, { N_("Central European (_MacCE)"), "x-mac-ce", LG_CENTRAL_EUROPEAN }, { N_("Central European (_Windows-1250)"), "windows-1250", LG_CENTRAL_EUROPEAN }, + { N_("Croatian (Mac_Croatian)"), "x-mac-croatian", LG_CENTRAL_EUROPEAN }, { N_("Chinese Simplified (_GB18030)"), "gb18030", LG_CHINESE }, { N_("Chinese Simplified (G_B2312)"), "GB2312", LG_CHINESE }, { N_("Chinese Simplified (GB_K)"), "x-gbk", LG_CHINESE }, @@ -127,7 +127,6 @@ encodings[] = { N_("Chinese Traditional (Big_5)"), "Big5", LG_CHINESE }, { N_("Chinese Traditional (Big5-HK_SCS)"), "Big5-HKSCS", LG_CHINESE }, { N_("Chinese Traditional (_EUC-TW)"), "x-euc-tw", LG_CHINESE }, - { N_("Croatian (Mac_Croatian)"), "x-mac-croatian", LG_CENTRAL_EUROPEAN }, { N_("Cyrillic (_IBM-855)"), "IBM855", LG_CYRILLIC }, { N_("Cyrillic (I_SO-8859-5)"), "ISO-8859-5", LG_CYRILLIC }, { N_("Cyrillic (IS_O-IR-111)"), "ISO-IR-111", LG_CYRILLIC }, @@ -137,35 +136,25 @@ encodings[] = { N_("Cyrillic/Russian (_CP-866)"), "IBM866", LG_CYRILLIC }, { N_("Cyrillic/Ukrainian (_KOI8-U)"), "KOI8-U", LG_CYRILLIC }, { N_("Cyrillic/Ukrainian (Mac_Ukrainian)"), "x-mac-ukrainian", LG_CYRILLIC }, - { N_("English (_US-ASCII)"), "us-ascii", LG_WESTERN }, - { N_("_Farsi (MacFarsi)"), "x-mac-farsi", LG_OTHER }, - { N_("_Georgian (GEOSTD8)"), "geostd8", LG_OTHER }, { N_("Greek (_ISO-8859-7)"), "ISO-8859-7", LG_GREEK }, { N_("Greek (_MacGreek)"), "x-mac-greek", LG_GREEK }, { N_("Greek (_Windows-1253)"), "windows-1253", LG_GREEK }, { N_("Gujarati (_MacGujarati)"), "x-mac-gujarati", LG_INDIAN }, { N_("Gurmukhi (Mac_Gurmukhi)"), "x-mac-gurmukhi", LG_INDIAN }, + { N_("Hindi (Mac_Devanagari)"), "x-mac-devanagari", LG_INDIAN }, { N_("Hebrew (_IBM-862)"), "IBM862", LG_HEBREW }, { N_("Hebrew (I_SO-8859-8-E)"), "ISO-8859-8-E", LG_HEBREW }, { N_("Hebrew (IS_O-8859-8-I)"), "ISO-8859-8-I", LG_HEBREW }, { N_("Hebrew (_MacHebrew)"), "x-mac-hebrew", LG_HEBREW }, { N_("Hebrew (_Windows-1255)"), "windows-1255", LG_HEBREW }, - { N_("Hindi (Mac_Devanagari)"), "x-mac-devanagari", LG_INDIAN }, - { N_("_Icelandic (MacIcelandic)"), "x-mac-icelandic", LG_OTHER }, + { N_("_Visual Hebrew (ISO-8859-8)"), "ISO-8859-8", LG_HEBREW }, { N_("Japanese (_EUC-JP)"), "EUC-JP", LG_JAPANESE }, { N_("Japanese (_ISO-2022-JP)"), "ISO-2022-JP", LG_JAPANESE }, - /* translators: the '__' characters are no mnemonics. - * keep them, they'll show up as '_' in Ephy */ - { N_("Japanese (_Shift__JIS)"), "Shift_JIS", LG_JAPANESE }, + { N_("Japanese (_Shift-JIS)"), "Shift_JIS", LG_JAPANESE }, { N_("Korean (_EUC-KR)"), "EUC-KR", LG_KOREAN }, { N_("Korean (_ISO-2022-KR)"), "ISO-2022-KR", LG_KOREAN }, { N_("Korean (_JOHAB)"), "x-johab", LG_KOREAN }, { N_("Korean (_UHC)"), "x-windows-949", LG_KOREAN }, - { N_("_Nordic (ISO-8859-10)"), "ISO-8859-10", LG_OTHER }, - { N_("Romanian (_MacRomanian)"), "x-mac-romanian", LG_OTHER }, - { N_("R_omanian (ISO-8859-16)"), "ISO-8859-16", LG_OTHER }, - { N_("South European (_ISO-8859-3)"), "ISO-8859-3", LG_OTHER }, - { N_("_Thai (TIS-620)"), "TIS-620", LG_OTHER }, { N_("Turkish (_IBM-857)"), "IBM857", LG_TURKISH }, { N_("Turkish (I_SO-8859-9)"), "ISO-8859-9", LG_TURKISH }, { N_("Turkish (_MacTurkish)"), "x-mac-turkish", LG_TURKISH }, @@ -176,20 +165,29 @@ encodings[] = { N_("Unicode (UTF-16_LE)"), "UTF-16LE", LG_UNICODE }, { N_("Unicode (UTF-3_2BE)"), "UTF-32BE", LG_UNICODE }, { N_("Unicode (UTF-32L_E)"), "UTF-32LE", LG_UNICODE }, - { N_("_User Defined"), "x-user-defined", LG_OTHER }, + { "x-_imap4-modified-utf7", "x-imap4-modified-utf7", LG_UNICODE }, { N_("Vietnamese (_TCVN)"), "x-viet-tcvn5712", LG_VIETNAMESE }, { N_("Vietnamese (_VISCII)"), "VISCII", LG_VIETNAMESE }, { N_("Vietnamese (V_PS)"), "x-viet-vps", LG_VIETNAMESE }, { N_("Vietnamese (_Windows-1258)"), "windows-1258", LG_VIETNAMESE }, - { N_("_Visual Hebrew (ISO-8859-8)"), "ISO-8859-8", LG_HEBREW }, + { N_("English (_US-ASCII)"), "us-ascii", LG_WESTERN }, { N_("Western (_IBM-850)"), "IBM850", LG_WESTERN }, { N_("Western (I_SO-8859-1)"), "ISO-8859-1", LG_WESTERN }, { N_("Western (IS_O-8859-15)"), "ISO-8859-15", LG_WESTERN }, { N_("Western (_MacRoman)"), "x-mac-roman", LG_WESTERN }, { N_("Western (_Windows-1252)"), "windows-1252", LG_WESTERN }, - /* encodings without translatable names */ + { N_("_Armenian (ARMSCII-8)"), "armscii-8", LG_OTHER }, + { N_("_Celtic (ISO-8859-14)"), "ISO-8859-14", LG_OTHER }, + { N_("_Farsi (MacFarsi)"), "x-mac-farsi", LG_OTHER }, + { N_("_Georgian (GEOSTD8)"), "geostd8", LG_OTHER }, + { N_("_Icelandic (MacIcelandic)"), "x-mac-icelandic", LG_OTHER }, + { N_("_Nordic (ISO-8859-10)"), "ISO-8859-10", LG_OTHER }, + { N_("Romanian (_MacRomanian)"), "x-mac-romanian", LG_OTHER }, + { N_("R_omanian (ISO-8859-16)"), "ISO-8859-16", LG_OTHER }, + { N_("South European (_ISO-8859-3)"), "ISO-8859-3", LG_OTHER }, + { N_("_Thai (TIS-620)"), "TIS-620", LG_OTHER }, + { N_("_User Defined"), "x-user-defined", LG_OTHER }, { "T._61-8bit", "T.61-8bit", LG_OTHER }, - { "x-_imap4-modified-utf7", "x-imap4-modified-utf7", LG_UNICODE }, { "x-u-_escaped", "x-u-escaped", LG_OTHER } }; static const guint n_encodings = G_N_ELEMENTS (encodings); diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c index 533877ce8..55f339e3b 100644 --- a/lib/ephy-langs.c +++ b/lib/ephy-langs.c @@ -29,11 +29,13 @@ static const FontsLanguageInfo font_languages[] = { N_("Baltic"), "x-baltic" }, { N_("Central European"), "x-central-euro" }, { N_("Cyrillic"), "x-cyrillic" }, + { N_("Devanagari"), "x-devanagari" }, { N_("Greek"), "el" }, { N_("Hebrew"), "he" }, { N_("Japanese"), "ja" }, { N_("Korean"), "ko" }, { N_("Simplified Chinese"), "zh-CN" }, + { N_("Tamil"), "x-tamil" }, { N_("Thai"), "th" }, { N_("Traditional Chinese"), "zh-TW" }, { N_("Turkish"), "tr" }, |