From 93137229bf3b04e4589ae315a81ed2de7a171ded Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Thu, 21 Mar 2019 16:35:38 +0100 Subject: fix merge conflicts with latest develop --- src/i18n/locales/id.json | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/i18n/locales/id.json') diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json index 6abbf064b..73271dceb 100644 --- a/src/i18n/locales/id.json +++ b/src/i18n/locales/id.json @@ -70,7 +70,9 @@ "menu.help.support" : "Dukungan", "menu.help.tos" : "Ketentuan Layanan", "menu.services" : "Layanan", + "menu.services.activatePreviousService" : "Activate previous service", "menu.services.addNewService" : "Tambahkan Layanan Baru...", + "menu.services.setNextServiceActive" : "Activate next service", "menu.view" : "Tampilan", "menu.view.enterFullScreen" : "Masuk ke Mode Layar Penuh", "menu.view.exitFullScreen" : "Keluar dari Layar Penuh", @@ -128,6 +130,7 @@ "settings.account.invoiceDownload" : "Unduh", "settings.account.manageSubscription.label" : "Kelola langganan Anda", "settings.account.successInfo" : "Perubahan Anda telah disimpan", + "settings.account.tryReloadServices" : "Coba lagi", "settings.account.tryReloadUserInfoRequest" : "Coba lagi", "settings.account.userInfoRequestFailed" : "Gagal memuat informasi pengguna", "settings.app.buttonClearAllCache" : "Bersihkan singgahan", @@ -140,16 +143,13 @@ "settings.app.form.beta" : "Sertakan versi beta", "settings.app.form.darkMode" : "Sisi Kelam menunggu Anda (Mode Gelap)", "settings.app.form.enableGPUAcceleration" : "Aktifkan Akselerasi GPU", - "settings.app.form.enableMenuBar" : "Tampilkan Franz di Bilah Menu", "settings.app.form.enableSpellchecking" : "Aktifkan pemeriksaan ejaan", "settings.app.form.enableSystemTray" : "Tampilkan Franz di baki sistem", - "settings.app.form.hideDockIcon" : "Sembunyikan ikon Franz di Dock", "settings.app.form.language" : "Bahasa", "settings.app.form.minimizeToSystemTray" : "Perkecil Franz ke baki sistem", "settings.app.form.runInBackground" : "Tetap jalankan Franz di latar belakang saat menutup jendela", "settings.app.form.showDisabledServices" : "Tampilkan tab layanan yang dinonaktifkan", "settings.app.form.showMessagesBadgesWhenMuted" : "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan", - "settings.app.form.spellcheckerLanguage" : "Periksa ejaan", "settings.app.headline" : "Pengaturan", "settings.app.headlineAdvanced" : "Tingkat Lanjut", "settings.app.headlineAppearance" : "Tampilan", @@ -212,8 +212,6 @@ "settings.service.form.proxy.restartInfo" : "Silahkan mulai ulang Franz setelah mengubah Setelan proxy", "settings.service.form.proxy.user" : "Pengguna (opsional)", "settings.service.form.saveButton" : "Simpan layanan", - "settings.service.form.spellcheckerLanguage" : "Periksa ejaan Bahasa", - "settings.service.form.spellcheckerLanguage.default" : "Gunakan Bawaan Sistem ({default})", "settings.service.form.tabHosted" : "Hosted", "settings.service.form.tabOnPremise" : "Hosted mandiri", "settings.service.form.team" : "Tim", @@ -223,6 +221,7 @@ "settings.services.discoverServices" : "Temukan layanan", "settings.services.headline" : "Layanan Anda", "settings.services.noServicesAdded" : "Anda belum menambahkan layanan apa pun.", + "settings.services.servicesRequestFailed" : "Could not load your services", "settings.services.tooltip.isDisabled" : "Layanan dinonaktifkan", "settings.services.tooltip.isMuted" : "Semua suara dibisukan", "settings.services.tooltip.notificationsDisabled" : "Pemberitahuan dinonaktifkan", @@ -255,9 +254,7 @@ "subscription.euTaxInfo" : "Warga UE: pajak penjualan lokal mungkin berlaku", "subscription.features.ads" : "Tanpa iklan, selamanya!", "subscription.features.comingSoon" : "segera hadir", - "subscription.features.encryptedSync" : "Sinkronisasi sesi terenkripsi", "subscription.features.noInterruptions" : "Tanpa menunggu dan ditanya untuk meningkatkan lisensi", - "subscription.features.onpremise" : "Integrasi layanan hosted, misalnya HipChat", "subscription.features.onpremise.mattermost" : "Integrasi layanan hosted, misalnya Mattermost", "subscription.features.proxy" : "Dukungan proksi untuk layanan", "subscription.features.spellchecker" : "Dukungan pengecek ejaan", @@ -280,9 +277,9 @@ "tabs.item.reload" : "Muat Ulang", "validation.email" : "{field} tidak benar", "validation.minLength" : "{field} setidaknya harus {length} karakter", + "validation.oneRequired" : "At least one is required", "validation.required" : "{field} wajib diisi", "validation.url" : "{field} bukan URL yang benar", "welcome.loginButton" : "Masuk ke akun Anda", - "welcome.signupButton" : "Buat akun gratis", - "welcome.slogan" : "Perpesanan yang bekerja untuk Anda" + "welcome.signupButton" : "Buat akun gratis" } -- cgit v1.2.3-54-g00ecf