Merge aurora to central
authorRomi Hardiyanto <romihardiyanto@gmail.com>
Tue, 01 Apr 2014 08:01:30 +0200
changeset 968 ae74f231a87b127206c3f9c33900bd49720ef751
parent 967 595be9a5f650f235861f7c3b3c00977646c73b19 (current diff)
parent 863 08970d5608c676528b94c49ab2fa4ca0c9d72693 (diff)
child 969 ad0a170f5380c84b7c3655af72308fa581ff4688
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:55:50 +0000
Merge aurora to central
browser/chrome/browser/preferences/fonts.dtd
toolkit/chrome/global/languageNames.properties
toolkit/chrome/global/regionNames.properties
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -22,19 +22,19 @@
 <!ENTITY  sans-serif.label                        "Tanpa-serif:">
 <!ENTITY  sans-serif.accesskey                    "a">
 <!ENTITY  monospace.label                         "Spasi tetap:">
 <!ENTITY  monospace.accesskey                     "e">
 
 <!ENTITY  font.langGroup.latin1                   "Barat">
 <!ENTITY  font.langGroup.latin2                   "Eropa Tengah">
 <!ENTITY  font.langGroup.japanese                 "Jepang">
-<!ENTITY  font.langGroup.trad-chinese             "Cina Tradisional (Taiwan)">
-<!ENTITY  font.langGroup.simpl-chinese            "Cina Sederhana">
-<!ENTITY  font.langGroup.trad-chinese-hk          "Cina Tradisional (Hong Kong)">
+<!ENTITY  font.langGroup.trad-chinese             "Tiongkok Tradisional (Taiwan)">
+<!ENTITY  font.langGroup.simpl-chinese            "Tiongkok Sederhana">
+<!ENTITY  font.langGroup.trad-chinese-hk          "Tiongkok Tradisional (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Korea">
 <!ENTITY  font.langGroup.cyrillic                 "Cyrillic">
 <!ENTITY  font.langGroup.baltic                   "Baltik">
 <!ENTITY  font.langGroup.el                       "Yunani">
 <!ENTITY  font.langGroup.turkish                  "Turki">
 <!ENTITY  font.langGroup.unicode                  "Bahasa Lain">
 <!ENTITY  font.langGroup.thai                     "Thailand">
 <!ENTITY  font.langGroup.hebrew                   "Ibrani">
@@ -66,8 +66,45 @@
 
 <!ENTITY  allowPagesToUse.label                   "Izinkan laman memilih hurufnya sendiri">
 <!ENTITY  allowPagesToUse.accesskey               "I">
 
 <!ENTITY languages.customize.Fallback.grouplabel  "Pengodean Karakter untuk Konten Lawas">
 <!ENTITY languages.customize.Fallback.label       "Pengodean Karakter Konten Lawas:">
 <!ENTITY languages.customize.Fallback.accesskey   "L">
 <!ENTITY languages.customize.Fallback.desc        "Pengodean karakter ini digunakan untuk konten lawas yang gagal mendeklarasikan pengodeannya.">
+
+<!ENTITY languages.customize.Fallback.auto        "Baku untuk Pelokalan Saat Ini">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.arabic):
+     Translate "Arabic" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.arabic      "Arab">
+<!ENTITY languages.customize.Fallback.baltic      "Baltik">
+<!ENTITY languages.customize.Fallback.ceiso       "Eropa Tengah, ISO">
+<!ENTITY languages.customize.Fallback.cewindows   "Eropa Tengah, Microsoft">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.simplified):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.simplified  "Tiongkok, Sederhana">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.traditional):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.traditional "Tiongkok, Tradisional">
+<!ENTITY languages.customize.Fallback.cyrillic    "Cyrillic">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.greek):
+     Translate "Greek" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.greek       "Yunani">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.hebrew):
+     Translate "Hebrew" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.hebrew      "Ibrani">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.japanese):
+     Translate "Japanese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.japanese    "Jepang">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.korean):
+     Translate "Korean" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.korean      "Korea">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.thai):
+     Translate "Thai" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.thai        "Thai">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.turkish):
+     Translate "Turkish" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.turkish     "Turki">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.vietnamese):
+     Translate "Vietnamese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.vietnamese  "Vietnam">
+<!ENTITY languages.customize.Fallback.other       "Lainnya (termasuk Eropa Barat)">
--- a/dom/chrome/charsetTitles.properties
+++ b/dom/chrome/charsetTitles.properties
@@ -29,23 +29,23 @@ macintosh.title         = Barat (MacRoma
 x-mac-ce.title          = Eropa Tengah (MacCE)
 x-mac-turkish.title     = Turki (MacTurkish)
 x-mac-croatian.title    = Kroasia (MacCroatian)
 x-mac-romanian.title    = Rumania (MacRomanian)
 x-mac-icelandic.title   = Islandia (MacIcelandic)
 iso-2022-jp.title = Jepang (ISO-2022-JP)
 shift_jis.title = Jepang (Shift_JIS)
 euc-jp.title = Jepang (EUC-JP)
-big5.title = Cina Tradisional (Big5)
-big5-hkscs.title = Cina Tradisional (Big5-HKSCS)
-x-euc-tw.title = Cina Tradisional (EUC-TW)
-gb2312.title = Cina Sederhana (GB2312)
-hz-gb-2312.title = Cina Sederhana (HZ)
-gbk.title = Cina Sederhana (GBK)
-iso-2022-cn.title = Cina Sederhana (ISO-2022-CN)
+big5.title = Tiongkok Tradisional (Big5)
+big5-hkscs.title = Tiongkok Tradisional (Big5-HKSCS)
+x-euc-tw.title = Tiongkok Tradisional (EUC-TW)
+gb2312.title = Tiongkok Sederhana (GB2312)
+hz-gb-2312.title = Tiongkok Sederhana (HZ)
+gbk.title = Tiongkok Sederhana (GBK)
+iso-2022-cn.title = Tiongkok Sederhana (ISO-2022-CN)
 euc-kr.title = Korea (EUC-KR)
 x-johab.title = Korea (JOHAB)
 iso-2022-kr.title = Korea (ISO-2022-KR)
 utf-7.title = Unicode (UTF-7)
 utf-8.title = Unicode (UTF-8)
 utf-16.title = Unicode (UTF-16)
 utf-16le.title = Unicode (UTF-16 Little Endian)
 utf-16be.title = Unicode (UTF-16 Big Endian)
@@ -78,27 +78,27 @@ windows-1255.title = Ibrani (Windows-125
 windows-1256.title = Arab (Windows-1256)
 x-user-defined.title = Kesukaan Pengguna
 ibm866.title = Cyrillic/Rusia (CP-866)
 ibm850.title = Barat (IBM-850)
 ibm852.title = Eropa Tengah (IBM-852)
 ibm855.title = Cyrillic (IBM-855)
 ibm857.title = Turki (IBM-857)
 ibm862.title = Ibrani (IBM-862)
-gb18030.title = Cina Sederhana (GB18030)
+gb18030.title = Tiongkok Sederhana (GB18030)
 x-mac-arabic.title = Arab (MacArabic)
 x-mac-farsi.title = Persia (MacFarsi)
 x-mac-hebrew.title = Ibrani (MacHebrew)
 x-mac-devanagari.title = Hindi (MacDevanagari)
 x-mac-gujarati.title = Gujarat (MacGujarati)
 x-mac-gurmukhi.title = Gurmukhi (MacGurmukhi)
 
 
 chardet.off.title                           = (Mati)
 chardet.universal_charset_detector.title    = Universal
 chardet.ja_parallel_state_machine.title     = Jepang
 chardet.ko_parallel_state_machine.title     = Korea
-chardet.zhtw_parallel_state_machine.title   = Cina Tradisional
-chardet.zhcn_parallel_state_machine.title   = Cina Sederhana
-chardet.zh_parallel_state_machine.title     = Cina
+chardet.zhtw_parallel_state_machine.title   = Tiongkok Tradisional
+chardet.zhcn_parallel_state_machine.title   = Tiongkok Sederhana
+chardet.zh_parallel_state_machine.title     = Tiongkok
 chardet.cjk_parallel_state_machine.title    = Asia Timur
 chardet.ruprob.title                        = Rusia
 chardet.ukprob.title                        = Ukraina
--- a/mail/chrome/messenger/preferences/fonts.dtd
+++ b/mail/chrome/messenger/preferences/fonts.dtd
@@ -22,19 +22,19 @@
 <!ENTITY  sans-serif.label                        "Tanpa-serif:">
 <!ENTITY  sans-serif.accesskey                    "T">
 <!ENTITY  monospace.label                         "Spasi tetap:">
 <!ENTITY  monospace.accesskey                     "S">
 
 <!ENTITY  font.langGroup.latin1                   "Barat">
 <!ENTITY  font.langGroup.latin2                   "Eropa Tengah">
 <!ENTITY  font.langGroup.japanese                 "Jepang">
-<!ENTITY  font.langGroup.trad-chinese             "Cina Tradisional (Taiwan)">
-<!ENTITY  font.langGroup.simpl-chinese            "Cina Sederhana">
-<!ENTITY  font.langGroup.trad-chinese-hk          "Cina Tradisional (Hong Kong)">
+<!ENTITY  font.langGroup.trad-chinese             "Tiongkok Tradisional (Taiwan)">
+<!ENTITY  font.langGroup.simpl-chinese            "Tiongkok Sederhana">
+<!ENTITY  font.langGroup.trad-chinese-hk          "Tiongkok Tradisional (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Korea">
 <!ENTITY  font.langGroup.cyrillic                 "Cyrillic">
 <!ENTITY  font.langGroup.baltic                   "Baltik">
 <!ENTITY  font.langGroup.el                       "Yunani">
 <!ENTITY  font.langGroup.turkish                  "Turki">
 <!ENTITY  font.langGroup.unicode                  "Bahasa Lain">
 <!ENTITY  font.langGroup.user-def                 "Kesukaan Pengguna">
 <!ENTITY  font.langGroup.thai                     "Thailand">
--- a/toolkit/chrome/global/charsetMenu.properties
+++ b/toolkit/chrome/global/charsetMenu.properties
@@ -60,26 +60,26 @@ windows-1250.key =         E
 windows-1250     = Eropa Tengah (Windows)
 ISO-8859-2.key   =       l
 ISO-8859-2       = Eropa Tengah (ISO)
 
 # Chinese, Simplified
 # LOCALIZATION NOTE (gbk.bis.key):
 # gbk.bis.key never appears together with gbk.key and, hence, can be the same.
 gbk.bis.key      =          S
-gbk.bis          = China, Sederhana
+gbk.bis          = Tiongkok, Sederhana
 # The strings gbk.key, gbk and gb18030 are no longer used but are retained
 # in order to enable backout after string freeze, just in case.
 gbk.key          =          S
-gbk              = China, Sederhana (GBK)
-gb18030          = China, Sederhana (GB18030)
+gbk              = Tiongkok, Sederhana (GBK)
+gb18030          = Tiongkok, Sederhana (GB18030)
 
 # Chinese, Traditional
 Big5.key         =          T
-Big5             = China, Tradisional
+Big5             = Tiongkok, Tradisional
 
 # Cyrillic
 windows-1251.key = C
 windows-1251     = Cyrillic (Windows)
 ISO-8859-5       = Cyrillic (ISO)
 KOI8-R           = Cyrillic (KOI8-R)
 KOI8-U           = Cyrillic (KOI8-U)
 IBM866           = Cyrillic (DOS)
--- a/toolkit/chrome/global/languageNames.properties
+++ b/toolkit/chrome/global/languageNames.properties
@@ -192,10 +192,10 @@ vi = Vietnam
 vo = Volap√ľk
 wa = Walloon
 wen = Sorbia
 wo = Wolof
 xh = Xhosa
 yi = Yiddish
 yo = Yoruba
 za = Zhuang
-zh = Cina
+zh = Tiongkok
 zu = Zulu
--- a/toolkit/chrome/global/regionNames.properties
+++ b/toolkit/chrome/global/regionNames.properties
@@ -44,17 +44,17 @@ cc=	Kepulauan Cocos (Keeling)
 cd=	Kongo-Kinshasa
 cf=	Afrika Tengah, Republik
 cg=	Kongo-Brazzaville
 ch=	Swiss
 ci=	Pantai Gading
 ck=	Cook, Kepulauan
 cl=	Chili
 cm=	Kamerun
-cn=	Cina
+cn=	Tiongkok
 co=	Kolombia
 cr=	Kosta Rika
 cu=	Kuba
 cv=	Tanjung Verde
 cx=	Natal, Pulau
 cy=	Siprus
 cz=	Ceko, Republik
 de=	Jerman