sync mail with beta
authorRomi Hardiyanto <romihardiyanto@gmail.com>
Thu, 28 Jul 2011 11:29:49 +0200
changeset 309 c0aa8849f237b64f05b9652556f3a73935a86541
parent 308 5e7202160c666198095ae2a3277147809a33c7f3
child 316 9e581b9da7fe504b744d2316b4a679697aa233e9
child 326 a9753365df1b0a925c7ed0432a84d7ce43e91acd
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:55:50 +0000
sync mail with beta
editor/ui/chrome/composer/editor.dtd
editor/ui/chrome/composer/editor.properties
editor/ui/chrome/composer/editorOverlay.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/aboutSupportMail.dtd
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/am-archiveoptions.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/baseMenuOverlay.dtd
mail/chrome/messenger/credits.dtd
mail/chrome/messenger/editContactOverlay.dtd
mail/chrome/messenger/featureConfigurator.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/safeMode.dtd
mail/chrome/messenger/taskbar.properties
mail/chrome/messenger/vcard.properties
mail/chrome/overrides/netError.dtd
other-licenses/branding/thunderbird/brand.dtd
--- a/editor/ui/chrome/composer/editor.dtd
+++ b/editor/ui/chrome/composer/editor.dtd
@@ -37,21 +37,65 @@
 
 <!-- Window title -->
 <!-- LOCALIZATION NOTE  (editorWindow.titlemodifier): DONT_TRANSLATE -->
 <!ENTITY editorWindow.titlemodifier "Composer"> 
 <!ENTITY editorWindow.titlemodifiermenuseparator " - ">
 
 <!-- Menu items:  the . means that the menu item isn't implemented yet -->
 
+<!-- Toolbar-only items -->
+<!ENTITY compositionToolbar.tooltip "Bilah Alat Komposisi">
+<!ENTITY previewToolbarCmd.label "Jelajahi">
+<!ENTITY previewToolbarCmd.tooltip "Muat laman ini di peramban">
+
+<!-- File menu items -->
+<!ENTITY exportToTextCmd.label "Ekspor sebagai Teks…">
+<!ENTITY exportToTextCmd.accesskey "T">
+<!ENTITY previewCmd.label "Jelajahi Laman">
+<!ENTITY previewCmd.accesskey "L">
+<!ENTITY sendPageCmd.label "Kirim Laman…">
+<!ENTITY sendPageCmd.accesskey "K">
+
 <!-- View menu items -->
-<!ENTITY viewMenu.label "Tampilan">
-<!ENTITY viewMenu.accesskey "T">
 <!ENTITY compositionToolbarCmd.label "Bilah Alat Komposisi">
 <!ENTITY compositionToolbarCmd.accesskey "K">
 <!ENTITY formattingToolbarCmd.label "Bilah Alat Format">
 <!ENTITY formattingToolbarCmd.accesskey "F">
 <!ENTITY editmodeToolbarCmd.label "Bilah Alat Mode Sunting">
 <!ENTITY editmodeToolbarCmd.accesskey "S">
 
 <!-- Format menu items -->
 <!ENTITY formatMenu.label "Format">
 <!ENTITY formatMenu.accesskey "o">
+<!ENTITY grid.label "Grid posisi">
+<!ENTITY grid.accesskey "g">
+<!ENTITY pageProperties.label "Judul dan Properti Laman…">
+<!ENTITY pageProperties.accesskey "J">
+
+<!-- Tools menu items -->
+<!ENTITY validateCmd.label "Validasi HTML">
+<!ENTITY validateCmd.accesskey "V">
+
+<!-- Display Mode toolbar and View menu items -->
+<!ENTITY NormalModeTab.label "Normal">
+<!ENTITY NormalMode.label "Mode Sunting Normal">
+<!ENTITY NormalMode.accesskey "n">
+<!ENTITY NormalMode.tooltip "Tampilkan pita tepian tabel dan penanda bernama">
+<!ENTITY AllTagsModeTab.label "Tag HTML">
+<!ENTITY AllTagsMode.label "Tag HTML">
+<!ENTITY AllTagsMode.accesskey "a">
+<!ENTITY AllTagsMode.tooltip "Tampilkan semua ikon pada tag HTML">
+
+<!-- LOCALIZATION NOTE: (HTMLSourceModeTab.dir, HTMLSourceModeTab.label)
+     Do NOT translate text for 'HTMLSourceModeTab.dir', use latin "ltr" if
+     you want the <html> image to left of the 'HTMLSourceModeTab.label' text,
+     or use latin "rtl" if you want this image to the right of text. You do
+     not need to include HTML in the label 'HTMLSourceModeTab.label' -->
+<!ENTITY HTMLSourceModeTab.dir "ltr">
+<!ENTITY HTMLSourceModeTab.label "Kode Sumber">
+<!ENTITY HTMLSourceMode.label "Kode Sumber HTML">
+<!ENTITY HTMLSourceMode.accesskey "o">
+<!ENTITY HTMLSourceMode.tooltip "Sunting Kode Sumber HTML">
+<!ENTITY PreviewModeTab.label "Pratinjau">
+<!ENTITY PreviewMode.label "Pratinjau">
+<!ENTITY PreviewMode.accesskey "P">
+<!ENTITY PreviewMode.tooltip "Tampilkan dalam mode WYSIWYG (seperti pada program peramban)">
--- a/editor/ui/chrome/composer/editor.properties
+++ b/editor/ui/chrome/composer/editor.properties
@@ -8,20 +8,21 @@ Save=Simpan
 More=Lebih Banyak
 Less=Sedikit
 MoreProperties=Lebih Banyak Properti
 FewerProperties=Lebih Sedikit Properti
 PropertiesAccessKey=P
 None=Tidak Ada
 none=tidak ada
 OpenHTMLFile=Buka Berkas HTML
+OpenTextFile=Buka Berkas Teks
 SelectImageFile=Pilih Berkas Gambar
 SaveDocument=Simpan Laman
 SaveDocumentAs=Simpan Laman dengan Nama
-ExportToText=Ekspor Menjadi Teks
+SaveTextAs=Simpan Teks dengan Nama
 EditMode=Mode Sunting
 Preview=Pratinjau
 Publish=Terbitkan
 PublishPage=Terbitkan Laman
 DontPublish=Jangan Terbitkan
 SavePassword=Gunakan Pengelola Sandi untuk menyimpan sandi ini
 CorrectSpelling=(perbaiki ejaan)
 NoSuggestedWords=(tidak ada saran ejaan)
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -40,19 +40,16 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- Attn: Localization - some of the menus in this dialog directly affect mail also. -->
 
 <!-- File menu items -->
 <!ENTITY fileMenu.label "Berkas">
 <!ENTITY fileMenu.accesskey "B">
-<!ENTITY newBlankPageCmd.label "Laman di Composer">
-<!ENTITY newBlankPageCmd.accesskey "n" >
-<!ENTITY newMenu.label "Baru">
 <!ENTITY openFileCmd.label "Buka Berkas…">
 <!ENTITY openFileCmd.accesskey "u">
 <!ENTITY openFileCmd.key "o">
 <!ENTITY openRemoteCmd.label "Buka Lokasi Web…">
 <!ENTITY openRemoteCmd.accesskey "L">
 <!ENTITY openRemoteCmd.key "l">
 <!ENTITY fileRecentMenu.label "Laman Terakhir">
 <!ENTITY fileRecentMenu.accesskey "r">
@@ -64,24 +61,18 @@
 <!ENTITY saveAsCmd.label "Simpan sebagai…">
 <!ENTITY saveAsCmd.accesskey "a">
 
 <!ENTITY publishCmd.label "Terbitkan">
 <!ENTITY publishCmd.accesskey "T">
 <!ENTITY publishCmd.key "S">
 <!ENTITY publishAsCmd.label "Terbitkan dengan Nama…">
 <!ENTITY publishAsCmd.accesskey "n">
-<!ENTITY exportToTextCmd.label "Ekspor ke Teks…">
-<!ENTITY exportToTextCmd.accesskey "T">
 <!ENTITY saveAsChangeEncodingCmd.label "Simpan dan Ubah Pengodean Karakter">
 <!ENTITY saveAsChangeEncodingCmd.accesskey "e">
-<!ENTITY previewCmd.label "Jelajahi Laman">
-<!ENTITY previewCmd.accesskey "J">
-<!ENTITY sendPageCmd.label "Kirim Laman…">
-<!ENTITY sendPageCmd.accesskey "K">
 <!ENTITY printSetupCmd.label "Tata Laman…">
 <!ENTITY printSetupCmd.accesskey "T">
 <!ENTITY printCmd.label "Cetak…">
 <!ENTITY printCmd.accesskey "C">
 <!ENTITY printCmd.key "p">
 <!ENTITY closeCmd.label "Tutup">
 <!ENTITY closeCmd.accesskey "T">
 <!ENTITY closeCmd.key "w">
@@ -111,18 +102,16 @@
 <!ENTITY findPrevCmd.accesskey "S">
 <!ENTITY findPrevCmd.key "g">
 <!ENTITY findPrevCmd.key2 "VK_F3">
 <!ENTITY enableInlineSpellChecker.label "Periksa Ejaan saat Mengetik">
 <!ENTITY enableInlineSpellChecker.accesskey "e">
 <!ENTITY checkSpellingCmd2.label "Periksa Ejaan">
 <!ENTITY checkSpellingCmd2.accesskey "e">
 <!ENTITY checkSpellingCmd2.key "k">
-<!ENTITY validateCmd.label "Periksa HTML">
-<!ENTITY validateCmd.accesskey "P">
 
 <!-- Insert menu items -->
 <!ENTITY insertMenu.label "Sisipkan">
 <!ENTITY insertMenu.accesskey "i">
 <!ENTITY insertLinkCmd.label "Tautan…">
 <!ENTITY insertLinkCmd.accesskey "T">
 <!ENTITY insertLinkCmd.key "l">
 <!ENTITY insertAnchorCmd.label "Penanda Bernama…">
@@ -327,21 +316,16 @@
 
 <!ENTITY increaseIndent.label "Tambah Indentasi">
 <!ENTITY increaseIndent.accesskey "I">
 <!ENTITY increaseIndent.key "=">
 <!ENTITY decreaseIndent.label "Kurangi Indentasi">
 <!ENTITY decreaseIndent.accesskey "u">
 <!ENTITY decreaseIndent.key "-">
 
-<!ENTITY grid.label "Peletakan Grid">
-<!ENTITY grid.accesskey "G">
-
-<!ENTITY pageProperties.label "Judul dan Properti Laman…">
-<!ENTITY pageProperties.accesskey "J">
 <!ENTITY colorsAndBackground.label "Warna dan Latar Belakang Laman…">
 <!ENTITY colorsAndBackground.accesskey "W">
 
 <!-- Table Menu -->
 <!ENTITY tableMenu.label "Tabel">
 <!ENTITY tableMenu.accesskey "b">
 
 <!-- Select Submenu -->
@@ -400,25 +384,23 @@
 <!ENTITY tableSplitCell.accesskey "s">
 <!ENTITY convertToTable.label "Buat Tabel dari Yang Disorot">
 <!ENTITY convertToTable.accesskey "o">
 <!ENTITY tableProperties.label "Properti Tabel…">
 <!ENTITY tableProperties.accesskey "o">
 
 <!-- Toolbar-only items -->
 <!ENTITY menuBar.tooltip "Bilah Menu">
-<!ENTITY compositionToolbar.tooltip "Bilah Alat Komposisi">
 <!ENTITY formatToolbar.tooltip "Bilah Format">
+<!ENTITY newToolbarCmd.label "Baru">
 <!ENTITY newToolbarCmd.tooltip "Buat Laman Baru di Composer">
 <!ENTITY openToolbarCmd.label "Buka">
 <!ENTITY openToolbarCmd.tooltip "Buka berkas lokal">
 <!ENTITY saveToolbarCmd.tooltip "Simpan berkas ke lokasi lokal">
 <!ENTITY publishToolbarCmd.tooltip "Unggah berkas ke lokasi daring">
-<!ENTITY previewToolbarCmd.label "Jelajahi">
-<!ENTITY previewToolbarCmd.tooltip "Muat Laman di program peramban">
 <!ENTITY printToolbarCmd.label "Cetak">
 <!ENTITY printToolbarCmd.tooltip "Cetak Laman Ini">
 <!ENTITY findToolbarCmd.label "Cari">
 <!ENTITY findToolbarCmd.tooltip "Cari teks di laman">
 <!ENTITY spellToolbarCmd.label "Periksa Ejaan">
 <!ENTITY spellToolbarCmd.tooltip "Periksa Ejaan saat mengetik atau seluruh laman">
 <!ENTITY imageToolbarCmd.label "Gambar">
 <!ENTITY imageToolbarCmd.tooltip "Sisipkan gambar baru atau sunting properti gambar yang dipilih">
@@ -445,43 +427,17 @@
 <!ENTITY numberListToolbarCmd.tooltip "Terapkan atau hapus daftar bernomor">
 <!ENTITY outdentToolbarCmd.tooltip "Turunkan indentasi teks (mundur ke kiri)">
 <!ENTITY indentToolbarCmd.tooltip "Naikkan indentasi teks (maju ke kanan)">
 <!ENTITY AlignPopupButton.tooltip "Pilih jenis rata paragraf">
 <!ENTITY InsertPopupButton.tooltip "Sisipkan Tautan, Penanda, Gambar, Garis Mendatar, atau Tabel">
 <!ENTITY alignLeftButton.tooltip "Buat rata kiri pada margin kiri">
 <!ENTITY alignCenterButton.tooltip "Buat teks rata tengah">
 <!ENTITY alignRightButton.tooltip "Buat teks rata kanan pada margin kanan">
-<!ENTITY alignjustifyButton.tooltip "Buat teks rata pada margin kiri dan kanan">
-
-<!-- Display Mode toolbar and View menu items -->
-<!ENTITY NormalModeTab.label "Normal">
-<!ENTITY NormalMode.label "Mode Sunting Normal">
-<!ENTITY NormalMode.accesskey "n">
-<!ENTITY NormalMode.tooltip "Tampilkan pita tepian tabel dan penanda bernama">
-<!ENTITY AllTagsMode.label "Tag HTML">
-<!ENTITY AllTagsMode.accesskey "a">
-<!ENTITY AllTagsMode.tooltip "Tampilkan semua ikon pada tag HTML">
-
-<!ENTITY HTMLSourceMode.label "Kode Sumber HTML">
-<!-- Toolbar has an image with "HTML" text, so don't include it in the string -->
-<!ENTITY SourceMode.label "Kode Sumber">
-<!ENTITY HTMLSourceMode.accesskey "o">
-<!ENTITY HTMLSourceMode.tooltip "Sunting Kode Sumber HTML">
-<!ENTITY PreviewMode.label "Pratinjau">
-<!ENTITY PreviewMode.accesskey "P">
-<!ENTITY PreviewMode.tooltip "Tampilkan dalam mode WYSIWYG (seperti pada program peramban)">
-
-<!-- LOCALIZATION NOTE: Do NOT translate text for 'SourceTabDirection'
-     Use latin "ltr" if you want the <html> image to left of the 
-     'SourceMode.label' text defined above,
-     or use latin "rtl" if you want this image to the right of text
-     This is the value of the HTML 'dir' attribute
--->
-<!ENTITY SourceTabDirection "ltr">
+<!ENTITY alignJustifyButton.tooltip "Buat teks rata pada margin kiri dan kanan">
 
 <!-- Structure Toolbar Context Menu items -->
 <!ENTITY structSelect.label         "Pilih">
 <!ENTITY structSelect.accesskey     "P">
 <!ENTITY structRemoveTag.label      "Hapus tag">
 <!ENTITY structRemoveTag.accesskey  "H">
 <!ENTITY structChangeTag.label      "Ubah tag">
 <!ENTITY structChangeTag.accesskey  "U">
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -1,9 +1,10 @@
 <!ENTITY window.title "Aturan Filter">
+<!ENTITY filterEditorDialog.dimensions "width: 100ch;">
 
 <!ENTITY filterName.label "Nama filter:">
 <!ENTITY filterName.accesskey "i">
 
 <!ENTITY junk.label "Junk">
 <!ENTITY notJunk.label "Bukan Junk">
 
 <!ENTITY lowestPriorityCmd.label "Terendah">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -1,16 +1,83 @@
-<!ENTITY aboutDialog.title      "Tentang &brandFullName;">
-<!ENTITY aboutButton.label      "&lt; Kembali">
-<!ENTITY aboutButton.accesskey  "K">
-<!ENTITY aboutVersion           "versi">
-<!ENTITY aboutMenu.label        "Tentang">
-<!ENTITY aboutMenu.accesskey    "T">
-<!ENTITY aboutCredits.label     "Kredit">
-<!ENTITY aboutCredits.accesskey "K">
-<!ENTITY aboutRights.label      "Hak Anda">
-<!ENTITY aboutRights.accesskey  "H">
-<!ENTITY aboutContributors.label "Kontributor">
-<!ENTITY aboutContributors.accesskey "K">
-<!ENTITY aboutLicense.label      "Lisensi">
-<!ENTITY aboutLicense.accesskey  "L">
+<!ENTITY aboutDialog.title          "Tentang &brandFullName;">
+
+<!ENTITY community.start2           "&brandShortName; didesain oleh ">
+<!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+<!ENTITY community.mozillaLink      "&vendorShortName;">
+<!ENTITY community.middle2          ", sebuah ">
+<!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
+<!ENTITY community.creditsLink      "komunitas global">
+<!ENTITY community.end2             " yang bekerja sama untuk Internet yang lebih baik. Kami percaya bahwa Internet harus bersifat terbuka, untuk publik, dan dapat diakses oleh semua orang tanpa batasan.">
+
+<!ENTITY contribute.start           "Tertarik? ">
+<!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
+<!ENTITY contribute.getInvolvedLink "Ikutan Yuk!">
+<!ENTITY contribute.end             "">
+
+<!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
+<!ENTITY bottomLinks.license        "Informasi Lisensi">
+
+<!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
+<!ENTITY bottomLinks.rights         "Hak Pengguna Akhir">
+
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+<!ENTITY bottomLinks.privacy        "Kebijakan Privasi">
+
+<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingForUpdates  "Memeriksa versi baru…">
+<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingAddonCompat "Memeriksa kompatibilitas pengaya…">
+<!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.noUpdatesFound      "&brandShortName; sudah dalam versi terbaru">
+<!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.adminDisabled       "Pemutakhiran dinonaktifkan oleh administrator sistem">
+
+<!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
+     update.failed.start, update.failed.linkText, and update.failed.end all go into
+     one line with linkText being wrapped in an anchor that links to a site to download
+     the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
+     one line, try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.failed.start        "Pemutakhiran gagal. ">
+<!ENTITY update.failed.linkText     "Unduh versi terbaru">
+<!ENTITY update.failed.end          "">
+
+<!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
+     all go into one line and have an anchor in between with text that is the same as the link to a site
+     to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
+     try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.manual.start        "Unduh ">
+<!ENTITY update.manual.linkText     "versi terbaru">
+<!ENTITY update.manual.end          "">
+
+<!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
+     update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
+     is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
+     the "em dash" (long dash).
+     example: Downloading update — 111 KB of 13 MB -->
+<!ENTITY update.downloading.start   "Mengunduh versi baru — ">
+<!ENTITY update.downloading.end     "">
+
+<!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
+     channel.description.end create one sentence, with the current channel label inserted in between.
+     example: You are currently on the _Stable_ update channel. -->
+<!ENTITY channel.description.start  "Anda sedang menggunakan kanal pembaruan ">
+<!ENTITY channel.description.end    ". ">
+
+<!ENTITY channel.change             "Ubah">
+
+<!ENTITY channel.release.description       "Nikmati rilis final yang telah diuji dan dikaji, yang digunakan beratus juta orang di seluruh dunia. Dapatkan selalu pengalaman daring dengan kecepatan super, pengubahsuaian nan mudah, serta teknologi Web terbaru.">
+<!ENTITY channel.beta.description          "Dapatkan fitur terbaru dengan kestabilan yang lebih baik. Kirimkan umpan balik untuk membantu memperhalus dan membesut apa yang akan disertakan dalam rilis final.">
+<!ENTITY channel.aurora.description        "    Dapatkan inovasi terbaru dalam lingkungan yang tidak stabil, bukan untuk yang suka uji nyali. Kirimkan umpan balik tentang fitur dan kinerja untuk menentukan apa yang akan disertakan dalam rilis final.">
+
+<!-- LOCALIZATION NOTE (channel.selector.start,channel.selector.end): channel.selector.start and
+     channel.selector.end create one sentence, with a channel selection menulist instered in between.
+     This is all in one line, so try to make the localized text short.
+     example: Switch to the [Stable] update channel. -->
+<!ENTITY channel.selector.start          "Ubah ke kanal pembaruan">
+<!ENTITY channel.selector.end            ".">
+
+<!-- LOCALIZATION NOTE (channel.selector.applyButton): This button applies the user's choice to switch
+     to a new update channel and starts the application update process. -->
+<!ENTITY channel.selector.applyButton    "Terapkan dan Perbarui">
+<!ENTITY channel.selector.cancelButton   "Batal">
 
 <!ENTITY cmdCloseMac.commandKey "w">
--- a/mail/chrome/messenger/aboutSupportMail.dtd
+++ b/mail/chrome/messenger/aboutSupportMail.dtd
@@ -2,13 +2,14 @@
 
 <!ENTITY aboutSupport.accountsTitle "Akun Email dan News">
 <!ENTITY aboutSupport.showPrivateData.mainText "Sertakan nama akun">
 <!ENTITY aboutSupport.showPrivateData.explanationText "(kemungkinan ada informasi yang dapat diidentifikasi)">
 <!ENTITY aboutSupport.accountsID "ID">
 <!ENTITY aboutSupport.accountsName "Nama">
 <!ENTITY aboutSupport.accountsIncomingServer "Server masuk">
 <!ENTITY aboutSupport.accountsOutgoingServers "Server keluar">
+<!ENTITY aboutSupport.accountsServerName "Nama">
 <!ENTITY aboutSupport.accountsConnSecurity "Keamanan sambungan">
 <!ENTITY aboutSupport.accountsAuthMethod "Metode autentikasi">
 <!ENTITY aboutSupport.accountsDefault "Bawaan?">
 
 <!ENTITY aboutSupport.sendViaEmail.label "Kirim lewat email">
--- a/mail/chrome/messenger/accountCreation.dtd
+++ b/mail/chrome/messenger/accountCreation.dtd
@@ -6,51 +6,53 @@
 <!ENTITY email.label                     "Alamat email:">
 <!ENTITY email.accesskey                 "l">
 <!ENTITY email.placeholder               "email@example.com">
 <!ENTITY password.label                  "Sandi:">
 <!ENTITY password.accesskey              "S">
 <!ENTITY password.placeholder            "Sandi">
 <!ENTITY password.text                   "Opsional, akan digunakan untuk memvalidasi nama pengguna">
 
-<!ENTITY accountInformation.label        "Informasi Akun">
-<!ENTITY username2.label                 "Nama pengguna:">
+<!ENTITY username.label                 "Nama pengguna:">
+<!ENTITY hostname.label                  "Nama host server">
+<!ENTITY port.label                      "Port">
+<!ENTITY ssl.label                       "SSL">
 <!ENTITY incoming.label                  "Terima:">
 <!ENTITY outgoing.label                  "Keluar:">
 <!ENTITY noEncryption.label              "Tanpa">
 <!ENTITY starttls.label                  "STARTTLS">
 <!ENTITY sslTls.label                    "SSL/TLS">
+<!ENTITY auth.label                      "Autentikasi">
 
+<!ENTITY advancedSetup.label             "Konfigurasi lanjut">
+<!ENTITY advancedSetup.accesskey         "a">
+<!-- LOCALIZATION NOTE (half-manual-test.label): This is the text that is
+     displayed on the button in manual edit mode which will re-guess
+     the account configuration, taking into account the settings that
+     the user has manually changed. -->
+<!ENTITY half-manual-test.label          "Uji ulang">
+<!ENTITY half-manual-test.accesskey      "l">
+<!ENTITY manual-edit.label               "Konfigurasi manual">
+<!ENTITY manual-edit.accesskey           "M">
 <!ENTITY imap.label                      "IMAP">
-<!ENTITY pop.label                       "POP">
+<!ENTITY pop3.label                      "POP">
 <!ENTITY smtp.label                      "SMTP">
-<!ENTITY imap.description                "IMAP - Akses pesan dan folder dari berbagai komputer">
-<!ENTITY pop.description                 "POP - Unduh semua pesan ke komputer ini. Folder hanya bersifat lokal">
-<!ENTITY recommended-appendix.label      "(direkomendasikan)">
+<!ENTITY autodetect.label                "Deteksi otomatis">
 
-<!ENTITY manualSetup.label               "Setup Manual…">
-<!ENTITY manualSetup.accesskey           "S">
 <!ENTITY cancel.label                    "Batal">
 <!ENTITY cancel.accesskey                "B">
 <!ENTITY continue.label                  "Lanjutkan">
 <!ENTITY continue.accesskey              "L">
-<!ENTITY startOver.label                 "Ulangi dari Awal">
-<!ENTITY startOver.accesskey             "U">
 <!ENTITY stop.label                      "Stop">
 <!ENTITY stop.accesskey                  "S">
-<!-- LOCALIZATION NOTE (retest.label): This is the text that is
-     displayed on the button which will re-guess the account configuration,
-     taking into account the settings the user has changed. -->
-<!ENTITY retest.label                    "Ulangi Uji Konfigurasi">
-<!ENTITY retest.accesskey                "U">
-<!ENTITY edit.label                      "Sunting">
-<!ENTITY edit.accesskey                  "S">
 
 <!ENTITY rememberPassword.label          "Ingat sandi">
 <!ENTITY rememberPassword.accesskey      "I">
+<!ENTITY imapLong.label                  "IMAP (folder daring)">
+<!ENTITY pop3Long.label                  "POP3 (simpan email di komputer Anda)">
 
 <!ENTITY warning.label                   "Peringatan!">
 <!ENTITY incomingSettings.label          "Pengaturan terima:">
 <!ENTITY outgoingSettings.label          "Pengaturan keluar:">
 <!ENTITY technicaldetails.label          "Detail teknis">
 <!-- LOCALIZATION NOTE (confirmWarning.label): If there is a security
      warning on the outgoing server, then the user will need to check a
      checkbox beside this text before continuing. -->
--- a/mail/chrome/messenger/accountCreation.properties
+++ b/mail/chrome/messenger/accountCreation.properties
@@ -4,35 +4,43 @@
 cleartext_warning=%1$S tidak menggunakan enkripsi.
 # LOCALIZATION NOTE(selfsigned_warning): %1$S will be the hostname of the server the user was trying to connect to.
 selfsigned_warning=%1$S tidak menggunakan sertifikat yang terpercaya.
 selfsigned_details=Umumnya, server email yang aman akan menyertakan sertifikat yang terpercaya yang membuktikan keberadaan server tersebut secara benar. Sambungan ke email server ini akan dienkripsi tetapi tidak dapat divalidasi apakah server tersebut merupakan server yang benar.
 cleartext_details=Server email yang tidak aman tidak menggunakan enkripsi untuk melindungi kerahasiaan sandi dan informasi pribadi Anda. Dengan tersambung ke server ini kerahasiaan sandi dan informasi pribadi tidak akan terjamin.
 
 # LOCALIZATION NOTE(default_server_tag): Used to indicate the default smtp server in the server dropdown list.
 default_server_tag= (default)
+# LOCALIZATION NOTE(port_auto): It must be short (4-5 characters max.).
+# Content of server port field (usually a number), used when the user didn't
+# enter anything yet and we'll automatically detect it later.
+port_auto=Otomatis
 
 # config titles
 # LOCALIZATION NOTE(looking_up_settings_disk): Referring to Thunderbird installation folder on user's harddisk. %1$S will be the brandShortName.
 looking_up_settings_disk=Mencari konfigurasi: Instalasi %1$S
 looking_up_settings_isp=Mencari konfigurasi: Penyedia layanan email
 # LOCALIZATION NOTE(looking_up_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
 looking_up_settings_db=Mencari konfigurasi: Basis data penyedia layanan (ISP) di Mozilla
 # LOCALIZATION NOTE(looking_up_settings_guess): We are checking common server names like pop., pop3., smtp., mail., without knowing whether they exist or really serve this email account. If a server responds, we try to talk to it via POP/IMAP/SMTP protocols and query its capabilities. If that succeeds, we assume we found a configuration. Of course, it may still be wrong, but it often works.
 looking_up_settings_guess=Mencari konfigurasi: Menebak konfigurasi nama server yang umum
+looking_up_settings_halfmanual=Mencari konfigurasi: Menebak servernya
 # LOCALIZATION NOTE(found_settings_disk): Referring to Thunderbird installation folder on user's harddisk. %1$S will be the brandShortName.
 found_settings_disk=Pengaturan berikut ditemukan pada: Instalasi %1$S
 found_settings_isp=Pengaturan berikut ditemukan pada: Penyedia layanan email
 # LOCALIZATION NOTE(found_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
 found_settings_db=Pengaturan berikut ditemukan pada: Basis data penyedia layanan (ISP) di Mozilla
 # LOCALIZATION NOTE(found_settings_guess): We tried common mail server names and we found a mail server and talked to it and it responded properly, so we think we found a suitable configuration, but we are only about 80% certain that it is the correct setting for this email address. There's a chance that email address may not actually be served by this server and it won't work, or that there is a better server.
 found_settings_guess=Pengaturan berikut ditemukan setelah menebak nama server yang umum
+found_settings_halfmanual=Pengaturan berikut ditemukan setelah menebak server yang dipilih
 # LOCALIZATION NOTE(failed_to_find_settings): %1$S will be the brandShortName.
 failed_to_find_settings=%1$S gagal menemukan pengaturan untuk akun email Anda.
 manually_edit_config=Sunting Konfigurasi
+# LOCALIZATION NOTE(guessed_settings_offline) User is offline, so we just took a wild guess and the user will have to enter the right settings.
+guessed_settings_offline=Anda sedang luring. Kami dapat menebak beberapa data pengaturan tetapi Anda harus memasukkan data pengaturan yang benar.
 
 # config subtitles
 check_preconfig=memeriksa prakonfigurasi…
 found_preconfig=menemukan prakonfigurasi
 checking_config=memeriksa konfigurasi…
 found_config=Menemukan konfigurasi untuk akun Anda
 checking_mozilla_config=memeriksa konfigurasi pada Komunitas Mozilla…
 found_isp_config=menemukan konfigurasi
@@ -50,14 +58,41 @@ password_ok=Sandi ok!
 user_pass_invalid=Nama pengguna atau sandi tidak sesuai
 check_server_details=Memeriksa detail server
 check_in_server_details=Memeriksa detail server penerima
 check_out_server_details=Memeriksa detail server keluar
 
 error_creating_account=Kesalahan saat Membuat Akun
 incoming_server_exists=Server penerima telah ada sebelumnya.
 
-no_encryption=Tanpa enkripsi
-ssl_tls=SSL/TLS
-starttls=STARTTLS
-
 please_enter_name=Masukkan nama Anda.
 double_check_email=Periksa lagi alamat email ini!
+
+#config result display
+# LOCALIZATION NOTE(resultUnknown): Displayed instead of resultIncoming,
+# resultOutgoing or resultUsername when we don't have a proper value.
+resultUnknown=Tidak diketahui
+# LOCALIZATION NOTE(resultIncoming):
+# %1$S will be replaced with either resultIMAP, resultPOP3 or resultSMTP.
+# %2$S will be replaced with the server hostname
+#   with possibly a port appended as ":"+port.
+#   The domain part may be made bold.
+# %3$S will be replaced with either resultNoEncryption or resultSSL or
+#    resultSTARTTLS.
+# %4$S will be replaced with either resultSSLCertWeak or resultSSLCertOK
+#    (which should normally be empty)
+# You may adjust the strings to be a real sentence.
+resultIncoming=%1$S, %2$S, %3$S%4$S
+# LOCALIZATION NOTE(resultOutgoing): see resultIncoming
+resultOutgoing=%1$S, %2$S, %3$S%4$S
+resultOutgoingExisting=Gunakkan server SMTP keluar yang sudah ditentukan
+resultIMAP=IMAP
+resultPOP3=POP3
+resultSMTP=SMTP
+# LOCALIZATION NOTE(resultNoEncryption): Neither SSL/TLS nor STARTTLS. Transmission of emails in cleartext over the Internet.
+resultNoEncryption=Tanpa Enkripsi
+resultSSL=SSL
+resultSTARTTLS=STARTTLS
+# LOCALIZATION NOTE(resultSSLCertWeak): \u0020 is just a space
+resultSSLCertWeak=\u0020(Peringatan: Tidak dapat memverifikasi server)
+resultSSLCertOK=
+resultUsernameBoth=%1$S
+resultUsernameDifferent=Masuk: %1$S, Keluar: %2$S
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -64,16 +64,18 @@ incorrectEmailAddressFormatTitle=Format 
 viewListTitle=Daftar Email: %S
 mailListNameExistsTitle=Daftar Email Sudah Ada
 mailListNameExistsMessage=Daftar Email dengan nama yang sama sudah ada. Silakan pilih nama lainnya.
 
 # used in the addressbook
 confirmDeleteMailingListTitle=Hapus Milis
 confirmDeleteAddressbookTitle=Hapus Buku Alamat
 confirmDeleteAddressbook=Yakin akan menghapus buku alamat terpilih?
+confirmDeleteContact=Yakin akan menghapus data kenalan terpilih?
+confirmDeleteContacts=Yakin akan menghapus data kenalan terpilih?
 confirmDeleteCollectionAddressbook=Jika buku alamat ini dihapus, %S tidak akan mengumpulkan alamat email lagi. Yakin akan menghapus buku alamat terpilih?
 confirmDeleteMailingList=Yakin akan menghapus daftar milis terpilih?
 confirmDeleteListsAndContacts=Yakin akan menghapus data kenalan dan daftar milis terpilih?
 confirmDeleteMailingLists=Yakin akan menghapus daftar milis terpilih?
 
 propertyPrimaryEmail=Email
 propertyListName=Nama Milis
 propertySecondaryEmail=Email Lainnya
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/am-archiveoptions.dtd
@@ -0,0 +1,19 @@
+<!-- extracted from am-archiveoptions.xul -->
+
+<!ENTITY dialogTitle.label "Opsi Pengarsipan">
+<!ENTITY archiveGranularityPrefix.label "Saat mengarsipkan pesan, letakkan di:">
+<!ENTITY archiveFlat.label "Folder tunggal">
+<!ENTITY archiveFlat.accesskey "u">
+<!ENTITY archiveYearly.label "Folder arsip tahunan">
+<!ENTITY archiveYearly.accesskey "t">
+<!ENTITY archiveMonthly.label "Folder arsip bulanan">
+<!ENTITY archiveMonthly.accesskey "b">
+<!ENTITY keepFolderStructure.label "Gunakan struktur folder yang ada untuk pesan yang diarsipkan">
+<!ENTITY keepFolderStructure.accesskey "K">
+<!ENTITY archiveExample.label "Contoh">
+<!-- LOCALIZATION NOTE (archiveFolderName.label): this should match the default
+     name for the "Archives" folder -->
+<!ENTITY archiveFolderName.label "Arsip">
+<!-- LOCALIZATION NOTE (inboxFolderName.label): this should match the default
+     name for the "Inbox" folder -->
+<!ENTITY inboxFolderName.label "Kotak Masuk">
--- a/mail/chrome/messenger/am-copies.dtd
+++ b/mail/chrome/messenger/am-copies.dtd
@@ -31,12 +31,16 @@
 <!ENTITY archivesFolderOn.accesskey "A">
 <!ENTITY archiveInOtherFolder.label "Lainnya:">
 <!ENTITY archiveInOtherFolder.accesskey "L">
 <!-- LOCALIZATION NOTE (templatesFolderOn.label): OK to translate this, bug #57440 -->
 <!ENTITY templatesFolderOn.label "Folder &quot;Templat&quot; di:">
 <!ENTITY templatesFolderOn.accesskey "m">
 <!ENTITY templateInOtherFolder.label "Lainnya:">
 <!ENTITY templateInOtherFolder.accesskey "a">
-<!ENTITY specialFoldersTitle.label "Konsep dan Templat">
+<!ENTITY specialFolders.label "Konsep dan Templat">
 <!ENTITY keepDrafts.label "Letakkan pesan konsep di:">
 <!ENTITY keepArchives.label "Letakkan arsip pesan di:">
-<!ENTITY keepTempltes.label "Letakkan pesan templat di:">
+<!ENTITY keepArchives.accesskey "a">
+<!ENTITY keepTemplates.label "Letakkan pesan templat di:">
+<!ENTITY archiveHierarchyButton.label "Opsi pengarsipan…">
+<!ENTITY archiveHierarchyButton.accesskey "a">
+<!ENTITY archivesTitle.label "Arsip Pesan">
--- a/mail/chrome/messenger/baseMenuOverlay.dtd
+++ b/mail/chrome/messenger/baseMenuOverlay.dtd
@@ -2,24 +2,25 @@
 <!ENTITY helpMenu.label "Bantuan">
 <!ENTITY helpMenu.accesskey "n">
 <!-- LOCALIZATION NOTE some localizations of Windows use "?"
                        for the help button in the menubar but Gnome does not.   -->
 <!ENTITY helpMenuWin.label "Bantuan">
 <!ENTITY helpMenuWin.accesskey "n">
 <!ENTITY helpTroubleshootingInfo.label      "Informasi Pemecahan Masalah…">
 <!ENTITY helpTroubleshootingInfo.accesskey  "m">
-<!ENTITY releaseCmd.label "Catatan Rilis">
-<!ENTITY releaseCmd.accesskey "R">
+<!ENTITY helpSafeMode.label     "Mulai Ulang dengan Pengaya Dinonaktifkan…">
+<!ENTITY helpSafeMode.accesskey "n">
+<!ENTITY releaseCmd2.label "Catatan Rilis">
+<!ENTITY releaseCmd2.accesskey "R">
 <!ENTITY whatsNewCmd.label "Kabar Terbaru">
 <!ENTITY whatsNewCmd.accesskey "K">
 <!ENTITY featureConfiguratorCmd.label "Asisten Migrasi">
 <!ENTITY featureConfiguratorCmd.accesskey "M">
 <!ENTITY openHelp.label "Daftar Isi Bantuan">
 <!ENTITY openHelp.accesskey "D">
 <!ENTITY openHelp.commandkey "VK_F1">
 <!ENTITY openHelpMac.label "Daftar Isi Bantuan &brandShortName;">
 <!ENTITY openHelpMac2.commandkey   "?">
 <!ENTITY openHelpMac2.modifiers    "accel">
 
-<!ENTITY updateCmd.label "Periksa Versi Baru…">
 <!ENTITY aboutMenuCmd.label "Tentang &brandShortName;">
 <!ENTITY aboutMenuCmd.accesskey "T">
deleted file mode 100644
--- a/mail/chrome/messenger/credits.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-<!ENTITY credit.title     "Kredit &brandFullName;">
-<!ENTITY brandMotto       "Ayo Maju Thunderbird!">
-<!ENTITY credit.thanks    "Terima Kasih Khusus Kepada">
-
-<!-- localization credits look like this: -->
-<!--
-<!ENTITY credit.translation
-  "<h3>Translators</h3><ul><li>Name Here</li></ul>">
--->
-<!ENTITY credit.translation "<h3>Translators</h3><ul><li>Dody Suria Wijaya</li><li>Milda Irhamni</li><li>Romi Hardiyanto</li></ul>">
-
-<!ENTITY credit.memory         "Untuk Mengenang">
-<!ENTITY credit.poweredByGecko "Didukung oleh Gecko&trade;">
--- a/mail/chrome/messenger/editContactOverlay.dtd
+++ b/mail/chrome/messenger/editContactOverlay.dtd
@@ -10,8 +10,10 @@
 <!ENTITY editContactAddressBook.label "Buku Alamat:">
 <!ENTITY editContactAddressBook.accesskey "A">
 
 <!ENTITY editContactPanelCancel.label "Batal">
 <!ENTITY editContactPanelCancel.accesskey "B">
 
 <!ENTITY editContactPanelDone.label "Selesai">
 <!ENTITY editContactPanelDone.accesskey "S">
+
+<!ENTITY contactMoveDisabledWarning.description "Anda tidak dapat mengubah buku alamat karena kontak ada dalam milis.">
--- a/mail/chrome/messenger/featureConfigurator.dtd
+++ b/mail/chrome/messenger/featureConfigurator.dtd
@@ -15,22 +15,28 @@
 <!ENTITY featureConfigurator.toolbar.new.status.explanation "Bilah alat yang rapi untuk tempat tombol yang terkait dengan pesan dalam jangkauan jemari Anda.">
 
 <!-- LOCALIZATION NOTE (featureConfigurator.toolbar.original.status): The word 'original' is chosen deliberately to be neutral, vs. 'old' which in English at least had a negative connotation.-->
 <!ENTITY featureConfigurator.toolbar.original "Gunakan tombol Bilah Alat Anda seperti sebelumnya">
 <!ENTITY featureConfigurator.toolbar.original.status.explanation "Tambahkan Tombol Pesan Baru pada tombol bilah alat sekarang.">
 
 <!ENTITY featureConfigurator.toolbarBenefits.para "Aksi untuk pesan seperti misalnya balas dan teruskan telah dipindahkan dari bilah alat ke bagian atas pesan itu sendiri. Pemindahan ini berguna untuk menyesuaikan tempat tombol aksi kepada tempat yang lebih cocok serta melebarkan tempat pada bilah alat untuk kotak pencarian yang lebih canggih, serta mungkin tombol untuk pengaya.">
 
+<!-- LOCALIZATION NOTE (featureConfigurator.addOn.downloading): The text to display while downloading the addon. -->
+<!ENTITY featureConfigurator.addOn.downloading "Mengunduh…">
+
 <!-- LOCALIZATION NOTE (featureConfigurator.addOn.installing): The text to display while installing the addon. -->
 <!ENTITY featureConfigurator.addOn.installing "Memasang…">
 
 <!-- LOCALIZATION NOTE (featureConfigurator.addOn.installed): The text to display after the user installs the addon from the configurator. -->
 <!ENTITY featureConfigurator.addOn.installed "Terpasang">
 
+<!-- LOCALIZATION NOTE (featureConfigurator.addOn.failure): The text to display when there is a problem installing the addon. -->
+<!ENTITY featureConfigurator.addOn.failure "Ada masalah saat memasang ekstensi ini!">
+
 <!-- LOCALIZATION NOTE (featureConfigurator.addOn.alreadyInstalled): The label to display when the addon is already installed. -->
 <!ENTITY featureConfigurator.addOn.alreadyInstalled "Ekstensi ini telah terpasang.">
 
 <!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.heading): The heading for the Compact Header page. -->
 <!ENTITY featureConfigurator.collapsedHeaders.heading "Header Kompak">
 
 <!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.para.weak): The paragraph to display if the user hadn't previously used the collapsed headers feature. -->
 <!ENTITY featureConfigurator.collapsedHeaders.para.weak "Tampilan pembacaan pesan kompak telah dijadikan menjadi pengaya tersendiri untuk lebih memudahkan dengan selera masing-masing pengguna.">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -1,19 +1,29 @@
 <!ENTITY messengerWindow.title "Email &amp; Newsgroup">
 <!ENTITY titledefault.label    "&brandFullName;">
 <!ENTITY titleSeparator.label " - ">
 
 <!-- File Menu -->
 <!ENTITY newFolderCmd.label "Folder…">
 <!ENTITY newFolderCmd.accesskey "F">
-<!ENTITY closeTabCmd.label "Tutup Tab">
-<!ENTITY closeTabCmd.accesskey "u">
-<!ENTITY closeOtherTabsCmd.label "Tutup Tab Lainnya">
-<!ENTITY closeOtherTabsCmd.accesskey "L">
+<!ENTITY closeTabCmd2.label "Tutup Tab">
+<!ENTITY closeTabCmd2.accesskey "u">
+<!ENTITY closeOtherTabsCmd2.label "Tutup Tab Lainnya">
+<!ENTITY closeOtherTabsCmd2.accesskey "L">
+<!ENTITY recentlyClosedTabsCmd.label "Tab yang Baru Ditutup">
+<!ENTITY recentlyClosedTabsCmd.accesskey "B">
+
+<!ENTITY undoCloseTabCmd.commandkey "T">
+<!-- LOCALIZATION NOTE (moveToNewWindow.label):
+     Menu option to cause the current tab to be migrated to a new Thunderbird
+     window.
+     -->
+<!ENTITY moveToNewWindow.label "Pindahkan ke Jendela Baru">
+<!ENTITY moveToNewWindow.accesskey "J">
 <!ENTITY newVirtualFolderCmd.label "Pencarian Tersimpan…">
 <!ENTITY newVirtualFolderCmd.accesskey "c">
 <!ENTITY newOtherAccountsCmd.label "Akun Lainnya…">
 <!ENTITY newOtherAccountsCmd.accesskey "L">
 <!ENTITY newEmailAccountCmd.label "Akun Email…">
 <!ENTITY newEmailAccountCmd.accesskey "E">
 <!ENTITY openMessageFileCmd.label "Buka Pesan Tersimpan…">
 <!ENTITY openMessageFileCmd.accesskey "P">
@@ -21,17 +31,16 @@
 <!ENTITY openAttachmentCmd.accesskey "L">
 <!ENTITY saveAsMenu.label "Simpan sebagai">
 <!ENTITY saveAsMenu.accesskey "S">
 <!ENTITY saveAsFileCmd.label "Berkas">
 <!ENTITY saveAsFileCmd.accesskey "B">
 <!ENTITY saveAsFileCmd.key "s">
 <!ENTITY saveAsTemplateCmd.label "Templat">
 <!ENTITY saveAsTemplateCmd.accesskey "T">
-<!ENTITY getNewMsgCmd.key "t">
 <!ENTITY getNewMsgForCmd.label "Ambil Pesan Baru untuk">
 <!ENTITY getNewMsgForCmd.accesskey "A">
 <!ENTITY getAllNewMsgCmdPopupMenu.label "Semua Akun">
 <!ENTITY getAllNewMsgCmdPopupMenu.accesskey "a">
 <!ENTITY getNewMsgCurrentAccountCmdPopupMenu.label "Akun Terpilih">
 <!ENTITY getNewMsgCurrentAccountCmdPopupMenu.accesskey "T">
 <!ENTITY getNextNMsgCmd.label "Ambil 500 Pesan News Berikutnya">
 <!ENTITY getNextNMsgCmd.accesskey "m">
@@ -310,16 +319,17 @@ you can use these alternative items. Oth
 <!ENTITY goBackCmd.accesskey "M">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY prevStarredMsgCmd.label "Pesan Berbintang">
 <!ENTITY prevStarredMsgCmd.accesskey "B">
 <!ENTITY folderMenu.label "Folder">
 <!ENTITY folderMenu.accesskey "O">
 <!ENTITY thisFolder.label "Folder Ini">
 <!ENTITY thisFolder.accesskey "F">
+<!ENTITY goRecentlyClosedTabs.label "Tab yang Baru Saja Ditutup">
 <!ENTITY startPageCmd.label "Laman Beranda">
 <!ENTITY startPageCmd.accesskey "L">
 
 <!-- Message Menu -->
 <!ENTITY msgMenu.label "Pesan">
 <!ENTITY msgMenu.accesskey "P">
 <!ENTITY newMsgCmd.label "Pesan Baru">
 <!ENTITY newMsgCmd.accesskey "B">
@@ -388,22 +398,21 @@ you can use these alternative items. Oth
 <!ENTITY tagCmd4.key "4">
 <!ENTITY tagCmd5.key "5">
 <!ENTITY tagCmd6.key "6">
 <!ENTITY tagCmd7.key "7">
 <!ENTITY tagCmd8.key "8">
 <!ENTITY tagCmd9.key "9">
 <!ENTITY markMenu.label "Tandai">
 <!ENTITY markMenu.accesskey "T">
+<!ENTITY toggleReadCmd.key "m">
 <!ENTITY markAsReadCmd.label "Sudah Dibaca">
 <!ENTITY markAsReadCmd.accesskey "d">
-<!ENTITY markAsReadCmd.key "m">
 <!ENTITY markAsUnreadCmd.label "Belum Dibaca">
 <!ENTITY markAsUnreadCmd.accesskey "u">
-<!ENTITY markAsUnreadCmd.key "m">
 <!ENTITY markThreadAsReadCmd.label "Utas Dibaca">
 <!ENTITY markThreadAsReadCmd.accesskey "b">
 <!ENTITY markThreadAsReadCmd.key "r">
 <!ENTITY markReadByDateCmd.label "Sudah Dibaca berdasarkan Tanggal…">
 <!ENTITY markReadByDateCmd.accesskey "T">
 <!ENTITY markReadByDateCmd.key "c">
 <!ENTITY markAllReadCmd.label "Dibaca Semua">
 <!ENTITY markAllReadCmd.accesskey "S">
@@ -503,17 +512,16 @@ you can use these alternative items. Oth
 <!ENTITY tagButton.label "Tag">
 <!ENTITY compactButton.label "Padatkan">
 
 <!-- Mail Toolbar Tooltips-->
 <!ENTITY advancedButton.tooltip "Pencarian pesan khusus">
 <!ENTITY getMsgButton.tooltip "Ambil pesan baru">
 <!ENTITY getAllNewMsgCmd.label "Ambil Semua Pesan Baru">
 <!ENTITY getAllNewMsgCmd.accesskey "A">
-<!ENTITY getAllNewMsgCmd.key "t">
 <!ENTITY newMsgButton.tooltip "Buat pesan baru">
 <!ENTITY replyButton.tooltip "Balas pesan ini">
 <!ENTITY replyAllButton.tooltip "Balas kepada pengirim dan semua penerima">
 <!ENTITY replyListButton.tooltip "Balas kepada milis">
 <!ENTITY forwardButton.tooltip "Teruskan pesan terpilih">
 <!ENTITY fileButton.tooltip "Simpan pesan terpilih sebagai berkas ">
 <!ENTITY archiveButton.tooltip "Arsipkan pesan terpilih">
 <!ENTITY nextButton.tooltip "Pindah ke pesan yang belum dibaca selanjutnya">
@@ -735,22 +743,24 @@ you can use these alternative items. Oth
 
 <!-- Remote Content Bar -->
 <!ENTITY remoteContentMessage2.label "Untuk melindungi privasi Anda, kandungan daring pada pesan ini telah diblokir.">
 <!ENTITY loadRemoteContentButton3.label "Tampilkan Kandungan Daring">
 
 <!-- Phishing Bar -->
 <!ENTITY phishingBarMessage2.label "Pesan ini mungkin berisi penipuan (scam).">
 <!ENTITY removePhishingBarButton1.label "Abaikan Peringatan">
+<!ENTITY disablePhishingWarning1.label "Nonaktifkan deteksi penipuan untuk semua pesan">
 <!ENTITY reportPhishingError1.label "Tampaknya pesan ini bukan pesan berisi penipuan.">
 
 <!-- MDN Bar -->
-<!ENTITY mdnBarMessage.label "Pengirim pesan telah meminta untuk diberitahu ketika Anda membaca pesan ini. Anda ingin memberi tahu pengirim?">
-<!ENTITY mdnBarIgnoreButton.label "Abaikan Permintaan">
-<!ENTITY mdnBarSendButton.label "Kirimkan Pemberitahuan">
+<!ENTITY mdnBarIgnoreButton2.label "Abaikan">
+<!ENTITY mdnBarIgnoreButton2.accesskey "i">
+<!ENTITY mdnBarSendButton2.label "Kirimkan Pemberitahuan Telah Dibaca">
+<!ENTITY mdnBarSendButton2.accesskey "n">
 
 <!-- Quick Search Bar -->
 <!-- LOCALIZATION NOTE (quickSearchCmd.key):
      This is actually the key used for the global message search box; we have
      not changed 
      -->
 <!ENTITY quickSearchCmd.key "k">
 <!-- LOCALIZATION NOTE (searchAllMessages.label.base):
@@ -795,29 +805,26 @@ you can use these alternative items. Oth
 <!ENTITY CopyNewsgroupName.accesskey "n">
 <!ENTITY CopyNewsgroupURL.label "Salin URL Newsgroup">
 <!ENTITY CopyNewsgroupURL.accesskey "U">
 <!ENTITY CreateFilterFrom.label "Buat Filter Dari…">
 <!ENTITY CreateFilterFrom.accesskey "B">
 <!ENTITY reportPhishingURL.label "Laporkan Email Penipuan (Scam)">
 <!ENTITY reportPhishingURL.accesskey "o">
 
+<!-- Spell checker context menu items -->
+<!ENTITY spellAddDictionaries.label "Tambah Kamus…">
+<!ENTITY spellAddDictionaries.accesskey "K">
+
+
 <!-- Content Pane Context Menu -->
 <!ENTITY saveLinkAsCmd.label "Simpan Tautan dengan Nama…">
 <!ENTITY saveLinkAsCmd.accesskey "T">
 <!ENTITY saveImageAsCmd.label "Simpan Gambar dengan Nama…">
 <!ENTITY saveImageAsCmd.accesskey "G">
-<!ENTITY cutCmd.label "Potong">
-<!ENTITY cutCmd.accesskey "P">
-<!ENTITY copyCmd.label "Salin">
-<!ENTITY copyCmd.accesskey "S">
-<!ENTITY pasteCmd.label "Tempel">
-<!ENTITY pasteCmd.accesskey "T">
-<!ENTITY selectAllCmd.label "Pilih Semua">
-<!ENTITY selectAllCmd.accesskey "a">
 <!ENTITY copyLinkCmd.label "Salin Lokasi Tautan">
 <!ENTITY copyLinkCmd.accesskey "S">
 <!ENTITY copyImageAllCmd.label "Salin Gambar">
 <!ENTITY copyImageAllCmd.accesskey "G">
 <!ENTITY copyEmailCmd.label "Salin Alamat Email">
 <!ENTITY copyEmailCmd.accesskey "E">
 <!ENTITY stopCmd.label "Stop">
 <!ENTITY stopCmd.accesskey "S">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -318,31 +318,57 @@ newsAcctType=News
 
 # LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
 nocachedbodytitle=<TITLE>Pindah ke Mode Daring untuk Menampilkan Pesan Ini</TITLE>\n
 
 # mailWindowOverlay.js
 confirmUnsubscribeTitle=Konfirmasi Berhenti Langganan
 confirmUnsubscribeText=Yakin akan berhenti berlangganan dari %S?
 confirmUnsubscribeManyText=Yakin akan berhenti berlangganan dari semua newsgroup ini?
+restoreAllTabs=Pulihkan Semua Tab
 
 # msgHdrViewOverlay.js
 openLabel=Buka
 openLabelAccesskey=B
 saveLabel=Simpan sebagai…
 saveLabelAccesskey=S
 detachLabel=Pisahkan…
 detachLabelAccesskey=h
 deleteLabel=Hapus
 deleteLabelAccesskey=H
 deleteAttachments=Lampiran berikut akan dihapus dari pesan secara permanen:\n%S\nProses ini tidak dapat dibatalkan. Yakin akan melanjutkan?
 detachAttachments=Lampiran berikut telah sukses disimpan dan akan dihapus dari pesan secara permanen:\n%S\nProses ini tidak dapat dibatalkan. Yakin akan melanjutkan?
 deleteAttachmentFailure=Gagal menghapus lampiran terpilih.
 emptyAttachment=Tampaknya lampiran ini tidak berisi.\nSilakan periksa ulang dengan pengirimnya.\nSeringkali firewall kantor atau program antivirus menghancurkan isi lampiran.
 
+# LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+# #1 number of attachments
+attachmentCount=#1 lampiran;#1 lampiran
+
+# LOCALIZATION NOTE (attachmentCountSingle): This is the format for the
+# attachment header when a message has only one attachment. This is separate
+# from attachmentCount above, since attachmentCountSingle typically ends with a
+# colon.
+attachmentCountSingle=1 lampiran:
+
+# LOCALIZATION NOTE (attachmentSizeUnknown): The string to show for the total
+# size of all attachments when none of the attachments' sizes can be detected.
+attachmentSizeUnknown=ukuran tidak diketahui
+
+# LOCALIZATION NOTE (attachmentSizeAtLeast): The string to show for the total
+# size of all attachments when at least one (but not all) of the attachments'
+# sizes can't be detected. %1$S is the formatted size.
+attachmentSizeAtLeast=paling tidak %1$S
+
+# LOCALIZATION NOTE (attachmentNameAndSize): This is the format for a single
+# item in the attachment list. %1$S is the attachment's filename, and %2$S is
+# the attachment's size
+attachmentNameAndSize=%1$S (%2$S)
+
 # This is the format for prepending accesskeys to the
 # each of the attachments in the file|attachments menu:
 #   ie: 1 file.txt
 #       2 another file.txt
 attachmentDisplayNameFormat=%S %S
 
 # This is the heading for the attachment summary when printing an email
 attachmentsPrintHeader=Lampiran:
@@ -355,19 +381,25 @@ 104=Sambungan ke server %S kehabisan wak
 
 recipientSearchCriteria=Subjek atau Penerima mengandung:
 fromSearchCriteria=Subjek atau Dari mengandung:
 
 # LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages  
 biffNotification_message=ada %1$S pesan baru
 biffNotification_messages=ada %1$S pesan baru
 
-# LOCALIZATION NOTE(biffNotification): %1$S is the name of the account %2$S is the number of new messages  
-newBiffNotification_message=%1$S ada %2$S pesan baru
-newBiffNotification_messages=%1$S ada %2$S pesan baru
+# LOCALIZATION NOTE(newMailNotification_message): %1$S is the name of the account %2$S is the number of new messages  
+newMailNotification_message=ada %2$S pesan baru di %1$S
+
+# LOCALIZATION NOTE(newMailNotification_messages): %1$S is the name of the account %2$S is the number of new messages  
+newMailNotification_messages=ada %2$S pesan baru di %1$S
+
+# LOCALIZATION NOTE(newMailNotification_messagetitle): %1$S is subject of new message and %2$S is sender of new message.
+# This is UNIX only
+newMailNotification_messagetitle=%1$S dari %2$S
 
 # LOCALIZATION NOTE(macBiffNotification is Mac only):
 #  %1$S is the number of new messages
 #  %2$S is a list of names and/or email addresses separated by biffNotification_separator
 #  %3$S is the number of new messages not displayed in the biff alert
 macBiffNotification_message=%1$S pesan baru dari %2$S.
 macBiffNotification_messages=%1$S pesan baru dari %2$S.
 macBiffNotification_messages_extra=%1$S pesan baru dari %2$S dan %3$S lainnya.
@@ -468,16 +500,21 @@ moveToFolderAgainAccessKey=L
 # should have the same value as moveToFolderAgainAccessKey as they are the same menu item in the UI
 # copyToFolderAgainAccessKey should also be a letter that occurs before %1$S
 copyToFolderAgain=Ulangi Salin ke "%1$S"
 copyToFolderAgainAccessKey=U
 
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
 alwaysLoadRemoteContentForSender2= Selalu muat kandungan daring dari %1$S 
 
+#LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
+mdnBarMessageNormal=%1$S meminta diberitahu saat Anda membaca pesan ini.
+#LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
+mdnBarMessageAddressDiffers=%1$S meminta diberitahu (lewat %2$S) saat Anda membaca pesan ini.
+
 # Strings for growl notifications on Mac OS X
 growlNotification=Email Baru
 
 # mailCommands.js
 emptyJunkTitle=Konfirmasi
 emptyJunkMessage=Yakin akan menghapus semua pesan dan subfolder dalam folder Junk secara permanen?
 emptyJunkDontAsk=Jangan tanya lagi.
 emptyTrashTitle=Konfirmasi
@@ -632,8 +669,32 @@ lwthemeInstallRequest.message=Situs ini 
 lwthemeInstallRequest.allowButton=Izinkan
 lwthemeInstallRequest.allowButton.accesskey=I
 
 lwthemePostInstallNotification.message=Tema baru telah dipasang.
 lwthemePostInstallNotification.undoButton=Batalkan
 lwthemePostInstallNotification.undoButton.accesskey=B
 lwthemePostInstallNotification.manageButton=Kelola Tema…
 lwthemePostInstallNotification.manageButton.accesskey=K
+
+# safeModeRestart
+safeModeRestartPromptTitle=Mulai Ulang dengan Pengaya Dinonaktifkan
+safeModeRestartPromptMessage=Yakin akan menonaktifkan semua pengaya dan memulai ulang?
+safeModeRestartButton=Mulai Ulang
+
+# Check for Updates in the About Dialog - button labels and accesskeys
+# LOCALIZATION NOTE - all of the following update buttons labels will only be
+# displayed one at a time. So, if a button is displayed nothing else will
+# be displayed alongside of the button. The button when displayed is located
+# directly under the Thunderbird version in the about dialog (see bug 596813 for
+# screenshots).
+update.checkInsideButton.label=Periksa Versi Baru
+update.checkInsideButton.accesskey=V
+update.resumeButton.label=Lanjutkan Mengunduh %S…
+update.resumeButton.accesskey=L
+update.openUpdateUI.applyButton.label=Pasang Versi Baru…
+update.openUpdateUI.applyButton.accesskey=P
+update.restart.applyButton.label=Pasang Versi Baru
+update.restart.applyButton.accesskey=P
+update.openUpdateUI.upgradeButton.label=Mutakhirkan Sekarang Juga…
+update.openUpdateUI.upgradeButton.accesskey=M
+update.restart.upgradeButton.label=Mutakhirkan Sekarang Juga
+update.restart.upgradeButton.accesskey=M
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -296,16 +296,21 @@ messageAttachmentSafeName=Pesan Terlampi
 ## String used for attachment pretty name, when attachment is message part
 partAttachmentSafeName=Bagian Pesan Terlampir
 
 # LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of attachments
 attachmentCount=#1 lampiran;#1 lampiran
 
+# LOCALIZATION NOTE (attachmentNameAndSize): This is the format for a single
+# item in the attachment list. %1$S is the attachment's filename, and %2$S is
+# the attachment's size
+attachmentNameAndSize=%1$S (%2$S)
+
 ## String used by the Initialization Error dialog
 initErrorDlogTitle=Penyunting Pesan
 initErrorDlgMessage=Kesalahan terjadi saat membuat jendela pembuat pesan. Silakan coba lagi.
 
 ## Strings used by Save as Draft/Template dialog
 SaveDialogTitle=Simpan Pesan
 ## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
 SaveDialogMsg=Pesan Anda telah disimpan dalam folder %1$S di bawah %2$S.
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -188,22 +188,26 @@
 <!ENTITY saveButton.label "Simpan">
 
 <!-- Mail Toolbar Tooltips -->
 <!ENTITY sendButton.tooltip "Kirim pesan ini sekarang juga"> 
 <!ENTITY sendlaterButton.tooltip "Kirim pesan ini nanti"> 
 <!ENTITY quoteButton.tooltip "Kutip pesan sebelumnya"> 
 <!ENTITY addressButton.tooltip "Pilih penerima dari Buku Alamat"> 
 <!ENTITY attachButton.tooltip "Sertakan lampiran"> 
+<!ENTITY spellingButton.tooltip "Periksa ejaan pada teks yang dipilih atau isi pesan keseluruhan">
 <!ENTITY saveButton.tooltip "Simpan pesan ini"> 
 <!ENTITY cutButton.tooltip              "Potong">
 <!ENTITY copyButton.tooltip             "Salin">
 <!ENTITY pasteButton.tooltip            "Tempel">
 
 <!-- Headers -->
+<!--LOCALIZATION NOTE headersSpace.style is for aligning  the From:, To: and
+    Subject: rows. It should be larger than the largest Header label  -->
+<!ENTITY headersSpace.style "width: 9em;">
 <!ENTITY fromAddr.label "Dari:">
 <!ENTITY fromAddr.accesskey "r">
 <!ENTITY toAddr.label "Kepada:"> 
 <!ENTITY ccAddr.label "Cc:"> 
 <!ENTITY bccAddr.label "Bcc:"> 
 <!ENTITY replyAddr.label "Balas Kepada:"> 
 <!ENTITY newsgroupsAddr.label "Newsgroup:"> 
 <!ENTITY followupAddr.label "Lanjutkan Kepada:"> 
@@ -257,11 +261,15 @@
 <!ENTITY renameAttachment.accesskey "G">
 <!ENTITY selectAll.label "Pilih Semua">
 <!ENTITY selectAll.accesskey "a">
 <!ENTITY attachFile.label "Lampirkan berkas…">
 <!ENTITY attachFile.accesskey "L">
 <!ENTITY attachPage.label "Lampirkan Laman Web…">
 <!ENTITY attachPage.accesskey "W">
 
+<!-- Spell checker context menu items -->
+<!ENTITY spellAddDictionaries.label "Tambah Kamus…">
+<!ENTITY spellAddDictionaries.accesskey "K">
+
 <!-- Title for the address picker panel -->
 <!ENTITY addressesSidebarTitle.label "Kenalan">
 
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -99,24 +99,48 @@
 <!ENTITY otherActionsPrint.label "cetak…">
 <!ENTITY otherActionsPrint.accesskey "c">
 
 <!ENTITY openAttachmentCmd.label    "Buka">
 <!ENTITY openAttachmentCmd.accesskey    "B">
 <!ENTITY saveAsAttachmentCmd.label    "Simpan dengan Nama…">
 <!ENTITY saveAsAttachmentCmd.accesskey    "a">
 <!ENTITY detachAttachmentCmd.label    "Pisahkan…">
+<!ENTITY detachAttachmentCmd.accesskey    "p…">
 <!ENTITY deleteAttachmentCmd.label    "Hapus">
+<!ENTITY deleteAttachmentCmd.accesskey    "H">
 <!ENTITY openAllAttachmentsCmd.label    "Buka Semua…">
 <!ENTITY openAllAttachmentsCmd.accesskey    "m">
 <!ENTITY saveAllAttachmentsCmd.label    "Simpan Semua…">
 <!ENTITY saveAllAttachmentsCmd.accesskey    "S">
 <!ENTITY detachAllAttachmentsCmd.label    "Pisahkan Semua…">
 <!ENTITY detachAllAttachmentsCmd.accesskey    "s">
 <!ENTITY deleteAllAttachmentsCmd.label    "Hapus Semua…">
 <!ENTITY deleteAllAttachmentsCmd.accesskey    "e">
 
+<!-- Attachment toolbar items -->
+<!ENTITY saveAttachmentButton.label       "simpan">
+<!ENTITY saveAttachmentButton.tooltip     "simpan berkas terlampir">
+<!ENTITY saveAllAttachmentsButton.label   "simpan semua">
+<!ENTITY saveAllAttachmentsButton.tooltip "simpan semua berkas terlampir">
+<!ENTITY openAttachmentMenuItem.label     "buka">
+<!ENTITY openAttachmentMenuItem.accesskey    "b">
+<!ENTITY saveAsAttachmentMenuItem.label    "simpan dengan nama…">
+<!ENTITY saveAsAttachmentMenuItem.accesskey    "s">
+<!ENTITY detachAttachmentMenuItem.label    "pisahkan…">
+<!ENTITY detachAttachmentMenuItem.accesskey    "n">
+<!ENTITY deleteAttachmentMenuItem.label    "hapus">
+<!ENTITY deleteAttachmentMenuItem.accesskey    "h">
+<!ENTITY openAllAttachmentsMenuItem.label    "buka semua…">
+<!ENTITY openAllAttachmentsMenuItem.accesskey    "m">
+<!ENTITY saveAllAttachmentsMenuItem.label    "simpan semua…">
+<!ENTITY saveAllAttachmentsMenuItem.accesskey    "s">
+<!ENTITY detachAllAttachmentsMenuItem.label    "pisahkan semua…">
+<!ENTITY detachAllAttachmentsMenuItem.accesskey    "p">
+<!ENTITY deleteAllAttachmentsMenuItem.label    "hapus semua…">
+<!ENTITY deleteAllAttachmentsMenuItem.accesskey    "u">
+
 <!ENTITY copyLinkCmd.label        "Salin Lokasi Tautan">
 <!ENTITY copyLinkCmd.accesskey    "S">
 
 <!ENTITY CopyMessageId.label "Salin ID-Pesan">
 <!ENTITY OpenMessageForMsgId.label "Buka Pesan dengan ID">
 <!ENTITY OpenBrowserWithMsgId.label "Buka Program Peramban dengan ID-Pesan">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/safeMode.dtd
@@ -0,0 +1,55 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+#if 0
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is mozilla.org Code.
+   -
+   - The Initial Developer of the Original Code is Mike Connor.
+   - Portions created by the Initial Developer are Copyright (C) 2005
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Mike Connor <mconnor@steelgryphon.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+#endif
+   - ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY safeModeDialog.title         "&brandShortName; Mode Aman">
+<!ENTITY window.width                 "37em">
+
+<!ENTITY safeModeDescription.label    "&brandShortName; sedang berjalan dalam Mode Aman, yang akan mematikan sementara pengaturan kesukaan, tema, dan ekstensi.">
+<!ENTITY safeModeDescription2.label   "Anda dapat membuat perubahan berikut menjadi permanen:">
+
+<!ENTITY disableAddons.label          "Matikan semua Pengaya">
+<!ENTITY disableAddons.accesskey      "M">
+
+<!ENTITY resetToolbars.label          "Setel ulang bilah alat dan kontrol">
+<!ENTITY resetToolbars.accesskey      "k">
+
+<!ENTITY changeAndRestartButton.label "Simpan Perubahan dan Mulai Ulang">
+<!ENTITY changeAndRestartButton.accesskey "M">
+
+<!ENTITY continueButton.label         "Lanjutkan dalam Mode Aman">
+<!ENTITY continueButton.accesskey         "A">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/taskbar.properties
@@ -0,0 +1,4 @@
+taskbar.tasks.composeMessage.label=Write new message
+taskbar.tasks.composeMessage.description=Write a new message.
+taskbar.tasks.openAddressBook.label=Open address book
+taskbar.tasks.openAddressBook.description=Open your address book.
deleted file mode 100644
--- a/mail/chrome/messenger/vcard.properties
+++ /dev/null
@@ -1,355 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# The following are used by the vcard content type handler to
-# to emit header display in HTML
-#
-
-# Out of memory
-## @name VCARD_OUT_OF_MEMORY
-## @loc None
--1000=Aplikasi kehabisan memori.
-
-# VCARD_LDAP_REGION
-## @name VCARD_LDAP_REGION
-## @loc None
-1001=Status
-
-# VCARD_LDAP_DOM_TYPE
-## @name VCARD_LDAP_DOM_TYPE
-## @loc None
-1002=Domestik
-
-# VCARD_LDAP_INTL_TYPE
-## @name VCARD_LDAP_INTL_TYPE
-## @loc None
-1003=Internasional
-
-# VCARD_LDAP_POSTAL_TYPE
-## @name VCARD_LDAP_POSTAL_TYPE
-## @loc None
-1004=Pos
-
-# VCARD_LDAP_PARCEL_TYPE
-## @name VCARD_LDAP_PARCEL_TYPE
-## @loc None
-1005=Parsel
-
-# VCARD_LDAP_WORK_TYPE
-## @name VCARD_LDAP_WORK_TYPE
-## @loc None
-1006=Kantor
-
-# VCARD_LDAP_HOME_TYPE
-## @name VCARD_LDAP_HOME_TYPE
-## @loc None
-1007=Rumah
-
-# VCARD_LDAP_PREF_TYPE
-## @name VCARD_LDAP_PREF_TYPE
-## @loc None
-1008=Disukai
-
-# VCARD_LDAP_VOICE_TYPE
-## @name VCARD_LDAP_VOICE_TYPE
-## @loc None
-1009=Suara
-
-# VCARD_LDAP_FAX_TYPE
-## @name VCARD_LDAP_FAX_TYPE
-## @loc None
-1010=Fax
-
-# VCARD_LDAP_MSG_TYPE
-## @name VCARD_LDAP_MSG_TYPE
-## @loc None
-1011=Pesan
-
-# VCARD_LDAP_CELL_TYPE
-## @name VCARD_LDAP_CELL_TYPE
-## @loc None
-1012=Handphone
-
-# VCARD_LDAP_PAGER_TYPE
-## @name VCARD_LDAP_PAGER_TYPE
-## @loc None
-1013=Pager
-
-# VCARD_LDAP_BBS_TYPE
-## @name VCARD_LDAP_BBS_TYPE
-## @loc None
-1014=BBS
-
-# VCARD_LDAP_MODEM_TYPE
-## @name VCARD_LDAP_MODEM_TYPE
-## @loc None
-1015=Modem
-
-# VCARD_LDAP_CAR_TYPE
-## @name VCARD_LDAP_CAR_TYPE
-## @loc None
-1016=Mobil
-
-# VCARD_LDAP_ISDN_TYPE
-## @name VCARD_LDAP_ISDN_TYPE
-## @loc None
-1017=ISDN
-
-# VCARD_LDAP_VIDEO_TYPE
-## @name VCARD_LDAP_VIDEO_TYPE
-## @loc None
-1018=Video
-
-# VCARD_LDAP_AOL_TYPE
-## @name VCARD_LDAP_AOL_TYPE
-## @loc None
-1019=AOL
-
-# VCARD_LDAP_APPLELINK_TYPE
-## @name VCARD_LDAP_APPLELINK_TYPE
-## @loc None
-1020=Applelink
-
-# VCARD_LDAP_ATTMAIL_TYPE
-## @name VCARD_LDAP_ATTMAIL_TYPE
-## @loc None
-1021=AT&T Mail
-
-# VCARD_LDAP_CSI_TYPE
-## @name VCARD_LDAP_CSI_TYPE
-## @loc None
-1022=Compuserve
-
-# VCARD_LDAP_EWORLD_TYPE
-## @name VCARD_LDAP_EWORLD_TYPE
-## @loc None
-1023=eWorld
-
-# VCARD_LDAP_INTERNET_TYPE
-## @name VCARD_LDAP_INTERNET_TYPE
-## @loc None
-1024=Internet
-
-# VCARD_LDAP_IBMMAIL_TYPE
-## @name VCARD_LDAP_IBMMAIL_TYPE
-## @loc None
-1025=IBM Mail
-
-# VCARD_LDAP_MCIMAIL_TYPE
-## @name VCARD_LDAP_MCIMAIL_TYPE
-## @loc None
-1026=MCI Mail
-
-# VCARD_LDAP_POWERSHARE_TYPE
-## @name VCARD_LDAP_POWERSHARE_TYPE
-## @loc None
-1027=Powershare
-
-# VCARD_LDAP_PRODIGY_TYPE
-## @name VCARD_LDAP_PRODIGY_TYPE
-## @loc None
-1028=Prodigy
-
-# VCARD_LDAP_TLX_TYPE
-## @name VCARD_LDAP_TLX_TYPE
-## @loc None
-1029=Telex
-
-# VCARD_LDAP_MIDDLE_NAME
-## @name VCARD_LDAP_MIDDLE_NAME
-## @loc None
-1030=Nama Tambahan
-
-# VCARD_LDAP_NAME_PREFIX
-## @name VCARD_LDAP_NAME_PREFIX
-## @loc None
-1031=Prefiks
-
-# VCARD_LDAP_NAME_SUFFIX
-## @name VCARD_LDAP_NAME_SUFFIX
-## @loc None
-1032=Suffiks
-
-# VCARD_LDAP_TZ
-## @name VCARD_LDAP_TZ
-## @loc None
-1033=Zona Waktu
-
-# VCARD_LDAP_GEO
-## @name VCARD_LDAP_GEO
-## @loc None
-1034=Posisi Geografis
-
-# VCARD_LDAP_SOUND
-## @name VCARD_LDAP_SOUND
-## @loc None
-1035=Suara
-
-# VCARD_LDAP_REVISION
-## @name VCARD_LDAP_REVISION
-## @loc None
-1036=Revisi
-
-# VCARD_LDAP_VERSION
-## @name VCARD_LDAP_VERSION
-## @loc None
-1037=Versi
-
-# VCARD_LDAP_KEY
-## @name VCARD_LDAP_KEY
-## @loc None
-1038=Kunci Publik
-
-# VCARD_LDAP_LOGO
-## @name VCARD_LDAP_LOGO
-## @loc None
-1039=Logo
-
-# VCARD_LDAP_BIRTHDAY
-## @name VCARD_LDAP_BIRTHDAY
-## @loc None
-1040=Ulang Tahun
-
-# VCARD_LDAP_X400
-## @name VCARD_LDAP_X400
-## @loc None
-1041=X400
-
-# VCARD_LDAP_ADDRESS
-## @name VCARD_LDAP_ADDRESS
-## @loc None
-1042=Alamat
-
-# VCARD_LDAP_LABEL
-## @name VCARD_LDAP_LABEL
-## @loc None
-1043=Label
-
-# VCARD_LDAP_MAILER
-## @name VCARD_LDAP_MAILER
-## @loc None
-1044=Mailer
-
-# VCARD_LDAP_ROLE
-## @name VCARD_LDAP_ROLE
-## @loc None
-1045=Peran
-
-# VCARD_LDAP_UPDATEURL
-## @name VCARD_LDAP_UPDATEURL
-## @loc None
-1046=Diperbarui Dari
-
-# VCARD_LDAP_COOLTALKADDRESS
-## @name VCARD_LDAP_COOLTALKADDRESS
-## @loc None
-1047=Alamat Pertemuan
-
-# VCARD_LDAP_USEHTML
-## @name VCARD_LDAP_USEHTML
-## @loc None
-1048=Email HTML
-
-# VCARD_MSG_ADD_TO_ADDR_BOOK
-## @name VCARD_MSG_ADD_TO_ADDR_BOOK
-## @loc None
-1049=Tambahkan ke Buku Alamat Pribadi
-
-# VCARD_ADDR_ADDINFO
-## @name VCARD_ADDR_ADDINFO
-## @loc None
-1050=Informasi Lainnya:
-
-# VCARD_ADDR_VIEW_COMPLETE_VCARD
-## @name VCARD_ADDR_VIEW_COMPLETE_VCARD
-## @loc None
-1051=Tampilkan Kartu Nama Lengkap
-
-# VCARD_ADDR_VIEW_CONDENSED_VCARD
-## @name VCARD_ADDR_VIEW_CONDENSED_VCARD
-## @loc None
-1052=Tampilkan Kartu Nama Ringkas
-
-# VCARD_ADDR_CONFINFO
-## @name VCARD_ADDR_CONFINFO
-## @loc None
-1053=Alamat Pertemuan
-
-# VCARD_ADDR_DEFAULT_DLS
-## @name VCARD_ADDR_DEFAULT_DLS
-## @loc None
-1054=Server Direktori Default
-
-# VCARD_ADDR_SPECIFIC_DLS
-## @name VCARD_ADDR_SPECIFIC_DLS
-## @loc None
-1055=Server Direktori Khusus
-
-# VCARD_ADDR_HOSTNAMEIP
-## @name VCARD_ADDR_HOSTNAMEIP
-## @loc None
-1056=Alamat IP atau Nama Host
-
-# VCARD_LDAP_PHONE_NUMBER
-## @name VCARD_LDAP_PHONE_NUMBER
-## @loc None
-1057=Nomor Telepon
-
-# VCARD_LDAP_PHOTOGRAPH
-## @name VCARD_LDAP_PHOTOGRAPH
-## @loc None
-1058=Foto
-
-# VCARD_LDAP_EMAIL_ADDRESS
-## @name VCARD_LDAP_EMAIL_ADDRESS
-## @loc None
-1059=Email
-
-# VCARD_LDAP_SURNAME
-## @name VCARD_LDAP_SURNAME
-## @loc None
-1060=Nama Belakang
-
-# VCARD_LDAP_GIVEN_NAME
-## @name VCARD_LDAP_GIVEN_NAME
-## @loc None
-1061=Nama Depan
-
-# VCARD_LDAP_SECRETARY
-## @name VCARD_LDAP_SECRETARY
-## @loc None
-1062=Asisten
--- a/mail/chrome/overrides/netError.dtd
+++ b/mail/chrome/overrides/netError.dtd
@@ -166,8 +166,11 @@ button is included here (instead of netE
 functionality specific to firefox. -->
 
 <!ENTITY securityOverride.warningContent "
 <p>Sebaiknya Anda tidak menambahkan pengecualian jika Anda sedang menggunakan jaringan internet yang tidak Anda percayai atau jika umumnya Anda tidak pernah melihat peringatan sejenis tentang server ini.</p>
 
 <button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
 <button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>
 ">
+
+<!ENTITY remoteXUL.title "XUL Daring">
+<!ENTITY remoteXUL.longDesc "<p><ul><li>Hubungi pemilik situs web untuk memberitahukan masalah ini.</li></ul></p>">
--- a/other-licenses/branding/thunderbird/brand.dtd
+++ b/other-licenses/branding/thunderbird/brand.dtd
@@ -1,5 +1,5 @@
 <!ENTITY  brandShortName        "Thunderbird">
 <!ENTITY  brandFullName         "Mozilla Thunderbird">
 <!ENTITY  vendorShortName       "Mozilla">
-<!ENTITY  logoTrademark         "Mozilla Thunderbird dan logo Thunderbird
+<!ENTITY  trademarkInfo.part1   "Mozilla Thunderbird dan logo Thunderbird
                                  merupakan merek dagang Mozilla Foundation.">