Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/appx/AppxManifest.xml
#	app/package.json
#	kernel/go.mod
#	kernel/util/working.go
  • Loading branch information
appdev committed Oct 16, 2024
2 parents ef79bfe + 738a907 commit bde1be8
Show file tree
Hide file tree
Showing 199 changed files with 19,986 additions and 9,018 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.5.1 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v32.2.0 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@v30.5.1 -D`
* `pnpm install electron@v32.2.0 -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.5.1 -D`
* `pnpm install electron@v32.2.0 -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.5.1 -D
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v32.2.0 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@v30.5.1 -D`
* `pnpm install electron@v32.2.0 -D`

NPM 镜像:

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

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

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

Expand Down
1,558 changes: 1,558 additions & 0 deletions app/appearance/langs/de_DE.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"exportPDFLowMemory": "Insufficient available memory to export this PDF, please reduce the content or increase available memory and try exporting again",
"exportConf": "Export settings",
"exportConfTip": "Account, access authorization code, synchronization, API token and data repo key will not be exported",
"importConf": "Import settings",
Expand Down Expand Up @@ -190,7 +191,7 @@
"unlockEdit": "Make doc writable",
"enable": "Enable",
"disable": "Disable",
"removeWorkspacePhysically": "Do you want to physically delete the data in workspace ${x}? (Physical deletion cannot be recovered)",
"removeWorkspacePhysically": "The workspace has been removed from the list, and the data in this workspace ${x} will be permanently deleted. This deletion cannot be undone, do you want to continue?",
"mainMenu": "Main Menu",
"searchRemoveName": "Do you want to delete ${x} and assign its query condition to ${y}?",
"searchUpdateName": "Update name ${x} to ${y}?",
Expand Down Expand Up @@ -702,7 +703,6 @@
"unitInches": "in",
"unitMillimeters": "mm",
"additionalLayers": "Additional Layers",
"thumbPage": "Thumbnail of Page {{page}}",
"thumbsTitle": "Show Thumbnails",
"document_properties_page_size_name_a3": "A3",
"document_properties_page_size_name_a4": "A4",
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"exportPDFLowMemory": "Memoria disponible insuficiente para exportar este PDF, por favor reduzca el contenido o aumente la memoria disponible y vuelva a intentar exportar",
"exportConf": "Configuración de exportación",
"exportConfTip": "Las cuentas, los códigos de acceso, la sincronización, los tokens API y las claves del almacén de datos no se exportarán",
"importConf": "Importar configuración",
Expand Down Expand Up @@ -190,7 +191,7 @@
"marginLeft": "Izquierda",
"enable": "Habilitar",
"disable": "Desactivar",
"removeWorkspacePhysically": "¿Quieres eliminar físicamente los datos en el espacio de trabajo ${x}? (La eliminación física no se puede recuperar)",
"removeWorkspacePhysically": "El espacio de trabajo ha sido eliminado de la lista y los datos en este espacio de trabajo ${x} se eliminarán permanentemente. Esta operación de eliminación no se puede deshacer, ¿deseas continuar?",
"mainMenu": "Menú principal",
"searchRemoveName": "¿Desea eliminar ${x} y asignar su condición de consulta a ${y}?",
"searchUpdateName": "¿Actualizar nombre ${x} a ${y}?",
Expand Down Expand Up @@ -702,7 +703,6 @@
"unitInches": "pulgadas",
"unitMillimeters": "milímetros",
"additionalLayers": "Capas adicionales",
"thumbPage": "Miniatura de la página {{page}}",
"thumbsTitle": "Mostrar miniaturas",
"document_properties_page_size_name_a3": "A3",
"document_properties_page_size_name_a4": "A4",
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"exportPDFLowMemory": "Mémoire disponible insuffisante pour exporter ce PDF, veuillez réduire le contenu ou augmenter la mémoire disponible et réessayer d'exporter",
"exportConf": "Exporter les paramètres",
"exportConfTip": "Les comptes, codes d'accès, synchronisation, tokens API et clés d'entrepôt de données ne seront pas exportés",
"importConf": "Importer les paramètres",
Expand Down Expand Up @@ -190,7 +191,7 @@
"marginLeft": "Gauche",
"enable": "Activer",
"disable": "Désactiver",
"removeWorkspacePhysically": "Voulez-vous supprimer physiquement les données de l'espace de travail ${x} ? (La suppression physique ne peut pas être récupérée)",
"removeWorkspacePhysically": "L'espace de travail a été retiré de la liste, et les données de cet espace de travail ${x} seront définitivement supprimées. Cette opération de suppression ne peut pas être annulée, souhaitez-vous continuer ?",
"mainMenu": "Menu principal",
"searchRemoveName": "Voulez-vous supprimer ${x} et affecter sa condition de requête à ${y} ?",
"searchUpdateName": "Mettre à jour le nom ${x} en ${y} ?",
Expand Down Expand Up @@ -702,7 +703,6 @@
"unitInches": "in",
"unitMillimeters": "mm",
"additionalLayers": "Calques additionnels",
"thumbPage": "Vignette de la page {{page}}",
"thumbsTitle": "Afficher les vignettes",
"document_properties_page_size_name_a3": "A3",
"document_properties_page_size_name_a4": "A4",
Expand Down
Loading

0 comments on commit bde1be8

Please sign in to comment.