Skip to content

Commit

Permalink
Merge commit '9ba3a7d883a26650b1bb9c5616a296b646dd0bac'
Browse files Browse the repository at this point in the history
  • Loading branch information
EightDoor committed Sep 24, 2024
2 parents 5a24493 + 9ba3a7d commit 5c2ae29
Show file tree
Hide file tree
Showing 144 changed files with 5,622 additions and 1,070 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Install pnpm: `npm install -g [email protected]`

Set the Electron mirror environment variable and install Electron:

* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v30.4.0 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v30.5.1 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@v30.4.0 -D`
* `pnpm install electron@v30.5.1 -D`

NPM mirror:

Expand All @@ -28,7 +28,7 @@ NPM mirror:

On the desktop, go to the app folder to run:

* `pnpm install electron@v30.4.0 -D`
* `pnpm install electron@v30.5.1 -D`
* `pnpm run dev`
* `pnpm run start`

Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

* macOS/Linux:
```
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v30.4.0 -D
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v30.5.1 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@v30.4.0 -D`
* `pnpm install electron@v30.5.1 -D`

NPM 镜像:

Expand All @@ -30,7 +30,7 @@ NPM 镜像:

桌面端进入 app 文件夹运行:

* `pnpm install electron@v30.4.0 -D`
* `pnpm install electron@v30.5.1 -D`
* `pnpm run dev`
* `pnpm run start`

Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/auto_aur_release_stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ jobs:
install -Dm755 \${_pkgname} "\${pkgdir}/\${_installdir}/siyuan.AppImage"
install -Dm644 "squashfs-root/resources/stage/icon.png" "\${pkgdir}/usr/share/icons/hicolor/512x512/apps/siyuan_stable.png"
install -Dm644 "squashfs-root/siyuan.desktop" "\${pkgdir}/usr/share/applications/siyuan_stable.desktop"
if [ ! -f "${pkgdir}/usr/bin/siyuan" ]; then
mkdir -p "${pkgdir}/usr/bin"
echo '#!/bin/sh' > "${pkgdir}/usr/bin/siyuan"
echo "exec ${_installdir}/siyuan.AppImage" >> "${pkgdir}/usr/bin/siyuan"
chmod 755 "${pkgdir}/usr/bin/siyuan"
fi
}
EOF
Expand Down
128 changes: 64 additions & 64 deletions app/appearance/emojis/conf.json

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"jumpToPage": "Jump to the specified page: 1 ~ ${x}",
"pageCountAndSnapshotCount": "Total ${x} pages, ${y} snapshots",
"pageCountAndHistoryCount": "Total ${x} pages, ${y} histories",
"visitCommunityShare": "Visit community share",
"clearContextSucc": "The context has been cleared",
"emptyMobilePlaceholder": "Record something",
"emptyPlaceholder": "Write something, ' / ' for commands",
Expand Down Expand Up @@ -41,6 +45,10 @@
"editorMarkdownInlineTagTip": "After enabling, <code class='fn__code'>#foo#</code> inline tag input syntax will be supported",
"editorMarkdownInlineMath": "Markdown inline formula syntax",
"editorMarkdownInlineMathTip": "After enabling, <code class='fn__code'>$foo$</code> inline formula syntax input will be supported",
"editorMarkdownInlineAsterisk": "Markdown inline asterisk syntax",
"editorMarkdownInlineAsteriskTip": "After enabling, <code class='fn__code'>*foo*</code> italic syntax and <code class='fn__code'>**foo**</code> bold syntax input will be supported",
"editorMarkdownInlineUnderscore": "Markdown inline underline syntax",
"editorMarkdownInlineUnderscoreTip": "After enabling, <code class='fn__code'>_foo_</code> italic syntax and <code class='fn__code'>__foo__</code> bold syntax input will be supported",
"currentNotebook": "Current Notebook",
"containerBlockTip1": "Enabling container blocks will result in duplicate search results",
"containerBlockTip2": "Enabling document blocks currently only supports searching for document titles",
Expand Down Expand Up @@ -462,6 +470,7 @@
"floatWindowMode1": "Press and hold <code class='fn__code'>${hotkey}</code>+Hover",
"floatWindowMode2": "Do not trigger",
"codeSnippet": "Code Snippet",
"codeSnippetTip": "Fine-tune the interface or functionality through code snippets",
"expandDown": "Expand Down",
"expandUp": "Expand Up",
"goForward": "Go forward",
Expand Down Expand Up @@ -1534,7 +1543,7 @@
"239": "Related operations are being processed, please try again later",
"240": "The current drag-and-drop heading is located in the container block and the drag-and-drop operation cannot be performed",
"241": "Drag to its subheading is not supported",
"242": "TODO",
"242": "Currently available space is [%s], at least [%s] is required to perform this operation",
"243": "Only list the first [%d] tags (including subtags), if you need to adjust, please modify [Settings - Doc Tree - Maximum number to list]",
"244": "Data indexing was not completed after the last use. Please execute [Doc Tree - Rebuild Index]. Please exit the program completely before shutting down the computer",
"245": "Data indexing was not completed after the last use. Please execute [Doc Tree - Rebuild Index]. Please use [Exit Application] in the right column panel to exit normally",
Expand Down
13 changes: 11 additions & 2 deletions app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"jumpToPage": "Saltar a la página especificada: 1 ~ ${x}",
"pageCountAndSnapshotCount": "Total ${x} páginas, ${y} instantáneas",
"pageCountAndHistoryCount": "Total ${x} páginas, ${y} historias",
"visitCommunityShare": "Visitar la comunidad compartida",
"clearContextSucc": "Se ha borrado el contexto",
"emptyMobilePlaceholder": "Grabar algo",
"emptyPlaceholder": "Escribe algo, ' / ' para los comandos",
Expand Down Expand Up @@ -41,6 +45,10 @@
"editorMarkdownInlineTagTip": "Después de habilitar, se admitirá la sintaxis de entrada de etiqueta en línea <code class='fn__code'>#foo#</code>",
"editorMarkdownInlineMath": "Sintaxis de fórmula en línea de Markdown",
"editorMarkdownInlineMathTip": "Después de habilitar, se admitirá la entrada de sintaxis de fórmula en línea <code class='fn__code'>$foo$</code>",
"editorMarkdownInlineAsterisk": "Sintaxis de asterisco en línea de Markdown",
"editorMarkdownInlineAsteriskTip": "Después de habilitar, se admitirá la entrada de sintaxis <code class='fn__code'>*foo*</code> en cursiva y <code class='fn__code'>**foo**</code> en negrita" ,
"editorMarkdownInlineUnderscore": "Sintaxis de subrayado en línea de Markdown",
"editorMarkdownInlineUnderscoreTip": "Después de habilitar, se admitirá la sintaxis <code class='fn__code'>_foo_</code> en cursiva y <code class='fn__code'>__foo__</code> en negrita",
"currentNotebook": "Cuaderno actual",
"containerBlockTip1": "Habilitar bloques de contenedores generará resultados de búsqueda duplicados",
"containerBlockTip2": "Habilitar bloques de documentos actualmente solo admite la búsqueda de títulos de documentos",
Expand Down Expand Up @@ -462,6 +470,7 @@
"floatWindowMode1": "Presione y mantenga presionado <code class='fn__code'>${hotkey}</code>+Flotar",
"floatWindowMode2": "No activar",
"codeSnippet": "Fragmento de código",
"codeSnippetTip": "Ajusta la interfaz o la funcionalidad mediante fragmentos de código",
"expandDown": "Expandir hacia abajo",
"expandUp": "Expandir hacia arriba",
"goForward": "Ir hacia adelante",
Expand Down Expand Up @@ -1057,7 +1066,7 @@
"export20": "La exportación de archivos Word .docx requiere la conversión del formato mediante <a href=\"https://pandoc.org\" target=\"_blank\">Pandoc</a>",
"export21": "Exportar plantilla de pie de página PDF",
"export22": "<code class='fn__code'>%page</code> es el número de página actual, <code class='fn__code'>%pages</code> es el número de página total y es compatible con las funciones de plantilla de Sprig ",
"export23": "Exportar descuento con YAML front-matter",
"export23": "Exportar Markdown con YAML front-matter",
"export24": "Después de habilitar, agregue información general de metadatos al comienzo del archivo Markdown exportado",
"export25": "Exportar ruta de plantilla .docx de Word",
"export26": "La ruta absoluta de la plantilla utilizada al exportar archivos .docx de Word, es decir, Pandoc <a href=\"https://pandoc.org/MANUAL.html#option--reference-doc\" target =\"_blank\">--reference-doc</a> valor del parámetro",
Expand Down Expand Up @@ -1534,7 +1543,7 @@
"239": "Las operaciones relacionadas se están procesando, inténtalo de nuevo más tarde",
"240": "El encabezado actual de arrastrar y soltar está ubicado en el bloque contenedor y la operación de arrastrar y soltar no se puede realizar",
"241": "No se admite arrastrar a su subtítulo",
"242": "TODO",
"242": "Espacio disponible actualmente [%s], se requiere al menos [%s] para realizar esta operación",
"243": "Enumere solo las primeras [%d] etiquetas (incluidas las subetiquetas), modifique [Configuración - Árbol de documentos - Número máximo a listar]",
"244": "La indexación de datos no se ha completado desde el último uso. Ejecute [Árbol de documentos - Reconstruir índice] una vez. En el futuro, salga completamente del programa antes de apagar la computadora.",
"245": "La indexación de datos no se ha completado desde el último uso. Ejecute [Árbol de documentos - Reconstruir índice] una vez. Utilice [Salir de la aplicación] en el panel de la columna derecha para salir normalmente",
Expand Down
11 changes: 10 additions & 1 deletion app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"jumpToPage": "Aller à la page spécifiée : 1 ~ ${x}",
"pageCountAndSnapshotCount": "Total de ${x} pages, ${y} instantanés",
"pageCountAndHistoryCount": "Total de ${x} pages, ${y} histoires",
"visitCommunityShare": "Visiter le partage communautaire",
"clearContextSucc": "Le contexte a été effacé",
"emptyMobilePlaceholder": "Enregistrer quelque chose",
"emptyPlaceholder": "Écrivez quelque chose, ' / ' pour les commandes",
Expand Down Expand Up @@ -41,6 +45,10 @@
"editorMarkdownInlineTagTip": "Après l'activation, la syntaxe de saisie des balises en ligne <code class='fn__code'>#foo#</code> sera prise en charge",
"editorMarkdownInlineMath": "Syntaxe de formule en ligne Markdown",
"editorMarkdownInlineMathTip": "Après l'activation, la saisie de la syntaxe de formule en ligne <code class='fn__code'>$foo$</code> sera prise en charge",
"editorMarkdownInlineAsterisk": "Syntaxe d'astérisque en ligne Markdown",
"editorMarkdownInlineAsteriskTip": "Après l'activation, la syntaxe <code class='fn__code'>*foo*</code> italique et la syntaxe <code class='fn__code'>**foo**</code> en gras seront prises en charge" ,
"editorMarkdownInlineUnderscore": "Syntaxe de soulignement en ligne Markdown",
"editorMarkdownInlineUnderscoreTip": "Après l'activation, la syntaxe <code class='fn__code'>_foo_</code> italique et la syntaxe <code class='fn__code'>__foo__</code> gras seront prises en charge",
"currentNotebook": "Carnet actuel",
"containerBlockTip1": "L'activation des blocs de conteneurs entraînera des résultats de recherche en double",
"containerBlockTip2": "L'activation des blocs de documents ne prend actuellement en charge que la recherche de titres de documents",
Expand Down Expand Up @@ -462,6 +470,7 @@
"floatWindowMode1": "Appuyez et maintenez <code class='fn__code'>${hotkey}</code>+Flotter",
"floatWindowMode2": "Ne pas déclencher",
"codeSnippet": "Extrait de code",
"codeSnippetTip": "Affiner l'interface ou les fonctionnalités grâce à des extraits de code",
"expandDown": "Développer vers le bas",
"expandUp": "Développer vers le haut",
"goForward": "Suivant",
Expand Down Expand Up @@ -1534,7 +1543,7 @@
"239": "Les opérations associées sont en cours de traitement, veuillez réessayer plus tard",
"240": "L'en-tête du glisser-déposer actuel se trouve dans le bloc conteneur et l'opération de glisser-déposer ne peut pas être effectuée",
"241": "Le glisser vers son sous-titre n'est pas pris en charge",
"242": "TODO",
"242": "Espace actuellement disponible [%s], au moins [%s] est requis pour effectuer cette opération",
"243": "Répertorier uniquement les [%d] premières balises (y compris les sous-balises). veuillez modifier [Paramètres - Arbre des documents - Nombre maximum de documents à lister].",
"244": "L'indexation des données n'a pas été terminée depuis la dernière utilisation. Veuillez exécuter [Arborescence des documents - Reconstruire l'index] une fois. À l'avenir, veuillez quitter complètement le programme avant d'éteindre l'ordinateur.",
"245": "L'indexation des données n'a pas été terminée depuis la dernière utilisation. Veuillez exécuter [Arborescence des documents - Reconstruire l'index] une fois. Veuillez utiliser [Quitter l'application] dans le panneau de la colonne de droite pour quitter normalement",
Expand Down
Loading

0 comments on commit 5c2ae29

Please sign in to comment.