From fe495f0380838dcd9afb9ff96dd6d91269708488 Mon Sep 17 00:00:00 2001 From: bluemeda Date: Tue, 5 Sep 2023 14:24:59 +0700 Subject: [PATCH 01/19] add translation `id` --- src/main/frontend/dicts.cljc | 6 +- src/resources/dicts/id.edn | 823 ++++++++++++++++++++++ src/resources/tutorials/dummy-notes-id.md | 14 + src/resources/tutorials/tutorial-id.md | 25 + 4 files changed, 866 insertions(+), 2 deletions(-) create mode 100644 src/resources/dicts/id.edn create mode 100644 src/resources/tutorials/dummy-notes-id.md create mode 100644 src/resources/tutorials/tutorial-id.md diff --git a/src/main/frontend/dicts.cljc b/src/main/frontend/dicts.cljc index c93ee85e087..196a5cbd5f4 100644 --- a/src/main/frontend/dicts.cljc +++ b/src/main/frontend/dicts.cljc @@ -58,7 +58,8 @@ :ko (edn-resource "dicts/ko.edn") :pl (edn-resource "dicts/pl.edn") :sk (edn-resource "dicts/sk.edn") - :uk (edn-resource "dicts/uk.edn")}) + :uk (edn-resource "dicts/uk.edn") + :id (edn-resource "dicts/id.edn")}) (def languages "List of languages presented to user" @@ -80,7 +81,8 @@ {:label "Türkçe" :value :tr} {:label "Українська" :value :uk} {:label "한국어" :value :ko} - {:label "Slovenčina" :value :sk}]) + {:label "Slovenčina" :value :sk} + {:label "Bahasa Indonesia" :value :id}]) (assert (= (set (keys dicts)) (set (map :value languages))) "List of user-facing languages must match list of dictionaries") \ No newline at end of file diff --git a/src/resources/dicts/id.edn b/src/resources/dicts/id.edn new file mode 100644 index 00000000000..7c5b3dbfdae --- /dev/null +++ b/src/resources/dicts/id.edn @@ -0,0 +1,823 @@ +{:accessibility/skip-to-main-content "Lompat ke konten utama" + :tutorial/text #resource "tutorials/tutorial-id.md" + :tutorial/dummy-notes #resource "tutorials/dummy-notes-id.md" + :on-boarding/demo-graph "Ini adalah grafik demo, perubahan tidak akan disimpan sampai Anda membuka folder lokal." + :on-boarding/add-graph "Tambahkan grafik" + :on-boarding/open-local-dir "Buka direktori lokal" + :on-boarding/new-graph-desc-1 "Logseq mendukung mode Markdown dan Org. Anda dapat membuka direktori yang sudah ada atau membuat direktori baru pada perangkat Anda, direktori juga dikenal sebagai folder. Data Anda hanya akan disimpan pada perangkat ini." + :on-boarding/new-graph-desc-2 "Setelah Anda membuka direktori Anda, ini akan membuat tiga folder dalam direktori tersebut:" + :on-boarding/new-graph-desc-3 "/journals - menyimpan halaman jurnal Anda" + :on-boarding/new-graph-desc-4 "/pages - menyimpan halaman lainnya" + :on-boarding/new-graph-desc-5 "/logseq - menyimpan konfigurasi, custom.css, dan beberapa metadata." + :on-boarding/welcome-whiteboard-modal-title "Kanvas baru untuk pikiran Anda." + :on-boarding/welcome-whiteboard-modal-description "Papan tulis adalah alat yang hebat untuk curah pendapat dan pengorganisasian. Sekarang Anda dapat menempatkan pemikiran Anda dari basis pengetahuan atau pemikiran baru di samping satu sama lain pada kanvas spasial untuk menghubungkan, mengasosiasikan, dan memahami dengan cara yang baru." + :on-boarding/welcome-whiteboard-modal-skip "Lewati" + :on-boarding/welcome-whiteboard-modal-start "Mulai menulis di papan tulis" + :on-boarding/tour-whiteboard-home "{1} Rumah untuk papan tulis Anda" + :on-boarding/tour-whiteboard-home-description "Papan tulis memiliki bagiannya sendiri di aplikasi di mana Anda dapat melihatnya sekilas, membuat yang baru, atau menghapusnya dengan mudah." + :on-boarding/tour-whiteboard-new "{1} Buat papan tulis baru" + :on-boarding/tour-whiteboard-new-description "Ada beberapa cara untuk membuat papan tulis baru. Salah satunya selalu ada di sini, di dasbor." + :on-boarding/tour-whiteboard-btn-next "Berikutnya" + :on-boarding/tour-whiteboard-btn-back "Kembali" + :on-boarding/tour-whiteboard-btn-finish "Selesai" + :on-boarding/quick-tour-btn-next "Berikutnya" + :on-boarding/quick-tour-btn-back "Kembali" + :on-boarding/quick-tour-btn-finish "Selesai" + :on-boarding/quick-tour-btn-skip "Lewati Tur Singkat" + :on-boarding/quick-tour-steps "LANGKAH " + :on-boarding/quick-tour-help-title "❓ Bantuan" + :on-boarding/quick-tour-help-desc "Anda bisa klik di sini untuk bantuan dan informasi lain tentang Logseq." + :on-boarding/quick-tour-journal-page-title "📆 Halaman Jurnal Harian" + :on-boarding/quick-tour-journal-page-desc-1 "Ini adalah halaman jurnal harian hari ini. Di sini Anda dapat menuangkan pemikiran, pembelajaran, dan ide Anda. Jangan khawatir tentang pengorganisasian. Tulis saja dan" + :on-boarding/quick-tour-journal-page-desc-2 "[[tautan]]" + :on-boarding/quick-tour-journal-page-desc-3 "pemikiran Anda." + :on-boarding/quick-tour-left-sidebar-title "👀 Bilah Sisi Kiri" + :on-boarding/quick-tour-left-sidebar-desc "Buka bilah sisi kiri untuk menjelajahi item menu penting di Logseq." + :on-boarding/quick-tour-favorites-title "⭐️ Favorit" + :on-boarding/quick-tour-favorites-desc-1 "Sematkan halaman favorit Anda melalui menu `... `di halaman mana pun." + :on-boarding/quick-tour-favorites-desc-2 "Kami juga telah menambahkan beberapa halaman template di sini untuk membantu Anda memulai. Anda dapat menghapusnya setelah Anda mulai menulis catatan Anda sendiri." + :on-boarding/command-palette-quick-tour "Tur singkat untuk orientasi" + :on-boarding/importing-main-title "Mengimpor catatan yang ada" + :on-boarding/importing-main-desc "Anda juga dapat melakukan ini nanti di aplikasi." + :on-boarding/importing-title "Apakah Anda sudah memiliki catatan yang ingin Anda impor?" + :on-boarding/importing-desc "Jika ia dalam format JSON, EDN atau Markdown, Logseq dapat bekerja dengannya." + :on-boarding/importing-roam-desc "Mengimpor Ekspor JSON dari grafik Roam Anda" + :on-boarding/importing-lsq-desc "Mengimpor EDN atau Ekspor JSON dari grafik Logseq Anda" + :on-boarding/importing-opml-desc " Mengimpor berkas OPML" + :on-boarding/main-title (fn [] ["Selamat datang di " [:strong "Logseq!"]]) + :on-boarding/main-desc "Pertama, Anda harus memilih folder di mana Logseq akan menyimpan pemikiran, ide, catatan Anda." + :on-boarding/section-btn-title "Pilih folder" + :on-boarding/section-btn-desc "Buka direktori yang ada atau Buat baru" + :on-boarding/section-title "Bagaimana Logseq menghemat pekerjaan Anda" + :on-boarding/section-desc "Di dalam direktori yang Anda pilih, Logseq akan membuat 4 folder." + :on-boarding/section-tip-1 "Setiap halaman adalah berkas yang disimpan hanya pada {1} Anda." + :on-boarding/section-tip-2 "Anda dapat memilih untuk menyinkronkannya nanti." + :on-boarding/section-assets "Grafik & Dokumen" + :on-boarding/section-computer "komputer" + :on-boarding/section-journals "Catatan harian" + :on-boarding/section-pages "HALAMAN" + :on-boarding/section-phone "telepon" + :on-boarding/section-app "APP Internal" + :on-boarding/section-config "Berkas Konfigurasi" + :query/config-property-settings "Pengaturan properti untuk kueri ini:" + :bug-report/main-title "Laporan bug" + :bug-report/clipboard-inspector-title "Pemeriksa data papan klip" + :bug-report/main-desc "Dapatkah Anda membantu kami dengan mengirimkan laporan bug? Kami akan menyelesaikannya sesegera mungkin." + :bug-report/section-clipboard-title "Apakah bug yang Anda temui terkait dengan fitur-fitur ini?" + :bug-report/section-clipboard-desc "Anda dapat menggunakan alat bantu praktis ini untuk memberikan informasi tambahan kepada kami." + :bug-report/section-clipboard-btn-title "Pembantu papan klip" + :bug-report/section-clipboard-btn-desc "Memeriksa dan mengumpulkan data papan klip" + :bug-report/section-issues-title "Atau..." + :bug-report/section-issues-desc "Jika tidak ada alat bantu yang tersedia bagi Anda untuk mengumpulkan informasi tambahan, silakan laporkan bug secara langsung." + :bug-report/section-issues-btn-title "Mengirimkan laporan bug" + :bug-report/section-issues-btn-desc "Bantu Jadikan Logseq Lebih Baik!" + :bug-report/inspector-page-desc-1 "Tekan Ctrl+V / ⌘+V untuk memeriksa data papan klip Anda" + :bug-report/inspector-page-desc-2 "atau klik di sini untuk menempelkan jika Anda menggunakan versi seluler" + :bug-report/inspector-page-placeholder "Tekan lama di sini untuk menempelkan jika Anda menggunakan ponsel" + :bug-report/inspector-page-tip "Ada yang salah? Tidak masalah, klik untuk kembali ke langkah sebelumnya." + :bug-report/inspector-page-btn-back "Kembali" + :bug-report/inspector-page-btn-copy "Salin hasilnya" + :bug-report/inspector-page-copy-notif "Disalin ke papan klip!" + :bug-report/inspector-page-btn-create-issue "Buat masalah" + :bug-report/inspector-page-desc-clipboard "Berikut ini adalah data yang dibaca dari clipboard." + :bug-report/inspector-page-desc-copy "Jika ini boleh dibagikan, klik tombol salin." + :bug-report/inspector-page-desc-create-issue "Sekarang Anda dapat melaporkan hasil yang ditempelkan ke clipboard Anda. Silakan tempelkan hasilnya di bagian 'Konteks Tambahan' dan sebutkan dari mana Anda menyalin konten asli. Terima kasih!" + :help/title-usage "Penggunaan" + :help/title-community "Komunitas" + :help/title-development "Pengembangan" + :help/title-about "Tentang" + :help/title-terms "Ketentuan" + :help/start "Memulai" + :help/about "Tentang Logseq" + :help/roadmap "Peta jalan" + :help/bug "Laporan bug" + :help/feature "Permintaan fitur" + :help/changelog "Catatan perubahan" + :help/blog "Blog Logseq" + :help/docs "Dokumentasi" + :help/privacy "Kebijakan privasi" + :help/terms "Ketentuan" + :help/forum-community "Komunitas forum" + :help/awesome-logseq "Logseq yang mengagumkan" + :help/shortcuts "Pintasan keyboard" + :help/shortcuts-triggers "Pemicu" + :help/shortcut "Pintasan" + :help/slash-autocomplete "Pelengkapan otomatis garis miring" + :help/block-content-autocomplete "Pelengkapan otomatis konten blok" + :help/reference-autocomplete "Pelengkapan otomatis referensi halaman" + :help/block-reference "Blok referensi" + :help/open-link-in-sidebar "Buka tautan di bilah sisi" + :more "Lebih lanjut" + :search/result-for "Hasil pencarian untuk " + :search/items "item" + :search/page-names "Nama halaman pencarian" + :search/recent "Pencarian terbaru:" + :search/blocks-in-page "Blok pencarian dalam halaman:" + :search/command-palette-tip-1 "Tip:" + :search/command-palette-tip-2 "Untuk membuka palet perintah" + :search/cache-outdated "Cache sudah kedaluwarsa. Silakan klik tombol 'Indeks ulang' di menu tarik-turun grafik." + :search-item/whiteboard "Papan tulis" + :search-item/page "Halaman" + :search-item/file "Berkas" + :search-item/block "Blok" + :search-item/no-result "Tidak ada hasil yang cocok" + :help/context-menu "Blokir menu konteks" + :help/markdown-syntax "Sintaks penurunan harga" + :help/org-mode-syntax "Sintaks mode org" + :bold "Cetak tebal" + :italics "Cetak miring" + :highlight "Sorot" + :strikethrough "Dicoret" + :code "Kode" + :untitled "Tanpa judul" + :right-side-bar/help "Bantuan" + :right-side-bar/switch-theme "Mode tema" + :right-side-bar/contents "Konten" + :right-side-bar/page-graph "Grafik halaman" + :right-side-bar/history "(Dev) Urungkan/Ubah riwayat" + :right-side-bar/history-undos "Urungkan" + :right-side-bar/history-redos "Pengulangan" + :right-side-bar/history-global "global" + :right-side-bar/history-pageonly "halaman saja" + :right-side-bar/block-ref "Referensi blok" + :right-side-bar/graph-view "Tampilan grafik" + :right-side-bar/all-pages "Semua halaman" + :right-side-bar/whiteboards "Papan tulis" + :right-side-bar/flashcards "Kartu flash" + :right-side-bar/new-page "Halaman baru" + :right-side-bar/show-journals "Tampilkan Jurnal" + :right-side-bar/separator "Pengatur ukuran bilah sisi kanan" + :right-side-bar/toggle-right-sidebar "Beralih ke bilah sisi kanan" + :right-side-bar/pane-close "Tutup" + :right-side-bar/pane-close-others "Tutup yang lain" + :right-side-bar/pane-close-all "Tutup semua" + :right-side-bar/pane-collapse "Menciutkan" + :right-side-bar/pane-collapse-others "Menciutkan yang lain" + :right-side-bar/pane-collapse-all "Tutup semua" + :right-side-bar/pane-expand "Memperluas" + :right-side-bar/pane-expand-all "Perluas semua" + :right-side-bar/pane-open-as-page "Buka sebagai halaman" + :right-side-bar/pane-more "Lebih banyak" + :left-side-bar/switch "Beralih ke:" + :left-side-bar/journals "Jurnal" + :left-side-bar/create "Membuat" + :left-side-bar/new-page "Halaman baru" + :left-side-bar/new-whiteboard "Papan tulis baru" + :left-side-bar/nav-favorites "Favorit" + :left-side-bar/nav-recent-pages "Halaman terbaru" + :page/something-went-wrong "Ada masalah" + :page/logseq-is-having-a-problem "Logseq mengalami masalah. Untuk mencoba mengembalikannya ke keadaan yang berfungsi, silakan coba langkah-langkah aman berikut ini secara berurutan:" + :page/step "Langkah {1}" + :page/try "Coba" + :page/slide-view "Tampilkan sebagai slide" + :page/slide-view-tip-go-fullscreen (fn [] [[:span.opacity-70 "Tip: tekan "] [:code "f"] [:span.opacity-70 " untuk masuk ke mode layar penuh"]]) + :page/delete-confirmation "Apakah Anda yakin ingin menghapus halaman ini beserta berkasnya?" + :page/open-in-finder "Buka dalam direktori" + :page/open-with-default-app "Buka dengan aplikasi default" + :page/make-public "Buat publik untuk dipublikasikan" + :page/version-history "Lihat riwayat halaman" + :page/open-backup-directory "Buka direktori cadangan halaman" + :page/make-private "Buat pribadi" + :page/delete "Hapus halaman" + :page/add-to-favorites "Tambahkan ke Favorit" + :page/unfavorite "Hapus dari Favorit" + :page/show-journals "Tampilkan jurnal" + :page/show-whiteboards "Tampilkan papan tulis" + :block/name "Nama Halaman" + :page/earlier "Lebih awal" + :page/copy-page-url "Salin URL halaman" + :page/illegal-page-name "Nama halaman tidak sah!" + :page/page-already-exists "Halaman “{1}” sudah ada!" + :page/whiteboard-to-journal-error "Halaman papan tulis tidak dapat diubah namanya menjadi judul jurnal!" + :file/name "Nama berkas" + :file/last-modified-at "Terakhir diubah pada" + :file/no-data "Tidak ada data" + :file/format-not-supported "Format .{1} tidak didukung." + :file/validate-existing-file-error "Halaman sudah ada dengan berkas lain: {1}, berkas saat ini: {2}. Harap pertahankan hanya satu dari mereka dan re-indeks grafik Anda." + :file-rn/re-index "Re-indeks sangat dianjurkan setelah berkas diubah nama dan pada perangkat lain setelah sinkronisasi." + :file-rn/need-action "Tindakan penggantian nama berkas disarankan agar sesuai dengan format baru. Re-indeks diperlukan pada semua perangkat saat berkas yang diubah nama disinkronkan." + :file-rn/or-select-actions " atau ubah nama berkas secara individual di bawah, lalu " + :file-rn/or-select-actions-2 ". Tindakan ini tidak tersedia setelah Anda menutup panel ini." + :file-rn/legend "🟢 Tindakan penggantian nama opsional; 🟡 Tindakan penggantian nama diperlukan untuk menghindari perubahan judul; 🔴 Perubahan besar." + :file-rn/close-panel "Tutup Panel" + :file-rn/all-action "Terapkan Semua Tindakan! ({1})" + :file-rn/select-format "(Opsi Mode Pengembang, Berbahaya!) Pilih format nama berkas" + :file-rn/rename "ubah nama berkas \"{1}\" menjadi \"{2}\"" + :file-rn/apply-rename "Terapkan operasi penggantian nama berkas" + :file-rn/suggest-rename "Tindakan diperlukan: " + :file-rn/otherwise-breaking "Atau judul akan menjadi" + :file-rn/no-action "Bagus! Tidak diperlukan tindakan lebih lanjut." + :file-rn/confirm-proceed "Perbarui format!" + :file-rn/select-confirm-proceed "Pengembang: tulis format" + :file-rn/unreachable-title "Peringatan! Nama halaman akan menjadi {1} dalam format nama berkas saat ini, kecuali properti title:: diatur secara manual" + :file-rn/optional-rename "Saran: " + :file-rn/format-deprecated "Anda saat ini menggunakan format yang sudah ketinggalan zaman. Diperbarui ke format terbaru sangat disarankan. Harap cadangkan data Anda dan tutup aplikasi Logseq di perangkat lain sebelum operasi ini." + :file-rn/filename-desc-1 "Pengaturan ini mengkonfigurasi bagaimana sebuah halaman disimpan ke dalam berkas Logseq menyimpan halaman ke dalam berkas dengan nama yang sama." + :file-rn/filename-desc-2 "Beberapa karakter seperti \"/\" atau \"?\" tidak valid untuk nama berkas" + :file-rn/filename-desc-3 "Logseq mengganti karakter yang tidak valid dengan ekivalen URL mereka untuk membuatnya valid (misalnya, \"?\" menjadi \"%3F\")." + :file-rn/filename-desc-4 "Pemisah ruang nama \"/\" juga diganti dengan \"___\" (tiga garis bawah) untuk pertimbangan estetika." + :file-rn/instruct-1 "Ini adalah proses 2 langkah untuk memperbarui format nama berkas:" + :file-rn/instruct-2 "1. Klik " + :file-rn/instruct-3 "2. Ikuti instruksi di bawah ini untuk mengubah nama berkas ke format baru:" + :page/created-at "Dibuat pada" + :page/updated-at "Diperbarui pada" + :page/backlinks "Tautan balik" + :linked-references/filter-search "Cari di halaman terhubung" + :editor/block-search "Cari blok" + :text/image "Gambar" + :asset/show-in-folder "Tampilkan gambar di folder" + :asset/open-in-browser "Buka gambar di peramban" + :asset/delete "Hapus gambar" + :asset/copy "Salin gambar" + :asset/maximize "Perbesar gambar" + :asset/confirm-delete "Apakah Anda yakin ingin menghapus {1} ini?" + :asset/physical-delete "Hapus juga berkasnya (perhatikan bahwa ini tidak dapat dikembalikan)" + :color/gray "Abu-abu" + :color/red "Merah" + :color/yellow "Kuning" + :color/green "Hijau" + :color/blue "Biru" + :color/purple "Ungu" + :color/pink "Merah muda" + :editor/copy "Salin" + :editor/cut "Potong" + :editor/expand-block-children "Perluas semua" + :editor/collapse-block-children "Tutup semua" + :editor/delete-selection "Hapus blok terpilih" + :editor/cycle-todo "Putar status TODO item saat ini" + :dev/show-page-data "(Dev) Tampilkan data halaman" + :dev/show-block-data "(Dev) Tampilkan data blok" + :dev/show-block-ast "(Dev) Tampilkan AST blok" + :dev/show-page-ast "(Dev) Tampilkan AST halaman" + :content/copy-export-as "Salin / Ekspor sebagai.." + :content/copy-block-url "Salin URL blok" + :content/copy-block-ref "Salin referensi blok" + :content/copy-block-emebed "Salin penanaman blok" + :content/copy-ref "Salin referensi ini" + :content/delete-ref "Hapus referensi ini" + :content/replace-with-text "Ganti dengan teks" + :content/replace-with-embed "Ganti dengan penanaman" + :content/open-in-sidebar "Buka di sidebar" + :content/click-to-edit "Klik untuk menyunting" + :context-menu/make-a-flashcard "Buat Kartu Belajar" + :context-menu/toggle-number-list "Alihkan daftar nomor" + :context-menu/preview-flashcard "Pratinjau Kartu Belajar" + :context-menu/make-a-template "Buat Templat" + :context-menu/input-template-name "Apa nama templatnya?" + :context-menu/template-include-parent-block "Termasuk blok induk dalam templat?" + :context-menu/template-exists-warning "Templat sudah ada!" + :settings-page/git-tip "Jika Anda telah mengaktifkan Sinkronisasi Logseq, Anda dapat melihat riwayat oenyuntingan halaman secara langsung. Bagian ini hanya untuk yang berpengalaman dalam teknologi." + :settings-page/git-desc-1 "Untuk melihat riwayat penyuntingan halaman, klik tiga titik horizontal di sudut kanan atas dan pilih \"Lihat riwayat halaman\"." + :settings-page/git-desc-2 "Untuk pengguna profesional, Logseq juga mendukung penggunaan " + :settings-page/git-desc-3 " untuk kontrol versi. Gunakan Git dengan risiko Anda sendiri karena masalah umum Git tidak didukung oleh tim Logseq." + :settings-page/git-switcher-label "Aktifkan komit otomatis Git" + :settings-page/git-commit-delay "Detik komit otomatis Git" + :settings-page/git-confirm "Anda perlu me-restart aplikasi setelah memperbarui pengaturan Git." + :settings-page/edit-config-edn "Sunting config.edn" + :settings-page/edit-global-config-edn "Sunting global config.edn" + :settings-page/edit-custom-css "Sunting custom.css" + :settings-page/edit-export-css "Sunting export.css" + :settings-page/edit-setting "Sunting" + :settings-page/custom-configuration "Konfigurasi kustom" + :settings-page/custom-global-configuration "Konfigurasi global kustom" + :settings-page/theme-light "terang" + :settings-page/theme-dark "gelap" + :settings-page/theme-system "sistem" + :settings-page/custom-theme "Tema kustom" + :settings-page/export-theme "Ekspor tema" + :settings-page/show-brackets "Tampilkan tanda kurung" + :settings-page/spell-checker "Pemeriksa ejaan" + :settings-page/auto-updater "Pembaruan otomatis" + :settings-page/disable-sentry "Kirim data penggunaan dan diagnosa ke Logseq" + :settings-page/disable-sentry-desc "Logseq tidak akan pernah mengumpulkan database grafik lokal Anda atau menjual data Anda." + :settings-page/preferred-outdenting "Pengaturan penyingkiran logis" + :settings-page/preferred-outdenting-tip "Sisi kiri menunjukkan penyingkiran dengan pengaturan default, dan sisi kanan menunjukkan penyingkiran logis yang diaktifkan " + :settings-page/preferred-outdenting-tip-more "→ Pelajari lebih lanjut" + :settings-page/show-full-blocks "Tampilkan semua baris referensi blok" + :settings-page/auto-expand-block-refs "Perluas referensi blok secara otomatis saat zoom-in" + :settings-page/auto-expand-block-refs-tip "Opsi ini mengontrol apakah referensi blok akan diperluas secara otomatis saat zoom-in." + :settings-page/custom-date-format "Format tanggal yang diinginkan" + :settings-page/custom-date-format-warning "Diperlukan re-indeks! Referensi jurnal yang ada akan rusak!" + :settings-page/custom-date-format-notification "Anda harus me-re-indeks grafik Anda agar perubahan ini berlaku" + :settings-page/preferred-pasting-file-hint "Ketika diaktifkan, menempelkan gambar dari internet akan mengunduh dan menyisipkan gambar. Ketika dinonaktifkan, akan menempelkan tautan ke gambar." + :settings-page/preferred-file-format "Format berkas yang diinginkan" + :settings-page/preferred-workflow "Alur kerja yang diinginkan" + :settings-page/preferred-pasting-file "Lebih suka menempelkan berkas" + :settings-page/enable-shortcut-tooltip "Aktifkan tooltip pintasan" + :settings-page/enable-timetracking "Pelacakan waktu" + :settings-page/enable-tooltip "Tooltip" + :settings-page/enable-journals "Jurnal" + :settings-page/enable-all-pages-public "Semua halaman menjadi publik saat dipublikasikan" + :settings-page/customize-shortcuts "Pintasan keyboard" + :settings-page/shortcut-settings "Sesuaikan pintasan" + :settings-page/home-default-page "Atur halaman beranda default" + :settings-page/enable-block-time "Waktu blok" + :settings-page/clear-cache "Hapus cache" + :settings-page/clear "Hapus" + :settings-page/clear-cache-warning "Menghapus cache akan menghapus grafik yang terbuka. Anda akan kehilangan perubahan yang belum disimpan." + :settings-page/developer-mode "Mode pengembang" + :settings-page/developer-mode-desc "Mode pengembang membantu kontributor dan pengembang ekstensi menguji integrasi mereka dengan Logseq dengan lebih efisien." + :settings-page/current-version "Versi saat ini" + :settings-page/tab-general "Umum" + :settings-page/tab-editor "Penyunting" + :settings-page/tab-keymap "Pemetaan tombol" + :settings-page/tab-version-control "Kontrol versi" + :settings-page/tab-account "Akun" + :settings-page/tab-advanced "Lanjutan" + :settings-page/tab-assets "Aset" + :settings-page/tab-features "Fitur" + :settings-page/plugin-system "Plugin" + :settings-page/enable-flashcards "Kartu Belajar" + :settings-page/network-proxy "Proxy jaringan" + :settings-page/filename-format "Format nama berkas" + :settings-page/alpha-features "Fitur Alpha" + :settings-page/beta-features "Fitur Beta" + :settings-page/login-prompt "Untuk mengakses fitur-fitur baru sebelum orang lain, Anda harus menjadi Sponsor atau Pendukung Logseq di Open Collective dan oleh karena itu harus masuk terlebih dahulu." + :settings-page/sync "Sinkronisasi" + :settings-page/sync-desc-1 "Klik" + :settings-page/sync-desc-2 "di sini" + :settings-page/sync-desc-3 "untuk petunjuk tentang cara menyiapkan dan menggunakan Sinkronisasi." + :settings-page/sync-diff-merge "Aktifkan penggabungan cerdas saat sinkronisasi" + :settings-page/sync-diff-merge-desc "Gabungkan pembaruan lokal dengan berkas remote secara otomatis saat terjadi konflik, daripada menimpa berkas remote." + :settings-page/sync-diff-merge-warn "Kemampuan penggabungan cerdas hanya diaktifkan pada perangkat setelah sinkronisasi pertama yang berhasil dengan server remote pada grafik dalam versi Logseq yang baru. Aktifkan ini di semua perangkat untuk mencapai pengalaman terbaik." + :settings-page/enable-whiteboards "Papan tulis" + :settings-page/native-titlebar "Bilah judul asli" + :settings-page/native-titlebar-desc "Aktifkan bilah judul jendela asli di Windows dan Linux." + :settings-page/check-for-updates "Periksa pembaruan" + :settings-page/checking "Memeriksa ..." + :settings-page/revision "Revisi: " + :settings-page/changelog "Apa yang baru?" + :settings-page/app-updated "Aplikasi Anda sudah terbaru 🎉" + :settings-page/update-available "Ditemukan rilis baru " + :settings-page/update-error-1 "⚠️ Ups, Ada Sesuatu yang Salah!" + :settings-page/update-error-2 " Silakan cek " + :settings-permission/start-granting "Berikan" + + :yes "Ya" + + :submit "Kirim" + :cancel "Batal" + :close "Tutup" + :delete "Hapus" + :save "Simpan" + :reset "Atur ulang" + :type "Jenis" + :host "Host" + :port "Port" + :re-index "Re-indeks" + :re-index-detail "Membangun ulang grafik" + :re-index-multiple-windows-warning "Anda perlu menutup jendela lain sebelum me-re-indeks grafik ini." + :re-index-discard-unsaved-changes-warning "Re-indeks akan membuang grafik saat ini, dan kemudian memproses semua berkas lagi sesuai dengan yang saat ini tersimpan di disk. Anda akan kehilangan perubahan yang belum disimpan dan ini mungkin memakan waktu. Lanjutkan?" + :open-new-window "Jendela baru" + :sync-from-local-files "Segarkan" + :sync-from-local-files-detail "Impor perubahan dari berkas lokal" + :sync-from-local-changes-detected "Segarkan mendeteksi dan memproses berkas yang diubah di disk Anda yang telah berbeda dari konten halaman Logseq saat ini. Lanjutkan?" + + :search/publishing "Cari" + :search "Cari atau buat halaman" + :whiteboard/link-whiteboard-or-block "Tautkan papan tulis/halaman/blok" + :whiteboard/align-left "Rata kiri" + :whiteboard/align-center-horizontally "Rata tengah secara horizontal" + :whiteboard/align-right "Rata kanan" + :whiteboard/distribute-horizontally "Sebarkan secara horizontal" + :whiteboard/align-top "Rata atas" + :whiteboard/align-center-vertically "Rata tengah secara vertikal" + :whiteboard/align-bottom "Rata bawah" + :whiteboard/distribute-vertically "Sebarkan secara vertikal" + :whiteboard/pack-into-rectangle "Paket ke dalam persegi panjang" + :whiteboard/zoom-to-fit "Perbesar untuk cocokkan" + :whiteboard/ungroup "Pecah kelompok" + :whiteboard/group "Kelompok" + :whiteboard/cut "Potong" + :whiteboard/copy "Salin" + :whiteboard/paste "Tempel" + :whiteboard/paste-as-link "Tempel sebagai tautan" + :whiteboard/export "Ekspor" + :whiteboard/select-all "Pilih semua" + :whiteboard/deselect-all "Batal pilih semua" + :whiteboard/lock "Kunci" + :whiteboard/unlock "Buka kunci" + :whiteboard/delete "Hapus" + :whiteboard/flip-horizontally "Putar secara horizontal" + :whiteboard/flip-vertically "Putar secara vertikal" + :whiteboard/move-to-front "Pindah ke depan" + :whiteboard/move-to-back "Pindah ke belakang" + :whiteboard/dev-print-shape-props "(Dev) Cetak properti bentuk" + :whiteboard/auto-resize "Perbesar otomatis" + :whiteboard/expand "Perluas" + :whiteboard/collapse "Ciutkan" + :whiteboard/website-url "URL situs web" + :whiteboard/reload "Muat ulang" + :whiteboard/open-website-url "Buka URL situs web" + :whiteboard/youtube-url "URL YouTube" + :whiteboard/open-youtube-url "Buka URL YouTube" + :whiteboard/twitter-url "URL Twitter" + :whiteboard/open-twitter-url "Buka URL Twitter" + :whiteboard/fill "Isi" + :whiteboard/stroke-type "Jenis garis" + :whiteboard/arrow-head "Kepala panah" + :whiteboard/bold "Tebal" + :whiteboard/italic "Miring" + :whiteboard/undo "Batal" + :whiteboard/redo "Ulang" + :whiteboard/zoom-in "Perbesar" + :whiteboard/zoom-out "Perkecil" + :whiteboard/select "Pilih" + :whiteboard/pan "Geser" + :whiteboard/add-block-or-page "Tambahkan blok atau halaman" + :whiteboard/draw "Gambar" + :whiteboard/highlight "Sorot" + :whiteboard/eraser "Penghapus" + :whiteboard/connector "Penyambung" + :whiteboard/text "Teks" + :whiteboard/color "Warna" + :whiteboard/select-custom-color "Pilih warna kustom" + :whiteboard/opacity "Keburaman" + :whiteboard/extra-small "Sangat Kecil" + :whiteboard/small "Kecil" + :whiteboard/medium "Sedang" + :whiteboard/large "Besar" + :whiteboard/extra-large "Sangat Besar" + :whiteboard/huge "Besar Sekali" + :whiteboard/scale-level "Tingkat Skala" + :whiteboard/rectangle "Persegi Panjang" + :whiteboard/circle "Lingkaran" + :whiteboard/triangle "Segitiga" + :whiteboard/shape "Bentuk" + :whiteboard/open-page "Buka halaman" + :whiteboard/open-page-in-sidebar "Buka halaman di sidebar" + :whiteboard/remove-link "Hapus tautan" + :whiteboard/link "Tautan" + :whiteboard/references "Referensi" + :whiteboard/link-to-any-page-or-block "Tautkan ke halaman atau blok apa pun" + :whiteboard/start-typing-to-search "Mulai mengetik untuk mencari..." + :whiteboard/new-block-no-colon "Blok baru" + :whiteboard/new-block "Blok baru:" + :whiteboard/new-page "Halaman baru:" + :whiteboard/new-whiteboard "Papan tulis baru" + :whiteboard/search-only-blocks "Cari hanya blok" + :whiteboard/search-only-pages "Cari hanya halaman" + :whiteboard/cache-outdated "Cache sudah ketinggalan zaman. Klik tombol 'Re-indeks' dalam menu tarik-turun grafik." + :whiteboard/shape-quick-links "Tautan Cepat Bentuk" + :whiteboard/edit-pdf "Sunting PDF" + :whiteboard/dashboard-card-new-whiteboard "Papan tulis baru" + :whiteboard/dashboard-card-created "Dibuat " + :whiteboard/dashboard-card-edited "Disunting " + :whiteboard/toggle-grid "Alihkan grid" + :whiteboard/snap-to-grid "Tetapkan ke grid" + :flashcards/modal-welcome-title "Saatnya membuat kartu!" + :flashcards/modal-welcome-desc-1 "Anda dapat menambahkan \"#card\" ke blok apa pun untuk mengubahnya menjadi kartu atau memicu \"/cloze\" untuk menambahkan beberapa cloze." + :flashcards/modal-welcome-desc-2 "Anda dapat " + :flashcards/modal-welcome-desc-3 "klik tautan ini" + :flashcards/modal-welcome-desc-4 " untuk memeriksa dokumentasinya." + :flashcards/modal-btn-show-answers "Tampilkan jawaban" + :flashcards/modal-btn-hide-answers "Sembunyikan jawaban" + :flashcards/modal-btn-show-clozes "Tampilkan cloze" + :flashcards/modal-btn-next-card "Berikutnya" + :flashcards/modal-btn-reset "Atur ulang" + :flashcards/modal-btn-reset-tip "Atur ulang kartu ini sehingga Anda dapat memeriksanya segera." + :flashcards/modal-btn-forgotten "Lupa" + :flashcards/modal-btn-remembered "Ingat" + :flashcards/modal-btn-recall "Memerlukan waktu untuk diingat" + :flashcards/modal-finished "Selamat, Anda telah meninjau semua kartu untuk pertanyaan ini, sampai jumpa berikutnya! 💯" + :flashcards/modal-select-all "Semua" + :flashcards/modal-select-switch "Beralih ke" + :flashcards/modal-current-total "Saat ini/Total" + :flashcards/modal-overdue-total "Ketinggalan/Total" + :flashcards/modal-toggle-preview-mode "Alihkan mode pratinjau" + :flashcards/modal-toggle-random-mode "Alihkan mode acak" + + :page-search "Cari di halaman ini" + :graph-search "Cari grafik" + :home "Beranda" + :new-page "Halaman baru:" + :whiteboard "Papan tulis" + :whiteboards "Papan tulis" + :new-whiteboard "Papan tulis baru:" + :new-graph "Tambahkan grafik baru" + :graph "Grafik" + :graph/persist "Logseq sedang menyinkronkan status internal, harap tunggu beberapa detik." + :graph/persist-error "Sinkronisasi status internal gagal." + :graph/save "Menyimpan..." + :graph/save-success "Tersimpan dengan sukses" + :graph/save-error "Gagal menyimpan" + :graph/all-graphs "Semua grafik" + :graph/local-graphs "Grafik lokal:" + :graph/remote-graphs "Grafik jarak jauh:" + :export "Ekspor" + :export-graph "Ekspor grafik" + :export-page "Ekspor halaman" + :export-markdown "Ekspor sebagai Markdown standar (tanpa properti blok)" + :export-opml "Ekspor sebagai OPML" + :export-public-pages "Ekspor halaman publik" + :export-json "Ekspor sebagai JSON" + :export-roam-json "Ekspor sebagai JSON Roam" + :export-edn "Ekspor sebagai EDN" + :export-transparent-background "Latar belakang transparan" + :export-copy-to-clipboard "Salin ke clipboard" + :export-copied-to-clipboard "Disalin ke clipboard!" + :export-save-to-file "Simpan ke berkas" + :all-graphs "Semua grafik" + :all-pages "Semua halaman" + :all-whiteboards "Semua papan tulis" + :all-files "Semua berkas" + :remove-orphaned-pages "Hapus halaman yang tidak terhubung?" + :all-journals "Semua jurnal" + :settings "Pengaturan" + :settings-of-plugins "Plugins" + :plugins "Plugins" + :themes "Tema" + :relaunch-confirm-to-work "Harus mengulang aplikasi untuk membuatnya berfungsi. Apakah Anda ingin me-restart sekarang?" + :import "Impor" + :importing "Mengimpor" + :join-community "Bergabung dengan komunitas" + :discourse-title "Forum kami!" + :help-shortcut-title "Klik untuk memeriksa pintasan dan tips lainnya" + :loading "Memuat..." + :parsing-files "Menganalisis berkas" + :loading-files "Memuat berkas" + :login "Masuk" + :logout "Keluar" + :logout-user "Keluar ({1})" + :download "Unduh" + :language "Bahasa" + :remove-background "Hapus latar belakang" + :remove-heading "Hapus judul" + :heading "Judul {1}" + :auto-heading "Judul otomatis" + :open-a-directory "Buka direktori lokal" + :toggle-theme "Alihkan tema" + + :help/shortcut-page-title "Pintasan Papan Ketik" + + :plugin/installed "Terpasang" + :plugin/installed-plugin "Plugin Terpasang: {1}" + :plugin/not-installed "Belum Terpasang" + :plugin/installing "Sedang Menginstal" + :plugin/install "Instal" + :plugin/reload "Muat Ulang" + :plugin/update "Perbarui" + :plugin/update-plugin "Perbarui Plugin: {1} - {2}" + :plugin/check-update "Periksa Pembaruan" + :plugin/check-all-updates "Periksa Semua Pembaruan" + :plugin/found-updates "Pembaruan Baru" + :plugin/found-n-updates "Ditemukan {1} Pembaruan" + :plugin/update-all-selected "Perbarui Semua yang Dipilih" + :plugin/all-updated "Semua Telah Diperbarui!" + :plugin/updates-downloading "Mengunduh Pembaruan" + :plugin/refresh-lists "Segarkan Daftar" + :plugin/enabled "Aktif" + :plugin/disabled "Nonaktif" + :plugin/update-available "Pembaruan Tersedia" + :plugin/updating "Sedang Memperbarui" + :plugin/uninstall "Uninstal" + :plugin/marketplace "Pasar" + :plugin/downloads "Unduhan" + :plugin/stars "Bintang" + :plugin/title "Judul ({1})" + :plugin/all "Semua" + :plugin/unpacked "Diekstrak" + :plugin/delete-alert "Apakah Anda yakin ingin menginstal plugin ini [{1}]?" + :plugin/open-settings "Buka pengaturan" + :plugin/open-package "Buka paket" + :plugin/load-unpacked "Muatkan plugin yang diekstrak" + :plugin/restart "Restart Aplikasi" + :plugin/unpacked-tips "Pilih direktori plugin" + :plugin/contribute "✨ Tulis dan kirimkan plugin baru" + :plugin/up-to-date "Ini terbaru {1}" + :plugin/custom-js-alert "Ditemukan berkas custom.js, izinkan eksekusi? (Jika Anda tidak memahami kontennya, disarankan untuk tidak mengizinkan eksekusi, yang memiliki risiko keamanan tertentu.)" + :plugin/security-warning "Plugin dapat mengakses grafik dan berkas lokal Anda, mengeluarkan permintaan jaringan. + Mereka juga dapat menyebabkan kerusakan atau kehilangan data. Kami sedang mengerjakan aturan akses yang tepat untuk grafik Anda. + Sementara itu, pastikan Anda memiliki cadangan rutin dari grafik Anda dan hanya menginstal plugin ketika Anda dapat membaca dan + mengerti kode sumbernya." + :plugin/search-plugin "Cari plugin" + :plugin/open-preferences "Buka Preferensi" + :plugin/open-logseq-dir "Buka" + :plugin/remote-error "Kesalahan jarak jauh: " + :plugin/checking-for-updates "Memeriksa pembaruan plugin ..." + :plugin/list-of-updates "Pembaruan Plugin: " + :plugin/auto-check-for-updates "Periksa otomatis pembaruan" + :plugin.install-from-file/menu-title "Instal dari plugins.edn" + :plugin.install-from-file/title "Instal plugin dari plugins.edn" + :plugin.install-from-file/notice "Plugin berikut akan menggantikan plugin Anda:" + :plugin.install-from-file/success "Semua plugin terinstal!" + :pdf/copy-ref "Salin ref" + :pdf/copy-text "Salin teks" + :pdf/linked-ref "Referensi terkait" + :pdf/toggle-dashed "Gaya putus-putus untuk sorotan area" + :pdf/hl-block-colored "Label berwarna untuk blok sorotan" + :pdf/doc-metadata "Metadata Dokumen" + + :updater/new-version-install "Versi baru telah diunduh." + :updater/quit-and-install "Mulai ulang untuk menginstal" + + :paginates/pages "Total {1} halaman" + :paginates/prev "Sebelumnya" + :paginates/next "Berikutnya" + + :tips/all-done "Semua Selesai!" + + :command-palette/prompt "Ketik perintah" + :select/default-prompt "Pilih salah satu" + :select/default-select-multiple "Pilih satu atau beberapa" + :select.graph/prompt "Pilih grafik" + :select.graph/empty-placeholder-description "Tidak ada grafik yang cocok. Apakah Anda ingin menambahkan yang lain?" + :select.graph/add-graph "Ya, tambahkan grafik lain" + + :file-sync/other-user-graph "Grafik lokal saat ini terikat ke grafik jarak jauh pengguna lain. Jadi tidak dapat memulai sinkronisasi." + :file-sync/graph-deleted "Grafik jarak jauh saat ini telah dihapus" + :file-sync/rsapi-cannot-upload-err "Tidak dapat memulai sinkronisasi, harap periksa apakah waktu lokal sudah benar." + :file-sync/connectivity-testing-failed "Pengujian koneksi jaringan gagal. Harap periksa pengaturan jaringan Anda. URL pengujian: " + + :notification/clear-all "Hapus semua" + + :shortcut.category/basics "Dasar" + :shortcut.category/formatting "Pemformatan" + :shortcut.category/navigating "Navigasi" + :shortcut.category/block-editing "Penyuntingan Blok Umum" + :shortcut.category/block-command-editing "Penyuntingan Perintah Blok" + :shortcut.category/block-selection "Pemilihan Blok (tekan Esc untuk keluar dari pemilihan)" + :shortcut.category/toggle "Beralih" + :shortcut.category/others "Lainnya" + :shortcut.category/plugins "Plugin" + :shortcut.category/whiteboard "Papan Tulis" + + :keymap/all "Semua" + :keymap/disabled "Nonaktifkan" + :keymap/unset "Tidak diatur" + :keymap/custom "Kustom" + :keymap/search "Cari" + :keymap/total "Total pintasan" + :keymap/keystroke-filter "Filter Pekerjaan Tombol" + :keymap/keystroke-record-desc "Tekan urutan tombol apa saja untuk memfilter pintasan" + :keymap/keystroke-record-setup-label "Tekan urutan tombol apa saja untuk mengatur pintasan" + :keymap/restore-to-default "Kembalikan ke default sistem" + :keymap/customize-for-label "Sesuaikan pintasan" + :keymap/conflicts-for-label "Konflik Keymap untuk" + + :window/minimize "Minimalkan" + :window/maximize "Maksimalkan" + :window/restore "Pulihkan" + :window/close "Tutup" + :window/exit-fullscreen "Keluar dari layar penuh" + + :header/toggle-left-sidebar "Alihkan bilah sisi kiri" + :header/search "Cari" + :header/more "Lainnya" + :header/go-back "Kembali" + :header/go-forward "Maju" + + :command.auto-complete/complete "Pelengkapan otomatis: Pilih item yang dipilih" + :command.auto-complete/next "Pelengkapan otomatis: Pilih item berikutnya" + :command.auto-complete/open-link "Pelengkapan otomatis: Buka item yang dipilih di browser" + :command.auto-complete/prev "Pelengkapan otomatis: Pilih item sebelumnya" + :command.auto-complete/shift-complete "APelengkapan otomatis: Buka item yang dipilih di sidebar" + :command.cards/forgotten "Kartu: terlupakan" + :command.cards/next-card "Kartu: kartu berikutnya" + :command.cards/recall "Kartu: ingatlah sejenak" + :command.cards/remembered "Kartu: diingatkan" + :command.cards/toggle-answers "Kartu: tampilkan / sembunyikan jawaban/clozes" + :command.command/run "Jalankan perintah git" + :command.command/toggle-favorite "Tambahkan/hapus dari favorit" + :command.command-palette/toggle "Aktifkan/matikan palet perintah" + :command.date-picker/complete "Date picker: Pilih hari yang dipilih" + :command.date-picker/next-day "Date picker: Pilih hari berikutnya" + :command.date-picker/next-week "Date picker: Pilih minggu berikutnya" + :command.date-picker/prev-day "Date picker: Pilih hari sebelumnya" + :command.date-picker/prev-week "Date picker: Pilih minggu sebelumnya" + :command.dev/show-block-ast "(Dev) Tampilkan AST blok" + :command.dev/show-block-data "(Dev) Tampilkan data blok" + :command.dev/show-page-ast "(Dev) Tampilkan AST halaman" + :command.dev/show-page-data "(Dev) Tampilkan data halaman" + :command.editor/backspace "Backspace / Hapus ke belakang" + :command.editor/backward-kill-word "Hapus kata ke belakang" + :command.editor/backward-word "Geser kursor ke belakang satu kata" + :command.editor/beginning-of-block "Geser kursor ke awal blok" + :command.editor/bold "Tebal" + :command.editor/clear-block "Hapus seluruh isi blok" + :command.editor/collapse-block-children "Kecilkan" + :command.editor/copy "Salin (menyalin seleksi atau referensi blok)" + :command.editor/copy-current-file "Salin berkas saat ini" + :command.editor/copy-embed "Salin referensi blok yang mengarah ke blok saat ini" + :command.editor/copy-page-url "Salin URL halaman" + :command.editor/copy-text "Salin seleksi sebagai teks" + :command.editor/cut "Potong" + :command.editor/cycle-todo "Putar status TODO item saat ini" + :command.editor/delete "Hapus / Hapus ke depan" + :command.editor/delete-selection "Hapus blok yang dipilih" + :command.editor/down "Geser kursor ke bawah / Pilih ke bawah" + :command.editor/end-of-block "Geser kursor ke akhir blok" + :command.editor/escape-editing "Keluar dari mode penyuntingan" + :command.editor/expand-block-children "Perluas" + :command.editor/follow-link "Ikuti tautan di bawah kursor" + :command.editor/forward-kill-word "Hapus kata ke depan" + :command.editor/forward-word "Geser kursor maju satu kata" + :command.editor/highlight "Sorot" + :command.editor/indent "Sisipkan blok" + :command.editor/insert-link "Tautan HTML" + :command.editor/insert-youtube-timestamp "Sisipkan penanda waktu YouTube" + :command.editor/italics "Miring" + :command.editor/kill-line-after "Hapus baris setelah posisi kursor" + :command.editor/kill-line-before "Hapus baris sebelum posisi kursor" + :command.editor/left "Geser kursor ke kiri / Buka blok yang dipilih di awal" + :command.editor/move-block-down "Geser blok ke bawah" + :command.editor/move-block-up "Geser blok ke atas" + :command.editor/new-block "Buat blok baru" + :command.editor/new-line "Baris baru dalam blok saat ini" + :command.editor/new-whiteboard "Papan tulis baru" + :command.editor/open-edit "Sunting blok yang dipilih" + :command.editor/open-file-in-default-app "Buka berkas dalam aplikasi default" + :command.editor/open-file-in-directory "Buka berkas di direktori induk" + :command.editor/open-link-in-sidebar "Buka tautan di sidebar" + :command.editor/outdent "Kurangi sisipan blok" + :command.editor/paste-text-in-one-block-at-point "Tempelkan teks ke dalam satu blok pada posisi kursor" + :command.editor/redo "Lakukan lagi" + :command.editor/replace-block-reference-at-point "Ganti referensi blok dengan isinya pada posisi kursor" + :command.editor/right "Geser kursor ke kanan / Buka blok yang dipilih di akhir" + :command.editor/select-all-blocks "Pilih semua blok" + :command.editor/select-block-down "Pilih blok di bawah" + :command.editor/select-block-up "Pilih blok di atas" + :command.editor/select-down "Pilih konten di bawah" + :command.editor/select-parent "Pilih blok induk" + :command.editor/select-up "Pilih konten di atas" + :command.editor/strike-through "Coret" + :command.editor/toggle-number-list "Hidupkan/matikan daftar angka" + :command.editor/toggle-open-blocks "Hidupkan/matikan blok terbuka (perluas atau perkecil semua blok)" + :command.editor/toggle-undo-redo-mode "Hidupkan/matikan mode undo redo (global atau hanya halaman)" + :command.editor/undo "Batal" + :command.editor/up "Geser kursor ke atas / Pilih ke atas" + :command.editor/zoom-in "Perbesar blok yang sedang disunting / Maju sebaliknya" + :command.editor/zoom-out "Perkecil blok yang sedang disunting / Mundur sebaliknya" + :command.git/commit "Buat commit git dengan pesan" + :command.go/all-graphs "Buka semua grafik" + :command.go/all-pages "Buka semua halaman" + :command.go/backward "Mundur" + :command.go/electron-find-in-page "Cari teks di halaman" + :command.go/electron-jump-to-the-next "Lompat ke pencocokan berikutnya dengan pencarian di bilah Temukan Anda" + :command.go/electron-jump-to-the-previous "Lompat ke pencocokan sebelumnya dengan pencarian di bilah Temukan Anda" + :command.go/flashcards "Alihkan kartu flash" + :command.go/forward "Maju" + :command.go/graph-view "Buka tampilan grafik" + :command.go/home "Buka beranda" + :command.go/journals "Buka jurnal" + :command.go/keyboard-shortcuts "Buka pintasan keyboard" + :command.go/next-journal "Buka jurnal berikutnya" + :command.go/prev-journal "Buka jurnal sebelumnya" + :command.go/search "Cari halaman dan blok" + :command.go/search-in-page "Cari blok di halaman saat ini" + :command.go/tomorrow "Buka ke esok hari" + :command.go/whiteboards "Buka papan tulis" + :command.graph/add "Tambahkan grafik" + :command.graph/export-as-html "Ekspor halaman grafik sebagai HTML" + :command.graph/open "Pilih grafik untuk dibuka" + :command.graph/re-index "Reindeks grafik saat ini" + :command.graph/remove "Hapus grafik" + :command.graph/save "Simpan grafik saat ini ke disk" + :command.misc/copy "Salin" + :command.pdf/close "Pdf: Tutup dokumen pdf saat ini" + :command.pdf/find "Pdf: Cari teks dokumen pdf saat ini" + :command.pdf/next-page "Pdf: Halaman berikutnya dokumen pdf saat ini" + :command.pdf/previous-page "Pdf: Halaman sebelumnya dokumen pdf saat ini" + :command.search/re-index "Bangun ulang indeks pencarian" + :command.sidebar/clear "Hapus semua di bilah sisi kanan" + :command.sidebar/close-top "Tutup item teratas di bilah sisi kanan" + :command.sidebar/open-today-page "Buka halaman hari ini di bilah sisi kanan" + :command.ui/clear-all-notifications "Hapus semua pemberitahuan" + :command.ui/goto-plugins "Buka dasbor plugin" + :command.ui/install-plugins-from-file "Pasang plugin dari plugins.edn" + :command.ui/select-theme-color "Pilih warna tema yang tersedia" + :command.ui/toggle-brackets "Alihkan tampilan tanda kurung" + :command.ui/toggle-cards "Alihkan kartu" + :command.ui/toggle-contents "Alihkan Konten di bilah samping" + :command.ui/toggle-document-mode "Alihkan mode dokumen" + :command.ui/toggle-help "Alihkan bantuan" + :command.ui/toggle-left-sidebar "Alihkan bilah sisi kiri" + :command.ui/toggle-right-sidebar "Alihkan bilah sisi kanan" + :command.ui/toggle-settings "Alihkan pengaturan" + :command.ui/toggle-theme "Alihkan antara tema gelap/cerah" + :command.ui/toggle-wide-mode "Alihkan mode lebar" + :command.whiteboard/bring-forward "Pindahkan ke depan" + :command.whiteboard/bring-to-front "Pindahkan ke depan sekali" + :command.whiteboard/connector "Alat konektor" + :command.whiteboard/ellipse "Alat elips" + :command.whiteboard/eraser "Alat penghapus" + :command.whiteboard/group "Pilihan grup" + :command.whiteboard/highlighter "Alat penggaris" + :command.whiteboard/lock "Kunci pilihan" + :command.whiteboard/pan "Alat geser" + :command.whiteboard/pencil "Alat pensil" + :command.whiteboard/portal "Alat portal" + :command.whiteboard/rectangle "Alat persegi panjang" + :command.whiteboard/reset-zoom "Atur ulang zoom" + :command.whiteboard/select "Alat pilihan" + :command.whiteboard/send-backward "Pindahkan ke belakang" + :command.whiteboard/send-to-back "Pindahkan ke belakang sekali" + :command.whiteboard/text "Alat teks" + :command.whiteboard/toggle-grid "Alihkan tampilan grid kanvas" + :command.whiteboard/ungroup "Pilihan ungroup" + :command.whiteboard/unlock "Buka kunci pilihan" + :command.whiteboard/zoom-in "Perbesar" + :command.whiteboard/zoom-out "Perkecil" + :command.whiteboard/zoom-to-fit "Zoom ke gambar" + :command.whiteboard/zoom-to-selection "Zoom ke seleksi" +} \ No newline at end of file diff --git a/src/resources/tutorials/dummy-notes-id.md b/src/resources/tutorials/dummy-notes-id.md new file mode 100644 index 00000000000..122230fee68 --- /dev/null +++ b/src/resources/tutorials/dummy-notes-id.md @@ -0,0 +1,14 @@ +--- +title: Bagaimana cara mengambil catatan dummy? +--- + +- Halo, saya blok! +:PROPERTIES: +:id: 5f713e91-8a3c-4b04-a33a-c39482428e2d +:END: + - Aku adalah blok anak! + - Aku blok anak lain! +- Hei, saya blok lain! +:PROPERTIES: +:id: 5f713ea8-8cba-403d-ac00-9964b1ec7190 +:END: diff --git a/src/resources/tutorials/tutorial-id.md b/src/resources/tutorials/tutorial-id.md new file mode 100644 index 00000000000..5ef7e68dab5 --- /dev/null +++ b/src/resources/tutorials/tutorial-id.md @@ -0,0 +1,25 @@ +## Hai, selamat datang di Logseq! +- Logseq adalah platform yang _mengedepankan privasi_, [sumber-terbuka](https://github.com/logseq/logseq) untuk manajemen pengetahuan dan kolaborasi. +- Ini adalah tutorial 3 menit tentang cara menggunakan Logseq. Mari kita mulai! +- Berikut beberapa tips yang mungkin berguna: +#+BEGIN_TIP +Klik untuk mengedit blok apa pun. +Ketik `Enter` untuk membuat blok baru. +Ketik `Shift+Enter` untuk membuat baris baru. +Ketik `/` untuk menampilkan semua perintah. +#+END_TIP +- 1. Mari kita buat halaman bernama [[Bagaimana cara mengambil catatan dummy?]]. Anda dapat mengkliknya untuk pergi ke halaman tersebut, atau Anda dapat `Shift+Klik` untuk membukanya di panel samping kanan! Sekarang Anda seharusnya dapat melihat _Referensi Tertaut_ dan _Referensi tak tertaut_. +- 2. Mari kita merujuk beberapa blok di [[Bagaimana cara mengambil catatan dummy?]]. Anda dapat `Shift+Klik` pada referensi blok apa pun untuk membukanya di panel samping kanan. Cobalah membuat beberapa perubahan di panel samping kanan; blok yang dirujuk tersebut juga akan berubah! + - ((5f713e91-8a3c-4b04-a33a-c39482428e2d)): Ini adalah referensi blok. + - ((5f713ea8-8cba-403d-ac00-9964b1ec7190)): Ini adalah referensi blok lainnya. +- 3. Apakah Anda mendukung tag? + - Tentu, ini adalah tag #dummy. +- 4. Apakah Anda mendukung tugas seperti todo/doing/done dan prioritas? + - Ya, ketik `/` dan pilih kata kunci todo atau prioritas (A/B/C) favorit Anda. + - SEKARANG [#A] Tutorial dummy tentang "Cara mengambil catatan dummy?" + - KEMUDIAN [#A] Cek video keren ini oleh [@shuomi3](https://twitter.com/shuomi3) tentang cara menggunakan Logseq untuk membuat catatan dan mengatur hidup Anda! + - ![Video YouTube](https://www.youtube.com/watch?v=BhHfF0P9A80&ab_channel=ShuOmi) + - SELESAI Membuat halaman + - DIBATALKAN [#C] Menulis halaman dengan lebih dari 1000 blok +- Itu dia! Anda dapat membuat lebih banyak poin atau membuka direktori lokal untuk mengimpor beberapa catatan sekarang! +- Anda juga dapat mengunduh aplikasi desktop kami [di sini](https://github.com/logseq/logseq/releases). \ No newline at end of file From 4b60ed2d9f5be3422d3d9d844647402998e5184b Mon Sep 17 00:00:00 2001 From: bluemeda Date: Tue, 5 Sep 2023 19:54:11 +0700 Subject: [PATCH 02/19] add some Indonesian terms to allowed-duplicates --- scripts/src/logseq/tasks/lang.clj | 3 ++- src/resources/dicts/id.edn | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/src/logseq/tasks/lang.clj b/scripts/src/logseq/tasks/lang.clj index 1b1110fe679..81391356538 100644 --- a/scripts/src/logseq/tasks/lang.clj +++ b/scripts/src/logseq/tasks/lang.clj @@ -176,7 +176,8 @@ :search-item/whiteboard :settings-page/enable-flashcards :settings-page/enable-whiteboards :settings-page/tab-editor :shortcut.category/whiteboard :whiteboard/medium :whiteboard/twitter-url :whiteboard/youtube-url :right-side-bar/history-global} - :tr #{:help/awesome-logseq}}) + :tr #{:help/awesome-logseq} + :id #{:host :port :on-boarding/section-app :right-side-bar/history-global}}) (defn- validate-languages-dont-have-duplicates "Looks up duplicates for all languages" diff --git a/src/resources/dicts/id.edn b/src/resources/dicts/id.edn index 7c5b3dbfdae..b67e5ed0b6f 100644 --- a/src/resources/dicts/id.edn +++ b/src/resources/dicts/id.edn @@ -326,7 +326,7 @@ :settings-page/tab-advanced "Lanjutan" :settings-page/tab-assets "Aset" :settings-page/tab-features "Fitur" - :settings-page/plugin-system "Plugin" + :settings-page/plugin-system "Pengaya" :settings-page/enable-flashcards "Kartu Belajar" :settings-page/network-proxy "Proxy jaringan" :settings-page/filename-format "Format nama berkas" @@ -524,8 +524,8 @@ :remove-orphaned-pages "Hapus halaman yang tidak terhubung?" :all-journals "Semua jurnal" :settings "Pengaturan" - :settings-of-plugins "Plugins" - :plugins "Plugins" + :settings-of-plugins "Pengaya" + :plugins "Pengaya" :themes "Tema" :relaunch-confirm-to-work "Harus mengulang aplikasi untuk membuatnya berfungsi. Apakah Anda ingin me-restart sekarang?" :import "Impor" From cd24919716ad1d51a7d9f29177b77c5a3505b8b2 Mon Sep 17 00:00:00 2001 From: Andelf Date: Wed, 6 Sep 2023 00:18:34 +0800 Subject: [PATCH 03/19] enhance(sync): refine network checking (#10147) --- src/main/frontend/components/plugins.cljs | 2 ++ src/main/frontend/fs/sync.cljs | 34 ++++++++++++++++------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/main/frontend/components/plugins.cljs b/src/main/frontend/components/plugins.cljs index f10a946f286..8e043caa199 100644 --- a/src/main/frontend/components/plugins.cljs +++ b/src/main/frontend/components/plugins.cljs @@ -433,6 +433,8 @@ (assoc opts :test (util/trim-safe (util/evalue %)))) :value (:test opts)}] [:datalist#proxy-test-url-datalist + [:option "https://api.logseq.com/logseq/version"] + [:option "https://logseq-connectivity-testing-prod.s3.us-east-1.amazonaws.com/logseq-connectivity-testing"] [:option "https://www.google.com"] [:option "https://s3.amazonaws.com"] [:option "https://clients3.google.com/generate_204"]]] diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs index ee57516236f..beb6f02e0fd 100644 --- a/src/main/frontend/fs/sync.cljs +++ b/src/main/frontend/fs/sync.cljs @@ -237,17 +237,25 @@ (when-let [ws (:ws @*ws)] (.close ws)))) +(def *ws-connect-retries (atom 0)) +(declare @*ws-connect-retries 3) + (do (println "ws-listen! retry count > 3, stop retry") + (reset! *ws-connect-retries 0) + (swap! *ws (fn [o] (assoc o :stop true))) + (clj (js/JSON.parse (.-data e)) :keywordize-keys true)] (when (some? (:txid data)) @@ -3357,9 +3365,13 @@ (= 200 (:status r2*)) (= "OK" (:body r2*)))] (if ok? - (println :connectivity-testing-succ) + (do (println :connectivity-testing-succ) + (notification/clear! :sync-connection-failed)) (notification/show! (str (t :file-sync/connectivity-testing-failed) - (print-str [config/CONNECTIVITY-TESTING-S3-URL api-url])) :warning false)) + (print-str [config/CONNECTIVITY-TESTING-S3-URL api-url])) + :warning + false + :sync-connection-failed)) ok?))) (declare network-online-cursor) @@ -3492,8 +3504,10 @@ ;; try to re-start sync when state=stopped every 1min (go-loop [] ( Date: Wed, 6 Sep 2023 13:48:41 +0800 Subject: [PATCH 04/19] enhance(ui): remove legacy shortcuts entry from the general settings --- src/main/frontend/components/settings.cljs | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/frontend/components/settings.cljs b/src/main/frontend/components/settings.cljs index 96d6db92224..23aeabb9fd0 100644 --- a/src/main/frontend/components/settings.cljs +++ b/src/main/frontend/components/settings.cljs @@ -472,15 +472,6 @@ ;; (let [value (not enable-block-timestamps?)] ;; (config-handler/set-config! :feature/enable-block-timestamps? value))))) -(rum/defc keyboard-shortcuts-row [t] - (row-with-button-action - {:left-label (t :settings-page/customize-shortcuts) - :button-label (t :settings-page/shortcut-settings) - :on-click (fn [] - (state/close-settings!) - (route-handler/redirect! {:to :shortcut-setting})) - :-for "customize_shortcuts"})) - (defn zotero-settings-row [] [:div.it.sm:grid.sm:grid-cols-3.sm:gap-4.sm:items-start [:label.block.text-sm.font-medium.leading-5.opacity-70 @@ -646,8 +637,7 @@ (when (config/global-config-enabled?) (edit-global-config-edn)) (when current-repo (edit-config-edn)) (when current-repo (edit-custom-css)) - (when current-repo (edit-export-css)) - (keyboard-shortcuts-row t)])) + (when current-repo (edit-export-css))])) (rum/defcs settings-editor < rum/reactive [_state current-repo] From a6ace12832bea3369f3d1bc19475fd1825eaec1e Mon Sep 17 00:00:00 2001 From: charlie Date: Wed, 6 Sep 2023 14:28:48 +0800 Subject: [PATCH 05/19] fix: lint --- src/resources/dicts/de.edn | 2 -- src/resources/dicts/en.edn | 2 -- src/resources/dicts/es.edn | 2 -- src/resources/dicts/fr.edn | 2 -- src/resources/dicts/id.edn | 2 -- src/resources/dicts/it.edn | 2 -- src/resources/dicts/ja.edn | 2 -- src/resources/dicts/ko.edn | 2 -- src/resources/dicts/nb-no.edn | 2 -- src/resources/dicts/nl.edn | 2 -- src/resources/dicts/pl.edn | 2 -- src/resources/dicts/pt-br.edn | 2 -- src/resources/dicts/pt-pt.edn | 2 -- src/resources/dicts/ru.edn | 2 -- src/resources/dicts/sk.edn | 2 -- src/resources/dicts/tr.edn | 2 -- src/resources/dicts/uk.edn | 2 -- src/resources/dicts/zh-cn.edn | 2 -- src/resources/dicts/zh-hant.edn | 2 -- 19 files changed, 38 deletions(-) diff --git a/src/resources/dicts/de.edn b/src/resources/dicts/de.edn index bf9d862de5e..638c5ee9bf7 100644 --- a/src/resources/dicts/de.edn +++ b/src/resources/dicts/de.edn @@ -576,7 +576,6 @@ :settings-page/custom-date-format-warning "Neuindizierung erforderlich! Vorhandene Journal-Verweise würden nicht mehr funktionieren!" :settings-page/custom-global-configuration "Benutzerdefinierte globale Konfiguration" :settings-page/custom-theme "Individuelles Theme" - :settings-page/customize-shortcuts "Tastaturbefehle" :settings-page/developer-mode "Entwicklermodus" :settings-page/developer-mode-desc "Der Entwicklermodus hilft Mitwirkenden und Entwicklern von Erweiterungen, ihre Integration mit Logseq effizienter zu testen." :settings-page/disable-sentry "Nutzungs- und Diagnostik-Daten an Logseq senden" @@ -605,7 +604,6 @@ :settings-page/preferred-outdenting "Logische Ausrückung" :settings-page/preferred-pasting-file "Einfügen der Datei bevorzugen" :settings-page/preferred-workflow "Bevorzugter Workflow" - :settings-page/shortcut-settings "Verknüpfungen anpassen" :settings-page/show-brackets "Klammern anzeigen" :settings-page/show-full-blocks "Alle Zeilen einer Blockreferenz anzeigen" :settings-page/spell-checker "Rechtschreibprüfung" diff --git a/src/resources/dicts/en.edn b/src/resources/dicts/en.edn index 8e3e1ecbc59..2ccf37998fb 100644 --- a/src/resources/dicts/en.edn +++ b/src/resources/dicts/en.edn @@ -308,8 +308,6 @@ :settings-page/enable-tooltip "Tooltips" :settings-page/enable-journals "Journals" :settings-page/enable-all-pages-public "All pages public when publishing" - :settings-page/customize-shortcuts "Keyboard shortcuts" - :settings-page/shortcut-settings "Customize shortcuts" :settings-page/home-default-page "Set the default home page" :settings-page/enable-block-time "Block timestamps" :settings-page/clear-cache "Clear cache" diff --git a/src/resources/dicts/es.edn b/src/resources/dicts/es.edn index 2bf9e0096b5..ce5268218e0 100644 --- a/src/resources/dicts/es.edn +++ b/src/resources/dicts/es.edn @@ -609,7 +609,6 @@ :settings-page/custom-date-format-notification "Debes reindexar tu grafo para que este cambio tome efecto" :settings-page/custom-date-format-warning "¡Se requiere reindexar! ¡Las referencias existentes del diario podrían estar rotas!" :settings-page/custom-global-configuration "Configuración global personalizada" - :settings-page/customize-shortcuts "Atajos de teclado" :settings-page/custom-theme "Tema personalizado" :settings-page/developer-mode-desc "El modo desarrollador permite a los colaboradores y desarrolladores de extensiones probar sus integraciones con Logseq más eficientemente." :settings-page/developer-mode "Modo desarrollador" @@ -651,7 +650,6 @@ :settings-page/preferred-pasting-file "Preferir pegar archivo" :settings-page/preferred-workflow "Flujo de trabajo preferido" :settings-page/revision "Revisión: " - :settings-page/shortcut-settings "Personalizar atajos" :settings-page/show-brackets "Mostrar corchetes" :settings-page/show-full-blocks "Mostrar todas las líneas de una referencia a bloque" :settings-page/spell-checker "Corrector ortográfico" diff --git a/src/resources/dicts/fr.edn b/src/resources/dicts/fr.edn index 996e163e40b..778a89d9c22 100644 --- a/src/resources/dicts/fr.edn +++ b/src/resources/dicts/fr.edn @@ -259,7 +259,6 @@ :settings-page/custom-date-format "Format de date préféré" :settings-page/custom-global-configuration "Configuration globale personnalisée" :settings-page/custom-theme "Thème personnalisé" - :settings-page/customize-shortcuts "Raccourcis clavier" :settings-page/disable-sentry "Envoyer des données d'utilisation et de diagnostique à Logseq" :settings-page/edit-custom-css "Modifier custom.css" :settings-page/edit-export-css "Modifier export.css" @@ -281,7 +280,6 @@ :settings-page/network-proxy "Proxy réseau" :settings-page/plugin-system "Extensions" :settings-page/preferred-outdenting "Mise en retrait logique" - :settings-page/shortcut-settings "Personnaliser les raccourcis" :settings-page/show-brackets "Montrer les parenthèses, crochets et accolades" :settings-page/spell-checker "Vérification orthographique" :settings-page/sync "Synchronisation" diff --git a/src/resources/dicts/id.edn b/src/resources/dicts/id.edn index b67e5ed0b6f..65c62cc79c4 100644 --- a/src/resources/dicts/id.edn +++ b/src/resources/dicts/id.edn @@ -308,8 +308,6 @@ :settings-page/enable-tooltip "Tooltip" :settings-page/enable-journals "Jurnal" :settings-page/enable-all-pages-public "Semua halaman menjadi publik saat dipublikasikan" - :settings-page/customize-shortcuts "Pintasan keyboard" - :settings-page/shortcut-settings "Sesuaikan pintasan" :settings-page/home-default-page "Atur halaman beranda default" :settings-page/enable-block-time "Waktu blok" :settings-page/clear-cache "Hapus cache" diff --git a/src/resources/dicts/it.edn b/src/resources/dicts/it.edn index 097dd474e26..3814c1b23fb 100644 --- a/src/resources/dicts/it.edn +++ b/src/resources/dicts/it.edn @@ -102,8 +102,6 @@ :settings-page/enable-tooltip "Suggerimenti" :settings-page/enable-journals "Diario" :settings-page/enable-all-pages-public "Tutte le pagine pubbliche durante la pubblicazione" - :settings-page/customize-shortcuts "Scorciatoie da tastiera" - :settings-page/shortcut-settings "Personalizza scorciatoie" :settings-page/home-default-page "Imposta la home page predefinita" :settings-page/enable-block-time "Indicatori temporali sui blocchi" :settings-page/clear-cache "Pulisci cache" diff --git a/src/resources/dicts/ja.edn b/src/resources/dicts/ja.edn index 70ce2a7e11b..a73f2bf7f3c 100644 --- a/src/resources/dicts/ja.edn +++ b/src/resources/dicts/ja.edn @@ -308,8 +308,6 @@ :settings-page/enable-tooltip "ツールチップ" :settings-page/enable-journals "日誌" :settings-page/enable-all-pages-public "パブリッシュ時には全てのページを公開する" - :settings-page/customize-shortcuts "キーボードショートカット" - :settings-page/shortcut-settings "ショートカットをカスタマイズ" :settings-page/home-default-page "デフォルトのホームページを設定" :settings-page/enable-block-time "ブロックタイムスタンプ" :settings-page/clear-cache "キャッシュをクリア" diff --git a/src/resources/dicts/ko.edn b/src/resources/dicts/ko.edn index fc474623463..b00d7308df1 100644 --- a/src/resources/dicts/ko.edn +++ b/src/resources/dicts/ko.edn @@ -104,8 +104,6 @@ :settings-page/enable-tooltip "툴팁 활성화" :settings-page/enable-journals "일지 활성화" :settings-page/enable-all-pages-public "출판할 때 모든 페이지 공개로 설정" - :settings-page/customize-shortcuts "키보드 단축키" - :settings-page/shortcut-settings "단축키 설정" :settings-page/home-default-page "기본 홈 페이지 설정" :settings-page/enable-block-time "블록 타임스탬프" :settings-page/clear-cache "캐시 지우기" diff --git a/src/resources/dicts/nb-no.edn b/src/resources/dicts/nb-no.edn index 9d4dcf63266..605ea36735b 100644 --- a/src/resources/dicts/nb-no.edn +++ b/src/resources/dicts/nb-no.edn @@ -102,8 +102,6 @@ :settings-page/enable-tooltip "Aktiver verktøytips" :settings-page/enable-journals "Aktiver dagbøker" :settings-page/enable-all-pages-public "Aktiver alle sider som offentlige ved publisering" - :settings-page/customize-shortcuts "Tastatursnarveier" - :settings-page/shortcut-settings "Tilpass snarveier" :settings-page/home-default-page "Angi standard hjemmeside" :settings-page/enable-block-time "Aktiver tidsstempel for blokker" :settings-page/clear-cache "Slett hurtigbuffer" diff --git a/src/resources/dicts/nl.edn b/src/resources/dicts/nl.edn index 3e0dbdf3663..3f1c5850392 100644 --- a/src/resources/dicts/nl.edn +++ b/src/resources/dicts/nl.edn @@ -192,7 +192,6 @@ :settings-page/custom-configuration "Aangepaste configuratie" :settings-page/custom-date-format "Gewenst datumformaat" :settings-page/custom-theme "Aangepast thema" - :settings-page/customize-shortcuts "Toetsenbord snelkoppelingen" :settings-page/developer-mode "Ontwikkelaar modus" :settings-page/developer-mode-desc "De ontwikkelaarsmodus helpt bijdragers en extensie-ontwikkelaars om hun integratie met Logseq efficiënter te testen." :settings-page/disable-sentry "Gebruiksgegevens en diagnostiek naar Logseq sturen" @@ -216,7 +215,6 @@ :settings-page/preferred-file-format "Gewenst bestandsformaat" :settings-page/preferred-outdenting "Logische uitdenting" :settings-page/preferred-workflow "Voorkeur voor workflow" - :settings-page/shortcut-settings "Snelkoppelingen aanpassen" :settings-page/show-brackets "Toon beugels" :settings-page/spell-checker "Spellingcontrole" :settings-page/tab-advanced "Geavanceerd" diff --git a/src/resources/dicts/pl.edn b/src/resources/dicts/pl.edn index efa2e728e47..33fe39fba52 100644 --- a/src/resources/dicts/pl.edn +++ b/src/resources/dicts/pl.edn @@ -107,8 +107,6 @@ :settings-page/enable-tooltip "Podpowiedzi" :settings-page/enable-journals "Dzienniki" :settings-page/enable-all-pages-public "Publikuj wszystkie strony" - :settings-page/customize-shortcuts "Skróty klawiszowe" - :settings-page/shortcut-settings "Zmień skróty" :settings-page/home-default-page "Ustaw domyślną stronę startową" :settings-page/enable-block-time "Włącz czas dla bloków" :settings-page/clear-cache "Wyczyść cache" diff --git a/src/resources/dicts/pt-br.edn b/src/resources/dicts/pt-br.edn index 9bb5792c1de..1d89eed1611 100644 --- a/src/resources/dicts/pt-br.edn +++ b/src/resources/dicts/pt-br.edn @@ -83,8 +83,6 @@ :settings-page/enable-tooltip "Ativar dicas de ferramentas" :settings-page/enable-journals "Ativar diários" :settings-page/enable-all-pages-public "Ativar todas as páginas públicas ao publicar" - :settings-page/customize-shortcuts "Atalhos de teclado" - :settings-page/shortcut-settings "Personalizar atalhos" :settings-page/home-default-page "Definir a página inicial padrão" :settings-page/enable-block-time "Ativar carimbos temporais nos blocos" :settings-page/clear-cache "Limpar cache" diff --git a/src/resources/dicts/pt-pt.edn b/src/resources/dicts/pt-pt.edn index 326c1138d70..f567551438e 100644 --- a/src/resources/dicts/pt-pt.edn +++ b/src/resources/dicts/pt-pt.edn @@ -174,8 +174,6 @@ :settings-page/enable-tooltip "Dicas de contexto" :settings-page/enable-journals "Páginas Diárias" :settings-page/enable-all-pages-public "Todas as páginas públicas ao publicar" - :settings-page/customize-shortcuts "Atalhos de teclado" - :settings-page/shortcut-settings "Personalizar atalhos" :settings-page/home-default-page "Definir a página inicial predefinida" :settings-page/enable-block-time "Marcas de tempo em blocos" :settings-page/clear-cache "Limpar cache" diff --git a/src/resources/dicts/ru.edn b/src/resources/dicts/ru.edn index e6d826c62f6..17d912ada13 100644 --- a/src/resources/dicts/ru.edn +++ b/src/resources/dicts/ru.edn @@ -215,8 +215,6 @@ :settings-page/enable-tooltip "Всплывающие подсказки" :settings-page/enable-journals "Журналы" :settings-page/enable-all-pages-public "При публикации все страницы становятся публичными" - :settings-page/customize-shortcuts "Сочетания клавиш" - :settings-page/shortcut-settings "Настроить горячие клавиши" :settings-page/home-default-page "Установить домашнюю страницу по умолчанию" :settings-page/enable-block-time "Временные метки блока" :settings-page/clear-cache "Очистить кэш" diff --git a/src/resources/dicts/sk.edn b/src/resources/dicts/sk.edn index 2a1ab432659..f3316312720 100644 --- a/src/resources/dicts/sk.edn +++ b/src/resources/dicts/sk.edn @@ -167,8 +167,6 @@ :settings-page/enable-tooltip "Povoliť okno s nápovedou" :settings-page/enable-journals "Denníky" :settings-page/enable-all-pages-public "Všetky stránky označiť ako verejné" - :settings-page/customize-shortcuts "Klávesové skratky" - :settings-page/shortcut-settings "Prispôsobiť skratky" :settings-page/home-default-page "Nastaviť predvolenú domovskú stránku" :settings-page/enable-block-time "Povoliť časové pečiatky bloku" :settings-page/clear-cache "Vymazať vyrovnávaciu pamäť" diff --git a/src/resources/dicts/tr.edn b/src/resources/dicts/tr.edn index 3d616366dc1..141db3946b2 100644 --- a/src/resources/dicts/tr.edn +++ b/src/resources/dicts/tr.edn @@ -298,8 +298,6 @@ :settings-page/enable-tooltip "Araç ipuçları" :settings-page/enable-journals "Günlük" :settings-page/enable-all-pages-public "Yayımlanan tüm sayfaları herkese açık yap" - :settings-page/customize-shortcuts "Klavye kısayolları" - :settings-page/shortcut-settings "Kısayolları özelleştir" :settings-page/home-default-page "Varsayılan ana sayfayı ayarla" :settings-page/enable-block-time "Blok zaman damgaları" :settings-page/clear-cache "Önbelleği temizle" diff --git a/src/resources/dicts/uk.edn b/src/resources/dicts/uk.edn index 18f7293ad0f..2f313646fc5 100644 --- a/src/resources/dicts/uk.edn +++ b/src/resources/dicts/uk.edn @@ -198,8 +198,6 @@ :settings-page/enable-tooltip "Підказки" :settings-page/enable-journals "Журнали" :settings-page/enable-all-pages-public "Усі сторінки є відкритими під час публікації" - :settings-page/customize-shortcuts "Гарячі клавіші" - :settings-page/shortcut-settings "Налаштуваня ярликів" :settings-page/home-default-page "Встановити домашню сторінку за умовчанням" :settings-page/enable-block-time "Блокувати позначки часу" :settings-page/clear-cache "Очистити кеш" diff --git a/src/resources/dicts/zh-cn.edn b/src/resources/dicts/zh-cn.edn index 506c5e91373..59b527346b7 100644 --- a/src/resources/dicts/zh-cn.edn +++ b/src/resources/dicts/zh-cn.edn @@ -216,8 +216,6 @@ :settings-page/enable-journals "开启日记" :settings-page/enable-all-pages-public "发布所有页面" :settings-page/enable-whiteboards "激活白板功能" - :settings-page/customize-shortcuts "自定义快捷键" - :settings-page/shortcut-settings "快捷键设置" :settings-page/home-default-page "设置首页默认页面" :settings-page/enable-block-time "记录 block 创建/修改时间" :settings-page/clear-cache "清除缓存" diff --git a/src/resources/dicts/zh-hant.edn b/src/resources/dicts/zh-hant.edn index 6debc36bab6..a92059e8b25 100644 --- a/src/resources/dicts/zh-hant.edn +++ b/src/resources/dicts/zh-hant.edn @@ -172,8 +172,6 @@ :settings-page/enable-timetracking "啟用時間追蹤" :settings-page/enable-tooltip "啟用提示" :settings-page/enable-journals "啟用日記頁面" - :settings-page/customize-shortcuts "個人化快捷鍵" - :settings-page/shortcut-settings "設定快捷鍵" :settings-page/home-default-page "設定預設首頁" :settings-page/enable-block-time "啟用區塊時間截記" :settings-page/clear-cache "清除快取資料" From 12642f57771596e18a0ace95faef4bd535d4bc5a Mon Sep 17 00:00:00 2001 From: Konstantinos Date: Wed, 6 Sep 2023 10:34:52 +0300 Subject: [PATCH 06/19] Enhance (UX): Electron loading (#10049) * hide window until theme is loaded * show window on db-restored * move manage call to handle maximized state * hook on theme load --- src/electron/electron/handler.cljs | 5 +++++ src/electron/electron/window.cljs | 2 +- src/main/frontend/components/theme.cljs | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/electron/electron/handler.cljs b/src/electron/electron/handler.cljs index ba268fff321..3aafd38ea65 100644 --- a/src/electron/electron/handler.cljs +++ b/src/electron/electron/handler.cljs @@ -6,6 +6,7 @@ ["buffer" :as buffer] ["diff-match-patch" :as google-diff] ["electron" :refer [app autoUpdater dialog ipcMain shell]] + ["electron-window-state" :as windowStateKeeper] ["fs" :as fs] ["fs-extra" :as fs-extra] ["os" :as os] @@ -618,6 +619,10 @@ (defmethod handle :window-close [^js win] (.close win)) +(defmethod handle :theme-loaded [^js win] + (.manage (windowStateKeeper) win) + (.show win)) + ;;;;;;;;;;;;;;;;;;;;;;; ;; file-sync-rs-apis ;; ;;;;;;;;;;;;;;;;;;;;;;; diff --git a/src/electron/electron/window.cljs b/src/electron/electron/window.cljs index d858c76c1f4..29c20c5cbc1 100644 --- a/src/electron/electron/window.cljs +++ b/src/electron/electron/window.cljs @@ -35,6 +35,7 @@ :titleBarStyle "hiddenInset" :trafficLightPosition {:x 16 :y 16} :autoHideMenuBar (not mac?) + :show false :webPreferences {:plugins true ; pdf :nodeIntegration false @@ -55,7 +56,6 @@ linux? (assoc :icon (node-path/join js/__dirname "icons/logseq.png"))) win (BrowserWindow. (clj->js win-opts))] - (.manage win-state win) (.onBeforeSendHeaders (.. session -defaultSession -webRequest) (clj->js {:urls (array "*://*.youtube.com/*")}) (fn [^js details callback] diff --git a/src/main/frontend/components/theme.cljs b/src/main/frontend/components/theme.cljs index 0e2c49a6c4d..8252f50fc7b 100644 --- a/src/main/frontend/components/theme.cljs +++ b/src/main/frontend/components/theme.cljs @@ -1,5 +1,6 @@ (ns frontend.components.theme - (:require [frontend.extensions.pdf.core :as pdf] + (:require [electron.ipc :as ipc] + [frontend.extensions.pdf.core :as pdf] [frontend.config :as config] [frontend.handler.plugin :as plugin-handler] [frontend.handler.plugin-config :as plugin-config-handler] @@ -33,7 +34,8 @@ (rum/use-effect! #(let [doc js/document.documentElement] - (.setAttribute doc "lang" preferred-language))) + (.setAttribute doc "lang" preferred-language) + (js/setTimeout (fn [] (ipc/ipc "theme-loaded")) 100))) ; Wait for the theme to be applied (rum/use-effect! #(when (and restored-sidebar? From 331afbc04fd4bc5672d5273ff2119403a3df832b Mon Sep 17 00:00:00 2001 From: Charlie Date: Wed, 6 Sep 2023 22:49:18 +0800 Subject: [PATCH 07/19] Enhance/plugins apis (#10127) * enhance(api): add page to recent for route api * enhance(api): support open block in right sidebar with entity id --- libs/src/LSPlugin.ts | 2 +- src/main/frontend/handler/editor.cljs | 2 +- src/main/frontend/handler/route.cljs | 8 ++++--- src/main/logseq/api.cljs | 30 ++++++++++++++++++--------- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/libs/src/LSPlugin.ts b/libs/src/LSPlugin.ts index 9a79043c8a2..828c2a7de93 100644 --- a/libs/src/LSPlugin.ts +++ b/libs/src/LSPlugin.ts @@ -811,7 +811,7 @@ export interface IEditorProxy extends Record { opts?: { replaceState: boolean } ) => void - openInRightSidebar: (uuid: BlockUUID) => void + openInRightSidebar: (id: BlockUUID | EntityID) => void /** * @example https://github.com/logseq/logseq-plugin-samples/tree/master/logseq-a-translator diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs index 6064f65b0fb..690b5c9559d 100644 --- a/src/main/frontend/handler/editor.cljs +++ b/src/main/frontend/handler/editor.cljs @@ -197,7 +197,7 @@ (defn open-block-in-sidebar! [block-id] (when block-id - (when-let [block (db/entity [:block/uuid block-id])] + (when-let [block (db/entity (if (number? block-id) block-id [:block/uuid block-id]))] (let [page? (nil? (:block/page block))] (state/sidebar-add-block! (state/get-current-repo) diff --git a/src/main/frontend/handler/route.cljs b/src/main/frontend/handler/route.cljs index bc2a3a674cd..cdf67700ac4 100644 --- a/src/main/frontend/handler/route.cljs +++ b/src/main/frontend/handler/route.cljs @@ -77,11 +77,13 @@ (recent-handler/add-page-to-recent! (state/get-current-repo) page-name click-from-recent?) (let [m (cond-> - (default-page-route page-name) + (default-page-route page-name) + anchor (assoc :query-params {:anchor anchor}) - push - (assoc :push push))] + + (boolean? push) + (assoc :push push))] (redirect! m))))) (defn redirect-to-whiteboard! diff --git a/src/main/logseq/api.cljs b/src/main/logseq/api.cljs index 3e674f34a7f..40206b0674b 100644 --- a/src/main/logseq/api.cljs +++ b/src/main/logseq/api.cljs @@ -13,6 +13,7 @@ [frontend.components.plugins :as plugins] [frontend.config :as config] [frontend.handler.config :as config-handler] + [frontend.handler.route :as route-handler] [frontend.db :as db] [frontend.db.model :as db-model] [frontend.db.query-dsl :as query-dsl] @@ -449,17 +450,23 @@ (def ^:export push_state (fn [^js k ^js params ^js query] - (rfe/push-state - (keyword k) - (bean/->clj params) - (bean/->clj query)))) + (let [k (keyword k) + page? (= k :page) + params (bean/->clj params) + query (bean/->clj query)] + (if-let [page-name (and page? (:name params))] + (route-handler/redirect-to-page! page-name {:anchor (:anchor query) :push true}) + (rfe/push-state k params query))))) (def ^:export replace_state (fn [^js k ^js params ^js query] - (rfe/replace-state - (keyword k) - (bean/->clj params) - (bean/->clj query)))) + (let [k (keyword k) + page? (= k :page) + params (bean/->clj params) + query (bean/->clj query)] + (if-let [page-name (and page? (:name params))] + (route-handler/redirect-to-page! page-name {:anchor (:anchor query) :push false}) + (rfe/replace-state k params query))))) (defn ^:export get_external_plugin [pid] @@ -563,8 +570,11 @@ page-handler/rename!) (defn ^:export open_in_right_sidebar - [block-uuid] - (editor-handler/open-block-in-sidebar! (sdk-utils/uuid-or-throw-error block-uuid))) + [block-id-or-uuid] + (editor-handler/open-block-in-sidebar! + (if (number? block-id-or-uuid) + block-id-or-uuid + (sdk-utils/uuid-or-throw-error block-id-or-uuid)))) (defn ^:export new_block_uuid [] (str (db/new-block-id))) From b678a806a15d1afb2e623671cdd775f5dc45eab2 Mon Sep 17 00:00:00 2001 From: Konstantinos Date: Wed, 6 Sep 2023 17:51:44 +0300 Subject: [PATCH 08/19] fix: close button visibility (#10145) --- src/main/frontend/components/container.css | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/frontend/components/container.css b/src/main/frontend/components/container.css index 7db910e713c..ccce10ffbcb 100644 --- a/src/main/frontend/components/container.css +++ b/src/main/frontend/components/container.css @@ -682,14 +682,6 @@ html[data-theme='dark'] { } } - &:not(:hover) { - ::-webkit-scrollbar-thumb, - ::-webkit-scrollbar, - ::-webkit-scrollbar-thumb:active { - background-color: transparent; - } - } - .initial { flex: 1; } @@ -698,22 +690,13 @@ html[data-theme='dark'] { @apply h-full; .button { - @apply hidden p-0 ml-2 flex items-center; + @apply p-0 ml-2 flex items-center; &:focus { @apply flex; } } } - - .is-mobile &, - &:hover { - .item-actions { - .button { - @apply flex; - } - } - } } } From e043a2c3fac3cb79b9a509296768781f97219f2c Mon Sep 17 00:00:00 2001 From: Andelf Date: Wed, 6 Sep 2023 22:52:25 +0800 Subject: [PATCH 09/19] chore(release): bump version 0.9.16 (#10149) --- android/app/build.gradle | 4 ++-- resources/forge.config.js | 2 +- resources/package.json | 2 +- src/main/frontend/version.cljs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 213f18fb899..6385021ae31 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.logseq.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 68 - versionName "0.9.15" + versionCode 69 + versionName "0.9.16" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/resources/forge.config.js b/resources/forge.config.js index 6e16252f7f5..fffdb278a98 100644 --- a/resources/forge.config.js +++ b/resources/forge.config.js @@ -4,7 +4,7 @@ module.exports = { packagerConfig: { name: 'Logseq', icon: './icons/logseq_big_sur.icns', - buildVersion: 68, + buildVersion: 69, protocols: [ { "protocol": "logseq", diff --git a/resources/package.json b/resources/package.json index 8181acde4d3..2375b80038b 100644 --- a/resources/package.json +++ b/resources/package.json @@ -1,7 +1,7 @@ { "name": "Logseq", "productName": "Logseq", - "version": "0.9.15", + "version": "0.9.16", "main": "electron.js", "author": "Logseq", "license": "AGPL-3.0", diff --git a/src/main/frontend/version.cljs b/src/main/frontend/version.cljs index b7e660124a0..9e0dc6cc43f 100644 --- a/src/main/frontend/version.cljs +++ b/src/main/frontend/version.cljs @@ -1,3 +1,3 @@ (ns ^:no-doc frontend.version) -(defonce version "0.9.15") +(defonce version "0.9.16") From 850bc1a89c23b5b969fbea56e2d384f81c505b97 Mon Sep 17 00:00:00 2001 From: Andelf Date: Thu, 7 Sep 2023 11:33:42 +0800 Subject: [PATCH 10/19] fix(sync): missing cross-origin handling for conn check (#10163) --- src/main/frontend/fs/sync.cljs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs index beb6f02e0fd..623a76e30d7 100644 --- a/src/main/frontend/fs/sync.cljs +++ b/src/main/frontend/fs/sync.cljs @@ -3357,8 +3357,8 @@ [] (go (let [api-url (str "https://" config/API-DOMAIN "/logseq/version") - r1 (http/get api-url) - r2 (http/get config/CONNECTIVITY-TESTING-S3-URL) + r1 (http/get api-url {:with-credentials? false}) + r2 (http/get config/CONNECTIVITY-TESTING-S3-URL {:with-credentials? false}) r1* ( Date: Thu, 7 Sep 2023 11:36:53 +0800 Subject: [PATCH 11/19] Revert "Enhance (UX): Electron loading (#10049)" (#10165) This reverts commit 12642f57771596e18a0ace95faef4bd535d4bc5a. --- src/electron/electron/handler.cljs | 5 ----- src/electron/electron/window.cljs | 2 +- src/main/frontend/components/theme.cljs | 6 ++---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/electron/electron/handler.cljs b/src/electron/electron/handler.cljs index 3aafd38ea65..ba268fff321 100644 --- a/src/electron/electron/handler.cljs +++ b/src/electron/electron/handler.cljs @@ -6,7 +6,6 @@ ["buffer" :as buffer] ["diff-match-patch" :as google-diff] ["electron" :refer [app autoUpdater dialog ipcMain shell]] - ["electron-window-state" :as windowStateKeeper] ["fs" :as fs] ["fs-extra" :as fs-extra] ["os" :as os] @@ -619,10 +618,6 @@ (defmethod handle :window-close [^js win] (.close win)) -(defmethod handle :theme-loaded [^js win] - (.manage (windowStateKeeper) win) - (.show win)) - ;;;;;;;;;;;;;;;;;;;;;;; ;; file-sync-rs-apis ;; ;;;;;;;;;;;;;;;;;;;;;;; diff --git a/src/electron/electron/window.cljs b/src/electron/electron/window.cljs index 29c20c5cbc1..d858c76c1f4 100644 --- a/src/electron/electron/window.cljs +++ b/src/electron/electron/window.cljs @@ -35,7 +35,6 @@ :titleBarStyle "hiddenInset" :trafficLightPosition {:x 16 :y 16} :autoHideMenuBar (not mac?) - :show false :webPreferences {:plugins true ; pdf :nodeIntegration false @@ -56,6 +55,7 @@ linux? (assoc :icon (node-path/join js/__dirname "icons/logseq.png"))) win (BrowserWindow. (clj->js win-opts))] + (.manage win-state win) (.onBeforeSendHeaders (.. session -defaultSession -webRequest) (clj->js {:urls (array "*://*.youtube.com/*")}) (fn [^js details callback] diff --git a/src/main/frontend/components/theme.cljs b/src/main/frontend/components/theme.cljs index 8252f50fc7b..0e2c49a6c4d 100644 --- a/src/main/frontend/components/theme.cljs +++ b/src/main/frontend/components/theme.cljs @@ -1,6 +1,5 @@ (ns frontend.components.theme - (:require [electron.ipc :as ipc] - [frontend.extensions.pdf.core :as pdf] + (:require [frontend.extensions.pdf.core :as pdf] [frontend.config :as config] [frontend.handler.plugin :as plugin-handler] [frontend.handler.plugin-config :as plugin-config-handler] @@ -34,8 +33,7 @@ (rum/use-effect! #(let [doc js/document.documentElement] - (.setAttribute doc "lang" preferred-language) - (js/setTimeout (fn [] (ipc/ipc "theme-loaded")) 100))) ; Wait for the theme to be applied + (.setAttribute doc "lang" preferred-language))) (rum/use-effect! #(when (and restored-sidebar? From 390a7f6bb9571f3a2bf6d2088dc1261033b9ea2c Mon Sep 17 00:00:00 2001 From: Andelf Date: Thu, 7 Sep 2023 10:35:15 +0800 Subject: [PATCH 12/19] chore(scripts): use prerelease style alpha version num --- scripts/get-pkg-version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get-pkg-version.js b/scripts/get-pkg-version.js index 0b8649a5b70..495dcf4687f 100644 --- a/scripts/get-pkg-version.js +++ b/scripts/get-pkg-version.js @@ -21,7 +21,7 @@ if (match) { if (process.argv[2] === 'nightly' || process.argv[2] === '') { const today = new Date() console.log( - ver + '-nightly.' + today.toISOString().split('T')[0].replaceAll('-', '') + ver + '-alpha+nightly.' + today.toISOString().split('T')[0].replaceAll('-', '') ) } else { console.log(ver) From 645a8d32dfaa7f95d2b5d4e88918a636c433587b Mon Sep 17 00:00:00 2001 From: Andelf Date: Thu, 7 Sep 2023 10:35:30 +0800 Subject: [PATCH 13/19] chore: bump version 0.9.17 --- android/app/build.gradle | 4 ++-- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- resources/forge.config.js | 2 +- resources/package.json | 2 +- src/main/frontend/version.cljs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 6385021ae31..ceb2fb2ab41 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.logseq.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 69 - versionName "0.9.16" + versionCode 70 + versionName "0.9.17" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 1330face0f5..bb126b1d2bb 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -519,7 +519,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.9.16; + MARKETING_VERSION = 0.9.17; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -546,7 +546,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.9.16; + MARKETING_VERSION = 0.9.17; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; @@ -571,7 +571,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.9.16; + MARKETING_VERSION = 0.9.17; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; @@ -598,7 +598,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.9.16; + MARKETING_VERSION = 0.9.17; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/resources/forge.config.js b/resources/forge.config.js index fffdb278a98..73214043bbc 100644 --- a/resources/forge.config.js +++ b/resources/forge.config.js @@ -4,7 +4,7 @@ module.exports = { packagerConfig: { name: 'Logseq', icon: './icons/logseq_big_sur.icns', - buildVersion: 69, + buildVersion: 70, protocols: [ { "protocol": "logseq", diff --git a/resources/package.json b/resources/package.json index 2375b80038b..9daefdb21e8 100644 --- a/resources/package.json +++ b/resources/package.json @@ -1,7 +1,7 @@ { "name": "Logseq", "productName": "Logseq", - "version": "0.9.16", + "version": "0.9.17", "main": "electron.js", "author": "Logseq", "license": "AGPL-3.0", diff --git a/src/main/frontend/version.cljs b/src/main/frontend/version.cljs index 9e0dc6cc43f..e4a6b147ed3 100644 --- a/src/main/frontend/version.cljs +++ b/src/main/frontend/version.cljs @@ -1,3 +1,3 @@ (ns ^:no-doc frontend.version) -(defonce version "0.9.16") +(defonce version "0.9.17") From b17cf111394f09cefafe9989e231dff84eff79a4 Mon Sep 17 00:00:00 2001 From: charlie Date: Thu, 7 Sep 2023 15:19:35 +0800 Subject: [PATCH 14/19] enhance(dev): better logs --- src/main/frontend/modules/shortcut/core.cljs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/frontend/modules/shortcut/core.cljs b/src/main/frontend/modules/shortcut/core.cljs index 0805ea13c05..8e34a60df08 100644 --- a/src/main/frontend/modules/shortcut/core.cljs +++ b/src/main/frontend/modules/shortcut/core.cljs @@ -102,7 +102,7 @@ (when-let [handler (-> (get @*installed-handlers install-id) :handler)] (.dispose ^js handler) - (js/console.debug "[shortcuts]" "uninstall handler" (-> @*installed-handlers (get install-id) :group str) (if refresh? "*" "")) + (log/debug :shortcuts/uninstall-handler (-> @*installed-handlers (get install-id) :group (str (if refresh? "*" "")))) (swap! *installed-handlers dissoc install-id)))) (defn install-shortcut-handler! @@ -146,7 +146,7 @@ (.listen handler EventType/SHORTCUT_TRIGGERED f) - (js/console.debug "[shortcuts] install handler" (str handler-id)) + (log/debug :shortcuts/install-handler (str handler-id)) (swap! *installed-handlers merge data) install-id))) @@ -181,9 +181,9 @@ :will-remount (fn [old-state new-state] (util/profile "[shortcuts] reinstalled:" - (uninstall-shortcut-handler! (::install-id old-state)) - (when-let [install-id (install-shortcut-handler! handler-id {:state new-state})] - (assoc new-state ::install-id install-id)))))))) + (uninstall-shortcut-handler! (::install-id old-state)) + (when-let [install-id (install-shortcut-handler! handler-id {:state new-state})] + (assoc new-state ::install-id install-id)))))))) (defn mixin* "This is an optimized version compared to (mixin). From f786b6495b130a96d2d6d83d7d0a5c6f9e8297b2 Mon Sep 17 00:00:00 2001 From: rcmerci Date: Thu, 7 Sep 2023 11:55:46 +0800 Subject: [PATCH 15/19] add timestamp to log --- src/main/frontend/fs/sync.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs index 623a76e30d7..63e795feba0 100644 --- a/src/main/frontend/fs/sync.cljs +++ b/src/main/frontend/fs/sync.cljs @@ -3513,7 +3513,7 @@ @network-online-cursor ; is online (or (= ::stop (:state (state/get-file-sync-state))) ;; state=stopped (nil? (state/get-file-sync-state)))) ;; the whole sync state not inited yet, happens when app starts without network - (println "trying to restart sync...") + (println "trying to restart sync..." (tc/to-string (t/now))) ( Date: Thu, 7 Sep 2023 17:27:52 +0800 Subject: [PATCH 16/19] fix(sync): avoid check connectivity for non-sync graph Close #10169 --- src/main/frontend/fs/sync.cljs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs index 63e795feba0..d940b0638ae 100644 --- a/src/main/frontend/fs/sync.cljs +++ b/src/main/frontend/fs/sync.cljs @@ -3365,8 +3365,7 @@ (= 200 (:status r2*)) (= "OK" (:body r2*)))] (if ok? - (do (println :connectivity-testing-succ) - (notification/clear! :sync-connection-failed)) + (notification/clear! :sync-connection-failed) (notification/show! [:div (t :file-sync/connectivity-testing-failed) [:a {:href api-url} api-url] From 0e4e42ac2b10cf513028607d3f34747bc9ae32b8 Mon Sep 17 00:00:00 2001 From: Andelf Date: Thu, 7 Sep 2023 20:06:52 +0800 Subject: [PATCH 17/19] fix(sync): check user refresh-token as well --- src/main/frontend/fs/sync.cljs | 3 ++- src/main/frontend/handler/user.cljs | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs index d940b0638ae..52d48c20c7c 100644 --- a/src/main/frontend/fs/sync.cljs +++ b/src/main/frontend/fs/sync.cljs @@ -3509,7 +3509,8 @@ (go-loop [] ( Date: Thu, 7 Sep 2023 20:34:45 +0800 Subject: [PATCH 18/19] refactor(sync): start-sync loop --- src/main/frontend/fs/sync.cljs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs index 52d48c20c7c..366c371a0ba 100644 --- a/src/main/frontend/fs/sync.cljs +++ b/src/main/frontend/fs/sync.cljs @@ -3384,10 +3384,21 @@ "Avoid running multiple sync instances simultaneously." (atom false)) +(defn- c (persist-var/-load graphs-txid)))))) ;; not a sync graph)) + (defn Date: Thu, 7 Sep 2023 21:16:03 +0800 Subject: [PATCH 19/19] remove redundant codes --- src/main/frontend/fs/sync.cljs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs index 366c371a0ba..c3a078c01dc 100644 --- a/src/main/frontend/fs/sync.cljs +++ b/src/main/frontend/fs/sync.cljs @@ -3397,12 +3397,9 @@ (defn