Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into release-2.10

pull/7492/head
Laurent Cozic 2022-12-18 16:01:40 +00:00
parent 0a65d538c5 31c66ae3cd
commit 318a61e7c5
22 changed files with 298 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Assets/WebsiteAssets/images/news/20221216-proxy-support.png.png → Assets/WebsiteAssets/images/news/20221216-proxy-support.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

50
Assets/WebsiteAssets/rss.xml
View File

@ -1,4 +1,42 @@
<?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>Fri, 09 Dec 2022 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Fri, 09 Dec 2022 00:00:00 GMT</pubDate><item><title><![CDATA[Joplin is hiring!]]></title><description><![CDATA[<p>Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device.</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>Fri, 16 Dec 2022 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Fri, 16 Dec 2022 00:00:00 GMT</pubDate><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/changelog/">Desktop app changelog</a></li>
<li><a href="https://joplinapp.org/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><item><title><![CDATA[Joplin is hiring!]]></title><description><![CDATA[<p>Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device.</p>
<p>We are looking to hire two JavaScript software developers to work on the desktop, mobile, and server applications. All those are built using modern technologies, including React, React Native and Electron with a strong focus on test units.</p> <p>We are looking to hire two JavaScript software developers to work on the desktop, mobile, and server applications. All those are built using modern technologies, including React, React Native and Electron with a strong focus on test units.</p>
<p>You need to demonstrate some experience with at least some of these technologies, and willing to learn more and touch various different projects.</p> <p>You need to demonstrate some experience with at least some of these technologies, and willing to learn more and touch various different projects.</p>
<p>You will be part of a small team, so you will have an opportunity for a high-impact role, targeting hundreds of thousands of users.</p> <p>You will be part of a small team, so you will have an opportunity for a high-impact role, targeting hundreds of thousands of users.</p>
@ -241,12 +279,4 @@
<p>If you click on it you will be sent to the Plans page via a special link. Then once you click on &quot;Buy now&quot; you will be sent to the Stripe page where you can start the subscription.</p> <p>If you click on it you will be sent to the Plans page via a special link. Then once you click on &quot;Buy now&quot; you will be sent to the Stripe page where you can start the subscription.</p>
<p>As mentioned in the message, the process takes into account your remaining beta trial days. So for example, if your beta account expires in 60 days, the subscription will have a free 60 days trial period. This is so you don't lose any of the beta trial days no matter when you start the subscription.</p> <p>As mentioned in the message, the process takes into account your remaining beta trial days. So for example, if your beta account expires in 60 days, the subscription will have a free 60 days trial period. This is so you don't lose any of the beta trial days no matter when you start the subscription.</p>
<p>If you have any question about it, please let me know.</p> <p>If you have any question about it, please let me know.</p>
]]></description><link>https://joplinapp.org/news/20210804-085003/</link><guid isPermaLink="false">20210804-085003</guid><pubDate>Wed, 04 Aug 2021 08:50:03 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[New beta editor for the mobile app]]></title><description><![CDATA[<p>The <a href="https://github.com/laurent22/joplin-android/releases">latest Android pre-release 24</a> features an improved beta editor, which I hope could become a replacement for the very basic editor we have at the moment.</p> ]]></description><link>https://joplinapp.org/news/20210804-085003/</link><guid isPermaLink="false">20210804-085003</guid><pubDate>Wed, 04 Aug 2021 08:50:03 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>
<p>It's still experimental because it's based on the equally experimental CodeMirror 6, however for simple editing tasks it seems to work fine. At the moment the improvements are:</p>
<p>- Syntax highlighting for various tags such as bold, italic and headings.</p>
<p>- List continuation for ordered and unordered lists (I didn't try checklists but I assume it doesn't work)</p>
<p>- Improved undo/redo</p>
<p>- Maybe better handling of large documents? CodeMirror 6 has a demo that loads a document with millions of lines, so maybe that will solve the performance issues that some users were having</p>
<p>If everything works well, later on we should be able to add things like a toolbar, spellchecking and other features that are impossible with the current editor.</p>
<p>If you find any bug, feel free to report here. Also make sure you backup your notes regularly in case there's an issue!</p>
]]></description><link>https://joplinapp.org/news/20210729-103234/</link><guid isPermaLink="false">20210729-103234</guid><pubDate>Thu, 29 Jul 2021 10:32:34 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>

8
README.md
View File

@ -22,11 +22,11 @@ Three types of applications are available: for **desktop** (Windows, macOS and L
Operating System | Download Operating System | Download
---|--- ---|---
Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v2.8.8/Joplin-Setup-2.8.8.exe'><img alt='Get it on Windows' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeWindows.png'/></a> Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/Joplin-Setup-2.9.17.exe'><img alt='Get it on Windows' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeWindows.png'/></a>
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.8.8/Joplin-2.8.8.dmg'><img alt='Get it on macOS' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeMacOS.png'/></a> macOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/Joplin-2.9.17.dmg'><img alt='Get it on macOS' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeMacOS.png'/></a>
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.8.8/Joplin-2.8.8.AppImage'><img alt='Get it on Linux' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeLinux.png'/></a> Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/Joplin-2.9.17.AppImage'><img alt='Get it on Linux' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeLinux.png'/></a>
**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.8.8/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file. **On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
**On Linux**, the recommended way is to use the following installation script as it will handle the desktop icon too: **On Linux**, the recommended way is to use the following installation script as it will handle the desktop icon too:

2
package.json
View File

@ -67,7 +67,7 @@
"@typescript-eslint/eslint-plugin": "5.46.1", "@typescript-eslint/eslint-plugin": "5.46.1",
"@typescript-eslint/parser": "5.46.1", "@typescript-eslint/parser": "5.46.1",
"cspell": "5.21.2", "cspell": "5.21.2",
"eslint": "8.29.0", "eslint": "8.30.0",
"eslint-interactive": "10.3.0", "eslint-interactive": "10.3.0",
"eslint-plugin-import": "2.26.0", "eslint-plugin-import": "2.26.0",
"eslint-plugin-promise": "6.1.1", "eslint-plugin-promise": "6.1.1",

4
packages/app-cli/package.json
View File

@ -42,7 +42,7 @@
"dependencies": { "dependencies": {
"@joplin/lib": "~2.10", "@joplin/lib": "~2.10",
"@joplin/renderer": "~2.10", "@joplin/renderer": "~2.10",
"aws-sdk": "2.1276.0", "aws-sdk": "2.1277.0",
"chalk": "4.1.2", "chalk": "4.1.2",
"compare-version": "0.1.2", "compare-version": "0.1.2",
"fs-extra": "11.1.0", "fs-extra": "11.1.0",
@ -71,7 +71,7 @@
"@joplin/tools": "~2.10", "@joplin/tools": "~2.10",
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",
"@types/jest": "29.2.4", "@types/jest": "29.2.4",
"@types/node": "18.11.15", "@types/node": "18.11.17",
"gulp": "4.0.2", "gulp": "4.0.2",
"jest": "29.3.1", "jest": "29.3.1",
"temp": "0.9.4", "temp": "0.9.4",

10
packages/app-desktop/gui/note-viewer/index.html
View File

@ -158,19 +158,23 @@
for (let i = 0; i < assets.length; i++) { for (let i = 0; i < assets.length; i++) {
const asset = assets[i]; const asset = assets[i];
// # and ? can be used in valid paths and shouldn't be treated as the start of a query or fragment
const encodedPath = asset.path
.replaceAll('#','%23')
.replaceAll('?','%3F')
const assetId = asset.name ? asset.name : asset.path; const assetId = asset.name ? asset.name : encodedPath;
if (pluginAssetsAdded_[assetId]) continue; if (pluginAssetsAdded_[assetId]) continue;
pluginAssetsAdded_[assetId] = true; pluginAssetsAdded_[assetId] = true;
if (asset.mime === 'application/javascript') { if (asset.mime === 'application/javascript') {
const script = document.createElement('script'); const script = document.createElement('script');
script.src = asset.path; script.src = encodedPath;
pluginAssetsContainer.appendChild(script); pluginAssetsContainer.appendChild(script);
} else if (asset.mime === 'text/css') { } else if (asset.mime === 'text/css') {
const link = document.createElement('link'); const link = document.createElement('link');
link.rel = 'stylesheet'; link.rel = 'stylesheet';
link.href = asset.path; link.href = encodedPath
pluginAssetsContainer.appendChild(link); pluginAssetsContainer.appendChild(link);
} }
} }

2
packages/app-desktop/package.json
View File

@ -109,7 +109,7 @@
"@joplin/tools": "~2.10", "@joplin/tools": "~2.10",
"@testing-library/react-hooks": "8.0.1", "@testing-library/react-hooks": "8.0.1",
"@types/jest": "29.2.4", "@types/jest": "29.2.4",
"@types/node": "18.11.15", "@types/node": "18.11.17",
"@types/react": "16.14.34", "@types/react": "16.14.34",
"@types/react-redux": "7.1.24", "@types/react-redux": "7.1.24",
"@types/styled-components": "5.1.26", "@types/styled-components": "5.1.26",

4
packages/app-mobile/ios/Podfile.lock
View File

@ -237,7 +237,7 @@ PODS:
- React-Core - React-Core
- react-native-rsa-native (2.0.5): - react-native-rsa-native (2.0.5):
- React - React
- react-native-slider (4.3.3): - react-native-slider (4.4.0):
- React-Core - React-Core
- react-native-sqlite-storage (6.0.1): - react-native-sqlite-storage (6.0.1):
- React-Core - React-Core
@ -537,7 +537,7 @@ SPEC CHECKSUMS:
react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983 react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
react-native-slider: 7d19220da2f2ae7cbb9aa80127cb73c597fa221f react-native-slider: d2938a12c4e439a227c70eec65d119136eb4aeb5
react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261 react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9 react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9
react-native-webview: 994b9f8fbb504d6314dc40d83f94f27c6831b3bf react-native-webview: 994b9f8fbb504d6314dc40d83f94f27c6831b3bf

2
packages/app-mobile/package.json
View File

@ -26,7 +26,7 @@
"@react-native-community/geolocation": "2.1.0", "@react-native-community/geolocation": "2.1.0",
"@react-native-community/netinfo": "9.3.7", "@react-native-community/netinfo": "9.3.7",
"@react-native-community/push-notification-ios": "1.10.1", "@react-native-community/push-notification-ios": "1.10.1",
"@react-native-community/slider": "4.3.3", "@react-native-community/slider": "4.4.0",
"assert-browserify": "2.0.0", "assert-browserify": "2.0.0",
"buffer": "6.0.3", "buffer": "6.0.3",
"constants-browserify": "1.0.0", "constants-browserify": "1.0.0",

4
packages/fork-htmlparser2/package.json
View File

@ -46,11 +46,11 @@
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "29.2.4", "@types/jest": "29.2.4",
"@types/node": "18.11.15", "@types/node": "18.11.17",
"@typescript-eslint/eslint-plugin": "5.46.1", "@typescript-eslint/eslint-plugin": "5.46.1",
"@typescript-eslint/parser": "5.46.1", "@typescript-eslint/parser": "5.46.1",
"coveralls": "3.1.1", "coveralls": "3.1.1",
"eslint": "8.29.0", "eslint": "8.30.0",
"eslint-config-prettier": "8.5.0", "eslint-config-prettier": "8.5.0",
"jest": "29.3.1", "jest": "29.3.1",
"prettier": "2.8.1", "prettier": "2.8.1",

2
packages/lib/package.json
View File

@ -19,7 +19,7 @@
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",
"@types/jest": "29.2.4", "@types/jest": "29.2.4",
"@types/js-yaml": "4.0.5", "@types/js-yaml": "4.0.5",
"@types/node": "18.11.15", "@types/node": "18.11.17",
"@types/node-rsa": "1.1.1", "@types/node-rsa": "1.1.1",
"@types/react": "17.0.52", "@types/react": "17.0.52",
"@types/uuid": "^9.0.0", "@types/uuid": "^9.0.0",

2
packages/plugin-repo-cli/package.json
View File

@ -29,7 +29,7 @@
"devDependencies": { "devDependencies": {
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",
"@types/jest": "29.2.4", "@types/jest": "29.2.4",
"@types/node": "18.11.15", "@types/node": "18.11.17",
"jest": "29.3.1", "jest": "29.3.1",
"source-map-loader": "4.0.1", "source-map-loader": "4.0.1",
"typescript": "4.9.4", "typescript": "4.9.4",

2
packages/renderer/package.json
View File

@ -19,7 +19,7 @@
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@types/jest": "29.2.4", "@types/jest": "29.2.4",
"@types/node": "18.11.15", "@types/node": "18.11.17",
"jest": "29.3.1", "jest": "29.3.1",
"typescript": "4.9.4" "typescript": "4.9.4"
}, },

2
packages/server/package.json
View File

@ -67,7 +67,7 @@
"@types/koa": "2.13.5", "@types/koa": "2.13.5",
"@types/markdown-it": "12.2.3", "@types/markdown-it": "12.2.3",
"@types/mustache": "4.2.2", "@types/mustache": "4.2.2",
"@types/nodemailer": "6.4.6", "@types/nodemailer": "6.4.7",
"@types/yargs": "17.0.17", "@types/yargs": "17.0.17",
"@types/zxcvbn": "4.4.1", "@types/zxcvbn": "4.4.1",
"gulp": "4.0.2", "gulp": "4.0.2",

2
packages/server/src/routes/api/items.ts
View File

@ -38,7 +38,7 @@ export async function putItemContents(path: SubPath, ctx: AppContext, isBatch: b
if (totalSize > batchMaxSize) throw new ErrorPayloadTooLarge(`Size of items (${formatBytes(totalSize)}) is over the limit (${formatBytes(batchMaxSize)})`); if (totalSize > batchMaxSize) throw new ErrorPayloadTooLarge(`Size of items (${formatBytes(totalSize)}) is over the limit (${formatBytes(batchMaxSize)})`);
} else { } else {
const filePath = parsedBody?.files?.file ? parsedBody.files.file.path : null; const filePath = parsedBody?.files?.file ? parsedBody.files.file.filepath : null;
try { try {
const buffer = filePath ? await fs.readFile(filePath) : Buffer.alloc(0); const buffer = filePath ? await fs.readFile(filePath) : Buffer.alloc(0);

206
packages/tools/locales/sv.po
View File

@ -15,6 +15,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.4.2\n" "X-Generator: Poedit 2.4.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
#: packages/app-mobile/components/screens/ConfigScreen.tsx:609 #: packages/app-mobile/components/screens/ConfigScreen.tsx:609
msgid "- Camera: to allow taking a picture and attaching it to a note." msgid "- Camera: to allow taking a picture and attaching it to a note."
@ -47,7 +49,7 @@ msgstr "(%s)"
#: packages/lib/services/plugins/api/JoplinViewsDialogs.ts:71 #: packages/lib/services/plugins/api/JoplinViewsDialogs.ts:71
msgid "(In plugin: %s)" msgid "(In plugin: %s)"
msgstr "" msgstr "(I tillägg: %s)"
#: packages/lib/SyncTargetNone.ts:16 #: packages/lib/SyncTargetNone.ts:16
msgid "(None)" msgid "(None)"
@ -95,12 +97,12 @@ msgstr "%d dagar"
#: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137 #: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137
#: packages/lib/utils/joplinCloud.ts:138 #: packages/lib/utils/joplinCloud.ts:138
msgid "%d GB" msgid "%d GB"
msgstr "" msgstr "%d GB"
#: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134 #: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134
#: packages/lib/utils/joplinCloud.ts:135 #: packages/lib/utils/joplinCloud.ts:135
msgid "%d GB storage space" msgid "%d GB storage space"
msgstr "" msgstr "%d GB lagringsutrymme"
#: packages/lib/models/Setting.ts:1322 #: packages/lib/models/Setting.ts:1322
msgid "%d hour" msgid "%d hour"
@ -113,13 +115,12 @@ msgstr "%d timmar"
#: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125 #: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125
#: packages/lib/utils/joplinCloud.ts:126 #: packages/lib/utils/joplinCloud.ts:126
msgid "%d MB" msgid "%d MB"
msgstr "" msgstr "%d MB"
#: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122 #: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122
#: packages/lib/utils/joplinCloud.ts:123 #: packages/lib/utils/joplinCloud.ts:123
#, fuzzy
msgid "%d MB per note or attachment" msgid "%d MB per note or attachment"
msgstr "Anteckningsbilagor" msgstr "%d MB per anteckning eller bilaga"
#: packages/lib/models/Setting.ts:1319 packages/lib/models/Setting.ts:1320 #: packages/lib/models/Setting.ts:1319 packages/lib/models/Setting.ts:1320
#: packages/lib/models/Setting.ts:1321 #: packages/lib/models/Setting.ts:1321
@ -210,11 +211,11 @@ msgid ""
"target is a regular note it will be converted to a to-do). Use \"clear\" to " "target is a regular note it will be converted to a to-do). Use \"clear\" to "
"convert the to-do back to a regular note." "convert the to-do back to a regular note."
msgstr "" msgstr ""
"<todo-command> kan antingen vara \"toggle\" eller \"clear\". Använd " "<todo-command> kan antingen vara \"toggle\" eller \"clear\". Använd \"toggle"
"\"toggle\" för att växla mellan givna uppgifter mellan slutförda och inte " "\" för att växla mellan givna uppgifter mellan slutförda och inte slutförda "
"slutförda tillstånd (Om målet är en vanlig anteckning kommer den att " "tillstånd (Om målet är en vanlig anteckning kommer den att konverteras till "
"konverteras till en att-göra). Använd \"clear\" för att konvertera uppgiften " "en att-göra). Använd \"clear\" för att konvertera uppgiften att-göra "
"att-göra tillbaka till en vanlig anteckning." "tillbaka till en vanlig anteckning."
#: packages/lib/models/Setting.ts:1348 #: packages/lib/models/Setting.ts:1348
msgid "A3" msgid "A3"
@ -256,7 +257,7 @@ msgstr "Acceptera"
#: packages/server/src/routes/admin/users.ts:138 #: packages/server/src/routes/admin/users.ts:138
msgid "Account" msgid "Account"
msgstr "" msgstr "Konto"
#: packages/app-desktop/gui/ResourceScreen.tsx:95 #: packages/app-desktop/gui/ResourceScreen.tsx:95
msgid "Action" msgid "Action"
@ -281,9 +282,8 @@ msgid "Add body"
msgstr "Lägg till brödtext" msgstr "Lägg till brödtext"
#: packages/app-mobile/components/action-button.js:76 #: packages/app-mobile/components/action-button.js:76
#, fuzzy
msgid "Add new" msgid "Add new"
msgstr "Lägg till titel" msgstr "Lägg till ny"
#: packages/app-desktop/gui/MainScreen/commands/setTags.ts:38 #: packages/app-desktop/gui/MainScreen/commands/setTags.ts:38
msgid "Add or remove tags:" msgid "Add or remove tags:"
@ -345,12 +345,17 @@ msgid ""
"Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to " "Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to "
"see the short notebook id or use $b for current selected notebook" "see the short notebook id or use $b for current selected notebook"
msgstr "" msgstr ""
"Tvetydig anteckningsbok \"%s\". Använd anteckningsbok-id istället - tryck på "
"\"ti\" för att se det korta anteckningsbok-id:t eller använd $b för aktuellt "
"vald anteckningsbok"
#: packages/app-cli/app/command-mv.js:29 #: packages/app-cli/app/command-mv.js:29
msgid "" msgid ""
"Ambiguous notebook \"%s\". Please use short notebook id instead - press " "Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
"\"ti\" to see the short notebook id" "\" to see the short notebook id"
msgstr "" msgstr ""
"Tvetydig anteckningsbok \"%s\". Använd kort anteckningsbok-id istället - "
"tryck på \"ti\" för att se det korta anteckningsbok-id:t"
#: packages/app-desktop/checkForUpdates.ts:197 #: packages/app-desktop/checkForUpdates.ts:197
msgid "An update is available, do you want to download it now?" msgid "An update is available, do you want to download it now?"
@ -381,9 +386,8 @@ msgid "Aritim Dark"
msgstr "Aritim mörkt" msgstr "Aritim mörkt"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:206 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:206
#, fuzzy
msgid "Attach" msgid "Attach"
msgstr "Bifoga..." msgstr "Bifoga"
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:53 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:53
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:591 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:591
@ -475,7 +479,7 @@ msgstr "Tillbaka"
#: packages/lib/utils/joplinCloud.ts:294 #: packages/lib/utils/joplinCloud.ts:294
msgid "Basic" msgid "Basic"
msgstr "" msgstr "Grundläggande"
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132
@ -496,9 +500,8 @@ msgid "Bulleted List"
msgstr "Punktlista" msgstr "Punktlista"
#: packages/server/src/routes/admin/users.ts:154 #: packages/server/src/routes/admin/users.ts:154
#, fuzzy
msgid "Can Share" msgid "Can Share"
msgstr "Dela" msgstr "Kan dela"
#: packages/app-desktop/bridge.ts:196 packages/app-desktop/bridge.ts:217 #: packages/app-desktop/bridge.ts:196 packages/app-desktop/bridge.ts:217
#: packages/app-desktop/checkForUpdates.ts:199 #: packages/app-desktop/checkForUpdates.ts:199
@ -634,7 +637,7 @@ msgstr ""
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:328 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:328
msgid "Case sensitive" msgid "Case sensitive"
msgstr "" msgstr "Skiftlägeskänslig"
#: packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.ts:7 #: packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.ts:7
msgid "Change application layout" msgid "Change application layout"
@ -743,7 +746,7 @@ msgstr "Samarbeta på anteckningsböcker tillsammans med andra"
#: packages/app-mobile/components/side-menu-content.tsx:333 #: packages/app-mobile/components/side-menu-content.tsx:333
msgid "Collapse" msgid "Collapse"
msgstr "" msgstr "Fäll in"
#: packages/lib/services/ReportService.ts:305 #: packages/lib/services/ReportService.ts:305
msgid "Coming alarms" msgid "Coming alarms"
@ -1076,7 +1079,7 @@ msgstr "dagar"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:109 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:109
msgid "Decrease indent level" msgid "Decrease indent level"
msgstr "" msgstr "Minska indragsnivå"
#: packages/app-cli/app/command-e2ee.ts:64 #: packages/app-cli/app/command-e2ee.ts:64
msgid "Decrypted items: %d" msgid "Decrypted items: %d"
@ -1168,9 +1171,8 @@ msgid "Delete plugin \"%s\"?"
msgstr "Ta bort insticksmodulen \"%s\"?" msgstr "Ta bort insticksmodulen \"%s\"?"
#: packages/app-mobile/components/ScreenHeader.tsx:417 #: packages/app-mobile/components/ScreenHeader.tsx:417
#, fuzzy
msgid "Delete selected notes" msgid "Delete selected notes"
msgstr "Ta bort dessa anteckningar?" msgstr "Ta bort valda anteckningar"
#: packages/lib/models/Note.ts:771 #: packages/lib/models/Note.ts:771
msgid "Delete these %d notes?" msgid "Delete these %d notes?"
@ -1332,7 +1334,7 @@ msgstr ""
#: packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx:149 #: packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx:149
msgid "Done" msgid "Done"
msgstr "" msgstr "Klar"
#: packages/app-desktop/checkForUpdates.ts:199 #: packages/app-desktop/checkForUpdates.ts:199
msgid "Download" msgid "Download"
@ -1389,9 +1391,8 @@ msgid "Duplicate line"
msgstr "Duplicera rad" msgstr "Duplicera rad"
#: packages/app-mobile/components/ScreenHeader.tsx:435 #: packages/app-mobile/components/ScreenHeader.tsx:435
#, fuzzy
msgid "Duplicate selected notes" msgid "Duplicate selected notes"
msgstr "Duplicera rad" msgstr "Duplicera valda anteckningar"
#: packages/app-cli/app/command-cp.js:13 #: packages/app-cli/app/command-cp.js:13
msgid "" msgid ""
@ -1413,9 +1414,8 @@ msgid "Edit in external editor"
msgstr "Redigera i extern redigerare" msgstr "Redigera i extern redigerare"
#: packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx:141 #: packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx:141
#, fuzzy
msgid "Edit link" msgid "Edit link"
msgstr "Redigera anteckningsbok" msgstr "Redigera länk"
#: packages/app-cli/app/command-edit.js:17 #: packages/app-cli/app/command-edit.js:17
msgid "Edit note." msgid "Edit note."
@ -1689,7 +1689,7 @@ msgstr "Avslutar programmet."
#: packages/app-mobile/components/side-menu-content.tsx:333 #: packages/app-mobile/components/side-menu-content.tsx:333
msgid "Expand" msgid "Expand"
msgstr "" msgstr "Fäll ut"
#: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:171 #: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:171
#: packages/app-desktop/gui/Sidebar/Sidebar.tsx:375 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:375
@ -1782,12 +1782,11 @@ msgstr "Filtrera taggar"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:218 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:218
msgid "Find and replace" msgid "Find and replace"
msgstr "" msgstr "Hitta och ersätt"
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:250 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:250
#, fuzzy
msgid "Find: " msgid "Find: "
msgstr "Hittad: %d." msgstr "Hitta: "
#: packages/app-desktop/gui/ExtensionBadge.min.js:10 #: packages/app-desktop/gui/ExtensionBadge.min.js:10
msgid "Firefox Extension" msgid "Firefox Extension"
@ -1827,7 +1826,7 @@ msgstr "Endast för felsökning: exportera din profil till ett externt SD-kort."
#: packages/lib/models/Setting.ts:1449 #: packages/lib/models/Setting.ts:1449
msgid "For example \"%s\"" msgid "For example \"%s\""
msgstr "" msgstr "Till exempel \"%s\""
#: packages/app-cli/app/command-help.js:36 #: packages/app-cli/app/command-help.js:36
msgid "For information on how to customise the shortcuts please visit %s" msgid "For information on how to customise the shortcuts please visit %s"
@ -1853,9 +1852,8 @@ msgid "Force path style"
msgstr "Tvinga sökvägsstil" msgstr "Tvinga sökvägsstil"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:276 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:276
#, fuzzy
msgid "Formatting" msgid "Formatting"
msgstr "Information" msgstr "Formatering"
#: packages/lib/commands/historyForward.ts:6 #: packages/lib/commands/historyForward.ts:6
msgid "Forward" msgid "Forward"
@ -1875,9 +1873,8 @@ msgid "Full changelog"
msgstr "Fullständig ändringslogg" msgstr "Fullständig ändringslogg"
#: packages/server/src/routes/admin/users.ts:130 #: packages/server/src/routes/admin/users.ts:130
#, fuzzy
msgid "Full name" msgid "Full name"
msgstr "Fullständig ändringslogg" msgstr "Fullständigt namn"
#: packages/lib/models/Setting.ts:2398 #: packages/lib/models/Setting.ts:2398
#: packages/server/src/services/MustacheService.ts:108 #: packages/server/src/services/MustacheService.ts:108
@ -1927,11 +1924,11 @@ msgstr "Bevilja auktorisation"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:48 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:48
msgid "Header %d" msgid "Header %d"
msgstr "" msgstr "Rubrik %d"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:280 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:280
msgid "Headers" msgid "Headers"
msgstr "" msgstr "Rubriker"
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:73 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:73
msgid "Heading" msgid "Heading"
@ -1946,14 +1943,12 @@ msgid "Hide %s"
msgstr "Dölj %s" msgstr "Dölj %s"
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:218 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:218
#, fuzzy
msgid "Hide advanced" msgid "Hide advanced"
msgstr "Dölj metadata" msgstr "Dölj avancerade"
#: packages/server/src/routes/admin/users.ts:200 #: packages/server/src/routes/admin/users.ts:200
#, fuzzy
msgid "Hide disabled" msgid "Hide disabled"
msgstr "Dölj inaktiverade nycklar" msgstr "Dölj inaktiverade"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:172 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:172
msgid "Hide disabled keys" msgid "Hide disabled keys"
@ -1964,14 +1959,12 @@ msgid "Hide Joplin"
msgstr "Dölj Joplin" msgstr "Dölj Joplin"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:253 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:253
#, fuzzy
msgid "Hide keyboard" msgid "Hide keyboard"
msgstr "Dölj metadata" msgstr "Dölj tangentbord"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.tsx:22 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.tsx:22
#, fuzzy
msgid "Hide more actions" msgid "Hide more actions"
msgstr "Dölj metadata" msgstr "Dölj fler åtgärder"
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:14 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:14
msgid "Highlight" msgid "Highlight"
@ -2132,7 +2125,7 @@ msgstr "I: %s"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:119 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:119
msgid "Increase indent level" msgid "Increase indent level"
msgstr "" msgstr "Öka indragsnivå"
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:104 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:104
msgid "Indent less" msgid "Indent less"
@ -2161,9 +2154,8 @@ msgstr "Infoga hyperlänk"
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:83 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:83
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:625 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:625
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:188 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:188
#, fuzzy
msgid "Insert time" msgid "Insert time"
msgstr "Infoga datumtid" msgstr "Infoga tid"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.tsx:191 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.tsx:191
msgid "Install" msgid "Install"
@ -2310,7 +2302,7 @@ msgstr ""
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:162 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:162
msgid "KaTeX" msgid "KaTeX"
msgstr "" msgstr "KaTeX"
#: packages/lib/models/Setting.ts:1494 #: packages/lib/models/Setting.ts:1494
msgid "Keep note history for" msgid "Keep note history for"
@ -2381,14 +2373,12 @@ msgid "Lines"
msgstr "Rader" msgstr "Rader"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:174 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:174
#, fuzzy
msgid "Link" msgid "Link"
msgstr "Länk" msgstr "Länk"
#: packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx:95 #: packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx:95
#, fuzzy
msgid "Link description" msgid "Link description"
msgstr "Kryptering" msgstr "Länkbeskrivning"
#: packages/app-desktop/gui/ShareNoteDialog.tsx:185 #: packages/app-desktop/gui/ShareNoteDialog.tsx:185
msgid "Link has been copied to clipboard!" msgid "Link has been copied to clipboard!"
@ -2397,9 +2387,8 @@ msgstr[0] "Länken har kopierats till urklipp!"
msgstr[1] "Länkarna har kopierats till urklipp!" msgstr[1] "Länkarna har kopierats till urklipp!"
#: packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx:92 #: packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx:92
#, fuzzy
msgid "Link text" msgid "Link text"
msgstr "Länk" msgstr "Länktext"
#: packages/app-mobile/components/screens/Note.tsx:197 #: packages/app-mobile/components/screens/Note.tsx:197
msgid "Links with protocol \"%s\" are not supported" msgid "Links with protocol \"%s\" are not supported"
@ -2413,7 +2402,7 @@ msgstr "Listobjekt"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:284 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:284
msgid "Lists" msgid "Lists"
msgstr "" msgstr "Listor"
#: packages/app-mobile/components/screens/encryption-config.tsx:212 #: packages/app-mobile/components/screens/encryption-config.tsx:212
msgid "Loaded" msgid "Loaded"
@ -2476,9 +2465,8 @@ msgid "Manage master password..."
msgstr "Hantera huvudlösenord..." msgstr "Hantera huvudlösenord..."
#: packages/lib/utils/joplinCloud.ts:165 #: packages/lib/utils/joplinCloud.ts:165
#, fuzzy
msgid "Manage multiple users" msgid "Manage multiple users"
msgstr "Hantera huvudlösenord" msgstr "Hantera flera användare"
#: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx:320 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx:320
msgid "Manage your plugins" msgid "Manage your plugins"
@ -2541,17 +2529,15 @@ msgstr "Max antal samtida anslutningar"
#: packages/server/src/routes/admin/users.ts:142 #: packages/server/src/routes/admin/users.ts:142
msgid "Max Item Size" msgid "Max Item Size"
msgstr "" msgstr "Max objektstorlek"
#: packages/lib/utils/joplinCloud.ts:117 #: packages/lib/utils/joplinCloud.ts:117
#, fuzzy
msgid "Max note or attachment size" msgid "Max note or attachment size"
msgstr "Anteckningsbilagor" msgstr "Max storlek för anteckning eller bilaga"
#: packages/server/src/routes/admin/users.ts:150 #: packages/server/src/routes/admin/users.ts:150
#, fuzzy
msgid "Max Total Size" msgid "Max Total Size"
msgstr "Faktiskt storlek" msgstr "Max total storlek"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:324 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:324
msgid "Missing keys" msgid "Missing keys"
@ -2598,9 +2584,8 @@ msgid "Move to notebook..."
msgstr "Flytta till anteckningsbok..." msgstr "Flytta till anteckningsbok..."
#: packages/app-cli/app/command-mv.js:14 #: packages/app-cli/app/command-mv.js:14
#, fuzzy
msgid "Moves the given <item> to [notebook]" msgid "Moves the given <item> to [notebook]"
msgstr "Flyttar anteckningarna som matchar <note> till [notebook]." msgstr "Flyttar det givna <item> till [notebook]"
#: packages/app-cli/app/cli-utils.js:161 #: packages/app-cli/app/cli-utils.js:161
#: packages/app-cli/app/setupCommand.ts:20 #: packages/app-cli/app/setupCommand.ts:20
@ -2652,7 +2637,7 @@ msgstr "Ny version: %s"
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:268 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:268
msgid "Next match" msgid "Next match"
msgstr "" msgstr "Nästa träff"
#: packages/lib/SyncTargetNextcloud.js:25 #: packages/lib/SyncTargetNextcloud.js:25
msgid "Nextcloud" msgid "Nextcloud"
@ -2770,9 +2755,8 @@ msgid "Note does not exist: \"%s\". Create it?"
msgstr "Anteckning finns inte: \"%s\". Skapa den?" msgstr "Anteckning finns inte: \"%s\". Skapa den?"
#: packages/app-mobile/components/NoteEditor/NoteEditor.tsx:82 #: packages/app-mobile/components/NoteEditor/NoteEditor.tsx:82
#, fuzzy
msgid "Note editor" msgid "Note editor"
msgstr "Anteckningshistorik" msgstr "Anteckningsredigerare"
#: packages/app-cli/app/command-edit.js:97 #: packages/app-cli/app/command-edit.js:97
msgid "Note has been saved." msgid "Note has been saved."
@ -2921,9 +2905,8 @@ msgid "Open %s"
msgstr "Öppna %s" msgstr "Öppna %s"
#: packages/app-desktop/gui/MainScreen/commands/openPdfViewer.ts:7 #: packages/app-desktop/gui/MainScreen/commands/openPdfViewer.ts:7
#, fuzzy
msgid "Open PDF viewer" msgid "Open PDF viewer"
msgstr "Aktivera PDF-visare" msgstr "Öppna PDF-visare"
#: packages/app-desktop/commands/openProfileDirectory.ts:8 #: packages/app-desktop/commands/openProfileDirectory.ts:8
msgid "Open profile directory" msgid "Open profile directory"
@ -2954,9 +2937,8 @@ msgid "Or create an account."
msgstr "Eller skapa ett konto." msgstr "Eller skapa ett konto."
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:82 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:82
#, fuzzy
msgid "Ordered list" msgid "Ordered list"
msgstr "Skapa användare" msgstr "Ordnad lista"
#: packages/app-desktop/gui/MenuBar.tsx:407 #: packages/app-desktop/gui/MenuBar.tsx:407
msgid "Other applications..." msgid "Other applications..."
@ -3010,7 +2992,7 @@ msgstr "PDF-fil"
#: packages/lib/utils/joplinCloud.ts:355 #: packages/lib/utils/joplinCloud.ts:355
msgid "Per user. Minimum of %d users." msgid "Per user. Minimum of %d users."
msgstr "" msgstr "Per användare. Minst %d användare."
#: packages/app-mobile/components/screens/Note.tsx:403 #: packages/app-mobile/components/screens/Note.tsx:403
msgid "Permission needed" msgid "Permission needed"
@ -3025,8 +3007,8 @@ msgid ""
"Please click on \"%s\" to proceed, or set the passwords in the \"%s\" list " "Please click on \"%s\" to proceed, or set the passwords in the \"%s\" list "
"below." "below."
msgstr "" msgstr ""
"Klicka på \"%s\" för att fortsätta, eller ställ in lösenorden i listan " "Klicka på \"%s\" för att fortsätta, eller ställ in lösenorden i listan \"%s"
"\"%s\" nedan." "\" nedan."
#: packages/lib/components/EncryptionConfigScreen/utils.ts:65 #: packages/lib/components/EncryptionConfigScreen/utils.ts:65
msgid "" msgid ""
@ -3158,7 +3140,7 @@ msgstr "Tryck för att ställa in dekrypteringslösenordet."
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:278 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:278
msgid "Previous match" msgid "Previous match"
msgstr "" msgstr "Föregående träff"
#: packages/app-desktop/gui/NotePropertiesDialog.min.js:307 #: packages/app-desktop/gui/NotePropertiesDialog.min.js:307
msgid "Previous versions of this note" msgid "Previous versions of this note"
@ -3170,16 +3152,15 @@ msgstr "Skriv ut"
#: packages/lib/utils/joplinCloud.ts:183 #: packages/lib/utils/joplinCloud.ts:183
msgid "Priority support" msgid "Priority support"
msgstr "" msgstr "Prioriterat stöd"
#: packages/app-mobile/components/screens/ConfigScreen.tsx:655 #: packages/app-mobile/components/screens/ConfigScreen.tsx:655
msgid "Privacy Policy" msgid "Privacy Policy"
msgstr "Integritetspolicy" msgstr "Integritetspolicy"
#: packages/lib/utils/joplinCloud.ts:316 #: packages/lib/utils/joplinCloud.ts:316
#, fuzzy
msgid "Pro" msgid "Pro"
msgstr "Profil" msgstr "Pro"
#: packages/server/src/services/TaskService.ts:24 #: packages/server/src/services/TaskService.ts:24
msgid "Process failed payment subscriptions" msgid "Process failed payment subscriptions"
@ -3210,17 +3191,16 @@ msgid "Properties"
msgstr "Egenskaper" msgstr "Egenskaper"
#: packages/lib/models/Setting.ts:1438 #: packages/lib/models/Setting.ts:1438
#, fuzzy
msgid "Proxy enabled" msgid "Proxy enabled"
msgstr "Aktiverad" msgstr "Proxy aktiverad"
#: packages/lib/models/Setting.ts:1459 #: packages/lib/models/Setting.ts:1459
msgid "Proxy timeout (seconds)" msgid "Proxy timeout (seconds)"
msgstr "" msgstr "Proxy tidsgräns (sekunder)"
#: packages/lib/models/Setting.ts:1448 #: packages/lib/models/Setting.ts:1448
msgid "Proxy URL" msgid "Proxy URL"
msgstr "" msgstr "Proxy-URL"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:252 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:252
msgid "Public-private key pair:" msgid "Public-private key pair:"
@ -3294,9 +3274,8 @@ msgid "Refresh"
msgstr "Uppdatera" msgstr "Uppdatera"
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:313 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:313
#, fuzzy
msgid "Regular expression" msgid "Regular expression"
msgstr "Aktivera matematiska uttryck" msgstr "Reguljärt uttryck"
#: packages/app-desktop/gui/MainScreen/MainScreen.tsx:620 #: packages/app-desktop/gui/MainScreen/MainScreen.tsx:620
#: packages/app-desktop/gui/Root.tsx:179 #: packages/app-desktop/gui/Root.tsx:179
@ -3341,20 +3320,19 @@ msgstr "Förnya token"
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:288 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:288
msgid "Replace" msgid "Replace"
msgstr "" msgstr "Ersätt"
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:298 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:298
#, fuzzy
msgid "Replace all" msgid "Replace all"
msgstr "Välj alla" msgstr "Ersätt alla"
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:236 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:236
msgid "Replace with..." msgid "Replace with..."
msgstr "" msgstr "Ersätt alla..."
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:257 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:257
msgid "Replace: " msgid "Replace: "
msgstr "" msgstr "Ersätt: "
#: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:219 #: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:219
#: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:220 #: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:220
@ -3489,9 +3467,8 @@ msgid "Search for plugins..."
msgstr "Sök efter insticksmoduler..." msgstr "Sök efter insticksmoduler..."
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:223 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:223
#, fuzzy
msgid "Search for..." msgid "Search for..."
msgstr "Sök..." msgstr "Sök efter..."
#: packages/app-desktop/gui/NoteListControls/commands/focusSearch.ts:6 #: packages/app-desktop/gui/NoteListControls/commands/focusSearch.ts:6
msgid "Search in all the notes" msgid "Search in all the notes"
@ -3590,9 +3567,8 @@ msgid "Share"
msgstr "Dela" msgstr "Dela"
#: packages/lib/utils/joplinCloud.ts:159 #: packages/lib/utils/joplinCloud.ts:159
#, fuzzy
msgid "Share and collaborate on a notebook" msgid "Share and collaborate on a notebook"
msgstr "Anteckningar kan bara skapas i en anteckningsbok." msgstr "Dela och samarbeta i en anteckningsbok"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:339 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:339
msgid "Share Notebook" msgid "Share Notebook"
@ -3604,7 +3580,7 @@ msgstr "Dela anteckningsbok..."
#: packages/lib/utils/joplinCloud.ts:177 #: packages/lib/utils/joplinCloud.ts:177
msgid "Sharing access control" msgid "Sharing access control"
msgstr "" msgstr "Dela åtkomstkontroll"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:305 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:305
msgid "Sharing notebook..." msgid "Sharing notebook..."
@ -3615,9 +3591,8 @@ msgid "Shortcuts are not available in CLI mode."
msgstr "Snabbkommandon är inte tillgängliga i läge för kommandotolk." msgstr "Snabbkommandon är inte tillgängliga i läge för kommandotolk."
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:208 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:208
#, fuzzy
msgid "Show advanced" msgid "Show advanced"
msgstr "Visa avancerade inställningar" msgstr "Visa avancerade"
#: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:217 #: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:217
msgid "Show Advanced Settings" msgid "Show Advanced Settings"
@ -3632,18 +3607,16 @@ msgid "Show completed to-dos"
msgstr "Visa slutförda att-göra" msgstr "Visa slutförda att-göra"
#: packages/server/src/routes/admin/users.ts:200 #: packages/server/src/routes/admin/users.ts:200
#, fuzzy
msgid "Show disabled" msgid "Show disabled"
msgstr "Visa inaktiverade nycklar" msgstr "Visa inaktiverade"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:172 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:172
msgid "Show disabled keys" msgid "Show disabled keys"
msgstr "Visa inaktiverade nycklar" msgstr "Visa inaktiverade nycklar"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.tsx:22 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.tsx:22
#, fuzzy
msgid "Show more actions" msgid "Show more actions"
msgstr "Visa anteckningsantal" msgstr "Visa fler åtgärder"
#: packages/lib/models/Setting.ts:883 #: packages/lib/models/Setting.ts:883
msgid "Show note counts" msgid "Show note counts"
@ -3659,7 +3632,7 @@ msgstr "Visa fältikon"
#: packages/app-mobile/components/ScreenHeader.tsx:287 #: packages/app-mobile/components/ScreenHeader.tsx:287
msgid "Show/hide the sidebar" msgid "Show/hide the sidebar"
msgstr "" msgstr "Visa/dölj sidofältet"
#: packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.ts:8 #: packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.ts:8
#: packages/app-mobile/components/ScreenHeader.tsx:286 #: packages/app-mobile/components/ScreenHeader.tsx:286
@ -3896,7 +3869,7 @@ msgstr ""
#: packages/lib/utils/joplinCloud.ts:147 #: packages/lib/utils/joplinCloud.ts:147
msgid "Sync as many devices as you want" msgid "Sync as many devices as you want"
msgstr "" msgstr "Synkronisera så många enheter du vill"
#: packages/app-mobile/components/screens/ConfigScreen.tsx:564 #: packages/app-mobile/components/screens/ConfigScreen.tsx:564
msgid "Sync Status" msgid "Sync Status"
@ -4001,9 +3974,8 @@ msgid "Take photo"
msgstr "Ta ett foto" msgstr "Ta ett foto"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:95 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:95
#, fuzzy
msgid "Task list" msgid "Task list"
msgstr "Uppgifter" msgstr "Uppgiftslista"
#: packages/server/src/services/MustacheService.ts:123 #: packages/server/src/services/MustacheService.ts:123
#: packages/server/src/services/MustacheService.ts:275 #: packages/server/src/services/MustacheService.ts:275
@ -4012,7 +3984,7 @@ msgstr "Uppgifter"
#: packages/lib/utils/joplinCloud.ts:338 #: packages/lib/utils/joplinCloud.ts:338
msgid "Teams" msgid "Teams"
msgstr "" msgstr "Team"
#: packages/lib/models/Setting.ts:1343 #: packages/lib/models/Setting.ts:1343
msgid "Text editor command" msgid "Text editor command"
@ -4466,9 +4438,8 @@ msgid "to-do"
msgstr "att-göra" msgstr "att-göra"
#: packages/app-mobile/components/note-item.js:143 #: packages/app-mobile/components/note-item.js:143
#, fuzzy
msgid "to-do: %s" msgid "to-do: %s"
msgstr "att-göra" msgstr "att-göra: %s"
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:112 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:112
msgid "Toggle comment" msgid "Toggle comment"
@ -4519,9 +4490,8 @@ msgid "Tools"
msgstr "Verktyg" msgstr "Verktyg"
#: packages/server/src/routes/admin/users.ts:146 #: packages/server/src/routes/admin/users.ts:146
#, fuzzy
msgid "Total Size" msgid "Total Size"
msgstr "Faktiskt storlek" msgstr "Total storlek"
#: packages/lib/services/ReportService.ts:282 #: packages/lib/services/ReportService.ts:282
msgid "Total: %d/%d" msgid "Total: %d/%d"
@ -4533,9 +4503,8 @@ msgstr "Försök igen"
#: packages/lib/utils/joplinCloud.ts:309 packages/lib/utils/joplinCloud.ts:331 #: packages/lib/utils/joplinCloud.ts:309 packages/lib/utils/joplinCloud.ts:331
#: packages/lib/utils/joplinCloud.ts:353 #: packages/lib/utils/joplinCloud.ts:353
#, fuzzy
msgid "Try it now" msgid "Try it now"
msgstr "Gör det nu" msgstr "Testa det nu"
#: packages/app-cli/app/command-help.js:71 #: packages/app-cli/app/command-help.js:71
msgid "" msgid ""
@ -4587,9 +4556,8 @@ msgid ""
msgstr "Okänd objekttyp hämtad - uppgradera Joplin till den senaste versionen" msgstr "Okänd objekttyp hämtad - uppgradera Joplin till den senaste versionen"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:69 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:69
#, fuzzy
msgid "Unordered list" msgid "Unordered list"
msgstr "Skapa användare" msgstr "Oordnad lista"
#: packages/app-desktop/gui/ShareNoteDialog.tsx:164 #: packages/app-desktop/gui/ShareNoteDialog.tsx:164
msgid "Unpublish note" msgid "Unpublish note"
@ -4849,7 +4817,7 @@ msgstr "y"
#: packages/app-cli/app/cli-utils.js:161 #: packages/app-cli/app/cli-utils.js:161
#: packages/app-cli/app/setupCommand.ts:20 #: packages/app-cli/app/setupCommand.ts:20
msgid "Y" msgid "Y"
msgstr "Y" msgstr "J"
#: packages/lib/models/Setting.ts:386 #: packages/lib/models/Setting.ts:386
msgid "yes" msgid "yes"

128
packages/tools/locales/zh_CN.po
View File

@ -88,7 +88,7 @@ msgstr "%d 天"
#: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137 #: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137
#: packages/lib/utils/joplinCloud.ts:138 #: packages/lib/utils/joplinCloud.ts:138
msgid "%d GB" msgid "%d GB"
msgstr "" msgstr "%d GB"
#: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134 #: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134
#: packages/lib/utils/joplinCloud.ts:135 #: packages/lib/utils/joplinCloud.ts:135
@ -106,7 +106,7 @@ msgstr "%d 小时"
#: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125 #: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125
#: packages/lib/utils/joplinCloud.ts:126 #: packages/lib/utils/joplinCloud.ts:126
msgid "%d MB" msgid "%d MB"
msgstr "" msgstr "%d MB"
#: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122 #: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122
#: packages/lib/utils/joplinCloud.ts:123 #: packages/lib/utils/joplinCloud.ts:123
@ -247,12 +247,12 @@ msgstr "账号"
#: packages/app-desktop/gui/ResourceScreen.tsx:95 #: packages/app-desktop/gui/ResourceScreen.tsx:95
msgid "Action" msgid "Action"
msgstr "动作" msgstr "操作"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:183 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:183
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:288 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:288
msgid "Actions" msgid "Actions"
msgstr "动作" msgstr "操作"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:178 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:178
msgid "Active" msgid "Active"
@ -462,7 +462,7 @@ msgstr "返回"
#: packages/lib/utils/joplinCloud.ts:294 #: packages/lib/utils/joplinCloud.ts:294
msgid "Basic" msgid "Basic"
msgstr "" msgstr "基本"
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132
@ -907,7 +907,7 @@ msgstr ""
#: packages/lib/components/EncryptionConfigScreen/utils.ts:220 #: packages/lib/components/EncryptionConfigScreen/utils.ts:220
msgid "Could not upgrade master key: %s" msgid "Could not upgrade master key: %s"
msgstr "无法升级主密钥：%s" msgstr "无法升级主密钥(master key)：%s"
#: packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.ts:26 #: packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.ts:26
msgid "" msgid ""
@ -957,7 +957,7 @@ msgstr "已新建远程项目：%d。"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:152 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:152
msgid "Created: " msgid "Created: "
msgstr "创建于： " msgstr "创建： "
#: packages/app-cli/app/command-import.js:48 #: packages/app-cli/app/command-import.js:48
#: packages/app-desktop/gui/ImportScreen.min.js:69 #: packages/app-desktop/gui/ImportScreen.min.js:69
@ -967,7 +967,7 @@ msgstr "已创建：%d 条。"
#: packages/app-mobile/components/screens/encryption-config.tsx:118 #: packages/app-mobile/components/screens/encryption-config.tsx:118
#: packages/app-mobile/components/screens/Note.tsx:845 #: packages/app-mobile/components/screens/Note.tsx:845
msgid "Created: %s" msgid "Created: %s"
msgstr "创建于：%s" msgstr "创建：%s"
#: packages/app-cli/app/command-mknote.js:12 #: packages/app-cli/app/command-mknote.js:12
msgid "Creates a new note." msgid "Creates a new note."
@ -1199,7 +1199,7 @@ msgstr "禁用安全模式并重启"
#: packages/app-desktop/gui/ClipperConfigScreen.tsx:102 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:102
msgid "Disable Web Clipper Service" msgid "Disable Web Clipper Service"
msgstr "禁用网页剪辑器" msgstr "禁用网页剪藏器"
#: packages/app-cli/app/command-e2ee.ts:127 #: packages/app-cli/app/command-e2ee.ts:127
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:249 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:249
@ -1323,7 +1323,7 @@ msgstr "下载资源中..."
#: packages/lib/models/Setting.ts:400 #: packages/lib/models/Setting.ts:400
msgid "Dracula" msgid "Dracula"
msgstr "德古拉紫 (Dracula)" msgstr "德古拉紫(Dracula)"
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
msgid "Drop notes or files here" msgid "Drop notes or files here"
@ -1534,7 +1534,7 @@ msgstr "启用视频播放器"
#: packages/app-desktop/gui/ClipperConfigScreen.tsx:113 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:113
msgid "Enable Web Clipper Service" msgid "Enable Web Clipper Service"
msgstr "启用网页剪辑器" msgstr "启用网页剪藏器"
#: packages/app-cli/app/command-e2ee.ts:127 #: packages/app-cli/app/command-e2ee.ts:127
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:249 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:249
@ -1578,7 +1578,7 @@ msgstr "加密状态：%s"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:172 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:172
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:271 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:271
msgid "Encryption keys" msgid "Encryption keys"
msgstr "加密密钥" msgstr "加密密钥(Encryption keys)"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:249 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:249
msgid "Encryption:" msgid "Encryption:"
@ -1595,7 +1595,7 @@ msgstr "在此输入代码"
#: packages/app-cli/app/command-e2ee.ts:38 #: packages/app-cli/app/command-e2ee.ts:38
#: packages/app-cli/app/command-e2ee.ts:84 #: packages/app-cli/app/command-e2ee.ts:84
msgid "Enter master password:" msgid "Enter master password:"
msgstr "输入主密码：" msgstr "输入主密码(master password)："
#: packages/app-mobile/components/screens/folder.js:111 #: packages/app-mobile/components/screens/folder.js:111
msgid "Enter notebook title" msgid "Enter notebook title"
@ -1697,14 +1697,14 @@ msgstr "仅导出选定笔记本。"
#: packages/lib/models/Setting.ts:1468 #: packages/lib/models/Setting.ts:1468
msgid "Fail-safe" msgid "Fail-safe"
msgstr "故障保护 (Fail-safe)" msgstr "故障保护(Fail-safe)"
#: packages/lib/models/Setting.ts:1469 #: packages/lib/models/Setting.ts:1469
msgid "" msgid ""
"Fail-safe: Do not wipe out local data when sync target is empty (often the " "Fail-safe: Do not wipe out local data when sync target is empty (often the "
"result of a misconfiguration or bug)" "result of a misconfiguration or bug)"
msgstr "" msgstr ""
"故障保护 (Fail-safe) ：当同步目标为空时（通常是配置错误或 Bug），不要删除本地" "故障保护(Fail-safe) ：当同步目标为空时（通常是配置错误或Bug），不要删除本地"
"数据" "数据"
#: packages/app-cli/app/main.js:95 #: packages/app-cli/app/main.js:95
@ -1743,7 +1743,7 @@ msgstr "查找和替换"
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:250 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:250
#, fuzzy #, fuzzy
msgid "Find: " msgid "Find: "
msgstr "已找到：%d 条。" msgstr "已找到："
#: packages/app-desktop/gui/ExtensionBadge.min.js:10 #: packages/app-desktop/gui/ExtensionBadge.min.js:10
msgid "Firefox Extension" msgid "Firefox Extension"
@ -1835,7 +1835,7 @@ msgstr "完整更新记录"
#: packages/lib/models/Setting.ts:2398 #: packages/lib/models/Setting.ts:2398
#: packages/server/src/services/MustacheService.ts:108 #: packages/server/src/services/MustacheService.ts:108
msgid "General" msgid "General"
msgstr "通用选项" msgstr "常规"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:252 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:252
msgid "Generated" msgid "Generated"
@ -1878,11 +1878,11 @@ msgstr "批准授权"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:48 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:48
msgid "Header %d" msgid "Header %d"
msgstr "" msgstr "Header %d"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:280 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:280
msgid "Headers" msgid "Headers"
msgstr "" msgstr "Headers"
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:73 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:73
msgid "Heading" msgid "Heading"
@ -1918,7 +1918,7 @@ msgstr "隐藏键盘"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.tsx:22 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.tsx:22
msgid "Hide more actions" msgid "Hide more actions"
msgstr "隐藏更多动作" msgstr "隐藏更多操作"
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:14 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:14
msgid "Highlight" msgid "Highlight"
@ -1931,7 +1931,7 @@ msgstr "主页"
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:78 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:78
msgid "Horizontal Rule" msgid "Horizontal Rule"
msgstr "水平线" msgstr "分割线"
#: packages/lib/services/interop/InteropService.ts:133 #: packages/lib/services/interop/InteropService.ts:133
msgid "HTML Directory" msgid "HTML Directory"
@ -2057,7 +2057,7 @@ msgstr "为使用文件系统同步，需要获取写入外部存储的权限。
#: packages/app-desktop/gui/ClipperConfigScreen.tsx:130 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:130
msgid "In order to use the web clipper, you need to do the following:" msgid "In order to use the web clipper, you need to do the following:"
msgstr "要使用网页剪辑器，您需要执行以下步骤：" msgstr "要使用网页剪藏器，您需要执行以下步骤："
#: packages/lib/Synchronizer.ts:305 #: packages/lib/Synchronizer.ts:305
msgid "In progress" msgid "In progress"
@ -2225,7 +2225,7 @@ msgstr "Joplin 服务器 URL"
msgid "" msgid ""
"Joplin Web Clipper allows saving web pages and screenshots from your browser " "Joplin Web Clipper allows saving web pages and screenshots from your browser "
"to Joplin." "to Joplin."
msgstr "Joplin 网页剪辑器可以让您将浏览器中的网页和屏幕截图保存到 Joplin。" msgstr "Joplin 网页剪藏器可以让您将浏览器中的网页和屏幕截图保存到 Joplin。"
#: packages/app-mobile/components/screens/ConfigScreen.tsx:641 #: packages/app-mobile/components/screens/ConfigScreen.tsx:641
msgid "Joplin website" msgid "Joplin website"
@ -2343,7 +2343,7 @@ msgstr "列表项"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:284 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:284
msgid "Lists" msgid "Lists"
msgstr "" msgstr "列表"
#: packages/app-mobile/components/screens/encryption-config.tsx:212 #: packages/app-mobile/components/screens/encryption-config.tsx:212
msgid "Loaded" msgid "Loaded"
@ -2399,11 +2399,11 @@ msgstr "捐助"
#: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:219 #: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:219
msgid "Manage master password" msgid "Manage master password"
msgstr "管理主密码" msgstr "管理主密码(master password)"
#: packages/lib/commands/openMasterPasswordDialog.ts:6 #: packages/lib/commands/openMasterPasswordDialog.ts:6
msgid "Manage master password..." msgid "Manage master password..."
msgstr "管理主密码……" msgstr "管理主密码(master password)..."
#: packages/lib/utils/joplinCloud.ts:165 #: packages/lib/utils/joplinCloud.ts:165
msgid "Manage multiple users" msgid "Manage multiple users"
@ -2451,7 +2451,7 @@ msgstr "标记语言"
#: packages/app-mobile/components/screens/encryption-config.tsx:117 #: packages/app-mobile/components/screens/encryption-config.tsx:117
msgid "Master Key %s" msgid "Master Key %s"
msgstr "主密钥 %s" msgstr "主密钥(Master Key) %s"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:133 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:133
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:277 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:277
@ -2462,7 +2462,7 @@ msgstr "主密码"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:278 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:278
#: packages/app-mobile/components/screens/encryption-config.tsx:211 #: packages/app-mobile/components/screens/encryption-config.tsx:211
msgid "Master password:" msgid "Master password:"
msgstr "主密码：" msgstr "主密码(Master password)："
#: packages/lib/models/Setting.ts:754 #: packages/lib/models/Setting.ts:754
msgid "Max concurrent connections" msgid "Max concurrent connections"
@ -2470,25 +2470,25 @@ msgstr "最大并发连接数"
#: packages/server/src/routes/admin/users.ts:142 #: packages/server/src/routes/admin/users.ts:142
msgid "Max Item Size" msgid "Max Item Size"
msgstr "" msgstr "最大条目数"
#: packages/lib/utils/joplinCloud.ts:117 #: packages/lib/utils/joplinCloud.ts:117
#, fuzzy #, fuzzy
msgid "Max note or attachment size" msgid "Max note or attachment size"
msgstr "笔记附件" msgstr "最大笔记或附件大小"
#: packages/server/src/routes/admin/users.ts:150 #: packages/server/src/routes/admin/users.ts:150
#, fuzzy #, fuzzy
msgid "Max Total Size" msgid "Max Total Size"
msgstr "实际大小" msgstr "最大总大小"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:324 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:324
msgid "Missing keys" msgid "Missing keys"
msgstr "缺少密钥" msgstr "缺少密钥(keys)"
#: packages/app-mobile/components/screens/encryption-config.tsx:271 #: packages/app-mobile/components/screens/encryption-config.tsx:271
msgid "Missing Master Keys" msgid "Missing Master Keys"
msgstr "缺少主密钥" msgstr "缺少主密钥(Master Keys)"
#: packages/app-cli/app/cli-utils.js:109 #: packages/app-cli/app/cli-utils.js:109
msgid "Missing required argument: %s" msgid "Missing required argument: %s"
@ -2508,7 +2508,7 @@ msgstr "更多信息"
#: packages/app-cli/app/app.js:64 #: packages/app-cli/app/app.js:64
msgid "More than one item match \"%s\". Please narrow down your query." msgid "More than one item match \"%s\". Please narrow down your query."
msgstr "有多条项目符合 “%s”。请缩小您的检索范围。" msgstr "不止一项匹配 “%s”。请缩小您的检索范围。"
#: packages/app-mobile/components/ScreenHeader.tsx:562 #: packages/app-mobile/components/ScreenHeader.tsx:562
msgid "Move %d notes to notebook \"%s\"?" msgid "Move %d notes to notebook \"%s\"?"
@ -2697,7 +2697,7 @@ msgstr "笔记不存在：“%s” 。是否创建？"
#: packages/app-mobile/components/NoteEditor/NoteEditor.tsx:82 #: packages/app-mobile/components/NoteEditor/NoteEditor.tsx:82
#, fuzzy #, fuzzy
msgid "Note editor" msgid "Note editor"
msgstr "笔记历史" msgstr "笔记编辑器"
#: packages/app-cli/app/command-edit.js:97 #: packages/app-cli/app/command-edit.js:97
msgid "Note has been saved." msgid "Note has been saved."
@ -2770,7 +2770,7 @@ msgstr "笔记"
#: packages/lib/models/Setting.ts:2418 #: packages/lib/models/Setting.ts:2418
msgid "Notes and settings are stored in: %s" msgid "Notes and settings are stored in: %s"
msgstr "笔记与设置储存于：%s" msgstr "笔记与配置信息存储于：%s"
#: packages/app-cli/app/command-mknote.js:16 #: packages/app-cli/app/command-mknote.js:16
#: packages/app-cli/app/command-mktodo.js:16 #: packages/app-cli/app/command-mktodo.js:16
@ -2805,7 +2805,7 @@ msgstr "位于 %s: %s"
#: packages/app-desktop/gui/MainScreen/MainScreen.tsx:602 #: packages/app-desktop/gui/MainScreen/MainScreen.tsx:602
msgid "One of your master keys use an obsolete encryption method." msgid "One of your master keys use an obsolete encryption method."
msgstr "您的主密钥之一使用了过时的加密方法。" msgstr "您的主密钥(Master Key)之一使用了过时的加密方法。"
#: packages/app-cli/app/gui/NoteWidget.js:48 #: packages/app-cli/app/gui/NoteWidget.js:48
msgid "" msgid ""
@ -2814,12 +2814,12 @@ msgid ""
"supplied the password, the encrypted items are being decrypted in the " "supplied the password, the encrypted items are being decrypted in the "
"background and will be available soon." "background and will be available soon."
msgstr "" msgstr ""
"一个或多个项目当前已加密，您可能需要提供主密码。若需进行此操作请输入 `e2ee " "一个或多个项目当前已加密，您可能需要提供主密码(master password)。若需进行此操作请输入 `e2ee "
"decrypt` 。若您已提供密码，此时加密文件正在后台解密，解锁之后即可使用。" "decrypt` 。若您已提供密码，此时加密文件正在后台解密，解锁之后即可使用。"
#: packages/app-desktop/gui/MainScreen/MainScreen.tsx:631 #: packages/app-desktop/gui/MainScreen/MainScreen.tsx:631
msgid "One or more master keys need a password." msgid "One or more master keys need a password."
msgstr "一个或多个主密钥需要密码。" msgstr "一个或多个主密钥(Master Key)需要密码。"
#: packages/lib/SyncTargetOneDrive.ts:29 #: packages/lib/SyncTargetOneDrive.ts:29
msgid "OneDrive" msgid "OneDrive"
@ -2844,7 +2844,7 @@ msgstr "打开 %s"
#: packages/app-desktop/gui/MainScreen/commands/openPdfViewer.ts:7 #: packages/app-desktop/gui/MainScreen/commands/openPdfViewer.ts:7
#, fuzzy #, fuzzy
msgid "Open PDF viewer" msgid "Open PDF viewer"
msgstr "启用 PDF 查看器" msgstr "打开 PDF 查看器"
#: packages/app-desktop/commands/openProfileDirectory.ts:8 #: packages/app-desktop/commands/openProfileDirectory.ts:8
msgid "Open profile directory" msgid "Open profile directory"
@ -2956,7 +2956,7 @@ msgstr "请确认您要重新加密整个数据库。"
msgid "" msgid ""
"Please enter your password in the master key list below before upgrading the " "Please enter your password in the master key list below before upgrading the "
"key." "key."
msgstr "在升级密钥之前，请在下面的主密钥列表中输入您的密码。" msgstr "在升级密钥之前，请在下面的主密钥(Master Key)列表中输入您的密码。"
#: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:321 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:321
msgid "" msgid ""
@ -3036,11 +3036,11 @@ msgstr "可用值：%s。"
#: packages/app-desktop/gui/KeymapConfig/utils/getLabel.ts:26 #: packages/app-desktop/gui/KeymapConfig/utils/getLabel.ts:26
msgid "Preferences" msgid "Preferences"
msgstr "首选项" msgstr "偏好设置"
#: packages/app-desktop/gui/MenuBar.tsx:518 #: packages/app-desktop/gui/MenuBar.tsx:518
msgid "Preferences..." msgid "Preferences..."
msgstr "首选项..." msgstr "偏好设置..."
#: packages/lib/models/Setting.ts:870 #: packages/lib/models/Setting.ts:870
msgid "Preferred dark theme" msgid "Preferred dark theme"
@ -3074,7 +3074,7 @@ msgstr "上次匹配"
#: packages/app-desktop/gui/NotePropertiesDialog.min.js:307 #: packages/app-desktop/gui/NotePropertiesDialog.min.js:307
msgid "Previous versions of this note" msgid "Previous versions of this note"
msgstr "此笔记的早期版本" msgstr "该笔记的历史版本"
#: packages/app-desktop/gui/MainScreen/commands/print.ts:7 #: packages/app-desktop/gui/MainScreen/commands/print.ts:7
msgid "Print" msgid "Print"
@ -3136,7 +3136,7 @@ msgstr "代理URL"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:252 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:252
msgid "Public-private key pair:" msgid "Public-private key pair:"
msgstr "公钥、私钥对：" msgstr "公-私钥对："
#: packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.ts:6 #: packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.ts:6
msgid "Publish note..." msgid "Publish note..."
@ -3260,7 +3260,7 @@ msgstr "全选"
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:236 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:236
msgid "Replace with..." msgid "Replace with..."
msgstr "" msgstr "替换为..."
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:257 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:257
msgid "Replace: " msgid "Replace: "
@ -3269,7 +3269,7 @@ msgstr "替换: "
#: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:219 #: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:219
#: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:220 #: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:220
msgid "Reset master password" msgid "Reset master password"
msgstr "重置主密码" msgstr "重置主密码(master password)"
#: packages/app-cli/app/command-import.js:51 #: packages/app-cli/app/command-import.js:51
#: packages/app-desktop/gui/ImportScreen.min.js:72 #: packages/app-desktop/gui/ImportScreen.min.js:72
@ -3278,7 +3278,7 @@ msgstr "资源：%d。"
#: packages/app-desktop/gui/MainScreen/MainScreen.tsx:591 #: packages/app-desktop/gui/MainScreen/MainScreen.tsx:591
msgid "Restart and upgrade" msgid "Restart and upgrade"
msgstr "重启后升级" msgstr "重启并升级"
#: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:708 #: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:708
msgid "Restart now" msgid "Restart now"
@ -3651,7 +3651,7 @@ msgstr "分栏视图"
#: packages/lib/models/Setting.ts:1159 #: packages/lib/models/Setting.ts:1159
msgid "Start application minimised in the tray icon" msgid "Start application minimised in the tray icon"
msgstr "应用程序启动时最小化到托盘" msgstr "程序启动时最小化到托盘"
#: packages/app-cli/app/command-server.js:14 #: packages/app-cli/app/command-server.js:14
msgid "" msgid ""
@ -3698,7 +3698,7 @@ msgstr "状态：在 %d 端口运行"
#: packages/app-desktop/gui/ClipperConfigScreen.tsx:133 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:133
msgid "Step 1: Enable the clipper service" msgid "Step 1: Enable the clipper service"
msgstr "步骤一：启用网页剪辑器" msgstr "步骤一：启用网页剪藏服务"
#: packages/app-cli/app/command-sync.ts:83 #: packages/app-cli/app/command-sync.ts:83
#: packages/app-desktop/gui/DropboxLoginScreen.tsx:46 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:46
@ -3850,7 +3850,7 @@ msgstr "同步"
#: packages/lib/models/Setting.ts:1335 #: packages/lib/models/Setting.ts:1335
msgid "Synchronise only over WiFi connection" msgid "Synchronise only over WiFi connection"
msgstr "只通过 WiFi 网络同步数据" msgstr "只通过 WiFi 同步"
#: packages/app-cli/app/command-sync.ts:29 #: packages/app-cli/app/command-sync.ts:29
msgid "Synchronises with remote storage." msgid "Synchronises with remote storage."
@ -3866,7 +3866,7 @@ msgstr "正在同步..."
#: packages/lib/models/Setting.ts:1350 #: packages/lib/models/Setting.ts:1350
msgid "Tabloid" msgid "Tabloid"
msgstr "文摘 (Tabloid)" msgstr "文摘(Tabloid)"
#: packages/app-mobile/components/screens/NoteTagsDialog.js:179 #: packages/app-mobile/components/screens/NoteTagsDialog.js:179
msgid "tag1, tag2, ..." msgid "tag1, tag2, ..."
@ -3892,7 +3892,7 @@ msgstr "拍照"
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:95 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:95
#, fuzzy #, fuzzy
msgid "Task list" msgid "Task list"
msgstr "任务" msgstr "任务列表"
#: packages/server/src/services/MustacheService.ts:123 #: packages/server/src/services/MustacheService.ts:123
#: packages/server/src/services/MustacheService.ts:275 #: packages/server/src/services/MustacheService.ts:275
@ -3901,7 +3901,7 @@ msgstr "任务"
#: packages/lib/utils/joplinCloud.ts:338 #: packages/lib/utils/joplinCloud.ts:338
msgid "Teams" msgid "Teams"
msgstr "" msgstr "团队"
#: packages/lib/models/Setting.ts:1343 #: packages/lib/models/Setting.ts:1343
msgid "Text editor command" msgid "Text editor command"
@ -3919,7 +3919,7 @@ msgstr "应用将要关闭。请重新启动它以完成此过程。"
#: packages/app-desktop/app.ts:340 #: packages/app-desktop/app.ts:340
msgid "" msgid ""
"The application did not close properly. Would you like to start in safe mode?" "The application did not close properly. Would you like to start in safe mode?"
msgstr "该应用程序没有正确关闭。你想在安全模式下启动吗？" msgstr "该程序没有正确关闭。你想在安全模式下启动吗？"
#: packages/lib/onedrive-api-node-utils.js:87 #: packages/lib/onedrive-api-node-utils.js:87
msgid "" msgid ""
@ -3964,7 +3964,7 @@ msgstr "默认的加密方法已更改为一种更安全的方法，建议您将
msgid "" msgid ""
"The default encryption method has been changed, you should re-encrypt your " "The default encryption method has been changed, you should re-encrypt your "
"data." "data."
msgstr "默认的加密方法已更改，您应当重新加密数据。" msgstr "默认的加密方式已变更，您应当重新加密数据。"
#: packages/lib/models/Setting.ts:1343 #: packages/lib/models/Setting.ts:1343
msgid "" msgid ""
@ -4019,7 +4019,7 @@ msgstr ""
#: packages/lib/components/EncryptionConfigScreen/utils.ts:218 #: packages/lib/components/EncryptionConfigScreen/utils.ts:218
msgid "The master key has been upgraded successfully!" msgid "The master key has been upgraded successfully!"
msgstr "主密钥已成功升级！" msgstr "主密钥(Master Key)已成功升级！"
#: packages/app-mobile/components/screens/encryption-config.tsx:272 #: packages/app-mobile/components/screens/encryption-config.tsx:272
msgid "" msgid ""
@ -4027,7 +4027,7 @@ msgid ""
"however the application does not currently have access to them. It is likely " "however the application does not currently have access to them. It is likely "
"they will eventually be downloaded via synchronisation." "they will eventually be downloaded via synchronisation."
msgstr "" msgstr ""
"具有这些 ID 的主密钥正被用于加密某些项，但应用程序目前无法访问它们。项目最终" "具有这些 ID 的主密钥(Master Key)正被用于加密某些项，但应用程序目前无法访问它们。项目最终"
"会通过同步获取，但目前可能仍未被同步。" "会通过同步获取，但目前可能仍未被同步。"
#: packages/lib/services/RevisionService.ts:267 #: packages/lib/services/RevisionService.ts:267
@ -4084,15 +4084,15 @@ msgstr ""
#: packages/app-desktop/gui/Root.tsx:177 #: packages/app-desktop/gui/Root.tsx:177
msgid "The Web Clipper needs your authorisation to access your data." msgid "The Web Clipper needs your authorisation to access your data."
msgstr "网页剪辑器需要您的授权才能访问您的数据。" msgstr "网页剪藏器需要您的授权才能访问您的数据。"
#: packages/app-desktop/gui/ClipperConfigScreen.tsx:84 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:84
msgid "The web clipper service is enabled and set to auto-start." msgid "The web clipper service is enabled and set to auto-start."
msgstr "网页剪辑器已启用并已设置为自动启动。" msgstr "网页剪藏器已启用并已设置为自动启动。"
#: packages/app-desktop/gui/ClipperConfigScreen.tsx:108 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:108
msgid "The web clipper service is not enabled." msgid "The web clipper service is not enabled."
msgstr "网页剪辑未启用。" msgstr "网页剪藏未启用。"
#: packages/lib/models/Setting.ts:827 #: packages/lib/models/Setting.ts:827
msgid "Theme" msgid "Theme"
@ -4258,7 +4258,7 @@ msgstr "要让 Joplin 与 Dropbox 同步，请按下列步骤操作："
#: packages/lib/components/EncryptionConfigScreen/utils.ts:54 #: packages/lib/components/EncryptionConfigScreen/utils.ts:54
msgid "To continue, please enter your master password below." msgid "To continue, please enter your master password below."
msgstr "若要继续，请在下面输入您的主密码。" msgstr "若要继续，请在下面输入您的主密码(master password)。"
#: packages/app-cli/app/app-gui.js:457 #: packages/app-cli/app/app-gui.js:457
msgid "To delete a tag, untag the associated notes." msgid "To delete a tag, untag the associated notes."
@ -4493,7 +4493,7 @@ msgstr "已更新远程项目：%d。"
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:152 #: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:152
msgid "Updated: " msgid "Updated: "
msgstr "更新于： " msgstr "更新： "
#: packages/app-cli/app/command-import.js:49 #: packages/app-cli/app/command-import.js:49
#: packages/app-desktop/gui/ImportScreen.min.js:70 #: packages/app-desktop/gui/ImportScreen.min.js:70
@ -4620,7 +4620,7 @@ msgstr "警告：由于性能原因无法显示所有资源（最多：%s）。"
#: packages/lib/models/Setting.ts:2408 packages/lib/utils/joplinCloud.ts:153 #: packages/lib/models/Setting.ts:2408 packages/lib/utils/joplinCloud.ts:153
msgid "Web Clipper" msgid "Web Clipper"
msgstr "网页剪辑器" msgstr "网页剪藏器"
#: packages/lib/SyncTargetWebDAV.js:23 #: packages/lib/SyncTargetWebDAV.js:23
msgid "WebDAV" msgid "WebDAV"

4
packages/tools/package.json
View File

@ -47,13 +47,13 @@
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",
"@types/jest": "29.2.4", "@types/jest": "29.2.4",
"@types/mustache": "4.2.2", "@types/mustache": "4.2.2",
"@types/node": "18.11.15", "@types/node": "18.11.17",
"gettext-extractor": "3.6.0", "gettext-extractor": "3.6.0",
"gulp": "4.0.2", "gulp": "4.0.2",
"html-entities": "1.4.0", "html-entities": "1.4.0",
"jest": "29.3.1", "jest": "29.3.1",
"rss": "1.2.2", "rss": "1.2.2",
"sass": "1.56.2", "sass": "1.57.0",
"sqlite3": "5.1.4", "sqlite3": "5.1.4",
"typescript": "4.9.4" "typescript": "4.9.4"
}, },

2
readme/changelog.md
View File

@ -1,6 +1,6 @@
# Joplin changelog # Joplin changelog
## [v2.9.17](https://github.com/laurent22/joplin/releases/tag/v2.9.17) (Pre-release) - 2022-11-15T10:28:37Z ## [v2.9.17](https://github.com/laurent22/joplin/releases/tag/v2.9.17) - 2022-11-15T10:28:37Z
- Fixed: Switching a note using Sidebar is slow and grayed out ([#6430](https://github.com/laurent22/joplin/issues/6430)) ([#6416](https://github.com/laurent22/joplin/issues/6416) by Kenichi Kobayashi) - Fixed: Switching a note using Sidebar is slow and grayed out ([#6430](https://github.com/laurent22/joplin/issues/6430)) ([#6416](https://github.com/laurent22/joplin/issues/6416) by Kenichi Kobayashi)
- Security: Fix XSS when a specially crafted string is passed to the renderer ([762b4e8](https://github.com/laurent22/joplin/commit/762b4e8)) (PoC by [@Alise](https://github.com/a1ise)) - Security: Fix XSS when a specially crafted string is passed to the renderer ([762b4e8](https://github.com/laurent22/joplin/commit/762b4e8)) (PoC by [@Alise](https://github.com/a1ise))

2
readme/download.md
View File

@ -10,7 +10,7 @@ Your download of <span class="downloaded-filename">Joplin</span> is in progress.
Access your notes on Windows, macOS or Linux. Access your notes on Windows, macOS or Linux.
<!-- DESKTOP-DOWNLOAD-LINKS --><a href='https://github.com/laurent22/joplin/releases/download/v2.8.8/Joplin-Setup-2.8.8.exe'><img alt='Get it on Windows' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeWindows.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.8.8/Joplin-2.8.8.dmg'><img alt='Get it on macOS' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeMacOS.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.8.8/Joplin-2.8.8.AppImage'><img alt='Get it on Linux' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeLinux.png'/></a><!-- DESKTOP-DOWNLOAD-LINKS --> <!-- DESKTOP-DOWNLOAD-LINKS --><a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/Joplin-Setup-2.9.17.exe'><img alt='Get it on Windows' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeWindows.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/Joplin-2.9.17.dmg'><img alt='Get it on macOS' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeMacOS.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/Joplin-2.9.17.AppImage'><img alt='Get it on Linux' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeLinux.png'/></a><!-- DESKTOP-DOWNLOAD-LINKS -->
</div> </div>

1
readme/news/20221216-release-2-9.md
View File

@ -1,5 +1,6 @@
--- ---
tweet: What's new in Joplin 2.9 tweet: What's new in Joplin 2.9
forum_url: https://discourse.joplinapp.org/t/28661
--- ---
# What's new in Joplin 2.9 # What's new in Joplin 2.9

117
yarn.lock
View File

@ -3640,6 +3640,23 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@eslint/eslintrc@npm:^1.4.0":
version: 1.4.0
resolution: "@eslint/eslintrc@npm:1.4.0"
dependencies:
ajv: ^6.12.4
debug: ^4.3.2
espree: ^9.4.0
globals: ^13.19.0
ignore: ^5.2.0
import-fresh: ^3.2.1
js-yaml: ^4.1.0
minimatch: ^3.1.2
strip-json-comments: ^3.1.1
checksum: 73e39c833deafde8d8706e6fa9b52b6d99927c094ead8e405ea4174e8197ec24aac9ba88ae38cc8ad32eaccf07b9c7fc5dc70761d1fba6da41a928691447305f
languageName: node
linkType: hard
"@evocateur/libnpmaccess@npm:^3.1.2": "@evocateur/libnpmaccess@npm:^3.1.2":
version: 3.1.2 version: 3.1.2
resolution: "@evocateur/libnpmaccess@npm:3.1.2" resolution: "@evocateur/libnpmaccess@npm:3.1.2"
@ -3857,6 +3874,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@humanwhocodes/config-array@npm:^0.11.8":
version: 0.11.8
resolution: "@humanwhocodes/config-array@npm:0.11.8"
dependencies:
"@humanwhocodes/object-schema": ^1.2.1
debug: ^4.1.1
minimatch: ^3.0.5
checksum: 0fd6b3c54f1674ce0a224df09b9c2f9846d20b9e54fabae1281ecfc04f2e6ad69bf19e1d6af6a28f88e8aa3990168b6cb9e1ef755868c3256a630605ec2cb1d3
languageName: node
linkType: hard
"@humanwhocodes/module-importer@npm:^1.0.1": "@humanwhocodes/module-importer@npm:^1.0.1":
version: 1.0.1 version: 1.0.1
resolution: "@humanwhocodes/module-importer@npm:1.0.1" resolution: "@humanwhocodes/module-importer@npm:1.0.1"
@ -4213,7 +4241,7 @@ __metadata:
"@joplin/tools": ~2.10 "@joplin/tools": ~2.10
"@testing-library/react-hooks": 8.0.1 "@testing-library/react-hooks": 8.0.1
"@types/jest": 29.2.4 "@types/jest": 29.2.4
"@types/node": 18.11.15 "@types/node": 18.11.17
"@types/react": 16.14.34 "@types/react": 16.14.34
"@types/react-redux": 7.1.24 "@types/react-redux": 7.1.24
"@types/styled-components": 5.1.26 "@types/styled-components": 5.1.26
@ -4306,7 +4334,7 @@ __metadata:
"@react-native-community/geolocation": 2.1.0 "@react-native-community/geolocation": 2.1.0
"@react-native-community/netinfo": 9.3.7 "@react-native-community/netinfo": 9.3.7
"@react-native-community/push-notification-ios": 1.10.1 "@react-native-community/push-notification-ios": 1.10.1
"@react-native-community/slider": 4.3.3 "@react-native-community/slider": 4.4.0
"@types/fs-extra": 9.0.13 "@types/fs-extra": 9.0.13
"@types/jest": 29.2.4 "@types/jest": 29.2.4
"@types/react-native": 0.64.19 "@types/react-native": 0.64.19
@ -4377,7 +4405,7 @@ __metadata:
resolution: "@joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2" resolution: "@joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2"
dependencies: dependencies:
"@types/jest": 29.2.4 "@types/jest": 29.2.4
"@types/node": 18.11.15 "@types/node": 18.11.17
"@typescript-eslint/eslint-plugin": 5.46.1 "@typescript-eslint/eslint-plugin": 5.46.1
"@typescript-eslint/parser": 5.46.1 "@typescript-eslint/parser": 5.46.1
coveralls: 3.1.1 coveralls: 3.1.1
@ -4385,7 +4413,7 @@ __metadata:
domhandler: 3.3.0 domhandler: 3.3.0
domutils: 3.0.1 domutils: 3.0.1
entities: 2.2.0 entities: 2.2.0
eslint: 8.29.0 eslint: 8.30.0
eslint-config-prettier: 8.5.0 eslint-config-prettier: 8.5.0
jest: 29.3.1 jest: 29.3.1
prettier: 2.8.1 prettier: 2.8.1
@ -4443,7 +4471,7 @@ __metadata:
"@types/jest": 29.2.4 "@types/jest": 29.2.4
"@types/js-yaml": 4.0.5 "@types/js-yaml": 4.0.5
"@types/nanoid": 3.0.0 "@types/nanoid": 3.0.0
"@types/node": 18.11.15 "@types/node": 18.11.17
"@types/node-rsa": 1.1.1 "@types/node-rsa": 1.1.1
"@types/react": 17.0.52 "@types/react": 17.0.52
"@types/uuid": ^9.0.0 "@types/uuid": ^9.0.0
@ -4546,7 +4574,7 @@ __metadata:
"@joplin/tools": ~2.10 "@joplin/tools": ~2.10
"@types/fs-extra": 9.0.13 "@types/fs-extra": 9.0.13
"@types/jest": 29.2.4 "@types/jest": 29.2.4
"@types/node": 18.11.15 "@types/node": 18.11.17
fs-extra: 11.1.0 fs-extra: 11.1.0
gh-release-assets: 2.0.1 gh-release-assets: 2.0.1
jest: 29.3.1 jest: 29.3.1
@ -4591,7 +4619,7 @@ __metadata:
"@joplin/fork-htmlparser2": ^4.1.41 "@joplin/fork-htmlparser2": ^4.1.41
"@joplin/fork-uslug": ^1.0.6 "@joplin/fork-uslug": ^1.0.6
"@types/jest": 29.2.4 "@types/jest": 29.2.4
"@types/node": 18.11.15 "@types/node": 18.11.17
font-awesome-filetypes: 2.1.0 font-awesome-filetypes: 2.1.0
fs-extra: 11.1.0 fs-extra: 11.1.0
highlight.js: 11.7.0 highlight.js: 11.7.0
@ -4636,7 +4664,7 @@ __metadata:
"@types/koa": 2.13.5 "@types/koa": 2.13.5
"@types/markdown-it": 12.2.3 "@types/markdown-it": 12.2.3
"@types/mustache": 4.2.2 "@types/mustache": 4.2.2
"@types/nodemailer": 6.4.6 "@types/nodemailer": 6.4.7
"@types/uuid": 9.0.0 "@types/uuid": 9.0.0
"@types/yargs": 17.0.17 "@types/yargs": 17.0.17
"@types/zxcvbn": 4.4.1 "@types/zxcvbn": 4.4.1
@ -4690,7 +4718,7 @@ __metadata:
"@types/fs-extra": 9.0.13 "@types/fs-extra": 9.0.13
"@types/jest": 29.2.4 "@types/jest": 29.2.4
"@types/mustache": 4.2.2 "@types/mustache": 4.2.2
"@types/node": 18.11.15 "@types/node": 18.11.17
"@types/node-fetch": 2.6.2 "@types/node-fetch": 2.6.2
"@types/yargs": 17.0.17 "@types/yargs": 17.0.17
dayjs: 1.11.7 dayjs: 1.11.7
@ -4710,7 +4738,7 @@ __metadata:
relative: 3.0.2 relative: 3.0.2
request: 2.88.2 request: 2.88.2
rss: 1.2.2 rss: 1.2.2
sass: 1.56.2 sass: 1.57.0
sharp: 0.31.2 sharp: 0.31.2
source-map-support: 0.5.21 source-map-support: 0.5.21
sqlite3: 5.1.4 sqlite3: 5.1.4
@ -6319,10 +6347,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@react-native-community/slider@npm:4.3.3": "@react-native-community/slider@npm:4.4.0":
version: 4.3.3 version: 4.4.0
resolution: "@react-native-community/slider@npm:4.3.3" resolution: "@react-native-community/slider@npm:4.4.0"
checksum: 2329dbefd678f848b9660793dff3a2f81ab65880821fbd208d240d1049c875f8dc67cf82218fdb89177ccbf9ac3120974569383e1a4eaf749d921f0076619ead checksum: 61d14a28d28221fea44f9a1e85363af8dbec27459131d26ef8c28a4fa01b8c3718bca6cfb0e7adb34847e2b513493f986f8403cb48425a8777dc8bead69271f8
languageName: node languageName: node
linkType: hard linkType: hard
@ -7147,10 +7175,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:18.11.15": "@types/node@npm:18.11.17":
version: 18.11.15 version: 18.11.17
resolution: "@types/node@npm:18.11.15" resolution: "@types/node@npm:18.11.17"
checksum: cae8692a5cee0316f93ee0342237eb921f70c51afb37c661c711a925a4642654ae7e404c5a80899d481c0cfaff3a6891ef04bacd330a2e72734192bfc91dc2d8 checksum: 1933afd068d5c75c068c6c4df6d10edb3b0b2bb6503d544e2f0496ac007c90596e6a5e284a8ef032451bc16f871b7e46719d7d2bea60e9b25d13a77d52161cac
languageName: node languageName: node
linkType: hard linkType: hard
@ -7161,12 +7189,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/nodemailer@npm:6.4.6": "@types/nodemailer@npm:6.4.7":
version: 6.4.6 version: 6.4.7
resolution: "@types/nodemailer@npm:6.4.6" resolution: "@types/nodemailer@npm:6.4.7"
dependencies: dependencies:
"@types/node": "*" "@types/node": "*"
checksum: c5ba1b83a28eb13778c54333ebe5fdd40555ce6df9dea672acb5682f872e83cae2e538ceeb64c7b064a2c7e7dc836d5a250ec7174795c5a61cb3a3fb90f3dceb checksum: dc2a33a89135e04a5bea4921e8645e8453b90e3c3b05f0646f05071c5951ab697ea49ea1e503a690f04cb0a6abfc54967325c5a4036356793cfbb64ba64fb141
languageName: node languageName: node
linkType: hard linkType: hard
@ -9045,9 +9073,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"aws-sdk@npm:2.1276.0": "aws-sdk@npm:2.1277.0":
version: 2.1276.0 version: 2.1277.0
resolution: "aws-sdk@npm:2.1276.0" resolution: "aws-sdk@npm:2.1277.0"
dependencies: dependencies:
buffer: 4.9.2 buffer: 4.9.2
events: 1.1.1 events: 1.1.1
@ -9059,7 +9087,7 @@ __metadata:
util: ^0.12.4 util: ^0.12.4
uuid: 8.0.0 uuid: 8.0.0
xml2js: 0.4.19 xml2js: 0.4.19
checksum: edbae484c531ea15f26ee41cc1ca42c36c0416be127742ae166ba4d7bf96574310834f1515f19bac8c92cc170cc2db0e70e2b8d71effcdf0a5c4824f161ac2f5 checksum: a6fd08d71d030de39ca181187f3e20c8534ccd1c79b52604e95fb09f50994384b5de31435aa29677ebafbd41d9cee0cae885408a056b970e6ac29ca27812ddd0
languageName: node languageName: node
linkType: hard linkType: hard
@ -15063,12 +15091,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"eslint@npm:8.29.0": "eslint@npm:8.30.0":
version: 8.29.0 version: 8.30.0
resolution: "eslint@npm:8.29.0" resolution: "eslint@npm:8.30.0"
dependencies: dependencies:
"@eslint/eslintrc": ^1.3.3 "@eslint/eslintrc": ^1.4.0
"@humanwhocodes/config-array": ^0.11.6 "@humanwhocodes/config-array": ^0.11.8
"@humanwhocodes/module-importer": ^1.0.1 "@humanwhocodes/module-importer": ^1.0.1
"@nodelib/fs.walk": ^1.2.8 "@nodelib/fs.walk": ^1.2.8
ajv: ^6.10.0 ajv: ^6.10.0
@ -15087,7 +15115,7 @@ __metadata:
file-entry-cache: ^6.0.1 file-entry-cache: ^6.0.1
find-up: ^5.0.0 find-up: ^5.0.0
glob-parent: ^6.0.2 glob-parent: ^6.0.2
globals: ^13.15.0 globals: ^13.19.0
grapheme-splitter: ^1.0.4 grapheme-splitter: ^1.0.4
ignore: ^5.2.0 ignore: ^5.2.0
import-fresh: ^3.0.0 import-fresh: ^3.0.0
@ -15108,7 +15136,7 @@ __metadata:
text-table: ^0.2.0 text-table: ^0.2.0
bin: bin:
eslint: bin/eslint.js eslint: bin/eslint.js
checksum: e05204b05907b82d910983995cb946e0ba62ca514eb2b6791c43f623333b143564a2eee0139909d31c10935c21877d815b1f76dd674a59cb91c471064325c4ab checksum: b7525bb465b342665c3b8bab7e114d514ef1bc4e79f211c919863f9c71767e7412ec82383a22614a92d159783f91101018817000f7c61ce69a5e7015280cafaf
languageName: node languageName: node
linkType: hard linkType: hard
@ -17139,6 +17167,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"globals@npm:^13.19.0":
version: 13.19.0
resolution: "globals@npm:13.19.0"
dependencies:
type-fest: ^0.20.2
checksum: a000dbd00bcf28f0941d8a29c3522b1c3b8e4bfe4e60e262c477a550c3cbbe8dbe2925a6905f037acd40f9a93c039242e1f7079c76b0fd184bc41dcc3b5c8e2e
languageName: node
linkType: hard
"globals@npm:^9.18.0": "globals@npm:^9.18.0":
version: 9.18.0 version: 9.18.0
resolution: "globals@npm:9.18.0" resolution: "globals@npm:9.18.0"
@ -20183,8 +20220,8 @@ __metadata:
"@joplin/tools": ~2.10 "@joplin/tools": ~2.10
"@types/fs-extra": 9.0.13 "@types/fs-extra": 9.0.13
"@types/jest": 29.2.4 "@types/jest": 29.2.4
"@types/node": 18.11.15 "@types/node": 18.11.17
aws-sdk: 2.1276.0 aws-sdk: 2.1277.0
chalk: 4.1.2 chalk: 4.1.2
compare-version: 0.1.2 compare-version: 0.1.2
fs-extra: 11.1.0 fs-extra: 11.1.0
@ -27948,7 +27985,7 @@ __metadata:
"@typescript-eslint/eslint-plugin": 5.46.1 "@typescript-eslint/eslint-plugin": 5.46.1
"@typescript-eslint/parser": 5.46.1 "@typescript-eslint/parser": 5.46.1
cspell: 5.21.2 cspell: 5.21.2
eslint: 8.29.0 eslint: 8.30.0
eslint-interactive: 10.3.0 eslint-interactive: 10.3.0
eslint-plugin-import: 2.26.0 eslint-plugin-import: 2.26.0
eslint-plugin-promise: 6.1.1 eslint-plugin-promise: 6.1.1
@ -28124,16 +28161,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"sass@npm:1.56.2": "sass@npm:1.57.0":
version: 1.56.2 version: 1.57.0
resolution: "sass@npm:1.56.2" resolution: "sass@npm:1.57.0"
dependencies: dependencies:
chokidar: ">=3.0.0 <4.0.0" chokidar: ">=3.0.0 <4.0.0"
immutable: ^4.0.0 immutable: ^4.0.0
source-map-js: ">=0.6.2 <2.0.0" source-map-js: ">=0.6.2 <2.0.0"
bin: bin:
sass: sass.js sass: sass.js
checksum: 7b1f524d04bc42df3bac6dc5201ff7475635b7df9a1390430ed5bd58b6a73ea1ae58b83ccea8da293cb77b85b4c848faf5f2779ca4b91b9303948c251d0ddca4 checksum: fb6358b9541dc7a5bc23dbbae85223e99fbadc1f4ae911e7c32c6e22fd7b617e20a0e8cd1213f23c97c621b067bfb0b9ca45e65d6ce4ca5fea5949f41bd428ed
languageName: node languageName: node
linkType: hard linkType: hard