--- a/browser/chrome/browser/migration/migration.dtd
+++ b/browser/chrome/browser/migration/migration.dtd
@@ -16,16 +16,18 @@
 <!ENTITY importFromNothing.label        "Jangan impor apa pun">
 <!ENTITY importFromNothing.accesskey    "J">
 <!ENTITY importFromSafari.label         "Safari">
 <!ENTITY importFromSafari.accesskey     "S">
 <!ENTITY importFromCanary.label         "Chrome Canary">
 <!ENTITY importFromCanary.accesskey     "n">
 <!ENTITY importFromChrome.label         "Chrome">
 <!ENTITY importFromChrome.accesskey     "C">
+<!ENTITY importFromChromeBeta.label     "Chrome Beta">
+<!ENTITY importFromChromeDev.label      "Chrome Dev">
 <!ENTITY importFromChromium.label       "Chromium">
 <!ENTITY importFromChromium.accesskey   "u">
 <!ENTITY importFromFirefox.label        "Firefox">
 <!ENTITY importFromFirefox.accesskey    "x">
 <!ENTITY importFrom360se.label          "360 Secure Browser">
 <!ENTITY importFrom360se.accesskey      "3">
 
 <!ENTITY noMigrationSources.label       "Tidak ada program yang berisi markah, riwayat atau sandi yang bisa ditemukan.">

--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -57,21 +57,22 @@ available. -->
 <!ENTITY connectionSettings.accesskey    "S">
 
 <!ENTITY httpCache.label                 "Konten Web Tembolok">
 
 <!--  Site Data section manages sites using Storage API and is under Network -->
 <!ENTITY siteData.label                  "Data Situs">
 <!ENTITY clearSiteData.label             "Bersihkan Semua Data">
 <!ENTITY clearSiteData.accesskey         "B">
+<!ENTITY siteDataSettings.label          "Pengaturan…">
+<!ENTITY siteDataSettings.accesskey      "u">
 <!ENTITY siteData1.label                 "Kuki dan Data Situs">
 <!ENTITY clearSiteData1.label            "Hapus Data…">
 <!ENTITY clearSiteData1.accesskey        "l">
-<!ENTITY siteDataSettings.label          "Pengaturan…">
-<!ENTITY siteDataSettings.accesskey      "u">
+<!ENTITY siteDataSettings1.label         "Kelola Data…">
 <!ENTITY siteDataLearnMoreLink.label     "Pelajari lebih lanjut">
 
 <!-- LOCALIZATION NOTE:
   The entities limitCacheSizeBefore.label and limitCacheSizeAfter.label appear on a single
   line in preferences as follows:
 
   &limitCacheSizeBefore.label [textbox for cache size in MB] &limitCacheSizeAfter.label;
 -->

--- a/browser/chrome/browser/sitePermissions.properties
+++ b/browser/chrome/browser/sitePermissions.properties
@@ -1,26 +1,28 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (state.current.allowed,
 #                    state.current.allowedForSession,
 #                    state.current.allowedTemporarily,
 #                    state.current.blockedTemporarily,
-#                    state.current.blocked):
+#                    state.current.blocked,
+#                    state.current.hide):
 # This label is used to display active permission states in the site
 # identity popup (which does not have a lot of screen space).
 state.current.allowed = Diizinkan
 state.current.allowedForSession = Sesi Diizinkan
 state.current.allowedTemporarily = Diizinkan sementara
 state.current.blockedTemporarily = Diblokir Sementara
 state.current.blocked = Diblokir
 state.current.prompt = Tanyakan Selalu
 
+
 # LOCALIZATION NOTE (state.multichoice.alwaysAsk,
 #                    state.multichoice.allow,
 #                    state.multichoice.allowForSession,
 #                    state.multichoice.block):
 # Used to label permission state checkboxes in the page info dialog.
 state.multichoice.alwaysAsk = Tanyakan Selalu
 state.multichoice.allow = Izinkan
 state.multichoice.allowForSession = Izinkan Sesi
@@ -34,9 +36,10 @@ permission.microphone.label = Menggunaka
 permission.screen.label = Bagikan Layar
 permission.install.label = Memasang Pengaya
 permission.popup.label = Membuka Jendela Sembulan
 permission.geo.label = Mengakses Data Lokasi Anda
 permission.shortcuts.label = Timpa Pintasan Papan Ketik
 permission.focus-tab-by-prompt.label = Pindah ke Tab ini
 permission.persistent-storage.label = Simpan Data di Penyimpanan Persisten
 permission.canvas.label = Ekstrak Data Canvas
+permission.flash-plugin.label = Jalankan Adobe Flash
 permission.midi.label = Akses Peranti MIDI

--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -96,16 +96,17 @@ unknownFailure = Dicekal: kode kegagalan
 d3d11layersCrashGuard = Compositor D3D11
 d3d11videoCrashGuard = Pendekode Video D3D11
 d3d9videoCrashGuard = Pendekode Video D3D9
 glcontextCrashGuard = OpenGL
 resetOnNextRestart = Setel Ulang pada Mulai Ulang Berikutnya
 gpuProcessKillButton = Matikan Proses GPU
 gpuDeviceResetButton = Picu Pengaturan Ulang Perangkat
 
+
 audioBackend = Backend Audio
 maxAudioChannels = Kanal Maksimal
 channelLayout = Tata Letak Saluran Pilihan
 sampleRate = Tingkat Sampel Pilihan
 
 minLibVersions = Versi minimum diharapkan
 loadedLibVersions = Versi yang digunakan
 
@@ -151,8 +152,13 @@ wheelWarning = input wheel asinkron dino
 touchWarning = input sentuh asinkron dinonaktifkan karena preferensi yang tidak didukung: %S
 
 # LOCALIZATION NOTE Strings explaining why a feature is or is not available.
 disabledByBuild = dinonaktifkan oleh build
 enabledByDefault = diaktifkan secara baku
 disabledByDefault = dinonaktifkan secara baku
 enabledByUser = diaktifkan pengguna
 disabledByUser = dinonaktifkan oleh pengguna
+
+# LOCALIZATION NOTE Strings representing the status of the Enterprise Policies engine.
+policies.inactive = Tidak Aktif
+policies.active = Aktif
+policies.error = Galat