sync mail with beta
authorRomi Hardiyanto <romihardiyanto@gmail.com>
Mon, 05 Dec 2011 23:24:54 +0100
changeset 463 55431815186c0ad4b110c3cb95c3f0f4df7487ce
parent 416 0beb10736d2b491fd8288a61a2f91ab258861fdb
child 464 38efe74eadcf9ac089708ad5e66f2a414633a3c3
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:55:50 +0000
sync mail with beta
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/dialogs/EditorImageProperties.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/addressbook/abDirTreeOverlay.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/am-main.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/multimessageview.dtd
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/telemetry.properties
mail/feedback/main.dtd
mail/feedback/main.properties
mail/installer/custom.properties
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -63,21 +63,16 @@
 
 <!ENTITY publishCmd.label "Terbitkan">
 <!ENTITY publishCmd.accesskey "T">
 <!ENTITY publishCmd.key "S">
 <!ENTITY publishAsCmd.label "Terbitkan dengan Nama…">
 <!ENTITY publishAsCmd.accesskey "n">
 <!ENTITY saveAsChangeEncodingCmd.label "Simpan dan Ubah Pengodean Karakter">
 <!ENTITY saveAsChangeEncodingCmd.accesskey "e">
-<!ENTITY printSetupCmd.label "Tata Laman…">
-<!ENTITY printSetupCmd.accesskey "T">
-<!ENTITY printCmd.label "Cetak…">
-<!ENTITY printCmd.accesskey "C">
-<!ENTITY printCmd.key "p">
 
 <!-- Edit menu items -->
 <!ENTITY editMenu.label "Ubah">
 <!ENTITY editMenu.accesskey "U">
 <!ENTITY pasteNoFormatting.label "Tempel tanpa Format">
 <!ENTITY pasteNoFormatting.accesskey "o">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Tempel Sebagai">
--- a/editor/ui/chrome/dialogs/EditorImageProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorImageProperties.dtd
@@ -96,15 +96,18 @@
 <!ENTITY topBottomEditField.label "Atas dan Bawah:">
 <!ENTITY topBottomEditField.accessKey "A">
 <!ENTITY borderEditField.label "Pita Tepian Padat:">
 <!ENTITY borderEditField.accessKey "t">
 
 <!-- These controls are in the Link Box -->
 <!ENTITY showImageLinkBorder.label "Tampilkan pita tepian di sekeliling gambar dengan tautan">
 <!ENTITY showImageLinkBorder.accessKey "B">
+<!ENTITY LinkAdvancedEditButton.label "Edit Lanjutan Tautan…">
+<!ENTITY LinkAdvancedEditButton.accessKey "L">
+<!ENTITY LinkAdvancedEditButton.tooltip "Tambah atau modifikasi atribut HTML, gaya, dan JavaScript">
 
 <!-- These tabs are currently used in the image input dialog -->
 <!ENTITY imageInputTab.label "Form">
 <!ENTITY imageLocationTab.label "Lokasi">
 <!ENTITY imageDimensionsTab.label "Dimensi">
 <!ENTITY imageAppearanceTab.label "Tampilan">
 <!ENTITY imageLinkTab.label "Tautan">
--- a/mail/chrome/messenger/AccountWizard.dtd
+++ b/mail/chrome/messenger/AccountWizard.dtd
@@ -1,18 +1,18 @@
 <!-- Entities for AccountWizard -->
 
 <!ENTITY windowTitle.label "Penuntun Pembuatan Akun">
 <!ENTITY accountWizard.size "width: 45em; height: 38em;">
 
 <!-- Entities for Account Type page -->
 
-<!ENTITY accountSetupInfo.label "Untuk menerima pesan, Anda diwajibkan membuat sebuah akun Email atau Newsgroup.">
+<!ENTITY accountSetupInfo2.label "Untuk menerima pesan, Anda diwajibkan membuat sebuah akun.">
 <!ENTITY accountTypeTitle.label "Membuat Akun Baru">
-<!ENTITY accountTypeDesc.label "Penuntun ini akan mengumpulkan informasi yang dibutuhkan untuk mengatur akun Email atau Newsgroup. Jika Anda tidak mengetahui informasi yang diminta, silakan hubungi Administrator Sistem atau Internet Service Provider Anda.">
+<!ENTITY accountTypeDesc2.label "Penuntun ini akan mengumpulkan informasi yang dibutuhkan untuk mengatur akun. Jika Anda tidak mengetahui informasi yang diminta, silakan hubungi Administrator Sistem atau Internet Service Provider Anda.">
 <!ENTITY accountTypeDirections.label "Pilih jenis akun yang ingin Anda atur:">
 <!ENTITY accountTypeMail.label "Akun email">
 <!ENTITY accountTypeMail.accesskey "m">
 <!ENTITY accountTypeNews.label "Akun newsgroup">
 <!ENTITY accountTypeNews.accesskey "w">
 
 <!-- Entities for Identity page -->
 
deleted file mode 100644
--- a/mail/chrome/messenger/addressbook/abDirTreeOverlay.dtd
+++ /dev/null
@@ -1,37 +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 Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- 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 ***** -->
-<!ENTITY dirTreeHeader.label               "Daftar Buku Alamat">  
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -74,16 +74,18 @@
 <!ENTITY propertiesCmd.accesskey                        "i">
 <!ENTITY propertiesCmd.key                              "i">
 
 <!-- View Menu -->
 <!ENTITY viewMenu.label                                 "Tampilan">
 <!ENTITY viewMenu.accesskey                             "T">
 <!ENTITY viewToolbarsMenu.label                         "Bilah Alat">
 <!ENTITY viewToolbarsMenu.accesskey                     "t"> 
+<!ENTITY menubarCmd.label 								"Bilah Menu">
+<!ENTITY menubarCmd.accesskey 							"M">
 <!ENTITY showAbToolbarCmd.label                         "Bilah Alat Buku Alamat">
 <!ENTITY showAbToolbarCmd.accesskey                     "B">
 <!ENTITY showTaskbarCmd.label                           "Bilah Status">
 <!ENTITY showTaskbarCmd.accesskey                       "S">
 <!ENTITY customizeToolbar.label                         "Suka-suka…">
 <!ENTITY customizeToolbar.accesskey                     "S">
 <!ENTITY showContactPane.label                          "Panel Ringkasan Data Kenalan">
 <!ENTITY showContactPane.accesskey                      "k">
--- a/mail/chrome/messenger/am-main.dtd
+++ b/mail/chrome/messenger/am-main.dtd
@@ -6,16 +6,17 @@
 <!ENTITY identityTitle.label "Identitas Default">
 <!ENTITY identityDesc.label "Setiap akun memiliki satu identitas. Identitas ini akan digunakan oleh orang lain untuk mengenali Anda saat mereka membaca pesan Anda.">
 <!ENTITY name.label "Nama Anda:">
 <!ENTITY name.accesskey "a">
 <!ENTITY email.label "Alamat Email:">
 <!ENTITY email.accesskey "E">
 <!ENTITY replyTo.label "Alamat Balasan:">
 <!ENTITY replyTo.accesskey "B">
+<!ENTITY replyTo.placeholder "Penerima akan membalas ke alamat yang berbeda ini">
 <!ENTITY organization.label "Organisasi:">
 <!ENTITY organization.accesskey "O">
 <!ENTITY signatureText.label "Teks untuk Tanda Tangan:">
 <!ENTITY signatureText.accesskey "T">
 <!ENTITY signatureHtml.label "Gunakan HTML (misalnya., &lt;b&gt;tebal&lt;/b&gt;)">
 <!ENTITY signatureHtml.accesskey "L">
 <!ENTITY signatureFile.label "Sertakan tanda tangan dari berkas (berkas teks, HTML, atau gambar):">
 <!ENTITY signatureFile.accesskey "H">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -116,16 +116,18 @@
 <!ENTITY undoMarkAllCmd.label "Batalkan Menandai Sudah Dibaca">
 <!ENTITY redoMarkAllCmd.label "Ulangi Menandai Sudah Dibaca">
 <!ENTITY undoDefaultCmd.label "Batal">
 <!ENTITY undoDefaultCmd.accesskey "B">
 <!ENTITY redoDefaultCmd.label "Ulangi">
 <!ENTITY redoDefaultCmd.accesskey "U">
 
 <!-- View Menu -->
+<!ENTITY menubarCmd.label "Bilah Menu">
+<!ENTITY menubarCmd.accesskey "M">
 <!ENTITY showMessengerToolbarCmd.label "Bilah Alat Email">
 <!ENTITY showMessengerToolbarCmd.accesskey "t">
 <!ENTITY customizeToolbar.label "Kesukaan…">
 <!ENTITY customizeToolbar.accesskey "K">
 
 <!ENTITY messagePaneLayoutStyle.label "Tata Letak">
 <!ENTITY messagePaneLayoutStyle.accesskey "T">
 <!ENTITY messagePaneClassic.label "Tampilan Klasik">
@@ -266,16 +268,18 @@ you can use these alternative items. Oth
 <!ENTITY fullZoomToggleCmd.label        "Perbesar Teks Saja">
 <!ENTITY fullZoomToggleCmd.accesskey    "T">
 <!ENTITY fullZoom.label                 "Perbesaran">
 <!ENTITY fullZoom.accesskey             "P">
 
 <!ENTITY pageSourceCmd.label "Kode Sumber Pesan">
 <!ENTITY pageSourceCmd.accesskey "P">
 <!ENTITY pageSourceCmd.key "u">
+<!ENTITY getNewMessagesCmd.key "y">
+<!ENTITY getAllNewMessagesCmd.key "Y">
 
 <!-- Search Menu -->
 <!ENTITY findMenu.label "Cari">
 <!ENTITY findMenu.accesskey "C">
 <!ENTITY findCmd.label "Cari dalam Isi Pesan…">
 <!ENTITY findCmd.accesskey "C">
 <!ENTITY findCmd.key "f">
 <!ENTITY findAgainCmd.label "Cari Lagi">
@@ -493,22 +497,24 @@ you can use these alternative items. Oth
 <!ENTITY replyListButton.label "Balas ke Milis">
 <!ENTITY forwardButton.label "Teruskan">
 <!ENTITY fileButton.label "Berkas">
 <!ENTITY archiveButton.label "Arsipkan">
 <!ENTITY nextButton.label "Lanjut">
 <!ENTITY previousButton.label "Sebelumnya">
 <!ENTITY backButton1.label "Mundur">
 <!ENTITY goForwardButton1.label "Maju">
+<!ENTITY deleteItem.title "Hapus">
 <!ENTITY deleteButton.label "Hapus">
 <!ENTITY undeleteButton.label "Kembalikan">
 <!ENTITY markButton.label "Tandai">
 <!ENTITY printButton.label "Cetak">
 <!ENTITY stopButton.label "Berhenti">
 <!ENTITY throbberItem.title "Indikator Aktivitas">
+<!ENTITY junkItem.title "Junk">
 <!ENTITY junkButton.label "Junk">
 <!ENTITY notJunkButton.label "Bukan Junk">
 <!ENTITY addressBookButton.label "Buku Alamat">
 <!ENTITY glodaSearch.title "Pencarian Global">
 <!ENTITY searchItem.title "Cari Cepat">
 <!ENTITY mailViewsToolbarItem.title "Tampilan Email">
 <!ENTITY folderLocationToolbarItem.title "Lokasi Folder">
 <!ENTITY tagButton.label "Tag">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -354,21 +354,16 @@ attachmentCountSingle=1 lampiran:
 # 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:
@@ -694,8 +689,30 @@ 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
+
+# missing plugin installer
+missingpluginsMessage.title=Plugin tambahan diperlukan untuk menampilkan semua media di laman ini.
+missingpluginsMessage.button.label=Pasang Plugin yang Belum Tersedia…
+missingpluginsMessage.button.accesskey=P
+outdatedpluginsMessage.title=Beberapa plugin yang digunakan pada laman ini telah usang.
+outdatedpluginsMessage.updateButton.label=Perbarui Plugin…
+outdatedpluginsMessage.updateButton.accesskey=u
+blockedpluginsMessage.title=Plugin yang dibutuhkan laman ini telah diblokir untuk perlindungan Anda.
+blockedpluginsMessage.infoButton.label=Detail…
+blockedpluginsMessage.infoButton.accesskey=D
+blockedpluginsMessage.searchButton.label=Periksa Versi Baru Plugin…
+blockedpluginsMessage.searchButton.accesskey=V
+crashedpluginsMessage.title=Plugin %S berhenti bekerja tiba-tiba.
+crashedpluginsMessage.reloadButton.label=Muat ulang laman
+crashedpluginsMessage.reloadButton.accesskey=M
+crashedpluginsMessage.submitButton.label=Kirim laporan crash
+crashedpluginsMessage.submitButton.accesskey=c
+crashedpluginsMessage.learnMore=Pelajari Lebih Lanjut…
+carbonFailurePluginsMessage.message=Laman ini membutuhkan plugin yang hanya dapat berjalan dalam mode 32-bit
+carbonFailurePluginsMessage.restartButton.label=Mulai ulang dalam mode 32-bit
+carbonFailurePluginsMessage.restartButton.accesskey=u
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -296,21 +296,16 @@ 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.
 
 ## String used if a file to attach does not exist when passed as
 ## a command line argument
 errorFileAttachTitle=Lampiran Berkas
 ## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -87,16 +87,18 @@
 <!ENTITY findPrevCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.accesskey "S"> 
 
 <!-- View Menu -->
 <!ENTITY viewMenu.label "Tampilan"> 
 <!ENTITY viewMenu.accesskey "T">
 <!ENTITY viewToolbarsMenuNew.label "Bilah Alat"> 
 <!ENTITY viewToolbarsMenuNew.accesskey "t"> 
+<!ENTITY menubarCmd.label "Bilah Menu">
+<!ENTITY menubarCmd.accesskey "M">
 <!ENTITY showCompositionToolbarCmd.label "Bilah Alat Komposisi">
 <!ENTITY showCompositionToolbarCmd.accesskey "K">
 <!ENTITY showFormattingBarCmd.label "Bilah Format">
 <!ENTITY showFormattingBarCmd.accesskey "F">
 <!ENTITY showTaskbarCmd.label "Bilah Status">
 <!ENTITY showTaskbarCmd.accesskey "S">
 <!ENTITY customizeToolbar.label "Suka-suka…">
 <!ENTITY customizeToolbar.accesskey "S">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -30,80 +30,80 @@
  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 ***** -->
 
-<!ENTITY toField2.label "kepada ">
-<!ENTITY fromField2.label "dari ">
-<!ENTITY senderField2.label "pengirim ">
-<!ENTITY organizationField2.label "organisasi ">
-<!ENTITY replyToField2.label "balas-ke ">
+
+<!ENTITY toField3.label "Kepada ">
+<!ENTITY fromField3.label "Dari ">
+<!ENTITY senderField3.label "Pengirim ">
+<!ENTITY organizationField3.label "Organisasi ">
+<!ENTITY replyToField3.label "Balas ke ">
 
-<!ENTITY subjectField2.label "subjek ">
-<!--# LOCALIZATION NOTE (ccField2.label): DONT_TRANSLATE -->
-<!ENTITY ccField2.label "cc ">
-<!ENTITY bccField2.label "bcc ">
-<!ENTITY newsgroupsField2.label "newsgroup ">
-<!ENTITY followupToField2.label "tindak-lanjut ">
-<!ENTITY tagsHdr2.label "tag ">
-<!ENTITY dateField2.label "tanggal ">
-<!ENTITY userAgentField2.label "agen-pengguna ">
-<!ENTITY referencesField2.label "referensi ">
-<!ENTITY messageIdField2.label "id-pesan ">
-<!ENTITY inReplyToField2.label "sebagai-balasan-kepada ">
-<!ENTITY originalWebsite2.label "situs-web ">
+<!ENTITY subjectField3.label "Subjek ">
+<!ENTITY ccField3.label "Cc ">
+<!ENTITY bccField3.label "Bcc ">
+<!ENTITY newsgroupsField3.label "Newsgroup ">
+<!ENTITY followupToField3.label "Tindak lanjut ">
+<!ENTITY tagsHdr3.label "Tag ">
+<!ENTITY dateField3.label "Tanggal ">
+<!ENTITY userAgentField3.label "Agen-pengguna ">
+<!ENTITY referencesField3.label "Referensi ">
+<!ENTITY messageIdField3.label "ID pesan ">
+<!ENTITY inReplyToField3.label "Sebagai balasan kepada ">
+<!ENTITY originalWebsite3.label "Situs web ">
 
 <!ENTITY editMessageDescription.label "Pesan ini masih konsep">
-<!ENTITY editMessageButton.label "Sunting…">
-<!ENTITY hdrArchiveButton.label "arsipkan">
-<!ENTITY hdrArchiveButton.tooltip "arsipkan pesan ini">
-<!ENTITY hdrSmartReplyButton.label "balasan pintar">
-<!ENTITY hdrReplyButton.label "balas">
-<!ENTITY hdrReplyButton.tooltip "balas pesan ini">
-<!ENTITY hdrReplyAllButton.label "balas ke semua">
-<!ENTITY hdrReplyAllButton.tooltip "balas ke pengirim dan semua penerima">
-<!ENTITY hdrReplyListButton.label "balas ke milis">
-<!ENTITY hdrReplyListButton.tooltip "balas ke milis">
-<!ENTITY hdrForwardButton.label "teruskan">
-<!ENTITY hdrForwardButton.tooltip "teruskan pesan ini">
-<!ENTITY hdrJunkButton.label "junk">
-<!ENTITY hdrJunkButton.tooltip "tandai pesan ini sebagai pesan junk">
-<!ENTITY hdrTrashButton.label "hapus">
-<!ENTITY hdrTrashButton.tooltip "hapus pesan ini">
+<!ENTITY editMessageButton.label "Edit…">
+<!ENTITY hdrArchiveButton1.label "Arsipkan">
+<!ENTITY hdrArchiveButton1.tooltip "Arsipkan pesan ini">
+<!ENTITY hdrSmartReplyButton1.label "Balasan pintar">
+<!ENTITY hdrReplyButton1.label "Balas">
+<!ENTITY hdrReplyButton1.tooltip "Balas pesan ini">
+<!ENTITY hdrReplyAllButton1.label "Balas ke semua">
+<!ENTITY hdrReplyAllButton1.tooltip "Balas ke pengirim dan semua penerima">
+<!ENTITY hdrReplyListButton1.label "Balas ke milis">
+<!ENTITY hdrReplyListButton1.tooltip "Balas ke milis">
+<!ENTITY hdrForwardButton1.label "Teruskan">
+<!ENTITY hdrForwardButton1.tooltip "Teruskan pesan ini">
+<!ENTITY hdrJunkButton1.label "Junk">
+<!ENTITY hdrJunkButton1.tooltip "Tandai pesan ini sebagai pesan junk">
+<!ENTITY hdrTrashButton1.label "Hapus">
+<!ENTITY hdrTrashButton1.tooltip "Hapus pesan ini">
 
 <!ENTITY hdrViewToolbarShowFull.label "Tampilkan Ikon dan Teks">
 <!ENTITY hdrViewToolbarShowFull.accesskey "a">
 <!ENTITY hdrViewToolbarShowIcons.label "Tampilkan Ikon Saja">
 <!ENTITY hdrViewToolbarShowIcons.accesskey "i">
 <!ENTITY hdrViewToolbarShowText.label "Tampilkan Teks Saja">
 <!ENTITY hdrViewToolbarShowText.accesskey "T">
 <!ENTITY hdrViewToolbarAlwaysReplySender.label "Selalu Tampilkan Balas ke Pengirim">
 <!ENTITY hdrViewToolbarAlwaysReplySender.accesskey "p">
 
-<!ENTITY otherActionsButton.label "aksi lainnya">
-<!ENTITY otherActionsOpenConversation.label "tampilkan dalam mode percakapan">
-<!ENTITY otherActionsOpenConversation.accesskey "c">
-<!ENTITY otherActionsOpenInNewWindow.label "buka di jendela baru">
-<!ENTITY otherActionsOpenInNewWindow.accesskey "j">
-<!ENTITY otherActionsOpenInNewTab.label "buka di tab baru">
-<!ENTITY otherActionsOpenInNewTab.accesskey "t">
-<!ENTITY markAsReadMenuItem.label "tandai sudah dibaca">
-<!ENTITY markAsReadMenuItem.accesskey "c">
-<!ENTITY markAsUnreadMenuItem.label "tandai belum dibaca">
-<!ENTITY markAsUnreadMenuItem.accesskey "b">
-<!ENTITY saveAsMenuItem.label "simpan sebagai…">
-<!ENTITY saveAsMenuItem.accesskey "s">
-<!ENTITY viewSourceMenuItem.label "tampilkan kode sumber…">
-<!ENTITY viewSourceMenuItem.accesskey "s">
-<!ENTITY otherActionsPrint.label "cetak…">
-<!ENTITY otherActionsPrint.accesskey "c">
+<!ENTITY otherActionsButton1.label "Aksi Lainnya">
+<!ENTITY otherActionsOpenConversation1.label "Tampilkan dalam Mode Percakapan">
+<!ENTITY otherActionsOpenConversation1.accesskey "C">
+<!ENTITY otherActionsOpenInNewWindow1.label "Buka di Jendela Baru">
+<!ENTITY otherActionsOpenInNewWindow1.accesskey "j">
+<!ENTITY otherActionsOpenInNewTab1.label "Buka di Tab Baru">
+<!ENTITY otherActionsOpenInNewTab1.accesskey "T">
+<!ENTITY markAsReadMenuItem1.label "Tandai Sudah Dibaca">
+<!ENTITY markAsReadMenuItem1.accesskey "c">
+<!ENTITY markAsUnreadMenuItem1.label "Tandai Belum Dibaca">
+<!ENTITY markAsUnreadMenuItem1.accesskey "b">
+<!ENTITY saveAsMenuItem1.label "Simpan sebagai…">
+<!ENTITY saveAsMenuItem1.accesskey "s">
+<!ENTITY viewSourceMenuItem1.label "Tampilkan Kode Sumber">
+<!ENTITY viewSourceMenuItem1.accesskey "s">
+<!ENTITY otherActionsPrint1.label "Cetak…">
+<!ENTITY otherActionsPrint1.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">
@@ -113,35 +113,19 @@
 <!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 saveAttachmentButton1.label       "Simpan">
+<!ENTITY saveAttachmentButton1.tooltip     "Simpan berkas terlampir">
+<!ENTITY saveAllAttachmentsButton1.label   "Simpan Semua">
+<!ENTITY saveAllAttachmentsButton1.tooltip "Simpan semua berkas terlampir">
 
 <!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">
--- a/mail/chrome/messenger/multimessageview.dtd
+++ b/mail/chrome/messenger/multimessageview.dtd
@@ -1,4 +1,4 @@
 <!ENTITY window.title             "Ringkasan Pesan">
 <!ENTITY selectedmessages.label   "Pesan Terpilih">
-<!ENTITY archive.label            "arsip">
-<!ENTITY delete.label             "hapus">
+<!ENTITY archiveButton.label      "Arsipkan">
+<!ENTITY deleteButton.label       "Hapus">
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -1,16 +1,19 @@
 <!ENTITY itemGeneral.label       "Utama">
 <!ENTITY itemDisplay.label       "Baca &amp; Tampilan">
 <!ENTITY itemUpdate.label        "Pemutakhiran">
 <!ENTITY itemNetworking.label    "Jaringan &amp; Ruang Disk">
 <!ENTITY itemCertificates.label  "Sertifikat">
 
 <!-- General Settings -->
 
+<!ENTITY submitTelemetry.label         "Kirim Data Kinerja">
+<!ENTITY submitTelemetry.accesskey     "K">
+<!ENTITY telemetryInfoLink.label       "Informasi selengkapnya tentang Telemetri">
 <!ENTITY enableGlodaSearch.label       "Aktifkan Sistem Pencarian Global dan Pengindeksan Pesan">
 <!ENTITY enableGlodaSearch.accesskey   "i">
 <!ENTITY systemIntegration.label       "Integrasi dengan Sistem">
 <!ENTITY alwaysCheckDefault.label      "Periksa apakah &brandShortName; adalah pembaca email default ketika memulai">
 <!ENTITY alwaysCheckDefault.accesskey  "l">
 <!ENTITY searchIntegration.label       "Izinkan &searchIntegration.engineName; untuk pencarian pesan">
 <!ENTITY searchIntegration.accesskey   "p">
 <!ENTITY checkNow.label                "Tetapkan Sekarang">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/telemetry.properties
@@ -0,0 +1,9 @@
+# Telemetry prompt
+# LOCALIZATION NOTE (telemetryText): %1$S will be replaced by brandFullName,
+# and %2$S by the value of the toolkit.telemetry.server_owner preference.
+telemetryText = Apakah Anda ingin membantu menyempurnakan %1$S dengan cara mengirimkan data penggunaan memori, kinerja, dan kedayatanggapan secara otomatis ke %2$S?
+telemetryLinkLabel = Pelajari Lebih Lanjut
+telemetryYesButtonLabel = Ya
+telemetryYesButtonAccessKey = Y
+telemetryNoButtonLabel = Tidak
+telemetryNoButtonAccessKey = T
new file mode 100644
--- /dev/null
+++ b/mail/feedback/main.dtd
@@ -0,0 +1,36 @@
+<!ENTITY testpilot.brand.label                      "Test Pilot">
+<!-- browser window: menu and status bar -->
+<!ENTITY testpilot.settings.label                   "Pengaturan">
+<!ENTITY testpilot.settings.dataSubmission.label    "Pengiriman Data">
+<!ENTITY testpilot.settings.notifications.label     "Pemberitahuan">
+<!ENTITY testpilot.settings.notifyWhen.label        "Beritahu ketika…">
+<!ENTITY testpilot.settings.readyToSubmit.label     "Ada studi yang siap dikirim">
+<!ENTITY testpilot.settings.newStudy.label          "Ada studi baru">
+<!ENTITY testpilot.settings.hasNewResults.label     "Ada hasil baru dari sebuah studi">
+<!ENTITY testpilot.settings.alwaysSubmitData.shortLabel  "Otomatis kirimkan data saya (jangan tanya lagi)">
+<!ENTITY testpilot.allYourStudies.label             "Semua Studi Pengguna Anda">
+<!ENTITY testpilot.about.label                      "Tentang Test Pilot">
+
+<!-- all studies window -->
+<!ENTITY testpilot.studiesWindow.title                  "Studi Test Pilot Anda">
+<!ENTITY testpilot.studiesWindow.currentStudies.label   "Studi Saat Ini">
+<!ENTITY testpilot.studiesWindow.finishedStudies.label  "Studi yang Selesai">
+<!ENTITY testpilot.studiesWindow.studyFindings.label    "Hasil Studi">
+<!ENTITY testpilot.studiesWindow.settings.label         "Pengaturan">
+<!ENTITY testpilot.studiesWindow.stillLoadingMessage    "Memuat, mohon tunggu…">
+
+<!-- raw data dialog -->
+<!ENTITY testpilot.rawDataWindow.title                  "Test Pilot: Data Mentah">
+
+<!-- notification -->
+<!ENTITY testpilot.notification.close.tooltip            "Tutup">
+
+<!-- Firefox 4 beta version UI -->
+<!ENTITY testpilot.enable.label                        "Aktifkan Studi Pengguna">
+<!ENTITY testpilot.feedbackbutton.label                "Saran">
+<!ENTITY testpilot.happy.label        "Firefox Membuatku Gembira Karena…">
+<!ENTITY testpilot.sad.label          "Firefox Membuatku Sedih Karena…">
+<!ENTITY testpilot.happy.thunderbirdLabel               "Thunderbird Membuatku Gembira Karena…">
+<!ENTITY testpilot.sad.thunderbirdLabel                 "Thunderbird Membuatku Sedih Karena…">
+<!ENTITY testpilot.broken.label       "Laporkan situs ini tidak berfungsi…">
+<!ENTITY testpilot.idea.label         "Kirim gagasan Anda…">
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/mail/feedback/main.properties
@@ -0,0 +1,115 @@
+# description for add-on manager
+extensions.tbtestpilot@labs.mozilla.com.description = Bantu Firefox menjadi lebih baik dengan menjalankan pengumpulan data studi pengguna.
+
+# common
+testpilot.fullBrandName = Test Pilot Mozilla Labs
+testpilot.moreInfo = Info Selengkapnya
+testpilot.submit = Kirim
+testpilot.takeSurvey = Ikuti Survei
+
+# Feedback button menu
+testpilot.turnOn = Aktifkan Studi Pengguna
+testpilot.turnOff = Matikan Studi Pengguna
+
+# studies window
+testpilot.studiesWindow.noStudies = Kami sedang menyiapkan studi baru dan akan mampir sebentar lagi.
+testpilot.studiesWindow.uploading = Mengunggah…
+testpilot.studiesWindow.unableToReachServer = Gagal menjangkau Mozilla; silakan coba lagi nanti.
+testpilot.studiesWindow.thanksForContributing = Terima kasih telah berkontribusi!
+testpilot.studiesWindow.finishedOn = Selesai pada %S
+testpilot.studiesWindow.canceledStudy = (Anda membatalkan keikutsertaan studi ini)
+testpilot.studiesWindow.missedStudy = (Anda ketinggalan studi ini)
+testpilot.studiesWindow.willStart = Akan dimulai pada %S
+testpilot.studiesWindow.gatheringData = Saat ini sedang mengumpulkan data.
+testpilot.studiesWindow.willFinish = Akan selesai pada %S
+testpilot.studiesWindow.proposeStudy = Ajukan proposal studi Anda sendiri
+
+# for pages
+testpilot.page.commentsAndDiscussions = Komentar & Diskusi &raquo;
+testpilot.page.proposeATest = Ajukan Proposal Uji &raquo;
+testpilot.page.testpilotOnTwitter = @MozTestPilot di Twitter &raquo;
+
+# status page
+testpilot.statusPage.uploadingData = Sedang menunggah data…
+testpilot.statusPage.uploadErrorMsg = Aduh! Terjadi galat saat menyambung ke server Mozilla. Mungkinkah jaringan Anda sedang mati?
+testpilot.statusPage.willRetry = Test Pilot akan mencoba lagi secara otomatis dan Anda dapat menutup laman ini sekarang.
+testpilot.statusPage.endedAlready = (Sudah selesai dan Anda seharusnya tidak melihat laman ini)
+testpilot.statusPage.todayAt =  hari ini pada %S
+testpilot.statusPage.endOn = pada %S
+# LOCALIZATION NOTE (numExtensions): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 = number of extensions
+# example: "2 extensions"
+testpilot.statusPage.numExtensions = #1 pengaya;#1 pengaya
+testpilot.statusPage.recursEveryNumberOfDays = Uji ini berulang setiap %S hari. Setiap kali selesai:
+testpilot.statusPage.askMeBeforeSubmitData = Tanyakan apakah data saya akan dikirimkan.
+testpilot.statusPage.alwaysSubmitData = Selalu kirimkan data saya dan jangan tanya lagi.
+testpilot.statusPage.neverSubmitData = Jangan pernah kirim data saya dan jangan tanya lagi.
+testpilot.statusPage.loading = Memuat, tunggu sebentar…
+
+# quit page
+testpilot.quitPage.aboutToQuit = Anda akan keluar dari studi "%S".
+testpilot.quitPage.optionalMessage = (Opsional) Jika ada waktu sebentar, beritahu kami mengapa Anda memilih untuk keluar dari studi.
+testpilot.quitPage.reason = Alasan:
+testpilot.quitPage.recurringStudy = Studi ini berulang. Umumnya kami akan memberitahu Anda kapan kami akan menjalankan studi ini. Jika Anda tidak ingin pernah mengikuti studi ini lagi, centang kotak di bawah ini:
+testpilot.quitPage.quitForever = Keluar dari studi berulang.
+testpilot.quitPage.quitStudy = Keluar dari Studi&raquo;
+
+# welcome page
+testpilot.welcomePage.thankYou = Terima Kasih Telah Bergabung dengan Tim Test Pilot!
+testpilot.welcomePage.gettingStarted = Memulai
+testpilot.welcomePage.pleaseTake = Mohon mengikuti
+testpilot.welcomePage.backgroundSurvey = Pilot Background Survey
+testpilot.welcomePage.clickToOpenStudiesWindow = Klik di sini untuk menampilkan studi yang sedang berlangsung.
+testpilot.welcomePage.testpilotAddon = Pengaya Test Pilot
+testpilot.welcomePage.iconExplanation = « cari ikon ini di pojok kanan jendela program peramban.
+testpilot.welcomePage.iconExplanation2 = « cari ikon ini pada menu Alat.
+testpilot.welcomePage.moreIconExplanation = Anda dapat mengklik ikonnya untuk menampilkan menu utama Test Pilot.
+testpilot.welcomePage.moreIconExplanation2 = Gunakan menu untuk melihat studi Test Pilot mana yang sedang dijalankan pada komputer Anda dan untuk menyetel preferensi Anda.
+testpilot.welcomePage.notificationInfo = Ikon ini akan menyembulkan notifikasi ketika sebuah studi membutuhkan perhatian Anda.
+testpilot.welcomePage.notificationInfo2 = Ikon akan tampil dan menyembulkan notifikasi ketika sebuah studi membutuhkan perhatian Anda.
+testpilot.welcomePage.privacyPolicy = Kebijakan Privasi
+testpilot.welcomePage.legalNotices = Pernyataan Hukum
+
+# survey page
+testpilot.surveyPage.saveAnswers = Simpan Tanggapan
+testpilot.surveyPage.submitAnswers = Kirim Tanggapan
+testpilot.surveyPage.changeAnswers = Ubah Tanggapan
+testpilot.surveyPage.loading = Memuat, mohon tunggu sebentar…
+testpilot.surveyPage.thankYouForFinishingSurvey = Terima kasih telah mengikuti survei ini. Tanggapan Anda akan diunggah bersama dengan data eksperimen berikutnya.
+testpilot.surveyPage.reviewOrChangeYourAnswers = Jika Anda ingin meninjau atau mengubah tanggapan Anda, Anda dapat melakukannya kapan saja lewat tombol di bawah ini.
+
+# modules/task.js
+testpilot.finishedTask.finishedStudy = Keren! Anda telah menyelesaikan Studi %S!
+testpilot.finishedTask.allRelatedDataDeleted = Semua data yang berhubungan dengan studi ini telah dihapus dari komputer Anda.
+
+# modules/setup.js
+testpilot.notification.update = Perbarui…
+testpilot.notification.thankYouForUploadingData = Terima Kasih!
+testpilot.notification.thankYouForUploadingData.message = Thank you for uploading your data.
+testpilot.notification.readyToSubmit = Siap Mengirimkan
+testpilot.notification.readyToSubmit.message = Studi Test Pilot "%S" telah selesai mengumpulkan data dan siap dikirimkan.
+testpilot.notification.newTestPilotStudy = Studi Test Pilot Baru
+testpilot.notification.newTestPilotStudy.pre.message = Studi Test Pilot "%S" akan dimulai.
+testpilot.notification.newTestPilotSurvey = Survei Test Pilot Baru
+testpilot.notification.newTestPilotSurvey.message = Survei Test Pilot "%S" kini tersedia.
+testpilot.notification.newTestPilotResults = Hasil Test Pilot Baru
+testpilot.notification.newTestPilotResults.message = Hasil terbaru studi Test Pilot "%S" telah tersedia.
+testpilot.notification.autoUploadedData = Terima Kasih!
+testpilot.notification.autoUploadedData.message = Studi Test Pilot "%S" telah selesai dan data Anda telah dikirimkan.
+testpilot.notification.extensionUpdate = Pemutakhiran Ekstensi
+testpilot.notification.extensionUpdate.message = Salah satu studi Anda membutuhkan versi terbaru pengaya Test Pilot. Anda dapat mengambil versi terbaruinya lewat jendela Pengelola Pengaya.
+
+# modules/setup.js - doorhanger notification buttons
+testpilot.notification.cancelLabel = Batalkan Studi
+testpilot.notification.alwaysSubmitLabel = Jangan Tanya, Selalu Kirim
+testpilot.notification.dontShowNewLabel = Jangan Kabari tentang Studi Baru
+testpilot.notification.seeAllStudiesLabel = Lihat Semua Studi Pengguna
+testpilot.notification.seeYourData = Lihat Data Anda
+
+# modules/notifications.js - doorhanger notification button shortcut keys
+testpilot.notification.accessKey.submit = k
+testpilot.notification.accessKey.moreInfo = s
+testpilot.notification.accessKey.allStudies = A
+testpilot.notification.accessKey.alwaysSubmit = j
+testpilot.notification.accessKey.cancel = b
--- a/mail/installer/custom.properties
+++ b/mail/installer/custom.properties
@@ -48,17 +48,16 @@
 # being used as an accesskey.
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
 
 REG_APP_DESC=$BrandShortName adalah aplikasi pembaca email kaya fitur. $BrandShortName mendukung protokol email IMAP dan POP, serta email dalam format HTML. Fitur modern lainnya adalah pengontrol email junk, fitur RSS, pencarian cepat nan tangguh, pemeriksaan ejaan saat mengetik, kotak masuk global, serta penggunaan filter pesan yang canggih.
 CONTEXT_OPTIONS=&Pilihan komponen $BrandShortName
 CONTEXT_SAFE_MODE=&Mode Aman $BrandShortName
-SAFE_MODE=Mode Aman
 OPTIONS_PAGE_TITLE=Jenis Pemasangan
 OPTIONS_PAGE_SUBTITLE=Pilih jenis setup
 OPTIONS_MAKE_DEFAULT=&Jadikan $BrandShortName sebagai aplikasi email default saya
 SHORTCUTS_PAGE_TITLE=Atur Shortcut
 SHORTCUTS_PAGE_SUBTITLE=Buat Ikon Program
 SUMMARY_PAGE_TITLE=Ringkasan
 SUMMARY_PAGE_SUBTITLE=Siap memulai pemasangan $BrandShortName
 SUMMARY_INSTALLED_TO=$BrandShortName akan dipasang di lokasi berikut: