From d82744549d22f9697cc7c2a7b31a98d2099b439c Mon Sep 17 00:00:00 2001
From: jaschen <cchenzyy@icloud.com>
Date: Sat, 20 Feb 2021 18:53:47 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E7=89=B9=E8=89=B2?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
journals/2020_05_14.org | 2 +-
journals/2020_05_20.org | 4 +--
journals/2020_05_31.org | 4 +--
journals/2020_06_01.org | 2 +-
journals/2021_02_20.md | 5 ++++
pages/Changelog_2020.org | 30 +++++++++----------
pages/backlinks.md | 13 --------
pages/changelog.md | 4 +--
pages/contents.md | 8 ++---
pages/knowledge_graph.md | 11 -------
pages/page_embed.md | 2 +-
...15\345\220\221\351\223\276\346\216\245.md" | 13 ++++++++
...45\350\257\206\345\233\276\350\260\261.md" | 10 +++++++
13 files changed, 56 insertions(+), 52 deletions(-)
create mode 100644 journals/2021_02_20.md
delete mode 100644 pages/backlinks.md
delete mode 100644 pages/knowledge_graph.md
create mode 100644 "pages/\345\217\215\345\220\221\351\223\276\346\216\245.md"
create mode 100644 "pages/\347\237\245\350\257\206\345\233\276\350\260\261.md"
diff --git a/journals/2020_05_14.org b/journals/2020_05_14.org
index af592895..1e129e6c 100644
--- a/journals/2020_05_14.org
+++ b/journals/2020_05_14.org
@@ -1,6 +1,6 @@
* Thursday, 05/14/2020
** [[Changelog 2020]]
-*** [[https://excalidraw.com/][Excalidraw]] Integration. [[Draw]] [[Features]]
+*** [[https://excalidraw.com/][Excalidraw]] Integration. [[Draw]] [[特色功能]]
Excalidraw is a [[https://github.com/excalidraw/excalidraw][open sourcing]] virtual whiteboard for sketching hand-drawn like diagrams.
Open <https://logseq.com/draw> and enjoy it!
*** Make it impossible for the server to know anything about the user's github token [[Security]]
diff --git a/journals/2020_05_20.org b/journals/2020_05_20.org
index a8482052..8519a6bc 100644
--- a/journals/2020_05_20.org
+++ b/journals/2020_05_20.org
@@ -3,8 +3,8 @@
*** Add page aliases (Only supporting org mode for now).
*** [[https://github.com/org-roam/org-roam][Org roam]] Integration.
Rudimentary Roam replica with Org-mode.
- [[Features]]
+ [[特色功能]]
*** Basic page graph.
- [[Features]]
+ [[特色功能]]
** [[Fixed issues]]
*** Definition list parsing
diff --git a/journals/2020_05_31.org b/journals/2020_05_31.org
index b3f92bc5..a705943f 100644
--- a/journals/2020_05_31.org
+++ b/journals/2020_05_31.org
@@ -1,10 +1,10 @@
* Sunday, 05/31/2020
** Changelog
-*** Custom journal date format support. [[Features]]
+*** Custom journal date format support. [[特色功能]]
You can set the ~:date-formatter~ in ~logseq.edn~.
The default formatter is ~"MMM do, yyyy"~, which will be something like
~Jun 1st, 2020~.
-*** Templates support . [[Features]]
+*** Templates support . [[特色功能]]
You can set the option ~:default-templates~ in the file ~logseq.edn~.
**** For Markdown users
#+BEGIN_SRC clojure
diff --git a/journals/2020_06_01.org b/journals/2020_06_01.org
index 895b371c..a8919a6d 100644
--- a/journals/2020_06_01.org
+++ b/journals/2020_06_01.org
@@ -1,6 +1,6 @@
* Jun 1st, 2020
** [[Changelog 2020]]
-*** Admonitions, inspired by [[https://asciidoctor.org/docs/user-manual/#admonition][Asciidoctor Admonitions]]. [[Features]]
+*** Admonitions, inspired by [[https://asciidoctor.org/docs/user-manual/#admonition][Asciidoctor Admonitions]]. [[特色功能]]
**** Note
#+BEGIN_NOTE
It supports */formats/* too.
diff --git a/journals/2021_02_20.md b/journals/2021_02_20.md
new file mode 100644
index 00000000..9c3ac711
--- /dev/null
+++ b/journals/2021_02_20.md
@@ -0,0 +1,5 @@
+---
+title: Feb 20th, 2021
+---
+
+##
\ No newline at end of file
diff --git a/pages/Changelog_2020.org b/pages/Changelog_2020.org
index 07e2399b..8281d0ae 100644
--- a/pages/Changelog_2020.org
+++ b/pages/Changelog_2020.org
@@ -23,7 +23,7 @@ This is our last release for 2020, it is a challenging year for everyone, stay
:created_at: 1609250758098
:last_modified_at: 1609251021197
:END:
-*** [[Features]]
+*** [[特色功能]]
:PROPERTIES:
:created_at: 1609249850194
:last_modified_at: 1609249850194
@@ -81,7 +81,7 @@ Go to ~Settings~ and toggle this button:
**** 7. ~Push now~ should always work
**** 8. Changed files are scrollable so that you can always click ~Download all files as a zip~
**** Fix a lot of CSS issues (especially on iOS)
-*** [[Features]]
+*** [[特色功能]]
:PROPERTIES:
:created_at: 1609250411844
:last_modified_at: 1609250585182
@@ -113,7 +113,7 @@ Go to ~Settings~ and toggle this button:
**** 16. Avoid Git empty commits
*** [[Enhancement]]
**** 1. Display orange dot when in editing mode
-*** [[Features]]
+*** [[特色功能]]
**** 1. Auto-export notes as zip files when you refresh the browser and there're new changes on the database schema. #data-safety
**** 2. Add ~Download all files as a zip~ support #data-safety
[[https://cdn.logseq.com/%2F8b9a461d-437e-4ca5-a2da-18b51077b5142020_11_29_Screenshot%202020-11-29%2023-42-09%20%2B0800.png?Expires=4760264603&Signature=n-hAo72C2l5wyXfOuPxas0505ftBOHNE~Yv61VEWF9m2ysp5RMkCkUJ5ZH-zYnop3AL5bpZiMIWXRH49yxpPfC1aIvcQWWp~71ZGEAIsLB3~aoL34XsfkNjujsREUE8~QXOabnzbSS8wAJ-X71TRzEOMYAhr5V0UEYJNwDEEDtUNtuE-hX1dTwZgVmoUrONDaw2oeg5cyawoxW2KIgX9UkvnhytKs8BXswM78UCFQTTNBL-QvuyjULmEObBdAjnh9I0X1YHZFg4cF-s7AB5EKYCTidpD--3lw9n-Wa2My~Te2g5VvHCZ8PwDWbCvKVN6CXMf8Zyd56EGqkYujPdwAg__&Key-Pair-Id=APKAJE5CCD6X7MP6PTEA][2020_11_29_Screenshot 2020-11-29 23-42-09 +0800.png]]
@@ -169,7 +169,7 @@ Add French language support by [[Kramer]]
**** 12. Fix a lot of CSS issues!!
*** [[Enhancement]]
**** 1. Push immediately after you save any block/create a new page
-*** [[Features]]
+*** [[特色功能]]
**** [[Page Alias]]
***** Actually, it's added months ago but it's not ready before.
***** *How to use it?*
@@ -203,7 +203,7 @@ Add French language support by [[Kramer]]
*** [[Enhancement]]
**** Global css variables support! 🎉🎉🎉
Thank you [[lachyc]]!
-*** [[Features]]
+*** [[特色功能]]
**** 1. Add ~Deadline~ and ~Scheduled~ support!
*How to use it?*
1. Type ~/deadline~ or ~/scheduled~ in the block editor.
@@ -266,7 +266,7 @@ The spent time for this block is ~18s~.
**** 7. [[https://github.com/logseq/logseq-internal/pull/154][Cannot drag a block to the first position in a page]] (by [[meh]])
**** 8. [[https://github.com/logseq/logseq/issues/376][Fix cannot drag a block to the first position in a page]] (by [[meh]])
**** 9. Fix inline math parsing
-*** [[Features]]
+*** [[特色功能]]
**** 1. [[Custom theme]] support!!
***** There're two ways for custom themes:
****** 1. Add a css file "logseq/custom.css".
@@ -285,7 +285,7 @@ The spent time for this block is ~18s~.
**** 5. Fixed git branches other than ~master~ not working
*** [[Enhancement]]
**** Better undo && redo
-*** [[Features]]
+*** [[特色功能]]
**** 1. Type ~s~ to switch between the file and the corresponding page (non editing mode)
**** 2. Grammarly support even for single-line blocks
Add ~:enable-grammarly? true~ to the file ~logseq/config.edn~.
@@ -302,7 +302,7 @@ Add ~:enable-grammarly? true~ to the file ~logseq/config.edn~.
**** 2. Fixed custom queries which make the app not responding
**** 3. Allow deleting journal pages
**** 4. Fixed dropdown modal display (by [[meh]])
-*** [[Features]]
+*** [[特色功能]]
**** 1. Publishing #experiment
Check out the [[https://logseq.github.io/page/publishing][docs]].
** [[Sep 28th, 2020]]
@@ -323,7 +323,7 @@ Check out the [[https://logseq.github.io/page/publishing][docs]].
**** 3. Fixed deleting blocks not working in the "References" section
**** 4. Fixed code block doesn't render when it starts with ~:xx~
**** 5. Fixed ~Ctrl + K~ linking not inserting cursor correctly
-*** [[Features]]
+*** [[特色功能]]
**** 1. Multi-line *Displayed Math* support (Katex syntax wrapped by ~$$~)
#+BEGIN_EXAMPLE
$$
@@ -348,7 +348,7 @@ You can right click the block dot and click "Make template" to give it a name. F
**** 3. Fixed embedding block with only table shows nothing
**** 4. Fixed embedding an empty page (no block) creates unreadable .md files
**** 5. Fixed embedded todos don't consistently update as expected
-*** [[Features]]
+*** [[特色功能]]
**** 1. You can change the default home page now, check #faq
** [[Sep 20th, 2020]]
*Version 0.0.3.2*
@@ -375,7 +375,7 @@ To add a property to any block, you can right click the left dot and click ~Add
**** 2. Fixed deleting in backlinks not triggering github sync
**** 3. Fixed Page titles when zoomed into a block
**** 4. Fixed embedded todos don't consistently update as expected
-*** [[Features]]
+*** [[特色功能]]
**** Convert a block to/from a heading
:PROPERTIES:
:background_color: rgb(83, 62, 125)
@@ -390,7 +390,7 @@ Click ~Convert back to a block~.
You can also change the background color of any block, it doesn't have to be a heading.
** [[Sep 14th, 2020]]
*Version 0.0.2.9*
-*** [[Features]]
+*** [[特色功能]]
**** 1. [[Internationalization]] (Special thanks to @Kamal for support!)
你好世界！ Logseq is coming to 30+ languages, and this release adds support for Chinese (Simplified) and Afrikaans. Languages will be automatically applied depending on your browser settings; if not, go to Settings to manually select languages.
***** English, Chinese (Simplified), Afrikaans: Supported today
@@ -405,7 +405,7 @@ If you want to help translate Logseq, sign up here: https://crwd.in/logseq
**** 3. Better undo/redo behavior
**** 4. Support multiple notifications now (by haoji)
**** 5. *All pages* support ~shift+click~ to open in right sidebar (by haoji)
-*** [[Features]]
+*** [[特色功能]]
**** 1. [[Shortcuts change]]
[[https://cdn.logseq.com/%2F8b9a461d-437e-4ca5-a2da-18b51077b5142020_09_13_Screenshot%202020-09-13%2015-36-10%20%2B0800.png?Expires=4753582587&Signature=GAjAjKEAx-8ItK04aNXqQzd8NQjfnHi9~CVJeho2yBP5E38BFKqMSVYC5Y1eQaz7jbksyKMuJi27NnM92FrZYJiCgUWtuV1txBhl2ANBRnRHUON7QzLFvY1wZI9~7~QTTsLYBxCDnsynoz3Bp0gS1kmn8eBWFq1KZtrHZ3mGs7HHDREI2PZJHTQsE4qXN1DENh~0RuZ0UsCBisu~5H1JtzDT2riUCurZm08G3EdSZ33Yrr7InA7~EDT8W-lCGhJp9VJSeWpRkYJXPKuwT6RQiA6ZyrLKtDPzn4p3Ik9bNSemIYaNedUt-TKAgDbk17TKrCYk~6QYI8~7EwK87crLQA__&Key-Pair-Id=APKAJE5CCD6X7MP6PTEA][2020_09_13_Screenshot 2020-09-13 15-36-10 +0800.png]]
** [[Sep 11th, 2020]]
@@ -418,7 +418,7 @@ If you want to help translate Logseq, sign up here: https://crwd.in/logseq
**** 5. Fixed code block highlighting performance issue
**** 6. Make it compatible with new date format with roam when importing json
**** 7. Fixed page rename && delete
-*** [[Features]]
+*** [[特色功能]]
**** 1. [[Developer mode]] (by haoji) #experiment
Developer mode helps contributors and extension developers test their integration with Logseq more efficient.
** [[Sep 9th, 2020]]
@@ -431,7 +431,7 @@ Logseq is migrating to creating journal pages on a daily basis for better perfor
*** [[Fixed Issues]]
**** 1. Fixed not able to DELETE a Page or even Rename a page
**** 2. Fixed an issue where contents page might show ~[[]]~ on page links
-*** [[Features]]
+*** [[特色功能]]
**** 1. In search menu, you can press ~shift~ when clicking on a link to open it in sidebar
**** 2. Supports directly adding pages to contents in page menu
** [[Sep 8th, 2020]]
diff --git a/pages/backlinks.md b/pages/backlinks.md
deleted file mode 100644
index ed29a347..00000000
--- a/pages/backlinks.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: Backlinks
----
-
-## A backlink is a link from one page to another and contributes to the [[Linked References]] pane at the bottom of the linked page.
-## Create a backlink by surrounding a word or sentence with a pair of square brackets e.g `[[logseq]]`. Typing `[[` will initiate page auto-completion.
-##
-#+BEGIN_TIP
-- Clicking a backlink will open the linked page in the main window
-- Shift + clicking a backlink will open the linked page in the sidebar
-- Opening a backlink to a page which does not currently exist will create a new page with the backlink text as its title
-- The [[Unlinked References]] list located below [[Linked References]] on a page displays potential backlinks, files which refer to the page but do not have a relevant backlink present.
- #+END_TIP
diff --git a/pages/changelog.md b/pages/changelog.md
index 252e6180..ecc7237c 100644
--- a/pages/changelog.md
+++ b/pages/changelog.md
@@ -34,7 +34,7 @@ https://github.com/WilliamDurin/gcal2logseq
**Version 0.0.7**
[[Desktop app]] download link:
https://github.com/logseq/logseq/releases/tag/0.0.7
-### [[Features]]
+### [[特色功能]]
#### 1. Auto-update support for desktop app #experiment
#### 2. Add both `data-refs` and `data-href` attributes to [make css more power](https://discuss.logseq.com/t/propositions-to-empower-css-mods/289/1)
### [[Thanks]]
@@ -92,7 +92,7 @@ Some highlights:
#### 3. Drag && drop any files (in editing mode), you can click the link to open the file with the system default app
## [[Jan 12th, 2021]]
**Version 0.0.5.1**
-### [[Features]]
+### [[特色功能]]
#### 1. **Local images support!**
`Notice:` it only supports local file storage.
You can copy and paste any pictures to a page, those pictures will be stored in the folder `assets/`.
diff --git a/pages/contents.md b/pages/contents.md
index e7b37bef..2ee12a44 100644
--- a/pages/contents.md
+++ b/pages/contents.md
@@ -5,12 +5,12 @@
### [Glossary](https://discuss.logseq.com/t/glossary-draft-work-in-progress/196)
### [[Testimonials]]
### [Awesome Logseq](https://github.com/logseq/awesome-logseq)
-## [[Features]]
-### [[Backlinks]]
-### [[Knowledge Graph]]
+## [[特色功能]]
+### [[反向链接]]
+### [[知识图谱]]
### [[Page and Block Embeds][Page and Block Embeds - {{embed (())}}]]
### [[Page and Block References][Page and Block References - ((block))]]
-### [[Tasks & Todos]]
+### [[任务和待办事项]]
### [[Commands]]
#### [[Advanced commands]]
### [Templates](https://discuss.logseq.com/t/templates-how-to-create-edit-and-insert/200)
diff --git a/pages/knowledge_graph.md b/pages/knowledge_graph.md
deleted file mode 100644
index efa40060..00000000
--- a/pages/knowledge_graph.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Knowledge Graph
----
-
-## As you add ideas and thoughts into Logseq and connect them, your knowledge graph grows. Just as your brain generates and connects new neurons to form new knowledge and ideas.
-
-## These connections are what makes Logseq so powerful as a second brain, we generate and synthesize information much like your won brain does, but better.
-## In Logseq, you can filter and even "remember" loose connections by checking out your linked references. You can see all the times you thought about [[Productivity]] and [[Habit Creation]] in their separate nodes and areas of your graph, but you never thought to connect the two. But since you wrote [[Productivity]] and happened to mention [[Habit Creation]] 4 months ago (in some random journal or essay), that proximity and connection live with you forever, even if you never drew the lines in your own head:
-{:height 338, :width 468}
-## Watch your knowledge graph grow by going to your main menu (click your profile picture) -> select "Graph"
-### Here is the [Documentation Graph ->](https://logseq.github.io/graph)
diff --git a/pages/page_embed.md b/pages/page_embed.md
index bd06ea7a..57c91886 100644
--- a/pages/page_embed.md
+++ b/pages/page_embed.md
@@ -9,5 +9,5 @@ tags: [[embed]]
##
#+BEGIN_TIP
- Edits made to the embedded content are also made to the referenced content.
-- Embedding does not contribute to a page's [[Linked References]]
+- Embedding does not contribute to a page's [[链接到的引用]]
#+END_TIP
\ No newline at end of file
diff --git "a/pages/\345\217\215\345\220\221\351\223\276\346\216\245.md" "b/pages/\345\217\215\345\220\221\351\223\276\346\216\245.md"
new file mode 100644
index 00000000..4444b8b8
--- /dev/null
+++ "b/pages/\345\217\215\345\220\221\351\223\276\346\216\245.md"
@@ -0,0 +1,13 @@
+---
+title: 反向链接
+---
+
+## 反向链接是指一个页面链接到了另外一个页面，在被链接的页面的底部会显示 [[链接到的引用]]
+## 使用两个方括号来创建一个链接，例如 `[[logseq]]`. 输入 `[[` 会触发自动补全。
+##
+#+BEGIN_TIP
+- 点击一个反向链接会在主界面打开它
+- 按住shift点击反向链接会在侧边栏打开它
+- 打开一个不存在的链接的时候，会用链接的名字作为标题创建一个页面
+- [[未链接到的引用]] 显示在 [[链接到的引用]]的下方，它表示可能存在的引用关系,也就是说有页面使用了本页的内容，但是没有创建链接
+ #+END_TIP
diff --git "a/pages/\347\237\245\350\257\206\345\233\276\350\260\261.md" "b/pages/\347\237\245\350\257\206\345\233\276\350\260\261.md"
new file mode 100644
index 00000000..1f03f909
--- /dev/null
+++ "b/pages/\347\237\245\350\257\206\345\233\276\350\260\261.md"
@@ -0,0 +1,10 @@
+---
+title: 知识图谱
+---
+
+## 随着你向Logseq中添加新的灵感和想法，然后链接他们，你的知识图谱也随之建立。就像是你的大脑生长出了新的神经元和突触一样。
+## 正是这些链接才让作为第二大脑的Logseq具有强大的力量，我们像大脑一样创建和组合信息，但是在Logseq，你可以做的比大脑还要好。
+## 在Logseq中，你可以使用过滤功能来找到那些即将被遗忘的链接，通过检查你创建的链接，你讲逐步回忆起那些知识。你可以看到你关于 [[生产力]] 和 [[习惯养成]] 的一切笔记。虽然你可能认为他们两个是单独的两个节点，没有什么关系。但是在4个月之前的笔记中，在讨论生产力的时候你无意的提到了习惯养成，这种链接就被Logseq永久的记录下来了，即使你在大脑中没有将这两个想到一起。
+{:height 338, :width 468}
+## 记得时刻查看你的知识图谱的成长状况，在主界面点击你的头像，选择「知识图谱」
+### 这是这份文档的图谱 [Documentation Graph ->](https://logseq.github.io/graph)
\ No newline at end of file
From 2836ce6ef4004cfd2ed2796ecd3e1994c0a1570d Mon Sep 17 00:00:00 2001
From: zhanghanduo <zhanghanduo@live.cn>
Date: Wed, 24 Feb 2021 09:21:09 +0800
Subject: [PATCH 2/5] update chinese version alias, import and publishing
---
journals/2021_02_24.md | 5 +++++
pages/Changelog_2020.org | 6 +++---
pages/contents.md | 6 +++---
pages/page_alias.md | 17 -----------------
pages/publishing.md | 16 ----------------
...\254\345\274\200\345\217\221\345\270\203.md" | 16 ++++++++++++++++
...\265\351\235\242\345\210\253\345\220\215.md" | 17 +++++++++++++++++
7 files changed, 44 insertions(+), 39 deletions(-)
create mode 100644 journals/2021_02_24.md
delete mode 100644 pages/page_alias.md
delete mode 100644 pages/publishing.md
create mode 100644 "pages/\345\205\254\345\274\200\345\217\221\345\270\203.md"
create mode 100644 "pages/\351\241\265\351\235\242\345\210\253\345\220\215.md"
diff --git a/journals/2021_02_24.md b/journals/2021_02_24.md
new file mode 100644
index 00000000..171c7e9c
--- /dev/null
+++ b/journals/2021_02_24.md
@@ -0,0 +1,5 @@
+---
+title: Feb 24th, 2021
+---
+
+##
\ No newline at end of file
diff --git a/pages/Changelog_2020.org b/pages/Changelog_2020.org
index 8281d0ae..d09bdb37 100644
--- a/pages/Changelog_2020.org
+++ b/pages/Changelog_2020.org
@@ -49,7 +49,7 @@ Each block will have both a ~created_at~ property and a ~last_modified_at~ prope
:END:
Go to ~Settings~ and toggle this button:
[[https://cdn.logseq.com/%2F5ff0a01d-47d4-487d-b346-4a43ded21ad02020_12_29_Screenshot%202020-12-29%2022-11-59%20%2B0800.png?Expires=4762851199&Signature=GMZt7WsfluDKWPeM1mNeg0ITna9S8ZCf4VYqKLKuVrrsYNHXggkMclB8af6hTaozDpNSBIxh-55d~edmfi3vquCKvXKPAccwkpLj2Uy-OIEy13h~vUzsWN0M59u17qnhgLWdfLxH9yOgasjoE8rv-oDNoI~TCl7Z6~aKRq~peGre2ikgJ6E6pPXTelwEW9NqnWKjho3R~aE9XcA3~aUSYjzTjxPG7z4SDVMrLm1ZQH~xqmoDEAe3TwHbSnrfrswElRMtYVaiGTancvSmRoxw-tsR6M7kFItwJmc8sGeiRPBG2lga9zP~2PH5Itws2TazQGNBqor8qWOhgdb5X4rF2A__&Key-Pair-Id=APKAJE5CCD6X7MP6PTEA][2020_12_29_Screenshot 2020-12-29 22-11-59 +0800.png]]
-**** [[Page Alias]] redirection support
+**** [[页面别名]] redirection support
:PROPERTIES:
:created_at: 1609251086056
:last_modified_at: 1609251086056
@@ -170,10 +170,10 @@ Add French language support by [[Kramer]]
*** [[Enhancement]]
**** 1. Push immediately after you save any block/create a new page
*** [[特色功能]]
-**** [[Page Alias]]
+**** [[页面别名]]
***** Actually, it's added months ago but it's not ready before.
***** *How to use it?*
-****** {{{embed [[Page Alias]] }}}
+****** {{{embed [[页面别名]] }}}
** [[Oct 28th, 2020]]
*Version 0.0.4.3*
*** [[Fixed issues]]
diff --git a/pages/contents.md b/pages/contents.md
index 2ee12a44..fdf55964 100644
--- a/pages/contents.md
+++ b/pages/contents.md
@@ -14,9 +14,9 @@
### [[Commands]]
#### [[Advanced commands]]
### [Templates](https://discuss.logseq.com/t/templates-how-to-create-edit-and-insert/200)
-### [[Import && Export]]
-### [[Page Alias]]
-### [[Publishing]]
+### [[导入和导出]]
+### [[页面别名]]
+### [[公开发布]]
### [[Block properties]]
:PROPERTIES:
:created_at: 1609233128830
diff --git a/pages/page_alias.md b/pages/page_alias.md
deleted file mode 100644
index 7e1166b3..00000000
--- a/pages/page_alias.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Page Alias
----
-
-## You can add any page alias to your existing pages.
-### For [[Markdown]] users:
-####
-#+BEGIN_EXAMPLE
----
-alias: page1, page2
----
-#+END_EXAMPLE
-### For [[Org Mode]] users:
-####
-#+BEGIN_EXAMPLE
-#+ALIAS: page1, page2
-#+END_EXAMPLE
diff --git a/pages/publishing.md b/pages/publishing.md
deleted file mode 100644
index 003f2cb7..00000000
--- a/pages/publishing.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: Publishing
----
-
-## How to publish your knowledge base to Github pages or any hosting server?
-- Download the latest publishing [release](https://github.com/logseq/logseq/releases/tag/0.0.6.0) and unzip it.
-- Go to the pages that you'd like to deploy to the public, click the right vertical menu, then click "Publish" and select "Publish it when exporting to an HTML file".
-
-- You can also choose to make all the pages public by adding `:all-pages-public? true` to `logseq/config.edn`.
-
-- Update the `logseq/config.edn`, you can configure the home page to be something like this:
-[[https://cdn.logseq.com/%2F8b9a461d-437e-4ca5-a2da-18b51077b5142020_10_02_Screenshot%202020-10-02%2009-14-11%20%2B0800.png?Expires=4755201265&Signature=myAhcN95Rv6u6q6ywW0PwVh~NKDgFC7plh8DXMhfkZ1VSo702cNhWApXLL32pvWKQlHOVNzSSjvwuXshjhiZ-ekR7QshiicZJP3--bhGZ0DHCx8ElZGGeUOol1DTPCXoqdBPuS6WCQEu76DCVhxAIMfAvHAIRIleSDau57TY4STGECb7cHPXBoDw2rVJsnQ9lIVTNf0k4Ola32EopRpjZ1yDlo1uqHHUgmj~RJO-VnzXmz4rGoHJ-kx~PjMJezqBuDfao2RDc5k75otH8EJydVOzVelfp89a4rkCcCjNOt2BgiYw1Bl04Fs~SpIYz-stC88JZnsaJ-WZVt0V7bk11Q__&Key-Pair-Id=APKAJE5CCD6X7MP6PTEA][2020_10_02_Screenshot 2020-10-02 09-14-11 +0800.png]]
-
-- Go to https://logseq.com, click the user avatar and then click "Export public pages" to download an `index.html` file, put it in your unzipped folder.
-- Deploy the folder to your GitHub pages (gh-pages branch) or any server.
-## We'll make it much easier for publishing in the future, for example, you can click a "Publish" button which will deploy to your preferred hosting solution (gh pages, netlify, etc.).
diff --git "a/pages/\345\205\254\345\274\200\345\217\221\345\270\203.md" "b/pages/\345\205\254\345\274\200\345\217\221\345\270\203.md"
new file mode 100644
index 00000000..82034012
--- /dev/null
+++ "b/pages/\345\205\254\345\274\200\345\217\221\345\270\203.md"
@@ -0,0 +1,16 @@
+---
+title: 公开发布
+---
+
+## 如何把你的知识库公开发布到[GitHub pages](https://pages.github.com/)上或者任意网页托管服务器上?
+- 下载最新的发布代码文件 [release](https://github.com/logseq/logseq/releases/tag/0.0.6.0) 并unzip解压缩它.
+- 进入你想要将其公开发布的那个页面,点击标题右侧的三点菜单栏,点击"发布"("publish")并选择"导出HTML时发布本页面"的按钮.
+
+- 你也可以选择通过在`logseq/config.edn`中添加`:all-pages-public? true` 将所有的页面公开.
+
+- 更新`logseq/config.edn`,你可以通过如下图所示的方法配置主页
+[[https://cdn.logseq.com/%2F8b9a461d-437e-4ca5-a2da-18b51077b5142020_10_02_Screenshot%202020-10-02%2009-14-11%20%2B0800.png?Expires=4755201265&Signature=myAhcN95Rv6u6q6ywW0PwVh~NKDgFC7plh8DXMhfkZ1VSo702cNhWApXLL32pvWKQlHOVNzSSjvwuXshjhiZ-ekR7QshiicZJP3--bhGZ0DHCx8ElZGGeUOol1DTPCXoqdBPuS6WCQEu76DCVhxAIMfAvHAIRIleSDau57TY4STGECb7cHPXBoDw2rVJsnQ9lIVTNf0k4Ola32EopRpjZ1yDlo1uqHHUgmj~RJO-VnzXmz4rGoHJ-kx~PjMJezqBuDfao2RDc5k75otH8EJydVOzVelfp89a4rkCcCjNOt2BgiYw1Bl04Fs~SpIYz-stC88JZnsaJ-WZVt0V7bk11Q__&Key-Pair-Id=APKAJE5CCD6X7MP6PTEA][2020_10_02_Screenshot 2020-10-02 09-14-11 +0800.png]]
+
+- 进入 https://logseq.com, 点击右上角三点菜单栏并点击"导出公开页面"下载一个`index.html`的文件,并将它放到你解压后的文件夹中.
+- 将这个文件夹部署到GitHub pages ('gh-pages' 分支) 或者任意服务器上.
+## 我们将在未来提供更为便捷的发布方式,比如,你可有直接通过点击"发布"按钮就可以通过你喜欢的托管方式 (GitHub pages, Netlify, 等等)进行部署.
diff --git "a/pages/\351\241\265\351\235\242\345\210\253\345\220\215.md" "b/pages/\351\241\265\351\235\242\345\210\253\345\220\215.md"
new file mode 100644
index 00000000..de65e5f8
--- /dev/null
+++ "b/pages/\351\241\265\351\235\242\345\210\253\345\220\215.md"
@@ -0,0 +1,17 @@
+---
+title: 页面别名
+---
+
+## 你可以为现有的页面添加任意别名
+### 对 [[Markdown]] 的使用者来说:
+####
+#+BEGIN_EXAMPLE
+---
+alias: page1, page2
+---
+#+END_EXAMPLE
+### 对 [[Org Mode]] 使用者来说:
+####
+#+BEGIN_EXAMPLE
+#+ALIAS: page1, page2
+#+END_EXAMPLE
\ No newline at end of file
From eff4376bb6a1377e7c27b15ebdbefecd2dd42f74 Mon Sep 17 00:00:00 2001
From: zhanghanduo <zhanghanduo@live.cn>
Date: Wed, 24 Feb 2021 09:30:06 +0800
Subject: [PATCH 3/5] update chinese version block properties
---
pages/Changelog_2020.org | 2 +-
pages/advanced_commands.md | 4 +--
pages/contents.md | 6 ++--
pages/slide.md | 2 +-
.../\345\235\227\345\261\236\346\200\247.md" | 34 +++++++++----------
.../\346\237\245\350\257\242.md" | 8 ++---
...30\347\272\247\346\237\245\350\257\242.md" | 4 +--
7 files changed, 30 insertions(+), 30 deletions(-)
rename pages/block_properties.md => "pages/\345\235\227\345\261\236\346\200\247.md" (70%)
rename pages/queries.md => "pages/\346\237\245\350\257\242.md" (98%)
rename pages/Advanced_Queries.md => "pages/\351\253\230\347\272\247\346\237\245\350\257\242.md" (99%)
diff --git a/pages/Changelog_2020.org b/pages/Changelog_2020.org
index d09bdb37..68c593ef 100644
--- a/pages/Changelog_2020.org
+++ b/pages/Changelog_2020.org
@@ -28,7 +28,7 @@ This is our last release for 2020, it is a challenging year for everyone, stay
:created_at: 1609249850194
:last_modified_at: 1609249850194
:END:
-**** Simple [[Queries]] support #experiment
+**** Simple [[查询]] support #experiment
:PROPERTIES:
:created_at: 1609249966260
:last_modified_at: 1609251607921
diff --git a/pages/advanced_commands.md b/pages/advanced_commands.md
index 7d8c83d0..12967c3c 100644
--- a/pages/advanced_commands.md
+++ b/pages/advanced_commands.md
@@ -6,9 +6,9 @@ title: Advanced commands
## List of advanced commands:
### `<Quote` - Displays text as quoted by indenting text and giving it left and right margins.
### `<Src` - Syntax highlights code text using CodeMirror. Passing an argument to the block e.g. `#+BEGIN_SRC clojure` sets the language. Default language is javascript.
-### `<Query` - Defines a block for [[Advanced Queries]]. Block renders query results when not being edited.
+### `<Query` - Defines a block for [[高级查询]]. Block renders query results when not being edited.
### `<Latex export` - TODO
-### `<Properties`- Defines [[Block properties]]. Each line is a different property.
+### `<Properties`- Defines [[块属性]]. Each line is a different property.
### Admonition commands display an icon next to a block to call attention to it for a specific purpose. These are inspired by [Asciidoctor admonitions](https://asciidoctor.org/docs/user-manual/#admonition).
#### `<Note`
#### `<Tip`
diff --git a/pages/contents.md b/pages/contents.md
index fdf55964..509c3212 100644
--- a/pages/contents.md
+++ b/pages/contents.md
@@ -17,7 +17,7 @@
### [[导入和导出]]
### [[页面别名]]
### [[公开发布]]
-### [[Block properties]]
+### [[块属性]]
:PROPERTIES:
:created_at: 1609233128830
:last_modified_at: 1609233128830
@@ -39,8 +39,8 @@
## ✨ [[Tips and Tricks]]
## [[Advanced Logseq]]
### [[Custom keyboard shortcuts]]
-### [[Queries]]
-#### [[Advanced Queries]]
+### [[查询]]
+#### [[高级查询]]
### [[Hiccup]]
### [[Custom views]]
### [Self Hosting Logseq](https://github.com/dustinlacewell/logseq-guide)
diff --git a/pages/slide.md b/pages/slide.md
index 095c4d28..59437ce8 100644
--- a/pages/slide.md
+++ b/pages/slide.md
@@ -12,7 +12,7 @@ It'll open the current page's slide in the right sidebar.
### 2. Press `f` to open the slide in _fullscreen_ mode.
## **Questions**
### 1. How to add a background image for a block?
-#### Add a `background-image` property #[[Block properties]]
+#### Add a `background-image` property #[[块属性]]
#+BEGIN_EXAMPLE
:PROPERTIES:
:background-image: https://images.unsplash.com/photo-1498855926480-d98e83099315
diff --git a/pages/block_properties.md "b/pages/\345\235\227\345\261\236\346\200\247.md"
similarity index 70%
rename from pages/block_properties.md
rename to "pages/\345\235\227\345\261\236\346\200\247.md"
index 803afd7b..a80c4408 100644
--- a/pages/block_properties.md
+++ "b/pages/\345\235\227\345\261\236\346\200\247.md"
@@ -1,17 +1,17 @@
---
-title: Block properties
+title: 块属性
---
-## Properties are key-value pairs associated with a block.
+## 属性(`Properties`)是指隶属于块(block)的键值对(Key-Value pairs)
:PROPERTIES:
-:created_at: 1609337544932
:last_modified_at: 1609337544932
+:created_at: 1609337544932
:END:
-## A Properties section can be defined:
-### by selecting the command `<Properties`
-### by right clicking the left dot and clicking `Add a property`.
-## Usage Example:
-### Let's add two books:
+## A Properties section can be defined: 一个属性区可以这样定义:
+### 通过输入指令 `<Properties`
+### 通过右键点击块的左侧圆点并选择 `Add a property`.
+## 例子:
+### 让我们添加两本书:
#### [[How to take smart notes]]
:PROPERTIES:
:type: [[book]]
@@ -29,21 +29,21 @@ title: Block properties
:last_modified_at: 1609337985298
:id: 5fec89e0-2b4b-4829-9697-00c139165e59
:END:
-## `Properties` can be used for selecting specific blocks.
+## `Properties` 可以被用来定位选择特定的块.
:PROPERTIES:
-:created_at: 1609233183055
:last_modified_at: 1609233190917
+:created_at: 1609233183055
:END:
-### For example, let's query all the blocks with the property "type" and the value "book" #examples #books
+### 比如,让我们查询所有包含属性为"type",而这个属性的值为"book"的块 #examples #books
:PROPERTIES:
-:created_at: 1609337879435
:last_modified_at: 1609337879435
+:created_at: 1609337879435
:END:
{{query (property type book)}}
-#### Or, we can use the [[Advanced Queries]]:
+#### 或者,我们可以用 [[高级查询]]:
:PROPERTIES:
-:created_at: 1609337897497
:last_modified_at: 1609337897497
+:created_at: 1609337897497
:END:
#+BEGIN_SRC clojure
@@ -59,8 +59,8 @@ title: Block properties
#+END_SRC
####
:PROPERTIES:
-:created_at: 1609337407330
:last_modified_at: 1609337407330
+:created_at: 1609337407330
:END:
#+BEGIN_QUERY
{:title [:h2 "My books"]
@@ -71,5 +71,5 @@ title: Block properties
[(= "[[book]]" ?t)]]
}
#+END_QUERY
-## **Resources**
-### 1. [[https://orgmode.org/guide/Properties.html][Org-mode properties]]
+## **相关资源**
+### 1. [[https://orgmode.org/guide/Properties.html][Org-mode properties]]
\ No newline at end of file
diff --git a/pages/queries.md "b/pages/\346\237\245\350\257\242.md"
similarity index 98%
rename from pages/queries.md
rename to "pages/\346\237\245\350\257\242.md"
index 2c01c233..98db8dd6 100644
--- a/pages/queries.md
+++ "b/pages/\346\237\245\350\257\242.md"
@@ -1,5 +1,5 @@
---
-title: Queries
+title: 查询
---
## **What are "Queries"?**
@@ -30,7 +30,7 @@ title: Queries
{{query Something you're looking for}}
#+END_EXAMPLE
You can type `/query` to create a simple query.
-2. [[Advanced Queries]]
+2. [[高级查询]]
## **Simple Queries filters**
:PROPERTIES:
:created_at: 1609237391135
@@ -86,7 +86,7 @@ Examples:
(between created_at -7d 7d)
(between last_modified_at -7d 7d)
#+END_EXAMPLE
-### **property** [[Block properties]]
+### **property** [[块属性]]
:PROPERTIES:
:created_at: 1609237428110
:last_modified_at: 1609247365218
@@ -196,4 +196,4 @@ Format: `(sort-by key order)` or `(sort-by key)`
:END:
#+BEGIN_EXAMPLE
{{query (between created_at today tomorrow)}}
-#+END_EXAMPLE
+#+END_EXAMPLE
\ No newline at end of file
diff --git a/pages/Advanced_Queries.md "b/pages/\351\253\230\347\272\247\346\237\245\350\257\242.md"
similarity index 99%
rename from pages/Advanced_Queries.md
rename to "pages/\351\253\230\347\272\247\346\237\245\350\257\242.md"
index 4d9b4a38..572d22d2 100644
--- a/pages/Advanced_Queries.md
+++ "b/pages/\351\253\230\347\272\247\346\237\245\350\257\242.md"
@@ -1,5 +1,5 @@
---
-title: Advanced Queries
+title: 高级查询
---
## The database that Logseq used is [[https://github.com/tonsky/datascript][Datascript]], which is an immutable in-memory database and [Datalog](https://en.wikipedia.org/wiki/Datalog) query engine in Clojure and ClojureScript.
@@ -256,4 +256,4 @@ https://gist.github.com/tiensonqin/9a40575827f8f63eec54432443ecb929
#+END_SRC
## **Resources**
### [^1]: [Learn Datalog Today](http://www.learndatalogtoday.org/) is an interactive tutorial designed to teach you the Datomic dialect of Datalog.
-### [^2]: [[https://docs.datomic.com/query.html][Datomic query documentation]]
+### [^2]: [[https://docs.datomic.com/query.html][Datomic query documentation]]
\ No newline at end of file
From 4b2fc2510c92b1782c1e5921a8dd835e48a8b242 Mon Sep 17 00:00:00 2001
From: zhanghanduo <zhanghanduo@live.cn>
Date: Wed, 24 Feb 2021 09:51:33 +0800
Subject: [PATCH 4/5] update simple query
---
.../\344\276\213\345\255\220.md" | 4 +-
.../\345\235\227\345\261\236\346\200\247.md" | 2 +-
"pages/\346\237\245\350\257\242.md" | 110 +++++++++---------
3 files changed, 58 insertions(+), 58 deletions(-)
rename pages/examples.md => "pages/\344\276\213\345\255\220.md" (97%)
diff --git a/pages/examples.md "b/pages/\344\276\213\345\255\220.md"
similarity index 97%
rename from pages/examples.md
rename to "pages/\344\276\213\345\255\220.md"
index 7b8ef68a..e3b0beef 100644
--- a/pages/examples.md
+++ "b/pages/\344\276\213\345\255\220.md"
@@ -1,5 +1,5 @@
---
-title: examples
+title: 例子
---
## Project management
@@ -36,4 +36,4 @@ title: examples
:PROPERTIES:
:created_at: 1609233523981
:last_modified_at: 1609234730471
-:END:
+:END:
\ No newline at end of file
diff --git "a/pages/\345\235\227\345\261\236\346\200\247.md" "b/pages/\345\235\227\345\261\236\346\200\247.md"
index a80c4408..1d0ec7dc 100644
--- "a/pages/\345\235\227\345\261\236\346\200\247.md"
+++ "b/pages/\345\235\227\345\261\236\346\200\247.md"
@@ -34,7 +34,7 @@ title: 块属性
:last_modified_at: 1609233190917
:created_at: 1609233183055
:END:
-### 比如,让我们查询所有包含属性为"type",而这个属性的值为"book"的块 #examples #books
+### 比如,让我们查询所有包含属性为"type",而这个属性的值为"book"的块 #例子 #books
:PROPERTIES:
:last_modified_at: 1609337879435
:created_at: 1609337879435
diff --git "a/pages/\346\237\245\350\257\242.md" "b/pages/\346\237\245\350\257\242.md"
index 98db8dd6..2b464edf 100644
--- "a/pages/\346\237\245\350\257\242.md"
+++ "b/pages/\346\237\245\350\257\242.md"
@@ -2,46 +2,46 @@
title: 查询
---
-## **What are "Queries"?**
+## **什么是"查询"(queries)?**
:PROPERTIES:
-:created_at: 1609230242742
:last_modified_at: 1609247076654
+:created_at: 1609230242742
:END:
-### Queries are for asking questions from your knowledge base and the outside world (in the coming weeks).
+### 查询(queries)就是从你的知识库里或者外部世界(未来几周会加入此功能)提出问题寻求解答
:PROPERTIES:
-:created_at: 1609230243642
:last_modified_at: 1609231528688
+:created_at: 1609230243642
:END:
[:div [:img {:src "https://cdn.logseq.com/%2F5ff0a01d-47d4-487d-b346-4a43ded21ad02020_12_29_photo-1444703686981-a3abbc4d4fe3.jpeg?Expires=4762830816&Signature=h~yT-Tq1VtBtEm09Z78eT5kkEbQGUVG-VBEDuGLgykW8vb~AkZNuoRNmwL-fcHgnG8HdYBhqXeJowN9q3my4UN1bxiJtAXl0dAEjmWAqpbedH9PPdyz2tZXcuPxwdk5wICFLrB~0VWMwV02LFZEKkgPYGhkUU8oakBphifgvTdYPKLQG95FTJh9kg7GhV5ZCc1Q3JrOlLGG2fuUObf1opScwbNbEdsQStO8Ou12AaTPccAmpxAJVuut-jZ9pRvdsa00X962QD9c67BEw1SfhKEcChNIbdp~44ltuRj1Bvc1Bs2ezKupQ1sWFD5BG97UEA7GuOyANjPC331ShW8aHSQ__&Key-Pair-Id=APKAJE5CCD6X7MP6PTEA"}]]
[:div.text-sm "By " [:a {:href "https://unsplash.com/photos/oMpAz-DN-9I" :target "_blank"} "Greg Rakozy"]]
-## **How to write queries?**
+## **如何编写查询语句?**
:PROPERTIES:
-:created_at: 1609231967174
:last_modified_at: 1609251558592
:id: 5feb30e3-fedc-4c2a-aa03-b44020c21c68
+:created_at: 1609231967174
:END:
-### There're two kinds of queries:
+### 有两种查询方式:
:PROPERTIES:
-:created_at: 1609237373442
:last_modified_at: 1609244684831
+:created_at: 1609237373442
:END:
-1. Simple queries by using `{{query }}`, the format is something like this:
+1. 简单的查询,输入`{{query}}`,格式如下:
#+BEGIN_EXAMPLE
{{query Something you're looking for}}
#+END_EXAMPLE
- You can type `/query` to create a simple query.
+ 你可以通过输入`/query`来创建一个简单的查询.
2. [[高级查询]]
-## **Simple Queries filters**
+## **简单查询的过滤器**
:PROPERTIES:
-:created_at: 1609237391135
:last_modified_at: 1609237391135
+:created_at: 1609237391135
:END:
-### **and**
+### **and (与)**
:PROPERTIES:
-:created_at: 1609237410438
:last_modified_at: 1609242191381
+:created_at: 1609237410438
:END:
-Examples:
+例如:
#+BEGIN_EXAMPLE
(and [[page 1]] [[page 2]])
#+END_EXAMPLE
@@ -49,37 +49,37 @@ Examples:
#+BEGIN_EXAMPLE
(and (todo now later done) [[page]])
#+END_EXAMPLE
-### **or**
+### **or (或)**
:PROPERTIES:
-:created_at: 1609237412110
:last_modified_at: 1609242378334
+:created_at: 1609237412110
:END:
-Examples:
+例如:
#+BEGIN_EXAMPLE
(or [[page 1]] [[page 2]])
#+END_EXAMPLE
-### **not**
+### **not (非)**
:PROPERTIES:
-:created_at: 1609237413167
:last_modified_at: 1609243244686
+:created_at: 1609237413167
:END:
-Examples:
+例如:
#+BEGIN_EXAMPLE
(not [[page 1]] [[page 2]])
#+END_EXAMPLE
### **between**
:PROPERTIES:
-:created_at: 1609237415572
:last_modified_at: 1609243879053
+:created_at: 1609237415572
:END:
-The format `(between start end)` will only support blocks on the journal pages.
-`(between created_at|last_modified_at start end)` support blocks on all the pages, you need to enable [[block timestamps]] to have those timestamps for new blocks.
+`(between start end)` 这种格式仅支持查询日记页面上的块.
+`(between created_at|last_modified_at start end)` 支持查询所有页面上的块, 你需要通过开启 [[block timestamps]] 让所有新生成的块拥有时间戳属性.
-There're several built-in symbols:
+有几个内置的符号共您使用:
1. `today|yesterday|tomorrow|now`
2. `+|-` number `y|m|w|d|h|min`
-Examples:
+例如:
#+BEGIN_EXAMPLE
(between -7d +7d)
(between -2w today)
@@ -95,105 +95,105 @@ Examples:
{{query (property type book)}}
### **todo**
:PROPERTIES:
-:created_at: 1609237429937
:last_modified_at: 1609242962513
+:created_at: 1609237429937
:END:
-Examples:
+例如:
#+BEGIN_EXAMPLE
(todo now)
(todo now later)
#+END_EXAMPLE
-### **priority**
+### **priority (优先级)**
:PROPERTIES:
-:created_at: 1609237434982
:last_modified_at: 1609242958502
+:created_at: 1609237434982
:END:
-Examples:
+例如:
#+BEGIN_EXAMPLE
(priority a)
(priority a b c)
#+END_EXAMPLE
### **page-property**
:PROPERTIES:
-:created_at: 1609237443550
:last_modified_at: 1609243687213
+:created_at: 1609237443550
:END:
-Example:
+例如:
{{query (page-property related "Block embed")}}
### **page-tags**
:PROPERTIES:
-:created_at: 1609237445606
:last_modified_at: 1609243746666
+:created_at: 1609237445606
:END:
-Example:
+例如:
{{query (page-tags embed)}}
### **all-page-tags**
:PROPERTIES:
-:created_at: 1609237447926
:last_modified_at: 1609243762970
+:created_at: 1609237447926
:END:
-Example:
+例如:
{{query (all-page-tags)}}
### **sort-by**
:PROPERTIES:
-:created_at: 1609237456009
:last_modified_at: 1609243222016
+:created_at: 1609237456009
:END:
-Format: `(sort-by key order)` or `(sort-by key)`
+格式: `(sort-by key order)` 或者 `(sort-by key)`
`key`: `created_at` | `last_modified_at`
-`order`: `desc` or `asc`, omit means `desc`.
+`order`: `desc`(降序排列) 或者 `asc` (升序排列), 不写则默认 `desc`.
#+BEGIN_EXAMPLE
(and (todo now later) (sort-by created_at desc))
#+END_EXAMPLE
-## **More query examples**
+## **更多查询实例**
:PROPERTIES:
-:created_at: 1609232210837
:last_modified_at: 1609243310412
+:created_at: 1609232210837
:END:
-### 1. Find the blocks containing page "tag1"
+### 1. 找到所有包含"tag1"页面的块
:PROPERTIES:
-:created_at: 1609232870139
:last_modified_at: 1609233755992
+:created_at: 1609232870139
:END:
#+BEGIN_EXAMPLE
{{query [[tag1]]}}
#+END_EXAMPLE
{{query [[tag1]]}}
-### 2. Find the blocks containing both `tag1` and `tag2`
+### 2. 找到同时包含`tag1`和`tag2`的所有块
:PROPERTIES:
-:created_at: 1609233702047
:last_modified_at: 1609233790865
+:created_at: 1609233702047
:END:
#+BEGIN_EXAMPLE
{{query (and [[tag1]] [[tag2]])}}
#+END_EXAMPLE
{{query (and [[tag1]] [[tag2]])}}
-### 3. Find the blocks containing either `tag1` or `tag2`
+### 3. 找到包含`tag1` 或者 `tag2` 中任意一个页面的块
:PROPERTIES:
-:created_at: 1609233864422
:last_modified_at: 1609233864422
+:created_at: 1609233864422
:END:
#+BEGIN_EXAMPLE
{{query (or [[tag1]] [[tag2]])}}
#+END_EXAMPLE
{{query (or [[tag1]] [[tag2]])}}
-### 4. Find the blocks containing `tag2` but not `tag1`
+### 4. 找到所有包含 `tag2` 但不包含 `tag1` 的块
:PROPERTIES:
-:created_at: 1609234732407
:last_modified_at: 1609236840152
+:created_at: 1609234732407
:END:
{{query (and [[tag2]] (not [[tag1]]))}}
-### 5. Find journal blocks created between [[Dec 5th, 2020]] to [[Dec 7th, 2020]]
+### 5. 找到所有日期从 [[Dec 5th, 2020]] 到 [[Dec 7th, 2020]] 之间的日记页面中的块
:PROPERTIES:
-:created_at: 1609242222695
:last_modified_at: 1609242323029
+:created_at: 1609242222695
:END:
{{query (between [[Dec 5th, 2020]] [[Dec 7th, 2020]] )}}
-### 6. Find all the blocks created today (you need to enable [[block timestamps]] before using this query)
+### 6. 找到所有在今天创建的块 (你需要在查询之前开启 [[block timestamps]] 功能)
:PROPERTIES:
-:created_at: 1609235122723
:last_modified_at: 1609249085047
+:created_at: 1609235122723
:END:
#+BEGIN_EXAMPLE
{{query (between created_at today tomorrow)}}
-#+END_EXAMPLE
\ No newline at end of file
+#+END_EXAMPLE
From 461fdfb04f47191b9841c433922be82097f00b14 Mon Sep 17 00:00:00 2001
From: psy <me@pys.im>
Date: Thu, 3 Jun 2021 20:13:26 +0800
Subject: [PATCH 5/5] fix: an unsolved conflict
---
journals/2020_05_31.org | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/journals/2020_05_31.org b/journals/2020_05_31.org
index 200da387..f7af713a 100644
--- a/journals/2020_05_31.org
+++ b/journals/2020_05_31.org
@@ -1,15 +1,10 @@
* Sunday, 05/31/2020
-<<<<<<< ours
-** Changelog
-*** Custom journal date format support. [[特色功能]]
-=======
** Changelog
-*** Custom journal date format support. [[Features]]
+*** Custom journal date format support. [[特色功能]]
:PROPERTIES:
:id: 60acdeb9-aa65-492b-8398-d4d65c1631c1
:END:
->>>>>>> theirs
You can set the ~:date-formatter~ in ~logseq.edn~.
The default formatter is ~"MMM do, yyyy"~, which will be something like
~Jun 1st, 2020~.
@@ -36,4 +31,4 @@
** Fixed issues
*** Org mode auto link parsing.
*** Markdown definition parsing (it supports both multiple definitions and multiple lines now).
-*** Footnote parsing.
\ No newline at end of file
+*** Footnote parsing.