update

.coderabbit.yaml

@@ -1,95 +0,0 @@
-# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
-language: "en-GB"
-reviews:
-  high_level_summary: false
-  estimate_code_review_effort: false
-  poem: false
-  auto_review:
-    enabled: true
-    drafts: false
-    ignore_usernames:
-      - "renovate[bot]"
-  auto_apply_labels: true
-  labeling_instructions:
-    - label: "accessibility"
-      instructions: "Apply when the PR contains changes related to accessibility, screen readers, keyboard navigation, or ARIA attributes."
-    - label: "android"
-      instructions: "Apply when the PR contains changes specific to the Android platform or Android app."
-    - label: "api"
-      instructions: "Apply when the PR modifies the Joplin API, REST endpoints, or API-related code."
-    - label: "bug"
-      instructions: "Apply when the PR fixes a bug or unexpected behaviour."
-    - label: "ci"
-      instructions: "Apply when the PR modifies CI/CD configuration, GitHub Actions workflows, or build pipelines."
-    - label: "cli"
-      instructions: "Apply when the PR contains changes specific to the Joplin CLI (command-line) application."
-    - label: "clipper"
-      instructions: "Apply when the PR contains changes to the Joplin Web Clipper browser extension."
-    - label: "database"
-      instructions: "Apply when the PR modifies database schema, migrations, or database-related logic."
-    - label: "desktop"
-      instructions: "Apply when the PR contains changes specific to the Joplin desktop (Electron) application."
-    - label: "documentation"
-      instructions: "Apply when the PR is mainly about adding or updating documentation, README files, or code comments."
-    - label: "draw"
-      instructions: "Apply when the PR contains changes related to the drawing or sketching feature."
-    - label: "editor"
-      instructions: "Apply when the PR contains changes to the note editor (CodeMirror, TinyMCE, or the editor infrastructure)."
-    - label: "enhancement"
-      instructions: "Apply when the PR adds a new feature or improves existing functionality (not a bug fix)."
-    - label: "export"
-      instructions: "Apply when the PR contains changes to export functionality (PDF, HTML, JEX, etc.)."
-    - label: "import"
-      instructions: "Apply when the PR contains changes to import functionality (Evernote, Markdown, etc.)."
-    - label: "iOS"
-      instructions: "Apply when the PR contains changes specific to the iOS platform or iOS app."
-    - label: "linux"
-      instructions: "Apply when the PR contains changes specific to Linux."
-    - label: "linux/wayland"
-      instructions: "Apply when the PR contains changes specific to Linux Wayland."
-    - label: "macOS"
-      instructions: "Apply when the PR contains changes specific to macOS."
-    - label: "markdown-editor"
-      instructions: "Apply when the PR contains changes to the Markdown editor or Markdown rendering."
-    - label: "mobile"
-      instructions: "Apply when the PR contains changes to the mobile app (iOS or Android)."
-    - label: "multi-window"
-      instructions: "Apply when the PR contains changes related to multi-window support."
-    - label: "OCR"
-      instructions: "Apply when the PR contains changes related to OCR (optical character recognition) functionality."
-    - label: "performance"
-      instructions: "Apply when the PR improves performance, reduces memory usage, or optimises speed."
-    - label: "plugins"
-      instructions: "Apply when the PR contains changes to the plugin system, plugin API, or specific plugins."
-    - label: "Regression"
-      instructions: "Apply when the linked issue, if any, has the Regression label."
-    - label: "renderer"
-      instructions: "Apply when the PR contains changes to the note renderer or how notes are displayed."
-    - label: "search"
-      instructions: "Apply when the PR contains changes to search functionality."
-    - label: "security"
-      instructions: "Apply when the PR is mainly about addressing a security vulnerability or improving security."
-    - label: "server"
-      instructions: "Apply when the PR contains changes to files under the packages/server folder."
-    - label: "Sharing"
-      instructions: "Apply when the PR contains changes to note or notebook sharing features."
-    - label: "sync"
-      instructions: "Apply when the PR contains changes to synchronisation logic or sync targets."
-    - label: "tags"
-      instructions: "Apply when the PR contains changes to tag management or tagging functionality."
-    - label: "transcribe"
-      instructions: "Apply when the PR contains changes to audio transcription functionality."
-    - label: "translation"
-      instructions: "Apply when the PR adds or updates translations or localisation strings."
-    - label: "Voice typing"
-      instructions: "Apply when the PR contains changes to voice typing functionality."
-    - label: "web"
-      instructions: "Apply when the PR contains changes to the Joplin web application or web-related features."
-    - label: "windows"
-      instructions: "Apply when the PR contains changes specific to Windows."
-knowledge_base:
-  code_guidelines:
-    enabled: true
-    filePatterns:
-      - "readme/dev/coding_style.md"
-      - "readme/dev/index.md"

.env-sample

@@ -31,7 +31,6 @@
 # QUEUE_DATABASE_PASSWORD=transcribe
 # QUEUE_DATABASE_PORT=5431
 # HTR_CLI_IMAGES_FOLDER=/home/user/images_storage
-# HTR_CLI_MODELS_FOLDER=/home/user/transcribe_models
 
 # =============================================================================
 # DEV CONFIG EXAMPLE

.eslintignore

@@ -6,7 +6,6 @@ _releases/
 *.min.js
 **/commands/index.ts
 **/node_modules/
-**/abcjs-basic-min.js
 packages/generator-joplin/generators/app/templates/api/
 Assets/
 docs/
@@ -92,13 +91,12 @@ readme/
 packages/react-native-vosk/lib/
 packages/lib/countable/Countable.js
 packages/onenote-converter/renderer/pkg/*
-packages/whisper-voice-typing/lib/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/app.js
 packages/app-cli/app/base-command.js
-packages/app-cli/app/cli-integration-tests.test.js
+packages/app-cli/app/cli-integration-tests.js
 packages/app-cli/app/command-apidoc.js
 packages/app-cli/app/command-attach.js
 packages/app-cli/app/command-batch.js
@@ -116,7 +114,6 @@ packages/app-cli/app/command-export.js
 packages/app-cli/app/command-geoloc.js
 packages/app-cli/app/command-help.js
 packages/app-cli/app/command-import.js
-packages/app-cli/app/command-keymap.js
 packages/app-cli/app/command-ls.js
 packages/app-cli/app/command-mkbook.test.js
 packages/app-cli/app/command-mkbook.js
@@ -167,6 +164,8 @@ packages/app-desktop/app.reducer.js
 packages/app-desktop/app.js
 packages/app-desktop/bridge.js
 packages/app-desktop/checkForUpdates.js
+packages/app-desktop/commands/convertNoteToMarkdown.test.js
+packages/app-desktop/commands/convertNoteToMarkdown.js
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyToClipboard.js
 packages/app-desktop/commands/editProfileConfig.js
@@ -183,7 +182,6 @@ packages/app-desktop/commands/openProfileDirectory.js
 packages/app-desktop/commands/openSecondaryAppInstance.js
 packages/app-desktop/commands/replaceMisspelling.js
 packages/app-desktop/commands/restoreNoteRevision.js
-packages/app-desktop/commands/showProfileEditor.js
 packages/app-desktop/commands/startExternalEditing.js
 packages/app-desktop/commands/stopExternalEditing.js
 packages/app-desktop/commands/switchProfile.js
@@ -208,6 +206,8 @@ packages/app-desktop/gui/ConfigScreen/controls/ToggleAdvancedSettingsButton.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js
+packages/app-desktop/gui/ConversionNotification/ConversionNotification.js
+packages/app-desktop/gui/Dialog.js
 packages/app-desktop/gui/DialogButtonRow.js
 packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js
 packages/app-desktop/gui/DialogTitle.js
@@ -247,7 +247,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/normalizeAccelerator.test.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/normalizeAccelerator.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useContextMenu.test.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useContextMenu.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearchExtension.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearchHandler.js
@@ -269,7 +268,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/CodeMirror.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/Editor.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/useEditorCommands.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/localisation.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useContentScriptRegistration.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useKeymap.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useRefocusOnVisiblePaneChange.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useSyncEditorValue.js
@@ -394,10 +392,7 @@ packages/app-desktop/gui/PopupNotification/NotificationItem.js
 packages/app-desktop/gui/PopupNotification/PopupNotificationList.js
 packages/app-desktop/gui/PopupNotification/PopupNotificationProvider.js
 packages/app-desktop/gui/PopupNotification/types.js
-packages/app-desktop/gui/ProfileEditor.js
-packages/app-desktop/gui/PromptDialog.test.js
 packages/app-desktop/gui/PromptDialog.js
-packages/app-desktop/gui/QuitSyncDialog.js
 packages/app-desktop/gui/ResizableLayout/LayoutItemContainer.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/ResizableLayout.js
@@ -429,11 +424,10 @@ packages/app-desktop/gui/Sidebar/Sidebar.js
 packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js
 packages/app-desktop/gui/Sidebar/commands/index.js
 packages/app-desktop/gui/Sidebar/hooks/useFocusHandler.js
-packages/app-desktop/gui/Sidebar/hooks/useOnItemClick.js
 packages/app-desktop/gui/Sidebar/hooks/useOnRenderItem.js
 packages/app-desktop/gui/Sidebar/hooks/useOnRenderListWrapper.js
 packages/app-desktop/gui/Sidebar/hooks/useOnSidebarKeyDownHandler.js
-packages/app-desktop/gui/Sidebar/hooks/useSelectedSidebarIndexes.js
+packages/app-desktop/gui/Sidebar/hooks/useSelectedSidebarIndex.js
 packages/app-desktop/gui/Sidebar/hooks/useSidebarCommandHandler.js
 packages/app-desktop/gui/Sidebar/hooks/useSidebarListData.js
 packages/app-desktop/gui/Sidebar/hooks/utils/toggleHeader.js
@@ -472,11 +466,8 @@ packages/app-desktop/gui/WindowCommandsAndDialogs/commands/deleteFolder.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/duplicateNote.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/editAlarm.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/exportPdf.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/commands/globalRedo.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/commands/globalUndo.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/gotoAnything.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/hideModalMessage.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/commands/importFrom.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/index.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/linkToNote.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/moveToFolder.js
@@ -517,15 +508,14 @@ packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleNotesSortOrderR
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/togglePerFolderSortOrder.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleSideBar.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleVisiblePanes.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/commands/utils/canUseNativeUndo.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/types.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/appDialogs.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/utils/showFolderPicker.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/usePrintToCallback.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/useSyncDialogState.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/useWindowCommands.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/useWindowControl.js
 packages/app-desktop/gui/dialogs.js
+packages/app-desktop/gui/hooks/useDocument.js
 packages/app-desktop/gui/hooks/useEffectDebugger.js
 packages/app-desktop/gui/hooks/useElementHeight.js
 packages/app-desktop/gui/hooks/useImperativeHandlerDebugger.js
@@ -571,7 +561,6 @@ packages/app-desktop/integration-tests/util/evaluateWithRetry.js
 packages/app-desktop/integration-tests/util/extendedExpect.js
 packages/app-desktop/integration-tests/util/getImageSourceSize.js
 packages/app-desktop/integration-tests/util/getMainWindow.js
-packages/app-desktop/integration-tests/util/mockClipboard.js
 packages/app-desktop/integration-tests/util/retryOnFailure.js
 packages/app-desktop/integration-tests/util/setDarkMode.js
 packages/app-desktop/integration-tests/util/setFilePickerResponse.js
@@ -625,12 +614,10 @@ packages/app-desktop/utils/checkForUpdatesUtils.test.js
 packages/app-desktop/utils/checkForUpdatesUtils.js
 packages/app-desktop/utils/checkForUpdatesUtilsTestData.js
 packages/app-desktop/utils/customProtocols/constants.js
-packages/app-desktop/utils/customProtocols/handleCustomProtocols.content.test.js
-packages/app-desktop/utils/customProtocols/handleCustomProtocols.plugins.test.js
+packages/app-desktop/utils/customProtocols/handleCustomProtocols.test.js
 packages/app-desktop/utils/customProtocols/handleCustomProtocols.js
 packages/app-desktop/utils/customProtocols/registerCustomProtocols.js
 packages/app-desktop/utils/getAssetPath.js
-packages/app-desktop/utils/initReact.js
 packages/app-desktop/utils/initializeCommandService.js
 packages/app-desktop/utils/isSafeToOpen.test.js
 packages/app-desktop/utils/isSafeToOpen.js
@@ -699,7 +686,6 @@ packages/app-mobile/components/FeedbackBanner.js
 packages/app-mobile/components/FolderPicker.js
 packages/app-mobile/components/Icon.js
 packages/app-mobile/components/IconButton.js
-packages/app-mobile/components/KeyboardAvoidingView.js
 packages/app-mobile/components/Modal.js
 packages/app-mobile/components/ModalDialog.js
 packages/app-mobile/components/NestableFlatList.js
@@ -733,8 +719,6 @@ packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
-packages/app-mobile/components/ProfileSwitcher/utils/deleteProfile.test.js
-packages/app-mobile/components/ProfileSwitcher/utils/deleteProfile.js
 packages/app-mobile/components/SafeAreaView.js
 packages/app-mobile/components/ScreenHeader/Menu.js
 packages/app-mobile/components/ScreenHeader/WarningBanner.test.js
@@ -865,8 +849,6 @@ packages/app-mobile/components/screens/NoteTagsDialog.js
 packages/app-mobile/components/screens/Notes/NewNoteButton.test.js
 packages/app-mobile/components/screens/Notes/NewNoteButton.js
 packages/app-mobile/components/screens/Notes/Notes.js
-packages/app-mobile/components/screens/Notes/TextWrapCalculator.js
-packages/app-mobile/components/screens/SearchScreen/SearchBar.js
 packages/app-mobile/components/screens/SearchScreen/SearchResults.test.js
 packages/app-mobile/components/screens/SearchScreen/SearchResults.js
 packages/app-mobile/components/screens/SearchScreen/index.js
@@ -881,7 +863,6 @@ packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js
 packages/app-mobile/components/screens/dropbox-login.js
 packages/app-mobile/components/screens/encryption-config.test.js
 packages/app-mobile/components/screens/encryption-config.js
-packages/app-mobile/components/screens/folder.js
 packages/app-mobile/components/screens/status.js
 packages/app-mobile/components/screens/tags.js
 packages/app-mobile/components/side-menu-content.js
@@ -973,7 +954,6 @@ packages/app-mobile/utils/fs-driver/testUtil/verifyDirectoryMatches.js
 packages/app-mobile/utils/getPackageInfo.js
 packages/app-mobile/utils/getVersionInfoText.js
 packages/app-mobile/utils/hooks/useBackHandler.js
-packages/app-mobile/utils/hooks/useDebounced.js
 packages/app-mobile/utils/hooks/useIsScreenReaderEnabled.js
 packages/app-mobile/utils/hooks/useKeyboardState.js
 packages/app-mobile/utils/hooks/useOnLongPressProps.js
@@ -982,8 +962,6 @@ packages/app-mobile/utils/hooks/useSafeAreaPadding.js
 packages/app-mobile/utils/image/fileToImage.web.js
 packages/app-mobile/utils/image/getImageDimensions.js
 packages/app-mobile/utils/image/resizeImage.js
-packages/app-mobile/utils/initReact.js
-packages/app-mobile/utils/initReact.web.js
 packages/app-mobile/utils/initializeCommandService.js
 packages/app-mobile/utils/ipc/RNToWebViewMessenger.js
 packages/app-mobile/utils/ipc/WebViewToRNMessenger.js
@@ -1027,7 +1005,6 @@ packages/editor/CodeMirror/CodeMirrorControl.js
 packages/editor/CodeMirror/configFromSettings.js
 packages/editor/CodeMirror/createEditor.test.js
 packages/editor/CodeMirror/createEditor.js
-packages/editor/CodeMirror/editorCommands/cutOrCopyText.js
 packages/editor/CodeMirror/editorCommands/duplicateLine.test.js
 packages/editor/CodeMirror/editorCommands/duplicateLine.js
 packages/editor/CodeMirror/editorCommands/editorCommands.js
@@ -1047,7 +1024,6 @@ packages/editor/CodeMirror/editorCommands/supportsCommand.js
 packages/editor/CodeMirror/extensions/biDirectionalTextExtension.js
 packages/editor/CodeMirror/extensions/ctrlClickActionExtension.js
 packages/editor/CodeMirror/extensions/ctrlClickCheckboxExtension.js
-packages/editor/CodeMirror/extensions/editorSettingsExtension.js
 packages/editor/CodeMirror/extensions/highlightActiveLineExtension.js
 packages/editor/CodeMirror/extensions/keyUpHandlerExtension.js
 packages/editor/CodeMirror/extensions/links/ctrlClickLinksExtension.js
@@ -1060,8 +1036,6 @@ packages/editor/CodeMirror/extensions/links/utils/getUrlAtPosition.js
 packages/editor/CodeMirror/extensions/links/utils/openLink.js
 packages/editor/CodeMirror/extensions/markdownDecorationExtension.test.js
 packages/editor/CodeMirror/extensions/markdownDecorationExtension.js
-packages/editor/CodeMirror/extensions/markdownFrontMatterExtension.test.js
-packages/editor/CodeMirror/extensions/markdownFrontMatterExtension.js
 packages/editor/CodeMirror/extensions/markdownHighlightExtension.test.js
 packages/editor/CodeMirror/extensions/markdownHighlightExtension.js
 packages/editor/CodeMirror/extensions/markdownMathExtension.test.js
@@ -1073,13 +1047,10 @@ packages/editor/CodeMirror/extensions/rendering/addFormattingClasses.js
 packages/editor/CodeMirror/extensions/rendering/renderBlockImages.test.js
 packages/editor/CodeMirror/extensions/rendering/renderBlockImages.js
 packages/editor/CodeMirror/extensions/rendering/renderingExtension.js
-packages/editor/CodeMirror/extensions/rendering/replaceBackslashEscapes.js
 packages/editor/CodeMirror/extensions/rendering/replaceBulletLists.js
 packages/editor/CodeMirror/extensions/rendering/replaceCheckboxes.js
 packages/editor/CodeMirror/extensions/rendering/replaceDividers.js
 packages/editor/CodeMirror/extensions/rendering/replaceFormatCharacters.js
-packages/editor/CodeMirror/extensions/rendering/replaceInlineHtml.test.js
-packages/editor/CodeMirror/extensions/rendering/replaceInlineHtml.js
 packages/editor/CodeMirror/extensions/rendering/types.js
 packages/editor/CodeMirror/extensions/rendering/utils/makeBlockReplaceExtension.js
 packages/editor/CodeMirror/extensions/rendering/utils/makeInlineReplaceExtension.js
@@ -1120,7 +1091,6 @@ packages/editor/CodeMirror/utils/getSearchState.js
 packages/editor/CodeMirror/utils/growSelectionToNode.js
 packages/editor/CodeMirror/utils/handleLinkEditRequests.js
 packages/editor/CodeMirror/utils/handlePasteEvent.js
-packages/editor/CodeMirror/utils/htmlNodeInfo.js
 packages/editor/CodeMirror/utils/isCursorAtBeginning.js
 packages/editor/CodeMirror/utils/isInSyntaxNode.js
 packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/allLanguages.js
@@ -1136,7 +1106,6 @@ packages/editor/CodeMirror/vendor/announceSearchMatch.js
 packages/editor/ProseMirror/commands/commands.test.js
 packages/editor/ProseMirror/commands/commands.js
 packages/editor/ProseMirror/commands/focusEditor.js
-packages/editor/ProseMirror/commands/selectDocumentEnd.js
 packages/editor/ProseMirror/createEditor.js
 packages/editor/ProseMirror/index.js
 packages/editor/ProseMirror/plugins/detailsPlugin.test.js
@@ -1144,12 +1113,10 @@ packages/editor/ProseMirror/plugins/detailsPlugin.js
 packages/editor/ProseMirror/plugins/imagePlugin.test.js
 packages/editor/ProseMirror/plugins/imagePlugin.js
 packages/editor/ProseMirror/plugins/inputRulesPlugin.js
+packages/editor/ProseMirror/plugins/joplinEditablePlugin/createEditorDialog.js
 packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.test.js
 packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/showCreateEditablePrompt.test.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/showCreateEditablePrompt.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/utils/createEditorDialog.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/utils/postProcessRenderedHtml.js
+packages/editor/ProseMirror/plugins/joplinEditablePlugin/postProcessRenderedHtml.js
 packages/editor/ProseMirror/plugins/joplinEditorApiPlugin.js
 packages/editor/ProseMirror/plugins/keymapPlugin.js
 packages/editor/ProseMirror/plugins/linkTooltipPlugin.test.js
@@ -1164,12 +1131,10 @@ packages/editor/ProseMirror/schema.js
 packages/editor/ProseMirror/styles.js
 packages/editor/ProseMirror/testing/createTestEditor.js
 packages/editor/ProseMirror/testing/createTestEditorWithSerializer.js
-packages/editor/ProseMirror/testing/mockEditorApi.js
 packages/editor/ProseMirror/types.js
 packages/editor/ProseMirror/utils/SelectableNodeView.js
 packages/editor/ProseMirror/utils/UndoStackSynchronizer.js
 packages/editor/ProseMirror/utils/canReplaceSelectionWith.js
-packages/editor/ProseMirror/utils/clampPointToDocument.js
 packages/editor/ProseMirror/utils/computeSelectionFormatting.js
 packages/editor/ProseMirror/utils/dom/createButton.js
 packages/editor/ProseMirror/utils/dom/createTextArea.js
@@ -1179,8 +1144,6 @@ packages/editor/ProseMirror/utils/dom/showModal.js
 packages/editor/ProseMirror/utils/extractSelectedLinesTo.test.js
 packages/editor/ProseMirror/utils/extractSelectedLinesTo.js
 packages/editor/ProseMirror/utils/forEachHeading.js
-packages/editor/ProseMirror/utils/getTextBetween.js
-packages/editor/ProseMirror/utils/insertRenderedMarkdown.js
 packages/editor/ProseMirror/utils/jumpToHash.js
 packages/editor/ProseMirror/utils/makeLinksClickableInElement.js
 packages/editor/ProseMirror/utils/postprocessEditorOutput.test.js
@@ -1248,7 +1211,6 @@ packages/lib/InMemoryCache.js
 packages/lib/JoplinDatabase.js
 packages/lib/JoplinError.js
 packages/lib/JoplinServerApi.js
-packages/lib/ObjectUtils.test.js
 packages/lib/ObjectUtils.js
 packages/lib/PerformanceLogger.test.js
 packages/lib/PerformanceLogger.js
@@ -1264,7 +1226,6 @@ packages/lib/SyncTargetOneDrive.js
 packages/lib/SyncTargetRegistry.js
 packages/lib/Synchronizer.js
 packages/lib/TaskQueue.js
-packages/lib/WebDavApi.js
 packages/lib/WelcomeUtils.js
 packages/lib/array.js
 packages/lib/callbackUrlUtils.test.js
@@ -1272,8 +1233,6 @@ packages/lib/callbackUrlUtils.js
 packages/lib/clipperUtils.js
 packages/lib/commands/convertHtmlToMarkdown.test.js
 packages/lib/commands/convertHtmlToMarkdown.js
-packages/lib/commands/convertNoteToMarkdown.test.js
-packages/lib/commands/convertNoteToMarkdown.js
 packages/lib/commands/deleteNote.js
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyForward.js
@@ -1288,7 +1247,6 @@ packages/lib/commands/synchronize.js
 packages/lib/commands/toggleAllFolders.test.js
 packages/lib/commands/toggleAllFolders.js
 packages/lib/commands/toggleEditorPlugin.js
-packages/lib/components/Dialog.js
 packages/lib/components/EncryptionConfigScreen/utils.test.js
 packages/lib/components/EncryptionConfigScreen/utils.js
 packages/lib/components/shared/NoteEditor/WarningBanner/onRichTextDismissLinkClick.js
@@ -1315,7 +1273,6 @@ packages/lib/components/shared/reduxSharedMiddleware.js
 packages/lib/components/shared/side-menu-shared.test.js
 packages/lib/components/shared/side-menu-shared.js
 packages/lib/database-driver-better-sqlite.js
-packages/lib/database-driver.js
 packages/lib/database.js
 packages/lib/debug/DebugService.js
 packages/lib/determineBaseAppDirs.js
@@ -1338,7 +1295,6 @@ packages/lib/fsDriver.test.js
 packages/lib/geolocation-node.js
 packages/lib/getAppName.test.js
 packages/lib/getAppName.js
-packages/lib/hooks/dom/useDocument.js
 packages/lib/hooks/plugins/usePlugin.js
 packages/lib/hooks/plugins/useVisiblePluginEditorViewIds.js
 packages/lib/hooks/useAsyncEffect.js
@@ -1405,7 +1361,6 @@ packages/lib/models/utils/getCanBeCollapsedFolderIds.js
 packages/lib/models/utils/getCollator.js
 packages/lib/models/utils/getConflictFolderId.js
 packages/lib/models/utils/isItemId.js
-packages/lib/models/utils/isJoplinServerVariant.js
 packages/lib/models/utils/itemCanBeEncrypted.js
 packages/lib/models/utils/onFolderDrop.test.js
 packages/lib/models/utils/onFolderDrop.js
@@ -1441,7 +1396,6 @@ packages/lib/services/KeymapService_keysRegExp.js
 packages/lib/services/KvStore.js
 packages/lib/services/MigrationService.js
 packages/lib/services/NavService.js
-packages/lib/services/NotePositionService.js
 packages/lib/services/PostMessageService.js
 packages/lib/services/ReportService.test.js
 packages/lib/services/ReportService.js
@@ -1457,7 +1411,6 @@ packages/lib/services/UndoRedoService.js
 packages/lib/services/WhenClause.test.js
 packages/lib/services/WhenClause.js
 packages/lib/services/commands/MenuUtils.js
-packages/lib/services/commands/ToolbarButtonUtils.test.js
 packages/lib/services/commands/ToolbarButtonUtils.js
 packages/lib/services/commands/commandsToMarkdownTable.js
 packages/lib/services/commands/focusEditorIfEditorCommand.js
@@ -1536,7 +1489,6 @@ packages/lib/services/keychain/KeychainServiceDriver.dummy.js
 packages/lib/services/keychain/KeychainServiceDriver.electron.js
 packages/lib/services/keychain/KeychainServiceDriver.node.js
 packages/lib/services/keychain/KeychainServiceDriverBase.js
-packages/lib/services/noteList/checkboxPieCss.js
 packages/lib/services/noteList/defaultLeftToRightListRenderer.js
 packages/lib/services/noteList/defaultListRenderer.js
 packages/lib/services/noteList/defaultMultiColumnsRenderer.js
@@ -1723,14 +1675,12 @@ packages/lib/shim-init-node.js
 packages/lib/shim.js
 packages/lib/string-utils.test.js
 packages/lib/string-utils.js
-packages/lib/testing/dom-test-environment.js
 packages/lib/testing/plugins/createTestPlugin.js
 packages/lib/testing/share/makeMockShareInvitation.js
 packages/lib/testing/share/mockShareService.js
 packages/lib/testing/syncTargetUtils.js
 packages/lib/testing/test-utils-synchronizer.js
 packages/lib/testing/test-utils.js
-packages/lib/testing/waitFor.js
 packages/lib/theme.js
 packages/lib/themes/aritimDark.js
 packages/lib/themes/dark.js
@@ -1829,14 +1779,10 @@ packages/renderer/MdToHtml/createEventHandlingAttrs.js
 packages/renderer/MdToHtml/linkReplacement.test.js
 packages/renderer/MdToHtml/linkReplacement.js
 packages/renderer/MdToHtml/renderMedia.js
-packages/renderer/MdToHtml/rules/abc.js
 packages/renderer/MdToHtml/rules/checkbox.js
 packages/renderer/MdToHtml/rules/code_inline.js
-packages/renderer/MdToHtml/rules/externalEmbed.js
 packages/renderer/MdToHtml/rules/fence.js
 packages/renderer/MdToHtml/rules/fountain.js
-packages/renderer/MdToHtml/rules/frontmatter.test.js
-packages/renderer/MdToHtml/rules/frontmatter.js
 packages/renderer/MdToHtml/rules/highlight_keywords.js
 packages/renderer/MdToHtml/rules/html_image.js
 packages/renderer/MdToHtml/rules/image.js
@@ -1870,40 +1816,24 @@ packages/tools/checkIgnoredFiles.js
 packages/tools/checkLibPaths.test.js
 packages/tools/checkLibPaths.js
 packages/tools/convertThemesToCss.js
-packages/tools/fuzzer/ActionRunner.js
-packages/tools/fuzzer/Fuzzer.js
-packages/tools/fuzzer/cli.js
+packages/tools/fuzzer/ActionTracker.js
+packages/tools/fuzzer/Client.js
+packages/tools/fuzzer/ClientPool.js
+packages/tools/fuzzer/Server.js
 packages/tools/fuzzer/constants.js
-packages/tools/fuzzer/ipc/Client.js
-packages/tools/fuzzer/ipc/ClientPool.js
-packages/tools/fuzzer/ipc/Server.js
-packages/tools/fuzzer/model/ActionTracker.js
 packages/tools/fuzzer/model/FolderRecord.js
-packages/tools/fuzzer/model/NoteRecord.js
-packages/tools/fuzzer/model/ResourceRecord.js
-packages/tools/fuzzer/model/Serializable.js
-packages/tools/fuzzer/model/types.js
+packages/tools/fuzzer/sync-fuzzer.js
 packages/tools/fuzzer/types.js
-packages/tools/fuzzer/utils/ProgressBar.js
 packages/tools/fuzzer/utils/SeededRandom.js
-packages/tools/fuzzer/utils/diffSortedStringArrays.test.js
-packages/tools/fuzzer/utils/diffSortedStringArrays.js
-packages/tools/fuzzer/utils/extractResourceIds.js
 packages/tools/fuzzer/utils/getNumberProperty.js
 packages/tools/fuzzer/utils/getProperty.js
 packages/tools/fuzzer/utils/getStringProperty.js
-packages/tools/fuzzer/utils/hangingIndent.js
-packages/tools/fuzzer/utils/logDiffDebug.js
 packages/tools/fuzzer/utils/openDebugSession.js
-packages/tools/fuzzer/utils/randomId.test.js
-packages/tools/fuzzer/utils/randomId.js
-packages/tools/fuzzer/utils/randomString.js
 packages/tools/fuzzer/utils/retryWithCount.js
 packages/tools/generate-database-types.js
 packages/tools/generate-images.js
 packages/tools/git-changelog.test.js
 packages/tools/git-changelog.js
-packages/tools/licenses/buildReport.js
 packages/tools/licenses/getLicenses.js
 packages/tools/licenses/licenseChecker.js
 packages/tools/licenses/licenseOverrides/fontAwesomeOverride/index.js
@@ -1940,7 +1870,6 @@ packages/tools/update-readme-contributors.js
 packages/tools/update-readme-download.test.js
 packages/tools/update-readme-download.js
 packages/tools/update-readme-sponsors.js
-packages/tools/updateCanary.js
 packages/tools/updateMarkdownDoc.js
 packages/tools/utils/discourse.test.js
 packages/tools/utils/discourse.js
@@ -1968,8 +1897,5 @@ packages/tools/website/utils/parser.js
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/processTranslations.js
 packages/tools/website/utils/render.js
-packages/tools/website/utils/supportedLocales.js
 packages/tools/website/utils/types.js
-packages/whisper-voice-typing/src/index.js
-packages/whisper-voice-typing/src/specs/Whisper.nitro.js
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

.github/workflows/build-android.yml

@@ -21,24 +21,19 @@ jobs:
           
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
-          node-version: '24'
+          node-version: '18'
           cache: 'yarn'
 
+      - uses: dtolnay/rust-toolchain@stable
+
       - name: Install Yarn
         run: |
           corepack enable
 
       - name: Install
         run:  yarn install
-        env:
-          SKIP_ONENOTE_CONVERTER_BUILD: 1
-      
-      - name: Free disk space
-        run: |
-          sudo rm -rf /usr/share/dotnet || true
-          sudo rm -rf /opt/ghc || true
 
       - name: Assemble Android Release
         run: |

.github/workflows/build-macos-m1.yml

@@ -9,9 +9,11 @@ jobs:
 
       - uses: actions/checkout@v4
       - uses: olegtarasov/get-tag@v2.1.4
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
-          node-version: '24'
+          # We need to pin the version to 18.15, because 18.16+ fails with this error:
+          # https://github.com/facebook/react-native/issues/36440
+          node-version: '18.20.8'
           cache: 'yarn'
 
       - name: Install Yarn
@@ -28,7 +30,7 @@ jobs:
       # See github-action-main.yml for explanation
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.14'
+          python-version: '3.13'
 
       - name: Set Publish Flag
         run: |
@@ -48,7 +50,6 @@ jobs:
           CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_REPO: ${{ github.repository }}
-          GITHUB_EVENT_NAME: ${{ github.event_name }}
           IS_CONTINUOUS_INTEGRATION: 1
           BUILD_SEQUENCIAL: 1
           PUBLISH_ENABLED: ${{ env.PUBLISH_ENABLED }}
@@ -58,38 +59,25 @@ jobs:
           yarn install
           cd packages/app-desktop
           npm pkg set 'build.mac.artifactName'='${productName}-${version}-${arch}.${ext}'
-
-          npm pkg delete 'build.mac.target'
           npm pkg set 'build.mac.target[0].target'='dmg'
           npm pkg set 'build.mac.target[0].arch[0]'='arm64'
           npm pkg set 'build.mac.target[1].target'='zip'
           npm pkg set 'build.mac.target[1].arch[0]'='arm64'
 
-          # Only enable pkg build in the main repository CI. As of 01/15/2026, pkg
-          # build fails when running on external pull requests.
-          if [[ "$GITHUB_EVENT_NAME" != "pull_request" ]]; then
-            npm pkg set 'build.mac.target[2].target'='pkg'
-            npm pkg set 'build.mac.target[2].arch[0]'='arm64'
-          fi
+          if [[ "$PUBLISH_ENABLED" == "true" ]]; then
+            echo "Building and publishing desktop application..."
+            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist --mac --arm64
 
-          build_dist() {
-            if [[ "$PUBLISH_ENABLED" == "true" ]]; then
-              echo "Building and publishing desktop application..."
-              PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist --mac --arm64
+            yarn modifyReleaseAssets --repo="$GH_REPO" --tag="$GIT_TAG_NAME" --token="$GITHUB_TOKEN"
+          else
+            echo "Building but *not* publishing desktop application..."
 
-              yarn modifyReleaseAssets --repo="$GH_REPO" --tag="$GIT_TAG_NAME" --token="$GITHUB_TOKEN"
-            else
-              echo "Building but *not* publishing desktop application..."
+            # We also want to disable signing the app in this case, because
+            # it doesn't work and we don't need it.
+            # https://www.electron.build/code-signing#how-to-disable-code-signing-during-the-build-process-on-macos
 
-              # We also want to disable signing the app in this case, because
-              # it doesn't work and we don't need it.
-              # https://www.electron.build/code-signing#how-to-disable-code-signing-during-the-build-process-on-macos
+            export CSC_IDENTITY_AUTO_DISCOVERY=false
+            npm pkg set 'build.mac.identity'=null --json
 
-              export CSC_IDENTITY_AUTO_DISCOVERY=false
-              npm pkg set 'build.mac.identity'=null --json
-
-              PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist  --mac --arm64 --publish=never
-            fi
-          }
-
-          build_dist || build_dist
+            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist  --mac --arm64 --publish=never
+          fi

.github/workflows/github-actions-main.yml

@@ -147,9 +147,9 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
-          node-version: '24'
+          node-version: '18'
 
       - name: Free disk space
         if: runner.os == 'Linux'

.github/workflows/shared/setup-build-environment/action.yml

@@ -51,9 +51,9 @@ runs:
     - uses: dtolnay/rust-toolchain@stable
       if: ${{ runner.os != 'Windows' }}
 
-    - uses: actions/setup-node@v6
+    - uses: actions/setup-node@v4
       with:
-        node-version: '24'
+        node-version: '18.20.8'
         # Disable the cache on ARM runners. For now, we don't run "yarn install" on these
         # environments and this breaks actions/setup-node.
         # See https://github.com/laurent22/joplin/commit/47d0d3eb9e89153a609fb5441344da10904c6308#commitcomment-159577783.
@@ -72,4 +72,4 @@ runs:
     # Ref: https://github.com/nodejs/node-gyp/issues/2869
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.14'
+        python-version: '3.13'

.gitignore

@@ -1,7 +1,6 @@
 _mydocs
 _releases
 _vieux/
-.claude
 !/var/cache
 !/var/logs
 !/var/sessions
@@ -53,7 +52,6 @@ lerna-debug.log
 docs/**/*.mustache
 .idea
 /readme/i18n
-.watchman-cookie-*
 
 # Yarn stuff
 # https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
@@ -71,7 +69,7 @@ docs/**/*.mustache
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/app.js
 packages/app-cli/app/base-command.js
-packages/app-cli/app/cli-integration-tests.test.js
+packages/app-cli/app/cli-integration-tests.js
 packages/app-cli/app/command-apidoc.js
 packages/app-cli/app/command-attach.js
 packages/app-cli/app/command-batch.js
@@ -89,7 +87,6 @@ packages/app-cli/app/command-export.js
 packages/app-cli/app/command-geoloc.js
 packages/app-cli/app/command-help.js
 packages/app-cli/app/command-import.js
-packages/app-cli/app/command-keymap.js
 packages/app-cli/app/command-ls.js
 packages/app-cli/app/command-mkbook.test.js
 packages/app-cli/app/command-mkbook.js
@@ -140,6 +137,8 @@ packages/app-desktop/app.reducer.js
 packages/app-desktop/app.js
 packages/app-desktop/bridge.js
 packages/app-desktop/checkForUpdates.js
+packages/app-desktop/commands/convertNoteToMarkdown.test.js
+packages/app-desktop/commands/convertNoteToMarkdown.js
 packages/app-desktop/commands/copyDevCommand.js
 packages/app-desktop/commands/copyToClipboard.js
 packages/app-desktop/commands/editProfileConfig.js
@@ -156,7 +155,6 @@ packages/app-desktop/commands/openProfileDirectory.js
 packages/app-desktop/commands/openSecondaryAppInstance.js
 packages/app-desktop/commands/replaceMisspelling.js
 packages/app-desktop/commands/restoreNoteRevision.js
-packages/app-desktop/commands/showProfileEditor.js
 packages/app-desktop/commands/startExternalEditing.js
 packages/app-desktop/commands/stopExternalEditing.js
 packages/app-desktop/commands/switchProfile.js
@@ -181,6 +179,8 @@ packages/app-desktop/gui/ConfigScreen/controls/ToggleAdvancedSettingsButton.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js
 packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js
+packages/app-desktop/gui/ConversionNotification/ConversionNotification.js
+packages/app-desktop/gui/Dialog.js
 packages/app-desktop/gui/DialogButtonRow.js
 packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js
 packages/app-desktop/gui/DialogTitle.js
@@ -220,7 +220,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/normalizeAccelerator.test.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/normalizeAccelerator.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useContextMenu.test.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useContextMenu.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearchExtension.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearchHandler.js
@@ -242,7 +241,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/CodeMirror.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/Editor.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/useEditorCommands.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/localisation.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useContentScriptRegistration.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useKeymap.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useRefocusOnVisiblePaneChange.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useSyncEditorValue.js
@@ -367,10 +365,7 @@ packages/app-desktop/gui/PopupNotification/NotificationItem.js
 packages/app-desktop/gui/PopupNotification/PopupNotificationList.js
 packages/app-desktop/gui/PopupNotification/PopupNotificationProvider.js
 packages/app-desktop/gui/PopupNotification/types.js
-packages/app-desktop/gui/ProfileEditor.js
-packages/app-desktop/gui/PromptDialog.test.js
 packages/app-desktop/gui/PromptDialog.js
-packages/app-desktop/gui/QuitSyncDialog.js
 packages/app-desktop/gui/ResizableLayout/LayoutItemContainer.js
 packages/app-desktop/gui/ResizableLayout/MoveButtons.js
 packages/app-desktop/gui/ResizableLayout/ResizableLayout.js
@@ -402,11 +397,10 @@ packages/app-desktop/gui/Sidebar/Sidebar.js
 packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.js
 packages/app-desktop/gui/Sidebar/commands/index.js
 packages/app-desktop/gui/Sidebar/hooks/useFocusHandler.js
-packages/app-desktop/gui/Sidebar/hooks/useOnItemClick.js
 packages/app-desktop/gui/Sidebar/hooks/useOnRenderItem.js
 packages/app-desktop/gui/Sidebar/hooks/useOnRenderListWrapper.js
 packages/app-desktop/gui/Sidebar/hooks/useOnSidebarKeyDownHandler.js
-packages/app-desktop/gui/Sidebar/hooks/useSelectedSidebarIndexes.js
+packages/app-desktop/gui/Sidebar/hooks/useSelectedSidebarIndex.js
 packages/app-desktop/gui/Sidebar/hooks/useSidebarCommandHandler.js
 packages/app-desktop/gui/Sidebar/hooks/useSidebarListData.js
 packages/app-desktop/gui/Sidebar/hooks/utils/toggleHeader.js
@@ -445,11 +439,8 @@ packages/app-desktop/gui/WindowCommandsAndDialogs/commands/deleteFolder.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/duplicateNote.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/editAlarm.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/exportPdf.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/commands/globalRedo.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/commands/globalUndo.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/gotoAnything.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/hideModalMessage.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/commands/importFrom.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/index.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/linkToNote.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/moveToFolder.js
@@ -490,15 +481,14 @@ packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleNotesSortOrderR
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/togglePerFolderSortOrder.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleSideBar.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/commands/toggleVisiblePanes.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/commands/utils/canUseNativeUndo.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/types.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/appDialogs.js
-packages/app-desktop/gui/WindowCommandsAndDialogs/utils/showFolderPicker.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/usePrintToCallback.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/useSyncDialogState.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/useWindowCommands.js
 packages/app-desktop/gui/WindowCommandsAndDialogs/utils/useWindowControl.js
 packages/app-desktop/gui/dialogs.js
+packages/app-desktop/gui/hooks/useDocument.js
 packages/app-desktop/gui/hooks/useEffectDebugger.js
 packages/app-desktop/gui/hooks/useElementHeight.js
 packages/app-desktop/gui/hooks/useImperativeHandlerDebugger.js
@@ -544,7 +534,6 @@ packages/app-desktop/integration-tests/util/evaluateWithRetry.js
 packages/app-desktop/integration-tests/util/extendedExpect.js
 packages/app-desktop/integration-tests/util/getImageSourceSize.js
 packages/app-desktop/integration-tests/util/getMainWindow.js
-packages/app-desktop/integration-tests/util/mockClipboard.js
 packages/app-desktop/integration-tests/util/retryOnFailure.js
 packages/app-desktop/integration-tests/util/setDarkMode.js
 packages/app-desktop/integration-tests/util/setFilePickerResponse.js
@@ -598,12 +587,10 @@ packages/app-desktop/utils/checkForUpdatesUtils.test.js
 packages/app-desktop/utils/checkForUpdatesUtils.js
 packages/app-desktop/utils/checkForUpdatesUtilsTestData.js
 packages/app-desktop/utils/customProtocols/constants.js
-packages/app-desktop/utils/customProtocols/handleCustomProtocols.content.test.js
-packages/app-desktop/utils/customProtocols/handleCustomProtocols.plugins.test.js
+packages/app-desktop/utils/customProtocols/handleCustomProtocols.test.js
 packages/app-desktop/utils/customProtocols/handleCustomProtocols.js
 packages/app-desktop/utils/customProtocols/registerCustomProtocols.js
 packages/app-desktop/utils/getAssetPath.js
-packages/app-desktop/utils/initReact.js
 packages/app-desktop/utils/initializeCommandService.js
 packages/app-desktop/utils/isSafeToOpen.test.js
 packages/app-desktop/utils/isSafeToOpen.js
@@ -672,7 +659,6 @@ packages/app-mobile/components/FeedbackBanner.js
 packages/app-mobile/components/FolderPicker.js
 packages/app-mobile/components/Icon.js
 packages/app-mobile/components/IconButton.js
-packages/app-mobile/components/KeyboardAvoidingView.js
 packages/app-mobile/components/Modal.js
 packages/app-mobile/components/ModalDialog.js
 packages/app-mobile/components/NestableFlatList.js
@@ -706,8 +692,6 @@ packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
-packages/app-mobile/components/ProfileSwitcher/utils/deleteProfile.test.js
-packages/app-mobile/components/ProfileSwitcher/utils/deleteProfile.js
 packages/app-mobile/components/SafeAreaView.js
 packages/app-mobile/components/ScreenHeader/Menu.js
 packages/app-mobile/components/ScreenHeader/WarningBanner.test.js
@@ -838,8 +822,6 @@ packages/app-mobile/components/screens/NoteTagsDialog.js
 packages/app-mobile/components/screens/Notes/NewNoteButton.test.js
 packages/app-mobile/components/screens/Notes/NewNoteButton.js
 packages/app-mobile/components/screens/Notes/Notes.js
-packages/app-mobile/components/screens/Notes/TextWrapCalculator.js
-packages/app-mobile/components/screens/SearchScreen/SearchBar.js
 packages/app-mobile/components/screens/SearchScreen/SearchResults.test.js
 packages/app-mobile/components/screens/SearchScreen/SearchResults.js
 packages/app-mobile/components/screens/SearchScreen/index.js
@@ -854,7 +836,6 @@ packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js
 packages/app-mobile/components/screens/dropbox-login.js
 packages/app-mobile/components/screens/encryption-config.test.js
 packages/app-mobile/components/screens/encryption-config.js
-packages/app-mobile/components/screens/folder.js
 packages/app-mobile/components/screens/status.js
 packages/app-mobile/components/screens/tags.js
 packages/app-mobile/components/side-menu-content.js
@@ -946,7 +927,6 @@ packages/app-mobile/utils/fs-driver/testUtil/verifyDirectoryMatches.js
 packages/app-mobile/utils/getPackageInfo.js
 packages/app-mobile/utils/getVersionInfoText.js
 packages/app-mobile/utils/hooks/useBackHandler.js
-packages/app-mobile/utils/hooks/useDebounced.js
 packages/app-mobile/utils/hooks/useIsScreenReaderEnabled.js
 packages/app-mobile/utils/hooks/useKeyboardState.js
 packages/app-mobile/utils/hooks/useOnLongPressProps.js
@@ -955,8 +935,6 @@ packages/app-mobile/utils/hooks/useSafeAreaPadding.js
 packages/app-mobile/utils/image/fileToImage.web.js
 packages/app-mobile/utils/image/getImageDimensions.js
 packages/app-mobile/utils/image/resizeImage.js
-packages/app-mobile/utils/initReact.js
-packages/app-mobile/utils/initReact.web.js
 packages/app-mobile/utils/initializeCommandService.js
 packages/app-mobile/utils/ipc/RNToWebViewMessenger.js
 packages/app-mobile/utils/ipc/WebViewToRNMessenger.js
@@ -1000,7 +978,6 @@ packages/editor/CodeMirror/CodeMirrorControl.js
 packages/editor/CodeMirror/configFromSettings.js
 packages/editor/CodeMirror/createEditor.test.js
 packages/editor/CodeMirror/createEditor.js
-packages/editor/CodeMirror/editorCommands/cutOrCopyText.js
 packages/editor/CodeMirror/editorCommands/duplicateLine.test.js
 packages/editor/CodeMirror/editorCommands/duplicateLine.js
 packages/editor/CodeMirror/editorCommands/editorCommands.js
@@ -1020,7 +997,6 @@ packages/editor/CodeMirror/editorCommands/supportsCommand.js
 packages/editor/CodeMirror/extensions/biDirectionalTextExtension.js
 packages/editor/CodeMirror/extensions/ctrlClickActionExtension.js
 packages/editor/CodeMirror/extensions/ctrlClickCheckboxExtension.js
-packages/editor/CodeMirror/extensions/editorSettingsExtension.js
 packages/editor/CodeMirror/extensions/highlightActiveLineExtension.js
 packages/editor/CodeMirror/extensions/keyUpHandlerExtension.js
 packages/editor/CodeMirror/extensions/links/ctrlClickLinksExtension.js
@@ -1033,8 +1009,6 @@ packages/editor/CodeMirror/extensions/links/utils/getUrlAtPosition.js
 packages/editor/CodeMirror/extensions/links/utils/openLink.js
 packages/editor/CodeMirror/extensions/markdownDecorationExtension.test.js
 packages/editor/CodeMirror/extensions/markdownDecorationExtension.js
-packages/editor/CodeMirror/extensions/markdownFrontMatterExtension.test.js
-packages/editor/CodeMirror/extensions/markdownFrontMatterExtension.js
 packages/editor/CodeMirror/extensions/markdownHighlightExtension.test.js
 packages/editor/CodeMirror/extensions/markdownHighlightExtension.js
 packages/editor/CodeMirror/extensions/markdownMathExtension.test.js
@@ -1046,13 +1020,10 @@ packages/editor/CodeMirror/extensions/rendering/addFormattingClasses.js
 packages/editor/CodeMirror/extensions/rendering/renderBlockImages.test.js
 packages/editor/CodeMirror/extensions/rendering/renderBlockImages.js
 packages/editor/CodeMirror/extensions/rendering/renderingExtension.js
-packages/editor/CodeMirror/extensions/rendering/replaceBackslashEscapes.js
 packages/editor/CodeMirror/extensions/rendering/replaceBulletLists.js
 packages/editor/CodeMirror/extensions/rendering/replaceCheckboxes.js
 packages/editor/CodeMirror/extensions/rendering/replaceDividers.js
 packages/editor/CodeMirror/extensions/rendering/replaceFormatCharacters.js
-packages/editor/CodeMirror/extensions/rendering/replaceInlineHtml.test.js
-packages/editor/CodeMirror/extensions/rendering/replaceInlineHtml.js
 packages/editor/CodeMirror/extensions/rendering/types.js
 packages/editor/CodeMirror/extensions/rendering/utils/makeBlockReplaceExtension.js
 packages/editor/CodeMirror/extensions/rendering/utils/makeInlineReplaceExtension.js
@@ -1093,7 +1064,6 @@ packages/editor/CodeMirror/utils/getSearchState.js
 packages/editor/CodeMirror/utils/growSelectionToNode.js
 packages/editor/CodeMirror/utils/handleLinkEditRequests.js
 packages/editor/CodeMirror/utils/handlePasteEvent.js
-packages/editor/CodeMirror/utils/htmlNodeInfo.js
 packages/editor/CodeMirror/utils/isCursorAtBeginning.js
 packages/editor/CodeMirror/utils/isInSyntaxNode.js
 packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/allLanguages.js
@@ -1109,7 +1079,6 @@ packages/editor/CodeMirror/vendor/announceSearchMatch.js
 packages/editor/ProseMirror/commands/commands.test.js
 packages/editor/ProseMirror/commands/commands.js
 packages/editor/ProseMirror/commands/focusEditor.js
-packages/editor/ProseMirror/commands/selectDocumentEnd.js
 packages/editor/ProseMirror/createEditor.js
 packages/editor/ProseMirror/index.js
 packages/editor/ProseMirror/plugins/detailsPlugin.test.js
@@ -1117,12 +1086,10 @@ packages/editor/ProseMirror/plugins/detailsPlugin.js
 packages/editor/ProseMirror/plugins/imagePlugin.test.js
 packages/editor/ProseMirror/plugins/imagePlugin.js
 packages/editor/ProseMirror/plugins/inputRulesPlugin.js
+packages/editor/ProseMirror/plugins/joplinEditablePlugin/createEditorDialog.js
 packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.test.js
 packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/showCreateEditablePrompt.test.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/showCreateEditablePrompt.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/utils/createEditorDialog.js
-packages/editor/ProseMirror/plugins/joplinEditablePlugin/utils/postProcessRenderedHtml.js
+packages/editor/ProseMirror/plugins/joplinEditablePlugin/postProcessRenderedHtml.js
 packages/editor/ProseMirror/plugins/joplinEditorApiPlugin.js
 packages/editor/ProseMirror/plugins/keymapPlugin.js
 packages/editor/ProseMirror/plugins/linkTooltipPlugin.test.js
@@ -1137,12 +1104,10 @@ packages/editor/ProseMirror/schema.js
 packages/editor/ProseMirror/styles.js
 packages/editor/ProseMirror/testing/createTestEditor.js
 packages/editor/ProseMirror/testing/createTestEditorWithSerializer.js
-packages/editor/ProseMirror/testing/mockEditorApi.js
 packages/editor/ProseMirror/types.js
 packages/editor/ProseMirror/utils/SelectableNodeView.js
 packages/editor/ProseMirror/utils/UndoStackSynchronizer.js
 packages/editor/ProseMirror/utils/canReplaceSelectionWith.js
-packages/editor/ProseMirror/utils/clampPointToDocument.js
 packages/editor/ProseMirror/utils/computeSelectionFormatting.js
 packages/editor/ProseMirror/utils/dom/createButton.js
 packages/editor/ProseMirror/utils/dom/createTextArea.js
@@ -1152,8 +1117,6 @@ packages/editor/ProseMirror/utils/dom/showModal.js
 packages/editor/ProseMirror/utils/extractSelectedLinesTo.test.js
 packages/editor/ProseMirror/utils/extractSelectedLinesTo.js
 packages/editor/ProseMirror/utils/forEachHeading.js
-packages/editor/ProseMirror/utils/getTextBetween.js
-packages/editor/ProseMirror/utils/insertRenderedMarkdown.js
 packages/editor/ProseMirror/utils/jumpToHash.js
 packages/editor/ProseMirror/utils/makeLinksClickableInElement.js
 packages/editor/ProseMirror/utils/postprocessEditorOutput.test.js
@@ -1221,7 +1184,6 @@ packages/lib/InMemoryCache.js
 packages/lib/JoplinDatabase.js
 packages/lib/JoplinError.js
 packages/lib/JoplinServerApi.js
-packages/lib/ObjectUtils.test.js
 packages/lib/ObjectUtils.js
 packages/lib/PerformanceLogger.test.js
 packages/lib/PerformanceLogger.js
@@ -1237,7 +1199,6 @@ packages/lib/SyncTargetOneDrive.js
 packages/lib/SyncTargetRegistry.js
 packages/lib/Synchronizer.js
 packages/lib/TaskQueue.js
-packages/lib/WebDavApi.js
 packages/lib/WelcomeUtils.js
 packages/lib/array.js
 packages/lib/callbackUrlUtils.test.js
@@ -1245,8 +1206,6 @@ packages/lib/callbackUrlUtils.js
 packages/lib/clipperUtils.js
 packages/lib/commands/convertHtmlToMarkdown.test.js
 packages/lib/commands/convertHtmlToMarkdown.js
-packages/lib/commands/convertNoteToMarkdown.test.js
-packages/lib/commands/convertNoteToMarkdown.js
 packages/lib/commands/deleteNote.js
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyForward.js
@@ -1261,7 +1220,6 @@ packages/lib/commands/synchronize.js
 packages/lib/commands/toggleAllFolders.test.js
 packages/lib/commands/toggleAllFolders.js
 packages/lib/commands/toggleEditorPlugin.js
-packages/lib/components/Dialog.js
 packages/lib/components/EncryptionConfigScreen/utils.test.js
 packages/lib/components/EncryptionConfigScreen/utils.js
 packages/lib/components/shared/NoteEditor/WarningBanner/onRichTextDismissLinkClick.js
@@ -1288,7 +1246,6 @@ packages/lib/components/shared/reduxSharedMiddleware.js
 packages/lib/components/shared/side-menu-shared.test.js
 packages/lib/components/shared/side-menu-shared.js
 packages/lib/database-driver-better-sqlite.js
-packages/lib/database-driver.js
 packages/lib/database.js
 packages/lib/debug/DebugService.js
 packages/lib/determineBaseAppDirs.js
@@ -1311,7 +1268,6 @@ packages/lib/fsDriver.test.js
 packages/lib/geolocation-node.js
 packages/lib/getAppName.test.js
 packages/lib/getAppName.js
-packages/lib/hooks/dom/useDocument.js
 packages/lib/hooks/plugins/usePlugin.js
 packages/lib/hooks/plugins/useVisiblePluginEditorViewIds.js
 packages/lib/hooks/useAsyncEffect.js
@@ -1378,7 +1334,6 @@ packages/lib/models/utils/getCanBeCollapsedFolderIds.js
 packages/lib/models/utils/getCollator.js
 packages/lib/models/utils/getConflictFolderId.js
 packages/lib/models/utils/isItemId.js
-packages/lib/models/utils/isJoplinServerVariant.js
 packages/lib/models/utils/itemCanBeEncrypted.js
 packages/lib/models/utils/onFolderDrop.test.js
 packages/lib/models/utils/onFolderDrop.js
@@ -1414,7 +1369,6 @@ packages/lib/services/KeymapService_keysRegExp.js
 packages/lib/services/KvStore.js
 packages/lib/services/MigrationService.js
 packages/lib/services/NavService.js
-packages/lib/services/NotePositionService.js
 packages/lib/services/PostMessageService.js
 packages/lib/services/ReportService.test.js
 packages/lib/services/ReportService.js
@@ -1430,7 +1384,6 @@ packages/lib/services/UndoRedoService.js
 packages/lib/services/WhenClause.test.js
 packages/lib/services/WhenClause.js
 packages/lib/services/commands/MenuUtils.js
-packages/lib/services/commands/ToolbarButtonUtils.test.js
 packages/lib/services/commands/ToolbarButtonUtils.js
 packages/lib/services/commands/commandsToMarkdownTable.js
 packages/lib/services/commands/focusEditorIfEditorCommand.js
@@ -1509,7 +1462,6 @@ packages/lib/services/keychain/KeychainServiceDriver.dummy.js
 packages/lib/services/keychain/KeychainServiceDriver.electron.js
 packages/lib/services/keychain/KeychainServiceDriver.node.js
 packages/lib/services/keychain/KeychainServiceDriverBase.js
-packages/lib/services/noteList/checkboxPieCss.js
 packages/lib/services/noteList/defaultLeftToRightListRenderer.js
 packages/lib/services/noteList/defaultListRenderer.js
 packages/lib/services/noteList/defaultMultiColumnsRenderer.js
@@ -1696,14 +1648,12 @@ packages/lib/shim-init-node.js
 packages/lib/shim.js
 packages/lib/string-utils.test.js
 packages/lib/string-utils.js
-packages/lib/testing/dom-test-environment.js
 packages/lib/testing/plugins/createTestPlugin.js
 packages/lib/testing/share/makeMockShareInvitation.js
 packages/lib/testing/share/mockShareService.js
 packages/lib/testing/syncTargetUtils.js
 packages/lib/testing/test-utils-synchronizer.js
 packages/lib/testing/test-utils.js
-packages/lib/testing/waitFor.js
 packages/lib/theme.js
 packages/lib/themes/aritimDark.js
 packages/lib/themes/dark.js
@@ -1802,14 +1752,10 @@ packages/renderer/MdToHtml/createEventHandlingAttrs.js
 packages/renderer/MdToHtml/linkReplacement.test.js
 packages/renderer/MdToHtml/linkReplacement.js
 packages/renderer/MdToHtml/renderMedia.js
-packages/renderer/MdToHtml/rules/abc.js
 packages/renderer/MdToHtml/rules/checkbox.js
 packages/renderer/MdToHtml/rules/code_inline.js
-packages/renderer/MdToHtml/rules/externalEmbed.js
 packages/renderer/MdToHtml/rules/fence.js
 packages/renderer/MdToHtml/rules/fountain.js
-packages/renderer/MdToHtml/rules/frontmatter.test.js
-packages/renderer/MdToHtml/rules/frontmatter.js
 packages/renderer/MdToHtml/rules/highlight_keywords.js
 packages/renderer/MdToHtml/rules/html_image.js
 packages/renderer/MdToHtml/rules/image.js
@@ -1843,40 +1789,24 @@ packages/tools/checkIgnoredFiles.js
 packages/tools/checkLibPaths.test.js
 packages/tools/checkLibPaths.js
 packages/tools/convertThemesToCss.js
-packages/tools/fuzzer/ActionRunner.js
-packages/tools/fuzzer/Fuzzer.js
-packages/tools/fuzzer/cli.js
+packages/tools/fuzzer/ActionTracker.js
+packages/tools/fuzzer/Client.js
+packages/tools/fuzzer/ClientPool.js
+packages/tools/fuzzer/Server.js
 packages/tools/fuzzer/constants.js
-packages/tools/fuzzer/ipc/Client.js
-packages/tools/fuzzer/ipc/ClientPool.js
-packages/tools/fuzzer/ipc/Server.js
-packages/tools/fuzzer/model/ActionTracker.js
 packages/tools/fuzzer/model/FolderRecord.js
-packages/tools/fuzzer/model/NoteRecord.js
-packages/tools/fuzzer/model/ResourceRecord.js
-packages/tools/fuzzer/model/Serializable.js
-packages/tools/fuzzer/model/types.js
+packages/tools/fuzzer/sync-fuzzer.js
 packages/tools/fuzzer/types.js
-packages/tools/fuzzer/utils/ProgressBar.js
 packages/tools/fuzzer/utils/SeededRandom.js
-packages/tools/fuzzer/utils/diffSortedStringArrays.test.js
-packages/tools/fuzzer/utils/diffSortedStringArrays.js
-packages/tools/fuzzer/utils/extractResourceIds.js
 packages/tools/fuzzer/utils/getNumberProperty.js
 packages/tools/fuzzer/utils/getProperty.js
 packages/tools/fuzzer/utils/getStringProperty.js
-packages/tools/fuzzer/utils/hangingIndent.js
-packages/tools/fuzzer/utils/logDiffDebug.js
 packages/tools/fuzzer/utils/openDebugSession.js
-packages/tools/fuzzer/utils/randomId.test.js
-packages/tools/fuzzer/utils/randomId.js
-packages/tools/fuzzer/utils/randomString.js
 packages/tools/fuzzer/utils/retryWithCount.js
 packages/tools/generate-database-types.js
 packages/tools/generate-images.js
 packages/tools/git-changelog.test.js
 packages/tools/git-changelog.js
-packages/tools/licenses/buildReport.js
 packages/tools/licenses/getLicenses.js
 packages/tools/licenses/licenseChecker.js
 packages/tools/licenses/licenseOverrides/fontAwesomeOverride/index.js
@@ -1913,7 +1843,6 @@ packages/tools/update-readme-contributors.js
 packages/tools/update-readme-download.test.js
 packages/tools/update-readme-download.js
 packages/tools/update-readme-sponsors.js
-packages/tools/updateCanary.js
 packages/tools/updateMarkdownDoc.js
 packages/tools/utils/discourse.test.js
 packages/tools/utils/discourse.js
@@ -1941,9 +1870,6 @@ packages/tools/website/utils/parser.js
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/processTranslations.js
 packages/tools/website/utils/render.js
-packages/tools/website/utils/supportedLocales.js
 packages/tools/website/utils/types.js
-packages/whisper-voice-typing/src/index.js
-packages/whisper-voice-typing/src/specs/Whisper.nitro.js
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 

.npmpackagejsonlintrc.json

@@ -5,7 +5,6 @@
 				"exceptions": [
 					"@joplin/editor",
 					"@joplin/fork-htmlparser2",
-					"@joplin/whisper-voice-typing",
 					"@joplin/fork-sax",
 					"@joplin/fork-uslug",
 					"@joplin/htmlpack",

.yarn/patches/@react-native-vector-icons-fontawesome5-npm-12.3.0-a1ca46610f.patch

@@ -1,21 +0,0 @@
-# Add a minSdkVersion to prevent the dangerous READ_PHONE_STATE
-# permission from being added.
-# See:
-# - Upstream issue report: https://github.com/oblador/react-native-vector-icons/issues/1861
-# - About the permission: https://developer.android.com/reference/android/Manifest.permission#READ_PHONE_STATE
-# - StackOverflow post with discussion and alternate workarounds: https://stackoverflow.com/questions/39668549/why-has-the-read-phone-state-permission-been-added
-diff --git a/android/build.gradle b/android/build.gradle
-index a16b4ad6d1871cf5cf73ef7ebeaf8bd4d662b134..9871afb5fbf8e687370e08f54d884ecd7dde7e7c 100644
---- a/android/build.gradle
-+++ b/android/build.gradle
-@@ -37,6 +37,10 @@ android {
-   }
- 
-   compileSdkVersion safeExtGet('compileSdkVersion', 31)
-+
-+  defaultConfig {
-+    minSdkVersion safeExtGet('minSdkVersion', 24)
-+  }
- }
- 
- dependencies {

.yarn/patches/@react-native-vector-icons-ionicons-npm-12.3.0-9bd4746f3f.patch

@@ -1,21 +0,0 @@
-# Add a minSdkVersion to prevent the dangerous READ_PHONE_STATE
-# permission from being added.
-# See:
-# - Upstream issue report: https://github.com/oblador/react-native-vector-icons/issues/1861
-# - About the permission: https://developer.android.com/reference/android/Manifest.permission#READ_PHONE_STATE
-# - StackOverflow post with discussion and alternate workarounds: https://stackoverflow.com/questions/39668549/why-has-the-read-phone-state-permission-been-added
-diff --git a/android/build.gradle b/android/build.gradle
-index d42bd23123644cc324051e9c7ec4635de286315a..640996df60fe7769f69b30b35f771eb9cf0b75d4 100644
---- a/android/build.gradle
-+++ b/android/build.gradle
-@@ -37,6 +37,10 @@ android {
-   }
- 
-   compileSdkVersion safeExtGet('compileSdkVersion', 31)
-+  
-+  defaultConfig {
-+    minSdkVersion safeExtGet('minSdkVersion', 24)
-+  }
- }
- 
- dependencies {

.yarn/patches/@react-native-vector-icons-material-design-icons-npm-12.4.0-890f7f618b.patch

@@ -1,21 +0,0 @@
-# Add a minSdkVersion to prevent the dangerous READ_PHONE_STATE
-# permission from being added.
-# See:
-# - Upstream issue report: https://github.com/oblador/react-native-vector-icons/issues/1861
-# - About the permission: https://developer.android.com/reference/android/Manifest.permission#READ_PHONE_STATE
-# - StackOverflow post with discussion and alternate workarounds: https://stackoverflow.com/questions/39668549/why-has-the-read-phone-state-permission-been-added
-diff --git a/android/build.gradle b/android/build.gradle
-index 170ec0ff9befe0f9155aaf5e1b84133cfd87be99..e6a0ab4a019ee67c5af7761ae8bb35f18b05c590 100644
---- a/android/build.gradle
-+++ b/android/build.gradle
-@@ -37,6 +37,10 @@ android {
-   }
- 
-   compileSdkVersion safeExtGet('compileSdkVersion', 31)
-+
-+  defaultConfig {
-+    minSdkVersion safeExtGet('minSdkVersion', 24)
-+  }
- }
- 
- dependencies {

.yarn/patches/@react-native-vector-icons-material-icons-npm-12.4.0-94138e627b.patch

@@ -1,21 +0,0 @@
-# Add a minSdkVersion to prevent the dangerous READ_PHONE_STATE
-# permission from being added.
-# See:
-# - Upstream issue report: https://github.com/oblador/react-native-vector-icons/issues/1861
-# - About the permission: https://developer.android.com/reference/android/Manifest.permission#READ_PHONE_STATE
-# - StackOverflow post with discussion and alternate workarounds: https://stackoverflow.com/questions/39668549/why-has-the-read-phone-state-permission-been-added
-diff --git a/android/build.gradle b/android/build.gradle
-index 3b22f9de66795ee01dbaa29655727ee7ddba3cc8..325daa88d33f066b3826e5031ce281793710af2d 100644
---- a/android/build.gradle
-+++ b/android/build.gradle
-@@ -37,6 +37,10 @@ android {
-   }
- 
-   compileSdkVersion safeExtGet('compileSdkVersion', 31)
-+
-+  defaultConfig {
-+    minSdkVersion safeExtGet('minSdkVersion', 24)
-+  }
- }
- 
- dependencies {

Assets/WebsiteAssets/css/site.css

@@ -658,84 +658,13 @@ footer .bottom-links-row p {
 }
 
 .language-switcher {
-	display: inline-block;
-	position: relative;
-	margin-left: 20px;
+	display: inline;
 }
 
 .language-switcher > button {
 	border: none;
 	background-color: transparent;
 	color: #0557ba;
-	cursor: pointer;
-	padding: 0;
-}
-
-.language-switcher > button:hover {
-	opacity: 0.8;
-}
-
-.language-switcher .dropdown-menu {
-	min-width: 100px;
-	padding: 5px 0 !important;
-	margin: 0 !important;
-	text-align: left;
-}
-
-.language-switcher .dropdown-menu li {
-	padding: 0 !important;
-	margin: 0 !important;
-	list-style: none;
-}
-
-.language-switcher .dropdown-item {
-	color: #333 !important;
-	padding: 8px 15px !important;
-	margin: 0 !important;
-	display: block;
-	text-align: left;
-	width: 100%;
-	box-sizing: border-box;
-}
-
-.language-switcher .dropdown-item.active {
-	background-color: #0557ba !important;
-	color: #fff !important;
-	margin: 0 !important;
-	border-radius: 0 !important;
-}
-
-.language-switcher .dropdown-item:hover:not(.active) {
-	background-color: #f0f0f0;
-}
-
-/* Language switcher on front page (blue background) */
-.navbar-frontpage .language-switcher > button {
-	color: #fff;
-}
-
-/* Mobile language section */
-.menu-mobile-language {
-	margin-top: 20px;
-	padding-top: 15px;
-	border-top: 1px solid rgba(255, 255, 255, 0.2);
-}
-
-.mobile-menu-language-label {
-	color: #90b1d9;
-	margin-bottom: 10px;
-	font-size: 0.9em;
-}
-
-.mobile-language-link {
-	display: inline-block;
-	margin: 0 10px;
-	padding: 5px 15px;
-	border-radius: 5px;
-}
-
-.mobile-language-link.active {
-	background-color: rgba(255, 255, 255, 0.2);
 }
 
 .joplin-cloud-feature-list .feature-description {

Assets/WebsiteAssets/js/script.js

@@ -124,52 +124,7 @@ async function setupDownloadPage() {
 	}
 }
 
-// Supported locale path prefixes (language code -> URL path)
-// Most languages use their code directly (fr, de), with exceptions mapped here
-const localePathOverrides = {
-	'zh': 'cn',
-};
-
-// List of supported language codes
-const supportedLanguages = ['fr', 'de', 'zh'];
-
-function getLocalePath(langCode) {
-	const pathPrefix = localePathOverrides[langCode] || langCode;
-	return '/' + pathPrefix;
-}
-
-function setupLocaleRedirect() {
-	// Only redirect on the front page (root path or index.html)
-	const path = window.location.pathname;
-	const isRootPage = path === '/' || path === '/index.html' || path === '';
-	if (!isRootPage) return;
-
-	// Check if user has explicitly chosen to stay on current locale
-	const localePreference = localStorage.getItem('joplin-locale-preference');
-	if (localePreference === 'en') return;
-
-	// Get user's preferred language from browser
-	const browserLang = (navigator.language || navigator.userLanguage || '').toLowerCase();
-
-	// Extract the base language code (e.g., 'fr' from 'fr-ca')
-	const langCode = browserLang.split('-')[0];
-
-	// Check if we support this language
-	if (!supportedLanguages.includes(langCode)) return;
-
-	window.location.href = getLocalePath(langCode) + '/';
-}
-
-// Allow users to switch back to English and remember their preference
-function setLocalePreference(locale) {
-	localStorage.setItem('joplin-locale-preference', locale);
-}
-
-// Expose globally for language switcher links
-window.setLocalePreference = setLocalePreference;
-
 $(function () {
 	setupMobileMenu();
-	setupLocaleRedirect();
 	void setupDownloadPage();
 });

Assets/WebsiteAssets/locales/de_DE.po

@@ -1,164 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: de_DE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.0.1\n"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:10
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:14
-msgid "/month"
-msgstr "/Monat"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:22
-msgid "/year"
-msgstr "/Jahr"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:71
-msgid "<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues."
-msgstr "<a href=\"https://joplincloud.com\">Joplin Cloud</a> ermöglicht es Ihnen, Ihre Notizen geräteübergreifend zu synchronisieren. Sie können Notizen veröffentlichen und mit Freunden, Familie oder Kollegen gemeinsam an Notizbüchern arbeiten."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:206
-msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
-msgstr "Passen Sie es <span class=\"frame-bg frame-bg-yellow-lg\">an</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:105
-msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
-msgstr "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span>-Notizen"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
-msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
-msgstr "100 % <span class=\"frame-bg frame-bg-yellow-lg\">Ihre Daten</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:299
-msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
-msgstr "Eine <span class=\"frame-bg frame-bg-yellow-lg\">französische</span> Alternative"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:237
-msgid "Access your notes from your computer, phone or tablet by synchronising with various services, including Joplin Cloud, Dropbox and OneDrive. The app is available on Windows, macOS, Linux, Android and iOS. A terminal app is also available!"
-msgstr "Greifen Sie von Ihrem Computer, Smartphone oder Tablet auf Ihre Notizen zu, indem Sie sie mit verschiedenen Diensten wie Joplin Cloud, Dropbox und OneDrive synchronisieren. Die App ist für Windows, macOS, Linux, Android und iOS verfügbar. Eine Terminal-App ist ebenfalls verfügbar!"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:121
-msgid "Already have a Joplin Cloud account? <a href=\"https://joplincloud.com\">Login now</a>"
-msgstr "Sie haben bereits ein Joplin-Cloud-Konto? <a href=\"https://joplincloud.com\">Jetzt anmelden</a>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:209
-msgid "Customise the app with plugins, custom themes and multiple text editors (Rich Text or Markdown). Or create your own scripts and plugins using the Extension API."
-msgstr "Passen Sie die App mit Plugins, eigenen Designs und verschiedenen Texteditoren (Rich Text oder Markdown) an. Oder erstellen Sie mit der Erweiterungs-API eigene Skripte und Plugins."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
-msgid "Download it now"
-msgstr "Jetzt herunterladen"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:113
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:64
-msgid "Download the app"
-msgstr "App herunterladen"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:214
-msgid "Find out more"
-msgstr "Mehr erfahren"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:55
-msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
-msgstr "Befreien Sie Ihre <span class=\"frame-bg frame-bg-blue\">Notizen</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:176
-msgid "Get the clipper"
-msgstr "Clipper herunterladen"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:108
-msgid "Images, videos, PDFs and audio files are supported. Create math expressions and diagrams directly from the app. Take photos with the mobile app and save them to a note."
-msgstr "Bilder, Videos, PDFs und Audiodateien werden unterstützt. Erstellen Sie mathematische Ausdrücke und Diagramme direkt in der App. Machen Sie Fotos mit der mobilen App und speichern Sie sie in einer Notiz."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:328
-msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
-msgstr "In der <span class=\"frame-bg frame-bg-yellow\">Presse</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:68
-msgid "Joplin Cloud"
-msgstr "Joplin Cloud"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:302
-msgid "Joplin Cloud is based in France. This means your data is protected by strict European Union privacy laws. In addition, Joplin Cloud implements strong end-to-end encryption so that not even us can have access to your data."
-msgstr "Joplin Cloud hat seinen Sitz in Frankreich. Das bedeutet, dass Ihre Daten durch strenge Datenschutzgesetze der Europäischen Union geschützt sind. Darüber hinaus verwendet Joplin Cloud eine starke Ende-zu-Ende-Verschlüsselung, sodass nicht einmal wir Zugriff auf Ihre Daten haben."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:58
-msgid "Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device."
-msgstr "Joplin ist eine Open-Source-App für Notizen. Halten Sie Ihre Gedanken fest und greifen Sie sicher von jedem Gerät darauf zu."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:79
-msgid "Joplin Server Business"
-msgstr "Joplin Server Business"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:82
-msgid "Joplin Server Business is a synchronisation server that you can install on your own infrastructure, so that your data remains private and secure within your business."
-msgstr "Joplin Server Business ist ein Synchronisationsserver, den Sie auf Ihrer eigenen Infrastruktur installieren können, sodass Ihre Daten innerhalb Ihres Unternehmens privat und sicher bleiben."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:263
-msgid "More about E2EE"
-msgstr "Mehr zu E2EE"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:392
-msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
-msgstr "Unsere <span class=\"frame-bg frame-bg-blue-lg\">Sponsoren</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:46
-msgid "Our synchronisation and sharing <span class=\"frame-bg frame-bg-yellow\">solutions</span>"
-msgstr "Unsere <span class=\"frame-bg frame-bg-yellow\">Lösungen</span> für Synchronisation und Zusammenarbeit"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:91
-msgid "Pay Monthly"
-msgstr "Monatlich zahlen"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:98
-msgid "Pay Yearly"
-msgstr "Jährlich zahlen"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:168
-msgid "Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
-msgstr "Speichern Sie <span class=\"frame-bg frame-bg-blue\">Webseiten</span> <br>als Notizen"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:66
-msgid "Sign up with Joplin Cloud"
-msgstr "Mit Joplin Cloud registrieren"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
-msgid "Synchronise and share your notes with our range of plans."
-msgstr "Synchronisieren und teilen Sie Ihre Notizen mit unseren verschiedenen Tarifen."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:395
-msgid "Thank you for your support!"
-msgstr "Vielen Dank für Ihre Unterstützung!"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:258
-msgid "The app is open source and your notes are saved to an open format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but yourself can access them."
-msgstr "Die App ist Open Source und Ihre Notizen werden in einem offenen Format gespeichert, sodass Sie jederzeit Zugriff darauf haben. Sie verwendet Ende-zu-Ende-Verschlüsselung (E2EE), um Ihre Notizen zu schützen und sicherzustellen, dass niemand außer Ihnen darauf zugreifen kann."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:145
-msgid "Try it now"
-msgstr "Jetzt ausprobieren"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:171
-msgid "Use the web clipper extension, available on Chrome and Firefox, to save web pages or take screenshots as notes."
-msgstr "Verwenden Sie die Web-Clipper-Erweiterung für Chrome und Firefox, um Webseiten zu speichern oder Screenshots als Notizen zu erstellen."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:139
-msgid "With Joplin Cloud, share your notes with your friends, family or colleagues and collaborate on them."
-msgstr "Mit Joplin Cloud können Sie Ihre Notizen mit Freunden, Familie oder Kollegen teilen und gemeinsam daran arbeiten."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
-msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
-msgstr "Gemeinsam <span class=\"frame-bg frame-bg-yellow\">arbeiten</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:142
-msgid "You can also publish a note to the internet and share the URL with others."
-msgstr "Sie können eine Notiz auch im Internet veröffentlichen und die URL mit anderen teilen."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:234
-msgid "Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you are"
-msgstr "Ihre Notizen, <span class=\"frame-bg frame-bg-blue-lg\">überall</span>, wo Sie sind"

Assets/WebsiteAssets/locales/fr_FR.po

@@ -1,6 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -9,235 +11,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:10
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:14
-msgid "/month"
-msgstr "/mois"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:22
-msgid "/year"
-msgstr "/an"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:71
-msgid ""
-"<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to "
-"synchronise your notes across devices. It also lets you publish notes, and "
-"collaborate on notebooks with your friends, family or colleagues."
-msgstr ""
-"<a href=\"https://joplincloud.com\">Joplin Cloud</a> vous permet de "
-"synchroniser vos notes entre vos appareils. Il vous permet également de "
-"publier des notes et de collaborer sur des carnets avec vos amis, votre "
-"famille ou vos collègues."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:206
-msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
-msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">Personnalisez</span>-la"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:105
-msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
-msgstr "Notes <span class=\"frame-bg frame-bg-yellow\">multimédia</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
-msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
-msgstr "100 % <span class=\"frame-bg frame-bg-yellow-lg\">vos données</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:299
-msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
-msgstr ""
-"Une alternative <span class=\"frame-bg frame-bg-yellow-lg\">française</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:237
-msgid ""
-"Access your notes from your computer, phone or tablet by synchronising with "
-"various services, including Joplin Cloud, Dropbox and OneDrive. The app is "
-"available on Windows, macOS, Linux, Android and iOS. A terminal app is also "
-"available!"
-msgstr ""
-"Accédez à vos notes depuis votre ordinateur, téléphone ou tablette en les "
-"synchronisant avec différents services, notamment Joplin Cloud, Dropbox et "
-"OneDrive. L’application est disponible sur Windows, macOS, Linux, Android et "
-"iOS. Une application en ligne de commande est également disponible !"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:121
-msgid ""
-"Already have a Joplin Cloud account? <a href=\"https://joplincloud.com"
-"\">Login now</a>"
-msgstr ""
-"Vous avez déjà un compte Joplin Cloud ? <a href=\"https://joplincloud.com"
-"\">Connectez-vous maintenant</a>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:209
-msgid ""
-"Customise the app with plugins, custom themes and multiple text editors "
-"(Rich Text or Markdown). Or create your own scripts and plugins using the "
-"Extension API."
-msgstr ""
-"Personnalisez l’application avec des extensions, des thèmes personnalisés et "
-"plusieurs éditeurs de texte (texte enrichi ou Markdown). Ou créez vos "
-"propres scripts et extensions grâce à l’API d’extension."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
-msgid "Download it now"
-msgstr "Téléchargez maintenant"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:113
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:64
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
 msgid "Download the app"
-msgstr "Télécharger l'appli"
+msgstr "Télécharger l'application"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:214
-msgid "Find out more"
-msgstr "En savoir plus"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:55
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
 msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
 msgstr "Libérez vos <span class=\"frame-bg frame-bg-blue\">notes</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:176
-msgid "Get the clipper"
-msgstr "Obtenir le clipper"
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
+msgid "Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device."
+msgstr "Joplin est une application libre de prise de notes. Capturez vos pensées et accédez-y de façon sécurisé depuis n'importe quel appareil."
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:108
-msgid ""
-"Images, videos, PDFs and audio files are supported. Create math expressions "
-"and diagrams directly from the app. Take photos with the mobile app and save "
-"them to a note."
-msgstr ""
-"Les images, vidéos, PDF et fichiers audio sont pris en charge. Créez des "
-"expressions mathématiques et des diagrammes directement depuis "
-"l’application. Prenez des photos avec l’application mobile et enregistrez-"
-"les dans une note."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:328
-msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
-msgstr "Dans la <span class=\"frame-bg frame-bg-yellow\">presse</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:68
-msgid "Joplin Cloud"
-msgstr "Joplin Cloud"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:302
-msgid ""
-"Joplin Cloud is based in France. This means your data is protected by strict "
-"European Union privacy laws. In addition, Joplin Cloud implements strong end-"
-"to-end encryption so that not even us can have access to your data."
-msgstr ""
-"Joplin Cloud est basé en France. Cela signifie que vos données sont "
-"protégées par les lois strictes de l’Union européenne en matière de "
-"confidentialité. De plus, Joplin Cloud met en œuvre un chiffrement de bout "
-"en bout robuste afin que même nous ne puissions pas accéder à vos données."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:58
-msgid ""
-"Joplin is an open source note-taking app. Capture your thoughts and securely "
-"access them from any device."
-msgstr ""
-"Joplin est une application libre de prise de notes. Capturez vos pensées et "
-"accédez-y de façon sécurisée depuis n'importe quel appareil."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:79
-msgid "Joplin Server Business"
-msgstr "Joplin Server Business"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:82
-msgid ""
-"Joplin Server Business is a synchronisation server that you can install on "
-"your own infrastructure, so that your data remains private and secure within "
-"your business."
-msgstr ""
-"Joplin Server Business est un serveur de synchronisation que vous pouvez "
-"installer sur votre propre infrastructure, afin que vos données restent "
-"privées et sécurisées au sein de votre entreprise."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:263
-msgid "More about E2EE"
-msgstr "En savoir plus sur le chiffrement de bout en bout"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:392
-msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
-msgstr "Nos <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:46
-msgid ""
-"Our synchronisation and sharing <span class=\"frame-bg frame-bg-yellow"
-"\">solutions</span>"
-msgstr ""
-"Nos <span class=\"frame-bg frame-bg-yellow\">solutions</span> de "
-"synchronisation et de partage"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:91
-msgid "Pay Monthly"
-msgstr "Payer mensuellement"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:98
-msgid "Pay Yearly"
-msgstr "Payer annuellement"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:168
-msgid ""
-"Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
-msgstr ""
-"Enregistrez des <span class=\"frame-bg frame-bg-blue\">pages web</span> "
-"<br>comme notes"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:66
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
 msgid "Sign up with Joplin Cloud"
 msgstr "S'inscrire sur Joplin Cloud"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
-msgid "Synchronise and share your notes with our range of plans."
-msgstr "Synchronisez et partagez vos notes grâce à notre gamme d’offres."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:395
-msgid "Thank you for your support!"
-msgstr "Merci pour votre soutien !"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:258
-msgid ""
-"The app is open source and your notes are saved to an open format, so you'll "
-"always have access to them. Uses End-To-End Encryption (E2EE) to secure your "
-"notes and ensure no-one but yourself can access them."
-msgstr ""
-"L’application est open source et vos notes sont enregistrées dans un format "
-"ouvert, vous aurez donc toujours accès à celles-ci. Elle utilise le "
-"chiffrement de bout en bout (E2EE) pour sécuriser vos notes et garantir que "
-"personne d’autre que vous ne puisse y accéder."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:145
-msgid "Try it now"
-msgstr "Essayez-la maintenant"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:171
-msgid ""
-"Use the web clipper extension, available on Chrome and Firefox, to save web "
-"pages or take screenshots as notes."
-msgstr ""
-"Utilisez l’extension Web Clipper, disponible sur Chrome et Firefox, pour "
-"enregistrer des pages web ou des captures d’écran comme notes."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:139
-msgid ""
-"With Joplin Cloud, share your notes with your friends, family or colleagues "
-"and collaborate on them."
-msgstr ""
-"Avec Joplin Cloud, partagez vos notes avec vos amis, votre famille ou vos "
-"collègues et collaborez dessus."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
-msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
-msgstr "Travaillez <span class=\"frame-bg frame-bg-yellow\">ensemble</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:142
-msgid ""
-"You can also publish a note to the internet and share the URL with others."
-msgstr ""
-"Vous pouvez également publier une note sur Internet et partager son URL avec "
-"d’autres."
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:234
-msgid ""
-"Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you "
-"are"
-msgstr ""
-"Vos notes, <span class=\"frame-bg frame-bg-blue-lg\">partout</span> où vous "
-"êtes"

Assets/WebsiteAssets/locales/zh_CN.po

@@ -9,213 +9,194 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:10
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:14
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:13
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:9
 msgid "/month"
 msgstr "/月"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:22
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:19
 msgid "/year"
 msgstr "/年"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:71
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:8
 msgid ""
 "<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to "
 "synchronise your notes across devices. It also lets you publish notes, and "
 "collaborate on notebooks with your friends, family or colleagues."
 msgstr ""
-"<a href=\"https://joplincloud.com\">Joplin Cloud</a> 允许您在不同设备之间同步笔记。"
-"它还支持发布笔记，并与朋友、家人或同事协作共享笔记本。"
+"<a href=\"https://joplincloud.com\">Joplin Cloud</a> 允许您在不同的设备上同步"
+"您的笔记。它还可以让您发布笔记，并与您的朋友、家人或同事在笔记本上进行协作。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:206
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:205
 msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
-msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">自定义</span>它"
+msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">定制</span>它 根据您的需要"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:105
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:104
 msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
-msgstr "<span class=\"frame-bg frame-bg-yellow\">多媒体</span>笔记"
+msgstr "<span class=\"frame-bg frame-bg-yellow\">多媒体</span>说明"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:256
 msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
-msgstr "100% <span class=\"frame-bg frame-bg-yellow-lg\">属于你的数据</span>"
+msgstr "百分之百<span class=\"frame-bg frame-bg-yellow-lg\">你的数据</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:299
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:298
 msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
-msgstr "一个<span class=\"frame-bg frame-bg-yellow-lg\">法国</span>替代方案"
+msgstr "一个<span class=\"frame-bg frame-bg-yellow-lg\">法国</span>的替代方案"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:237
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:236
 msgid ""
 "Access your notes from your computer, phone or tablet by synchronising with "
 "various services, including Joplin Cloud, Dropbox and OneDrive. The app is "
 "available on Windows, macOS, Linux, Android and iOS. A terminal app is also "
 "available!"
 msgstr ""
-"通过与包括 Joplin Cloud、Dropbox 和 OneDrive 在内的多种服务同步，"
-"您可以在电脑、手机或平板上访问笔记。该应用支持 Windows、macOS、Linux、Android 和 iOS。"
-"同时还提供终端版本应用！"
+"通过与各种服务同步，包括Joplin Cloud、Dropbox和OneDrive，从你的电脑、手机或平"
+"板电脑访问你的笔记。该应用程序可在Windows、macOS、Linux、Android和iOS上使用。"
+"终端应用也可使用!"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:121
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
 msgid ""
-"Already have a Joplin Cloud account? <a href=\"https://"
-"joplincloud.com\">Login now</a>"
+"Already have a Joplin Cloud account? <a href=\"https://joplincloud.com"
+"\">Login now</a>"
 msgstr ""
-"已经拥有 Joplin Cloud 账户？<a href=\"https://joplincloud.com\">立即登录</a>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:209
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:208
 msgid ""
 "Customise the app with plugins, custom themes and multiple text editors "
 "(Rich Text or Markdown). Or create your own scripts and plugins using the "
 "Extension API."
 msgstr ""
-"通过插件、自定义主题和多种文本编辑器（富文本或 Markdown）来自定义应用。"
-"您也可以使用扩展 API 创建自己的脚本和插件。"
+"用插件、自定义主题和多个文本编辑器（富文本或马克顿）来定制该应用程序。或者使"
+"用扩展API创建你自己的脚本和插件。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:242
 msgid "Download it now"
-msgstr "立即下载"
+msgstr "下载该应用程序"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:113
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:64
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:112
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
 msgid "Download the app"
-msgstr "下载应用"
+msgstr "下载该应用程序"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:214
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:213
 msgid "Find out more"
 msgstr "了解更多"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:55
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
 msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
 msgstr "释放你的<span class=\"frame-bg frame-bg-blue\">笔记</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:176
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:175
 msgid "Get the clipper"
-msgstr "获取网页剪藏器"
+msgstr "获取剪子"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:108
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:107
 msgid ""
 "Images, videos, PDFs and audio files are supported. Create math expressions "
 "and diagrams directly from the app. Take photos with the mobile app and save "
 "them to a note."
 msgstr ""
-"支持图片、视频、PDF 和音频文件。可在应用内直接创建数学公式和图表。"
-"还可通过移动端拍照并保存到笔记中。"
+"Joplin，由于其起源和设计，适应并尊重中国的标准和规则。这保证了您的使用不受限"
+"制，以及您的使用数据的完全透明和安全。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:328
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:327
 msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
-msgstr "媒体<span class=\"frame-bg frame-bg-yellow\">报道</span>"
+msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:68
-msgid "Joplin Cloud"
-msgstr "Joplin Cloud"
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:5
+msgid "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">plans</span>"
+msgstr "乔普林云<span class=\"frame-bg frame-bg-yellow\">计划</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:302
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:301
 msgid ""
 "Joplin Cloud is based in France. This means your data is protected by strict "
 "European Union privacy laws. In addition, Joplin Cloud implements strong end-"
 "to-end encryption so that not even us can have access to your data."
 msgstr ""
-"Joplin Cloud 位于法国，这意味着您的数据受到严格的欧盟隐私法规保护。"
-"此外，Joplin Cloud 采用强大的端到端加密技术，确保连我们也无法访问您的数据。"
+"Joplin Cloud 位于法国。 这意味着您的数据受到严格的欧盟隐私法的保护。 此外，"
+"Joplin Cloud 实施了强大的端到端加密，因此即使是我们也无法访问您的数据。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:58
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
 msgid ""
 "Joplin is an open source note-taking app. Capture your thoughts and securely "
 "access them from any device."
 msgstr ""
-"Joplin 是一款开源笔记应用。随时记录想法，并可在任何设备上安全访问。"
+"Joplin是一个开源的记事本应用程序。捕捉你的想法并从任何设备上安全地访问它们。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:79
-msgid "Joplin Server Business"
-msgstr "Joplin Server 商业版"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:82
-msgid ""
-"Joplin Server Business is a synchronisation server that you can install on "
-"your own infrastructure, so that your data remains private and secure within "
-"your business."
-msgstr ""
-"Joplin Server 商业版是一款可部署在您自有基础设施上的同步服务器，"
-"确保您的数据在企业内部保持私密与安全。"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:263
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:262
 msgid "More about E2EE"
-msgstr "了解更多关于 E2EE"
+msgstr "关于E2EE的更多信息"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:392
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:391
 msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
-msgstr "我们的<span class=\"frame-bg frame-bg-blue-lg\">赞助商</span>"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:46
-msgid ""
-"Our synchronisation and sharing <span class=\"frame-bg frame-bg-"
-"yellow\">solutions</span>"
 msgstr ""
-"我们的同步与共享<span class=\"frame-bg frame-bg-yellow\">解决方案</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:91
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:23
 msgid "Pay Monthly"
-msgstr "按月付费"
+msgstr "月度"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:98
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:30
 msgid "Pay Yearly"
-msgstr "按年付费"
+msgstr "每年一次"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:168
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:167
 msgid ""
 "Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
-msgstr "将<span class=\"frame-bg frame-bg-blue\">网页</span><br>保存为笔记"
+msgstr "保存<span class=\"frame-bg frame-bg-blue\">网页</span> <br>作为笔记"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:66
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
 msgid "Sign up with Joplin Cloud"
-msgstr "注册 Joplin Cloud"
+msgstr "与乔布林云签约"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
-msgid "Synchronise and share your notes with our range of plans."
-msgstr "通过我们的多种方案同步并共享您的笔记。"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:395
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:394
 msgid "Thank you for your support!"
-msgstr "感谢您的支持！"
+msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:258
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
 msgid ""
 "The app is open source and your notes are saved to an open format, so you'll "
 "always have access to them. Uses End-To-End Encryption (E2EE) to secure your "
 "notes and ensure no-one but yourself can access them."
 msgstr ""
-"该应用为开源软件，笔记以开放格式保存，确保您始终可以访问。"
-"采用端到端加密（E2EE）保护您的笔记，确保只有您本人可以访问。"
+"该应用程序是开源的，你的笔记被保存为开放的格式，所以你将永远可以访问它们。使"
+"用端对端加密（E2EE）来保护你的笔记，确保除了你自己之外没有人可以访问它们。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:145
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:144
 msgid "Try it now"
-msgstr "立即体验"
+msgstr "现在就试试吧"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:171
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:170
 msgid ""
 "Use the web clipper extension, available on Chrome and Firefox, to save web "
 "pages or take screenshots as notes."
-msgstr ""
-"使用适用于 Chrome 和 Firefox 的网页剪藏扩展，将网页或截图保存为笔记。"
+msgstr "使用Chrome和Firefox上的web clipper扩展，可以保存网页或截图作为笔记。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:139
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
 msgid ""
 "With Joplin Cloud, share your notes with your friends, family or colleagues "
 "and collaborate on them."
-msgstr ""
-"通过 Joplin Cloud，与朋友、家人或同事共享笔记并协作编辑。"
+msgstr "通过乔普林云，与你的朋友、家人或同事分享你的笔记，并进行合作。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:137
 msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
-msgstr "<span class=\"frame-bg frame-bg-yellow\">协作</span>工作"
+msgstr "<span class=\"frame-bg frame-bg-yellow\">一起</span>工作"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:142
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:141
 msgid ""
 "You can also publish a note to the internet and share the URL with others."
-msgstr "您还可以将笔记发布到互联网，并与他人分享链接。"
+msgstr "您还可以将笔记发布到 Internet 并与其他人共享 URL。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:234
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:233
 msgid ""
 "Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you "
 "are"
 msgstr ""
-"无论身在何处，您的笔记都<span class=\"frame-bg frame-bg-blue-lg\">随时可达</span>"
+"你的笔记<span class=\"frame-bg frame-bg-blue-lg\">你在哪里都可以</span>"
+
+#~ msgid ""
+#~ "Joplin, due to its origin and design, adapts and respects Chinese "
+#~ "standards and rules. This guarantees your unrestricted use and complete "
+#~ "transparency and security of your usage data."
+#~ msgstr ""
+#~ "Joplin，由于其起源和设计，适应并尊重中国的标准和规则。这保证了您的使用不受"
+#~ "限制，以及您的使用数据的完全透明和安全。"

Assets/WebsiteAssets/rss.xml

@@ -1,61 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Tue, 10 Feb 2026 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Tue, 10 Feb 2026 00:00:00 GMT</pubDate><item><title><![CDATA[Joplin will come preloaded on the HMD Terra M]]></title><description><![CDATA[<div style="overflow: auto;">
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260210-hmd-joplin-logo.png" width="200px" style="float: left; margin-right: 16px; margin-bottom: 16px;"/>
-<p>We’re happy to announce a collaboration with <a href="https://www.hmdsecure.com/">HMD Secure</a>, who will preload Joplin on their upcoming device, the HMD Terra M.</p>
-<p>This partnership brings Joplin to a new class of rugged, professional devices built for instant reliable communication, and reflects a shared focus on reliability, security, and long-term use.</p>
-</div>
-<h2>About HMD Secure<a name="about-hmd-secure" href="#about-hmd-secure" class="heading-anchor">🔗</a></h2>
-<p>HMD Secure Oy is a subsidiary of HMD (Human Mobile Devices), the largest European smartphone manufacturer. Headquartered in Finland, HMD Secure develops rugged, sovereign, and secure solutions for governments, defence, public safety, enterprise, and critical infrastructure.</p>
-<p>Built on a foundation of European R&amp;D and enhanced supply chain traceability and security, HMD Secure offers organisations a trusted platform for sovereignty, resilience, and long-term control.</p>
-<h2>About the HMD Terra M<a name="about-the-hmd-terra-m" href="#about-the-hmd-terra-m" class="heading-anchor">🔗</a></h2>
-<p>The <a href="https://www.hmdsecure.com/hmd-terra-m">HMD Terra M</a> is a compact, ultra-rugged smart feature phone delivered as a fully managed, mission-critical communications solution. Designed for professionals operating in demanding environments, it combines MIL-STD-810H and IP68/IP69K durability with instant Push-to-Talk, programmable PTT and emergency keys, loud high-output audio, and long battery life.</p>
-<p>Built for rapid enterprise deployment, Terra M supports modern connectivity including dual SIM and eSIM, enterprise-grade MDM, and secure applications—enabling organisations to deploy, manage, and scale frontline communications reliably from day one.</p>
-<h2>Why Joplin on the Terra M<a name="why-joplin-on-the-terra-m" href="#why-joplin-on-the-terra-m" class="heading-anchor">🔗</a></h2>
-<p>Joplin’s <strong>offline-first design</strong>, <strong>end-to-end encryption</strong>, and focus on <strong>data ownership</strong> make it a natural fit for a device built to be trusted in the field. With Joplin preloaded, Terra M users can securely capture notes, procedures, and checklists from day one, even in challenging conditions.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260210-hmd-terra-m.jpg" alt="The HMD Terra M phone"></p>
-]]></description><link>https://joplinapp.org/news/20260210-hmd-terra-m</link><guid isPermaLink="false">20260210-hmd-terra-m</guid><pubDate>Tue, 10 Feb 2026 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[What's new in Joplin 3.5]]></title><description><![CDATA[<h2>Improvements across desktop and mobile<a name="improvements-across-desktop-and-mobile" href="#improvements-across-desktop-and-mobile" class="heading-anchor">🔗</a></h2>
-<h3>More stable and consistent Markdown editing<a name="more-stable-and-consistent-markdown-editing" href="#more-stable-and-consistent-markdown-editing" class="heading-anchor">🔗</a></h3>
-<p>The Markdown editor has been refined to feel more stable and closer to the final rendered view. Headings in the editor now more closely match how they appear when viewing a note, reducing the visual jump between editing and reading. Layout issues have also been addressed so elements like rendered checkboxes and images no longer cause the editor to shift unexpectedly while typing.</p>
-<p>The ABC music notation plugin appeared to be popular but had some limitations. With this new version, ABC is now part of the app, which means it can now work from published notes, and from the Rich Text editor!</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-abc.png" alt="ABC music notation rendered directly in Joplin, showing a short musical phrase displayed from plain-text ABC syntax"></p>
-<h3>Smoother switching between notes<a name="smoother-switching-between-notes" href="#smoother-switching-between-notes" class="heading-anchor">🔗</a></h3>
-<p>Switching between notes is now less disruptive. Joplin restores cursor position and scroll location more reliably, making it easier to move back and forth between notes—especially when working with longer documents or comparing content—without losing your place.</p>
-<h3>Case insensitive tags<a name="case-insensitive-tags" href="#case-insensitive-tags" class="heading-anchor">🔗</a></h3>
-<p>Tags are now treated in a case-insensitive way, which helps prevent duplicate tags caused by differences in capitalisation, while still allowing mixed-case tag names. All this time we were hoping that @dpoulton <a href="https://discourse.joplinapp.org/t/tags-lower-case-only/4220/106">would just get used to lowercase tags</a>, but 5 years later it looks like it's not happening ;) So thank you @mrjo118 for implementing it!</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-lowercase-tags.png" alt="Joplin tag list demonstrating case-insensitive tags, with mixed-case tag names merged into a single tag."></p>
-<h3>More reliable syncing and sharing<a name="more-reliable-syncing-and-sharing" href="#more-reliable-syncing-and-sharing" class="heading-anchor">🔗</a></h3>
-<p>Syncing and sharing have been made more robust in everyday use. Joplin now handles repeated syncs more efficiently, avoids unnecessary data usage, and is better at detecting and syncing all changes, particularly when using WebDAV and S3 sync targets.</p>
-<p>Moreover filesystem synchronisation is now more reliable, in particular when used alongside tools like SyncThing on both mobile and desktop.</p>
-<h3>Accessibility and readability improvements<a name="accessibility-and-readability-improvements" href="#accessibility-and-readability-improvements" class="heading-anchor">🔗</a></h3>
-<p>Accessibility has seen further refinements in this release. Dark mode readability has been improved, common editor elements are clearer, and animations are reduced or disabled when system “reduce motion” settings are enabled, making the app more comfortable to use for a wider range of users. Keyboard navigation has also been improved on the desktop application.</p>
-<h2>Desktop-specific improvements<a name="desktop-specific-improvements" href="#desktop-specific-improvements" class="heading-anchor">🔗</a></h2>
-<h3>Easier profile management<a name="easier-profile-management" href="#easier-profile-management" class="heading-anchor">🔗</a></h3>
-<p>Managing multiple profiles on desktop is now simpler thanks to a new, more user-friendly profile management interface. This removes the need to manually edit configuration files and makes switching between different setups easier and safer.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-profiles.png" alt="Desktop profile management screen in Joplin showing multiple profiles with options to rename or delete them."></p>
-<h3>Significantly improved OneNote import<a name="significantly-improved-onenote-import" href="#significantly-improved-onenote-import" class="heading-anchor">🔗</a></h3>
-<p>Importing content from OneNote is now more reliable and accurate. Support has been expanded to cover more OneNote file formats, and many edge cases have been addressed so imported notes more closely match their original structure and content. This makes migrating from OneNote to Joplin smoother and more trustworthy.</p>
-<h3>Better tools for organising large note collections<a name="better-tools-for-organising-large-note-collections" href="#better-tools-for-organising-large-note-collections" class="heading-anchor">🔗</a></h3>
-<p>Desktop users can now select multiple notebooks at once, making it easier to reorganise notebook structures, move groups of notes, or clean up larger collections without working notebook by notebook.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-multi-select.png" alt="Joplin desktop sidebar with several notebooks selected at the same time for bulk organisation."></p>
-<h3>Polished editing experience on desktop<a name="polished-editing-experience-on-desktop" href="#polished-editing-experience-on-desktop" class="heading-anchor">🔗</a></h3>
-<p>Both the Markdown and Rich Text editors have been further refined. Cursor behaviour is more predictable, visual consistency between editing and viewing has improved, and several layout and rendering issues have been fixed to reduce interruptions while writing.</p>
-<h3>More reliable search and navigation<a name="more-reliable-search-and-navigation" href="#more-reliable-search-and-navigation" class="heading-anchor">🔗</a></h3>
-<p>Search and navigation on desktop have been improved with fixes that ensure search results behave consistently and remain visible when moving between windows or views.</p>
-<h3>Improved math support in WebClipper<a name="improved-math-support-in-webclipper" href="#improved-math-support-in-webclipper" class="heading-anchor">🔗</a></h3>
-<p>The WebClipper is not forgotten in this release - clipping certain math formulas, in particular from Wikipedia but also other websites, has been improved. Additionally, certain scientific articles are now also better handled by the WebClipper.</p>
-<h2>Mobile-specific improvements<a name="mobile-specific-improvements" href="#mobile-specific-improvements" class="heading-anchor">🔗</a></h2>
-<h3>A more powerful Rich Text Editor on mobile<a name="a-more-powerful-rich-text-editor-on-mobile" href="#a-more-powerful-rich-text-editor-on-mobile" class="heading-anchor">🔗</a></h3>
-<p>The mobile Rich Text Editor continues to improve, with new and expanded support for tables, code blocks, and other structured content. These changes make it easier to create and edit more complex notes directly on mobile devices.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-rte1.png" alt="Joplin mobile Rich Text Editor showing table editing controls and an embedded code block inside a note."></p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-rte2.png" alt="Mobile code block editor in Joplin with a Python code snippet displayed in an editable dialog."></p>
-<h3>Easier tag management on mobile<a name="easier-tag-management-on-mobile" href="#easier-tag-management-on-mobile" class="heading-anchor">🔗</a></h3>
-<p>Managing tags on mobile is now more practical. You can rename and delete tags directly from the app, and searching through tags is easier, helping keep large tag lists organised over time.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-mobile-tags.png" alt="Joplin mobile tag management screen showing a tag options menu with rename and delete actions."></p>
-<h3>Improved stability and usability on mobile devices<a name="improved-stability-and-usability-on-mobile-devices" href="#improved-stability-and-usability-on-mobile-devices" class="heading-anchor">🔗</a></h3>
-<p>Several fixes improve overall stability and usability on mobile, particularly on smaller screens. Issues causing UI elements to appear off-screen have been addressed, and the app behaves more consistently in situations that previously caused hangs or visual glitches.</p>
-<h2>Bug fixes and security fixes across platforms<a name="bug-fixes-and-security-fixes-across-platforms" href="#bug-fixes-and-security-fixes-across-platforms" class="heading-anchor">🔗</a></h2>
-<h3>A large number of stability, correctness and security fixes<a name="a-large-number-of-stability-correctness-and-security-fixes" href="#a-large-number-of-stability-correctness-and-security-fixes" class="heading-anchor">🔗</a></h3>
-<p>Joplin 3.5 includes about 114 bug fixes across desktop and mobile, addressing issues in editing, syncing, importing, rendering, and general stability. Many fixes target edge cases that could lead to crashes, inconsistent behaviour, or rare data loss scenarios. Moreover, this version includes several vulnerability fixes to make the applications more secure.</p>
-]]></description><link>https://joplinapp.org/news/20260111-release-3-5</link><guid isPermaLink="false">20260111-release-3-5</guid><pubDate>Sun, 11 Jan 2026 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[What's new in Joplin 3.4]]></title><description><![CDATA[<p>Joplin 3.4 includes many bug fixes and improvements, with a focus on the mobile app.</p>
+<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Mon, 22 Sep 2025 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Mon, 22 Sep 2025 00:00:00 GMT</pubDate><item><title><![CDATA[What's new in Joplin 3.4]]></title><description><![CDATA[<p>Joplin 3.4 includes many bug fixes and improvements, with a focus on the mobile app.</p>
 <h2>Mobile<a name="mobile" href="#mobile" class="heading-anchor">🔗</a></h2>
 <h3>Rich Text Editor<a name="rich-text-editor" href="#rich-text-editor" class="heading-anchor">🔗</a></h3>
 <p>The mobile app now includes a beta <a href="https://joplinapp.org/help/apps/rich_text_editor">Rich Text Editor</a>! The new editor renders formatting/math/images within the editor:</p>
@@ -519,4 +462,61 @@ sys 0m38.013s</p>
 <p>The extension is open source, with the code available here: <a href="https://github.com/laurent22/github-actions-logs-extension">https://github.com/laurent22/github-actions-logs-extension</a></p>
 <p>And to install it, follow this link:</p>
 <p><a href="https://chrome.google.com/webstore/detail/github-action-raw-log-vie/lgejlnoopmcdglhfjblaeldbcfnmjddf"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230116-extension-get-it-now.png" alt="Download GitHub Action Raw Log Viewer extension"></a></p>
-]]></description><link>https://joplinapp.org/news/20230116-github-actions-log-viewer</link><guid isPermaLink="false">20230116-github-actions-log-viewer</guid><pubDate>Mon, 16 Jan 2023 00:00:00 GMT</pubDate><twitter-text>Introducing the &quot;GitHub Action Raw Log Viewer&quot; extension for Chrome</twitter-text></item></channel></rss>
+]]></description><link>https://joplinapp.org/news/20230116-github-actions-log-viewer</link><guid isPermaLink="false">20230116-github-actions-log-viewer</guid><pubDate>Mon, 16 Jan 2023 00:00:00 GMT</pubDate><twitter-text>Introducing the &quot;GitHub Action Raw Log Viewer&quot; extension for Chrome</twitter-text></item><item><title><![CDATA[Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0)]]></title><description><![CDATA[<p>As was <a href="https://discourse.joplinapp.org/t/rfc-switch-to-agpl-license-for-joplin-server/16529">discussed last year</a>, Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0) for the desktop, mobile and CLI applications, as well as the web clipper.</p>
+<p>Any open source or commercial fork of Joplin will have to license any changes they make under AGPL, and share these changes back with the community. This is the main reason we switch to this license. It allows us to continue releasing the project as open source while ensuring that those who benefit commercially (or not) from it share back their changes.</p>
+<h2>What is the GPL license?<a name="what-is-the-gpl-license" href="#what-is-the-gpl-license" class="heading-anchor">🔗</a></h2>
+<p>The AGPL license is based on the GPL license. This is what tldr;Legal has to say about the GPL license:</p>
+<blockquote>
+<p>You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build &amp; install instructions. (<a href="https://tldrlegal.com/license/gnu-general-public-license-v3-(gpl-3)">source</a>)</p>
+</blockquote>
+<h2>What is the AGPL license?<a name="what-is-the-agpl-license" href="#what-is-the-agpl-license" class="heading-anchor">🔗</a></h2>
+<p>This is the license we'll use for Joplin from now on:</p>
+<blockquote>
+<p>The AGPL license differs from the other GNU licenses in that it was built for network software. You can distribute modified versions if you keep track of the changes and the date you made them. As per usual with GNU licenses, you must license derivatives under AGPL. It provides the same restrictions and freedoms as the GPLv3 but with an additional clause which makes it so that source code must be distributed along with web publication. Since web sites and services are never distributed in the traditional sense, the AGPL is the GPL of the web. (<a href="https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)">source</a>)</p>
+</blockquote>
+<h2>What does it change for users?<a name="what-does-it-change-for-users" href="#what-does-it-change-for-users" class="heading-anchor">🔗</a></h2>
+<p>There is no changes for users of Joplin - the apps remain open sources and you can still use them freely.</p>
+<h2>What does it change for developers?<a name="what-does-it-change-for-developers" href="#what-does-it-change-for-developers" class="heading-anchor">🔗</a></h2>
+<p>Any code you develop for Joplin will also remain open source. The only difference is that we'll ask to sign an Individual Contributor License Agreement (CLA) to ensure that the copyright of the entire codebase remains with the Joplin organisation. This is necessary so that if we ever want to change the license again we are able to do so without having to get the agreement of each individual contributor afterwards (which would be nearly impossible).</p>
+<p>This is a bit of an extra constraint but it is hard to avoid. Contributor License Agreements are very common for GPL or AGPL projects. For example Apache, Canonical or Python all require their contributors to sign a CLA.</p>
+<h2>Questions?<a name="questions" href="#questions" class="heading-anchor">🔗</a></h2>
+<p>If you have any questions please let us know. Overall we believe this is a positive improvements for Joplin as it means any work derives from it will also benefit the project.</p>
+]]></description><link>https://joplinapp.org/news/20221221-agpl</link><guid isPermaLink="false">20221221-agpl</guid><pubDate>Wed, 21 Dec 2022 00:00:00 GMT</pubDate><twitter-text>Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0)</twitter-text></item><item><title><![CDATA[What's new in Joplin 2.9]]></title><description><![CDATA[<h2>Proxy support<a name="proxy-support" href="#proxy-support" class="heading-anchor">🔗</a></h2>
+<p>Both the desktop and mobile application now support proxies thanks to the work of Jason Williams. This will allow you to use the apps in particular when you are behind a company proxy.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20221216-proxy-support.png" alt=""></p>
+<h2>New PDF viewer<a name="new-pdf-viewer" href="#new-pdf-viewer" class="heading-anchor">🔗</a></h2>
+<p>The desktop application now features a new PDF viewer thanks to the work of Asrient during GSoC.</p>
+<p>The main advantage for now is that this viewer preserves the last PDF page that was read. In the next version, the viewer will also include a way to annotate PDF files.</p>
+<h2>Multi-language spell checking<a name="multi-language-spell-checking" href="#multi-language-spell-checking" class="heading-anchor">🔗</a></h2>
+<p>The desktop app include a multi-language spell checking features, which allows you, for example, to spell-check notes in your native language and in English.</p>
+<h2>New mobile text editor<a name="new-mobile-text-editor" href="#new-mobile-text-editor" class="heading-anchor">🔗</a></h2>
+<p>Writing formatted notes on mobile has always been cumbersome due to the need to enter special format characters like <code>*</code> or <code>[</code>, etc.</p>
+<p>Thanks to the work of Henry Heino during GSoC, writing notes on the go is now easier thanks to an improved Markdown editor.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20221216-mobile-beta-editor.png" alt=""></p>
+<p>The most visible feature is the addition of a toolbar, which helps input those special characters, like on desktop.</p>
+<p>Moreover Henry made a lot of subtle but useful improvements to the editor, for example to improve the note appearance, to improve list continuation, etc. Search within a note is now also supported as well as spell-checking.</p>
+<p>At a more technical level, Henry also added many test units to ensure that the editor remains robust and reliable.</p>
+<p>To enable the feature, go to the configuration screen and selected &quot;Opt-in to the editor beta&quot;. It is already very stable so we will probably promote it to be the main editor from the next version.</p>
+<h2>Improved alignment of notebook icons<a name="improved-alignment-of-notebook-icons" href="#improved-alignment-of-notebook-icons" class="heading-anchor">🔗</a></h2>
+<p>Previously, when you would assign an icon to a notebook, it would shift the title to the right, but notebook without an icon would not. It means that notebooks with and without an icon would not be vertically aligned.</p>
+<p>To tidy things up, this new version adds a default icons to notebooks without an explicitly assigned icon. This result in the notebook titles being correctly vertically aligned.</p>
+<p>Note that this feature is only enabled if you use custom icons - otherwise it will simply display the notebook titles without any default icons, as before.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20221216-notebook-icons.png" alt=""></p>
+<h2>Improved handling of file attachments<a name="improved-handling-of-file-attachments" href="#improved-handling-of-file-attachments" class="heading-anchor">🔗</a></h2>
+<p>Self Not Found made a number of small but useful improvements to attachment handling, including increasing the maximum size to 200MB, adding support for attaching multiple files, and fixing issues with synchronising attachments via proxy.</p>
+<h2>Fixed filesystem sync on mobile<a name="fixed-filesystem-sync-on-mobile" href="#fixed-filesystem-sync-on-mobile" class="heading-anchor">🔗</a></h2>
+<p>This was a long and complex change due to the need to support new Android APIs but hopefully that should now be working again, thanks to the work of jd1378.</p>
+<p>So you can now sync again your notes with Syncthing and other file-based synchronisation systems.</p>
+<h2>And more...<a name="and-more" href="#and-more" class="heading-anchor">🔗</a></h2>
+<p>In total this new desktop version includes 36 improvements, bug fixes, and security fixes.</p>
+<p>As always, a lot of work went into the Android and iOS app too, which include 37 improvements, bug fixes, and security fixes.</p>
+<p>See here for the changelogs:</p>
+<ul>
+<li><a href="https://joplinapp.org/help/about/changelog/desktop">Desktop app changelog</a></li>
+<li><a href="https://joplinapp.org/help/about/changelog/android/">Android app changelog</a></li>
+</ul>
+<h2>About the Android version<a name="about-the-android-version" href="#about-the-android-version" class="heading-anchor">🔗</a></h2>
+<p>Unfortunately we cannot publish the Android version because it is based on a framework version that Google does not accept. To upgrade the app a lot of changes are needed and another round of pre-releases, and therefore there will not be a 2.9 version for Google Play. You may however download the official APK directly from there: <a href="https://github.com/laurent22/joplin-android/releases/tag/android-v2.9.8">Android 2.9 Official Release</a></p>
+<p>This is the reality of app stores in general - small developers being imposed never ending new requirements by all-powerful companies, and by the time a version is finally ready we can't even publish it because yet more requirements are in place.</p>
+<p>For the record the current 2.9 app works perfectly fine. It targets Android 11, which is only 2 years old and is still supported (and installed on millions of phones). Google requires us to target Android 12 which only came out last year.</p>
+]]></description><link>https://joplinapp.org/news/20221216-release-2-9</link><guid isPermaLink="false">20221216-release-2-9</guid><pubDate>Fri, 16 Dec 2022 00:00:00 GMT</pubDate><twitter-text>What&apos;s new in Joplin 2.9</twitter-text></item></channel></rss>

Assets/WebsiteAssets/templates/front.mustache

@@ -14,7 +14,6 @@
 		<link rel="stylesheet" href="{{{assetUrls.css.fontawesome}}}">
 		{{> openGraphTags}}
 		{{> rssFeedLink}}
-		{{> hreflangTags}}
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"

Assets/WebsiteAssets/templates/main-new.mustache

@@ -26,7 +26,6 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 		<meta name="theme-color" content="#000000" />
 		{{> openGraphTags}}
 		{{> rssFeedLink}}
-		{{> hreflangTags}}
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"

Assets/WebsiteAssets/templates/partials/hreflangTags.mustache

@@ -1,4 +0,0 @@
-{{#availableLocales}}
-<link rel="alternate" hreflang="{{hreflang}}" href="https://joplinapp.org{{#pathPrefix}}/{{pathPrefix}}{{/pathPrefix}}{{currentPath}}" />
-{{/availableLocales}}
-<link rel="alternate" hreflang="x-default" href="https://joplinapp.org{{currentPath}}" />

Assets/WebsiteAssets/templates/partials/navbar.mustache

@@ -16,17 +16,21 @@
 				<a href="{{baseUrl}}/news/" class="fw500">News</a>
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
+				<!-- <a href="{{baseUrl}}/cn/" class="fw500">中文</a> -->
 
+				<!--
 				<div class="dropdown language-switcher">
-					<button class="fw500" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-						<i class="fas fa-globe"></i> {{locale.code}}
+					<button class="fw500" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
+						Language
 					</button>
-					<ul class="dropdown-menu dropdown-menu-end">
-						{{#availableLocales}}
-							<li><a class="dropdown-item {{#isActive}}active{{/isActive}}" href="{{baseUrl}}/{{pathPrefix}}" onclick="setLocalePreference('{{code}}')">{{name}}</a></li>
-						{{/availableLocales}}
+					<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
+						<li><a class="dropdown-item" href="#">Action</a></li>
+						<li><a class="dropdown-item" href="#">Another action</a></li>
+						<li><a class="dropdown-item" href="#">Something else here</a></li>
 					</ul>
 				</div>
+				-->
+
 
 				{{#showJoplinCloudLinks}}
 					{{> joplinCloudButton}}
@@ -35,6 +39,7 @@
 			</div>
 			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
 				{{> twitterLink}}
+				<!-- <a href="{{baseUrl}}/cn/" class="fw500 chinese-page-link">中文</a> -->
 				{{> joplinCloudButton}}
 				{{> supportButton}}
 
@@ -69,13 +74,6 @@
 							{{/showJoplinCloudLinks}}
 							{{> supportButton}}
 						</div>
-
-						<div class="text-center menu-mobile-language">
-							<p class="fw500 mobile-menu-language-label"><i class="fas fa-globe"></i> Language</p>
-							{{#availableLocales}}
-								<a href="{{baseUrl}}/{{pathPrefix}}" class="fw500 mobile-menu-link mobile-language-link {{#isActive}}active{{/isActive}}" onclick="setLocalePreference('{{code}}')">{{name}}</a>
-							{{/availableLocales}}
-						</div>
 					</div>
 
 					{{#showToc}}
@@ -83,7 +81,7 @@
 					{{/showToc}}
 
 					{{> socialFeeds}}
-
+					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
 							Copyright &copy; 2016-{{yyyy}} Laurent&nbsp;Cozic

Assets/WebsiteAssets/website.pot

@@ -2,156 +2,140 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:10
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:14
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:13
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:9
 msgid "/month"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:22
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:19
 msgid "/year"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:71
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:8
 msgid "<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:206
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:205
 msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:105
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:104
 msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:256
 msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:299
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:298
 msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:237
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:236
 msgid "Access your notes from your computer, phone or tablet by synchronising with various services, including Joplin Cloud, Dropbox and OneDrive. The app is available on Windows, macOS, Linux, Android and iOS. A terminal app is also available!"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:121
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
 msgid "Already have a Joplin Cloud account? <a href=\"https://joplincloud.com\">Login now</a>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:209
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:208
 msgid "Customise the app with plugins, custom themes and multiple text editors (Rich Text or Markdown). Or create your own scripts and plugins using the Extension API."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:242
 msgid "Download it now"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:113
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:64
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:112
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
 msgid "Download the app"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:214
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:213
 msgid "Find out more"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:55
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
 msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:176
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:175
 msgid "Get the clipper"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:108
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:107
 msgid "Images, videos, PDFs and audio files are supported. Create math expressions and diagrams directly from the app. Take photos with the mobile app and save them to a note."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:328
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:327
 msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:68
-msgid "Joplin Cloud"
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:5
+msgid "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">plans</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:302
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:301
 msgid "Joplin Cloud is based in France. This means your data is protected by strict European Union privacy laws. In addition, Joplin Cloud implements strong end-to-end encryption so that not even us can have access to your data."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:58
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
 msgid "Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:79
-msgid "Joplin Server Business"
-msgstr ""
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:82
-msgid "Joplin Server Business is a synchronisation server that you can install on your own infrastructure, so that your data remains private and secure within your business."
-msgstr ""
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:263
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:262
 msgid "More about E2EE"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:392
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:391
 msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:46
-msgid "Our synchronisation and sharing <span class=\"frame-bg frame-bg-yellow\">solutions</span>"
-msgstr ""
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:91
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:23
 msgid "Pay Monthly"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:98
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:30
 msgid "Pay Yearly"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:168
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:167
 msgid "Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:66
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
 msgid "Sign up with Joplin Cloud"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
-msgid "Synchronise and share your notes with our range of plans."
-msgstr ""
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:395
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:394
 msgid "Thank you for your support!"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:258
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
 msgid "The app is open source and your notes are saved to an open format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but yourself can access them."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:145
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:144
 msgid "Try it now"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:171
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:170
 msgid "Use the web clipper extension, available on Chrome and Firefox, to save web pages or take screenshots as notes."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:139
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
 msgid "With Joplin Cloud, share your notes with your friends, family or colleagues and collaborate on them."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:137
 msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:142
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:141
 msgid "You can also publish a note to the internet and share the URL with others."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:234
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:233
 msgid "Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you are"
 msgstr ""

Assets/keys/joplin-canary-signing-key.asc

@@ -1,14 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEaZWFlBYJKwYBBAHaRw8BAQdAIh3xQbjaS0EC+8WuKXNPjVF/ayq0/2GZlheR
-qj1G3Qe0RUpvcGxpbiBDYW5hcnkgU2lnbmluZyBLZXkgKFdhcnJhbnQgQ2FuYXJ5
-IEtleSkgPGNhbmFyeUBqb3BsaW5hcHAub3JnPoiZBBMWCgBBFiEE+CD4MG3QBaEC
-0YzVlGrp+lkV71MFAmmVhZQCGwMFCQPCZwAFCwkIBwICIgIGFQoJCAsCBBYCAwEC
-HgcCF4AACgkQlGrp+lkV71MZtwD/Ufd4OAcgkl5T6MSB+WDFg8BXvpaBZfNnZkoo
-LrOoqNAA/iqGiiBRoarlus2ATOiWhyXaEpRUQcEeaRhhqHW0BGcCuDgEaZWFlBIK
-KwYBBAGXVQEFAQEHQFORKWRLp4hDYzR8Q5IRyF9AIjoziR+sj4icUdvZx4Z6AwEI
-B4h+BBgWCgAmFiEE+CD4MG3QBaEC0YzVlGrp+lkV71MFAmmVhZQCGwwFCQPCZwAA
-CgkQlGrp+lkV71Nu+AD9Gw4qEmL8WNCNs7idc8CRpGpS2DhasNTV398lbKYzco0B
-ANlMrGlMc0w1KhuFxdU4fF3s/ktUUnjJwosxK94l5/MJ
-=C9VN
------END PGP PUBLIC KEY BLOCK-----

Dockerfile.server

@@ -2,7 +2,7 @@
 # Build stage
 # =============================================================================
 
-FROM node:24 AS builder
+FROM node:18 AS builder
 
 RUN apt-get update \
     && apt-get install -y \
@@ -58,7 +58,7 @@ RUN --mount=type=cache,target=/build/.yarn/cache --mount=type=cache,target=/buil
 # from a smaller base image.
 # =============================================================================
 
-FROM node:24-slim
+FROM node:18-slim
 
 ARG user=joplin
 RUN useradd --create-home --shell /bin/bash $user

Dockerfile.transcribe

@@ -1,25 +1,26 @@
-FROM node:24-bullseye
+FROM node:18-bullseye
 
 RUN apt-get update \
     && apt-get install -y \
-    ca-certificates curl wget unzip \
-    python3 tini \
+    ca-certificates curl \
+    python3 tini
+
+## install docker
+RUN install -m 0755 -d /etc/apt/keyrings
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+RUN chmod a+r /etc/apt/keyrings/docker.asc
+RUN echo \
+    "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+    $(. /etc/os-release && echo bullseye) stable" | \
+    tee /etc/apt/sources.list.d/docker.list > /dev/null
+RUN apt-get update \
+    && apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \
     && rm -rf /var/lib/apt/lists/*
 
 ENV NODE_ENV=production
 
 RUN corepack enable
 
-# Download llama.cpp binary
-WORKDIR /opt/llama
-RUN wget -q https://github.com/ggml-org/llama.cpp/releases/download/b5449/llama-b5449-bin-ubuntu-x64.zip \
-    && unzip llama-b5449-bin-ubuntu-x64.zip \
-    && rm llama-b5449-bin-ubuntu-x64.zip \
-    && chmod +x /opt/llama/build/bin/llama-mtmd-cli
-
-# Create non-root user for security
-RUN groupadd -r transcribe && useradd -r -g transcribe transcribe
-
 WORKDIR /app
 
 COPY .yarn/releases ./.yarn/releases
@@ -43,17 +44,7 @@ RUN BUILD_SEQUENCIAL=1 yarn install --inline-builds \
     && yarn cache clean \
     && rm -rf .yarn/berry
 
-# Create images directory and set permissions
-RUN mkdir -p /app/packages/transcribe/images \
-    && chown -R transcribe:transcribe /app/packages/transcribe/images
-
 WORKDIR /app/packages/transcribe
 
-# Switch to non-root user
-USER transcribe
-
-# Set environment variable for embedded llama.cpp binary
-ENV HTR_CLI_BINARY_PATH=/opt/llama/build/bin/llama-mtmd-cli
-
 # Start the Node.js application
 CMD ["yarn", "start"]

Joplin_install_and_update.sh

@@ -67,45 +67,6 @@ showHelp() {
   fi
 }
 
-# Accepts two versions in symver (a.b.c).
-# Echos -1 if the first version is less than the second,
-#        0 if they're equal,
-#        1 if the first version is greater than second.
-compareVersions() {
-  V_MAJOR1=$(echo "$1"|cut -d. -f1)
-  V_MAJOR2=$(echo "$2"|cut -d. -f1)
-
-  if [[ $V_MAJOR1 -lt $V_MAJOR2 ]] ; then
-    echo -1
-    return
-  elif [[ $V_MAJOR1 -gt $V_MAJOR2 ]] ; then
-    echo 1
-    return
-  fi
-
-  V_MINOR1=$(echo "$1"|cut -d. -f2)
-  V_MINOR2=$(echo "$2"|cut -d. -f2)
-
-  if [[ $V_MINOR1 -lt $V_MINOR2 ]] ; then
-    echo -1
-    return
-  elif [[ $V_MINOR1 -gt $V_MINOR2 ]] ; then
-    echo 1
-    return
-  fi
-
-  V_PATCH1=$(echo "$1"|cut -d. -f3)
-  V_PATCH2=$(echo "$2"|cut -d. -f3)
-
-  if [[ $V_PATCH1 -lt $V_PATCH2 ]] ; then
-    echo -1
-  elif [[ $V_PATCH1 -gt $V_PATCH2 ]] ; then
-    echo 1
-  else
-    echo 0
-  fi
-}
-
 #-----------------------------------------------------
 # Setup Download Helper: DL
 #-----------------------------------------------------
@@ -198,21 +159,12 @@ else
 fi
 
 # Check if it's in the latest version
-if [[ -e "${INSTALL_DIR}/VERSION" ]]; then
-  CURRENT_VERSION=$(< "${INSTALL_DIR}/VERSION")
-  VERSION_COMPARISON=$(compareVersions "$CURRENT_VERSION" "$RELEASE_VERSION")
-
-  if [[ "$VERSION_COMPARISON" == "0" ]]; then
-    print "${COLOR_GREEN}You already have the latest version${COLOR_RESET} ${RELEASE_VERSION} ${COLOR_GREEN}installed.${COLOR_RESET}"
-    ([[ "$FORCE" == true ]] && print "Forcing installation...") || exit 0
-  elif [[ "$VERSION_COMPARISON" == "1" ]]; then
-    print "${COLOR_YELLOW}You have version ${CURRENT_VERSION} installed, which is newer than the latest published version ${RELEASE_VERSION}.${COLOR_RESET}"
-    print "${COLOR_YELLOW}Skipping installation to avoid downgrade.${COLOR_RESET}"
-  else
-    print "The latest version is ${RELEASE_VERSION}, but you have ${CURRENT_VERSION} installed."
-  fi
+if [[ -e "${INSTALL_DIR}/VERSION" ]] && [[ $(< "${INSTALL_DIR}/VERSION") == "${RELEASE_VERSION}" ]]; then
+  print "${COLOR_GREEN}You already have the latest version${COLOR_RESET} ${RELEASE_VERSION} ${COLOR_GREEN}installed.${COLOR_RESET}"
+  ([[ "$FORCE" == true ]] && print "Forcing installation...") || exit 0
 else
-  print "The latest version is ${RELEASE_VERSION}, but you have no version installed."
+  [[ -e "${INSTALL_DIR}/VERSION" ]] && CURRENT_VERSION=$(< "${INSTALL_DIR}/VERSION")
+  print "The latest version is ${RELEASE_VERSION}, but you have ${CURRENT_VERSION:-no version} installed."
 fi
 
 # Check if it's an update or a new install
@@ -284,7 +236,7 @@ if command -v lsb_release &> /dev/null; then
   # without writing the AppImage to a non-user-writable location (without invalidating other security
   # controls). See https://discourse.joplinapp.org/t/possible-future-requirement-for-no-sandbox-flag-for-ubuntu-23-10/.
   HAS_USERNS_RESTRICTIONS=false
-  if [[ "$DISTVER" =~ ^(Ubuntu|Tuxedo) && $DISTMAJOR -ge 23 ]]; then
+  if [[ "$DISTVER" =~ ^Ubuntu && $DISTMAJOR -ge 23 ]]; then
     HAS_USERNS_RESTRICTIONS=true
   fi
 
@@ -306,15 +258,6 @@ fi
 if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.*|.*i3.*|.*sway.* ]] || [[ `command -v update-desktop-database` ]]; then
   DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
   DESKTOP_FILE_LOCATION="$DATA_HOME/applications"
-
-  # Only later versions of Joplin default to Wayland
-  IS_WAYLAND_BY_DEFAULT=$(compareVersions "$RELEASE_VERSION" "3.5.6")
-  # Joplin has a different startup WM class on Wayland and X11:
-  STARTUP_WM_CLASS=Joplin
-  if [[ $XDG_SESSION_TYPE != "x11" && $IS_WAYLAND_BY_DEFAULT == "1" ]]; then
-    STARTUP_WM_CLASS=@joplin/app-desktop
-  fi
-
   # Only delete the desktop file if it will be replaced
   rm -f "$DESKTOP_FILE_LOCATION/appimagekit-joplin.desktop"
 
@@ -329,9 +272,7 @@ Name=Joplin
 Comment=Joplin for Desktop
 Exec=env APPIMAGELAUNCHER_DISABLE=TRUE "${INSTALL_DIR}/Joplin.AppImage" ${SANDBOXPARAM} %u
 Icon=joplin
-# This will be different between Wayland and X11. On Wayland, the startup
-# WM class is "@joplin/app-desktop". On X11, it's "Joplin".
-StartupWMClass=${STARTUP_WM_CLASS}
+StartupWMClass=Joplin
 Type=Application
 Categories=Office;
 MimeType=x-scheme-handler/joplin;

README.md

@@ -1,5 +1,5 @@
 <!-- DONATELINKS -->
-[![Donate using PayPal](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?hosted_button_id=WQCERTSSLCC7U) [![Sponsor on GitHub](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [![Become a patron](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Donate using IBAN](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
+[![Donate using PayPal](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?business=E8JMYD2LQ8MMA&no_recurring=0&item_name=I+rely+on+donations+to+maintain+and+improve+the+Joplin+open+source+project.+Thank+you+for+your+help+-+it+makes+a+difference%21&currency_code=EUR) [![Sponsor on GitHub](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [![Become a patron](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Donate using IBAN](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
 <!-- DONATELINKS -->
 
 <img width="64" src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/LinuxIcons/256x256.png" align="left" style="margin-right:15px"/>
@@ -61,14 +61,6 @@ Name | Description
 
 Please see the guide for information on how to contribute to the development of Joplin: https://github.com/laurent22/joplin/blob/dev/readme/dev/index.md
 
-## Warrant Canary Signing Key
-
-Fingerprint:
-
-F820 F830 6DD0 05A1 02D1  8CD5 946A E9FA 5915 EF53
-
-Public key: https://github.com/laurent22/joplin/raw/dev/Assets/keys/joplin-canary-signing-key.asc
-
 # Contributors
 
 Thank you to everyone who've contributed to Joplin's source code!

SECURITY.md

@@ -6,7 +6,7 @@ Only the latest version is supported with security updates.
 
 ## Reporting a Vulnerability
 
-Please report vulnerabilities [through private vulnerability reporting](https://github.com/laurent22/joplin/security/advisories/new) **with a proof of concept** that shows the security vulnerability. Please do not contact us without this proof of concept, as we cannot fix anything without this.
+Please [contact support](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/AdresseSupport.png) **with a proof of concept** that shows the security vulnerability. Please do not contact us without this proof of concept, as we cannot fix anything without this.
 
 For general opinions on what makes an app more or less secure, please use the forum.
 

cspell.json

@@ -33,7 +33,7 @@
 		"/packages/app-desktop/build/",
 		"/packages/app-desktop/utils/checkForUpdatesUtilsTestData.ts",
 		"/packages/app-desktop/vendor/",
-		"/packages/whisper-voice-typing/vendor/",
+		"/packages/app-mobile/android/vendor/",
 		"/packages/app-mobile/ios/Pods/",
 		"/packages/app-mobile/lib/rnInjectedJs",
 		"/packages/app-mobile/pluginAssets",
@@ -63,7 +63,6 @@
 		"/readme/_i18n",
 		"/readme/about/changelog/desktop.md",
 		"/readme/licenses.md",
-		"/readme/canary.txt",
 		"/readme/i18n",
 		"cspell.json",
 		"node_modules"

devbox.json

@@ -9,15 +9,20 @@
     "vips.dev": {
       "platforms": ["aarch64-darwin"],
     },
-    "nodejs":     "24.9.0",
+    "nodejs":     "23.11.0",
     "pkg-config": "latest",
+    "darwin.apple_sdk.frameworks.Foundation": { // satisfies missing CoreText/CoreText.h
+      // https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/default.nix
+      "version":   "",
+      "platforms": ["aarch64-darwin", "x86_64-darwin"],
+    },
     "python": "3.13.3",
     "bat":    "latest",
     "electron": {
       "version":            "latest",
       "excluded_platforms": ["aarch64-darwin", "x86_64-darwin"],
     },
-    "git":    "2.50.1",
+    "git":    "2.48.1",
   },
   "shell": {
     "init_hook": [

docker-compose.db-dev.yml

@@ -19,7 +19,7 @@
 services:
 
     postgresql-master:
-        image: 'bitnamilegacy/postgresql:17.6.0'
+        image: 'bitnamilegacy/postgresql:17.4.0'
         ports:
             - '5432:5432'
         environment:
@@ -36,7 +36,7 @@ services:
             - POSTGRESQL_EXTRA_FLAGS=-c work_mem=100000 -c log_statement=all
 
     postgresql-slave:
-        image: 'bitnamilegacy/postgresql:17.6.0'
+        image: 'bitnamilegacy/postgresql:17.4.0'
         ports:
             - '5433:5432'
         depends_on:

docker-compose.server.yml

@@ -84,8 +84,8 @@ services:
         profiles:
             - full
         volumes:
+            - /var/run/docker.sock:/var/run/docker.sock
             - ${HTR_CLI_IMAGES_FOLDER}:/app/packages/transcribe/images
-            - ${HTR_CLI_MODELS_FOLDER}:/opt/models:ro
         depends_on:
             - transcribe-db
         ports:
@@ -94,16 +94,6 @@ services:
             - transcribe-network
             - shared-network
         restart: unless-stopped
-        # Security: limit resources to prevent runaway processes
-        deploy:
-            resources:
-                limits:
-                    memory: 16G
-                    cpus: '4'
-        # Security: read-only root filesystem with only images folder writable
-        read_only: true
-        tmpfs:
-            - /tmp
         environment:
             - APP_PORT=4567
             - DB_CLIENT=pg
@@ -113,6 +103,5 @@ services:
             - QUEUE_DATABASE_PORT=${QUEUE_DATABASE_PORT}
             - QUEUE_DATABASE_HOST=transcribe-db
             - API_KEY=${TRANSCRIBE_API_KEY}
-            - HTR_CLI_IMAGES_FOLDER=/app/packages/transcribe/images
-            - HTR_CLI_MODELS_FOLDER=/opt/models
+            - HTR_CLI_IMAGES_FOLDER=${HTR_CLI_IMAGES_FOLDER}
 

jest.config.base.js

@@ -1,6 +0,0 @@
-// This is the base Jest configuration - all
-// jest.config.js files should inherit from it.
-
-module.exports = {
-	watchman: false,
-};

joplin.code-workspace

@@ -16,7 +16,6 @@
 			"./packages/app-cli/**/*.mo": true,
 			"./packages/app-cli/**/build/": true,
 			"./packages/app-cli/**/config.json": true,
-			"**/.watchman-cookie-*": true,
 			"./packages/app-cli/**/linkToLocal.sh": true,
 			"./packages/app-cli/**/node_modules/": true,
 			"./packages/app-cli/**/out.txt": true,

package.json

@@ -38,7 +38,7 @@
     "linter-precommit": "eslint --resolve-plugins-relative-to . --fix --ext .js --ext .jsx --ext .ts --ext .tsx",
     "linter": "eslint --resolve-plugins-relative-to . --fix --quiet --ext .js --ext .jsx --ext .ts --ext .tsx",
     "packageJsonLint": "node ./packages/tools/packageJsonLint.js",
-    "syncFuzzer": "node ./packages/tools/fuzzer/cli.js",
+    "syncFuzzer": "node ./packages/tools/fuzzer/sync-fuzzer.js",
     "postinstall": "husky && gulp build",
     "postPreReleasesToForum": "node ./packages/tools/postPreReleasesToForum",
     "publishAll": "git pull && yarn buildParallel && lerna version --yes --no-private --no-git-tag-version && gulp completePublishAll",
@@ -60,7 +60,6 @@
     "test": "yarn workspaces foreach --worktree --parallel --verbose --interlaced --jobs 2 run test",
     "tsc": "yarn workspaces foreach --worktree --parallel --verbose --interlaced run tsc",
     "updateIgnored": "node packages/tools/gulp/tasks/updateIgnoredTypeScriptBuildRun.js",
-    "updateCanary": "node ./packages/tools/updateCanary",
     "updateMarkdownDoc": "node ./packages/tools/updateMarkdownDoc",
     "updateNews": "node ./packages/tools/website/updateNews",
     "updatePluginTypes": "./packages/generator-joplin/updateTypes.sh",
@@ -82,22 +81,22 @@
     "eslint-plugin-promise": "6.6.0",
     "eslint-plugin-react": "7.37.5",
     "execa": "5.1.1",
-    "fs-extra": "11.3.2",
+    "fs-extra": "11.2.0",
     "glob": "11.0.3",
     "gulp": "4.0.2",
     "husky": "9.1.7",
     "lerna": "3.22.1",
-    "lint-staged": "16.2.7",
+    "lint-staged": "15.5.2",
     "madge": "8.0.0",
-    "npm-package-json-lint": "9.0.0",
+    "npm-package-json-lint": "8.0.0",
     "typescript": "5.8.3"
   },
   "dependencies": {
     "@types/fs-extra": "11.0.4",
     "eslint-plugin-github": "4.10.2",
     "http-server": "14.1.1",
-    "node-gyp": "11.5.0",
-    "nodemon": "3.1.11"
+    "node-gyp": "11.2.0",
+    "nodemon": "3.1.10"
   },
   "packageManager": "yarn@4.9.2",
   "resolutions": {

packages/app-cli/app/cli-integration-tests.test.ts

@@ -1,270 +0,0 @@
-import * as fs from 'fs-extra';
-import Logger, { TargetType } from '@joplin/utils/Logger';
-import { dirname } from '@joplin/lib/path-utils';
-const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js');
-import JoplinDatabase from '@joplin/lib/JoplinDatabase';
-import BaseModel from '@joplin/lib/BaseModel';
-import Folder from '@joplin/lib/models/Folder';
-import Note from '@joplin/lib/models/Note';
-import Setting from '@joplin/lib/models/Setting';
-import { node } from 'execa';
-import { splitCommandString } from '@joplin/utils';
-const nodeSqlite = require('sqlite3');
-const { loadKeychainServiceAndSettings } = require('@joplin/lib/services/SettingUtils');
-const { default: shimInitCli } = require('./utils/shimInitCli');
-
-const baseDir = `${dirname(__dirname)}/tests/cli-integration`;
-const joplinAppPath = `${__dirname}/main.js`;
-
-shimInitCli({ nodeSqlite, appVersion: () => require('../package.json').version, keytar: null });
-require('@joplin/lib/testing/test-utils');
-
-
-interface Client {
-	id: number;
-	profileDir: string;
-}
-
-function createClient(id: number): Client {
-	return {
-		id: id,
-		profileDir: `${baseDir}/client${id}`,
-	};
-}
-
-
-async function execCommand(client: Client, command: string) {
-	const result = await node(
-		joplinAppPath,
-		['--update-geolocation-disabled', '--env', 'dev', '--profile', client.profileDir, ...splitCommandString(command)],
-	);
-	if (result.exitCode !== 0) {
-		throw new Error(`Command failed: ${command}:\nstderr: ${result.stderr}\nstdout: ${result.stdout}`);
-	}
-	return result.stdout;
-}
-
-async function clearDatabase(db: JoplinDatabase) {
-	await db.transactionExecBatch(['DELETE FROM folders', 'DELETE FROM notes', 'DELETE FROM tags', 'DELETE FROM note_tags', 'DELETE FROM resources', 'DELETE FROM deleted_items']);
-}
-
-
-describe('cli-integration-tests', () => {
-	let client: Client;
-	let db: JoplinDatabase;
-
-	beforeAll(async () => {
-		await fs.remove(baseDir);
-		await fs.mkdir(baseDir);
-
-		client = createClient(1);
-		// Initialize the database by running a client command and exiting.
-		await execCommand(client, 'version');
-
-		const dbLogger = new Logger();
-		dbLogger.addTarget(TargetType.Console);
-		dbLogger.setLevel(Logger.LEVEL_WARN);
-
-		db = new JoplinDatabase(new DatabaseDriverNode());
-		db.setLogger(dbLogger);
-
-		await db.open({ name: `${client.profileDir}/database.sqlite` });
-		BaseModel.setDb(db);
-		Setting.setConstant('rootProfileDir', client.profileDir);
-		Setting.setConstant('profileDir', client.profileDir);
-		await loadKeychainServiceAndSettings([]);
-	});
-
-	beforeEach(async () => {
-		await clearDatabase(db);
-	});
-
-	it.each([
-		'version',
-		'help',
-	])('should run command %j without crashing', async (command) => {
-		await execCommand(client, command);
-	});
-
-	it('should support the \'ls\' command', async () => {
-		await execCommand(client, 'mkbook nb1');
-		await execCommand(client, 'mknote note1');
-		await execCommand(client, 'mknote note2');
-		const r = await execCommand(client, 'ls');
-
-		expect(r.indexOf('note1') >= 0).toBe(true);
-		expect(r.indexOf('note2') >= 0).toBe(true);
-	});
-
-	it('should support the \'mv\' command', async () => {
-		await execCommand(client, 'mkbook nb2');
-		await execCommand(client, 'mkbook nb1');
-		await execCommand(client, 'mknote n1');
-		await execCommand(client, 'mv n1 nb2');
-
-		const f1 = await Folder.loadByTitle('nb1');
-		const f2 = await Folder.loadByTitle('nb2');
-		let notes1 = await Note.previews(f1.id);
-		let notes2 = await Note.previews(f2.id);
-
-		expect(notes1.length).toBe(0);
-		expect(notes2.length).toBe(1);
-
-		await execCommand(client, 'mknote note1');
-		await execCommand(client, 'mknote note2');
-		await execCommand(client, 'mknote note3');
-		await execCommand(client, 'mknote blabla');
-
-		notes1 = await Note.previews(f1.id);
-		notes2 = await Note.previews(f2.id);
-
-		expect(notes1.length).toBe(4);
-		expect(notes2.length).toBe(1);
-
-		await execCommand(client, 'mv \'note*\' nb2');
-
-		notes2 = await Note.previews(f2.id);
-		notes1 = await Note.previews(f1.id);
-
-		expect(notes1.length).toBe(1);
-		expect(notes2.length).toBe(4);
-	});
-
-	it('should support the \'use\' command', async () => {
-		await execCommand(client, 'mkbook nb1');
-		await execCommand(client, 'mkbook nb2');
-		await execCommand(client, 'mknote n1');
-		await execCommand(client, 'mknote n2');
-
-		const f1 = await Folder.loadByTitle('nb1');
-		const f2 = await Folder.loadByTitle('nb2');
-		let notes1 = await Note.previews(f1.id);
-		let notes2 = await Note.previews(f2.id);
-
-		expect(notes1.length).toBe(0);
-		expect(notes2.length).toBe(2);
-
-		await execCommand(client, 'use nb1');
-		await execCommand(client, 'mknote note2');
-		await execCommand(client, 'mknote note3');
-
-		notes1 = await Note.previews(f1.id);
-		notes2 = await Note.previews(f2.id);
-
-		expect(notes1.length).toBe(2);
-	});
-
-	it('should support creating and removing folders', async () => {
-		await execCommand(client, 'mkbook nb1');
-
-		let folders = await Folder.all();
-		expect(folders.length).toBe(1);
-		expect(folders[0].title).toBe('nb1');
-
-		await execCommand(client, 'mkbook nb1');
-
-		folders = await Folder.all();
-		expect(folders.length).toBe(2);
-		expect(folders[0].title).toBe('nb1');
-		expect(folders[1].title).toBe('nb1');
-
-		await execCommand(client, 'rmbook -p -f nb1');
-
-		folders = await Folder.all();
-		expect(folders.length).toBe(1);
-
-		await execCommand(client, 'rmbook -p -f nb1');
-
-		folders = await Folder.all();
-		expect(folders.length).toBe(0);
-	});
-
-	it('should support creating and removing notes', async () => {
-		await execCommand(client, 'mkbook nb1');
-		await execCommand(client, 'mknote n1');
-
-		let notes = await Note.all();
-		expect(notes.length).toBe(1);
-		expect(notes[0].title).toBe('n1');
-
-		await execCommand(client, 'rmnote -p -f n1');
-		notes = await Note.all();
-		expect(notes.length).toBe(0);
-
-		await execCommand(client, 'mknote n1');
-		await execCommand(client, 'mknote n2');
-
-		notes = await Note.all();
-		expect(notes.length).toBe(2);
-
-		// Should fail to delete a non-existent note
-		let failed = false;
-		try {
-			await execCommand(client, 'rmnote -f \'blabla*\'');
-		} catch (error) {
-			failed = true;
-		}
-		expect(failed).toBe(true);
-
-		notes = await Note.all();
-		expect(notes.length).toBe(2);
-
-		await execCommand(client, 'rmnote -f -p \'n*\'');
-
-		notes = await Note.all();
-		expect(notes.length).toBe(0);
-	});
-
-	it('should support listing the contents of notes', async () => {
-		await execCommand(client, 'mkbook nb1');
-		await execCommand(client, 'mknote mynote');
-
-		const folder = await Folder.loadByTitle('nb1');
-		const note = await Note.loadFolderNoteByField(folder.id, 'title', 'mynote');
-
-		let r = await execCommand(client, 'cat mynote');
-		expect(r).toContain('mynote');
-		expect(r).not.toContain(note.id);
-
-		r = await execCommand(client, 'cat -v mynote');
-		expect(r).toContain(note.id);
-	});
-
-	it('should support changing settings with config', async () => {
-		await execCommand(client, 'config editor vim');
-		await Setting.reset();
-		await Setting.load();
-		expect(Setting.value('editor')).toBe('vim');
-
-		await execCommand(client, 'config editor subl');
-		await Setting.reset();
-		await Setting.load();
-		expect(Setting.value('editor')).toBe('subl');
-
-		const r = await execCommand(client, 'config');
-		expect(r.indexOf('editor') >= 0).toBe(true);
-		expect(r.indexOf('subl') >= 0).toBe(true);
-	});
-
-	it('should support copying folders with cp', async () => {
-		await execCommand(client, 'mkbook nb2');
-		await execCommand(client, 'mkbook nb1');
-		await execCommand(client, 'mknote n1');
-
-		await execCommand(client, 'cp n1');
-
-		const f1 = await Folder.loadByTitle('nb1');
-		const f2 = await Folder.loadByTitle('nb2');
-		let notes = await Note.previews(f1.id);
-
-		expect(notes.length).toBe(2);
-
-		await execCommand(client, 'cp n1 nb2');
-		const notesF1 = await Note.previews(f1.id);
-		expect(notesF1.length).toBe(2);
-		notes = await Note.previews(f2.id);
-		expect(notes.length).toBe(1);
-		expect(notes[0].title).toBe(notesF1[0].title);
-	});
-});
-

packages/app-cli/app/cli-integration-tests.ts

@@ -0,0 +1,300 @@
+'use strict';
+
+/* eslint-disable no-console */
+
+import * as fs from 'fs-extra';
+import Logger, { TargetType } from '@joplin/utils/Logger';
+import { dirname } from '@joplin/lib/path-utils';
+const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js');
+import JoplinDatabase from '@joplin/lib/JoplinDatabase';
+import BaseModel from '@joplin/lib/BaseModel';
+import Folder from '@joplin/lib/models/Folder';
+import Note from '@joplin/lib/models/Note';
+import Setting from '@joplin/lib/models/Setting';
+const { sprintf } = require('sprintf-js');
+const exec = require('child_process').exec;
+const nodeSqlite = require('sqlite3');
+const { loadKeychainServiceAndSettings } = require('@joplin/lib/services/SettingUtils');
+const { default: shimInitCli } = require('./utils/shimInitCli');
+
+const baseDir = `${dirname(__dirname)}/tests/cli-integration`;
+const joplinAppPath = `${__dirname}/main.js`;
+
+shimInitCli({ nodeSqlite, appVersion: () => require('../package.json').version, keytar: null });
+require('@joplin/lib/testing/test-utils');
+
+const logger = new Logger();
+logger.addTarget(TargetType.Console);
+logger.setLevel(Logger.LEVEL_ERROR);
+
+const dbLogger = new Logger();
+dbLogger.addTarget(TargetType.Console);
+dbLogger.setLevel(Logger.LEVEL_INFO);
+
+const db = new JoplinDatabase(new DatabaseDriverNode());
+db.setLogger(dbLogger);
+
+interface Client {
+	id: number;
+	profileDir: string;
+}
+
+function createClient(id: number): Client {
+	return {
+		id: id,
+		profileDir: `${baseDir}/client${id}`,
+	};
+}
+
+const client = createClient(1);
+
+function execCommand(client: Client, command: string) {
+	const exePath = `node ${joplinAppPath}`;
+	const cmd = `${exePath} --update-geolocation-disabled --env dev --profile ${client.profileDir} ${command}`;
+	logger.info(`${client.id}: ${command}`);
+
+	return new Promise<string>((resolve, reject) => {
+		exec(cmd, (error: string, stdout: string, stderr: string) => {
+			if (error) {
+				logger.error(stderr);
+				reject(error);
+			} else {
+				resolve(stdout.trim());
+			}
+		});
+	});
+}
+
+function assertTrue(v: unknown) {
+	if (!v) throw new Error(sprintf('Expected "true", got "%s"."', v));
+	process.stdout.write('.');
+}
+
+function assertFalse(v: unknown) {
+	if (v) throw new Error(sprintf('Expected "false", got "%s"."', v));
+	process.stdout.write('.');
+}
+
+function assertEquals(expected: unknown, real: unknown) {
+	if (expected !== real) throw new Error(sprintf('Expecting "%s", got "%s"', expected, real));
+	process.stdout.write('.');
+}
+
+async function clearDatabase() {
+	await db.transactionExecBatch(['DELETE FROM folders', 'DELETE FROM notes', 'DELETE FROM tags', 'DELETE FROM note_tags', 'DELETE FROM resources', 'DELETE FROM deleted_items']);
+}
+
+const testUnits: Record<string, ()=> Promise<void>> = {};
+
+testUnits.testFolders = async () => {
+	await execCommand(client, 'mkbook nb1');
+
+	let folders = await Folder.all();
+	assertEquals(1, folders.length);
+	assertEquals('nb1', folders[0].title);
+
+	await execCommand(client, 'mkbook nb1');
+
+	folders = await Folder.all();
+	assertEquals(2, folders.length);
+	assertEquals('nb1', folders[0].title);
+	assertEquals('nb1', folders[1].title);
+
+	await execCommand(client, 'rmbook -p -f nb1');
+
+	folders = await Folder.all();
+	assertEquals(1, folders.length);
+
+	await execCommand(client, 'rmbook -p -f nb1');
+
+	folders = await Folder.all();
+	assertEquals(0, folders.length);
+};
+
+testUnits.testNotes = async () => {
+	await execCommand(client, 'mkbook nb1');
+	await execCommand(client, 'mknote n1');
+
+	let notes = await Note.all();
+	assertEquals(1, notes.length);
+	assertEquals('n1', notes[0].title);
+
+	await execCommand(client, 'rmnote -p -f n1');
+	notes = await Note.all();
+	assertEquals(0, notes.length);
+
+	await execCommand(client, 'mknote n1');
+	await execCommand(client, 'mknote n2');
+
+	notes = await Note.all();
+	assertEquals(2, notes.length);
+
+	// Should fail to delete a non-existent note
+	let failed = false;
+	try {
+		await execCommand(client, 'rmnote -f \'blabla*\'');
+	} catch (error) {
+		failed = true;
+	}
+	assertEquals(failed, true);
+
+	notes = await Note.all();
+	assertEquals(2, notes.length);
+
+	await execCommand(client, 'rmnote -f -p \'n*\'');
+
+	notes = await Note.all();
+	assertEquals(0, notes.length);
+};
+
+testUnits.testCat = async () => {
+	await execCommand(client, 'mkbook nb1');
+	await execCommand(client, 'mknote mynote');
+
+	const folder = await Folder.loadByTitle('nb1');
+	const note = await Note.loadFolderNoteByField(folder.id, 'title', 'mynote');
+
+	let r = await execCommand(client, 'cat mynote');
+	assertTrue(r.indexOf('mynote') >= 0);
+	assertFalse(r.indexOf(note.id) >= 0);
+
+	r = await execCommand(client, 'cat -v mynote');
+	assertTrue(r.indexOf(note.id) >= 0);
+};
+
+testUnits.testConfig = async () => {
+	await execCommand(client, 'config editor vim');
+	await Setting.reset();
+	await Setting.load();
+	assertEquals('vim', Setting.value('editor'));
+
+	await execCommand(client, 'config editor subl');
+	await Setting.reset();
+	await Setting.load();
+	assertEquals('subl', Setting.value('editor'));
+
+	const r = await execCommand(client, 'config');
+	assertTrue(r.indexOf('editor') >= 0);
+	assertTrue(r.indexOf('subl') >= 0);
+};
+
+testUnits.testCp = async () => {
+	await execCommand(client, 'mkbook nb2');
+	await execCommand(client, 'mkbook nb1');
+	await execCommand(client, 'mknote n1');
+
+	await execCommand(client, 'cp n1');
+
+	const f1 = await Folder.loadByTitle('nb1');
+	const f2 = await Folder.loadByTitle('nb2');
+	let notes = await Note.previews(f1.id);
+
+	assertEquals(2, notes.length);
+
+	await execCommand(client, 'cp n1 nb2');
+	const notesF1 = await Note.previews(f1.id);
+	assertEquals(2, notesF1.length);
+	notes = await Note.previews(f2.id);
+	assertEquals(1, notes.length);
+	assertEquals(notesF1[0].title, notes[0].title);
+};
+
+testUnits.testLs = async () => {
+	await execCommand(client, 'mkbook nb1');
+	await execCommand(client, 'mknote note1');
+	await execCommand(client, 'mknote note2');
+	const r = await execCommand(client, 'ls');
+
+	assertTrue(r.indexOf('note1') >= 0);
+	assertTrue(r.indexOf('note2') >= 0);
+};
+
+testUnits.testMv = async () => {
+	await execCommand(client, 'mkbook nb2');
+	await execCommand(client, 'mkbook nb1');
+	await execCommand(client, 'mknote n1');
+	await execCommand(client, 'mv n1 nb2');
+
+	const f1 = await Folder.loadByTitle('nb1');
+	const f2 = await Folder.loadByTitle('nb2');
+	let notes1 = await Note.previews(f1.id);
+	let notes2 = await Note.previews(f2.id);
+
+	assertEquals(0, notes1.length);
+	assertEquals(1, notes2.length);
+
+	await execCommand(client, 'mknote note1');
+	await execCommand(client, 'mknote note2');
+	await execCommand(client, 'mknote note3');
+	await execCommand(client, 'mknote blabla');
+
+	notes1 = await Note.previews(f1.id);
+	notes2 = await Note.previews(f2.id);
+
+	assertEquals(4, notes1.length);
+	assertEquals(1, notes2.length);
+
+	await execCommand(client, 'mv \'note*\' nb2');
+
+	notes2 = await Note.previews(f2.id);
+	notes1 = await Note.previews(f1.id);
+
+	assertEquals(1, notes1.length);
+	assertEquals(4, notes2.length);
+};
+
+testUnits.testUse = async () => {
+	await execCommand(client, 'mkbook nb1');
+	await execCommand(client, 'mkbook nb2');
+	await execCommand(client, 'mknote n1');
+	await execCommand(client, 'mknote n2');
+
+	const f1 = await Folder.loadByTitle('nb1');
+	const f2 = await Folder.loadByTitle('nb2');
+	let notes1 = await Note.previews(f1.id);
+	let notes2 = await Note.previews(f2.id);
+
+	assertEquals(0, notes1.length);
+	assertEquals(2, notes2.length);
+
+	await execCommand(client, 'use nb1');
+	await execCommand(client, 'mknote note2');
+	await execCommand(client, 'mknote note3');
+
+	notes1 = await Note.previews(f1.id);
+	notes2 = await Note.previews(f2.id);
+
+	assertEquals(2, notes1.length);
+	assertEquals(2, notes2.length);
+};
+
+async function main() {
+	await fs.remove(baseDir);
+
+	logger.info(await execCommand(client, 'version'));
+
+	await db.open({ name: `${client.profileDir}/database.sqlite` });
+	BaseModel.setDb(db);
+	Setting.setConstant('rootProfileDir', client.profileDir);
+	Setting.setConstant('profileDir', client.profileDir);
+	await loadKeychainServiceAndSettings([]);
+
+	let onlyThisTest = 'testMv';
+	onlyThisTest = '';
+
+	for (const n in testUnits) {
+		if (!testUnits.hasOwnProperty(n)) continue;
+		if (onlyThisTest && n !== onlyThisTest) continue;
+
+		await clearDatabase();
+		const testName = n.substr(4).toLowerCase();
+		process.stdout.write(`${testName}: `);
+		await testUnits[n]();
+		console.info('');
+	}
+}
+
+main().catch(error => {
+	console.info('');
+	logger.error(error);
+});

packages/app-cli/app/command-apidoc.ts

@@ -402,17 +402,7 @@ async function fetchAllNotes() {
 				lines.push('');
 			}
 
-			if (model.type === BaseModel.TYPE_NOTE) {
-				lines.push(`By default, the ${singular} will be moved **to the trash**. To permanently delete it, add the query parameter \`permanent=1\``);
-				lines.push('');
-
-				lines.push('### DELETE /notes/:id/revisions');
-				lines.push('');
-				lines.push('Deletes all the revisions attached to this note.');
-				lines.push('');
-			}
-
-			if (model.type === BaseModel.TYPE_FOLDER) {
+			if (model.type === BaseModel.TYPE_NOTE || model.type === BaseModel.TYPE_FOLDER) {
 				lines.push(`By default, the ${singular} will be moved **to the trash**. To permanently delete it, add the query parameter \`permanent=1\``);
 				lines.push('');
 			}

packages/app-cli/app/command-keymap.ts

@@ -1,49 +0,0 @@
-import BaseCommand from './base-command';
-import app from './app';
-import { _ } from '@joplin/lib/locale';
-const { cliUtils } = require('./cli-utils.js');
-
-interface Args { }
-
-class Command extends BaseCommand {
-	public override usage() {
-		return 'keymap';
-	}
-
-	public override description() {
-		return _('Displays the configured keyboard shortcuts.');
-	}
-
-	public override compatibleUis() {
-		return ['cli', 'gui'];
-	}
-
-	public override async action(_args: Args) {
-		const keymaps = await app().loadKeymaps();
-
-		this.stdout(_('Configured keyboard shortcuts:'));
-		this.stdout('\n');
-
-		const rows = [];
-		const padding = '  ';
-
-		rows.push([`${padding}${_('KEYS')}`, _('TYPE'), _('COMMAND')]);
-		rows.push([`${padding}----`, '----', '-------']);
-
-		for (const item of keymaps) {
-			const formattedKeys = item.keys
-				.map((k: string) => (k === ' ' ? `(${_('SPACE')})` : k))
-				.join(', ');
-			rows.push([padding + formattedKeys, item.type, item.command]);
-		}
-
-		cliUtils.printArray(this.stdout.bind(this), rows);
-
-		if (app().gui() && !app().gui().isDummy()) {
-			app().gui().showConsole();
-			app().gui().maximizeConsole();
-		}
-	}
-}
-
-module.exports = Command;

packages/app-cli/app/command-publish.test.ts

@@ -1,7 +1,6 @@
 import ShareService from '@joplin/lib/services/share/ShareService';
 import mockShareService from '@joplin/lib/testing/share/mockShareService';
-import { createFolderTree, setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
-import waitFor from '@joplin/lib/testing/waitFor';
+import { createFolderTree, setupDatabaseAndSynchronizer, switchClient, waitFor } from '@joplin/lib/testing/test-utils';
 import { setupApplication, setupCommandForTesting } from './utils/testUtils';
 import Note from '@joplin/lib/models/Note';
 import Folder from '@joplin/lib/models/Folder';

packages/app-cli/app/command-testing.ts

@@ -107,7 +107,6 @@ class Command extends BaseCommand {
 				userContentBaseUrl: () => joplinServerAuth.userContentBaseUrl,
 				username: () => joplinServerAuth.email,
 				password: () => joplinServerAuth.password,
-				apiKey: () => '',
 				session: (): Session => null,
 			});
 

packages/app-cli/app/command-unpublish.test.ts

@@ -1,7 +1,6 @@
 import ShareService from '@joplin/lib/services/share/ShareService';
 import mockShareService from '@joplin/lib/testing/share/mockShareService';
-import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
-import waitFor from '@joplin/lib/testing/waitFor';
+import { setupDatabaseAndSynchronizer, switchClient, waitFor } from '@joplin/lib/testing/test-utils';
 import { setupApplication, setupCommandForTesting } from './utils/testUtils';
 import Note from '@joplin/lib/models/Note';
 import Folder from '@joplin/lib/models/Folder';

packages/app-cli/app/command-unpublish.ts

@@ -17,11 +17,17 @@ type Args = {
 
 class Command extends BaseCommand {
 	public usage() {
-		return 'unpublish [note]';
+		return 'publish [note]';
 	}
 
 	public description() {
-		return _('Unpublishes a note from Joplin Server or Joplin Cloud');
+		return _('Publishes a note to Joplin Server or Joplin Cloud');
+	}
+
+	public options() {
+		return [
+			['-f, --force', _('Do not ask for user confirmation.')],
+		];
 	}
 
 	public enabled() {

packages/app-cli/app/command-version.ts

@@ -12,7 +12,7 @@ class Command extends BaseCommand {
 	}
 
 	public override async action() {
-		this.stdout(versionInfo(require('../package.json'), {}).message);
+		this.stdout(versionInfo(require('./package.json'), {}).message);
 	}
 }
 

packages/app-cli/app/utils/testUtils.ts

@@ -2,7 +2,6 @@ import app from '../app';
 import Folder from '@joplin/lib/models/Folder';
 import BaseCommand from '../base-command';
 import setupCommand from '../setupCommand';
-import Setting from '@joplin/lib/models/Setting';
 
 // eslint-disable-next-line @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any -- Old code before rule was applied, Old code before rule was applied
 export const setupCommandForTesting = (CommandClass: any, stdout: Function = null): BaseCommand => {
@@ -19,9 +18,4 @@ export const setupApplication = async () => {
 
 	// Some tests also need access to the Redux store
 	app().initRedux();
-
-	// Since the settings need to be loaded before the store is created, it will never
-	// receive the SETTING_UPDATE_ALL event, which means state.settings will not be
-	// initialised. So we manually call dispatchUpdateAll() to force an update.
-	Setting.dispatchUpdateAll();
 };

packages/app-cli/jest.config.js

@@ -24,21 +24,9 @@
 // 4. Remove tests one by one to narrow it down to the one with the async
 //    call that's causing problem.
 
-const baseConfig = require('../../jest.config.base.js');
-
 module.exports = {
-	...baseConfig,
 	testMatch: [
-		'**/tests/HtmlToHtml.js',
-		'**/tests/HtmlToMd.js',
-		'**/tests/MarkupToHtml.js',
-		'**/tests/MdToHtml.js',
-		'**/tests/feature_NoteHistory.js',
-		'**/tests/feature_NoteList.js',
-		'**/tests/feature_ShowAllNotes.js',
-		'**/tests/feature_TagList.js',
-
-		'**/tests/services/**/*.js',
+		'**/tests/**/*.js',
 		'**/*.test.js',
 	],
 

packages/app-cli/jest.setup.js

@@ -1,5 +1,5 @@
 const { afterEachCleanUp } = require('@joplin/lib/testing/test-utils.js');
-const { default: shimInitCli } = require('./app/utils/shimInitCli');
+const { shimInit } = require('@joplin/lib/shim-init-node.js');
 const shim = require('@joplin/lib/shim').default;
 const sharp = require('sharp');
 const nodeSqlite = require('sqlite3');
@@ -13,7 +13,7 @@ try {
 	keytar = null;
 }
 
-shimInitCli({ sharp, nodeSqlite, appVersion: () => require('./package.json').version, keytar });
+shimInit({ sharp, keytar, nodeSqlite });
 
 global.afterEach(async () => {
 	await afterEachCleanUp();

packages/app-cli/package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "test": "jest --verbose=false --config=jest.config.js --bail --forceExit",
     "test-one": "jest --verbose=false --config=jest.config.js --bail --forceExit",
-    "test-ci": "jest --config=jest.config.js --forceExit --testPathIgnorePatterns=cli-integration-tests.test",
+    "test-ci": "jest --config=jest.config.js --forceExit",
     "build": "gulp build",
     "start": "gulp build -L && node \"build/main.js\" --stack-trace-enabled --log-level debug --env dev",
     "start-no-build": "node \"build/main.js\" --stack-trace-enabled --log-level debug --env dev",
@@ -35,20 +35,20 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "3.6.0",
+  "version": "3.5.1",
   "bin": "./main.js",
   "engines": {
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "~3.6",
-    "@joplin/renderer": "~3.6",
-    "@joplin/utils": "~3.6",
+    "@joplin/lib": "~3.5",
+    "@joplin/renderer": "~3.5",
+    "@joplin/utils": "~3.5",
     "aws-sdk": "2.1340.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
     "file-type": "16.5.4",
-    "fs-extra": "11.3.2",
+    "fs-extra": "11.2.0",
     "html-entities": "1.4.0",
     "keytar": "7.9.0",
     "md5": "2.3.0",
@@ -57,7 +57,7 @@
     "proper-lockfile": "4.1.2",
     "redux": "4.2.1",
     "server-destroy": "1.0.1",
-    "sharp": "0.34.5",
+    "sharp": "0.34.3",
     "sprintf-js": "1.1.3",
     "sqlite3": "5.1.6",
     "string-padding": "1.0.2",
@@ -70,7 +70,7 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@joplin/tools": "~3.6",
+    "@joplin/tools": "~3.5",
     "@types/fs-extra": "11.0.4",
     "@types/jest": "29.5.14",
     "@types/node": "18.19.130",

packages/app-cli/tests/MarkupToHtml.ts

@@ -52,7 +52,7 @@ describe('MarkupToHtml', () => {
 			pluginAssets: [],
 		};
 
-		expect(await service.render(MarkupLanguage.Html, testString, {}, { })).toMatchObject(expectedOutput);
-		expect(await service.render(MarkupLanguage.Markdown, testString, {}, { })).toMatchObject(expectedOutput);
+		expect(await service.render(MarkupLanguage.Html, testString, {}, {})).toMatchObject(expectedOutput);
+		expect(await service.render(MarkupLanguage.Markdown, testString, {}, {})).toMatchObject(expectedOutput);
 	});
 });

packages/app-cli/tests/MdToHtml.ts

@@ -12,7 +12,6 @@ function newTestMdToHtml(options: any = null) {
 		ResourceModel: {
 			isResourceUrl: isResourceUrl,
 			urlToId: resourceUrlToId,
-			fullPath: () => '/some/path/here',
 		},
 		fsDriver: shim.fsDriver(),
 		...options,
@@ -57,21 +56,6 @@ describe('MdToHtml', () => {
 				mdToHtmlOptions.mapsToLine = true;
 			} else if (mdFilename.startsWith('resource_')) {
 				mdToHtmlOptions.resources = {};
-			} else if (mdFilename.startsWith('pdf_')) {
-				mdToHtmlOptions.resources = {
-					'00000000000000000000000000000001': {
-						item: { mime: 'application/pdf' },
-						localState: { },
-					},
-				};
-				mdToHtmlOptions.pdfViewerEnabled = true;
-			} else if (mdFilename.startsWith('video_')) {
-				mdToHtmlOptions.resources = {
-					'00000000000000000000000000000001': {
-						item: { mime: 'video/mp4' },
-						localState: { },
-					},
-				};
 			}
 
 			const markdown = await shim.fsDriver().readFile(mdFilePath);
@@ -99,14 +83,10 @@ describe('MdToHtml', () => {
 					'',
 				];
 
-				// Use this to generate the needed file:
-
-				// await writeFile('/path/to/actual.html', actualHtml, 'utf-8');
-
 				// eslint-disable-next-line no-console
 				console.info(msg.join('\n'));
 
-				expect(actualHtml).toBe(expectedHtml);
+				expect(false).toBe(true);
 				// return;
 			} else {
 				expect(true).toBe(true);

packages/app-cli/tests/html_to_md/anchor_multiline_title.html

@@ -1,11 +0,0 @@
-<ul>
-	<li><a href="https://example.com/" title="This
-
-is a test title
-testing!
-
-Test...">Test!</a></li>
-	<li><a href="http://example.com" title="
-Test
-">Another test...</a></li>
-</ul>

packages/app-cli/tests/html_to_md/anchor_multiline_title.md

@@ -1,5 +0,0 @@
-- [Test!](https://example.com/ "This
-    is a test title
-    testing!
-    Test...")
-- [Another test...](http://example.com "Test")

packages/app-cli/tests/html_to_md/source_block_with_space.html

@@ -1,11 +0,0 @@
-<div class="joplin-editable">
-	<!-- Regression test: Historically, text nodes before the first "joplin-source" block caused
-	     conversion to fail. -->
-	A text node!
-	<pre class="joplin-source" data-joplin-language="test" data-joplin-source-open="```&#10;" data-joplin-source-close="&#10;```">
-		Test!
-	</pre>
-	<div class="joplin-rendered">
-		<p>Test content</p>
-	</div>
-</div>

packages/app-cli/tests/html_to_md/source_block_with_space.md

@@ -1,4 +0,0 @@
-```
-		Test!
-	
-```

packages/app-cli/tests/html_to_md/wikipedia_math_inline.html

@@ -1,74 +0,0 @@
-<!-- From https://en.wikipedia.org/wiki/Collatz_conjecture -->
-<math display="block" xmlns="http://www.w3.org/1998/Math/MathML" alttext="{\displaystyle f(n)={\begin{cases}n/2&amp;{\text{if }}n\equiv 0{\pmod {2}},\\3n+1&amp;{\text{if }}n\equiv 1{\pmod {2}}.\end{cases}}}">
-  <semantics>
-    <mrow class="MJX-TeXAtom-ORD">
-      <mstyle displaystyle="true" scriptlevel="0">
-        <mi>f</mi>
-        <mo stretchy="false">(</mo>
-        <mi>n</mi>
-        <mo stretchy="false">)</mo>
-        <mo>=</mo>
-        <mrow class="MJX-TeXAtom-ORD">
-          <mrow>
-            <mo>{</mo>
-            <mtable columnalign="left left" rowspacing=".2em" columnspacing="1em" displaystyle="false">
-              <mtr>
-                <mtd>
-                  <mi>n</mi>
-                  <mrow class="MJX-TeXAtom-ORD">
-                    <mo>/</mo>
-                  </mrow>
-                  <mn>2</mn>
-                </mtd>
-                <mtd>
-                  <mrow class="MJX-TeXAtom-ORD">
-                    <mtext>if&nbsp;</mtext>
-                  </mrow>
-                  <mi>n</mi>
-                  <mo>\u2261</mo>
-                  <mn>0</mn>
-                  <mrow class="MJX-TeXAtom-ORD">
-                    <mspace width="0.444em"></mspace>
-                    <mo stretchy="false">(</mo>
-                    <mi>mod</mi>
-                    <mspace width="0.333em"></mspace>
-                    <mn>2</mn>
-                    <mo stretchy="false">)</mo>
-                  </mrow>
-                  <mo>,</mo>
-                </mtd>
-              </mtr>
-              <mtr>
-                <mtd>
-                  <mn>3</mn>
-                  <mi>n</mi>
-                  <mo>+</mo>
-                  <mn>1</mn>
-                </mtd>
-                <mtd>
-                  <mrow class="MJX-TeXAtom-ORD">
-                    <mtext>if&nbsp;</mtext>
-                  </mrow>
-                  <mi>n</mi>
-                  <mo>\u2261</mo>
-                  <mn>1</mn>
-                  <mrow class="MJX-TeXAtom-ORD">
-                    <mspace width="0.444em"></mspace>
-                    <mo stretchy="false">(</mo>
-                    <mi>mod</mi>
-                    <mspace width="0.333em"></mspace>
-                    <mn>2</mn>
-                    <mo stretchy="false">)</mo>
-                  </mrow>
-                  <mo>.</mo>
-                </mtd>
-              </mtr>
-            </mtable>
-            <mo fence="true" stretchy="true" symmetric="true"></mo>
-          </mrow>
-        </mrow>
-      </mstyle>
-    </mrow>
-    <annotation encoding="application/x-tex">{\displaystyle f(n)={\begin{cases}n/2&amp;{\text{if }}n\equiv 0{\pmod {2}},\\3n+1&amp;{\text{if }}n\equiv 1{\pmod {2}}.\end{cases}}}</annotation>
-  </semantics>
-</math></span><img src="/some/src/here" class="mwe-math-fallback-image-display mw-invert skin-invert" aria-hidden="true" style="vertical-align: -3.171ex; width:45.735ex; height:7.509ex;"/>

packages/app-cli/tests/html_to_md/wikipedia_math_inline.md

@@ -1 +0,0 @@
-${\displaystyle f(n)={\begin{cases}n/2&{\text{if }}n\equiv 0{\pmod {2}},\\3n+1&{\text{if }}n\equiv 1{\pmod {2}}.\end{cases}}}$

packages/app-cli/tests/md_to_html/abc.html

@@ -1,10 +0,0 @@
-
-				<div class="joplin-editable joplin-abc-notation">
-					<pre class="joplin-source" data-abc-options="{&quot;responsive&quot;:&quot;resize&quot;}" data-joplin-language="abc" data-joplin-source-open="```abc&#10;" data-joplin-source-close="&#10;```&#10;">{responsive:'resize'}
----
-K:F
-!f!(fgag-g2c2)|</pre>
-					<pre class="joplin-rendered joplin-abc-notation-rendered">K:F
-!f!(fgag-g2c2)|</pre>
-				</div>
-			

packages/app-cli/tests/md_to_html/abc.md

@@ -1,6 +0,0 @@
-```abc
-{ responsive: 'resize' }
----
-K:F
-!f!(fgag-g2c2)|
-```

packages/app-cli/tests/md_to_html/external_embed.html

@@ -1,8 +0,0 @@
-
-				<div class="joplin-editable">
-					<span class="joplin-source" data-joplin-source-open="" data-joplin-source-close="">https://www.youtube.com/watch?v=iJqe9pC-z-Y</span>
-					<div class="joplin-youtube-player-rendered">
-						<iframe src="https://www.youtube-nocookie.com/embed/iJqe9pC-z-Y" title="YouTube video player" frameborder="0" allowfullscreen></iframe>
-					</div>
-				</div>
-			

packages/app-cli/tests/md_to_html/external_embed.md

@@ -1 +0,0 @@
-https://www.youtube.com/watch?v=iJqe9pC-z-Y

packages/app-cli/tests/md_to_html/external_embed2.html

@@ -1,10 +0,0 @@
-<p>Link: <a data-from-md title='https://www.youtube.com/watch?v=iJqe9pC-z-Y' href='https://www.youtube.com/watch?v=iJqe9pC-z-Y' onclick='postMessage(&quot;https://www.youtube.com/watch?v=iJqe9pC-z-Y&quot;, { resourceId: &quot;&quot; }); return false;'>https://www.youtube.com/watch?v=iJqe9pC-z-Y</a></p>
-<p>
-				<div class="joplin-editable">
-					<span class="joplin-source" data-joplin-source-open="" data-joplin-source-close="">https://www.youtube.com/watch?v=iJqe9pC-z-Y</span>
-					<div class="joplin-youtube-player-rendered">
-						<iframe src="https://www.youtube-nocookie.com/embed/iJqe9pC-z-Y" title="YouTube video player" frameborder="0" allowfullscreen></iframe>
-					</div>
-				</div>
-			</p>
-<p>Test</p>

packages/app-cli/tests/md_to_html/external_embed2.md

@@ -1,5 +0,0 @@
-Link: https://www.youtube.com/watch?v=iJqe9pC-z-Y
-
-https://www.youtube.com/watch?v=iJqe9pC-z-Y
-
-Test

packages/app-cli/tests/md_to_html/pdf_embed.html

@@ -1,4 +0,0 @@
-<p>Embed without starting page:</p>
-<p><a data-from-md data-resource-id='00000000000000000000000000000001' type='application/pdf' href='#' onclick='postMessage(&quot;joplin://00000000000000000000000000000001&quot;, { resourceId: &quot;00000000000000000000000000000001&quot; }); return false;'><span class="resource-icon fa-file-pdf"></span>pdf</a><object data="file:///some/path/here" class="media-player media-pdf" type="application/pdf"></object></p>
-<p>Embed with starting page:</p>
-<p><a data-from-md data-resource-id='00000000000000000000000000000001' type='application/pdf' href='#' onclick='postMessage(&quot;joplin://00000000000000000000000000000001#page=1&quot;, { resourceId: &quot;00000000000000000000000000000001&quot; }); return false;'><span class="resource-icon fa-file-pdf"></span>pdf</a><object data="file:///some/path/here#page=1" class="media-player media-pdf" type="application/pdf"></object></p>

packages/app-cli/tests/md_to_html/pdf_embed.md

@@ -1,8 +0,0 @@
-
-Embed without starting page:
-
-[pdf](:/00000000000000000000000000000001)
-
-Embed with starting page:
-
-[pdf](:/00000000000000000000000000000001#page=1)

packages/app-cli/tests/md_to_html/video_embed.html

@@ -1,10 +0,0 @@
-<p><a data-from-md data-resource-id='00000000000000000000000000000001' type='video/mp4' href='#' onclick='postMessage(&quot;joplin://00000000000000000000000000000001#t=1,2&quot;, { resourceId: &quot;00000000000000000000000000000001&quot; }); return false;'><span class="resource-icon fa-file-video"></span>video, with start/end time</a>
-			<video class="media-player media-video" controls>
-				<source src="file:///some/path/here#t=1,2" type="video/mp4">
-			</video>
-		</p>
-<p><a data-from-md data-resource-id='00000000000000000000000000000001' type='video/mp4' href='#' onclick='postMessage(&quot;joplin://00000000000000000000000000000001&quot;, { resourceId: &quot;00000000000000000000000000000001&quot; }); return false;'><span class="resource-icon fa-file-video"></span>video, without start/end time</a>
-			<video class="media-player media-video" controls>
-				<source src="file:///some/path/here" type="video/mp4">
-			</video>
-		</p>

packages/app-cli/tests/md_to_html/video_embed.md

@@ -1,4 +0,0 @@
-
-[video, with start/end time](:/00000000000000000000000000000001#t=1,2)
-
-[video, without start/end time](:/00000000000000000000000000000001)

packages/app-cli/tests/support/plugins/menu/GENERATOR_DOC.md

@@ -1,22 +1,27 @@
-# Plugin development
+# generator-joplin
 
-This documentation describes how to create a plugin, and how to work with the plugin builder framework and API.
+Scaffolds out a new Joplin plugin
 
 ## Installation
 
 First, install [Yeoman](http://yeoman.io) and generator-joplin using [npm](https://www.npmjs.com/) (we assume you have pre-installed [node.js](https://nodejs.org/)).
 
 ```bash
-npm install -g yo@4.3.1
+npm install -g yo
 npm install -g generator-joplin
 ```
 
 Then generate your new project:
 
 ```bash
-yo --node-package-manager npm joplin
+yo joplin
 ```
 
+## Development
+
+To test the generator for development purposes, follow the instructions there: https://yeoman.io/authoring/#running-the-generator
+This is a template to create a new Joplin plugin.
+
 ## Structure
 
 The main two files you will want to look at are:
@@ -34,10 +39,6 @@ To build the plugin, simply run `npm run dist`.
 
 The project is setup to use TypeScript, although you can change the configuration to use plain JavaScript.
 
-## Updating the manifest version number
-
-You can run `npm run updateVersion` to bump the patch part of the version number, so for example 1.0.3 will become 1.0.4. This script will update both the package.json and manifest.json version numbers so as to keep them in sync.
-
 ## Publishing the plugin
 
 To publish the plugin, add it to npmjs.com by running `npm publish`. Later on, a script will pick up your plugin and add it automatically to the Joplin plugin repository as long as the package satisfies these conditions:
@@ -66,13 +67,6 @@ By default, the compiler (webpack) is going to compile `src/index.ts` only (as w
 
 To get such an external script file to compile, you need to add it to the `extraScripts` array in `plugin.config.json`. The path you add should be relative to /src. For example, if you have a file in "/src/webviews/index.ts", the path should be set to "webviews/index.ts". Once compiled, the file will always be named with a .js extension. So you will get "webviews/index.js" in the plugin package, and that's the path you should use to reference the file.
 
-## More information
-
-- [Joplin Plugin API](https://joplinapp.org/api/references/plugin_api/classes/joplin.html)
-- [Joplin Data API](https://joplinapp.org/help/api/references/rest_api)
-- [Joplin Plugin Manifest](https://joplinapp.org/api/references/plugin_manifest/)
-- Ask for help on the [forum](https://discourse.joplinapp.org/) or our [Discord channel](https://discord.gg/VSj7AFHvpq)
-
 ## License
 
 MIT © Laurent Cozic

packages/app-cli/tests/support/plugins/menu/api/Joplin.d.ts

@@ -73,8 +73,4 @@ export default class Joplin {
      */
     require(_path: string): any;
     versionInfo(): Promise<import("./types").VersionInfo>;
-    /**
-     * Tells whether the current theme is a dark one or not.
-     */
-    shouldUseDarkColors(): Promise<boolean>;
 }

packages/app-cli/tests/support/plugins/menu/api/JoplinClipboard.d.ts

@@ -1,4 +1,3 @@
-import { ClipboardContent } from './types';
 export default class JoplinClipboard {
     private electronClipboard_;
     private electronNativeImage_;
@@ -27,19 +26,4 @@ export default class JoplinClipboard {
      * For example [ 'text/plain', 'text/html' ]
      */
     availableFormats(): Promise<string[]>;
-    /**
-     * Writes multiple formats to the clipboard simultaneously.
-     * This allows setting both text/plain and text/html at the same time.
-     *
-     * <span class="platform-desktop">desktop</span>
-     *
-     * @example
-     * ```typescript
-     * await joplin.clipboard.write({
-     *   text: 'Plain text version',
-     *   html: '<strong>HTML version</strong>'
-     * });
-     * ```
-     */
-    write(content: ClipboardContent): Promise<void>;
 }

packages/app-cli/tests/support/plugins/menu/api/JoplinCommands.d.ts

@@ -14,7 +14,7 @@ import Plugin from '../Plugin';
  * now, are not well documented. You can find the list directly on GitHub
  * though at the following locations:
  *
- * * [Main screen commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/WindowCommandsAndDialogs/commands)
+ * * [Main screen commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/MainScreen/commands)
  * * [Global commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/commands)
  * * [Editor commands](https://github.com/laurent22/joplin/tree/dev/packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts)
  *
@@ -25,13 +25,8 @@ import Plugin from '../Plugin';
  * commands can be found in these places:
  *
  * * [Global commands](https://github.com/laurent22/joplin/tree/dev/packages/app-mobile/commands)
- * * [Note screen commands](https://github.com/laurent22/joplin/tree/dev/packages/app-mobile/components/screens/Note/commands)
  * * [Editor commands](https://github.com/laurent22/joplin/blob/dev/packages/app-mobile/components/NoteEditor/commandDeclarations.ts)
  *
- * Additionally, certain global commands have the same implementation on both platforms:
- *
- * * [Shared global commands](https://github.com/laurent22/joplin/tree/dev/packages/lib/commands)
- *
  * ## Executing editor commands
  *
  * There might be a situation where you want to invoke editor commands

packages/app-cli/tests/support/plugins/menu/api/JoplinSettings.d.ts

@@ -42,11 +42,9 @@ export default class JoplinSettings {
      */
     values(keys: string[] | string): Promise<Record<string, unknown>>;
     /**
-     * Gets a setting value (only applies to setting you registered from your plugin).
+     * @deprecated Use joplin.settings.values()
      *
-     * Note: If you want to retrieve all your plugin settings, for example when the plugin starts,
-     * it is recommended to use the `values()` function instead - it will be much faster than
-     * calling `value()` multiple times.
+     * Gets a setting value (only applies to setting you registered from your plugin)
      */
     value(key: string): Promise<any>;
     /**
@@ -54,15 +52,11 @@ export default class JoplinSettings {
      */
     setValue(key: string, value: any): Promise<void>;
     /**
-     * Gets global setting values, including app-specific settings and those set by other plugins.
+     * Gets a global setting value, including app-specific settings and those set by other plugins.
      *
      * The list of available settings is not documented yet, but can be found by looking at the source code:
      *
-     * https://github.com/laurent22/joplin/blob/dev/packages/lib/models/settings/builtInMetadata.ts
-     */
-    globalValues(keys: string[]): Promise<any[]>;
-    /**
-     * @deprecated Use joplin.settings.globalValues()
+     * https://github.com/laurent22/joplin/blob/dev/packages/lib/models/Setting.ts#L142
      */
     globalValue(key: string): Promise<any>;
     /**

packages/app-cli/tests/support/plugins/menu/api/JoplinViews.d.ts

@@ -9,17 +9,8 @@ import JoplinViewsEditors from './JoplinViewsEditor';
 /**
  * This namespace provides access to view-related services.
  *
- * ## Creating a view
- *
- * All view services provide a `create()` method which you would use to create the view object,
- * whether it's a dialog, a toolbar button or a menu item. In some cases, the `create()` method will
- * return a [[ViewHandle]], which you would use to act on the view, for example to set certain
- * properties or call some methods.
- *
- * ## The `webviewApi` object
- *
- * Within a view, you can use the global object `webviewApi` for various utility functions, such as
- * sending messages or displaying context menu. Refer to [[WebviewApi]] for the full documentation.
+ * All view services provide a `create()` method which you would use to create the view object, whether it's a dialog, a toolbar button or a menu item.
+ * In some cases, the `create()` method will return a [[ViewHandle]], which you would use to act on the view, for example to set certain properties or call some methods.
  */
 export default class JoplinViews {
     private store;

packages/app-cli/tests/support/plugins/menu/api/JoplinViewsDialogs.d.ts

@@ -1,5 +1,5 @@
 import Plugin from '../Plugin';
-import { ButtonSpec, ViewHandle, DialogResult, Toast } from './types';
+import { ButtonSpec, ViewHandle, DialogResult } from './types';
 /**
  * Allows creating and managing dialogs. A dialog is modal window that
  * contains a webview and a row of buttons. You can update the
@@ -43,10 +43,6 @@ export default class JoplinViewsDialogs {
      * Displays a message box with OK/Cancel buttons. Returns the button index that was clicked - "0" for OK and "1" for "Cancel"
      */
     showMessageBox(message: string): Promise<number>;
-    /**
-     * Displays a Toast notification in the corner of the application screen.
-     */
-    showToast(toast: Toast): Promise<void>;
     /**
      * Displays a dialog to select a file or a directory. Same options and
      * output as

packages/app-cli/tests/support/plugins/menu/api/JoplinViewsEditor.d.ts

@@ -1,18 +1,5 @@
 import Plugin from '../Plugin';
-import { ActivationCheckCallback, ViewHandle, UpdateCallback, EditorPluginCallbacks } from './types';
-interface SaveNoteOptions {
-    /**
-     * The ID of the note to save. This should match either:
-     * - The ID of the note currently being edited
-     * - The ID of a note that was very recently open in the editor.
-     *
-     * This property is present to ensure that the note editor doesn't write
-     * to the wrong note just after switching notes.
-     */
-    noteId: string;
-    /** The note's new content. */
-    body: string;
-}
+import { ActivationCheckCallback, ViewHandle, UpdateCallback } from './types';
 /**
  * Allows creating alternative note editors. You can create a view to handle loading and saving the
  * note, and do your own rendering.
@@ -54,18 +41,10 @@ export default class JoplinViewsEditors {
     private store;
     private plugin;
     private activationCheckHandlers_;
-    private unhandledActivationCheck_;
     constructor(plugin: Plugin, store: any);
     private controller;
-    /**
-     * Registers a new editor plugin. Joplin will call the provided callback to create new editor views
-     * associated with the plugin as necessary (e.g. when a new editor is created in a new window).
-     */
-    register(viewId: string, callbacks: EditorPluginCallbacks): Promise<void>;
     /**
      * Creates a new editor view
-     *
-     * @deprecated
      */
     create(id: string): Promise<ViewHandle>;
     /**
@@ -81,21 +60,14 @@ export default class JoplinViewsEditors {
      */
     onMessage(handle: ViewHandle, callback: Function): Promise<void>;
     /**
-     * Saves the content of the editor, without calling `onUpdate` for editors in the same window.
-     */
-    saveNote(handle: ViewHandle, props: SaveNoteOptions): Promise<void>;
-    /**
-     * Emitted when the editor can potentially be activated - this is for example when the current
-     * note is changed, or when the application is opened. At that point you should check the
-     * current note and decide whether your editor should be activated or not. If it should, return
-     * `true`, otherwise return `false`.
-     *
-     * @deprecated - `onActivationCheck` should be provided when the editor is first created with
-     * 	`editor.register`.
+     * Emitted when the editor can potentially be activated - this for example when the current note
+     * is changed, or when the application is opened. At that point should can check the current
+     * note and decide whether your editor should be activated or not. If it should return `true`,
+     * otherwise return `false`.
      */
     onActivationCheck(handle: ViewHandle, callback: ActivationCheckCallback): Promise<void>;
     /**
-     * Emitted when your editor content should be updated. This is for example when the currently
+     * Emitted when the editor content should be updated. This for example when the currently
      * selected note changes, or when the user makes the editor visible.
      */
     onUpdate(handle: ViewHandle, callback: UpdateCallback): Promise<void>;
@@ -114,4 +86,3 @@ export default class JoplinViewsEditors {
      */
     isVisible(handle: ViewHandle): Promise<boolean>;
 }
-export {};

packages/app-cli/tests/support/plugins/menu/api/JoplinViewsPanels.d.ts

@@ -80,9 +80,5 @@ export default class JoplinViewsPanels {
      * Tells whether the panel is visible or not
      */
     visible(handle: ViewHandle): Promise<boolean>;
-    /**
-     * Assuming that the current panel is an editor plugin view, returns
-     * whether the editor plugin view supports editing the current note.
-     */
     isActive(handle: ViewHandle): Promise<boolean>;
 }

packages/app-cli/tests/support/plugins/menu/api/JoplinWorkspace.d.ts

@@ -80,8 +80,6 @@ export default class JoplinWorkspace {
     filterEditorContextMenu(handler: FilterHandler<EditContextMenuFilterObject>): void;
     /**
      * Gets the currently selected note. Will be `null` if no note is selected.
-     *
-     * On desktop, this returns the selected note in the focused window.
      */
     selectedNote(): Promise<any>;
     /**
@@ -95,12 +93,5 @@ export default class JoplinWorkspace {
      * Gets the IDs of the selected notes (can be zero, one, or many). Use the data API to retrieve information about these notes.
      */
     selectedNoteIds(): Promise<string[]>;
-    /**
-     * Gets the last hash (note section ID) from cross-note link targeting specific section.
-     * New hash is available after `onNoteSelectionChange()` is triggered.
-     * Example of cross-note link where `hello-world` is a hash: [Other Note Title](:/9bc9a5cb83f04554bf3fd3e41b4bb415#hello-world).
-     * Method returns empty value when a note was navigated with method other than cross-note link containing valid hash.
-     */
-    selectedNoteHash(): Promise<string>;
 }
 export {};