test

Auto-updated using release-website.sh

.eslintignore

@@ -894,9 +894,9 @@ packages/app-mobile/components/NoteBodyViewer/hooks/useSource.js.map
 packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.d.ts
 packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js
 packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js.map
-packages/app-mobile/components/NoteEditor/CodeMirror/createEditor.d.ts
-packages/app-mobile/components/NoteEditor/CodeMirror/createEditor.js
-packages/app-mobile/components/NoteEditor/CodeMirror/createEditor.js.map
+packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.test.d.ts
+packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.test.js
+packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.test.js.map
 packages/app-mobile/components/NoteEditor/CodeMirror/decoratorExtension.d.ts
 packages/app-mobile/components/NoteEditor/CodeMirror/decoratorExtension.js
 packages/app-mobile/components/NoteEditor/CodeMirror/decoratorExtension.js.map
@@ -927,6 +927,12 @@ packages/app-mobile/components/NoteEditor/CodeMirror/markdownReformatter.test.js
 packages/app-mobile/components/NoteEditor/CodeMirror/syntaxHighlightingLanguages.d.ts
 packages/app-mobile/components/NoteEditor/CodeMirror/syntaxHighlightingLanguages.js
 packages/app-mobile/components/NoteEditor/CodeMirror/syntaxHighlightingLanguages.js.map
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/createEditor.d.ts
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/createEditor.js
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/createEditor.js.map
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/forceFullParse.d.ts
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/forceFullParse.js
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/forceFullParse.js.map
 packages/app-mobile/components/NoteEditor/CodeMirror/theme.d.ts
 packages/app-mobile/components/NoteEditor/CodeMirror/theme.js
 packages/app-mobile/components/NoteEditor/CodeMirror/theme.js.map

.github/workflows/cla.yml

@@ -0,0 +1,36 @@
+name: "CLA Assistant"
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened,closed,synchronize]
+
+jobs:
+  CLAAssistant:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "CLA Assistant"
+        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+        # Beta Release
+        uses: contributor-assistant/github-action@v2.2.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # the below token should have repo scope and must be manually added by you in the repository's secret
+          PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+        with:
+          path-to-signatures: 'readme/cla_signatures.json'
+          path-to-document: 'https://github.com/laurent22/joplin/blob/dev/readme/cla.md' # e.g. a CLA or a DCO document
+          # branch should not be protected
+          branch: 'dev'
+          allowlist: joplinbot,renovate[bot]
+
+         # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
+          #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
+          #remote-repository-name: enter the  remote repository name where the signatures should be stored (Default is storing the signatures in the same repository)
+          #create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
+          #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
+          #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
+          #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
+          #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
+          #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
+          #use-dco-flag: true - If you are using DCO instead of CLA

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

@@ -13,7 +13,8 @@ jobs:
 
   Main:
     needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
+    # We always process server or desktop release tags, because they also publish the release
+    if: needs.pre_job.outputs.should_skip != 'true' || startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/v')
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

.gitignore

@@ -882,9 +882,9 @@ packages/app-mobile/components/NoteBodyViewer/hooks/useSource.js.map
 packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.d.ts
 packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js
 packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js.map
-packages/app-mobile/components/NoteEditor/CodeMirror/createEditor.d.ts
-packages/app-mobile/components/NoteEditor/CodeMirror/createEditor.js
-packages/app-mobile/components/NoteEditor/CodeMirror/createEditor.js.map
+packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.test.d.ts
+packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.test.js
+packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.test.js.map
 packages/app-mobile/components/NoteEditor/CodeMirror/decoratorExtension.d.ts
 packages/app-mobile/components/NoteEditor/CodeMirror/decoratorExtension.js
 packages/app-mobile/components/NoteEditor/CodeMirror/decoratorExtension.js.map
@@ -915,6 +915,12 @@ packages/app-mobile/components/NoteEditor/CodeMirror/markdownReformatter.test.js
 packages/app-mobile/components/NoteEditor/CodeMirror/syntaxHighlightingLanguages.d.ts
 packages/app-mobile/components/NoteEditor/CodeMirror/syntaxHighlightingLanguages.js
 packages/app-mobile/components/NoteEditor/CodeMirror/syntaxHighlightingLanguages.js.map
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/createEditor.d.ts
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/createEditor.js
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/createEditor.js.map
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/forceFullParse.d.ts
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/forceFullParse.js
+packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/forceFullParse.js.map
 packages/app-mobile/components/NoteEditor/CodeMirror/theme.d.ts
 packages/app-mobile/components/NoteEditor/CodeMirror/theme.js
 packages/app-mobile/components/NoteEditor/CodeMirror/theme.js.map

.yarnrc.yml

@@ -6,7 +6,7 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-3.3.0.cjs
+yarnPath: .yarn/releases/yarn-3.3.1.cjs
 
 logFilters:
 

Assets/WebsiteAssets/css/site.css

@@ -954,6 +954,10 @@ footer .bottom-links-row p {
 		display: none;
 	}
 
+	#nav-section a {
+		margin-left: 4px;
+	}
+
 }
 
 /*****************************************************************
@@ -1204,3 +1208,7 @@ footer .bottom-links-row p {
 :lang(zh-cn) .top-section-img-en {
 	display: none;
 }
+
+:lang(zh-cn) #plans-section .faq {
+	display: none;
+}

Assets/WebsiteAssets/locales/zh_CN.po

@@ -1,8 +1,6 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: zh_CN\n"
@@ -11,23 +9,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:192
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:13
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:9
+msgid "/month"
+msgstr "/月"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:19
+msgid "/year"
+msgstr "/年"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:8
+msgid ""
+"<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to "
+"synchronise your notes across devices. It also lets you publish notes, and "
+"collaborate on notebooks with your friends, family or colleagues."
+msgstr ""
+"<a href=\"https://joplincloud.com\">Joplin Cloud</a> 允许您在不同的设备上同步"
+"您的笔记。它还可以让您发布笔记，并与您的朋友、家人或同事在笔记本上进行协作。"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:205
 msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
 msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">定制</span>它 根据您的需要"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:91
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:104
 msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
 msgstr "<span class=\"frame-bg frame-bg-yellow\">多媒体</span>说明"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:256
 msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
 msgstr "百分之百<span class=\"frame-bg frame-bg-yellow-lg\">你的数据</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:271
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:298
 msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
 msgstr "一个<span class=\"frame-bg frame-bg-yellow-lg\">法国</span>的替代方案"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:223
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:236
 msgid ""
 "Access your notes from your computer, phone or tablet by synchronising with "
 "various services, including Joplin Cloud, Dropbox and OneDrive. The app is "
@@ -38,7 +54,13 @@ msgstr ""
 "板电脑访问你的笔记。该应用程序可在Windows、macOS、Linux、Android和iOS上使用。"
 "终端应用也可使用!"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:195
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
+msgid ""
+"Already have a Joplin Cloud account? <a href=\"https://joplincloud.com"
+"\">Login now</a>"
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:208
 msgid ""
 "Customise the app with plugins, custom themes and multiple text editors "
 "(Rich Text or Markdown). Or create your own scripts and plugins using the "
@@ -47,28 +69,28 @@ msgstr ""
 "用插件、自定义主题和多个文本编辑器（富文本或马克顿）来定制该应用程序。或者使"
 "用扩展API创建你自己的脚本和插件。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:229
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:242
 msgid "Download it now"
 msgstr "下载该应用程序"
 
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:112
 #: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:99
 msgid "Download the app"
 msgstr "下载该应用程序"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:200
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:213
 msgid "Find out more"
-msgstr ""
+msgstr "了解更多"
 
 #: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
 msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
 msgstr "释放你的<span class=\"frame-bg frame-bg-blue\">笔记</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:162
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:175
 msgid "Get the clipper"
 msgstr "获取剪子"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:94
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:107
 msgid ""
 "Images, videos, PDFs and audio files are supported. Create math expressions "
 "and diagrams directly from the app. Take photos with the mobile app and save "
@@ -77,10 +99,23 @@ msgstr ""
 "Joplin，由于其起源和设计，适应并尊重中国的标准和规则。这保证了您的使用不受限"
 "制，以及您的使用数据的完全透明和安全。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:288
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:327
 msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
 msgstr ""
 
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:5
+msgid "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">plans</span>"
+msgstr "乔普林云<span class=\"frame-bg frame-bg-yellow\">计划</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:301
+msgid ""
+"Joplin Cloud is based in France. This means your data is protected by strict "
+"European Union privacy laws. In addition, Joplin Cloud implements strong end-"
+"to-end encryption so that not even us can have access to your data."
+msgstr ""
+"Joplin Cloud 位于法国。 这意味着您的数据受到严格的欧盟隐私法的保护。 此外，"
+"Joplin Cloud 实施了强大的端到端加密，因此即使是我们也无法访问您的数据。"
+
 #: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
 msgid ""
 "Joplin is an open source note-taking app. Capture your thoughts and securely "
@@ -88,24 +123,23 @@ msgid ""
 msgstr ""
 "Joplin是一个开源的记事本应用程序。捕捉你的想法并从任何设备上安全地访问它们。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:274
-msgid ""
-"Joplin, due to its origin and design, adapts and respects Chinese standards "
-"and rules. This guarantees your unrestricted use and complete transparency "
-"and security of your usage data."
-msgstr ""
-"Joplin，由于其起源和设计，适应并尊重中国的标准和规则。这保证了您的使用不受限"
-"制，以及您的使用数据的完全透明和安全。"
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:249
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:262
 msgid "More about E2EE"
-msgstr ""
+msgstr "关于E2EE的更多信息"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:352
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:391
 msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:154
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:23
+msgid "Pay Monthly"
+msgstr "月度"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:30
+msgid "Pay Yearly"
+msgstr "每年一次"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:167
 msgid ""
 "Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
 msgstr "保存<span class=\"frame-bg frame-bg-blue\">网页</span> <br>作为笔记"
@@ -114,11 +148,11 @@ msgstr "保存<span class=\"frame-bg frame-bg-blue\">网页</span> <br>作为笔
 msgid "Sign up with Joplin Cloud"
 msgstr "与乔布林云签约"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:355
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:394
 msgid "Thank you for your support!"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:244
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
 msgid ""
 "The app is open source and your notes are saved to an open format, so you'll "
 "always have access to them. Uses End-To-End Encryption (E2EE) to secure your "
@@ -127,34 +161,42 @@ msgstr ""
 "该应用程序是开源的，你的笔记被保存为开放的格式，所以你将永远可以访问它们。使"
 "用端对端加密（E2EE）来保护你的笔记，确保除了你自己之外没有人可以访问它们。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:131
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:144
 msgid "Try it now"
 msgstr "现在就试试吧"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:157
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:170
 msgid ""
 "Use the web clipper extension, available on Chrome and Firefox, to save web "
 "pages or take screenshots as notes."
 msgstr "使用Chrome和Firefox上的web clipper扩展，可以保存网页或截图作为笔记。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:125
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
 msgid ""
 "With Joplin Cloud, share your notes with your friends, family or colleagues "
 "and collaborate on them."
 msgstr "通过乔普林云，与你的朋友、家人或同事分享你的笔记，并进行合作。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:124
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:137
 msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
 msgstr "<span class=\"frame-bg frame-bg-yellow\">一起</span>工作"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:128
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:141
 msgid ""
 "You can also publish a note to the internet and share the URL with others."
-msgstr ""
+msgstr "您还可以将笔记发布到 Internet 并与其他人共享 URL。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:220
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:233
 msgid ""
 "Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you "
 "are"
 msgstr ""
 "你的笔记<span class=\"frame-bg frame-bg-blue-lg\">你在哪里都可以</span>"
+
+#~ msgid ""
+#~ "Joplin, due to its origin and design, adapts and respects Chinese "
+#~ "standards and rules. This guarantees your unrestricted use and complete "
+#~ "transparency and security of your usage data."
+#~ msgstr ""
+#~ "Joplin，由于其起源和设计，适应并尊重中国的标准和规则。这保证了您的使用不受"
+#~ "限制，以及您的使用数据的完全透明和安全。"

Assets/WebsiteAssets/rss.xml

@@ -1,4 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Tue, 15 Nov 2022 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Tue, 15 Nov 2022 00:00:00 GMT</pubDate><item><title><![CDATA[Modernising and securing Joplin, one package at a time]]></title><description><![CDATA[<p>If you watch the <a href="https://github.com/laurent22/joplin">Joplin source code repository</a>, you may have noticed a lot of Renovate pull requests lately. This <a href="https://www.mend.io/free-developer-tools/renovate/">Renovate tool</a> is a way to manage dependencies - it automatically finds what needs to be updated, then upgrade it to the latest version, and create a pull request. If all tests pass, we can then merge this pull request. So far we have merged 267 of these pull requests.</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>Wed, 21 Dec 2022 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Wed, 21 Dec 2022 00:00:00 GMT</pubDate><item><title><![CDATA[Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0)]]></title><description><![CDATA[<p>As was <a href="https://discourse.joplinapp.org/t/rfc-switch-to-agpl-license-for-joplin-server/16529">discussed last year</a>, Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0) for the desktop, mobile and CLI applications, as well as the web clipper.</p>
+<p>Any open source or commercial fork of Joplin will have to license any changes they make under AGPL, and share these changes back with the community. This is the main reason we switch to this license. It allows us to continue releasing the project as open source while ensuring that those who benefit commercially (or not) from it share back their changes.</p>
+<h2>What is the GPL license?<a name="what-is-the-gpl-license" href="#what-is-the-gpl-license" class="heading-anchor">🔗</a></h2>
+<p>The AGPL license is based on the GPL license. This is what tldr;Legal has to say about the GPL license:</p>
+<blockquote>
+<p>You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build &amp; install instructions. (<a href="https://tldrlegal.com/license/gnu-general-public-license-v3-(gpl-3)">source</a>)</p>
+</blockquote>
+<h2>What is the AGPL license?<a name="what-is-the-agpl-license" href="#what-is-the-agpl-license" class="heading-anchor">🔗</a></h2>
+<p>This is the license we'll use for Joplin from now on:</p>
+<blockquote>
+<p>The AGPL license differs from the other GNU licenses in that it was built for network software. You can distribute modified versions if you keep track of the changes and the date you made them. As per usual with GNU licenses, you must license derivatives under AGPL. It provides the same restrictions and freedoms as the GPLv3 but with an additional clause which makes it so that source code must be distributed along with web publication. Since web sites and services are never distributed in the traditional sense, the AGPL is the GPL of the web. (<a href="https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)">source</a>)</p>
+</blockquote>
+<h2>What does it change for users?<a name="what-does-it-change-for-users" href="#what-does-it-change-for-users" class="heading-anchor">🔗</a></h2>
+<p>There is no changes for users of Joplin - the apps remain open sources and you can still use them freely.</p>
+<h2>What does it change for developers?<a name="what-does-it-change-for-developers" href="#what-does-it-change-for-developers" class="heading-anchor">🔗</a></h2>
+<p>Any code you develop for Joplin will also remain open source. The only difference is that we'll ask to sign an Individual Contributor License Agreement (CLA) to ensure that the copyright of the entire codebase remains with the Joplin organisation. This is necessary so that if we ever want to change the license again we are able to do so without having to get the agreement of each individual contributor afterwards (which would be nearly impossible).</p>
+<p>This is a bit of an extra constraint but it is hard to avoid. Contributor License Agreements are very common for GPL or AGPL projects. For example Apache, Canonical or Python all require their contributors to sign a CLA.</p>
+<h2>Questions?<a name="questions" href="#questions" class="heading-anchor">🔗</a></h2>
+<p>If you have any questions please let us know. Overall we believe this is a positive improvements for Joplin as it means any work derives from it will also benefit the project.</p>
+]]></description><link>https://joplinapp.org/news/20221221-agpl/</link><guid isPermaLink="false">20221221-agpl</guid><pubDate>Wed, 21 Dec 2022 00:00:00 GMT</pubDate><twitter-text>Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0)</twitter-text></item><item><title><![CDATA[What's new in Joplin 2.9]]></title><description><![CDATA[<h2>Proxy support<a name="proxy-support" href="#proxy-support" class="heading-anchor">🔗</a></h2>
+<p>Both the desktop and mobile application now support proxies thanks to the work of Jason Williams. This will allow you to use the apps in particular when you are behind a company proxy.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20221216-proxy-support.png" alt=""></p>
+<h2>New PDF viewer<a name="new-pdf-viewer" href="#new-pdf-viewer" class="heading-anchor">🔗</a></h2>
+<p>The desktop application now features a new PDF viewer thanks to the work of Asrient during GSoC.</p>
+<p>The main advantage for now is that this viewer preserves the last PDF page that was read. In the next version, the viewer will also include a way to annotate PDF files.</p>
+<h2>Multi-language spell checking<a name="multi-language-spell-checking" href="#multi-language-spell-checking" class="heading-anchor">🔗</a></h2>
+<p>The desktop app include a multi-language spell checking features, which allows you, for example, to spell-check notes in your native language and in English.</p>
+<h2>New mobile text editor<a name="new-mobile-text-editor" href="#new-mobile-text-editor" class="heading-anchor">🔗</a></h2>
+<p>Writing formatted notes on mobile has always been cumbersome due to the need to enter special format characters like <code>*</code> or <code>[</code>, etc.</p>
+<p>Thanks to the work of Henry Heino during GSoC, writing notes on the go is now easier thanks to an improved Markdown editor.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20221216-mobile-beta-editor.png" alt=""></p>
+<p>The most visible feature is the addition of a toolbar, which helps input those special characters, like on desktop.</p>
+<p>Moreover Henry made a lot of subtle but useful improvements to the editor, for example to improve the note appearance, to improve list continuation, etc. Search within a note is now also supported as well as spell-checking.</p>
+<p>At a more technical level, Henry also added many test units to ensure that the editor remains robust and reliable.</p>
+<p>To enable the feature, go to the configuration screen and selected &quot;Opt-in to the editor beta&quot;. It is already very stable so we will probably promote it to be the main editor from the next version.</p>
+<h2>Improved alignment of notebook icons<a name="improved-alignment-of-notebook-icons" href="#improved-alignment-of-notebook-icons" class="heading-anchor">🔗</a></h2>
+<p>Previously, when you would assign an icon to a notebook, it would shift the title to the right, but notebook without an icon would not. It means that notebooks with and without an icon would not be vertically aligned.</p>
+<p>To tidy things up, this new version adds a default icons to notebooks without an explicitly assigned icon. This result in the notebook titles being correctly vertically aligned.</p>
+<p>Note that this feature is only enabled if you use custom icons - otherwise it will simply display the notebook titles without any default icons, as before.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20221216-notebook-icons.png" alt=""></p>
+<h2>Improved handling of file attachments<a name="improved-handling-of-file-attachments" href="#improved-handling-of-file-attachments" class="heading-anchor">🔗</a></h2>
+<p>Self Not Found made a number of small but useful improvements to attachment handling, including increasing the maximum size to 200MB, adding support for attaching multiple files, and fixing issues with synchronising attachments via proxy.</p>
+<h2>Fixed filesystem sync on mobile<a name="fixed-filesystem-sync-on-mobile" href="#fixed-filesystem-sync-on-mobile" class="heading-anchor">🔗</a></h2>
+<p>This was a long and complex change due to the need to support new Android APIs but hopefully that should now be working again, thanks to the work of jd1378.</p>
+<p>So you can now sync again your notes with Syncthing and other file-based synchronisation systems.</p>
+<h2>And more...<a name="and-more" href="#and-more" class="heading-anchor">🔗</a></h2>
+<p>In total this new desktop version includes 36 improvements, bug fixes, and security fixes.</p>
+<p>As always, a lot of work went into the Android and iOS app too, which include 37 improvements, bug fixes, and security fixes.</p>
+<p>See here for the changelogs:</p>
+<ul>
+<li><a href="https://joplinapp.org/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>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>If you're interested please contact us at job-AT-joplin.cloud</p>
+<p>No agencies please.</p>
+]]></description><link>https://joplinapp.org/news/20221209-job/</link><guid isPermaLink="false">20221209-job</guid><pubDate>Fri, 09 Dec 2022 00:00:00 GMT</pubDate><twitter-text>Joplin is hiring!</twitter-text></item><item><title><![CDATA[Modernising and securing Joplin, one package at a time]]></title><description><![CDATA[<p>If you watch the <a href="https://github.com/laurent22/joplin">Joplin source code repository</a>, you may have noticed a lot of Renovate pull requests lately. This <a href="https://www.mend.io/free-developer-tools/renovate/">Renovate tool</a> is a way to manage dependencies - it automatically finds what needs to be updated, then upgrade it to the latest version, and create a pull request. If all tests pass, we can then merge this pull request. So far we have merged 267 of these pull requests.</p>
 <p>Updating Joplin packages was long due. It is necessary so that we don't fall behind and end up using unsupported or deprecated packages. We also benefit from bug fixes and performance improvements. It is also important in terms of security, since recent package versions usually include various security fixes.</p>
 <p>We used to rely on a tool called &quot;npm audit&quot; to do this, however it no longer works on the Joplin codebase, and it was always risky to use it since it would update multiple packages in one command - so if something went wrong it was difficult to find the culprit.</p>
 <p>Renovate on the other hand upgrades packages one at a time, and run our test units to ensure everything is still working as expected. It also upgrades multiple instances of the same package across the monorepo, which is convenient to keep our code consistent. It also has a number of options to make our life easier, such as the ability to automatically merge a pull request for patch releases since this is usually safe (when a package is, for example upgraded from 1.0.1 to 1.0.3).</p>
@@ -230,29 +293,4 @@
 <p>Of course Joplin still supports other sync options such as Nextcloud, Dropbox and OneDrive or AWS S3. You can also self host using Joplin Server. The advantage of Joplin Cloud being that you don't need to maintain a server yourself - for a small fee you'll get that taken care of.</p>
 <p>Additionally, subscribing to Joplin Cloud is a great way to support the project as a whole, including the open source applications. Such support is needed in the long term to provide bug and security fixes, add new features, and provide support.</p>
 <p>At some level it is also an experiment, to see if such a service is financially viable and can allow me to work full time on the project. This is certainly something I would like, and perhaps Joplin Cloud combined with your donations will allow that.</p>
-]]></description><link>https://joplinapp.org/news/20210831-154354/</link><guid isPermaLink="false">20210831-154354</guid><pubDate>Tue, 31 Aug 2021 15:43:54 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[How to start your subscription if you have a free Joplin Cloud Beta account]]></title><description><![CDATA[<p>For anyone with a beta account, if you would like to keep using it after the end of the trial period, there is now a button to do this from the Joplin Cloud home page:</p>
-<img height="222" src="https://aws1.discourse-cdn.com/standard14/uploads/cozic/optimized/2X/e/e2b54352d0e401e692a75817f6faa0432322c405_2_517x222.png" width="517">
-<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>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>
-<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><item><title><![CDATA[The Jopin Cloud beta is now closed]]></title><description><![CDATA[<p>The beta program helped narrow down a few issues and should make Joplin Cloud (and Joplin Server) more reliable. More precisely:</p>
-<ul>
-<li>
-<p>About 7 bugs have been fixed, including two major ones regarding sharing, and one security issue.</p>
-</li>
-<li>
-<p>About a dozen improvements, new features and optimisations have been added following your feedback.</p>
-</li>
-</ul>
-<p>As promised if you have a beta account you can keep using it and it will remain free for the three months after the account was created. After that, you will receive a link to start the Stripe subscription if you wish to keep using the account.</p>
-<p>If you have sent me an email before the end of the beta and I didn't reply yet, I will do so soon, and will send you the confirmation email.</p>
-<p>Thanks everyone for participating!</p>
-]]></description><link>https://joplinapp.org/news/20210718-103538/</link><guid isPermaLink="false">20210718-103538</guid><pubDate>Sun, 18 Jul 2021 10:35:38 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>
+]]></description><link>https://joplinapp.org/news/20210831-154354/</link><guid isPermaLink="false">20210831-154354</guid><pubDate>Tue, 31 Aug 2021 15:43:54 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>

Assets/WebsiteAssets/templates/front.mustache

@@ -280,14 +280,40 @@
 			<div id="made-in-france-section" class="blue-bg">
 				<div class="container">
 					<div class="row">
-						<div class="col-12">
-							<h2 translate class="text-center">
-								A <span class="frame-bg frame-bg-yellow-lg">French</span> Alternative
-							</h2>
-							<p translate class="text-center">
-								Joplin, due to its origin and design, adapts and respects Chinese standards and rules. This guarantees your unrestricted use and complete transparency and security of your usage data.
-							</p>
-							<br /><br /><br /><br />
+						<div class="d-none d-md-block col-md-6">
+							<br />
+							<br />
+							<br />
+							<img
+								src="{{imageBaseUrl}}/made-in-france.png"
+								alt=""
+								class="img-fluid"
+							/>
+							<br />
+							<br />
+							<br />
+						</div>
+						<div class="col-12 col-md-6">
+							<div class="ml-30 ml-mobile-0">
+								<h2 translate id="customise-it-title">
+									A <span class="frame-bg frame-bg-yellow-lg">French</span> Alternative
+								</h2>
+								<p translate>
+									Joplin Cloud is based in France. This means your data is protected by strict European Union privacy laws. In addition, Joplin Cloud implements strong end-to-end encryption so that not even us can have access to your data.
+								</p>
+								<br />
+								<br />
+								<br />
+								<br class="d-block d-lg-none" />
+								<br class="d-block d-lg-none" />
+								<img
+									src="{{imageBaseUrl}}/made-in-france.png"
+									alt=""
+									class="img-fluid d-block d-md-none"
+								/>
+								<br />
+								<br />
+							</div>
 						</div>
 					</div>
 				</div>

Assets/WebsiteAssets/templates/partials/navbar.mustache

@@ -16,6 +16,7 @@
 				<a href="{{baseUrl}}/news/" class="fw500">News</a>
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
+				<a href="{{baseUrl}}/cn/" class="fw500">中文</a>
 				{{#showJoplinCloudLinks}}
 					{{> joplinCloudButton}}
 				{{/showJoplinCloudLinks}}
@@ -23,6 +24,7 @@
 			</div>
 			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
 				{{> twitterLink}}
+				<a href="{{baseUrl}}/cn/" class="fw500">中文</a>
 				{{> supportButton}}
 
 				<span class="pointer"

Assets/WebsiteAssets/templates/partials/plan.mustache

@@ -6,17 +6,17 @@
 			</div>
 
 			<div class="plan-price plan-price-monthly">
-				{{priceMonthly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month{{#footnote}} (*){{/footnote}}</sub>
+				{{priceMonthly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;<span translate>/month</span>{{#footnote}} (*){{/footnote}}</sub>
 			</div>
 
 			<div class="plan-price plan-price-yearly">
-				{{priceYearly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month{{#footnote}} (*){{/footnote}}</sub>
+				{{priceYearly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;<span translate>/month</span>{{#footnote}} (*){{/footnote}}</sub>
 			</div>
 		</div>
 
 		<div class="plan-price-yearly-per-year">
 			<div>
-				({{priceYearly.formattedAmount}}<sub class="per-year">&nbsp;/year</sub>)
+				({{priceYearly.formattedAmount}}<sub class="per-year">&nbsp;<span translate>/year</span></sub>)
 			</div>
 		</div>
 

Assets/WebsiteAssets/templates/plans.mustache

@@ -2,10 +2,10 @@
 	<div class="container">
 		<div class="row">
 			<div class="col-12 title-box">
-				<h1 class="text-center">
+				<h1 translate class="text-center">
 					Joplin Cloud <span class="frame-bg frame-bg-yellow">plans</span>
 				</h1>
-				<p class="text-center sub-title">
+				<p translate class="text-center sub-title">
 					<a href="https://joplincloud.com">Joplin Cloud</a> allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues.
 				</p>
 			</div>
@@ -20,14 +20,14 @@
 		<div style="display: flex; justify-content: center; margin-top: 1.2em">	
 			<div class="form-check form-check-inline">
 				<input id="pay-monthly-radio" class="form-check-input" type="radio" name="pay-radio" checked value="monthly">
-				<label style="font-weight: bold" class="form-check-label" for="pay-monthly-radio">
+				<label translate style="font-weight: bold" class="form-check-label" for="pay-monthly-radio">
 					Pay Monthly
 				</label>
 			</div>
 
 			<div class="form-check form-check-inline">
 				<input id="pay-yearly-radio" class="form-check-input" type="radio" name="pay-radio" value="yearly">
-				<label style="font-weight: bold" class="form-check-label" for="pay-yearly-radio">
+				<label translate style="font-weight: bold" class="form-check-label" for="pay-yearly-radio">
 					Pay Yearly
 				</label>
 			</div>	
@@ -46,7 +46,7 @@
 				{{> plan}}
 			{{/plans.teams}}
 
-			<p class="joplin-cloud-login-info">Already have a Joplin Cloud account? <a href="https://joplincloud.com">Login now</a></p>
+			<p translate class="joplin-cloud-login-info">Already have a Joplin Cloud account? <a href="https://joplincloud.com">Login now</a></p>
 		</div>
 
 		<div class="row">
@@ -59,7 +59,7 @@
 			</div>
 		</div>
 
-		<div class="row">
+		<div class="row faq">
 			{{{faqHtml}}}
 		</div>
 	</div>

Assets/WebsiteAssets/website.pot

@@ -2,40 +2,57 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:192
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:13
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:9
+msgid "/month"
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:19
+msgid "/year"
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:8
+msgid "<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues."
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:205
 msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:91
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:104
 msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:256
 msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:271
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:298
 msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:223
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:236
 msgid "Access your notes from your computer, phone or tablet by synchronising with various services, including Joplin Cloud, Dropbox and OneDrive. The app is available on Windows, macOS, Linux, Android and iOS. A terminal app is also available!"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:195
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
+msgid "Already have a Joplin Cloud account? <a href=\"https://joplincloud.com\">Login now</a>"
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:208
 msgid "Customise the app with plugins, custom themes and multiple text editors (Rich Text or Markdown). Or create your own scripts and plugins using the Extension API."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:229
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:242
 msgid "Download it now"
 msgstr ""
 
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:112
 #: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:99
 msgid "Download the app"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:200
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:213
 msgid "Find out more"
 msgstr ""
 
@@ -43,35 +60,47 @@ msgstr ""
 msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:162
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:175
 msgid "Get the clipper"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:94
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:107
 msgid "Images, videos, PDFs and audio files are supported. Create math expressions and diagrams directly from the app. Take photos with the mobile app and save them to a note."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:288
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:327
 msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
 msgstr ""
 
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:5
+msgid "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">plans</span>"
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:301
+msgid "Joplin Cloud is based in France. This means your data is protected by strict European Union privacy laws. In addition, Joplin Cloud implements strong end-to-end encryption so that not even us can have access to your data."
+msgstr ""
+
 #: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
 msgid "Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:274
-msgid "Joplin, due to its origin and design, adapts and respects Chinese standards and rules. This guarantees your unrestricted use and complete transparency and security of your usage data."
-msgstr ""
-
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:249
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:262
 msgid "More about E2EE"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:352
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:391
 msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:154
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:23
+msgid "Pay Monthly"
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:30
+msgid "Pay Yearly"
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:167
 msgid "Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
 msgstr ""
 
@@ -79,34 +108,34 @@ msgstr ""
 msgid "Sign up with Joplin Cloud"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:355
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:394
 msgid "Thank you for your support!"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:244
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
 msgid "The app is open source and your notes are saved to an open format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but yourself can access them."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:131
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:144
 msgid "Try it now"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:157
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:170
 msgid "Use the web clipper extension, available on Chrome and Firefox, to save web pages or take screenshots as notes."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:125
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
 msgid "With Joplin Cloud, share your notes with your friends, family or colleagues and collaborate on them."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:124
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:137
 msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:128
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:141
 msgid "You can also publish a note to the internet and share the URL with others."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:220
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:233
 msgid "Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you are"
 msgstr ""

CONTRIBUTING.md

@@ -43,6 +43,10 @@ If you want to start contributing to the project's code, please follow these gui
 
 Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/dev/BUILD.md) for more details.
 
+## Signing the Individual Contributor License Agreement
+
+All contributors to the project must sign our [Individual Contributor License Agreement](https://github.com/laurent22/joplin/blob/dev/readme/cla.md).
+
 ## Coding style
 
 Please see [readme/coding_style.md](readme/coding_style.md).

Joplin_install_and_update.sh

@@ -201,20 +201,22 @@ fi
 # If a new environment needs to be supported, then the command check section should be re-thought
 if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.*|.*i3.*|.*sway.* ]] || [[ `command -v update-desktop-database` ]]
 then
+    DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
+    DESKTOP_FILE_LOCATION="$DATA_HOME/applications"
     # Only delete the desktop file if it will be replaced
-    rm -f ~/.local/share/applications/appimagekit-joplin.desktop
+    rm -f "$DESKTOP_FILE_LOCATION/appimagekit-joplin.desktop"
 
     # On some systems this directory doesn't exist by default
-    mkdir -p ~/.local/share/applications
+    mkdir -p "$DESKTOP_FILE_LOCATION"
     
     # Tabs specifically, and not spaces, are needed for indentation with Bash heredocs
-    cat >> ~/.local/share/applications/appimagekit-joplin.desktop <<-EOF
+    cat >> "$DESKTOP_FILE_LOCATION/appimagekit-joplin.desktop" <<-EOF
 	[Desktop Entry]
 	Encoding=UTF-8
 	Name=Joplin
 	Comment=Joplin for Desktop
 	Exec=${HOME}/.joplin/Joplin.AppImage ${SANDBOXPARAM} %u
-	Icon=joplin
+	Icon=@joplinapp-desktop
 	StartupWMClass=Joplin
 	Type=Application
 	Categories=Office;
@@ -224,7 +226,7 @@ then
 	EOF
     
     # Update application icons
-    [[ `command -v update-desktop-database` ]] && update-desktop-database ~/.local/share/applications && update-desktop-database ~/.local/share/icons
+    [[ `command -v update-desktop-database` ]] && update-desktop-database "$DESKTOP_FILE_LOCATION" && update-desktop-database "$DATA_HOME/icons"
     print "${COLOR_GREEN}OK${COLOR_RESET}"
 else
     print "${COLOR_RED}NOT DONE, unknown desktop '${DESKTOP}'${COLOR_RESET}"

LICENSE

@@ -1,12 +1,13 @@
-All code in this repository is licensed under the MIT License **unless a
-directory contains a LICENSE or LICENSE.md file**, in which case that file
-applies to the code in that sub-directory.
+All code in this repository is licensed under the AGPL-3.0-or-later License
+**unless a directory contains a LICENSE or LICENSE.md file**, in which case that
+file applies to the code in that sub-directory.
 
 For example, packages/server contains a LICENSE.md file, thus all code under the
 packages/server directory is licensed under that license.
 
 For example, packages/app-cli does NOT contain a LICENSE file, thus all code
-under that directory is licensed under the default license, which is MIT.
+under that directory is licensed under the default license, which is
+AGPL-3.0-or-later.
 
 * * *
 
@@ -23,23 +24,8 @@ icons please contact the author in order to get a permission.
 
 * * *
 
-MIT License
+AGPL-3.0-or-later License
 
 Copyright (c) 2016-2022 Laurent Cozic
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+https://spdx.org/licenses/AGPL-3.0-or-later.html

README.md

@@ -22,11 +22,11 @@ Three types of applications are available: for **desktop** (Windows, macOS and L
 
 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>
-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>
-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>
+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.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.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:
 
@@ -530,47 +530,47 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  84%
-<img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  24%
-<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  60%
-<img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  47%
-<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  [Xavi Ivars](mailto:xavi.ivars@gmail.com)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  81%
-<img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  ERYpTION  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [MrKanister](mailto:pueblos_spatulas@aleeas.com)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  46%
+<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  82%
+<img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  23%
+<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  59%
+<img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  46%
+<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  [Xavi Ivars](mailto:xavi.ivars@gmail.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  79%
+<img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  ERYpTION  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [MrKanister](mailto:pueblos_spatulas@aleeas.com)  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  45%
 <img src="https://joplinapp.org/images/flags/country-4x3/gb.png" width="16px"/>  |  English (United Kingdom)  |  [en_GB](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po)  |    |  100%
 <img src="https://joplinapp.org/images/flags/country-4x3/us.png" width="16px"/>  |  English (United States of America)  |  [en_US](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po)  |    |  100%
-<img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  92%
-<img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  27%
-<img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato0  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  100%
+<img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  91%
+<img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  26%
+<img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato0  |  98%
+<img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  98%
 <img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  30%
-<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [Wisnu Adi Santoso](mailto:waditos@gmail.com)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Albano Battistella](mailto:albano_battistella@hotmail.com)  |  81%
-<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  81%
-<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  82%
-<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MHolkamp](mailto:mholkamp@users.noreply.github.com)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  58%
-<img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [X3NO](mailto:X3NO@disroot.org)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Renato Nunes Bastos](mailto:rnbastos@gmail.com)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  76%
-<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  53%
-<img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  84%
-<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [Wisnu Adi Santoso](mailto:waditos@gmail.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Albano Battistella](mailto:albano_battistella@hotmail.com)  |  80%
+<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  80%
+<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  81%
+<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MHolkamp](mailto:mholkamp@users.noreply.github.com)  |  91%
+<img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  91%
+<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  57%
+<img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [X3NO](mailto:X3NO@disroot.org)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Renato Nunes Bastos](mailto:rnbastos@gmail.com)  |  91%
+<img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  75%
+<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  52%
+<img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  83%
+<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  99%
 <img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  38%
-<img src="https://joplinapp.org/images/flags/country-4x3/vn.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  82%
-<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  76%
-<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  92%
-<img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  84%
-<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  68%
-<img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [KaneGreen](mailto:737445366KG@Gmail.com)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Kevin Hsu](mailto:kevin.hsu.hws@gmail.com)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/vn.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  80%
+<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  75%
+<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  91%
+<img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  83%
+<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  67%
+<img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [KaneGreen](mailto:737445366KG@Gmail.com)  |  97%
+<img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Kevin Hsu](mailto:kevin.hsu.hws@gmail.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  92%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 
 # Contributors

package.json

@@ -55,7 +55,7 @@
     "updateIgnored": "gulp updateIgnoredTypeScriptBuild",
     "updatePluginTypes": "./packages/generator-joplin/updateTypes.sh",
     "watch": "yarn workspaces foreach --parallel --verbose --interlaced --jobs 999 run watch",
-    "watchWebsite": "nodemon --verbose --watch Assets/WebsiteAssets --watch packages/tools/website/build.js --ext md,ts,js,mustache,css,tsx,gif,png,svg --exec \"node packages/tools/website/build.js && http-server --port 8077 ../joplin-website/docs -a localhost\""
+    "watchWebsite": "nodemon --verbose --watch Assets/WebsiteAssets --watch packages/tools/website --watch packages/tools/website/utils --ext md,ts,js,mustache,css,tsx,gif,png,svg --exec \"node packages/tools/website/build.js && http-server --port 8077 ../joplin-website/docs -a localhost\""
   },
   "husky": {
     "hooks": {
@@ -64,31 +64,31 @@
   },
   "devDependencies": {
     "@seiyab/eslint-plugin-react-hooks": "4.5.1-beta.0",
-    "@typescript-eslint/eslint-plugin": "5.43.0",
-    "@typescript-eslint/parser": "5.43.0",
+    "@typescript-eslint/eslint-plugin": "5.47.0",
+    "@typescript-eslint/parser": "5.47.0",
     "cspell": "5.21.2",
-    "eslint": "8.28.0",
-    "eslint-interactive": "10.2.0",
+    "eslint": "8.30.0",
+    "eslint-interactive": "10.3.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-react": "7.31.11",
-    "fs-extra": "10.1.0",
+    "fs-extra": "11.1.0",
     "glob": "8.0.3",
     "gulp": "4.0.2",
     "husky": "3.1.0",
     "lerna": "3.22.1",
-    "lint-staged": "13.0.3",
+    "lint-staged": "13.1.0",
     "madge": "5.0.1",
     "typedoc": "0.17.8",
-    "typescript": "4.9.3"
+    "typescript": "4.9.4"
   },
   "dependencies": {
     "@types/fs-extra": "9.0.13",
     "http-server": "14.1.1",
-    "node-gyp": "9.3.0",
+    "node-gyp": "9.3.1",
     "nodemon": "2.0.20"
   },
-  "packageManager": "yarn@3.3.0",
+  "packageManager": "yarn@3.3.1",
   "resolutions": {
     "joplin-rn-alarm-notification@1.0.5": "patch:joplin-rn-alarm-notification@npm:1.0.5#.yarn/patches/joplin-rn-alarm-notification-npm-1.0.5-662e871c03"
   }

packages/app-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "joplin",
   "description": "Joplin CLI Client",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "author": "Laurent Cozic",
   "private": true,
   "scripts": {
@@ -34,18 +34,18 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "2.9.1",
+  "version": "2.10.0",
   "bin": "./main.js",
   "engines": {
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "~2.9",
-    "@joplin/renderer": "~2.9",
-    "aws-sdk": "2.1258.0",
+    "@joplin/lib": "~2.10",
+    "@joplin/renderer": "~2.10",
+    "aws-sdk": "2.1279.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
-    "fs-extra": "10.1.0",
+    "fs-extra": "11.1.0",
     "html-entities": "1.4.0",
     "image-type": "3.1.0",
     "keytar": "7.9.0",
@@ -57,7 +57,7 @@
     "server-destroy": "1.0.1",
     "sharp": "0.31.2",
     "sprintf-js": "1.1.2",
-    "sqlite3": "5.1.2",
+    "sqlite3": "5.1.4",
     "string-padding": "1.0.2",
     "strip-ansi": "6.0.1",
     "tcp-port-used": "1.0.2",
@@ -68,13 +68,13 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@joplin/tools": "~2.9",
+    "@joplin/tools": "~2.10",
     "@types/fs-extra": "9.0.13",
-    "@types/jest": "29.2.3",
-    "@types/node": "18.11.9",
+    "@types/jest": "29.2.4",
+    "@types/node": "18.11.17",
     "gulp": "4.0.2",
     "jest": "29.3.1",
     "temp": "0.9.4",
-    "typescript": "4.9.3"
+    "typescript": "4.9.4"
   }
 }

packages/app-cli/tests/html_to_html/sanitize.dest.html

@@ -1,2 +1,2 @@
-<img src=""/>
-<img src=""/>
+<img src/>
+<img src/>

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

@@ -1,2 +1,2 @@
-<img src="" class="jop-noMdConv"/>
-<img src="" class="jop-noMdConv"/>
+<img src class="jop-noMdConv"/>
+<img src class="jop-noMdConv"/>

packages/app-clipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "2.9.0",
+    "version": "2.10.0",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": "script-src 'self'; object-src 'self'",

packages/app-clipper/package.json

@@ -8,5 +8,5 @@
   "description": "Joplin Web Clipper",
   "main": "main.js",
   "author": "Laurent Cozic",
-  "license": "MIT"
+  "license": "AGPL-3.0-or-later"
 }

packages/app-desktop/gui/MainScreen/commands/openItem.ts

@@ -16,8 +16,13 @@ export const runtime = (): CommandRuntime => {
 			if (!link) throw new Error('Link cannot be empty');
 
 			if (link.startsWith('joplin://') || link.startsWith(':/')) {
-				const { itemId, hash } = parseResourceUrl(link);
-				await openItemById(itemId, context.dispatch, hash);
+				const parsedUrl = parseResourceUrl(link);
+				if (parsedUrl) {
+					const { itemId, hash } = parsedUrl;
+					await openItemById(itemId, context.dispatch, hash);
+				} else {
+					void require('electron').shell.openExternal(link);
+				}
 			} else if (urlProtocol(link)) {
 				if (link.indexOf('file://') === 0) {
 					// When using the file:// protocol, openPath doesn't work (does

packages/app-desktop/gui/note-viewer/index.html

@@ -158,19 +158,23 @@
 
 			for (let i = 0; i < assets.length; 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;
 				pluginAssetsAdded_[assetId] = true;
 
 				if (asset.mime === 'application/javascript') {
 					const script = document.createElement('script');
-					script.src = asset.path;
+					script.src = encodedPath;
 					pluginAssetsContainer.appendChild(script);
 				} else if (asset.mime === 'text/css') {
 					const link = document.createElement('link');
 					link.rel = 'stylesheet';
-					link.href = asset.path;
+					link.href = encodedPath
 					pluginAssetsContainer.appendChild(link);
 				}
 			}

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.9.17",
+  "version": "2.10.2",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,
@@ -20,7 +20,7 @@
     "url": "git+https://github.com/laurent22/joplin.git"
   },
   "author": "Laurent Cozic",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/laurent22/joplin/issues"
   },
@@ -95,7 +95,7 @@
       "icon": "../../Assets/LinuxIcons",
       "category": "Office",
       "desktop": {
-        "Icon": "joplin",
+        "Icon": "@joplinapp-desktop",
         "MimeType": "x-scheme-handler/joplin;"
       },
       "target": "AppImage"
@@ -106,10 +106,10 @@
   },
   "homepage": "https://github.com/laurent22/joplin#readme",
   "devDependencies": {
-    "@joplin/tools": "~2.9",
+    "@joplin/tools": "~2.10",
     "@testing-library/react-hooks": "8.0.1",
-    "@types/jest": "29.2.3",
-    "@types/node": "18.11.9",
+    "@types/jest": "29.2.4",
+    "@types/node": "18.11.17",
     "@types/react": "16.14.34",
     "@types/react-redux": "7.1.24",
     "@types/styled-components": "5.1.26",
@@ -126,7 +126,7 @@
     "js-sha512": "0.8.0",
     "nan": "2.17.0",
     "react-test-renderer": "18.2.0",
-    "typescript": "4.9.3"
+    "typescript": "4.9.4"
   },
   "optionalDependencies": {
     "7zip-bin-linux": "^1.0.1",
@@ -134,12 +134,12 @@
     "7zip-bin-win": "^2.1.1"
   },
   "dependencies": {
-    "@electron/remote": "2.0.8",
+    "@electron/remote": "2.0.9",
     "@fortawesome/fontawesome-free": "5.15.4",
     "@joeattardi/emoji-button": "4.6.4",
-    "@joplin/lib": "~2.9",
-    "@joplin/pdf-viewer": "~2.9",
-    "@joplin/renderer": "~2.9",
+    "@joplin/lib": "~2.10",
+    "@joplin/pdf-viewer": "~2.10",
+    "@joplin/renderer": "~2.10",
     "async-mutex": "0.4.0",
     "codemirror": "5.65.9",
     "color": "3.2.1",
@@ -148,8 +148,8 @@
     "debounce": "1.2.1",
     "electron-window-state": "5.0.3",
     "formatcoords": "1.1.3",
-    "fs-extra": "10.1.0",
-    "highlight.js": "11.6.0",
+    "fs-extra": "11.1.0",
+    "highlight.js": "11.7.0",
     "immer": "7.0.15",
     "keytar": "7.9.0",
     "mark.js": "8.11.1",
@@ -164,14 +164,14 @@
     "react-datetime": "3.2.0",
     "react-dom": "18.2.0",
     "react-redux": "8.0.5",
-    "react-select": "5.6.1",
+    "react-select": "5.7.0",
     "react-toggle-button": "2.2.0",
-    "react-tooltip": "4.5.0",
+    "react-tooltip": "4.5.1",
     "redux": "4.2.0",
     "reselect": "4.1.7",
     "roboto-fontface": "0.10.0",
     "smalltalk": "4.1.1",
-    "sqlite3": "5.1.2",
+    "sqlite3": "5.1.4",
     "styled-components": "5.3.6",
     "styled-system": "5.1.5",
     "taboverride": "4.0.3",

packages/app-mobile/android/app/build.gradle

@@ -147,7 +147,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 		versionCode 2097676
-		versionName "2.9.8"
+		versionName "2.10.0"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}

packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.test.ts

@@ -0,0 +1,46 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { EditorSettings } from '../types';
+import { initCodeMirror } from './CodeMirror';
+import { themeStyle } from '@joplin/lib/theme';
+import Setting from '@joplin/lib/models/Setting';
+import { forceParsing } from '@codemirror/language';
+
+
+const createEditorSettings = (themeId: number) => {
+	const themeData = themeStyle(themeId);
+	const editorSettings: EditorSettings = {
+		katexEnabled: true,
+		spellcheckEnabled: true,
+		themeId,
+		themeData,
+	};
+
+	return editorSettings;
+};
+
+describe('CodeMirror', () => {
+	it('should give headings a different style', async () => {
+		const headerLineText = '# Testing...';
+		const initialText = `${headerLineText}\nThis is a test.`;
+		const editorSettings = createEditorSettings(Setting.THEME_LIGHT);
+
+		const editor = initCodeMirror(document.body, initialText, editorSettings);
+
+		// Force the generation of the syntax tree now.
+		forceParsing(editor.editor);
+
+		// CodeMirror nests the tag that styles the header within .cm-headerLine:
+		//  <div class='cm-headerLine'><span class='someclass'>Testing...</span></div>
+		const headerLineContent = document.body.querySelector('.cm-headerLine > span')!;
+
+
+		expect(headerLineContent.textContent).toBe(headerLineText);
+
+		const style = getComputedStyle(headerLineContent);
+		expect(style.borderBottom).not.toBe('');
+		expect(style.fontSize).toBe('1.6em');
+	});
+});

packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.ts

@@ -45,9 +45,14 @@ import {
 	toggleList, toggleMath, updateLink,
 } from './markdownCommands';
 
+
+interface CodeMirrorResult extends CodeMirrorControl {
+	editor: EditorView;
+}
+
 export function initCodeMirror(
 	parentElement: any, initialText: string, settings: EditorSettings
-): CodeMirrorControl {
+): CodeMirrorResult {
 	logMessage('Initializing CodeMirror...');
 	const theme = settings.themeData;
 

packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.bulletedVsChecklist.test.ts

@@ -3,7 +3,7 @@
  */
 import { EditorSelection } from '@codemirror/state';
 import { ListType } from '../types';
-import createEditor from './createEditor';
+import createEditor from './testUtil/createEditor';
 import { toggleList } from './markdownCommands';
 
 describe('markdownCommands.bulletedVsChecklist', () => {

packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.toggleList.test.ts

@@ -7,7 +7,7 @@ import {
 	increaseIndent, toggleList,
 } from './markdownCommands';
 import { ListType } from '../types';
-import createEditor from './createEditor';
+import createEditor from './testUtil/createEditor';
 
 describe('markdownCommands.toggleList', () => {
 	it('should remove the same type of list', () => {

packages/app-mobile/components/NoteEditor/CodeMirror/markdownMathParser.test.ts

@@ -1,15 +1,14 @@
 import { markdown } from '@codemirror/lang-markdown';
-import { ensureSyntaxTree } from '@codemirror/language';
+import { syntaxTree } from '@codemirror/language';
 import { SyntaxNode } from '@lezer/common';
 import { EditorState } from '@codemirror/state';
 import { blockMathTagName, inlineMathContentTagName, inlineMathTagName, MarkdownMathExtension } from './markdownMathParser';
 import { GFM as GithubFlavoredMarkdownExt } from '@lezer/markdown';
+import forceFullParse from './testUtil/forceFullParse';
 
-const syntaxTreeCreateTimeout = 100; // ms
-
-/** Create an EditorState with markdown extensions */
+// Creates an EditorState with math and markdown extensions
 const createEditorState = (initialText: string): EditorState => {
-	return EditorState.create({
+	const editorState = EditorState.create({
 		doc: initialText,
 		extensions: [
 			markdown({
@@ -17,15 +16,16 @@ const createEditorState = (initialText: string): EditorState => {
 			}),
 		],
 	});
+	forceFullParse(editorState);
+
+	return editorState;
 };
 
-/**
- * Returns a list of all nodes with the given name in the given editor's syntax tree.
- * Attempts to create the syntax tree if it doesn't exist.
- */
+// Returns a list of all nodes with the given name in the given editor's syntax tree.
+// Attempts to create the syntax tree if it doesn't exist.
 const findNodesWithName = (editor: EditorState, nodeName: string) => {
 	const result: SyntaxNode[] = [];
-	ensureSyntaxTree(editor, syntaxTreeCreateTimeout)?.iterate({
+	syntaxTree(editor).iterate({
 		enter: (node) => {
 			if (node.name === nodeName) {
 				result.push(node.node);
@@ -36,8 +36,8 @@ const findNodesWithName = (editor: EditorState, nodeName: string) => {
 	return result;
 };
 
-describe('Inline parsing', () => {
-	it('Document with just a math region', () => {
+describe('markdownMathParser', () => {
+	it('should parse inline math that contains space characters, numbers, and symbols', () => {
 		const documentText = '$3 + 3$';
 		const editor = createEditorState(documentText);
 		const inlineMathNodes = findNodesWithName(editor, inlineMathTagName);
@@ -53,7 +53,7 @@ describe('Inline parsing', () => {
 		expect(inlineMathContentNodes.length).toBe(0);
 	});
 
-	it('Inline math mixed with text', () => {
+	it('should parse comment within multi-word inline math', () => {
 		const beforeMath = '# Testing!\n\nThis is a test of ';
 		const mathRegion = '$\\TeX % TeX Comment!$';
 		const afterMath = ' formatting.';
@@ -72,7 +72,7 @@ describe('Inline parsing', () => {
 		expect(inlineMathNodes[0].to).toBe(beforeMath.length + mathRegion.length);
 	});
 
-	it('Inline math with no ending $ in a block', () => {
+	it('shouldn\'t start inline math if there is no ending $', () => {
 		const documentText = 'This is a $test\n\nof inline math$...';
 		const editor = createEditorState(documentText);
 		const inlineMathNodes = findNodesWithName(editor, inlineMathTagName);
@@ -81,21 +81,19 @@ describe('Inline parsing', () => {
 		expect(inlineMathNodes.length).toBe(0);
 	});
 
-	it('Shouldn\'t start if block would have spaces just inside', () => {
+	it('shouldn\'t start if math would have a space just after the $', () => {
 		const documentText = 'This is a $ test of inline math$...\n\n$Testing... $...';
 		const editor = createEditorState(documentText);
 		expect(findNodesWithName(editor, inlineMathTagName).length).toBe(0);
 	});
 
-	it('Shouldn\'t start if $ is escaped', () => {
+	it('shouldn\'t start inline math if $ is escaped', () => {
 		const documentText = 'This is a \\$test of inline math$...';
 		const editor = createEditorState(documentText);
 		expect(findNodesWithName(editor, inlineMathTagName).length).toBe(0);
 	});
-});
 
-describe('Block math tests', () => {
-	it('Document with just block math', () => {
+	it('should correctly parse document containing just block math', () => {
 		const documentText = '$$\n\t\\{ 1, 1, 2, 3, 5, ... \\}\n$$';
 		const editor = createEditorState(documentText);
 		const inlineMathNodes = findNodesWithName(editor, inlineMathTagName);
@@ -108,7 +106,7 @@ describe('Block math tests', () => {
 		expect(blockMathNodes[0].to).toBe(documentText.length);
 	});
 
-	it('Block math with comment', () => {
+	it('should correctly parse comment in block math', () => {
 		const startingText = '$$ % Testing...\n\t\\text{Test.}\n$$';
 		const afterMath = '\nTest.';
 		const editor = createEditorState(startingText + afterMath);
@@ -129,7 +127,7 @@ describe('Block math tests', () => {
 		});
 	});
 
-	it('Block math without an ending tag', () => {
+	it('should extend block math without ending tag to end of document', () => {
 		const beforeMath = '# Testing...\n\n';
 		const documentText = `${beforeMath}$$\n\t\\text{Testing...}\n\n\t3 + 3 = 6`;
 		const editor = createEditorState(documentText);
@@ -140,7 +138,7 @@ describe('Block math tests', () => {
 		expect(blockMathNodes[0].to).toBe(documentText.length);
 	});
 
-	it('Single-line declaration of block math', () => {
+	it('should parse block math declared on a single line', () => {
 		const documentText = '$$ Test. $$';
 		const editor = createEditorState(documentText);
 		const blockMathNodes = findNodesWithName(editor, blockMathTagName);

packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/createEditor.ts

@@ -1,9 +1,10 @@
 import { markdown } from '@codemirror/lang-markdown';
 import { GFM as GithubFlavoredMarkdownExt } from '@lezer/markdown';
-import { forceParsing, indentUnit } from '@codemirror/language';
+import { indentUnit } from '@codemirror/language';
 import { SelectionRange, EditorSelection, EditorState } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
-import { MarkdownMathExtension } from './markdownMathParser';
+import { MarkdownMathExtension } from '../markdownMathParser';
+import forceFullParse from './forceFullParse';
 
 // Creates and returns a minimal editor with markdown extensions
 const createEditor = (initialText: string, initialSelection: SelectionRange): EditorView => {
@@ -19,7 +20,7 @@ const createEditor = (initialText: string, initialSelection: SelectionRange): Ed
 		],
 	});
 
-	forceParsing(editor);
+	forceFullParse(editor.state);
 	return editor;
 };
 

packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/forceFullParse.ts

@@ -0,0 +1,18 @@
+import { ensureSyntaxTree, syntaxTreeAvailable } from '@codemirror/language';
+import { EditorState } from '@codemirror/state';
+
+// Forces a full parse of a CodeMirror editor. This is intended for unit testing.
+// If not in a unit-test consider using ensureSyntaxTree or forceParsing.
+// This will throw if no language is configured for the editor.
+const forceFullParse = (editorState: EditorState) => {
+	const timeout = 3000; // ms
+	ensureSyntaxTree(editorState, editorState.doc.length, timeout);
+
+	if (!syntaxTreeAvailable(editorState)) {
+		throw new Error(
+			`Unable to generate a syntax tree in ${timeout}. Is the editor configured to parse a language?`
+		);
+	}
+};
+
+export default forceFullParse;

packages/app-mobile/components/screens/NoteTagsDialog.js

@@ -91,7 +91,7 @@ class NoteTagsDialogComponent extends React.Component {
 		};
 
 		this.filterTags = (allTags) => {
-			return allTags.filter((tag) => tag.title.includes(this.state.tagFilter.toLowerCase()), allTags);
+			return allTags.filter((tag) => tag.title.toLowerCase().includes(this.state.tagFilter.toLowerCase()), allTags);
 		};
 	}
 

packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj

@@ -327,7 +327,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=/usr/local/opt/node@12/bin/node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
+			shellScript = "export NODE_BINARY=/usr/local/bin/node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
 		027E2AA6B101F8CFCA582EC1 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -492,13 +492,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.9.0;
+				MARKETING_VERSION = 12.10.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -521,12 +521,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.9.0;
+				MARKETING_VERSION = 12.10.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -667,14 +667,14 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.9.0;
+				MARKETING_VERSION = 12.10.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@@ -698,14 +698,14 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 82;
+				CURRENT_PROJECT_VERSION = 83;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.9.0;
+				MARKETING_VERSION = 12.10.0;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";

packages/app-mobile/ios/Podfile.lock

@@ -223,27 +223,27 @@ PODS:
     - React-Core
   - react-native-camera/RN (4.2.1):
     - React-Core
-  - react-native-document-picker (8.1.2):
+  - react-native-document-picker (8.1.3):
     - React-Core
   - react-native-geolocation (2.1.0):
     - React-Core
   - react-native-get-random-values (1.8.0):
     - React-Core
-  - react-native-image-picker (4.10.1):
+  - react-native-image-picker (4.10.2):
     - React-Core
   - react-native-image-resizer (1.4.5):
     - React-Core
-  - react-native-netinfo (9.3.6):
+  - react-native-netinfo (9.3.7):
     - React-Core
   - react-native-rsa-native (2.0.5):
     - React
-  - react-native-slider (4.3.3):
+  - react-native-slider (4.4.0):
     - React-Core
   - react-native-sqlite-storage (6.0.1):
     - React-Core
   - react-native-version-info (1.1.1):
     - React-Core
-  - react-native-webview (11.23.1):
+  - react-native-webview (11.26.0):
     - React-Core
   - React-perflogger (0.67.2)
   - React-RCTActionSheet (0.67.2):
@@ -316,7 +316,7 @@ PODS:
     - React-Core
   - RNCPushNotificationIOS (1.10.1):
     - React-Core
-  - RNDateTimePicker (6.7.0):
+  - RNDateTimePicker (6.7.1):
     - React-Core
   - RNFileViewer (2.1.5):
     - React-Core
@@ -326,7 +326,7 @@ PODS:
     - React
   - RNSecureRandom (1.0.1):
     - React
-  - RNShare (8.0.0):
+  - RNShare (8.0.1):
     - React-Core
   - RNVectorIcons (9.2.0):
     - React-Core
@@ -514,8 +514,8 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: c94002c1d93da3658f4d5119c6994d19961e3d52
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
-  JoplinCommonShareExtension: 270b4f8eb4e22828eeda433a04ed689fc1fd09b5
-  JoplinRNShareExtension: 9cd07431e525b36344fcecfaeecff974efc78528
+  JoplinCommonShareExtension: a8b60b02704d85a7305627912c0240e94af78db7
+  JoplinRNShareExtension: 485f3e6dad83b7b77f1572eabc249f869ee55c02
   RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
   RCTRequired: cd47794163052d2b8318c891a7a14fcfaccc75ab
   RCTTypeSafety: 393bb40b3e357b224cde53d3fec26813c52428b1
@@ -530,17 +530,17 @@ SPEC CHECKSUMS:
   React-logger: 23de8ea0f44fa00ee77e96060273225607fd4d78
   react-native-alarm-notification: 88c751922c791cc628bd7efb09bff18c8f178a5d
   react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
-  react-native-document-picker: f5ec1a712ca2a975c233117f044817bb8393cad4
+  react-native-document-picker: 958e2bc82e128be69055be261aeac8d872c8d34c
   react-native-geolocation: 69f4fd37650b8e7fee91816d395e62dd16f5ab8d
   react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
-  react-native-image-picker: f2ab1215d17bcfe27b0eb6417cc236fd1f4775e7
+  react-native-image-picker: bf34f3f516d139ed3e24c5f5a381a91819e349ea
   react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
-  react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461
+  react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
   react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
-  react-native-slider: 7d19220da2f2ae7cbb9aa80127cb73c597fa221f
+  react-native-slider: d2938a12c4e439a227c70eec65d119136eb4aeb5
   react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
   react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9
-  react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581
+  react-native-webview: 994b9f8fbb504d6314dc40d83f94f27c6831b3bf
   React-perflogger: 3c9bb7372493e49036f07a82c44c8cf65cbe88db
   React-RCTActionSheet: 052606483045a408693aa7e864410b4a052f541a
   React-RCTAnimation: 08d4cac13222bb1348c687a0158dfd3b577cdb63
@@ -556,12 +556,12 @@ SPEC CHECKSUMS:
   rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNCPushNotificationIOS: 87b8d16d3ede4532745e05b03c42cff33a36cc45
-  RNDateTimePicker: c6b404647f45472443b0fdcdd31296fc3516b0eb
+  RNDateTimePicker: 0530a73a6f3a1a85814cbde0802736993b9e675e
   RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
   RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef
-  RNShare: 36aa3e6958373a0ad1c95a1c960adef589da3794
+  RNShare: d93e00e906e6174657f6370b480437e4702bc86e
   RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
   Yoga: 9b6696970c3289e8dea34b3eda93f23e61fb8121
 

packages/app-mobile/ios/ShareExtension/JoplinCommonShareExtension.podspec

@@ -4,7 +4,7 @@ Pod::Spec.new do |spec|
   spec.summary      = "Common Share Extension code for Joplin."
   spec.description  = "Common Share Extension for Joplin"
   spec.homepage     = "https://github.com/laurent22/joplin"
-  spec.license      = { :type => "MIT" }
+  spec.license      = { :type => "AGPL-3.0-or-later" }
   spec.author       = { "Duncan Cunningham" => "duncanc4@gmail.com" }
   spec.platform     = :ios, "9.0"
   spec.source       = { :path => "." }

packages/app-mobile/ios/ShareExtension/JoplinRNShareExtension.podspec

@@ -4,7 +4,7 @@ Pod::Spec.new do |spec|
   spec.summary      = "React Native module for Joplin to access the data from the share extension."
   spec.description  = "React Native Share Extension module for Joplin"
   spec.homepage     = "https://github.com/laurent22/joplin"
-  spec.license      = { :type => "MIT" }
+  spec.license      = { :type => "AGPL-3.0-or-later" }
   spec.author       = { "Duncan Cunningham" => "duncanc4@gmail.com" }
   spec.platform     = :ios, "9.0"
   spec.source       = { :path => "." }

packages/app-mobile/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@joplin/app-mobile",
   "description": "Joplin for Mobile",
-  "license": "MIT",
-  "version": "2.9.0",
+  "license": "AGPL-3.0-or-later",
+  "version": "2.10.0",
   "private": true,
   "scripts": {
     "start": "react-native start --reset-cache",
@@ -18,15 +18,15 @@
     "postinstall": "jetify && yarn run build"
   },
   "dependencies": {
-    "@joplin/lib": "~2.9",
-    "@joplin/react-native-saf-x": "~2.9",
-    "@joplin/renderer": "~2.9",
+    "@joplin/lib": "~2.10",
+    "@joplin/react-native-saf-x": "~2.10",
+    "@joplin/renderer": "~2.10",
     "@react-native-community/clipboard": "1.5.1",
-    "@react-native-community/datetimepicker": "6.7.0",
+    "@react-native-community/datetimepicker": "6.7.1",
     "@react-native-community/geolocation": "2.1.0",
-    "@react-native-community/netinfo": "9.3.6",
+    "@react-native-community/netinfo": "9.3.7",
     "@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",
     "buffer": "6.0.3",
     "constants-browserify": "1.0.0",
@@ -42,26 +42,26 @@
     "react-native-action-button": "2.8.5",
     "react-native-camera": "4.2.1",
     "react-native-dialogbox": "0.6.10",
-    "react-native-document-picker": "8.1.2",
+    "react-native-document-picker": "8.1.3",
     "react-native-dropdownalert": "4.5.1",
     "react-native-file-viewer": "2.1.5",
     "react-native-fs": "2.20.0",
     "react-native-get-random-values": "1.8.0",
-    "react-native-image-picker": "4.10.1",
+    "react-native-image-picker": "4.10.2",
     "react-native-image-resizer": "1.4.5",
-    "react-native-modal-datetime-picker": "14.0.0",
+    "react-native-modal-datetime-picker": "14.0.1",
     "react-native-popup-menu": "0.16.1",
     "react-native-quick-actions": "0.3.13",
     "react-native-rsa-native": "2.0.5",
     "react-native-securerandom": "1.0.1",
-    "react-native-share": "8.0.0",
+    "react-native-share": "8.0.1",
     "react-native-side-menu-updated": "1.3.2",
     "react-native-sqlite-storage": "6.0.1",
     "react-native-url-polyfill": "1.3.0",
     "react-native-vector-icons": "9.2.0",
     "react-native-version-info": "1.1.1",
-    "react-native-webview": "11.23.1",
-    "react-redux": "8.0.5",
+    "react-native-webview": "11.26.0",
+    "react-redux": "7.2.9",
     "redux": "4.2.0",
     "rn-fetch-blob": "0.12.0",
     "stream": "0.0.2",
@@ -75,26 +75,26 @@
     "@babel/runtime": "7.16.3",
     "@codemirror/commands": "6.1.2",
     "@codemirror/lang-cpp": "6.0.2",
-    "@codemirror/lang-html": "6.1.3",
+    "@codemirror/lang-html": "6.4.0",
     "@codemirror/lang-java": "6.0.1",
     "@codemirror/lang-javascript": "6.1.1",
     "@codemirror/lang-markdown": "6.0.5",
     "@codemirror/lang-php": "6.0.1",
     "@codemirror/lang-rust": "6.0.1",
-    "@codemirror/language": "6.3.0",
-    "@codemirror/legacy-modes": "6.2.0",
-    "@codemirror/search": "6.2.2",
-    "@codemirror/state": "6.1.3",
-    "@codemirror/view": "6.4.2",
-    "@joplin/tools": "~2.9",
-    "@lezer/highlight": "1.1.2",
+    "@codemirror/language": "6.3.1",
+    "@codemirror/legacy-modes": "6.3.1",
+    "@codemirror/search": "6.2.3",
+    "@codemirror/state": "6.1.4",
+    "@codemirror/view": "6.6.0",
+    "@joplin/tools": "~2.10",
+    "@lezer/highlight": "1.1.3",
     "@types/fs-extra": "9.0.13",
-    "@types/jest": "29.2.3",
+    "@types/jest": "29.2.4",
     "@types/react-native": "0.64.19",
     "@types/react-redux": "7.1.24",
     "babel-plugin-module-resolver": "4.1.0",
     "execa": "4.1.0",
-    "fs-extra": "10.1.0",
+    "fs-extra": "11.1.0",
     "gulp": "4.0.2",
     "jest": "29.3.1",
     "jest-environment-jsdom": "29.3.1",
@@ -103,9 +103,9 @@
     "metro-react-native-babel-preset": "0.66.2",
     "nodemon": "2.0.20",
     "ts-jest": "29.0.3",
-    "ts-loader": "9.4.1",
+    "ts-loader": "9.4.2",
     "ts-node": "10.9.1",
-    "typescript": "4.9.3",
+    "typescript": "4.9.4",
     "uglify-js": "3.17.4",
     "webpack": "5.74.0"
   }

packages/app-mobile/pluginAssets/highlight.js/atom-one-dark-reasonable.css.base64.js

@@ -1 +1 @@
-module.exports = `LyoKCkF0b20gT25lIERhcmsgV2l0aCBzdXBwb3J0IGZvciBSZWFzb25NTCBieSBHaWRpIE1vcnJpcywgYmFzZWQgb2ZmIHdvcmsgYnkgRGFuaWVsIEdhbWFnZQoKT3JpZ2luYWwgT25lIERhcmsgU3ludGF4IHRoZW1lIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL2F0b20vb25lLWRhcmstc3ludGF4CgoqLwouaGxqcyB7CiAgY29sb3I6ICNhYmIyYmY7CiAgYmFja2dyb3VuZDogIzI4MmMzNDsKfQouaGxqcy1rZXl3b3JkLCAuaGxqcy1vcGVyYXRvciB7CiAgY29sb3I6ICNGOTI2NzI7Cn0KLmhsanMtcGF0dGVybi1tYXRjaCB7CiAgY29sb3I6ICNGOTI2NzI7Cn0KLmhsanMtcGF0dGVybi1tYXRjaCAuaGxqcy1jb25zdHJ1Y3RvciB7CiAgY29sb3I6ICM2MWFlZWU7Cn0KLmhsanMtZnVuY3Rpb24gewogIGNvbG9yOiAjNjFhZWVlOwp9Ci5obGpzLWZ1bmN0aW9uIC5obGpzLXBhcmFtcyB7CiAgY29sb3I6ICNBNkUyMkU7Cn0KLmhsanMtZnVuY3Rpb24gLmhsanMtcGFyYW1zIC5obGpzLXR5cGluZyB7CiAgY29sb3I6ICNGRDk3MUY7Cn0KLmhsanMtbW9kdWxlLWFjY2VzcyAuaGxqcy1tb2R1bGUgewogIGNvbG9yOiAjN2U1N2MyOwp9Ci5obGpzLWNvbnN0cnVjdG9yIHsKICBjb2xvcjogI2UyYjkzZDsKfQouaGxqcy1jb25zdHJ1Y3RvciAuaGxqcy1zdHJpbmcgewogIGNvbG9yOiAjOUNDQzY1Owp9Ci5obGpzLWNvbW1lbnQsIC5obGpzLXF1b3RlIHsKICBjb2xvcjogI2IxOGViMTsKICBmb250LXN0eWxlOiBpdGFsaWM7Cn0KLmhsanMtZG9jdGFnLCAuaGxqcy1mb3JtdWxhIHsKICBjb2xvcjogI2M2NzhkZDsKfQouaGxqcy1zZWN0aW9uLCAuaGxqcy1uYW1lLCAuaGxqcy1zZWxlY3Rvci10YWcsIC5obGpzLWRlbGV0aW9uLCAuaGxqcy1zdWJzdCB7CiAgY29sb3I6ICNlMDZjNzU7Cn0KLmhsanMtbGl0ZXJhbCB7CiAgY29sb3I6ICM1NmI2YzI7Cn0KLmhsanMtc3RyaW5nLCAuaGxqcy1yZWdleHAsIC5obGpzLWFkZGl0aW9uLCAuaGxqcy1hdHRyaWJ1dGUsIC5obGpzLW1ldGEgLmhsanMtc3RyaW5nIHsKICBjb2xvcjogIzk4YzM3OTsKfQouaGxqcy1idWlsdF9pbiwKLmhsanMtdGl0bGUuY2xhc3NfLAouaGxqcy1jbGFzcyAuaGxqcy10aXRsZSB7CiAgY29sb3I6ICNlNmMwN2I7Cn0KLmhsanMtYXR0ciwgLmhsanMtdmFyaWFibGUsIC5obGpzLXRlbXBsYXRlLXZhcmlhYmxlLCAuaGxqcy10eXBlLCAuaGxqcy1zZWxlY3Rvci1jbGFzcywgLmhsanMtc2VsZWN0b3ItYXR0ciwgLmhsanMtc2VsZWN0b3ItcHNldWRvLCAuaGxqcy1udW1iZXIgewogIGNvbG9yOiAjZDE5YTY2Owp9Ci5obGpzLXN5bWJvbCwgLmhsanMtYnVsbGV0LCAuaGxqcy1saW5rLCAuaGxqcy1tZXRhLCAuaGxqcy1zZWxlY3Rvci1pZCwgLmhsanMtdGl0bGUgewogIGNvbG9yOiAjNjFhZWVlOwp9Ci5obGpzLWVtcGhhc2lzIHsKICBmb250LXN0eWxlOiBpdGFsaWM7Cn0KLmhsanMtc3Ryb25nIHsKICBmb250LXdlaWdodDogYm9sZDsKfQouaGxqcy1saW5rIHsKICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsKfQo=`;
+module.exports = `cHJlIGNvZGUuaGxqc3tkaXNwbGF5OmJsb2NrO292ZXJmbG93LXg6YXV0bztwYWRkaW5nOjFlbX1jb2RlLmhsanN7cGFkZGluZzozcHggNXB4fS5obGpze2NvbG9yOiNhYmIyYmY7YmFja2dyb3VuZDojMjgyYzM0fS5obGpzLWtleXdvcmQsLmhsanMtb3BlcmF0b3IsLmhsanMtcGF0dGVybi1tYXRjaHtjb2xvcjojZjkyNjcyfS5obGpzLWZ1bmN0aW9uLC5obGpzLXBhdHRlcm4tbWF0Y2ggLmhsanMtY29uc3RydWN0b3J7Y29sb3I6IzYxYWVlZX0uaGxqcy1mdW5jdGlvbiAuaGxqcy1wYXJhbXN7Y29sb3I6I2E2ZTIyZX0uaGxqcy1mdW5jdGlvbiAuaGxqcy1wYXJhbXMgLmhsanMtdHlwaW5ne2NvbG9yOiNmZDk3MWZ9LmhsanMtbW9kdWxlLWFjY2VzcyAuaGxqcy1tb2R1bGV7Y29sb3I6IzdlNTdjMn0uaGxqcy1jb25zdHJ1Y3Rvcntjb2xvcjojZTJiOTNkfS5obGpzLWNvbnN0cnVjdG9yIC5obGpzLXN0cmluZ3tjb2xvcjojOWNjYzY1fS5obGpzLWNvbW1lbnQsLmhsanMtcXVvdGV7Y29sb3I6I2IxOGViMTtmb250LXN0eWxlOml0YWxpY30uaGxqcy1kb2N0YWcsLmhsanMtZm9ybXVsYXtjb2xvcjojYzY3OGRkfS5obGpzLWRlbGV0aW9uLC5obGpzLW5hbWUsLmhsanMtc2VjdGlvbiwuaGxqcy1zZWxlY3Rvci10YWcsLmhsanMtc3Vic3R7Y29sb3I6I2UwNmM3NX0uaGxqcy1saXRlcmFse2NvbG9yOiM1NmI2YzJ9LmhsanMtYWRkaXRpb24sLmhsanMtYXR0cmlidXRlLC5obGpzLW1ldGEgLmhsanMtc3RyaW5nLC5obGpzLXJlZ2V4cCwuaGxqcy1zdHJpbmd7Y29sb3I6Izk4YzM3OX0uaGxqcy1idWlsdF9pbiwuaGxqcy1jbGFzcyAuaGxqcy10aXRsZSwuaGxqcy10aXRsZS5jbGFzc197Y29sb3I6I2U2YzA3Yn0uaGxqcy1hdHRyLC5obGpzLW51bWJlciwuaGxqcy1zZWxlY3Rvci1hdHRyLC5obGpzLXNlbGVjdG9yLWNsYXNzLC5obGpzLXNlbGVjdG9yLXBzZXVkbywuaGxqcy10ZW1wbGF0ZS12YXJpYWJsZSwuaGxqcy10eXBlLC5obGpzLXZhcmlhYmxle2NvbG9yOiNkMTlhNjZ9LmhsanMtYnVsbGV0LC5obGpzLWxpbmssLmhsanMtbWV0YSwuaGxqcy1zZWxlY3Rvci1pZCwuaGxqcy1zeW1ib2wsLmhsanMtdGl0bGV7Y29sb3I6IzYxYWVlZX0uaGxqcy1lbXBoYXNpc3tmb250LXN0eWxlOml0YWxpY30uaGxqcy1zdHJvbmd7Zm9udC13ZWlnaHQ6NzAwfS5obGpzLWxpbmt7dGV4dC1kZWNvcmF0aW9uOnVuZGVybGluZX0=`;

packages/app-mobile/pluginAssets/highlight.js/atom-one-light.css.base64.js

@@ -1 +1 @@
-module.exports = `LyoKCkF0b20gT25lIExpZ2h0IGJ5IERhbmllbCBHYW1hZ2UKT3JpZ2luYWwgT25lIExpZ2h0IFN5bnRheCB0aGVtZSBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9hdG9tL29uZS1saWdodC1zeW50YXgKCmJhc2U6ICAgICNmYWZhZmEKbW9uby0xOiAgIzM4M2E0Mgptb25vLTI6ICAjNjg2Yjc3Cm1vbm8tMzogICNhMGExYTcKaHVlLTE6ICAgIzAxODRiYgpodWUtMjogICAjNDA3OGYyCmh1ZS0zOiAgICNhNjI2YTQKaHVlLTQ6ICAgIzUwYTE0ZgpodWUtNTogICAjZTQ1NjQ5Cmh1ZS01LTI6ICNjOTEyNDMKaHVlLTY6ICAgIzk4NjgwMQpodWUtNi0yOiAjYzE4NDAxCgoqLwoKLmhsanMgewogIGNvbG9yOiAjMzgzYTQyOwogIGJhY2tncm91bmQ6ICNmYWZhZmE7Cn0KCi5obGpzLWNvbW1lbnQsCi5obGpzLXF1b3RlIHsKICBjb2xvcjogI2EwYTFhNzsKICBmb250LXN0eWxlOiBpdGFsaWM7Cn0KCi5obGpzLWRvY3RhZywKLmhsanMta2V5d29yZCwKLmhsanMtZm9ybXVsYSB7CiAgY29sb3I6ICNhNjI2YTQ7Cn0KCi5obGpzLXNlY3Rpb24sCi5obGpzLW5hbWUsCi5obGpzLXNlbGVjdG9yLXRhZywKLmhsanMtZGVsZXRpb24sCi5obGpzLXN1YnN0IHsKICBjb2xvcjogI2U0NTY0OTsKfQoKLmhsanMtbGl0ZXJhbCB7CiAgY29sb3I6ICMwMTg0YmI7Cn0KCi5obGpzLXN0cmluZywKLmhsanMtcmVnZXhwLAouaGxqcy1hZGRpdGlvbiwKLmhsanMtYXR0cmlidXRlLAouaGxqcy1tZXRhIC5obGpzLXN0cmluZyB7CiAgY29sb3I6ICM1MGExNGY7Cn0KCi5obGpzLWF0dHIsCi5obGpzLXZhcmlhYmxlLAouaGxqcy10ZW1wbGF0ZS12YXJpYWJsZSwKLmhsanMtdHlwZSwKLmhsanMtc2VsZWN0b3ItY2xhc3MsCi5obGpzLXNlbGVjdG9yLWF0dHIsCi5obGpzLXNlbGVjdG9yLXBzZXVkbywKLmhsanMtbnVtYmVyIHsKICBjb2xvcjogIzk4NjgwMTsKfQoKLmhsanMtc3ltYm9sLAouaGxqcy1idWxsZXQsCi5obGpzLWxpbmssCi5obGpzLW1ldGEsCi5obGpzLXNlbGVjdG9yLWlkLAouaGxqcy10aXRsZSB7CiAgY29sb3I6ICM0MDc4ZjI7Cn0KCi5obGpzLWJ1aWx0X2luLAouaGxqcy10aXRsZS5jbGFzc18sCi5obGpzLWNsYXNzIC5obGpzLXRpdGxlIHsKICBjb2xvcjogI2MxODQwMTsKfQoKLmhsanMtZW1waGFzaXMgewogIGZvbnQtc3R5bGU6IGl0YWxpYzsKfQoKLmhsanMtc3Ryb25nIHsKICBmb250LXdlaWdodDogYm9sZDsKfQoKLmhsanMtbGluayB7CiAgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7Cn0K`;
+module.exports = `cHJlIGNvZGUuaGxqc3tkaXNwbGF5OmJsb2NrO292ZXJmbG93LXg6YXV0bztwYWRkaW5nOjFlbX1jb2RlLmhsanN7cGFkZGluZzozcHggNXB4fS5obGpze2NvbG9yOiMzODNhNDI7YmFja2dyb3VuZDojZmFmYWZhfS5obGpzLWNvbW1lbnQsLmhsanMtcXVvdGV7Y29sb3I6I2EwYTFhNztmb250LXN0eWxlOml0YWxpY30uaGxqcy1kb2N0YWcsLmhsanMtZm9ybXVsYSwuaGxqcy1rZXl3b3Jke2NvbG9yOiNhNjI2YTR9LmhsanMtZGVsZXRpb24sLmhsanMtbmFtZSwuaGxqcy1zZWN0aW9uLC5obGpzLXNlbGVjdG9yLXRhZywuaGxqcy1zdWJzdHtjb2xvcjojZTQ1NjQ5fS5obGpzLWxpdGVyYWx7Y29sb3I6IzAxODRiYn0uaGxqcy1hZGRpdGlvbiwuaGxqcy1hdHRyaWJ1dGUsLmhsanMtbWV0YSAuaGxqcy1zdHJpbmcsLmhsanMtcmVnZXhwLC5obGpzLXN0cmluZ3tjb2xvcjojNTBhMTRmfS5obGpzLWF0dHIsLmhsanMtbnVtYmVyLC5obGpzLXNlbGVjdG9yLWF0dHIsLmhsanMtc2VsZWN0b3ItY2xhc3MsLmhsanMtc2VsZWN0b3ItcHNldWRvLC5obGpzLXRlbXBsYXRlLXZhcmlhYmxlLC5obGpzLXR5cGUsLmhsanMtdmFyaWFibGV7Y29sb3I6Izk4NjgwMX0uaGxqcy1idWxsZXQsLmhsanMtbGluaywuaGxqcy1tZXRhLC5obGpzLXNlbGVjdG9yLWlkLC5obGpzLXN5bWJvbCwuaGxqcy10aXRsZXtjb2xvcjojNDA3OGYyfS5obGpzLWJ1aWx0X2luLC5obGpzLWNsYXNzIC5obGpzLXRpdGxlLC5obGpzLXRpdGxlLmNsYXNzX3tjb2xvcjojYzE4NDAxfS5obGpzLWVtcGhhc2lze2ZvbnQtc3R5bGU6aXRhbGljfS5obGpzLXN0cm9uZ3tmb250LXdlaWdodDo3MDB9LmhsanMtbGlua3t0ZXh0LWRlY29yYXRpb246dW5kZXJsaW5lfQ==`;

packages/app-mobile/pluginAssets/index.js

@@ -1,5 +1,5 @@
 module.exports = {
-hash:"abde4aa0d823e75ca24be9dd0e8c971a", files: {
+hash:"edb511738c14143467cc859e46bd6121", files: {
 'highlight.js/atom-one-dark-reasonable.css': { data: require('./highlight.js/atom-one-dark-reasonable.css.base64.js'), mime: 'text/css', encoding: 'base64' },
 'highlight.js/atom-one-light.css': { data: require('./highlight.js/atom-one-light.css.base64.js'), mime: 'text/css', encoding: 'base64' },
 'katex/fonts/KaTeX_AMS-Regular.woff2': { data: require('./katex/fonts/KaTeX_AMS-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },

packages/fork-htmlparser2/package.json

@@ -45,17 +45,17 @@
     "entities": "2.2.0"
   },
   "devDependencies": {
-    "@types/jest": "29.2.3",
-    "@types/node": "18.11.9",
-    "@typescript-eslint/eslint-plugin": "5.43.0",
-    "@typescript-eslint/parser": "5.43.0",
+    "@types/jest": "29.2.4",
+    "@types/node": "18.11.17",
+    "@typescript-eslint/eslint-plugin": "5.47.0",
+    "@typescript-eslint/parser": "5.47.0",
     "coveralls": "3.1.1",
-    "eslint": "8.28.0",
+    "eslint": "8.30.0",
     "eslint-config-prettier": "8.5.0",
     "jest": "29.3.1",
-    "prettier": "2.7.1",
+    "prettier": "2.8.1",
     "ts-jest": "29.0.3",
-    "typescript": "4.9.3"
+    "typescript": "4.9.4"
   },
   "jest": {
     "preset": "ts-jest",

packages/generator-joplin/generators/app/templates/src/manifest.json

@@ -1,7 +1,7 @@
 {
 	"manifest_version": 1,
 	"id": "<%= pluginId %>",
-	"app_min_version": "2.9",
+	"app_min_version": "2.10",
 	"version": "1.0.0",
 	"name": "<%= pluginName %>",
 	"description": "<%= pluginDescription %>",

packages/generator-joplin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-joplin",
-  "version": "2.9.1",
+  "version": "2.10.0",
   "description": "Scaffolds out a new Joplin plugin",
   "homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin",
   "author": {
@@ -32,6 +32,6 @@
     "jest": "29.3.1"
   },
   "repository": "https://github.com/laurent22/generator-joplin",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "private": true
 }

packages/htmlpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/htmlpack",
-  "version": "2.9.1",
+  "version": "2.10.0",
   "description": "Pack an HTML file and all its linked resources into a single HTML file",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -17,7 +17,7 @@
     "@joplin/fork-htmlparser2": "^4.1.41",
     "css": "3.0.0",
     "datauri": "4.1.0",
-    "fs-extra": "10.1.0",
+    "fs-extra": "11.1.0",
     "html-entities": "1.4.0"
   },
   "devDependencies": {

packages/lib/locale.ts

@@ -563,6 +563,10 @@ function localeStrings(canonicalName: string) {
 	return loadedLocales_[locale];
 }
 
+const currentLocale = () => {
+	return currentLocale_;
+};
+
 function setLocale(canonicalName: string) {
 	if (currentLocale_ === canonicalName) return;
 	currentLocale_ = closestSupportedLocale(canonicalName);
@@ -594,4 +598,4 @@ function _n(singular: string, plural: string, n: number, ...args: any[]) {
 	return _(singular, ...args);
 }
 
-export { _, _n, supportedLocales, localesFromLanguageCode, languageCodeOnly, countryDisplayName, localeStrings, setLocale, supportedLocalesToLanguages, defaultLocale, closestSupportedLocale, languageCode, countryCodeOnly };
+export { _, _n, supportedLocales, currentLocale, localesFromLanguageCode, languageCodeOnly, countryDisplayName, localeStrings, setLocale, supportedLocalesToLanguages, defaultLocale, closestSupportedLocale, languageCode, countryCodeOnly };

packages/lib/locales/da_DK.json

@@ -1,8 +1,12 @@
 {
  "\"%s\" is missing the required \"%s\" property.": "\"%s\" mangler for den påkrævede \"%s\" egenskab.",
  "%d days": "%d dage",
+ "%d GB": "%d GB",
+ "%d GB storage space": "%d GB lagerplads",
  "%d hour": "%d time",
  "%d hours": "%d timer",
+ "%d MB": "%d MB",
+ "%d MB per note or attachment": "%d MB pr. note eller vedhæftning",
  "%d minutes": "%d minutter",
  "%d notes match this pattern. Delete them?": "%d noter der matcher dette mønster. Slet dem?",
  "%s %s (%s, %s)": "%s %s (%s, %s)",
@@ -27,6 +31,7 @@
  "&Tools": "&Værktøjer",
  "&View": "&Vis",
  "(%s)": "(%s)",
+ "(In plugin: %s)": "(I udvidelse: %s)",
  "(None)": "(Ingen)",
  "(wysiwyg: %s)": "(wysiwyg: %s)",
  "- Camera: to allow taking a picture and attaching it to a note.": "- Kamera: Tilladelse til fotografering og vedhæftning af et billede til en note.",
@@ -42,11 +47,13 @@
  "Accelerator \"%s\" is not valid.": "Accelerator \"%s\" er ikke gyldig.",
  "Accelerator \"%s\" is used for \"%s\" and \"%s\" commands. This may lead to unexpected behaviour.": "Accelerator \"%s\" bruges til \"%s\" og \"%s\" kommandoer. Det kan føre til uventet opførsel.",
  "Accept": "Acceptér",
+ "Account": "Konto",
  "Action": "Handling",
  "Actions": "Handlinger",
  "Active": "Aktiv",
  "Actual Size": "Faktisk størrelse",
  "Add body": "Tilføj brødtekst",
+ "Add new": "Tilføj ny",
  "Add or remove tags:": "Tilføj eller fjern etiketter:",
  "Add recipient:": "Tilføj modtager:",
  "Add title": "Tilføj titel",
@@ -58,7 +65,10 @@
  "All notes": "Alle noter",
  "All potential ports are in use - please report the issue at %s": "Alle mulige porte er i brug - rapportér venligst problemet på %s",
  "Also displays unset and hidden config variables.": "Viser også tomme eller skjulte konfigurations variabler.",
+ "Also publish linked notes": "Offentliggør også tilknyttede noter",
  "Always": "Altid",
+ "Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to see the short notebook id or use $b for current selected notebook": "Tvetydig notesbog \"%s\". Brug venligst notesbog-id i stedet - tryk på \"ti\" for at se det korte notebogs-id eller brug $b for den aktuelle valgte notesbog",
+ "Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti\" to see the short notebook id": "Tvetydig notesbog \"%s\". Brug venligst kort notesbog-id i stedet - tryk på \"ti\" for at se det korte notebogs-id",
  "An update is available, do you want to download it now?": "Opdatering er tilgængelig, vil du hente den nu?",
  "Appearance": "Udseende",
  "Application": "Program",
@@ -66,6 +76,7 @@
  "Are you sure you want to renew the authorisation token?": "Er du sikker på, at du vil forny autorisationstoken?",
  "Arguments:": "Argumenter:",
  "Aritim Dark": "Aritim Mørk",
+ "Attach": "Vedhæft",
  "Attach file": "Vedhæft fil",
  "Attach photo": "Vedhæft foto",
  "Attach...": "Vedhæft...",
@@ -84,10 +95,12 @@
  "Automatically check for updates": "Tjek automatisk efter opdateringer",
  "Automatically switch theme to match system theme": "Skifter automatisk tema så det matcher systemets tema",
  "Back": "Tilbage",
+ "Basic": "Grundlæggende",
  "Bold": "Fed",
  "Browse all plugins": "Gennemse alle udvidelser",
  "Browse...": "Gennemse...",
  "Bulleted List": "Punktliste",
+ "Can Share": "Kan dele",
  "Cancel": "Annullér",
  "Cancelling background synchronisation... Please wait.": "Annullerer baggrunds synkronisering... Vent venligst.",
  "Cancelling...": "Annullerer...",
@@ -105,6 +118,7 @@
  "Cannot save %s \"%s\" because it is larger than the allowed limit (%s)": "Kan ikke gemme %s \"%s\" da den er større end den tilladte grænse (%s)",
  "Cannot save %s \"%s\" because it would go over the total allowed size (%s) for this account": "Kan ikke gemme %s \"%s\" da den vil overskride den tilladte størrelse (%s) for denne konto",
  "Cannot share encrypted notebook with recipient %s because they have not enabled end-to-end encryption. They may do so from the screen Configuration > Encryption.": "Kan ikke dele krypteret notebook med modtager %s, fordi de ikke har aktiveret end-to-end-kryptering. De kan gøre det i Indstillinger > Kryptering.",
+ "Case sensitive": "Bogstavstørrelse har betydning",
  "Change application layout": "Skift applikationslayout",
  "Change language": "Skift sprog",
  "Characters": "Tegn",
@@ -127,6 +141,7 @@
  "Code Block": "Kode blok",
  "Code View": "Kodevisning",
  "Collaborate on notebooks with others": "Samarbejd med andre om notesbøger",
+ "Collapse": "Fold sammen",
  "Coming alarms": "Kommende alarmer",
  "Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem. Note that if you make changes to the TLS settings, you must save your changes before clicking on \"Check synchronisation configuration\".": "Komma-adskilt liste med stier til mapper der indlæses certifikater fra, eller stier til individuelle certifikatfiler. For eksempel: /my/cert_dir, /other/custom.pem. Vær opmærksom på at hvis du ændrer dine TLS indstillinger, så skal du gemme dine ændringer før du klikker på \"Tjek synkroniseringskonfiguration\".",
  "command": "kommando",
@@ -144,6 +159,7 @@
  "Conflicted: %d": "Konflikter: %d",
  "Conflicts": "Konflikter",
  "Conflicts (attachments)": "Konflikter (vedhæftninger)",
+ "Consolidated billing": "Konsolideret fakturering",
  "Content provided by %s": "Indhold leveret af %s",
  "Convert to note": "Konverter til note",
  "Convert to todo": "Konverter til opgave",
@@ -164,7 +180,9 @@
  "Could not respond to the invitation. Please try again, or check with the notebook owner if they are still sharing it.\n\nThe error was: \"%s\"": "Kunne ikke svare på invitationen. Prøv venligst igen, eller kontakt ejeren af notesbogen, hvis de stadig deler den\n\nFejlen var: \"%s\"",
  "Could not upgrade master key: %s": "Kunne ikke opgradere hovednøgle: %s",
  "Could not verify the share status of this notebook - aborting. Please try again when you are connected to the internet.": "Kunne ikke verificere denne notesbogs status for deling - afbryder. Prøv venligst igen, når du har forbindelse til internettet.",
+ "Create": "Opret",
  "Create a notebook": "Opret en notesbog",
+ "Create new profile...": "Opret ny note...",
  "Create notebook": "Opret notesbog",
  "Create user": "Opret bruger",
  "Created": "Oprettet",
@@ -193,6 +211,7 @@
  "Date": "Dato",
  "Date format": "Datoformat",
  "days": "dage",
+ "Decrease indent level": "Reducer indrykningsniveau",
  "Decrypted items: %d": "Dekrypterede emner: %d",
  "Decrypted items: %s / %s": "Dekrypterede emner: %s / %s",
  "Decrypting items: %d/%d": "Dekrypterede emner: %d/%d",
@@ -209,6 +228,7 @@
  "Delete notebook \"%s\"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.": "Slet notesbogen \"%s\"?\n\nAlle noter og undernotesbøger i denne notesbog bliver også slettet.",
  "Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.": "Slet notesbog? Alle noter og undernotesbøger i denne notesbog bliver også slettet.",
  "Delete plugin \"%s\"?": "Slet udvidelse \"%s\"?",
+ "Delete selected notes": "Slet valgte noter",
  "Delete these %d notes?": "Slet disse %d noter?",
  "Delete this invitation? The recipient will no longer have access to this shared notebook.": "Vil du slette denne invitation? Modtageren vil ikke længere have adgang til denne delte notesbog.",
  "Deleted local items: %d.": "Slettede lokale emner: %d.",
@@ -240,6 +260,7 @@
  "Do it now": "Gør det nu",
  "Do not ask for confirmation.": "Spørg ikke om bekræftelse.",
  "Do not lose the password as, for security purposes, this will be the *only* way to decrypt the data! To enable encryption, please enter your password below.": "Glem ikke adgangkoden, da den af sikkerhedshensyn er den *eneste* mulighed for dekryptering af data! For at aktivere kryptering til, skal du indtaste din adgangskode herunder.",
+ "Done": "Færdig",
  "Download": "Download",
  "Download and install the relevant extension for your browser:": "Download og installer den relevante udvidelse til din browser:",
  "Downloaded": "Downloadet",
@@ -253,17 +274,21 @@
  "Dropbox Login": "Dropbox login",
  "Duplicate": "Dupliker",
  "Duplicate line": "Dupliker linje",
+ "Duplicate selected notes": "Dupliker valgte noter",
  "Duplicates the notes matching <note> to [notebook]. If no notebook is specified the note is duplicated in the current notebook.": "Kopierer alle noter der matcher <note> til [notebook]. Hvis notesbog ikke er udfyldt, kopieres til aktuel notesbog.",
  "Edit": "Redigér",
  "Edit in external editor": "Rediger i ekstern editor",
+ "Edit link": "Rediger link",
  "Edit note.": "Rediger note.",
  "Edit notebook": "Rediger notesbog",
+ "Edit profile configuration...": "Rediger profilkonfiguration...",
  "Editor": "Editor",
  "Editor font": "Tekstredigeringsskrifttype",
  "Editor font family": "Rediger skrifttypefamilie",
  "Editor font size": "Tekstredigeringsskriftstørrelse",
  "Editor maximum width": "Maksimal bredde på editor",
  "Editor monospace font family": "Editor monospace skrifttypefamilie",
+ "Editor: %s": "Editor: %s",
  "Either \"text\" or \"json\"": "Enten \"text\" eller \"json\"",
  "Emacs": "Emacs",
  "Email": "E-mail",
@@ -315,6 +340,7 @@
  "Evernote Export File (as HTML)": "Evernote eksport fil (i HTML)",
  "Evernote Export File (as Markdown)": "Evernote eksport fil (i Markdown)",
  "Exits the application.": "Lukker programmet.",
+ "Expand": "Udvid",
  "Export": "Eksportér",
  "Export all": "Eksporter alle",
  "Export debug report": "Eksporter fejlrapport",
@@ -333,6 +359,9 @@
  "Fetching resources: %d/%d": "Henter ressourcer: %d/%d",
  "File": "Fil",
  "File system": "Filsystem",
+ "Filter tags": "Filtrer etiketter",
+ "Find and replace": "Find og erstat",
+ "Find: ": "Find: ",
  "Firefox Extension": "Firefox udvidelse",
  "Fix search index": "Fiks søgeindeks",
  "Fixing search index...": "Fikser søgeindeks...",
@@ -341,14 +370,17 @@
  "Focus title": "Fokuser på titel",
  "Folders": "Mapper",
  "For debugging purpose only: export your profile to an external SD card.": "Kun til fejlsøgning: Eksporter din profil til et eksternt SD-kort.",
+ "For example \"%s\"": "For eksempel \"%s\"",
  "For information on how to customise the shortcuts please visit %s": "For info om tilpasning af links, besøg %s",
  "For more information about End-To-End Encryption (E2EE) and advice on how to enable it please check the documentation:": "Se dokumentationen for nærmere oplysninger om End-To-End-kryptering (E2EE) og vejledning om hvordan det skal aktiveres:",
  "For the list of keyboard shortcuts and config options, type `help keymap`": "For at få vist listen af tastatur genveje og konfigurationsmuligheder, test `help keymap`",
  "Force path style": "Gennemtving sti-stil",
+ "Formatting": "Formatering",
  "Forward": "Videresend",
  "Found: %d.": "Fundet: %d.",
  "FTS enabled: %d": "Fuld-tekst søgning slået til: %d",
  "Full changelog": "Komplet ændringslog",
+ "Full name": "Fuldt navn",
  "General": "Generelt",
  "Generated": "Oprettet",
  "Generating link...": "Opretter link...",
@@ -358,11 +390,17 @@
  "Go to source URL": "Gå til kilde-URL",
  "Goto Anything...": "Gå til tilfældig...",
  "Grant authorisation": "Giv tilladelse",
+ "Header %d": "Overskrift %d",
+ "Headers": "Overskrifter",
  "Heading": "Overskrift",
  "Help": "Hjælp",
  "Hide %s": "Skjul %s",
+ "Hide advanced": "Skjul avancerede",
+ "Hide disabled": "Skjul deaktiverede",
  "Hide disabled keys": "Skjul deaktiverede nøgler",
  "Hide Joplin": "Skjul Joplin",
+ "Hide keyboard": "Skjul tastatur",
+ "Hide more actions": "Skjul flere handlinger",
  "Highlight": "Fremhæv",
  "Home": "Hjem",
  "Horizontal Rule": "Vandret linje",
@@ -387,12 +425,14 @@
  "In order to use the web clipper, you need to do the following:": "For at bruge Web-Clipperen skal du gøre følgende:",
  "In progress": "I gang",
  "In: %s": "I: %s",
+ "Increase indent level": "Øg indrykningsniveau",
  "Indent less": "Indryk mindre",
  "Indent more": "Indryk mere",
  "Information": "Information",
  "Inline Code": "Inline-kode",
  "Insert": "Indsæt",
  "Insert Hyperlink": "Indsæt hyperlink",
+ "Insert time": "Indsæt tid",
  "Install": "Installer",
  "Install from file": "Installér fra fil",
  "Installed": "Installeret",
@@ -423,6 +463,7 @@
  "Joplin Web Clipper allows saving web pages and screenshots from your browser to Joplin.": "Joplin Web-Clipper gør at du kan gemme hjemmesider og screenshots fra din browser i Joplin.",
  "Joplin website": "Joplin hjemmeside",
  "Joplin's own sync service. Also gives access to Joplin-specific features such as publishing notes or collaborating on notebooks with others.": "Joplin's egen synkroniseringstjeneste. Giver også adgang til særlige Joplin-funktioner såsom publicering af noter og samarbejde med andre om notesbøger.",
+ "KaTeX": "KaTeX",
  "Keep note history for": "Behold note-historie i",
  "Keyboard Mode": "Tastaturtilstand",
  "Keyboard Shortcut": "Tastaturgenvej",
@@ -440,9 +481,13 @@
  "Letter": "US Letter",
  "Light": "Lyst",
  "Lines": "Linjer",
+ "Link": "Link",
+ "Link description": "Link-kryptering",
  "Link has been copied to clipboard!": "Link er kopieret til udklipsholder!",
+ "Link text": "Link-tekst",
  "Links with protocol \"%s\" are not supported": "Links med \"%s\" protokollen er ikke understøttede",
  "List item": "Listepunkt",
+ "Lists": "Lister",
  "Loaded": "Indlæst",
  "Location": "Placering",
  "Lock file is already being hold. If you know that no synchronisation is taking place, you may delete the lock file at \"%s\" and resume the operation.": "Låsefil er allerede i brug. Hvis du ved at ingen synkronisering er i gang kan du slette låsefilen \"%s\" og genoptage synkroniseringen.",
@@ -456,6 +501,7 @@
  "Make a donation": "Giv en donation",
  "Manage master password": "Administrer hovedadgangskode",
  "Manage master password...": "Administrer hovedadgangskode...",
+ "Manage multiple users": "Administrer flere brugere",
  "Manage your plugins": "Administrer dine udvidelser",
  "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, `status`, `decrypt-file`, and `target-status`.": "Administrer E2EE-konfiguration. Kommandoer er `enable`(aktiver), `disable`(sluk), `decrypt`(dekrypter), `status`, `decrypt-file`(dekrypter fil) og `target-status` (modtager-status).",
  "Manual": "Manuel",
@@ -468,6 +514,9 @@
  "Master password": "Hovedadgangskode",
  "Master password:": "Hovedadgangskode:",
  "Max concurrent connections": "Maksimale samtidige forbindelser",
+ "Max Item Size": "Maks elementstørrelse",
+ "Max note or attachment size": "Maksimal størrelse af note eller vedhæftning",
+ "Max Total Size": "Maks samlet størrelse",
  "Missing keys": "Manglende nøgler",
  "Missing Master Keys": "Manglende hovednøgler",
  "Missing required argument: %s": "Mangler krævet argument: %s",
@@ -479,6 +528,7 @@
  "Move to notebook": "Flyt til notesbog",
  "Move to notebook...": "Flyt til notesbog...",
  "Move to notebook:": "Flyt til notesbog:",
+ "Moves the given <item> to [notebook]": "Flytter det givne <item> til [notebook].",
  "n": "n",
  "N": "N",
  "New note": "Ny note",
@@ -489,6 +539,7 @@
  "New tags:": "Nye etiketter:",
  "New to-do": "Ny opgave",
  "New version: %s": "Ny version: %s",
+ "Next match": "Næste match",
  "Nextcloud": "Nextcloud",
  "Nextcloud password": "Nextcloud-adgangskode",
  "Nextcloud username": "Nextcloud brugernavn",
@@ -516,6 +567,7 @@
  "Note attachments...": "Note-vedhæftninger...",
  "Note body": "Noteindhold",
  "Note does not exist: \"%s\". Create it?": "Note eksisterer ikke: \"%s\". Skal den oprettes?",
+ "Note editor": "Noteeditor",
  "Note has been saved.": "Note gemt.",
  "Note History": "Notehistore",
  "Note is not a to-do: \"%s\"": "Noten er ikke en opgave: \"%s\"",
@@ -546,12 +598,14 @@
  "Only one note can be printed at a time.": "Kun én note kan printes ad gangen.",
  "Open": "Åbn",
  "Open %s": "Åbn %s",
+ "Open PDF viewer": "Åbn PDF-viser",
  "Open profile directory": "Åbn profilmappe",
  "Open Sync Wizard...": "Open Synk-hjælper...",
  "Open...": "Åbn...",
  "Operation cancelled": "Udførelse annulleret",
  "Options": "Indstillinger",
  "Or create an account.": "Eller opret en konto.",
+ "Ordered list": "Sorteret liste",
  "Other applications...": "Andre applikationer...",
  "Output format: %s": "Output-format: %s",
  "Page orientation for PDF export": "Sideretning for PDF eksport",
@@ -563,8 +617,10 @@
  "Paste": "Indsæt",
  "Path:": "Sti:",
  "PDF File": "PDF-fil",
+ "Per user. Minimum of %d users.": "Pr. bruger. Minimum %d brugere.",
  "Permission needed": "Tilladelse nødvendig",
  "Permission to use camera": "Tilladelse til at bruge kameraet",
+ "Please click on \"%s\" to proceed, or set the passwords in the \"%s\" list below.": "Klik på \"%s\" for at fortsætte, eller indstil adgangskoderne på \"%s\"-listen nedenfor.",
  "Please confirm that you would like to re-encrypt your complete database.": "Bekræft venligst at du ønsker at genkryptere hele din database.",
  "Please enter your password in the master key list below before upgrading the key.": "Indtast din adgangskode i hovednøglelisten nedenfor før opgradering af nøglen.",
  "Please note that if it is a large notebook, it may take a few minutes for all the notes to show up on the recipient's device.": "Bemærk, at hvis der er tale om en stor notesbog, kan det tage et par minutter, før alle noter vises på modtagerens enhed.",
@@ -590,15 +646,22 @@
  "Press the shortcut": "Tryk på genvejen",
  "Press the shortcut and then press ENTER. Or, press BACKSPACE to clear the shortcut.": "Tryk på genvejen og tryk så på ENTER. Eller, tryk MELLEMRUMSTASTEN for at rydde genvejen.",
  "Press to set the decryption password.": "Klik for at gemme dekrypterings-adgangskodeord.",
+ "Previous match": "Forrige match",
  "Previous versions of this note": "Tidligere udgaver af denne note",
  "Print": "Udskriv",
+ "Priority support": "Prioriteret support",
  "Privacy Policy": "Privatlivspolitik",
+ "Pro": "Pro",
  "Process failed payment subscriptions": "Behandl mislykkede betalingsabonnementer",
  "Process oversized accounts": "Behandl for store konti",
  "Process user deletions": "Behandl brugersletninger",
  "Profile": "Profil",
+ "Profile name:": "Profilnavn:",
  "Profile Version: %s": "Profil-version: %s",
  "Properties": "Egenskaber",
+ "Proxy enabled": "Proxy aktiveret",
+ "Proxy timeout (seconds)": "Proxy timeout (sekunder)",
+ "Proxy URL": "Proxy-URL",
  "Public-private key pair:": "Offentligt-privat nøglepar:",
  "Publish note...": "Publicer note...",
  "Publish Notes": "Publicer noter",
@@ -615,6 +678,7 @@
  "Recipients:": "Modtagere:",
  "Redo": "Gentag",
  "Refresh": "Opfrisk",
+ "Regular expression": "Almindeligt udtryk",
  "Reject": "Afvis",
  "Remove": "Fjern",
  "Remove tag \"%s\" from all notes?": "Slet etikette \"%s\" fra alle noter?",
@@ -624,6 +688,10 @@
  "Rename tag:": "Omdøb etikette:",
  "Renames the given <item> (note or notebook) to <name>.": "Omdøber det aktuelle <item> (note eller notesbog) til <name>.",
  "Renew token": "Forny token",
+ "Replace": "Erstat",
+ "Replace all": "Erstat alt",
+ "Replace with...": "Erstat med...",
+ "Replace: ": "Erstat: ",
  "Reset master password": "Nulstil hovedadgangskode",
  "Resources: %d.": "Ressourcer: %d.",
  "Restart and upgrade": "Genstart og upgradér",
@@ -631,7 +699,7 @@
  "Restore": "Gendan",
  "Restored Notes": "Gendannede noter",
  "Retry": "Prøv igen",
- "Retry All": "Prøv Alle",
+ "Retry All": "Prøv alle",
  "Reveal file in folder": "Vis fil i mappe",
  "Reverse sort order": "Omvendt sorteringsorden",
  "Reverses the sorting order.": "Modsat sortering.",
@@ -646,11 +714,13 @@
  "Safe mode is currently active. Note rendering and all plugins are temporarily disabled.": "Fejlsikret tilstand er aktiv i øjeblikket. Notegengivelse og alle plugins er midlertidigt deaktiveret.",
  "Save": "Gem",
  "Save alarm": "Gem alarm",
+ "Save as %s": "Gem som %s",
  "Save as...": "Gem som...",
  "Save changes": "Gem ændringer",
  "Save geo-location with notes": "Gem geo-lokation i noter",
  "Search": "Søg",
  "Search for plugins...": "Søg efter udvidelser...",
+ "Search for...": "Søg efter...",
  "Search in all the notes": "Søg i alle noterne",
  "Search in current note": "Søg i denne note",
  "Search...": "Søg...",
@@ -670,17 +740,23 @@
  "Set the password": "Indstil adgangskoden",
  "Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s": "Sætter ejerskab <name> af valgt <note> til aktuel [value]. Mulige ejerskab er:\n\n%s",
  "Share": "Del",
+ "Share and collaborate on a notebook": "Del og samarbejd om en notesbog",
  "Share Notebook": "Del notesbog",
  "Share notebook...": "Del notesbog...",
+ "Sharing access control": "Adgangskontrol ved deling",
  "Sharing notebook...": "Deler notesbog...",
  "Shortcuts are not available in CLI mode.": "Links er ikke til rådighed i CLI-tilstand.",
+ "Show advanced": "Vis avancerede",
  "Show Advanced Settings": "Vis avancerede indstillinger",
  "Show all": "Vis alt",
  "Show completed to-dos": "Vis færdige opgaver",
+ "Show disabled": "Vis deaktiverede",
  "Show disabled keys": "Vis deaktiverede nøgler",
+ "Show more actions": "Vis flere handlinger",
  "Show note counts": "Vis noteantal",
  "Show sort order buttons": "Vis knapper til sorteringsrækkefølge",
  "Show tray icon": "Vis ikon på bundbjælke",
+ "Show/hide the sidebar": "Vis/skjul sidebjælken",
  "Sidebar": "Sidebjælke",
  "Size": "Størrelse",
  "Skip this version": "Spring denne version over",
@@ -725,9 +801,12 @@
  "Swap line down": "Ombyt linje nedad",
  "Swap line up": "Ombyt linje opad",
  "Switch between note and to-do type": "Skift mellem note- og opgave type",
+ "Switch profile": "Skift profil",
  "Switch to note type": "Skift til note",
+ "Switch to profile %d": "Skift til profil %d",
  "Switch to to-do type": "Skift til opgave",
  "Switches to [notebook] - all further operations will happen within this notebook.": "Skifter til [notebook] - alle fremtidige handlinger sker i denne notesbog.",
+ "Sync as many devices as you want": "Synkroniser så mange enheder, du vil",
  "Sync Status": "Synkroniseringsstatus",
  "Sync status (synced items / total items)": "Synk status (synk'ede emner / emner i alt)",
  "Sync target must be upgraded! Run `%s` to proceed.": "Synk-mål skal opgraderes! Kør `%s` for at fortsætte.",
@@ -747,13 +826,17 @@
  "Synchronising...": "Synkroniserer...",
  "Synchronizing...": "Synkroniserer...",
  "Tabloid": "US Tabloid",
+ "tag1, tag2, ...": "etiket1, etiket2, ...",
  "Tagged: %d.": "Etiketterede: %d.",
  "Tags": "Etiketter",
  "Take photo": "Tag et foto",
+ "Task list": "Opgaveliste",
  "Tasks": "Opgaver",
+ "Teams": "Teams",
  "Text editor command": "Tekstredigeringskomando",
  "Thank you! Your Joplin Cloud account is now setup and ready to use.": "Mange tak! Din Joplin Cloud-konto er nu indstillet og klar til brug.",
  "The app is now going to close. Please relaunch it to complete the process.": "Appen lukker nu. Genstart den for at fuldføre processen.",
+ "The application did not close properly. Would you like to start in safe mode?": "Programmet blev ikke lukket korrekt. Ønsker du at starte i fejlsikret tilstand?",
  "The application has been authorised - you may now close this browser tab.": "App'en er blevet godkendt - du kan nu lukke dette faneblad.",
  "The application has been authorised!": "App'en er succesfuldt godkendt!",
  "The application has been successfully authorised.": "Denne app er succesfuldt godkendt.",
@@ -821,6 +904,7 @@
  "To retry decryption of these items. Run `e2ee decrypt --retry-failed-items`": "For at prøve at dekryptere dem igen. Kør `e2ee decrypt --retry-failed-items`",
  "To work correctly, the app needs the following permissions. Please enable them in your phone settings, in Apps > Joplin > Permissions": "For at virke korrekt skal app'en bruge følgende tilladelser. Slå dem til i din telefons indstillinger, i Apps > Joplin > Tilladelser",
  "to-do": "opgave",
+ "to-do: %s": "opgave: %s",
  "Toggle comment": "Vis kommentar",
  "Toggle development tools": "Slå udviklingsværktøjer til eller fra",
  "Toggle editor layout": "Skift editor layout",
@@ -833,8 +917,10 @@
  "Toggle sort order field": "Slå felt for sorteringsrækkefølge til eller fra",
  "Token has been copied to the clipboard!": "Din token er blevet kopieret til udklipsholderen!",
  "Tools": "Værktøjer",
+ "Total Size": "Samlet størrelse",
  "Total: %d/%d": "I alt: %d/%d",
  "Try again": "Prøv igen",
+ "Try it now": "Prøv det nu",
  "Type `help [command]` for more information about a command; or type `help all` for the complete usage information.": "Tast `help [kommando]` for mere info om en kommando; eller tast `help all` for fuld brugsinformation.",
  "Type `joplin help` for usage information.": "Tast `Joplin help` for alm. info.",
  "Type a note title or part of its content to jump to it. Or type # followed by a tag name, or @ followed by a notebook name. Or type : to search for commands.": "Skriv titlen på en note eller noget af notens indhold for at hoppe til den. Eller skriv # efterfulgt af et etikettenavn, eller @ efterfulgt af en notesbogs navn. Eller skriv: for at søge efter kommandoer.",
@@ -844,6 +930,7 @@
  "Undo": "Fortryd",
  "Unknown flag: %s": "Ukendt markering: %s",
  "Unknown item type downloaded - please upgrade Joplin to the latest version": "Ukendt elementtype downloadet - opgrader venligst Joplin til den seneste version",
+ "Unordered list": "Usorteret liste",
  "Unpublish note": "Afpublicer note",
  "Unshare": "Del ikke længere",
  "Unshare this notebook? The recipients will no longer have access to its content.": "Del ikke længere denne notesbog? Modtagerne vil ikke længere have adgang til dens indhold.",
@@ -903,6 +990,7 @@
  "You may use the tool below to re-encrypt your data, for example if you know that some of your notes are encrypted with an obsolete encryption method.": "Du kan bruge værktøjet nedenfor til at genkryptere dine data for eksempel hvis du ved at nogle af dine noter er krypteret med en forældet krypteringsmetode.",
  "Your choice: ": "Dit valg: ",
  "Your data is going to be re-encrypted and synced again.": "Dine data bliver genkrypteret og synkroniseret igen.",
+ "Your password is needed to decrypt some of your data.": "Din adgangskode er nødvendig for at dekryptere nogle af dine data.",
  "Your password is needed to decrypt some of your data. Type `:e2ee decrypt` to set it.": "Din adgangskode er nødvendig for at dekryptere nogle af dine data. Tast `:e2ee decrypt` for at indstille den.",
  "Your permission to use your camera is required.": "Din tilladelse til at bruge kameraet er påkrævet.",
  "Your version: %s": "Din version: %s",

packages/lib/locales/de_DE.json

@@ -1,8 +1,12 @@
 {
  "\"%s\" is missing the required \"%s\" property.": "„%s“ fehlt die erforderliche Eigenschaft „%s“.",
  "%d days": "%d Tage",
+ "%d GB": "%d GB",
+ "%d GB storage space": "%d GB Speicherplatz",
  "%d hour": "%d Stunde",
  "%d hours": "%d Stunden",
+ "%d MB": "&d MB",
+ "%d MB per note or attachment": "%d MB pro Notiz oder Anhang",
  "%d minutes": "%d Minuten",
  "%d notes match this pattern. Delete them?": "%d Notizen stimmen mit diesem Muster überein. Sollen sie gelöscht werden?",
  "%s %s (%s, %s)": "%s %s (%s, %s)",
@@ -27,6 +31,7 @@
  "&Tools": "&Werkzeuge",
  "&View": "&Ansicht",
  "(%s)": "(%s)",
+ "(In plugin: %s)": "(In Erweiterung: %s)",
  "(None)": "(Keiner)",
  "(wysiwyg: %s)": "(WYSIWYG: %s)",
  "- Camera: to allow taking a picture and attaching it to a note.": "- Kamera: um ein Bild aufzunehmen und an eine Notiz anzuhängen.",
@@ -42,11 +47,13 @@
  "Accelerator \"%s\" is not valid.": "Der Beschleuniger „%s“ ist nicht gültig.",
  "Accelerator \"%s\" is used for \"%s\" and \"%s\" commands. This may lead to unexpected behaviour.": "Der Beschleuniger „%s“ wird für die Befehle „%s“ und „%s“ verwendet. Dies kann zu unerwartetem Verhalten führen.",
  "Accept": "Akzeptieren",
+ "Account": "Konto",
  "Action": "Aktion",
  "Actions": "Aktionen",
  "Active": "Aktiv",
  "Actual Size": "Aktuelle Größe",
  "Add body": "Text hinzufügen",
+ "Add new": "Neu hinzufügen",
  "Add or remove tags:": "Schlagwörter hinzufügen oder entfernen:",
  "Add recipient:": "Füge Empfänger hinzu:",
  "Add title": "Titel hinzufügen",
@@ -60,6 +67,8 @@
  "Also displays unset and hidden config variables.": "Zeigt auch nicht gesetzte und versteckte Konfigurationsvariablen an.",
  "Also publish linked notes": "Auch verlinkte Notizen veröffentlichen",
  "Always": "Immer",
+ "Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to see the short notebook id or use $b for current selected notebook": "Zweideutiges Notizbuch „%s“. Bitte verwende stattdessen die Notizbuch-ID - drücke „ti“, um die kurze Notizbuch-ID zu sehen oder verwende $b für das aktuell ausgewählte Notizbuch",
+ "Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti\" to see the short notebook id": "Zweideutiges Notizbuch „%s“. Bitte verwende stattdessen die kurze Notizbuch-ID - drücke „ti“, um die kurze Notizbuch-ID zu sehen",
  "An update is available, do you want to download it now?": "Es ist eine Aktualisierung verfügbar. Soll sie jetzt heruntergeladen werden?",
  "Appearance": "Erscheinungsbild",
  "Application": "Anwendung",
@@ -67,6 +76,7 @@
  "Are you sure you want to renew the authorisation token?": "Bist du sicher, dass du den Berechtigungstoken erneuern möchtest?",
  "Arguments:": "Kommandozeilenargumente:",
  "Aritim Dark": "Aritim dunkel",
+ "Attach": "Anhängen",
  "Attach file": "Datei anhängen",
  "Attach photo": "Foto anhängen",
  "Attach...": "Anhängen ...",
@@ -85,10 +95,12 @@
  "Automatically check for updates": "Automatisch auf Aktualisierungen prüfen",
  "Automatically switch theme to match system theme": "Automatisch das Design ändern, um es dem System-Design anzupassen",
  "Back": "Zurück",
+ "Basic": "Standard",
  "Bold": "Fett",
  "Browse all plugins": "Alle Erweiterungen durchsuchen",
  "Browse...": "Durchsuchen ...",
  "Bulleted List": "Aufzählung",
+ "Can Share": "Teilen möglich",
  "Cancel": "Abbrechen",
  "Cancelling background synchronisation... Please wait.": "Hintergrundsynchronisation wird abgebrochen … Bitte warten.",
  "Cancelling...": "Wird abgebrochen ...",
@@ -106,6 +118,7 @@
  "Cannot save %s \"%s\" because it is larger than the allowed limit (%s)": "Kann %s „%s“ nicht speichern, da es größer ist als das erlaubte Limit (%s)",
  "Cannot save %s \"%s\" because it would go over the total allowed size (%s) for this account": "Kann %s „%s“ nicht speichern, da es die zulässige Gesamtgröße (%s) für dieses Konto überschreiten würde",
  "Cannot share encrypted notebook with recipient %s because they have not enabled end-to-end encryption. They may do so from the screen Configuration > Encryption.": "Das verschlüsselte Notizbuch kann nicht mit %s geteilt werden, da die Person die Ende-zu-Ende Verschlüsselung nicht aktiviert hat. Dies ist unter Optionen > Verschlüsselung möglich.",
+ "Case sensitive": "Groß- und Kleinschreibung beachtend",
  "Change application layout": "Anwendungs-Layout ändern",
  "Change language": "Sprache ändern",
  "Characters": "Zeichen",
@@ -128,6 +141,7 @@
  "Code Block": "Code-Block",
  "Code View": "Code-Ansicht",
  "Collaborate on notebooks with others": "Gemeinsam mit anderen an Notizbüchern arbeiten",
+ "Collapse": "Einklappen",
  "Coming alarms": "Anstehende Alarme",
  "Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem. Note that if you make changes to the TLS settings, you must save your changes before clicking on \"Check synchronisation configuration\".": "Kommagetrennte Liste von Pfaden zu Verzeichnissen, aus denen die Zertifikate geladen werden, oder Pfad zu einzelnen Zertifikatsdateien. Zum Beispiel: /my/cert_dir, /other/custom.pem. Wenn du Änderungen an den TLS-Einstellungen vornimmst, musst du deine Änderungen speichern, bevor du auf „Synchronisierungskonfiguration prüfen“ klickst.",
  "command": "Befehl",
@@ -145,6 +159,7 @@
  "Conflicted: %d": "Im Konflikt: %d",
  "Conflicts": "Konflikte",
  "Conflicts (attachments)": "Konflikte (Anhänge)",
+ "Consolidated billing": "Konsolidierte Rechnung",
  "Content provided by %s": "Von %s bereitgestellte Inhalte",
  "Convert to note": "In eine Notiz umwandeln",
  "Convert to todo": "In eine Aufgabe umwandeln",
@@ -196,6 +211,7 @@
  "Date": "Datum",
  "Date format": "Datumsformat",
  "days": "Tage",
+ "Decrease indent level": "Einrückung verringern",
  "Decrypted items: %d": "Entschlüsselte Objekte: %d",
  "Decrypted items: %s / %s": "Entschlüsselte Objekte: %s / %s",
  "Decrypting items: %d/%d": "Entschlüsselte Objekte: %d/%d",
@@ -212,6 +228,7 @@
  "Delete notebook \"%s\"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.": "Notizbuch „%s“ löschen?\n\nAlle Notizen und Unter-Notizbücher in diesem Notizbuch werden ebenfalls gelöscht.",
  "Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.": "Notizbuch löschen? Alle Notizen und Unter-Notizbücher in diesem Notizbuch werden ebenfalls gelöscht.",
  "Delete plugin \"%s\"?": "Erweiterung „%s“ löschen?",
+ "Delete selected notes": "Ausgewählte Notizen löschen",
  "Delete these %d notes?": "Sollen diese %d Notizen gelöscht werden?",
  "Delete this invitation? The recipient will no longer have access to this shared notebook.": "Einladung löschen? Der Empfänger hat dann keinen Zugriff mehr auf dieses freigegebene Notizbuch.",
  "Deleted local items: %d.": "Lokale Elemente gelöscht: %d.",
@@ -243,6 +260,7 @@
  "Do it now": "Mach es jetzt",
  "Do not ask for confirmation.": "Nicht nach einer Bestätigung fragen.",
  "Do not lose the password as, for security purposes, this will be the *only* way to decrypt the data! To enable encryption, please enter your password below.": "Achte darauf, dass du das Passwort nicht verlierst, da dies aus Sicherheitsgründen die *einzige* Möglichkeit ist, deine Daten zu entschlüsseln! Um die Verschlüsselung zu aktivieren, gib bitte unten dein Passwort ein.",
+ "Done": "Fertig",
  "Download": "Herunterladen",
  "Download and install the relevant extension for your browser:": "Lade die entsprechende Erweiterung für deinen Browser herunter und installiere sie:",
  "Downloaded": "Heruntergeladen",
@@ -256,9 +274,11 @@
  "Dropbox Login": "Dropbox-Anmeldung",
  "Duplicate": "Duplizieren",
  "Duplicate line": "Dupliziere Zeile",
+ "Duplicate selected notes": "Ausgewählte Notizen duplizieren",
  "Duplicates the notes matching <note> to [notebook]. If no notebook is specified the note is duplicated in the current notebook.": "Dupliziert die Notizen, die mit <note> übereinstimmen, nach [notebook]. Wenn kein Notizbuch angegeben ist, wird die Notiz im aktuellen Notizbuch dupliziert.",
  "Edit": "Bearbeiten",
  "Edit in external editor": "Im externen Editor bearbeiten",
+ "Edit link": "Link bearbeiten",
  "Edit note.": "Notiz bearbeiten.",
  "Edit notebook": "Notizbuch bearbeiten",
  "Edit profile configuration...": "Profilkonfiguration bearbeiten...",
@@ -320,6 +340,7 @@
  "Evernote Export File (as HTML)": "Evernote Export-Datei (als HTML)",
  "Evernote Export File (as Markdown)": "Evernote Export-Datei (als Markdown)",
  "Exits the application.": "Beendet die Anwendung.",
+ "Expand": "Erweitern",
  "Export": "Exportieren",
  "Export all": "Alles exportieren",
  "Export debug report": "Ereignisprotokoll exportieren",
@@ -339,6 +360,8 @@
  "File": "Datei",
  "File system": "Dateisystem",
  "Filter tags": "Tags filtern",
+ "Find and replace": "Suchen und ersetzen",
+ "Find: ": "Suche: ",
  "Firefox Extension": "Firefox-Erweiterung",
  "Fix search index": "Suchindex reparieren",
  "Fixing search index...": "Suchindex wird repariert ...",
@@ -347,14 +370,17 @@
  "Focus title": "Titel fokussieren",
  "Folders": "Ordner",
  "For debugging purpose only: export your profile to an external SD card.": "Nur für Debugging-Zwecke: Exportiere dein Profil auf eine externe SD-Karte.",
+ "For example \"%s\"": "Zum Beispiel „%s“",
  "For information on how to customise the shortcuts please visit %s": "Für weitere Informationen über die Anpassung von Tastenkürzel besuche bitte %s",
  "For more information about End-To-End Encryption (E2EE) and advice on how to enable it please check the documentation:": "Weitere Informationen zur Ende-zu-Ende-Verschlüsselung (E2EE) und Hinweise zur Aktivierung findest du in der Dokumentation (auf Englisch):",
  "For the list of keyboard shortcuts and config options, type `help keymap`": "Um die komplette Liste aller verfügbaren Tastenkürzel und Konfigurationseinstellungen anzuzeigen, tippe `help keymap` ein",
  "Force path style": "Pfadstil erzwingen",
+ "Formatting": "Formatierung",
  "Forward": "Weiter",
  "Found: %d.": "Gefunden: %d.",
  "FTS enabled: %d": "FTS aktiviert: %d",
  "Full changelog": "Komplettes Änderungsprotokoll",
+ "Full name": "Ganzer Name",
  "General": "Allgemeines",
  "Generated": "Erzeugt",
  "Generating link...": "Link wird erzeugt ...",
@@ -364,11 +390,17 @@
  "Go to source URL": "Zur Quell-URL gehen",
  "Goto Anything...": "Gehe zu ...",
  "Grant authorisation": "Genehmigung erteilen",
+ "Header %d": "Kopfzeile %d",
+ "Headers": "Kopfzeilen",
  "Heading": "Überschrift",
  "Help": "Hilfe",
  "Hide %s": "%s ausblenden",
+ "Hide advanced": "Erweitertes verstecken",
+ "Hide disabled": "Deaktiviertes verstecken",
  "Hide disabled keys": "Deaktivierte Schlüssel ausblenden",
  "Hide Joplin": "Joplin ausblenden",
+ "Hide keyboard": "Tastatur verstecken",
+ "Hide more actions": "Mehr Aktionen verstecken",
  "Highlight": "Hervorheben",
  "Home": "Startseite",
  "Horizontal Rule": "Horizontale Linie",
@@ -393,12 +425,14 @@
  "In order to use the web clipper, you need to do the following:": "Um den Web-Clipper zu benutzen, musst du Folgendes tun:",
  "In progress": "In Bearbeitung",
  "In: %s": "In: %s",
+ "Increase indent level": "Einrückung vergrößern",
  "Indent less": "Ausrücken",
  "Indent more": "Einrücken",
  "Information": "Information",
  "Inline Code": "Code im Fließtext",
  "Insert": "Einfügen",
  "Insert Hyperlink": "Weblink einfügen",
+ "Insert time": "Uhrzeit einfügen",
  "Install": "Installieren",
  "Install from file": "Aus Datei installieren",
  "Installed": "Installiert",
@@ -429,6 +463,7 @@
  "Joplin Web Clipper allows saving web pages and screenshots from your browser to Joplin.": "Joplin Web-Clipper ermöglicht das Speichern von Webseiten und Screenshots aus deinem Browser in Joplin.",
  "Joplin website": "Joplin Webseite",
  "Joplin's own sync service. Also gives access to Joplin-specific features such as publishing notes or collaborating on notebooks with others.": "Joplins eigener Synchronisationsdienst. Ermöglicht auch den Zugriff auf Joplin-spezifische Funktionen wie das Veröffentlichen von Notizen oder die Zusammenarbeit an Notizbüchern mit anderen.",
+ "KaTeX": "KaTeX",
  "Keep note history for": "Notizenverlauf speichern für",
  "Keyboard Mode": "Tastatur-Modus",
  "Keyboard Shortcut": "Tastaturkürzel",
@@ -446,9 +481,13 @@
  "Letter": "Letter",
  "Light": "Hell",
  "Lines": "Zeilen",
+ "Link": "Link",
+ "Link description": "Link-Beschreibung",
  "Link has been copied to clipboard!": "Der Link wurde in die Zwischenablage kopiert!",
+ "Link text": "Link-Text",
  "Links with protocol \"%s\" are not supported": "Links mit dem Protokoll „%s“ werden nicht unterstützt",
  "List item": "Listeneintrag",
+ "Lists": "Listen",
  "Loaded": "Geladen",
  "Location": "Standort",
  "Lock file is already being hold. If you know that no synchronisation is taking place, you may delete the lock file at \"%s\" and resume the operation.": "Eine Sperrdatei ist vorhanden. Wenn du dir sicher bist, dass keine Synchronisation im Gange ist, kannst du die Sperrdatei „%s“ löschen und den Vorgang fortsetzen.",
@@ -462,6 +501,7 @@
  "Make a donation": "Spenden",
  "Manage master password": "Master-Passwort verwalten",
  "Manage master password...": "Master-Passwort verwalten...",
+ "Manage multiple users": "Verwalte mehrere Nutzer",
  "Manage your plugins": "Erweiterungen verwalten",
  "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, `status`, `decrypt-file`, and `target-status`.": "Verwaltet die E2EE-Konfiguration. Die Befehle lauten `enable`, `disable`, `decrypt`, `status`, `decrypt-file` und `target-status`.",
  "Manual": "Manuell",
@@ -474,6 +514,9 @@
  "Master password": "Master-Passwort",
  "Master password:": "Master-Passwort:",
  "Max concurrent connections": "Maximale Anzahl an gleichzeitigen Verbindungen",
+ "Max Item Size": "Maximale Elementgröße",
+ "Max note or attachment size": "Maximale Notiz- oder Anhanggröße",
+ "Max Total Size": "Maximale Gesamtgröße",
  "Missing keys": "Fehlende Schlüssel",
  "Missing Master Keys": "Fehlende Hauptschlüssel",
  "Missing required argument: %s": "Fehlendes erforderliches Argument: %s",
@@ -485,6 +528,7 @@
  "Move to notebook": "Verschiebe in das Notizbuch",
  "Move to notebook...": "In Notizbuch verschieben ...",
  "Move to notebook:": "Verschiebe in das Notizbuch:",
+ "Moves the given <item> to [notebook]": "Verschiebt das gewählte <item> nach [notebook]",
  "n": "n",
  "N": "N",
  "New note": "Neue Notiz",
@@ -495,6 +539,7 @@
  "New tags:": "Neue Schlagwörter:",
  "New to-do": "Neue Aufgabe",
  "New version: %s": "Neue Version: %s",
+ "Next match": "Nächste Übereinstimmung",
  "Nextcloud": "Nextcloud",
  "Nextcloud password": "Nextcloud-Passwort",
  "Nextcloud username": "Nextcloud-Benutzername",
@@ -522,6 +567,7 @@
  "Note attachments...": "Notiz-Anhänge ...",
  "Note body": "Notiz-Text",
  "Note does not exist: \"%s\". Create it?": "Notiz „%s“ existiert nicht. Soll sie erstellt werden?",
+ "Note editor": "Notiz-Editor",
  "Note has been saved.": "Die Notiz wurde gespeichert.",
  "Note History": "Notizenverlauf",
  "Note is not a to-do: \"%s\"": "Notiz ist keine Aufgabe: „%s“",
@@ -552,12 +598,14 @@
  "Only one note can be printed at a time.": "Es kann jeweils nur eine Notiz gedruckt werden.",
  "Open": "Öffnen",
  "Open %s": "Öffne %s",
+ "Open PDF viewer": "PDF-Betrachter öffnen",
  "Open profile directory": "Profilverzeichnis öffnen",
  "Open Sync Wizard...": "Sync-Assistent öffnen...",
  "Open...": "Öffnen ...",
  "Operation cancelled": "Vorgang abgebrochen",
  "Options": "Optionen",
  "Or create an account.": "Oder erstelle ein Konto.",
+ "Ordered list": "Geordnete Liste",
  "Other applications...": "Andere Anwendungen...",
  "Output format: %s": "Ausgabeformat: %s",
  "Page orientation for PDF export": "Seitenausrichtung für den PDF-Export",
@@ -569,6 +617,7 @@
  "Paste": "Einfügen",
  "Path:": "Pfad:",
  "PDF File": "PDF-Datei",
+ "Per user. Minimum of %d users.": "Pro Nutzer. Minimum von %d Nutzern.",
  "Permission needed": "Berechtigung benötigt",
  "Permission to use camera": "Berechtigung zur Verwendung der Kamera",
  "Please click on \"%s\" to proceed, or set the passwords in the \"%s\" list below.": "Bitte klicke auf „%s“, um fortzufahren, oder trage die Passwörter in die Liste „%s“ unten ein.",
@@ -597,9 +646,12 @@
  "Press the shortcut": "Drücke die Tastenkombination",
  "Press the shortcut and then press ENTER. Or, press BACKSPACE to clear the shortcut.": "Drücke die Tastenkombination und dann EINGABE. Oder drücke die RÜCKTASTE, um die Tastenkombination zu löschen.",
  "Press to set the decryption password.": "Tippe hier, um das Entschlüsselungspasswort festzulegen.",
+ "Previous match": "Vorherige Übereinstimmung",
  "Previous versions of this note": "Vorherige Version dieser Notiz",
  "Print": "Drucken",
+ "Priority support": "Premium Support",
  "Privacy Policy": "Datenschutzrichtlinie",
+ "Pro": "Pro",
  "Process failed payment subscriptions": "Verarbeite fehlgeschlagene Zahlungsabonnements",
  "Process oversized accounts": "Verarbeite zu große Konten",
  "Process user deletions": "Verarbeite Benutzerlöschungen",
@@ -607,6 +659,9 @@
  "Profile name:": "Profilname:",
  "Profile Version: %s": "Profil-Version: %s",
  "Properties": "Eigenschaften",
+ "Proxy enabled": "Proxy aktiviert",
+ "Proxy timeout (seconds)": "Proxy Zeitüberschreitung (Sekunden)",
+ "Proxy URL": "Proxy URL",
  "Public-private key pair:": "Öffentlich-Privates Schlüsselpaar:",
  "Publish note...": "Notiz veröffentlichen...",
  "Publish Notes": "Notizen veröffentlichen",
@@ -623,6 +678,7 @@
  "Recipients:": "Empfänger:",
  "Redo": "Wiederholen",
  "Refresh": "Neu laden",
+ "Regular expression": "Regulärer Ausdruck",
  "Reject": "Ablehnen",
  "Remove": "Entfernen",
  "Remove tag \"%s\" from all notes?": "Schlagwort „%s“ von allen Notizen entfernen?",
@@ -632,6 +688,10 @@
  "Rename tag:": "Schlagwort umbenennen:",
  "Renames the given <item> (note or notebook) to <name>.": "Benennt das angegebene <item> (Notiz oder Notizbuch) zu <name> um.",
  "Renew token": "Token erneuern",
+ "Replace": "Ersetzen",
+ "Replace all": "Alle ersetzen",
+ "Replace with...": "Ersetzen mit...",
+ "Replace: ": "Ersetze: ",
  "Reset master password": "Master-Passwort zurücksetzen",
  "Resources: %d.": "Anhänge: %d.",
  "Restart and upgrade": "Neustarten und aktualisieren",
@@ -660,6 +720,7 @@
  "Save geo-location with notes": "Momentanen Standort zusammen mit Notizen speichern",
  "Search": "Suchen",
  "Search for plugins...": "Suche nach Erweiterungen ...",
+ "Search for...": "Suche nach...",
  "Search in all the notes": "Alle Notizen durchsuchen",
  "Search in current note": "Aktuelle Notiz durchsuchen",
  "Search...": "Suchen ...",
@@ -679,17 +740,23 @@
  "Set the password": "Gib das Passwort ein",
  "Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s": "Setzt die Eigenschaft <name> der gegebenen <note> auf den gegebenen [Wert]. Mögliche Werte sind:\n\n%s",
  "Share": "Teilen",
+ "Share and collaborate on a notebook": "Teile Notizbücher und kollaboriere an ihnen",
  "Share Notebook": "Notizbuch teilen",
  "Share notebook...": "Notizbuch teilen...",
+ "Sharing access control": "Kontrolle der Zugriffsfreigaben",
  "Sharing notebook...": "Notizbuch wird geteilt ...",
  "Shortcuts are not available in CLI mode.": "Tastenkürzel sind im CLI-Modus nicht verfügbar.",
+ "Show advanced": "Erweitertes anzeigen",
  "Show Advanced Settings": "Erweiterte Einstellungen anzeigen",
  "Show all": "Zeige alles",
  "Show completed to-dos": "Abgeschlossene Aufgaben anzeigen",
+ "Show disabled": "Deaktiviertes anzeigen",
  "Show disabled keys": "Deaktivierte Schlüssel anzeigen",
+ "Show more actions": "Mehr Aktionen anzeigen",
  "Show note counts": "Notizanzahl anzeigen",
  "Show sort order buttons": "Knöpfe zur Einstellung der Sortierreihenfolge anzeigen",
  "Show tray icon": "Taskleistensymbol anzeigen",
+ "Show/hide the sidebar": "Zeige/Verstecke die Seitenleiste",
  "Sidebar": "Seitenleiste",
  "Size": "Größe",
  "Skip this version": "Überspringe diese Version",
@@ -739,6 +806,7 @@
  "Switch to profile %d": "Wechsle zu Profil %d",
  "Switch to to-do type": "Zu Aufgaben-Typ wechseln",
  "Switches to [notebook] - all further operations will happen within this notebook.": "Wechselt zu [notebook] - alle weiteren Aktionen werden in diesem Notizbuch ausgeführt.",
+ "Sync as many devices as you want": "Synchronisierung beliebig vieler Geräte",
  "Sync Status": "Synchronisationsstatus",
  "Sync status (synced items / total items)": "Synchronisationsstatus (synchronisierte Elemente / Elemente insgesamt)",
  "Sync target must be upgraded! Run `%s` to proceed.": "Das Synchronisationsziel muss aktualisiert werden! Führe `%s` aus, um fortzufahren.",
@@ -762,7 +830,9 @@
  "Tagged: %d.": "Verschlagwortet: %d.",
  "Tags": "Schlagwörter",
  "Take photo": "Foto aufnehmen",
+ "Task list": "Aufgaben-Liste",
  "Tasks": "Aufgaben",
+ "Teams": "Teams",
  "Text editor command": "Texteditor-Befehl",
  "Thank you! Your Joplin Cloud account is now setup and ready to use.": "Vielen Dank! Das Joplin Cloud-Konto ist nun eingerichtet und einsatzbereit.",
  "The app is now going to close. Please relaunch it to complete the process.": "Die App wird nun geschlossen. Bitte starte sie erneut, um den Vorgang abzuschließen.",
@@ -834,6 +904,7 @@
  "To retry decryption of these items. Run `e2ee decrypt --retry-failed-items`": "Um die Entschlüsselung dieser Objekte nochmal zu versuchen, führe `e2ee decrypt --retry-failed-items` aus",
  "To work correctly, the app needs the following permissions. Please enable them in your phone settings, in Apps > Joplin > Permissions": "Um korrekt arbeiten zu können, benötigt die App die folgenden Berechtigungen. Bitte aktiviere diese in deinen Telefoneinstellungen, unter Apps > Joplin > Berechtigungen",
  "to-do": "Aufgabe",
+ "to-do: %s": "To-Do: %s",
  "Toggle comment": "Kommentar ein-/ausschalten",
  "Toggle development tools": "Entwicklerwerkzeuge ein-/ausschalten",
  "Toggle editor layout": "Editor-Layout umschalten",
@@ -846,8 +917,10 @@
  "Toggle sort order field": "Ändere die Sortierreihenfolge",
  "Token has been copied to the clipboard!": "Token wurde in die Zwischenablage kopiert!",
  "Tools": "Werkzeuge",
+ "Total Size": "Gesamtgröße",
  "Total: %d/%d": "Insgesamt: %d/%d",
  "Try again": "Versuche es erneut",
+ "Try it now": "Jetzt testen",
  "Type `help [command]` for more information about a command; or type `help all` for the complete usage information.": "Tippe `help [Befehl]`, um weitere Informationen über einen Befehl zu erhalten oder tippe `help all` für die vollständigen Hinweise zur Nutzung des Befehls.",
  "Type `joplin help` for usage information.": "Gib `joplin help` für Informationen zur Benutzung ein.",
  "Type a note title or part of its content to jump to it. Or type # followed by a tag name, or @ followed by a notebook name. Or type : to search for commands.": "Gib den Titel einer Notiz oder einen Teil seines Inhalts ein, um dorthin zu springen. Oder gib # gefolgt von einem Schlagwort oder @ gefolgt vom Namen eines Notizbuchs ein. Oder gib : für eine Suche nach Kommandos ein.",
@@ -857,6 +930,7 @@
  "Undo": "Rückgängig",
  "Unknown flag: %s": "Unbekanntes Argument: %s",
  "Unknown item type downloaded - please upgrade Joplin to the latest version": "Unbekannter Eintrags-Typ heruntergeladen - bitte aktualisiere Joplin",
+ "Unordered list": "Ungeordnete Liste",
  "Unpublish note": "Veröffentlichung der Notiz aufheben",
  "Unshare": "Nicht mehr teilen",
  "Unshare this notebook? The recipients will no longer have access to its content.": "Teilen des Notizbuch beenden? Der Empfänger wird keinen Zugriff mehr auf den Inhalt haben.",

packages/lib/locales/fi_FI.json

@@ -27,6 +27,7 @@
  "&Tools": "&Työkalut",
  "&View": "&Näytä",
  "(%s)": "(%s)",
+ "(In plugin: %s)": "(Laajennuksessa: %s)",
  "(None)": "(Ei mitään)",
  "(wysiwyg: %s)": "(wysiwyg: %s)",
  "- Camera: to allow taking a picture and attaching it to a note.": "- Kamera: sallia kuvan ottamisen ja liittämisen muistiinpanoon.",
@@ -42,11 +43,13 @@
  "Accelerator \"%s\" is not valid.": "Pikatoiminto \"%s\" ei kelpaa.",
  "Accelerator \"%s\" is used for \"%s\" and \"%s\" commands. This may lead to unexpected behaviour.": "Pikatoimintoa %s käytetään komennoissa %s ja %s. Tämä voi johtaa odottamattomaan käytökseen.",
  "Accept": "Hyväksy",
+ "Account": "Tili",
  "Action": "Toiminta",
  "Actions": "Toiminnot",
  "Active": "Aktiivinen",
  "Actual Size": "Todellinen koko",
  "Add body": "Lisää runko",
+ "Add new": "Lisää uusi",
  "Add or remove tags:": "Lisää tai poista tunnisteita:",
  "Add recipient:": "Lisää vastaanottaja:",
  "Add title": "Lisää otsikko",
@@ -60,6 +63,8 @@
  "Also displays unset and hidden config variables.": "Näyttää myös merkitsemättömät ja piilotetut konfigurointimuuttujat.",
  "Also publish linked notes": "Julkaise myös linkitetyt muistiinpanot",
  "Always": "Aina",
+ "Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to see the short notebook id or use $b for current selected notebook": "Epäselvä muistikirja \"%s\". Käytä sen sijaan muistikirjan tunnusta - paina \"ti\" nähdäksesi lyhyen muistikirjan tunnuksen tai käytä $b nykyiselle valitulle muistikirjalle",
+ "Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti\" to see the short notebook id": "Epäselvä muistikirja \"%s\". Käytä sen sijaan lyhyttä muistikirjan tunnusta - paina \"ti\" nähdäksesi lyhyen muistikirjan tunnuksen",
  "An update is available, do you want to download it now?": "Päivitys on saatavilla. Haluatko ladata sen nyt?",
  "Appearance": "Ulkonäkö",
  "Application": "Sovellus",
@@ -67,6 +72,7 @@
  "Are you sure you want to renew the authorisation token?": "Haluatko varmasti uusia valtuutustunnuksen?",
  "Arguments:": "Väitteet:",
  "Aritim Dark": "Aritim Dark",
+ "Attach": "Liittää",
  "Attach file": "Liitä tiedosto",
  "Attach photo": "Liitä valokuva",
  "Attach...": "Liitä...",
@@ -89,6 +95,7 @@
  "Browse all plugins": "Selaa kaikkia laajennuksia",
  "Browse...": "Selaa...",
  "Bulleted List": "Luettelomerkitty luettelo",
+ "Can Share": "Voit jakaa",
  "Cancel": "Peruuta",
  "Cancelling background synchronisation... Please wait.": "Peruutetaan taustasynkronointi... Odota.",
  "Cancelling...": "Peruutetaan...",
@@ -106,6 +113,7 @@
  "Cannot save %s \"%s\" because it is larger than the allowed limit (%s)": "Tallennus ei onnistu %s \"%s\" koska se on suurempi kuin sallittu raja (%s)",
  "Cannot save %s \"%s\" because it would go over the total allowed size (%s) for this account": "Kohdetta %s \"%s\" ei voida tallentaa, koska se ylittäisi tämän tilin sallitun kokonaiskoon (%s)",
  "Cannot share encrypted notebook with recipient %s because they have not enabled end-to-end encryption. They may do so from the screen Configuration > Encryption.": "Salattua muistikirjaa ei voi jakaa vastaanottajan %s kanssa, koska hän ei ole ottanut päästä päähän -salausta käyttöön. Sen voi tehdä Asetukset> Salauksen määritys.",
+ "Case sensitive": "Kirjainkoko",
  "Change application layout": "Sovelluksen asettelun muuttaminen",
  "Change language": "Vaihda kieltä",
  "Characters": "Merkit",
@@ -128,6 +136,7 @@
  "Code Block": "Koodilohko",
  "Code View": "Koodinäkymä",
  "Collaborate on notebooks with others": "Muistikirjojen yhteiskäyttö muiden kanssa",
+ "Collapse": "Tiivistä",
  "Coming alarms": "Tulevat hälytykset",
  "Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem. Note that if you make changes to the TLS settings, you must save your changes before clicking on \"Check synchronisation configuration\".": "Pilkuilla erotettu luettelo hakemistoiden poluista, joilta varmenteet ladataan, tai polku yksittäisiin varmennetiedostoihin. Esimerkiksi: /my/cert_dir, /other/custom.pem. Huomaa, että jos teet muutoksia TLS asetuksiin, sinun on tallennettava muutokset ennen kuin napsautat \"Tarkista synkronointiasetukset\".",
  "command": "komento",
@@ -196,6 +205,7 @@
  "Date": "Päivämäärä",
  "Date format": "Päivämäärän muoto",
  "days": "päivää",
+ "Decrease indent level": "Pienennä sisennystä",
  "Decrypted items: %d": "Purettuja kohteita: %d",
  "Decrypted items: %s / %s": "Purettuja kohteita: %s / %s",
  "Decrypting items: %d/%d": "Kohteiden salauksen purkaminen: %d/%d",
@@ -212,6 +222,7 @@
  "Delete notebook \"%s\"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.": "Poista muistikirja \"%s\"?\n\nMyös kaikki tämän muistikirjan muistiinpanot ja alimuistikirjat poistetaan.",
  "Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.": "Poistetaanko muistikirja? Kaikki tämän muistikirjan muistiinpanot ja alimuistikirjat poistetaan myös.",
  "Delete plugin \"%s\"?": "Poista laajennus \"%s\"?",
+ "Delete selected notes": "Poista valitut muistiinpanot",
  "Delete these %d notes?": "Poistetaanko nämä %d muistiinpanot?",
  "Delete this invitation? The recipient will no longer have access to this shared notebook.": "Poistetaanko tämä kutsu? Vastaanottaja ei voi enää käyttää tätä jaettua muistikirjaa.",
  "Deleted local items: %d.": "Poistetut paikalliset kohteet: %d.",
@@ -243,6 +254,7 @@
  "Do it now": "Hae se nyt",
  "Do not ask for confirmation.": "Älä kysy vahvistusta.",
  "Do not lose the password as, for security purposes, this will be the *only* way to decrypt the data! To enable encryption, please enter your password below.": "Älä kadota salasanaa, sillä tämä on turvallisuussyistä *ainoa* tapa purkaa tietojen salaus! Voit ottaa salauksen käyttöön kirjoittamalla salasanasi alle.",
+ "Done": "Valmis",
  "Download": "Lataa",
  "Download and install the relevant extension for your browser:": "Lataa ja asenna laajennus selaimeesi:",
  "Downloaded": "Ladattu",
@@ -256,9 +268,11 @@
  "Dropbox Login": "Dropbox kirjautuminen",
  "Duplicate": "Duplikaatti, toinen samanlainen",
  "Duplicate line": "Rivin kaksoiskappale",
+ "Duplicate selected notes": "Kopioi valitut muistiinpanot",
  "Duplicates the notes matching <note> to [notebook]. If no notebook is specified the note is duplicated in the current notebook.": "Kopioi muistiinpanot, jotka vastaavat <note> arvoon [notebook]. Jos mitään muistikirjaa ei ole määritetty, muistiinpano kopioidaan nykyiseen muistikirjaan.",
  "Edit": "Muokkaa",
  "Edit in external editor": "Muokkaa ulkoisessa tekstieditorissa",
+ "Edit link": "Muokkaa linkkiä",
  "Edit note.": "Muokkaa muistiinpanoa.",
  "Edit notebook": "Muokkaa muistikirjaa",
  "Edit profile configuration...": "Muokkaa profiilin asetuksia...",
@@ -320,6 +334,7 @@
  "Evernote Export File (as HTML)": "Evernote vie tiedosto (kuten HTML)",
  "Evernote Export File (as Markdown)": "Evernote vie tiedosto (kuten Markdown)",
  "Exits the application.": "Sulkee sovelluksen.",
+ "Expand": "Laajenna",
  "Export": "Vie",
  "Export all": "Vie kaikki",
  "Export debug report": "Vie virheenkorjausraportti",
@@ -339,6 +354,8 @@
  "File": "Tiedosto",
  "File system": "Tiedostojärjestelmä",
  "Filter tags": "Suodata tunnisteet",
+ "Find and replace": "Etsi ja korvaa",
+ "Find: ": "Etsi: ",
  "Firefox Extension": "Firefox laajennus",
  "Fix search index": "Hakuindeksin korjaaminen",
  "Fixing search index...": "Korjataan hakuindeksiä...",
@@ -347,14 +364,17 @@
  "Focus title": "Tarkennuksen otsikko",
  "Folders": "Kansiot",
  "For debugging purpose only: export your profile to an external SD card.": "Vain virheenkorjausta varten: vie profiilisi ulkoiselle SD-kortille.",
+ "For example \"%s\"": "Esimerkiksi \"%s\"",
  "For information on how to customise the shortcuts please visit %s": "Lisätietoja pikavalintojen mukauttamisesta on osoitteessa %s",
  "For more information about End-To-End Encryption (E2EE) and advice on how to enable it please check the documentation:": "Lisätietoja E2EE (End-To-End Encryption) -salauksesta ja sen käyttöönottoon liittyvistä ohjeista saat seuraavista ohjeista:",
  "For the list of keyboard shortcuts and config options, type `help keymap`": "Saat luettelon pikanäppäimistä ja config vaihtoehtoja, kirjoita `help keymap`",
  "Force path style": "Pakota polun tyyli",
+ "Formatting": "Muotoilu",
  "Forward": "Eteenpäin",
  "Found: %d.": "Löytyi: %d.",
  "FTS enabled: %d": "Koko tekstin haku (FTS) Käytössä: %d",
  "Full changelog": "Täysi muutosloki",
+ "Full name": "Koko nimi",
  "General": "Yleiset",
  "Generated": "Luotu",
  "Generating link...": "Luodaan linkki...",
@@ -364,11 +384,17 @@
  "Go to source URL": "Siirry lähteen URL osoitteeseen",
  "Goto Anything...": "Siirry mihin tahansa...",
  "Grant authorisation": "Myönnä lupa",
+ "Header %d": "Otsikko %d",
+ "Headers": "Otsikot",
  "Heading": "Otsikko",
  "Help": "Apua",
  "Hide %s": "Piilota %s",
+ "Hide advanced": "Piilota edistyneet",
+ "Hide disabled": "Piilota käytöstä poistetut",
  "Hide disabled keys": "Piilota käytöstä poistetut avaimet",
  "Hide Joplin": "Piilota Joplin",
+ "Hide keyboard": "Piilota näppäimistö",
+ "Hide more actions": "Piilota lisää toimintoja",
  "Highlight": "Korosta",
  "Home": "Koti",
  "Horizontal Rule": "Vaakaviiva",
@@ -393,12 +419,14 @@
  "In order to use the web clipper, you need to do the following:": "Jotta voit käyttää Web Clipperiä, sinun on tehtävä seuraavat toimet:",
  "In progress": "Käynnissä",
  "In: %s": "Sisään: %s",
+ "Increase indent level": "Lisää sisennystä",
  "Indent less": "Sisennä vähemmän",
  "Indent more": "Sisennä lisää",
  "Information": "Tiedot",
  "Inline Code": "Inline-koodi",
  "Insert": "Aseta",
  "Insert Hyperlink": "Lisää hyperlinkki",
+ "Insert time": "Aseta aika",
  "Install": "Asenna",
  "Install from file": "Asenna tiedostosta",
  "Installed": "Asennettu",
@@ -429,6 +457,7 @@
  "Joplin Web Clipper allows saving web pages and screenshots from your browser to Joplin.": "Joplin Web Clipper mahdollistaa verkkosivujen ja kuvakaappausten tallentamisen selaimesta Jopliniin.",
  "Joplin website": "Joplin verkkosivusto",
  "Joplin's own sync service. Also gives access to Joplin-specific features such as publishing notes or collaborating on notebooks with others.": "Joplinin oma synkronointipalvelu. Voit myös käyttää Joplin erityisominaisuuksia, kuten muistiinpanojen julkaisemista tai muistikirjojen yhteiskäyttöä muiden kanssa.",
+ "KaTeX": "KaTeX",
  "Keep note history for": "Säilytä muistiinpanohistoria",
  "Keyboard Mode": "Näppäimistötila",
  "Keyboard Shortcut": "Pikanäppäin",
@@ -446,9 +475,13 @@
  "Letter": "Letter",
  "Light": "Vaalea",
  "Lines": "Rivit",
+ "Link": "Linkki",
+ "Link description": "Linkin kuvaus",
  "Link has been copied to clipboard!": "Linkki on kopioitu leikepöydälle!",
+ "Link text": "Linkin kuvaus",
  "Links with protocol \"%s\" are not supported": "Linkkejä protokollaan \"%s\" ei tueta",
  "List item": "Luettelon kohde",
+ "Lists": "Luettelot",
  "Loaded": "Ladattu",
  "Location": "Sijainti",
  "Lock file is already being hold. If you know that no synchronisation is taking place, you may delete the lock file at \"%s\" and resume the operation.": "Lukitustiedosto on jo pidossa. Jos tiedät, että synkronointia ei tapahdu, voit poistaa lukitustiedoston kohdasta \"%s\" ja jatkaa toimintaa.",
@@ -474,6 +507,8 @@
  "Master password": "Pääsalasana",
  "Master password:": "Pääsalasana:",
  "Max concurrent connections": "Samanaikaiset yhteydet enintään",
+ "Max Item Size": "Kohteen enimmäiskoko",
+ "Max Total Size": "Suurin kokonaiskoko",
  "Missing keys": "Puuttuvat avaimet",
  "Missing Master Keys": "Puuttuvat pääavaimet",
  "Missing required argument: %s": "Vaadittu argumentti puuttuu: %s",
@@ -485,6 +520,7 @@
  "Move to notebook": "Siirry muistikirjaan",
  "Move to notebook...": "Siirry muistikirjaan...",
  "Move to notebook:": "Siirrä muistikirjaan:",
+ "Moves the given <item> to [notebook]": "Siirtää annetun <item> [notebook]",
  "n": "e",
  "N": "E",
  "New note": "Uusi muistiinpano",
@@ -495,6 +531,7 @@
  "New tags:": "Uudet tunnisteet:",
  "New to-do": "Uusi tehtävä",
  "New version: %s": "Uusi versio: %s",
+ "Next match": "Seuraava vastaavuus",
  "Nextcloud": "Nextcloud",
  "Nextcloud password": "Nextcloud salasana",
  "Nextcloud username": "Nextcloud käyttäjänimi",
@@ -522,6 +559,7 @@
  "Note attachments...": "Muistiinpanon liitteet...",
  "Note body": "Muistiinpanon kappale",
  "Note does not exist: \"%s\". Create it?": "Huomautusta ei ole: \"%s\". Luodaanko se?",
+ "Note editor": "Muistiinpano editori",
  "Note has been saved.": "Huomautus on tallennettu.",
  "Note History": "Muistiinpanohistoria",
  "Note is not a to-do: \"%s\"": "Huomautus ei ole tehtävä: \"%s\"",
@@ -552,12 +590,14 @@
  "Only one note can be printed at a time.": "Vain yksi muistiinpano voidaan tulostaa kerrallaan.",
  "Open": "Avaa",
  "Open %s": "Avaa %s",
+ "Open PDF viewer": "Avaa PDF katseluohjelma",
  "Open profile directory": "Avaa profiilihakemisto",
  "Open Sync Wizard...": "Avaa ohjattu synkronointitoiminto.",
  "Open...": "Avaa...",
  "Operation cancelled": "Toiminto peruutettu",
  "Options": "Asetukset",
  "Or create an account.": "Tai luo tili.",
+ "Ordered list": "Järjestetty luettelo",
  "Other applications...": "Muut sovellukset...",
  "Output format: %s": "Esitysmuoto: %s",
  "Page orientation for PDF export": "Sivun suunta PDF vientiä varten",
@@ -597,6 +637,7 @@
  "Press the shortcut": "Paina pikakuvaketta",
  "Press the shortcut and then press ENTER. Or, press BACKSPACE to clear the shortcut.": "Paina pikakuvaketta ja paina sitten ENTER-näppäintä. Voit myös tyhjentää pikakuvakkeen painamalla VÄLILYÖNTI-näppäintä.",
  "Press to set the decryption password.": "Aseta salauksen purkuun salasana painamalla tätä.",
+ "Previous match": "Edellinen vastaavuus",
  "Previous versions of this note": "Tämän muistiinpanon aiemmat versiot",
  "Print": "Tulosta",
  "Privacy Policy": "Tietosuojakäytäntö",
@@ -607,6 +648,9 @@
  "Profile name:": "Profiilin nimi:",
  "Profile Version: %s": "Profiilin versio: %s",
  "Properties": "Ominaisuudet",
+ "Proxy enabled": "Välityspalvelin käytössä",
+ "Proxy timeout (seconds)": "Välityspalvelimen aikakatkaisu (sekuntia)",
+ "Proxy URL": "Välityspalvelimen URL-osoite",
  "Public-private key pair:": "Julkinen ja yksityinen avainpari:",
  "Publish note...": "Muistiinpanon julkaiseminen...",
  "Publish Notes": "Julkaise muistiinpanot",
@@ -623,6 +667,7 @@
  "Recipients:": "Vastaanottajat:",
  "Redo": "Tee uudelleen",
  "Refresh": "Päivitä",
+ "Regular expression": "Säännöllinen lauseke",
  "Reject": "Hylkää",
  "Remove": "Poista",
  "Remove tag \"%s\" from all notes?": "Poistetaanko tunniste \"%s\" kaikista muistiinpanoista?",
@@ -632,6 +677,10 @@
  "Rename tag:": "Nimeä tunniste uudelleen:",
  "Renames the given <item> (note or notebook) to <name>.": "Nimeää annetun <item> (muistiinpano tai muistikirja) nimeksi <name>.",
  "Renew token": "Uusi tunnus",
+ "Replace": "Korvaa",
+ "Replace all": "Korvaa kaikki",
+ "Replace with...": "Korvaa...",
+ "Replace: ": "Vaihda: ",
  "Reset master password": "Pääsalasanan vaihtaminen",
  "Resources: %d.": "Resursseja: %d.",
  "Restart and upgrade": "Käynnistä uudelleen ja päivitä",
@@ -660,6 +709,7 @@
  "Save geo-location with notes": "Tallenna maantieteellinen sijainti muistiinpanojen avulla",
  "Search": "Etsi",
  "Search for plugins...": "Etsi laajennuksia...",
+ "Search for...": "Etsii...",
  "Search in all the notes": "Etsi kaikista muistiinpanoista",
  "Search in current note": "Etsi nykyisestä muistiinpanosta",
  "Search...": "Etsi...",
@@ -683,13 +733,17 @@
  "Share notebook...": "Muistikirjan jakaminen...",
  "Sharing notebook...": "Jaetaan muistikirjaa...",
  "Shortcuts are not available in CLI mode.": "Pikavalinnat eivät ole käytettävissä CLI tilassa.",
+ "Show advanced": "Näytä edistyneet",
  "Show Advanced Settings": "Näytä lisäasetukset",
  "Show all": "Näytä kaikki",
  "Show completed to-dos": "Näytä valmiit tehtävät",
+ "Show disabled": "Näytä käytöstä poistetut",
  "Show disabled keys": "Näytä käytöstä poistetut avaimet",
+ "Show more actions": "Näytä lisää toimintoja",
  "Show note counts": "Näytä muistiinpanojen määrä",
  "Show sort order buttons": "Näytä lajittelujärjestyspainikkeet",
  "Show tray icon": "Näytä kuvake tehtäväpalkissa",
+ "Show/hide the sidebar": "Näytä/piilota sivupalkki",
  "Sidebar": "Sivupalkki",
  "Size": "Koko",
  "Skip this version": "Ohita tämä versio",
@@ -762,6 +816,7 @@
  "Tagged: %d.": "Merkityt: %d.",
  "Tags": "Tunnisteet",
  "Take photo": "Ota valokuva",
+ "Task list": "Tehtävälista",
  "Tasks": "Tehtävät",
  "Text editor command": "Tekstieditorin komento",
  "Thank you! Your Joplin Cloud account is now setup and ready to use.": "Kiitos! Your Joplin Cloud tilisi on nyt määritetty ja käyttövalmis.",
@@ -834,6 +889,7 @@
  "To retry decryption of these items. Run `e2ee decrypt --retry-failed-items`": "Yritä uudelleen purkaa nämä kohteet. Suorita `e2ee decrypt --retry-failed-items`",
  "To work correctly, the app needs the following permissions. Please enable them in your phone settings, in Apps > Joplin > Permissions": "Toimiakseen oikein sovellus tarvitsee seuraavat käyttöoikeudet. Ota ne käyttöön puhelimesi asetuksissa, valitsemalla Sovellukset> Joplin> Luvat (käyttöoikeudet)",
  "to-do": "tehtävä",
+ "to-do: %s": "tehtävä: %s",
  "Toggle comment": "Vaihda kommentti",
  "Toggle development tools": "Vaihda kehitystyökalut",
  "Toggle editor layout": "Vaihda editorin asettelua",
@@ -846,6 +902,7 @@
  "Toggle sort order field": "Vaihda lajittelujärjestyskenttää",
  "Token has been copied to the clipboard!": "Tunnus on kopioitu leikepöydälle!",
  "Tools": "Työkalut",
+ "Total Size": "Koko yhteensä",
  "Total: %d/%d": "Yhteensä: %d/%d",
  "Try again": "Yritä uudestaan",
  "Type `help [command]` for more information about a command; or type `help all` for the complete usage information.": "Kirjoita `help [command]` saadaksesi lisätietoja komennosta; tai kirjoita `help all` saadaksesi täydelliset käyttötiedot.",
@@ -857,6 +914,7 @@
  "Undo": "Kumoa",
  "Unknown flag: %s": "Tuntematon merkintä: %s",
  "Unknown item type downloaded - please upgrade Joplin to the latest version": "Tuntematon kohdetyyppi ladattu - päivitä Joplin uusimpaan versioon",
+ "Unordered list": "Järjestämätön luettelo",
  "Unpublish note": "Peruuta muistiinpanon julkaisu",
  "Unshare": "Poista jakaminen",
  "Unshare this notebook? The recipients will no longer have access to its content.": "Poistetaanko tämän muistikirjan jakaminen? Vastaanottajilla ei ole enää pääsyä sen sisältöön.",

packages/lib/locales/index.js

@@ -41,45 +41,45 @@ locales['uk_UA'] = require('./uk_UA.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":84};
-stats['eu'] = {"percentDone":24};
-stats['bs_BA'] = {"percentDone":60};
-stats['bg_BG'] = {"percentDone":47};
-stats['ca'] = {"percentDone":94};
-stats['hr_HR'] = {"percentDone":94};
-stats['cs_CZ'] = {"percentDone":81};
-stats['da_DK'] = {"percentDone":92};
-stats['de_DE'] = {"percentDone":94};
-stats['et_EE'] = {"percentDone":46};
+stats['ar'] = {"percentDone":82};
+stats['eu'] = {"percentDone":23};
+stats['bs_BA'] = {"percentDone":59};
+stats['bg_BG'] = {"percentDone":46};
+stats['ca'] = {"percentDone":92};
+stats['hr_HR'] = {"percentDone":92};
+stats['cs_CZ'] = {"percentDone":79};
+stats['da_DK'] = {"percentDone":99};
+stats['de_DE'] = {"percentDone":99};
+stats['et_EE'] = {"percentDone":45};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":92};
-stats['eo'] = {"percentDone":27};
-stats['fi_FI'] = {"percentDone":94};
-stats['fr_FR'] = {"percentDone":100};
+stats['es_ES'] = {"percentDone":91};
+stats['eo'] = {"percentDone":26};
+stats['fi_FI'] = {"percentDone":98};
+stats['fr_FR'] = {"percentDone":98};
 stats['gl_ES'] = {"percentDone":30};
-stats['id_ID'] = {"percentDone":94};
-stats['it_IT'] = {"percentDone":81};
-stats['hu_HU'] = {"percentDone":81};
-stats['nl_BE'] = {"percentDone":82};
-stats['nl_NL'] = {"percentDone":92};
-stats['nb_NO'] = {"percentDone":92};
-stats['fa'] = {"percentDone":58};
-stats['pl_PL'] = {"percentDone":94};
-stats['pt_BR'] = {"percentDone":92};
-stats['pt_PT'] = {"percentDone":76};
-stats['ro'] = {"percentDone":53};
-stats['sl_SI'] = {"percentDone":84};
-stats['sv'] = {"percentDone":94};
+stats['id_ID'] = {"percentDone":92};
+stats['it_IT'] = {"percentDone":80};
+stats['hu_HU'] = {"percentDone":80};
+stats['nl_BE'] = {"percentDone":81};
+stats['nl_NL'] = {"percentDone":91};
+stats['nb_NO'] = {"percentDone":91};
+stats['fa'] = {"percentDone":57};
+stats['pl_PL'] = {"percentDone":92};
+stats['pt_BR'] = {"percentDone":91};
+stats['pt_PT'] = {"percentDone":75};
+stats['ro'] = {"percentDone":52};
+stats['sl_SI'] = {"percentDone":83};
+stats['sv'] = {"percentDone":99};
 stats['th_TH'] = {"percentDone":38};
-stats['vi'] = {"percentDone":82};
-stats['tr_TR'] = {"percentDone":94};
-stats['uk_UA'] = {"percentDone":76};
-stats['el_GR'] = {"percentDone":92};
-stats['ru_RU'] = {"percentDone":84};
-stats['sr_RS'] = {"percentDone":68};
-stats['zh_CN'] = {"percentDone":94};
-stats['zh_TW'] = {"percentDone":94};
-stats['ja_JP'] = {"percentDone":94};
-stats['ko'] = {"percentDone":94};
+stats['vi'] = {"percentDone":80};
+stats['tr_TR'] = {"percentDone":92};
+stats['uk_UA'] = {"percentDone":75};
+stats['el_GR'] = {"percentDone":91};
+stats['ru_RU'] = {"percentDone":83};
+stats['sr_RS'] = {"percentDone":67};
+stats['zh_CN'] = {"percentDone":97};
+stats['zh_TW'] = {"percentDone":92};
+stats['ja_JP'] = {"percentDone":92};
+stats['ko'] = {"percentDone":92};
 module.exports = { locales: locales, stats: stats };

packages/lib/locales/nl_NL.json

@@ -47,6 +47,7 @@
  "Active": "Actief",
  "Actual Size": "Ware Grootte",
  "Add body": "Inhoud toevoegen",
+ "Add new": "Nieuw toevoegen",
  "Add or remove tags:": "Labels toevoegen of verwijderen:",
  "Add recipient:": "Voeg ontvanger toe:",
  "Add title": "Toevoegen titel",
@@ -104,6 +105,7 @@
  "Cannot save %s \"%s\" because it is larger than the allowed limit (%s)": "%s \"%s\" kan niet worden opgeslagen omdat het groter is dan de limiet (%s)",
  "Cannot save %s \"%s\" because it would go over the total allowed size (%s) for this account": "%s \"%s\" kan niet worden opgeslagen omdat de totale grootte van dit account (%s) overschreid",
  "Cannot share encrypted notebook with recipient %s because they have not enabled end-to-end encryption. They may do so from the screen Configuration > Encryption.": "Kan een gecodeerd notitieblok niet delen met %s van de ontvanger omdat deze geen end-to-end-codering heeft ingeschakeld. Ze kunnen dit doen via het scherm Configuratie > Encryptie.",
+ "Case sensitive": "Hoofdlettergevoelig ",
  "Change application layout": "Wijzig de layout van de applicatie",
  "Change language": "Taal veranderen",
  "Characters": "Karakters",
@@ -126,6 +128,7 @@
  "Code Block": "Code Blok",
  "Code View": "Codeweergave",
  "Collaborate on notebooks with others": "Samenwerken aan notitieblokken met anderen",
+ "Collapse": "Inklappen",
  "Coming alarms": "Aankomende alarmen",
  "Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem. Note that if you make changes to the TLS settings, you must save your changes before clicking on \"Check synchronisation configuration\".": "Kommagescheiden lijst van paden naar mappen waaruit de certificaten moeten worden geladen, of paden naar individuele bestanden. Bijvoorbeeld: /mijn/cert_map, /overig/aangepast.pem. Let op: als u wijzigingen aanbrengt, dan moet u ze opslaan voordat u klik op \"Synchronisatie-configuratie controleren.",
  "command": "commando",
@@ -164,6 +167,7 @@
  "Could not upgrade master key: %s": "Kon hoofdsleutel niet bijwerken: %s",
  "Could not verify the share status of this notebook - aborting. Please try again when you are connected to the internet.": "Kan de sharestatus van dit notitieblok - aborteren - niet controleren. Probeer het opnieuw wanneer u verbonden bent met internet.",
  "Create a notebook": "Creëer een notitieboek",
+ "Create new profile...": "Creëer nieuw profiel ",
  "Create notebook": "Creëer notitieboek",
  "Create user": "Maak gebruiker aan",
  "Created": "Gecreëerd",
@@ -252,6 +256,7 @@
  "Dropbox Login": "Inloggen op Dropbox",
  "Duplicate": "Dupliceren",
  "Duplicate line": "Dupliceer regel",
+ "Duplicate selected notes": "Dupliceer geselecteerde notities",
  "Duplicates the notes matching <note> to [notebook]. If no notebook is specified the note is duplicated in the current notebook.": "Dupliceert de notities die overeenkomen met <note> tot [notebook]. Als geen notitieboek wordt opgegeven, dan wordt de notitie gedupliceerd in het huidige notitieboek.",
  "Edit": "Bewerken",
  "Edit in external editor": "Bewerken in externe editor",
@@ -905,6 +910,6 @@
  "Your password is needed to decrypt some of your data. Type `:e2ee decrypt` to set it.": "Uw wachtwoord is nodig om sommige van uw gegevens te decoderen. Typ ':e2ee decrypt' om het in te stellen.",
  "Your permission to use your camera is required.": "Uw toestemming om de camera te gebruiken is vereist.",
  "Your version: %s": "Uw versie: %s",
- "Zoom In": "Inzoemen",
- "Zoom Out": "Uitzoemen"
+ "Zoom In": "Inzoomen",
+ "Zoom Out": "Uitzoomen"
 }

packages/lib/locales/sv.json

@@ -1,8 +1,12 @@
 {
  "\"%s\" is missing the required \"%s\" property.": "\"%s\" saknar den nödvändiga egenskapen \"%s\".",
  "%d days": "%d dagar",
+ "%d GB": "%d GB",
+ "%d GB storage space": "%d GB lagringsutrymme",
  "%d hour": "%d timme",
  "%d hours": "%d timmar",
+ "%d MB": "%d MB",
+ "%d MB per note or attachment": "%d MB per anteckning eller bilaga",
  "%d minutes": "%d minuter",
  "%d notes match this pattern. Delete them?": "%d anteckningar matchar det här mönstret. Ta bort dem?",
  "%s %s (%s, %s)": "%s %s (%s, %s)",
@@ -27,6 +31,7 @@
  "&Tools": "&Verktyg",
  "&View": "&Visa",
  "(%s)": "(%s)",
+ "(In plugin: %s)": "(I tillägg: %s)",
  "(None)": "(Ingen)",
  "(wysiwyg: %s)": "(wysiwyg: %s)",
  "- Camera: to allow taking a picture and attaching it to a note.": "- Kamera: för att tillåta att du tar en bild och bifogar den till en anteckning.",
@@ -42,11 +47,13 @@
  "Accelerator \"%s\" is not valid.": "Acceleratorn \"%s\" är inte giltig.",
  "Accelerator \"%s\" is used for \"%s\" and \"%s\" commands. This may lead to unexpected behaviour.": "Acceleratorn \"%s\" används för \"%s\" och \"%s\" kommandon. Detta kan leda till oväntat beteende.",
  "Accept": "Acceptera",
+ "Account": "Konto",
  "Action": "Åtgärd",
  "Actions": "Åtgärder",
  "Active": "Aktiv",
  "Actual Size": "Faktiskt storlek",
  "Add body": "Lägg till brödtext",
+ "Add new": "Lägg till ny",
  "Add or remove tags:": "Lägg till eller ta bort taggar:",
  "Add recipient:": "Lägg till mottagare:",
  "Add title": "Lägg till titel",
@@ -60,6 +67,8 @@
  "Also displays unset and hidden config variables.": "Visar även inte inställda och dolda konfigurationsvariabler.",
  "Also publish linked notes": "Publicera även länkade anteckningar",
  "Always": "Alltid",
+ "Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to see the short notebook id or use $b for current selected notebook": "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",
+ "Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti\" to see the short notebook id": "Tvetydig anteckningsbok \"%s\". Använd kort anteckningsbok-id istället - tryck på \"ti\" för att se det korta anteckningsbok-id:t",
  "An update is available, do you want to download it now?": "En uppdatering är tillgänglig, vill du hämta den nu?",
  "Appearance": "Utseende",
  "Application": "Program",
@@ -67,6 +76,7 @@
  "Are you sure you want to renew the authorisation token?": "Är du säker på att du vill förnya auktoriseringstoken?",
  "Arguments:": "Argument:",
  "Aritim Dark": "Aritim mörkt",
+ "Attach": "Bifoga",
  "Attach file": "Bifoga fil",
  "Attach photo": "Bifoga foto",
  "Attach...": "Bifoga...",
@@ -85,10 +95,12 @@
  "Automatically check for updates": "Sök automatiskt efter uppdateringar",
  "Automatically switch theme to match system theme": "Växla automatiskt tema för att matcha systemtema",
  "Back": "Tillbaka",
+ "Basic": "Grundläggande",
  "Bold": "Fet",
  "Browse all plugins": "Bläddra bland alla insticksmoduler",
  "Browse...": "Bläddra...",
  "Bulleted List": "Punktlista",
+ "Can Share": "Kan dela",
  "Cancel": "Avbryt",
  "Cancelling background synchronisation... Please wait.": "Avbryter bakgrundssynkronisering... vänta.",
  "Cancelling...": "Avbryter...",
@@ -106,6 +118,7 @@
  "Cannot save %s \"%s\" because it is larger than the allowed limit (%s)": "Det går inte att spara %s \"%s\" eftersom den är större än den tillåtna gränsen (%s)",
  "Cannot save %s \"%s\" because it would go over the total allowed size (%s) for this account": "Det går inte att spara%s \"%s\" eftersom det skulle gå över den totala tillåtna storleken (%s) för det här kontot",
  "Cannot share encrypted notebook with recipient %s because they have not enabled end-to-end encryption. They may do so from the screen Configuration > Encryption.": "Det går inte att dela krypterad anteckningsbok med mottagaren %s eftersom de inte har aktiverat ände-till-ände-kryptering. De kan göra det från skärmen Inställningar > Kryptering.",
+ "Case sensitive": "Skiftlägeskänslig",
  "Change application layout": "Ändra programmets layout",
  "Change language": "Ändra språk",
  "Characters": "Tecken",
@@ -128,6 +141,7 @@
  "Code Block": "Kodblockering",
  "Code View": "Kodvy",
  "Collaborate on notebooks with others": "Samarbeta på anteckningsböcker tillsammans med andra",
+ "Collapse": "Fäll in",
  "Coming alarms": "Kommande larm",
  "Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem. Note that if you make changes to the TLS settings, you must save your changes before clicking on \"Check synchronisation configuration\".": "Kommaseparerad lista över sökvägar till kataloger för att läsa certifikaten från eller sökvägen till enskilda cert-filer. Till exempel: /my/cert_dir,/other/custom.pem. Observera att om du ändrar TLS-inställningarna måste du spara dina ändringar innan du klickar på \"Kontrollera synkroniseringskonfiguration\".",
  "command": "kommando",
@@ -196,6 +210,7 @@
  "Date": "Datum",
  "Date format": "Datumformat",
  "days": "dagar",
+ "Decrease indent level": "Minska indragsnivå",
  "Decrypted items: %d": "Dekrypterade objekt: %d",
  "Decrypted items: %s / %s": "Antal dekrypterade objekt: %s / %s",
  "Decrypting items: %d/%d": "Dekrypterar objekt: %d/%d",
@@ -212,6 +227,7 @@
  "Delete notebook \"%s\"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.": "Ta bort anteckningsboken\"%s\"?\n\nAlla anteckningar och delanteckningsböcker i den här anteckningsboken tas också bort.",
  "Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.": "Ta bort anteckningsboken? Alla anteckningar och delanteckningsböcker i den här anteckningsboken tas bort också.",
  "Delete plugin \"%s\"?": "Ta bort insticksmodulen \"%s\"?",
+ "Delete selected notes": "Ta bort valda anteckningar",
  "Delete these %d notes?": "Ta bort dessa %d anteckningar?",
  "Delete this invitation? The recipient will no longer have access to this shared notebook.": "Ta bort denna inbjudan? Mottagaren har inte längre tillgång till den delade anteckningsboken.",
  "Deleted local items: %d.": "Borttagna lokala objekt: %d.",
@@ -243,6 +259,7 @@
  "Do it now": "Gör det nu",
  "Do not ask for confirmation.": "Fråga inte om bekräftelse.",
  "Do not lose the password as, for security purposes, this will be the *only* way to decrypt the data! To enable encryption, please enter your password below.": "Förlora inte lösenordet som för säkerhetsändamål kommer det att vara det *enda* sättet att dekryptera data! För att aktivera kryptering, ange ditt lösenord nedan.",
+ "Done": "Klar",
  "Download": "Hämta",
  "Download and install the relevant extension for your browser:": "Hämta och installera det relevanta tillägget för din webbläsare:",
  "Downloaded": "Hämtad",
@@ -256,9 +273,11 @@
  "Dropbox Login": "Dropbox-inloggning",
  "Duplicate": "Duplicera",
  "Duplicate line": "Duplicera rad",
+ "Duplicate selected notes": "Duplicera valda anteckningar",
  "Duplicates the notes matching <note> to [notebook]. If no notebook is specified the note is duplicated in the current notebook.": "Duplicerar anteckningarna som matchar <note> till [notebook]. Om ingen anteckningsbok är angiven kopieras anteckningen i den aktuella anteckningsboken.",
  "Edit": "Redigera",
  "Edit in external editor": "Redigera i extern redigerare",
+ "Edit link": "Redigera länk",
  "Edit note.": "Redigera anteckning.",
  "Edit notebook": "Redigera anteckningsbok",
  "Edit profile configuration...": "Redigera profilkonfiguration...",
@@ -320,6 +339,7 @@
  "Evernote Export File (as HTML)": "Evernote-exporteringsfil (som HTML)",
  "Evernote Export File (as Markdown)": "Evernote-exporteringsfil (som Markdown)",
  "Exits the application.": "Avslutar programmet.",
+ "Expand": "Fäll ut",
  "Export": "Exportera",
  "Export all": "Exportera alla",
  "Export debug report": "Exportera felsökningsrapport",
@@ -339,6 +359,8 @@
  "File": "Fil",
  "File system": "Filsystem",
  "Filter tags": "Filtrera taggar",
+ "Find and replace": "Hitta och ersätt",
+ "Find: ": "Hitta: ",
  "Firefox Extension": "Firefox-tillägg",
  "Fix search index": "Åtgärda sökindex",
  "Fixing search index...": "Åtgärdar sökindex...",
@@ -347,14 +369,17 @@
  "Focus title": "Fokus på titel",
  "Folders": "Mappar",
  "For debugging purpose only: export your profile to an external SD card.": "Endast för felsökning: exportera din profil till ett externt SD-kort.",
+ "For example \"%s\"": "Till exempel \"%s\"",
  "For information on how to customise the shortcuts please visit %s": "För information om hur du anpassar snabbkommandon, besök %s",
  "For more information about End-To-End Encryption (E2EE) and advice on how to enable it please check the documentation:": "För mer information om ände-till-ände-kryptering (E2EE) och råd om hur du aktiverar det finns i dokumentationen:",
  "For the list of keyboard shortcuts and config options, type `help keymap`": "För listan över snabbkommandon och konfigurationsinställningar, skriv `help keymap`",
  "Force path style": "Tvinga sökvägsstil",
+ "Formatting": "Formatering",
  "Forward": "Framåt",
  "Found: %d.": "Hittad: %d.",
  "FTS enabled: %d": "FTS aktiverat: %d",
  "Full changelog": "Fullständig ändringslogg",
+ "Full name": "Fullständigt namn",
  "General": "Allmänt",
  "Generated": "Skapad",
  "Generating link...": "Skapar länk...",
@@ -364,11 +389,17 @@
  "Go to source URL": "Gå till källans URL",
  "Goto Anything...": "Gå till något...",
  "Grant authorisation": "Bevilja auktorisation",
+ "Header %d": "Rubrik %d",
+ "Headers": "Rubriker",
  "Heading": "Rubrik",
  "Help": "Hjälp",
  "Hide %s": "Dölj %s",
+ "Hide advanced": "Dölj avancerade",
+ "Hide disabled": "Dölj inaktiverade",
  "Hide disabled keys": "Dölj inaktiverade nycklar",
  "Hide Joplin": "Dölj Joplin",
+ "Hide keyboard": "Dölj tangentbord",
+ "Hide more actions": "Dölj fler åtgärder",
  "Highlight": "Markera",
  "Home": "Hem",
  "Horizontal Rule": "Horisontell regel",
@@ -393,12 +424,14 @@
  "In order to use the web clipper, you need to do the following:": "För att kunna använda Web Clipper måste du göra följande:",
  "In progress": "Pågår",
  "In: %s": "I: %s",
+ "Increase indent level": "Öka indragsnivå",
  "Indent less": "Mindre indrag",
  "Indent more": "Mer indrag",
  "Information": "Information",
  "Inline Code": "Infoga kod",
  "Insert": "Infoga",
  "Insert Hyperlink": "Infoga hyperlänk",
+ "Insert time": "Infoga tid",
  "Install": "Installera",
  "Install from file": "Installera från fil",
  "Installed": "Installerad",
@@ -429,6 +462,7 @@
  "Joplin Web Clipper allows saving web pages and screenshots from your browser to Joplin.": "Joplin Web Clipper gör det möjligt att spara webbsidor och skärmdumpar från din webbläsare till Joplin.",
  "Joplin website": "Joplin-webbplats",
  "Joplin's own sync service. Also gives access to Joplin-specific features such as publishing notes or collaborating on notebooks with others.": "Joplins egen synkroniseringstjänst. Ger också åtkomst till Joplin-specifika funktioner som att publicera anteckningar eller samarbeta med anteckningsböcker.",
+ "KaTeX": "KaTeX",
  "Keep note history for": "Spara anteckningshistorik i",
  "Keyboard Mode": "Tangentbordsläge",
  "Keyboard Shortcut": "Tangentbordsgenväg",
@@ -446,9 +480,13 @@
  "Letter": "Brev",
  "Light": "Ljust",
  "Lines": "Rader",
+ "Link": "Länk",
+ "Link description": "Länkbeskrivning",
  "Link has been copied to clipboard!": "Länken har kopierats till urklipp!",
+ "Link text": "Länktext",
  "Links with protocol \"%s\" are not supported": "Länkar med protokoll \"%s\" stöds inte",
  "List item": "Listobjekt",
+ "Lists": "Listor",
  "Loaded": "Inläst",
  "Location": "Plats",
  "Lock file is already being hold. If you know that no synchronisation is taking place, you may delete the lock file at \"%s\" and resume the operation.": "Låsfilen hålls redan. Om du vet att ingen synkronisering sker, kan du ta bort låsfilen vid \"%s\" och återuppta operationen.",
@@ -462,6 +500,7 @@
  "Make a donation": "Gör en donation",
  "Manage master password": "Hantera huvudlösenord",
  "Manage master password...": "Hantera huvudlösenord...",
+ "Manage multiple users": "Hantera flera användare",
  "Manage your plugins": "Hantera dina insticksmoduler",
  "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, `status`, `decrypt-file`, and `target-status`.": "Hanterar E2EE-konfigurationen. Kommandona är `enable`,` disable`, `decrypt`,` status`, `decrypt-file` och `target-status`.",
  "Manual": "Manuellt",
@@ -474,6 +513,9 @@
  "Master password": "Huvudlösenord",
  "Master password:": "Huvudlösenord:",
  "Max concurrent connections": "Max antal samtida anslutningar",
+ "Max Item Size": "Max objektstorlek",
+ "Max note or attachment size": "Max storlek för anteckning eller bilaga",
+ "Max Total Size": "Max total storlek",
  "Missing keys": "Saknade nycklar",
  "Missing Master Keys": "Saknade huvudnycklar",
  "Missing required argument: %s": "Saknade obligatoriskt argument: %s",
@@ -485,6 +527,7 @@
  "Move to notebook": "Flytta till anteckningsboken",
  "Move to notebook...": "Flytta till anteckningsbok...",
  "Move to notebook:": "Flytta till anteckningsboken:",
+ "Moves the given <item> to [notebook]": "Flyttar det givna <item> till [notebook]",
  "n": "n",
  "N": "N",
  "New note": "Ny anteckning",
@@ -495,6 +538,7 @@
  "New tags:": "Nya taggar:",
  "New to-do": "Ny att-göra",
  "New version: %s": "Ny version: %s",
+ "Next match": "Nästa träff",
  "Nextcloud": "Nextcloud",
  "Nextcloud password": "Nextcloud-lösenord",
  "Nextcloud username": "Nextcloud-användarnamn",
@@ -522,6 +566,7 @@
  "Note attachments...": "Anteckningsbilagor...",
  "Note body": "Texten",
  "Note does not exist: \"%s\". Create it?": "Anteckning finns inte: \"%s\". Skapa den?",
+ "Note editor": "Anteckningsredigerare",
  "Note has been saved.": "Anteckning har sparats.",
  "Note History": "Anteckningshistorik",
  "Note is not a to-do: \"%s\"": "Anteckning är inte en att-göra: \"%s\"",
@@ -552,12 +597,14 @@
  "Only one note can be printed at a time.": "Endast en anteckning kan skrivas ut åt gången.",
  "Open": "Öppna",
  "Open %s": "Öppna %s",
+ "Open PDF viewer": "Öppna PDF-visare",
  "Open profile directory": "Öppna profilmappen",
  "Open Sync Wizard...": "Öppna synkroniseringsguiden...",
  "Open...": "Öppna...",
  "Operation cancelled": "Operation avbruten",
  "Options": "Inställningar",
  "Or create an account.": "Eller skapa ett konto.",
+ "Ordered list": "Ordnad lista",
  "Other applications...": "Andra program...",
  "Output format: %s": "Utmatningsformat: %s",
  "Page orientation for PDF export": "Sidorientering för export till PDF",
@@ -569,6 +616,7 @@
  "Paste": "Klistra in",
  "Path:": "Sökväg:",
  "PDF File": "PDF-fil",
+ "Per user. Minimum of %d users.": "Per användare. Minst %d användare.",
  "Permission needed": "Tillstånd behövs",
  "Permission to use camera": "Tillåtelse att använda kameran",
  "Please click on \"%s\" to proceed, or set the passwords in the \"%s\" list below.": "Klicka på \"%s\" för att fortsätta, eller ställ in lösenorden i listan \"%s\" nedan.",
@@ -597,9 +645,12 @@
  "Press the shortcut": "Tryck på genvägen",
  "Press the shortcut and then press ENTER. Or, press BACKSPACE to clear the shortcut.": "Tryck på genvägen och tryck sedan på ENTER. Eller tryck på BACKSPACE för att rensa genvägen.",
  "Press to set the decryption password.": "Tryck för att ställa in dekrypteringslösenordet.",
+ "Previous match": "Föregående träff",
  "Previous versions of this note": "Tidigare versioner av denna anteckning",
  "Print": "Skriv ut",
+ "Priority support": "Prioriterat stöd",
  "Privacy Policy": "Integritetspolicy",
+ "Pro": "Pro",
  "Process failed payment subscriptions": "Bearbeta misslyckade betalningsprenumerationer",
  "Process oversized accounts": "Bearbeta överdimensionerade konton",
  "Process user deletions": "Bearbeta raderingar av användare",
@@ -607,6 +658,9 @@
  "Profile name:": "Profilnamn:",
  "Profile Version: %s": "Profilversion: %s",
  "Properties": "Egenskaper",
+ "Proxy enabled": "Proxy aktiverad",
+ "Proxy timeout (seconds)": "Proxy tidsgräns (sekunder)",
+ "Proxy URL": "Proxy-URL",
  "Public-private key pair:": "Offentlig-privat nyckelpar:",
  "Publish note...": "Publisera anteckning...",
  "Publish Notes": "Publicera anteckningar",
@@ -623,6 +677,7 @@
  "Recipients:": "Mottagare:",
  "Redo": "Gör om",
  "Refresh": "Uppdatera",
+ "Regular expression": "Reguljärt uttryck",
  "Reject": "Avvisa",
  "Remove": "Ta bort",
  "Remove tag \"%s\" from all notes?": "Ta bort taggen \"%s\" från alla anteckningar?",
@@ -632,6 +687,10 @@
  "Rename tag:": "Byt namn på tagg:",
  "Renames the given <item> (note or notebook) to <name>.": "Byter namn på den angivna <item> (anteckning eller anteckningsbok) till <name>.",
  "Renew token": "Förnya token",
+ "Replace": "Ersätt",
+ "Replace all": "Ersätt alla",
+ "Replace with...": "Ersätt alla...",
+ "Replace: ": "Ersätt: ",
  "Reset master password": "Återställ huvudlösenord",
  "Resources: %d.": "Resurser: %d.",
  "Restart and upgrade": "Starta om och uppgradera",
@@ -660,6 +719,7 @@
  "Save geo-location with notes": "Spara geolokalisering med anteckningar",
  "Search": "Sök",
  "Search for plugins...": "Sök efter insticksmoduler...",
+ "Search for...": "Sök efter...",
  "Search in all the notes": "Sök i alla anteckningarna",
  "Search in current note": "Sök i aktuell anteckning",
  "Search...": "Sök...",
@@ -679,17 +739,23 @@
  "Set the password": "Ställ in lösenord",
  "Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s": "Ställer in egenskapen <name> av den givna <note> till det angivna [value]. Möjliga egenskaper är:\n\n%s",
  "Share": "Dela",
+ "Share and collaborate on a notebook": "Dela och samarbeta i en anteckningsbok",
  "Share Notebook": "Dela anteckningsbok",
  "Share notebook...": "Dela anteckningsbok...",
+ "Sharing access control": "Dela åtkomstkontroll",
  "Sharing notebook...": "Delar anteckningsboken...",
  "Shortcuts are not available in CLI mode.": "Snabbkommandon är inte tillgängliga i läge för kommandotolk.",
+ "Show advanced": "Visa avancerade",
  "Show Advanced Settings": "Visa avancerade inställningar",
  "Show all": "Visa alla",
  "Show completed to-dos": "Visa slutförda att-göra",
+ "Show disabled": "Visa inaktiverade",
  "Show disabled keys": "Visa inaktiverade nycklar",
+ "Show more actions": "Visa fler åtgärder",
  "Show note counts": "Visa anteckningsantal",
  "Show sort order buttons": "Visa sorteringsordningsknappar",
  "Show tray icon": "Visa fältikon",
+ "Show/hide the sidebar": "Visa/dölj sidofältet",
  "Sidebar": "Sidofält",
  "Size": "Storlek",
  "Skip this version": "Hoppa över denna versionen",
@@ -739,6 +805,7 @@
  "Switch to profile %d": "Byt till profilen %d",
  "Switch to to-do type": "Byt till att-göra-typ",
  "Switches to [notebook] - all further operations will happen within this notebook.": "Växlar till [notebook] - alla ytterligare åtgärder kommer att hända inom denna anteckningsbok.",
+ "Sync as many devices as you want": "Synkronisera så många enheter du vill",
  "Sync Status": "Synkroniseringsstatus",
  "Sync status (synced items / total items)": "Synkroniseringstillstånd (synkroniserade objekt / totalt antal objekt)",
  "Sync target must be upgraded! Run `%s` to proceed.": "Synkroniseringsmålet måste uppgraderas! Kör `%s` för att fortsätta.",
@@ -762,7 +829,9 @@
  "Tagged: %d.": "Taggad: %d.",
  "Tags": "Taggar",
  "Take photo": "Ta ett foto",
+ "Task list": "Uppgiftslista",
  "Tasks": "Uppgifter",
+ "Teams": "Team",
  "Text editor command": "Textredigeringskommando",
  "Thank you! Your Joplin Cloud account is now setup and ready to use.": "Tack! Ditt Joplin Cloud-konto är nu konfigurerat och klart att använda.",
  "The app is now going to close. Please relaunch it to complete the process.": "Appen kommer nu att stängas. Starta om den för att slutföra processen.",
@@ -834,6 +903,7 @@
  "To retry decryption of these items. Run `e2ee decrypt --retry-failed-items`": "För att försöka dekryptera dessa objekt igen. Kör `e2ee decrypt --retry-failed-items`",
  "To work correctly, the app needs the following permissions. Please enable them in your phone settings, in Apps > Joplin > Permissions": "För att fungera korrekt behöver appen följande tillstånd. Aktivera dem i dina telefoninställningar, i Appar > Joplin > Behörigheter",
  "to-do": "att-göra",
+ "to-do: %s": "att-göra: %s",
  "Toggle comment": "Växla kommentar",
  "Toggle development tools": "Växla utvecklingsverktyg",
  "Toggle editor layout": "Växla redigeringslayout",
@@ -846,8 +916,10 @@
  "Toggle sort order field": "Växla sorteringsordningsfält",
  "Token has been copied to the clipboard!": "Token har kopierats till urklipp!",
  "Tools": "Verktyg",
+ "Total Size": "Total storlek",
  "Total: %d/%d": "Totalt: %d/%d",
  "Try again": "Försök igen",
+ "Try it now": "Testa det nu",
  "Type `help [command]` for more information about a command; or type `help all` for the complete usage information.": "Skriv `help [command]` för mer information om ett kommando; eller skriv `help all` för fullständig användningsinformation.",
  "Type `joplin help` for usage information.": "Skriv `joplin help` för användningsinformation.",
  "Type a note title or part of its content to jump to it. Or type # followed by a tag name, or @ followed by a notebook name. Or type : to search for commands.": "Skriv titeln på en anteckning för att hoppa till den. Eller skriv # följt av namnet på en tagg eller@ följt av namnet på en anteckningsbok. Eller skriv : för att söka efter kommandon.",
@@ -857,6 +929,7 @@
  "Undo": "Ångra",
  "Unknown flag: %s": "Okänd flagga: %s",
  "Unknown item type downloaded - please upgrade Joplin to the latest version": "Okänd objekttyp hämtad - uppgradera Joplin till den senaste versionen",
+ "Unordered list": "Oordnad lista",
  "Unpublish note": "Sluta publisera anteckningen",
  "Unshare": "Sluta dela",
  "Unshare this notebook? The recipients will no longer have access to its content.": "Dela inte den här anteckningsboken? Mottagarna har inte längre tillgång till dess innehåll.",
@@ -906,7 +979,7 @@
  "When creating a new to-do:": "När du skapar en ny att-göra:",
  "Words": "Ord",
  "y": "y",
- "Y": "Y",
+ "Y": "J",
  "yes": "ja",
  "Yes": "Ja",
  "You are about to attach a large image (%dx%d pixels). Would you like to resize it down to %d pixels before attaching it?": "Du håller på att bifoga en stor bild (%dx%d pixlar). Vill du ändra storleken till %d pixlar innan du bifogar den?",

packages/lib/locales/zh_CN.json

@@ -1,8 +1,12 @@
 {
  "\"%s\" is missing the required \"%s\" property.": "“%s” 缺少必须的属性 “%s”。",
  "%d days": "%d 天",
+ "%d GB": "%d GB",
+ "%d GB storage space": "%dGB存储空间",
  "%d hour": "%d 小时",
  "%d hours": "%d 小时",
+ "%d MB": "%d MB",
+ "%d MB per note or attachment": "每个笔记或附件%dMB",
  "%d minutes": "%d 分钟",
  "%d notes match this pattern. Delete them?": "有 %d 条笔记匹配。是否删除？",
  "%s %s (%s, %s)": "%s %s (%s, %s)",
@@ -27,6 +31,7 @@
  "&Tools": "工具 (&T)",
  "&View": "视图 (&V)",
  "(%s)": "(%s)",
+ "(In plugin: %s)": "(在插件%s中)",
  "(None)": "（无）",
  "(wysiwyg: %s)": "（兼容所见即所得编辑器：%s）",
  "- Camera: to allow taking a picture and attaching it to a note.": "- 相机：允许拍照并将照片添加到一条笔记中。",
@@ -42,8 +47,9 @@
  "Accelerator \"%s\" is not valid.": "加速键 “%s” 无效。",
  "Accelerator \"%s\" is used for \"%s\" and \"%s\" commands. This may lead to unexpected behaviour.": "加速键 “%s” 被用于 “%s” 和 “%s” 命令。这可能导致意外的表现。",
  "Accept": "接受",
- "Action": "动作",
- "Actions": "动作",
+ "Account": "账号",
+ "Action": "操作",
+ "Actions": "操作",
  "Active": "正在使用",
  "Actual Size": "实际大小",
  "Add body": "添加内容",
@@ -60,6 +66,8 @@
  "Also displays unset and hidden config variables.": "同时显示未设置的与隐藏的配置变量。",
  "Also publish linked notes": "同时发布链接的笔记",
  "Always": "总是",
+ "Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to see the short notebook id or use $b for current selected notebook": "不明确的笔记本“%s”。请改用短笔记本id - 按\"ti\"查看短笔记本id,或使用 $b 选择当前笔记本",
+ "Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti\" to see the short notebook id": "不明确的笔记本“%s”。请改用短笔记本id - 按\"ti\"查看短笔记本id",
  "An update is available, do you want to download it now?": "有更新可用，是否现在进行下载？",
  "Appearance": "外观",
  "Application": "应用程序",
@@ -67,6 +75,7 @@
  "Are you sure you want to renew the authorisation token?": "确定要更新授权令牌吗？",
  "Arguments:": "参数：",
  "Aritim Dark": "暗黑 (Aritim)",
+ "Attach": "附加",
  "Attach file": "附加文件",
  "Attach photo": "附加照片",
  "Attach...": "附加...",
@@ -85,6 +94,7 @@
  "Automatically check for updates": "自动检查更新",
  "Automatically switch theme to match system theme": "根据系统主题自动切换",
  "Back": "返回",
+ "Basic": "基本",
  "Bold": "加粗",
  "Browse all plugins": "浏览所有插件",
  "Browse...": "浏览...",
@@ -106,6 +116,7 @@
  "Cannot save %s \"%s\" because it is larger than the allowed limit (%s)": "无法保存 %s “%s”，因为超过了允许的限制大小 (%s)。",
  "Cannot save %s \"%s\" because it would go over the total allowed size (%s) for this account": "无法保存 %s “%s”，因为超过了允许的限制大小 (%s)",
  "Cannot share encrypted notebook with recipient %s because they have not enabled end-to-end encryption. They may do so from the screen Configuration > Encryption.": "无法与收件人 %s 共享加密的笔记本，因为他们没有启用端到端加密。他们可以通过 配置 > 加密 界面来启用。",
+ "Case sensitive": "大小写敏感",
  "Change application layout": "更改应用布局",
  "Change language": "更改语言",
  "Characters": "字符数",
@@ -128,6 +139,7 @@
  "Code Block": "代码块",
  "Code View": "代码视图",
  "Collaborate on notebooks with others": "与他人共同协作笔记本",
+ "Collapse": "折叠",
  "Coming alarms": "临近提醒",
  "Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem. Note that if you make changes to the TLS settings, you must save your changes before clicking on \"Check synchronisation configuration\".": "以逗号分隔的路径列表，可以是包含证书的目录，也可以直接指向单独的证书路径。例如：/my/cert_dir,/other/custom.pem。请注意，如果更改 TLS 设置，则必须先保存更改，之后再点击 “检查同步配置”。",
  "command": "命令",
@@ -145,6 +157,7 @@
  "Conflicted: %d": "有冲突：%d 条",
  "Conflicts": "冲突",
  "Conflicts (attachments)": "冲突（附件）",
+ "Consolidated billing": "合并计费",
  "Content provided by %s": "内容由 %s 提供",
  "Convert to note": "转换为笔记",
  "Convert to todo": "转换为待办事项",
@@ -163,7 +176,7 @@
  "Could not export notes: %s": "无法导出笔记：%s",
  "Could not install plugin: %s": "无法安装插件：%s",
  "Could not respond to the invitation. Please try again, or check with the notebook owner if they are still sharing it.\n\nThe error was: \"%s\"": "无法对邀请作出回应。请再试一次，或向笔记本所有者核实他们是否仍在共享它。\n\n错误是：“%s”",
- "Could not upgrade master key: %s": "无法升级主密钥：%s",
+ "Could not upgrade master key: %s": "无法升级主密钥(master key)：%s",
  "Could not verify the share status of this notebook - aborting. Please try again when you are connected to the internet.": "无法验证此笔记的分享状态 — 正在终止。请在连接到互联网后再次尝试。",
  "Create": "创建",
  "Create a notebook": "新建一个笔记本",
@@ -175,9 +188,9 @@
  "Created local items: %d.": "已新建本地项目：%d。",
  "Created locally": "已新建本地项目",
  "Created remote items: %d.": "已新建远程项目：%d。",
- "Created: ": "创建于： ",
+ "Created: ": "创建： ",
  "Created: %d.": "已创建：%d 条。",
- "Created: %s": "创建于：%s",
+ "Created: %s": "创建：%s",
  "Creates a new note.": "新建笔记。",
  "Creates a new notebook.": "新建笔记本。",
  "Creates a new to-do.": "新建待办事项。",
@@ -196,6 +209,7 @@
  "Date": "日期",
  "Date format": "日期格式",
  "days": "天",
+ "Decrease indent level": "减少缩进级别",
  "Decrypted items: %d": "已解密条目：%d",
  "Decrypted items: %s / %s": "已解密条目： %s / %s",
  "Decrypting items: %d/%d": "正在解密条目：%d/%d",
@@ -226,7 +240,7 @@
  "Disable": "禁用",
  "Disable encryption": "禁用加密",
  "Disable safe mode and restart": "禁用安全模式并重启",
- "Disable Web Clipper Service": "禁用网页剪辑器",
+ "Disable Web Clipper Service": "禁用网页剪藏器",
  "Disabled": "已禁用",
  "Disabling encryption means *all* your notes and attachments are going to be re-synchronised and sent unencrypted to the sync target. Do you wish to continue?": "禁用加密会导致 *所有笔记与附件* 重新同步，并以非加密的数据形式发送到同步目标。确定继续吗？",
  "Discard changes": "放弃更改",
@@ -243,6 +257,7 @@
  "Do it now": "立即执行",
  "Do not ask for confirmation.": "不再要求确认。",
  "Do not lose the password as, for security purposes, this will be the *only* way to decrypt the data! To enable encryption, please enter your password below.": "不要丢失密码，因为出于安全考虑，这将是解密数据的*唯一*方式！要启用加密功能，请在下面输入密码。",
+ "Done": "完成",
  "Download": "下载",
  "Download and install the relevant extension for your browser:": "为您的浏览器下载并安装相关的扩展插件：",
  "Downloaded": "已下载",
@@ -250,7 +265,7 @@
  "Downloaded and encrypted": "已下载并加密",
  "Downloading": "下载中",
  "Downloading resources...": "下载资源中...",
- "Dracula": "德古拉紫 (Dracula)",
+ "Dracula": "德古拉紫(Dracula)",
  "Drop notes or files here": "将笔记或文件拖到此处",
  "Dropbox": "Dropbox",
  "Dropbox Login": "登录 Dropbox",
@@ -295,7 +310,7 @@
  "Enable table of contents extension": "启用目录扩展 （[TOC]）",
  "Enable typographer support": "启用 Typographer 支持",
  "Enable video player": "启用视频播放器",
- "Enable Web Clipper Service": "启用网页剪辑器",
+ "Enable Web Clipper Service": "启用网页剪藏器",
  "Enable ~sub~ syntax": "启用 ~sub~ 语法",
  "Enabled": "已启用",
  "Enabling encryption means *all* your notes and attachments are going to be re-synchronised and sent encrypted to the sync target.": "启用加密意味着您的*所有*笔记与附件都将被重新同步，并被加密发送到同步目标。",
@@ -305,11 +320,11 @@
  "Encryption": "加密",
  "Encryption Config": "加密配置",
  "Encryption is: %s": "加密状态：%s",
- "Encryption keys": "加密密钥",
+ "Encryption keys": "加密密钥(Encryption keys)",
  "Encryption:": "加密：",
  "End-to-end encryption": "端到端加密",
  "Enter code here": "在此输入代码",
- "Enter master password:": "输入主密码：",
+ "Enter master password:": "输入主密码(master password)：",
  "Enter notebook title": "输入笔记本标题",
  "Enum": "枚举",
  "Error": "发生错误",
@@ -320,6 +335,7 @@
  "Evernote Export File (as HTML)": "Evernote 导出文件 (HTML)",
  "Evernote Export File (as Markdown)": "Evernote 导出文件 (Markdown)",
  "Exits the application.": "退出应用。",
+ "Expand": "展开",
  "Export": "导出",
  "Export all": "全部导出",
  "Export debug report": "导出调试报告",
@@ -330,8 +346,8 @@
  "Exports Joplin data to the given path. By default, it will export the complete database including notebooks, notes, tags and resources.": "导出 Joplin 数据到选定路径。默认将导出包含笔记本、笔记、标签与资源等的完整数据库。",
  "Exports only the given note.": "仅导出选定笔记。",
  "Exports only the given notebook.": "仅导出选定笔记本。",
- "Fail-safe": "故障保护 (Fail-safe)",
- "Fail-safe: Do not wipe out local data when sync target is empty (often the result of a misconfiguration or bug)": "故障保护 (Fail-safe) ：当同步目标为空时（通常是配置错误或 Bug），不要删除本地数据",
+ "Fail-safe": "故障保护(Fail-safe)",
+ "Fail-safe: Do not wipe out local data when sync target is empty (often the result of a misconfiguration or bug)": "故障保护(Fail-safe) ：当同步目标为空时（通常是配置错误或Bug），不要删除本地数据",
  "Fatal error:": "严重错误：",
  "Feature flags": "特性标志",
  "Fetched items: %d/%d.": "已获取项目：%d/%d.",
@@ -339,6 +355,7 @@
  "File": "文件",
  "File system": "文件系统",
  "Filter tags": "筛选标签",
+ "Find and replace": "查找和替换",
  "Firefox Extension": "Firefox 扩展插件",
  "Fix search index": "修复搜索索引",
  "Fixing search index...": "正在修复搜索索引...",
@@ -347,6 +364,7 @@
  "Focus title": "聚焦标题",
  "Folders": "文件夹",
  "For debugging purpose only: export your profile to an external SD card.": "仅用于调试目的：将您的配置文件导出到外部 SD 卡。",
+ "For example \"%s\"": "例如\"%s\"",
  "For information on how to customise the shortcuts please visit %s": "若想了解有关如何自定义快捷键的信息，请访问 %s",
  "For more information about End-To-End Encryption (E2EE) and advice on how to enable it please check the documentation:": "若想了解有关端到端加密 (E2EE) 的更多信息，以及如何启用它的建议，请查阅文档：",
  "For the list of keyboard shortcuts and config options, type `help keymap`": "输入 `help keymap` 来获取完整的键盘快捷键列表",
@@ -355,7 +373,7 @@
  "Found: %d.": "已找到：%d 条。",
  "FTS enabled: %d": "FTS 已开启：%d",
  "Full changelog": "完整更新记录",
- "General": "通用选项",
+ "General": "常规",
  "Generated": "已生成",
  "Generating link...": "生成链接中...",
  "Get it now:": "立即获取：",
@@ -364,14 +382,20 @@
  "Go to source URL": "转到源 URL",
  "Goto Anything...": "跳转到任意内容...",
  "Grant authorisation": "批准授权",
+ "Header %d": "Header %d",
+ "Headers": "Headers",
  "Heading": "标题",
  "Help": "帮助",
  "Hide %s": "隐藏 %s",
+ "Hide advanced": "隐藏高级的",
+ "Hide disabled": "隐藏禁用的",
  "Hide disabled keys": "隐藏禁用的密钥",
  "Hide Joplin": "隐藏 Joplin",
+ "Hide keyboard": "隐藏键盘",
+ "Hide more actions": "隐藏更多操作",
  "Highlight": "突出显示",
  "Home": "主页",
- "Horizontal Rule": "水平线",
+ "Horizontal Rule": "分割线",
  "HTML Directory": "HTML 目录",
  "HTML File": "HTML 文件",
  "Hyperlink": "超链接",
@@ -390,9 +414,10 @@
  "In order to associate a geo-location with the note, the app needs your permission to access your location.\n\nYou may turn off this option at any time in the Configuration screen.": "为了将地理位置与笔记关联，本应用需要获取您的位置的权限。\n\n您可以在“配置”页面中随时关闭此选项。",
  "In order to do so, your entire data set will have to be encrypted and synchronised, so it is best to run it overnight.\n\nTo start, please follow these instructions:\n\n1. Synchronise all your devices.\n2. Click \"%s\".\n3. Let it run to completion. While it runs, avoid changing any note on your other devices, to avoid conflicts.\n4. Once sync is done on this device, sync all your other devices and let it run to completion.\n\nImportant: you only need to run this ONCE on one device.": "为此，必须对整个数据集进行加密和同步，因此最好在夜间休息时分运行。\n\n首先，请按照以下说明进行操作：\n\n1. 同步您的所有设备。\n2. 单击 “%s”。\n3. 让其完成运行。在运行时，请不要在其他设备上更改任何笔记，以免发生冲突。\n4. 在此设备上完成同步后，同步其他所有设备，并运行至同步完成。\n\n重要提醒：在一台设备上只需要运行一次。",
  "In order to use file system synchronisation your permission to write to external storage is required.": "为使用文件系统同步，需要获取写入外部存储的权限。",
- "In order to use the web clipper, you need to do the following:": "要使用网页剪辑器，您需要执行以下步骤：",
+ "In order to use the web clipper, you need to do the following:": "要使用网页剪藏器，您需要执行以下步骤：",
  "In progress": "正在进行",
  "In: %s": "位于：%s",
+ "Increase indent level": "增加缩进级别",
  "Indent less": "减少缩进",
  "Indent more": "增加缩进",
  "Information": "说明",
@@ -426,9 +451,10 @@
  "Joplin Server email": "Joplin 服务器邮箱",
  "Joplin Server password": "Joplin 服务器密码",
  "Joplin Server URL": "Joplin 服务器 URL",
- "Joplin Web Clipper allows saving web pages and screenshots from your browser to Joplin.": "Joplin 网页剪辑器可以让您将浏览器中的网页和屏幕截图保存到 Joplin。",
+ "Joplin Web Clipper allows saving web pages and screenshots from your browser to Joplin.": "Joplin 网页剪藏器可以让您将浏览器中的网页和屏幕截图保存到 Joplin。",
  "Joplin website": "Joplin 官网",
  "Joplin's own sync service. Also gives access to Joplin-specific features such as publishing notes or collaborating on notebooks with others.": "Joplin 自己的同步服务。还可以访问 Joplin 的特定功能，比如发布笔记或者与他人协作笔记本。",
+ "KaTeX": "KaTeX",
  "Keep note history for": "保留笔记历史",
  "Keyboard Mode": "键盘模式",
  "Keyboard Shortcut": "键盘快捷键",
@@ -449,6 +475,7 @@
  "Link has been copied to clipboard!": "链接已复制到剪贴板！",
  "Links with protocol \"%s\" are not supported": "不支持 “%s” 协议的链接",
  "List item": "列表项",
+ "Lists": "列表",
  "Loaded": "已加载",
  "Location": "位置",
  "Lock file is already being hold. If you know that no synchronisation is taking place, you may delete the lock file at \"%s\" and resume the operation.": "锁定文件已被占用。如果您确认当前未在进行任何同步，可在删除锁定文件 “%s” 后继续上一步操作。",
@@ -460,8 +487,9 @@
  "Logout": "登出",
  "Logs": "日志",
  "Make a donation": "捐助",
- "Manage master password": "管理主密码",
- "Manage master password...": "管理主密码……",
+ "Manage master password": "管理主密码(master password)",
+ "Manage master password...": "管理主密码(master password)...",
+ "Manage multiple users": "管理多个用户",
  "Manage your plugins": "管理您的插件",
  "Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, `status`, `decrypt-file`, and `target-status`.": "管理 E2EE 配置。命令为：`enable`、`disable`、`decrypt`、`status`、`decrypt-file` 和 `target-status`。",
  "Manual": "手动",
@@ -470,17 +498,19 @@
  "Marks a to-do as done.": "标记待办事项为完成。",
  "Marks a to-do as non-completed.": "标记待办事项为未完成。",
  "Markup": "标记语言",
- "Master Key %s": "主密钥 %s",
+ "Master Key %s": "主密钥(Master Key) %s",
  "Master password": "主密码",
- "Master password:": "主密码：",
+ "Master password:": "主密码(Master password)：",
  "Max concurrent connections": "最大并发连接数",
- "Missing keys": "缺少密钥",
- "Missing Master Keys": "缺少主密钥",
+ "Max Item Size": "最大条目数",
+ "Max note or attachment size": "最大项目大小",
+ "Missing keys": "缺少密钥(keys)",
+ "Missing Master Keys": "缺少主密钥(Master Keys)",
  "Missing required argument: %s": "缺失必选参数：%s",
  "Mobile data - auto-sync disabled": "移动数据自动同步被禁用",
  "More info": "更多信息",
  "More information": "更多信息",
- "More than one item match \"%s\". Please narrow down your query.": "有多条项目符合 “%s”。请缩小您的检索范围。",
+ "More than one item match \"%s\". Please narrow down your query.": "不止一项匹配 “%s”。请缩小您的检索范围。",
  "Move %d notes to notebook \"%s\"?": "是否移动 %d 条笔记到笔记本 “%s”？",
  "Move to notebook": "移动到笔记本",
  "Move to notebook...": "移动到笔记本...",
@@ -495,6 +525,7 @@
  "New tags:": "新建标签：",
  "New to-do": "新建待办事项",
  "New version: %s": "新版本：%s",
+ "Next match": "下次匹配",
  "Nextcloud": "Nextcloud",
  "Nextcloud password": "Nextcloud 密码",
  "Nextcloud username": "Nextcloud 用户名",
@@ -529,7 +560,7 @@
  "Note list growth factor": "笔记列表增长因子",
  "Note properties": "笔记属性",
  "Note title": "笔记标题",
- "Note&book": "笔记&笔记本",
+ "Note&book": "笔记本 (&B)",
  "Note: Does not work in all desktop environments.": "注意：在部分桌面环境下无法工作。",
  "Note: When a note is shared, it will no longer be encrypted on the server.": "注意：笔记分享后，便不再在服务器上加密。",
  "Notebook": "笔记本",
@@ -538,15 +569,15 @@
  "Notebooks": "笔记本",
  "Notebooks cannot be named \"%s\", which is a reserved title.": "笔记本无法被命名为 “%s”，该标题已被留作他用。",
  "Notes": "笔记",
- "Notes and settings are stored in: %s": "笔记与设置储存于：%s",
+ "Notes and settings are stored in: %s": "笔记与配置信息存储于：%s",
  "Notes can only be created within a notebook.": "笔记只能在笔记本内创建。",
  "Numbered List": "有序列表",
  "OK": "确认",
  "OLED Dark": "纯黑 (OLED)",
  "On %s: %s": "位于 %s: %s",
- "One of your master keys use an obsolete encryption method.": "您的主密钥之一使用了过时的加密方法。",
- "One or more items are currently encrypted and you may need to supply a master password. To do so please type `e2ee decrypt`. If you have already supplied the password, the encrypted items are being decrypted in the background and will be available soon.": "一个或多个项目当前已加密，您可能需要提供主密码。若需进行此操作请输入 `e2ee decrypt` 。若您已提供密码，此时加密文件正在后台解密，解锁之后即可使用。",
- "One or more master keys need a password.": "一个或多个主密钥需要密码。",
+ "One of your master keys use an obsolete encryption method.": "您的主密钥(Master Key)之一使用了过时的加密方法。",
+ "One or more items are currently encrypted and you may need to supply a master password. To do so please type `e2ee decrypt`. If you have already supplied the password, the encrypted items are being decrypted in the background and will be available soon.": "一个或多个项目当前已加密，您可能需要提供主密码(master password)。若需进行此操作请输入 `e2ee decrypt` 。若您已提供密码，此时加密文件正在后台解密，解锁之后即可使用。",
+ "One or more master keys need a password.": "一个或多个主密钥(Master Key)需要密码。",
  "OneDrive": "OneDrive",
  "OneDrive Login": "登录 OneDrive",
  "Only one note can be printed at a time.": "一次只能打印一个笔记。",
@@ -569,11 +600,12 @@
  "Paste": "粘贴",
  "Path:": "路径：",
  "PDF File": "PDF 文件",
+ "Per user. Minimum of %d users.": "每个用户。至少有%d个用户。",
  "Permission needed": "需要权限",
  "Permission to use camera": "使用相机的权限",
  "Please click on \"%s\" to proceed, or set the passwords in the \"%s\" list below.": "请单击 “%s” 继续，或在下面的 “%s” 列表中设置密码。",
  "Please confirm that you would like to re-encrypt your complete database.": "请确认您要重新加密整个数据库。",
- "Please enter your password in the master key list below before upgrading the key.": "在升级密钥之前，请在下面的主密钥列表中输入您的密码。",
+ "Please enter your password in the master key list below before upgrading the key.": "在升级密钥之前，请在下面的主密钥(Master Key)列表中输入您的密码。",
  "Please note that if it is a large notebook, it may take a few minutes for all the notes to show up on the recipient's device.": "请注意，如果是大型笔记本，可能需要几分钟时间才能在收件人的设备上显示出所有的笔记。",
  "Please open the following URL in your browser to authenticate the application. The application will create a directory in \"Apps/Joplin\" and will only read and write files in this directory. It will have no access to any files outside this directory nor to any other personal data. No data will be shared with any third party.": "请在浏览器中打开以下链接以验证本应用程序。本应用会建立 “Apps/Joplin” 文件目录，并只会读写该目录中的文件。本应用没有任何权限访问此目录以外的任何文件或个人信息，也不会与第三方分享任何数据。",
  "Please select a notebook first.": "请先选择笔记本。",
@@ -589,16 +621,18 @@
  "Portrait": "竖版",
  "Possible keys/values:": "可用键/值：",
  "Possible values: %s.": "可用值：%s。",
- "Preferences": "首选项",
- "Preferences...": "首选项...",
+ "Preferences": "偏好设置",
+ "Preferences...": "偏好设置...",
  "Preferred dark theme": "首选暗色主题",
  "Preferred light theme": "首选亮色主题",
  "Press Ctrl+D or type \"exit\" to exit the application": "按 Ctrl+D 或输入 “exit” 退出程序",
  "Press the shortcut": "按下快捷键",
  "Press the shortcut and then press ENTER. Or, press BACKSPACE to clear the shortcut.": "按下快捷键然后按下回车。或者：按下退格键以清除快捷键。",
  "Press to set the decryption password.": "点按设置解密密码。",
- "Previous versions of this note": "此笔记的早期版本",
+ "Previous match": "上次匹配",
+ "Previous versions of this note": "该笔记的历史版本",
  "Print": "打印",
+ "Priority support": "优先支持",
  "Privacy Policy": "隐私政策",
  "Process failed payment subscriptions": "处理失败的付费订阅",
  "Process oversized accounts": "处理超容量的账户",
@@ -607,7 +641,9 @@
  "Profile name:": "配置文件：",
  "Profile Version: %s": "配置文件版本：%s",
  "Properties": "笔记属性",
- "Public-private key pair:": "公钥、私钥对：",
+ "Proxy timeout (seconds)": "代理超时(秒)",
+ "Proxy URL": "代理URL",
+ "Public-private key pair:": "公-私钥对：",
  "Publish note...": "分享笔记...",
  "Publish Notes": "分享笔记",
  "Publish notes to the internet": "把笔记发布到互联网",
@@ -632,9 +668,12 @@
  "Rename tag:": "重命名标签：",
  "Renames the given <item> (note or notebook) to <name>.": "重命名选定的 <item> （笔记或笔记本）到 <name>。",
  "Renew token": "更新令牌",
- "Reset master password": "重置主密码",
+ "Replace": "替换",
+ "Replace with...": "替换为...",
+ "Replace: ": "替换: ",
+ "Reset master password": "重置主密码(master password)",
  "Resources: %d.": "资源：%d。",
- "Restart and upgrade": "重启后升级",
+ "Restart and upgrade": "重启并升级",
  "Restart now": "立即重启",
  "Restore": "恢复",
  "Restored Notes": "已恢复的笔记",
@@ -679,8 +718,10 @@
  "Set the password": "设置密码",
  "Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s": "将给定的 <note> 的属性 <name> 设置为 [value]。可用属性有：\n\n%s",
  "Share": "分享",
+ "Share and collaborate on a notebook": "在笔记本上分享和协作",
  "Share Notebook": "分享笔记本",
  "Share notebook...": "分享笔记本...",
+ "Sharing access control": "共享访问控制",
  "Sharing notebook...": "分享笔记本中...",
  "Shortcuts are not available in CLI mode.": "快捷键在 CLI 模式下不可用。",
  "Show Advanced Settings": "显示高级选项",
@@ -690,6 +731,7 @@
  "Show note counts": "显示笔记数",
  "Show sort order buttons": "显示排序方法按钮",
  "Show tray icon": "显示托盘图标",
+ "Show/hide the sidebar": "显示/隐藏侧边栏",
  "Sidebar": "边栏",
  "Size": "大小",
  "Skip this version": "跳过该版本",
@@ -709,7 +751,7 @@
  "Specify the port that should be used by the API server. If not set, a default will be used.": "请指定 API 服务器应使用的端口。如果未设置，将使用默认值。",
  "Spell checker": "拼写检查器",
  "Split View": "分栏视图",
- "Start application minimised in the tray icon": "应用程序启动时最小化到托盘",
+ "Start application minimised in the tray icon": "程序启动时最小化到托盘",
  "Start, stop or check the API server. To specify on which port it should run, set the api.port config variable. Commands are (%s).": "启动，停止或检查 API 服务。可以通过设置 ‘api.port’ 变量指定 API 服务运行在哪个端口上。执行命令 (%s) 。",
  "Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.": "开始解密，请稍候... 取决于需解密的文件数量，该环节可能需要几分钟。",
  "Starting synchronisation...": "开始同步...",
@@ -719,12 +761,13 @@
  "Status": "状态",
  "Status: %s": "状态：%s",
  "Status: Started on port %d": "状态：在 %d 端口运行",
- "Step 1: Enable the clipper service": "步骤一：启用网页剪辑器",
+ "Step 1: Enable the clipper service": "步骤一：启用网页剪藏服务",
  "Step 1: Open this URL in your browser to authorise the application:": "步骤一：在浏览器中打开此 URL 来授权应用程序：",
  "Step 2: Enter the code provided by Dropbox:": "步骤二：输入 Dropbox 提供的代码：",
  "Step 2: Install the extension": "步骤二：安装扩展",
  "Stop": "停止",
  "Stop external editing": "停止外部编辑",
+ "Storage space": "储存空间",
  "Strikethrough": "删除线",
  "strong text": "加粗文本",
  "Submit": "提交",
@@ -739,6 +782,7 @@
  "Switch to profile %d": "切换到配置文件 %d",
  "Switch to to-do type": "切换为待办事项",
  "Switches to [notebook] - all further operations will happen within this notebook.": "切换到 [notebook] - 所有进一步操作将在该笔记本中进行。",
+ "Sync as many devices as you want": "尽可能多地同步您想要的设备",
  "Sync Status": "同步状态",
  "Sync status (synced items / total items)": "同步状态（已同步条目/条目总数）",
  "Sync target must be upgraded! Run `%s` to proceed.": "需要升级同步目标！运行 `%s` 以继续。",
@@ -753,20 +797,21 @@
  "Synchronisation target": "同步目标",
  "Synchronisation target: %s (%s)": "同步目标：%s (%s)",
  "Synchronise": "同步",
- "Synchronise only over WiFi connection": "只通过 WiFi 网络同步数据",
+ "Synchronise only over WiFi connection": "只通过 WiFi 同步",
  "Synchronises with remote storage.": "与远程储存同步。",
  "Synchronising...": "正在同步...",
  "Synchronizing...": "正在同步...",
- "Tabloid": "文摘 (Tabloid)",
+ "Tabloid": "文摘(Tabloid)",
  "tag1, tag2, ...": "标签1, 标签2, ...",
  "Tagged: %d.": "已加标签：%d 条。",
  "Tags": "标签",
  "Take photo": "拍照",
  "Tasks": "任务",
+ "Teams": "团队",
  "Text editor command": "文本编辑器命令",
  "Thank you! Your Joplin Cloud account is now setup and ready to use.": "感谢！您的 Joplin Cloud 帐号已经设置完毕。",
  "The app is now going to close. Please relaunch it to complete the process.": "应用将要关闭。请重新启动它以完成此过程。",
- "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?": "该程序没有正确关闭。你想在安全模式下启动吗？",
  "The application has been authorised - you may now close this browser tab.": "授权成功 - 您可以关闭此页面了。",
  "The application has been authorised!": "应用已成功授权！",
  "The application has been successfully authorised.": "已成功授予本应用程序权限。",
@@ -775,7 +820,7 @@
  "The command \"%s\" is only available in GUI mode": "命令 “%s” 仅在 GUI 模式下可用",
  "The default admin password is insecure and has not been changed! [Change it now](%s)": "默认管理员密码不安全且尚未更改！[现在更改](%s)",
  "The default encryption method has been changed to a more secure one and it is recommended that you apply it to your data.": "默认的加密方法已更改为一种更安全的方法，建议您将其应用于您的数据。",
- "The default encryption method has been changed, you should re-encrypt your data.": "默认的加密方法已更改，您应当重新加密数据。",
+ "The default encryption method has been changed, you should re-encrypt your data.": "默认的加密方式已变更，您应当重新加密数据。",
  "The editor command (may include arguments) that will be used to open a note. If none is provided it will try to auto-detect the default editor.": "该文本编辑器命令（可包含参数）将会被用于打开笔记。若未提供将尝试自动检测默认编辑器。",
  "The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes.": "拉伸系数属性用于指定项目之间的容量比例。如，因子为 2 的项目所占容量是因子为 1 的项目的两倍。该更改在软件重启后生效。",
  "The following attachments are being watched for changes:": "下列附件发生的改动正在被监控：",
@@ -783,8 +828,8 @@
  "The Joplin mobile app does not currently support this type of link: %s": "Joplin 移动应用目前不支持这种类型的链接：%s",
  "The Joplin team has vetted this plugin and it meets our standards for security and performance.": "Joplin 团队已经核准了该插件，它符合我们对于安全和性能的要求。",
  "The keys with these IDs are used to encrypt some of your items, however the application does not currently have access to them. It is likely they will eventually be downloaded via synchronisation.": "具有这些 ID 的密钥正被用于加密您的某些项，但应用程序目前无法访问它们。项目最终会通过同步获取，但目前可能仍未被同步。",
- "The master key has been upgraded successfully!": "主密钥已成功升级！",
- "The master keys with these IDs are used to encrypt some of your items, however the application does not currently have access to them. It is likely they will eventually be downloaded via synchronisation.": "具有这些 ID 的主密钥正被用于加密某些项，但应用程序目前无法访问它们。项目最终会通过同步获取，但目前可能仍未被同步。",
+ "The master key has been upgraded successfully!": "主密钥(Master Key)已成功升级！",
+ "The master keys with these IDs are used to encrypt some of your items, however the application does not currently have access to them. It is likely they will eventually be downloaded via synchronisation.": "具有这些 ID 的主密钥(Master Key)正被用于加密某些项，但应用程序目前无法访问它们。项目最终会通过同步获取，但目前可能仍未被同步。",
  "The note \"%s\" has been successfully restored to the notebook \"%s\".": "笔记 “%s” 已成功恢复到笔记本 “%s” 中。",
  "The notebook could not be saved: %s": "无法保存笔记本：%s",
  "The notes have been imported: %s": "以下笔记已被导入：%s",
@@ -794,9 +839,9 @@
  "The sync target needs to be upgraded. Press this banner to proceed.": "同步目标需要升级。按这个横幅继续。",
  "The tag \"%s\" already exists. Please choose a different name.": "标签 “%s” 已存在。请选择一个不同的名称。",
  "The target to synchronise to. Each sync target may have additional parameters which are named as `sync.NUM.NAME` (all documented below).": "所要同步的目标。每个同步目标都可能有名为 `sync.NUM.NAME` 的附加参数（见下文）。",
- "The Web Clipper needs your authorisation to access your data.": "网页剪辑器需要您的授权才能访问您的数据。",
- "The web clipper service is enabled and set to auto-start.": "网页剪辑器已启用并已设置为自动启动。",
- "The web clipper service is not enabled.": "网页剪辑未启用。",
+ "The Web Clipper needs your authorisation to access your data.": "网页剪藏器需要您的授权才能访问您的数据。",
+ "The web clipper service is enabled and set to auto-start.": "网页剪藏器已启用并已设置为自动启动。",
+ "The web clipper service is not enabled.": "网页剪藏未启用。",
  "Theme": "主题",
  "There are currently no notes. Create one by clicking on the (+) button.": "当前没有任何笔记。点击 (+) 按钮创建。",
  "There is currently no notebook. Create one by clicking on \"New notebook\".": "当前没有笔记本。点击 “新建笔记本” 创建。",
@@ -823,7 +868,7 @@
  "title": "标题",
  "Title": "标题",
  "To allow Joplin to synchronise with Dropbox, please follow the steps below:": "要让 Joplin 与 Dropbox 同步，请按下列步骤操作：",
- "To continue, please enter your master password below.": "若要继续，请在下面输入您的主密码。",
+ "To continue, please enter your master password below.": "若要继续，请在下面输入您的主密码(master password)。",
  "To delete a tag, untag the associated notes.": "移除相关笔记的标签后才可删除此标签。",
  "To delete: %d": "将删除：%d 条",
  "To enter command line mode, press \":\"": "按 “:” 键进入命令行模式",
@@ -848,6 +893,7 @@
  "Tools": "工具",
  "Total: %d/%d": "总数：%d/%d 条",
  "Try again": "重试",
+ "Try it now": "现在就试试吧",
  "Type `help [command]` for more information about a command; or type `help all` for the complete usage information.": "输入 `help [command]` 来获取有关该命令的更多信息；或输入 `help all` 获取完整的用法提示。",
  "Type `joplin help` for usage information.": "输入 `joplin help` 获取用法信息。",
  "Type a note title or part of its content to jump to it. Or type # followed by a tag name, or @ followed by a notebook name. Or type : to search for commands.": "输入笔记标题或部分内容以转跳到它。或者输入 # 跟着一个标签名，或者输入 @ 跟着一个笔记本名字，或者输入 : 以搜索命令。",
@@ -870,7 +916,7 @@
  "updated date": "更新日期",
  "Updated local items: %d.": "已更新本地项目：%d。",
  "Updated remote items: %d.": "已更新远程项目：%d。",
- "Updated: ": "更新于： ",
+ "Updated: ": "更新： ",
  "Updated: %d.": "已更新：%d 条。",
  "Updated: %s": "已更新：%s",
  "Updating...": "正在更新…",
@@ -895,7 +941,7 @@
  "Vim": "Vim",
  "Warning": "警告",
  "Warning: not all resources shown for performance reasons (limit: %s).": "警告：由于性能原因无法显示所有资源（最多：%s）。",
- "Web Clipper": "网页剪辑器",
+ "Web Clipper": "网页剪藏器",
  "WebDAV": "WebDAV",
  "WebDAV password": "WebDAV 密码",
  "WebDAV URL": "WebDAV URL",

packages/lib/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@joplin/lib",
-  "version": "2.9.1",
+  "version": "2.10.0",
   "description": "Joplin Core library",
   "author": "Laurent Cozic",
   "homepage": "",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "publishConfig": {
     "access": "public"
   },
@@ -17,25 +17,25 @@
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.13",
-    "@types/jest": "29.2.3",
+    "@types/jest": "29.2.4",
     "@types/js-yaml": "4.0.5",
-    "@types/node": "18.11.9",
+    "@types/node": "18.11.17",
     "@types/node-rsa": "1.1.1",
     "@types/react": "17.0.52",
-    "@types/uuid": "^8.3.4",
+    "@types/uuid": "^9.0.0",
     "clean-html": "1.5.0",
     "jest": "29.3.1",
     "sharp": "0.31.2",
-    "typescript": "4.9.3"
+    "typescript": "4.9.4"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.213.0",
-    "@aws-sdk/s3-request-presigner": "3.213.0",
+    "@aws-sdk/client-s3": "3.235.0",
+    "@aws-sdk/s3-request-presigner": "3.235.0",
     "@joplin/fork-htmlparser2": "^4.1.41",
     "@joplin/fork-sax": "^1.2.45",
     "@joplin/fork-uslug": "^1.0.6",
-    "@joplin/htmlpack": "^2.9.1",
-    "@joplin/renderer": "^2.9.1",
+    "@joplin/htmlpack": "~2.10",
+    "@joplin/renderer": "~2.10",
     "@joplin/turndown": "^4.0.63",
     "@joplin/turndown-plugin-gfm": "^1.0.45",
     "@types/nanoid": "3.0.0",
@@ -53,7 +53,7 @@
     "fast-xml-parser": "3.21.1",
     "follow-redirects": "1.15.2",
     "form-data": "4.0.0",
-    "fs-extra": "10.1.0",
+    "fs-extra": "11.1.0",
     "hpagent": "1.2.0",
     "html-entities": "1.4.0",
     "html-minifier": "4.0.0",
@@ -74,7 +74,7 @@
     "node-persist": "3.1.0",
     "node-rsa": "1.1.1",
     "promise": "8.3.0",
-    "query-string": "7.1.1",
+    "query-string": "7.1.3",
     "re-reselect": "4.0.1",
     "read-chunk": "2.1.0",
     "redux": "4.2.0",
@@ -82,10 +82,10 @@
     "reselect": "4.1.7",
     "server-destroy": "1.0.1",
     "sprintf-js": "1.1.2",
-    "sqlite3": "5.1.2",
+    "sqlite3": "5.1.4",
     "string-padding": "1.0.2",
     "string-to-stream": "3.0.1",
-    "tar": "6.1.12",
+    "tar": "6.1.13",
     "tcp-port-used": "1.0.2",
     "uglifycss": "0.0.29",
     "url-parse": "1.5.10",

packages/lib/utils/joplinCloud.ts

@@ -1,5 +1,6 @@
 import * as fs from 'fs-extra';
 import markdownUtils, { MarkdownTableHeader, MarkdownTableRow } from '../markdownUtils';
+import { _ } from '../locale';
 
 type FeatureId = string;
 
@@ -110,85 +111,87 @@ export function findPrice(prices: StripePublicConfigPrice[], query: FindPriceQue
 	return output;
 }
 
-const features: Record<FeatureId, PlanFeature> = {
-	maxItemSize: {
-		title: 'Max note or attachment size',
-		basic: true,
-		pro: true,
-		teams: true,
-		basicInfo: '10 MB per note or attachment',
-		proInfo: '200 MB per note or attachment',
-		teamsInfo: '200 MB per note or attachment',
-		basicInfoShort: '10 MB',
-		proInfoShort: '200 MB',
-		teamsInfoShort: '200 MB',
-	},
-	maxStorage: {
-		title: 'Storage space',
-		basic: true,
-		pro: true,
-		teams: true,
-		basicInfo: '1 GB storage space',
-		proInfo: '10 GB storage space',
-		teamsInfo: '10 GB storage space',
-		basicInfoShort: '1 GB',
-		proInfoShort: '10 GB',
-		teamsInfoShort: '10 GB',
-	},
-	publishNote: {
-		title: 'Publish notes to the internet',
-		basic: true,
-		pro: true,
-		teams: true,
-	},
-	sync: {
-		title: 'Sync as many devices as you want',
-		basic: true,
-		pro: true,
-		teams: true,
-	},
-	clipper: {
-		title: 'Web Clipper',
-		basic: true,
-		pro: true,
-		teams: true,
-	},
-	collaborate: {
-		title: 'Share and collaborate on a notebook',
-		basic: false,
-		pro: true,
-		teams: true,
-	},
-	multiUsers: {
-		title: 'Manage multiple users',
-		basic: false,
-		pro: false,
-		teams: true,
-	},
-	consolidatedBilling: {
-		title: 'Consolidated billing',
-		basic: false,
-		pro: false,
-		teams: true,
-	},
-	sharingAccessControl: {
-		title: 'Sharing access control',
-		basic: false,
-		pro: false,
-		teams: true,
-	},
-	prioritySupport: {
-		title: 'Priority support',
-		basic: false,
-		pro: false,
-		teams: true,
-	},
+const features = (): Record<FeatureId, PlanFeature> => {
+	return {
+		maxItemSize: {
+			title: _('Max note or attachment size'),
+			basic: true,
+			pro: true,
+			teams: true,
+			basicInfo: _('%d MB per note or attachment', 10),
+			proInfo: _('%d MB per note or attachment', 200),
+			teamsInfo: _('%d MB per note or attachment', 200),
+			basicInfoShort: _('%d MB', 10),
+			proInfoShort: _('%d MB', 200),
+			teamsInfoShort: _('%d MB', 200),
+		},
+		maxStorage: {
+			title: _('Storage space'),
+			basic: true,
+			pro: true,
+			teams: true,
+			basicInfo: _('%d GB storage space', 1),
+			proInfo: _('%d GB storage space', 10),
+			teamsInfo: _('%d GB storage space', 10),
+			basicInfoShort: _('%d GB', 1),
+			proInfoShort: _('%d GB', 10),
+			teamsInfoShort: _('%d GB', 10),
+		},
+		publishNote: {
+			title: _('Publish notes to the internet'),
+			basic: true,
+			pro: true,
+			teams: true,
+		},
+		sync: {
+			title: _('Sync as many devices as you want'),
+			basic: true,
+			pro: true,
+			teams: true,
+		},
+		clipper: {
+			title: _('Web Clipper'),
+			basic: true,
+			pro: true,
+			teams: true,
+		},
+		collaborate: {
+			title: _('Share and collaborate on a notebook'),
+			basic: false,
+			pro: true,
+			teams: true,
+		},
+		multiUsers: {
+			title: _('Manage multiple users'),
+			basic: false,
+			pro: false,
+			teams: true,
+		},
+		consolidatedBilling: {
+			title: _('Consolidated billing'),
+			basic: false,
+			pro: false,
+			teams: true,
+		},
+		sharingAccessControl: {
+			title: _('Sharing access control'),
+			basic: false,
+			pro: false,
+			teams: true,
+		},
+		prioritySupport: {
+			title: _('Priority support'),
+			basic: false,
+			pro: false,
+			teams: true,
+		},
+	};
 };
 
 export const getFeatureIdsByPlan = (planName: PlanName, featureOn: boolean): FeatureId[] => {
 	const output: FeatureId[] = [];
 
-	for (const [k, v] of Object.entries(features)) {
+	for (const [k, v] of Object.entries(features())) {
 		if (v[planName] === featureOn) {
 			output.push(k);
 		}
@@ -200,7 +203,7 @@ export const getFeatureIdsByPlan = (planName: PlanName, featureOn: boolean): Fea
 export const getFeatureLabelsByPlan = (planName: PlanName, featureOn: boolean): string[] => {
 	const output: FeatureId[] = [];
 
-	for (const [featureId, v] of Object.entries(features)) {
+	for (const [featureId, v] of Object.entries(features())) {
 		if (v[planName] === featureOn) {
 			output.push(getFeatureLabel(planName, featureId));
 		}
@@ -214,7 +217,7 @@ export const getAllFeatureIds = (): FeatureId[] => {
 };
 
 export const getFeatureById = (featureId: FeatureId): PlanFeature => {
-	return features[featureId];
+	return features()[featureId];
 };
 
 export const getFeaturesByPlan = (planName: PlanName, featureOn: boolean): PlanFeature[] => {
@@ -230,14 +233,14 @@ export const getFeaturesByPlan = (planName: PlanName, featureOn: boolean): PlanF
 };
 
 export const getFeatureLabel = (planName: PlanName, featureId: FeatureId): string => {
-	const feature = features[featureId];
+	const feature = features()[featureId];
 	const k = `${planName}Info`;
 	if ((feature as any)[k]) return (feature as any)[k];
 	return feature.title;
 };
 
 export const getFeatureEnabled = (planName: PlanName, featureId: FeatureId): boolean => {
-	const feature = features[featureId];
+	const feature = features()[featureId];
 	return feature[planName];
 };
 
@@ -270,7 +273,7 @@ export const createFeatureTableMd = () => {
 		return '✔️';
 	};
 
-	for (const [, feature] of Object.entries(features)) {
+	for (const [, feature] of Object.entries(features())) {
 		const row: MarkdownTableRow = {
 			featureLabel: feature.title,
 			basic: getCellInfo(PlanName.Basic, feature),
@@ -288,7 +291,7 @@ export function getPlans(stripeConfig: StripePublicConfig): Record<PlanName, Pla
 	return {
 		basic: {
 			name: 'basic',
-			title: 'Basic',
+			title: _('Basic'),
 			priceMonthly: findPrice(stripeConfig.prices, {
 				accountType: 1,
 				period: PricePeriod.Monthly,
@@ -303,14 +306,14 @@ export function getPlans(stripeConfig: StripePublicConfig): Record<PlanName, Pla
 			featuresOff: getFeatureIdsByPlan(PlanName.Basic, false),
 			featureLabelsOn: getFeatureLabelsByPlan(PlanName.Basic, true),
 			featureLabelsOff: getFeatureLabelsByPlan(PlanName.Basic, false),
-			cfaLabel: 'Try it now',
+			cfaLabel: _('Try it now'),
 			cfaUrl: '',
 			footnote: '',
 		},
 
 		pro: {
 			name: 'pro',
-			title: 'Pro',
+			title: _('Pro'),
 			priceMonthly: findPrice(stripeConfig.prices, {
 				accountType: 2,
 				period: PricePeriod.Monthly,
@@ -325,14 +328,14 @@ export function getPlans(stripeConfig: StripePublicConfig): Record<PlanName, Pla
 			featuresOff: getFeatureIdsByPlan(PlanName.Pro, false),
 			featureLabelsOn: getFeatureLabelsByPlan(PlanName.Pro, true),
 			featureLabelsOff: getFeatureLabelsByPlan(PlanName.Pro, false),
-			cfaLabel: 'Try it now',
+			cfaLabel: _('Try it now'),
 			cfaUrl: '',
 			footnote: '',
 		},
 
 		teams: {
 			name: 'teams',
-			title: 'Teams',
+			title: _('Teams'),
 			priceMonthly: findPrice(stripeConfig.prices, {
 				accountType: 3,
 				period: PricePeriod.Monthly,
@@ -347,9 +350,9 @@ export function getPlans(stripeConfig: StripePublicConfig): Record<PlanName, Pla
 			featuresOff: getFeatureIdsByPlan(PlanName.Teams, false),
 			featureLabelsOn: getFeatureLabelsByPlan(PlanName.Teams, true),
 			featureLabelsOff: getFeatureLabelsByPlan(PlanName.Teams, false),
-			cfaLabel: 'Try it now',
+			cfaLabel: _('Try it now'),
 			cfaUrl: '',
-			footnote: 'Per user. Minimum of 2 users.',
+			footnote: _('Per user. Minimum of %d users.', 2),
 		},
 	};
 }

packages/pdf-viewer/main.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import shim from '@joplin/lib/shim';
 shim.setReact(React);
-import { render } from 'react-dom';
+const { createRoot } = require('react-dom/client');
 import * as pdfjsLib from 'pdfjs-dist';
 import MiniViewerApp from './miniViewer';
 import MessageService from './messageService';
@@ -42,7 +42,5 @@ function App() {
 	return <div>Error: Unknown app type "{type}"</div>;
 }
 
-render(
-	<App/>,
-	document.getElementById('pdf-root')
-);
+const root = createRoot(document.getElementById('pdf-root'));
+root.render(<App/>);

packages/pdf-viewer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/pdf-viewer",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "Provides embedded PDF viewers for Joplin",
   "main": "dist/main.js",
   "types": "src/main.ts",
@@ -17,21 +17,21 @@
     "postinstall": "yarn build"
   },
   "author": "Joplin",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "devDependencies": {
-    "@types/jest": "29.2.3",
+    "@types/jest": "29.2.4",
     "@types/pdfjs-dist": "2.10.378",
     "@types/react": "16.14.34",
     "@types/react-dom": "18.0.9",
     "@types/styled-components": "5.1.25",
     "babel-jest": "29.3.1",
-    "css-loader": "6.7.2",
+    "css-loader": "6.7.3",
     "jest": "29.3.1",
     "jest-environment-jsdom": "29.3.1",
     "style-loader": "3.3.1",
     "ts-jest": "29.0.3",
-    "ts-loader": "9.4.1",
-    "typescript": "4.9.3",
+    "ts-loader": "9.4.2",
+    "typescript": "4.9.4",
     "webpack": "5.74.0",
     "webpack-cli": "4.10.0"
   },
@@ -39,7 +39,7 @@
     "@fortawesome/fontawesome-svg-core": "6.1.2",
     "@fortawesome/free-solid-svg-icons": "6.1.2",
     "@fortawesome/react-fontawesome": "0.2.0",
-    "@joplin/lib": "~2.9",
+    "@joplin/lib": "~2.10",
     "async-mutex": "0.4.0",
     "pdfjs-dist": "2.16.105",
     "react": "18.2.0",

packages/plugin-repo-cli/lib/gitCompareUrl.test.ts

@@ -15,6 +15,17 @@ describe('gitCompareUrl', () => {
 				},
 				'https://github.com/JackGruber/joplin-plugin-copytags/compare/b52b01f6d3b709a811ac214253636a7c207c87dd..9ec4a476a54440ac43422c34e179dcabfca1e5a0',
 			],
+			[
+				{
+					repository_url: 'https://github.com/JackGruber/joplin-plugin-copytags.git',
+					_publish_commit: 'master:9ec4a476a54440ac43422c34e179dcabfca1e5a0',
+				},
+				{
+					repository_url: 'https://github.com/JackGruber/joplin-plugin-copytags.git',
+					_publish_commit: 'master:b52b01f6d3b709a811ac214253636a7c207c87dd',
+				},
+				'https://github.com/JackGruber/joplin-plugin-copytags/compare/b52b01f6d3b709a811ac214253636a7c207c87dd..9ec4a476a54440ac43422c34e179dcabfca1e5a0',
+			],
 			[
 				{
 					repository_url: 'https://github.com/JackGruber/joplin-plugin-copytags',

packages/plugin-repo-cli/lib/gitCompareUrl.ts

@@ -11,13 +11,19 @@ function removeBranch(commit: string): string {
 	return commit;
 }
 
+const formatRepoUrl = (url: string): string => {
+	if (!url) return url;
+	if (url.endsWith('.git')) return url.substring(0, url.length - 4);
+	return url;
+};
+
 export default function(manifest: any, previousManifest: any = null): string {
 	// "repository_url": "https://github.com/JackGruber/joplin-plugin-copytags",
 	// "_publish_commit": "master:b52b01f6d3b709a811ac214253636a7c207c87dd",
 
 	// https://github.com/JackGruber/joplin-plugin-copytags/compare/9ec4a476a54440ac43422c34e179dcabfca1e5a0..b52b01f6d3b709a811ac214253636a7c207c87dd
 
-	const repoUrl: string = manifest.repository_url;
+	const repoUrl: string = formatRepoUrl(manifest.repository_url);
 	const commit: string = removeBranch(manifest._publish_commit);
 	const previousCommit: string = previousManifest ? removeBranch(previousManifest._publish_commit) : '';
 

packages/plugin-repo-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/plugin-repo-cli",
-  "version": "2.9.1",
+  "version": "2.10.0",
   "description": "",
   "main": "index.js",
   "bin": "./dist/index.js",
@@ -16,11 +16,11 @@
     "dist": "webpack --config webpack.config.js"
   },
   "author": "",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@joplin/lib": "^2.9.1",
-    "@joplin/tools": "^2.9.1",
-    "fs-extra": "10.1.0",
+    "@joplin/lib": "~2.10",
+    "@joplin/tools": "~2.10",
+    "fs-extra": "11.1.0",
     "gh-release-assets": "2.0.1",
     "node-fetch": "2.6.7",
     "source-map-support": "0.5.21",
@@ -28,11 +28,11 @@
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.13",
-    "@types/jest": "29.2.3",
-    "@types/node": "18.11.9",
+    "@types/jest": "29.2.4",
+    "@types/node": "18.11.17",
     "jest": "29.3.1",
     "source-map-loader": "4.0.1",
-    "typescript": "4.9.3",
+    "typescript": "4.9.4",
     "webpack": "5.65.0",
     "webpack-cli": "4.10.0"
   },

packages/plugins/package.json

@@ -3,5 +3,5 @@
   "version": "0.0.0",
   "description": "Sub-package to group official Joplin plugins",
   "private": true,
-  "license": "MIT"
+  "license": "AGPL-3.0-or-later"
 }

packages/react-native-saf-x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/react-native-saf-x",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "a module to help work with scoped storages on android easily",
   "main": "src/index",
   "react-native": "src/index",
@@ -33,7 +33,7 @@
     "storage-access-framework"
   ],
   "author": "Javad Mnjd (https://github.com/jd1378)",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "homepage": "",
   "publishConfig": {
     "access": "public"
@@ -44,7 +44,7 @@
     "@types/react-native": "0.64.19",
     "react": "18.2.0",
     "react-native": "0.66.1",
-    "typescript": "4.9.3"
+    "typescript": "4.9.4"
   },
   "peerDependencies": {
     "react": "*",

packages/renderer/assets/highlight.js/atom-one-dark-reasonable.css

@@ -1,74 +1 @@
-/*
-
-Atom One Dark With support for ReasonML by Gidi Morris, based off work by Daniel Gamage
-
-Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
-
-*/
-.hljs {
-  color: #abb2bf;
-  background: #282c34;
-}
-.hljs-keyword, .hljs-operator {
-  color: #F92672;
-}
-.hljs-pattern-match {
-  color: #F92672;
-}
-.hljs-pattern-match .hljs-constructor {
-  color: #61aeee;
-}
-.hljs-function {
-  color: #61aeee;
-}
-.hljs-function .hljs-params {
-  color: #A6E22E;
-}
-.hljs-function .hljs-params .hljs-typing {
-  color: #FD971F;
-}
-.hljs-module-access .hljs-module {
-  color: #7e57c2;
-}
-.hljs-constructor {
-  color: #e2b93d;
-}
-.hljs-constructor .hljs-string {
-  color: #9CCC65;
-}
-.hljs-comment, .hljs-quote {
-  color: #b18eb1;
-  font-style: italic;
-}
-.hljs-doctag, .hljs-formula {
-  color: #c678dd;
-}
-.hljs-section, .hljs-name, .hljs-selector-tag, .hljs-deletion, .hljs-subst {
-  color: #e06c75;
-}
-.hljs-literal {
-  color: #56b6c2;
-}
-.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta .hljs-string {
-  color: #98c379;
-}
-.hljs-built_in,
-.hljs-title.class_,
-.hljs-class .hljs-title {
-  color: #e6c07b;
-}
-.hljs-attr, .hljs-variable, .hljs-template-variable, .hljs-type, .hljs-selector-class, .hljs-selector-attr, .hljs-selector-pseudo, .hljs-number {
-  color: #d19a66;
-}
-.hljs-symbol, .hljs-bullet, .hljs-link, .hljs-meta, .hljs-selector-id, .hljs-title {
-  color: #61aeee;
-}
-.hljs-emphasis {
-  font-style: italic;
-}
-.hljs-strong {
-  font-weight: bold;
-}
-.hljs-link {
-  text-decoration: underline;
-}
+pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{color:#abb2bf;background:#282c34}.hljs-keyword,.hljs-operator,.hljs-pattern-match{color:#f92672}.hljs-function,.hljs-pattern-match .hljs-constructor{color:#61aeee}.hljs-function .hljs-params{color:#a6e22e}.hljs-function .hljs-params .hljs-typing{color:#fd971f}.hljs-module-access .hljs-module{color:#7e57c2}.hljs-constructor{color:#e2b93d}.hljs-constructor .hljs-string{color:#9ccc65}.hljs-comment,.hljs-quote{color:#b18eb1;font-style:italic}.hljs-doctag,.hljs-formula{color:#c678dd}.hljs-deletion,.hljs-name,.hljs-section,.hljs-selector-tag,.hljs-subst{color:#e06c75}.hljs-literal{color:#56b6c2}.hljs-addition,.hljs-attribute,.hljs-meta .hljs-string,.hljs-regexp,.hljs-string{color:#98c379}.hljs-built_in,.hljs-class .hljs-title,.hljs-title.class_{color:#e6c07b}.hljs-attr,.hljs-number,.hljs-selector-attr,.hljs-selector-class,.hljs-selector-pseudo,.hljs-template-variable,.hljs-type,.hljs-variable{color:#d19a66}.hljs-bullet,.hljs-link,.hljs-meta,.hljs-selector-id,.hljs-symbol,.hljs-title{color:#61aeee}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}.hljs-link{text-decoration:underline}

packages/renderer/assets/highlight.js/atom-one-light.css

@@ -1,94 +1 @@
-/*
-
-Atom One Light by Daniel Gamage
-Original One Light Syntax theme from https://github.com/atom/one-light-syntax
-
-base:    #fafafa
-mono-1:  #383a42
-mono-2:  #686b77
-mono-3:  #a0a1a7
-hue-1:   #0184bb
-hue-2:   #4078f2
-hue-3:   #a626a4
-hue-4:   #50a14f
-hue-5:   #e45649
-hue-5-2: #c91243
-hue-6:   #986801
-hue-6-2: #c18401
-
-*/
-
-.hljs {
-  color: #383a42;
-  background: #fafafa;
-}
-
-.hljs-comment,
-.hljs-quote {
-  color: #a0a1a7;
-  font-style: italic;
-}
-
-.hljs-doctag,
-.hljs-keyword,
-.hljs-formula {
-  color: #a626a4;
-}
-
-.hljs-section,
-.hljs-name,
-.hljs-selector-tag,
-.hljs-deletion,
-.hljs-subst {
-  color: #e45649;
-}
-
-.hljs-literal {
-  color: #0184bb;
-}
-
-.hljs-string,
-.hljs-regexp,
-.hljs-addition,
-.hljs-attribute,
-.hljs-meta .hljs-string {
-  color: #50a14f;
-}
-
-.hljs-attr,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-type,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo,
-.hljs-number {
-  color: #986801;
-}
-
-.hljs-symbol,
-.hljs-bullet,
-.hljs-link,
-.hljs-meta,
-.hljs-selector-id,
-.hljs-title {
-  color: #4078f2;
-}
-
-.hljs-built_in,
-.hljs-title.class_,
-.hljs-class .hljs-title {
-  color: #c18401;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-link {
-  text-decoration: underline;
-}
+pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{color:#383a42;background:#fafafa}.hljs-comment,.hljs-quote{color:#a0a1a7;font-style:italic}.hljs-doctag,.hljs-formula,.hljs-keyword{color:#a626a4}.hljs-deletion,.hljs-name,.hljs-section,.hljs-selector-tag,.hljs-subst{color:#e45649}.hljs-literal{color:#0184bb}.hljs-addition,.hljs-attribute,.hljs-meta .hljs-string,.hljs-regexp,.hljs-string{color:#50a14f}.hljs-attr,.hljs-number,.hljs-selector-attr,.hljs-selector-class,.hljs-selector-pseudo,.hljs-template-variable,.hljs-type,.hljs-variable{color:#986801}.hljs-bullet,.hljs-link,.hljs-meta,.hljs-selector-id,.hljs-symbol,.hljs-title{color:#4078f2}.hljs-built_in,.hljs-class .hljs-title,.hljs-title.class_{color:#c18401}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}.hljs-link{text-decoration:underline}

packages/renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/renderer",
-  "version": "2.9.1",
+  "version": "2.10.0",
   "description": "The Joplin note renderer, used the mobile and desktop application",
   "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
   "main": "index.js",
@@ -16,19 +16,19 @@
     "test-ci": "yarn test"
   },
   "author": "",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "devDependencies": {
-    "@types/jest": "29.2.3",
-    "@types/node": "18.11.9",
+    "@types/jest": "29.2.4",
+    "@types/node": "18.11.17",
     "jest": "29.3.1",
-    "typescript": "4.9.3"
+    "typescript": "4.9.4"
   },
   "dependencies": {
     "@joplin/fork-htmlparser2": "^4.1.41",
     "@joplin/fork-uslug": "^1.0.6",
     "font-awesome-filetypes": "2.1.0",
-    "fs-extra": "10.1.0",
-    "highlight.js": "11.6.0",
+    "fs-extra": "11.1.0",
+    "highlight.js": "11.7.0",
     "html-entities": "1.4.0",
     "json-stringify-safe": "5.0.1",
     "katex": "0.13.24",
@@ -46,7 +46,7 @@
     "markdown-it-sup": "1.0.0",
     "markdown-it-toc-done-right": "4.2.0",
     "md5": "2.3.0",
-    "mermaid": "9.1.7"
+    "mermaid": "9.2.2"
   },
   "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
 }

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/server",
-  "version": "2.9.7",
+  "version": "2.10.4",
   "private": true,
   "scripts": {
     "start-dev": "yarn run build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev",
@@ -21,23 +21,23 @@
     "watch": "tsc --watch --preserveWatchOutput --project tsconfig.json"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.213.0",
+    "@aws-sdk/client-s3": "3.235.0",
     "@fortawesome/fontawesome-free": "5.15.4",
-    "@joplin/lib": "~2.9",
-    "@joplin/renderer": "~2.9",
+    "@joplin/lib": "~2.10",
+    "@joplin/renderer": "~2.10",
     "@koa/cors": "4.0.0",
-    "@types/uuid": "8.3.4",
+    "@types/uuid": "9.0.0",
     "bcryptjs": "2.4.3",
     "bulma": "0.9.4",
     "bulma-prefers-dark": "0.1.0-beta.1",
     "compare-versions": "3.6.0",
-    "dayjs": "1.11.6",
-    "formidable": "2.0.1",
-    "fs-extra": "10.1.0",
+    "dayjs": "1.11.7",
+    "formidable": "2.1.1",
+    "fs-extra": "11.1.0",
     "html-entities": "1.4.0",
-    "jquery": "3.6.1",
+    "jquery": "3.6.3",
     "knex": "2.3.0",
-    "koa": "2.13.4",
+    "koa": "2.14.1",
     "markdown-it": "13.0.1",
     "mustache": "4.2.0",
     "nanoid": "2.1.11",
@@ -48,27 +48,28 @@
     "pg": "8.8.0",
     "pretty-bytes": "5.6.0",
     "prettycron": "0.10.0",
-    "query-string": "7.1.1",
+    "query-string": "7.1.3",
     "rate-limiter-flexible": "2.4.1",
     "raw-body": "2.5.1",
-    "sqlite3": "5.1.2",
+    "sqlite3": "5.1.4",
     "stripe": "8.222.0",
     "uuid": "9.0.0",
     "yargs": "17.6.2",
     "zxcvbn": "4.4.2"
   },
   "devDependencies": {
-    "@joplin/tools": "~2.9",
+    "@joplin/tools": "~2.10",
     "@rmp135/sql-ts": "1.15.1",
+    "@types/formidable": "2.0.5",
     "@types/fs-extra": "9.0.13",
-    "@types/jest": "29.2.3",
+    "@types/jest": "29.2.4",
     "@types/jest-expect-message": "1.0.4",
     "@types/jsdom": "16.2.15",
-    "@types/koa": "2.13.4",
+    "@types/koa": "2.13.5",
     "@types/markdown-it": "12.2.3",
-    "@types/mustache": "4.2.1",
-    "@types/nodemailer": "6.4.6",
-    "@types/yargs": "17.0.13",
+    "@types/mustache": "4.2.2",
+    "@types/nodemailer": "6.4.7",
+    "@types/yargs": "17.0.17",
     "@types/zxcvbn": "4.4.1",
     "gulp": "4.0.2",
     "jest": "29.3.1",
@@ -76,6 +77,6 @@
     "jsdom": "16.7.0",
     "node-mocks-http": "1.12.1",
     "source-map-support": "0.5.21",
-    "typescript": "4.9.3"
+    "typescript": "4.9.4"
   }
 }

packages/server/src/routes/api/items.ts

@@ -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)})`);
 	} else {
-		const filePath = parsedBody?.files?.file ? parsedBody.files.file.path : null;
+		const filePath = parsedBody?.files?.file ? parsedBody.files.file.filepath : null;
 
 		try {
 			const buffer = filePath ? await fs.readFile(filePath) : Buffer.alloc(0);

packages/server/src/utils/requestUtils.ts

@@ -1,8 +1,9 @@
 import { cookieGet } from './cookies';
 import { ErrorForbidden } from './errors';
 import { AppContext } from './types';
-
-const formidable = require('formidable');
+import * as formidable from 'formidable';
+import { Fields, Files } from 'formidable';
+import { IncomingMessage } from 'http';
 
 export type BodyFields = Record<string, any>;
 
@@ -11,8 +12,22 @@ interface FormParseResult {
 	files: any;
 }
 
+interface ParsedBody {
+	fields: Fields;
+	files: Files;
+}
+
+interface FormParseRequest extends IncomingMessage {
+	__isMocked: boolean;
+	__parsed: ParsedBody;
+	files: Files;
+	body: any;
+}
+
 // Input should be Koa ctx.req, which corresponds to the native Node request
-export async function formParse(req: any): Promise<FormParseResult> {
+export async function formParse(request: IncomingMessage): Promise<FormParseResult> {
+	const req: FormParseRequest = request as any;
+
 	// It's not clear how to get mocked requests to be parsed successfully by
 	// formidable so we use this small hack. If it's mocked, we are running test
 	// units and the request body is already an object and can be returned.
@@ -29,7 +44,7 @@ export async function formParse(req: any): Promise<FormParseResult> {
 	// headers
 	return new Promise((resolve: Function, reject: Function) => {
 		const form = formidable({ multiples: true });
-		form.parse(req, (error: any, fields: any, files: any) => {
+		form.parse(req, (error: any, fields: Fields, files: Files) => {
 			if (error) {
 				reject(error);
 				return;

packages/server/src/utils/testing/apiUtils.ts

@@ -60,7 +60,7 @@ export async function execRequestC(sessionId: string, method: string, path: stri
 
 	if (body) appContextOptions.request.body = body;
 
-	if (options.filePath) appContextOptions.request.files = { file: { path: options.filePath } };
+	if (options.filePath) appContextOptions.request.files = { file: { filepath: options.filePath } };
 	if (options.query) appContextOptions.request.query = options.query;
 
 	const context = await koaAppContext(appContextOptions);

packages/tools/generate-images.json

@@ -0,0 +1,63 @@
+{
+	"done": {
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ios_marketing1024x1024.png_1024_1024__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_app76x76.png_76_76__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_app76x76@2x.png_152_152__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_notification20x20.png_20_20__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_notification20x20@2x.png_40_40__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_pro_app83.5x83.5@2x.png_167_167__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_settings29x29.png_29_29__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_settings29x29@2x.png_58_58__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_spotlight40x40.png_40_40__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/ipad_spotlight40x40@2x.png_80_80__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_app60x60@2x.png_120_120__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_app60x60@3x.png_180_180__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_notification20x20@2x.png_40_40__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_notification20x20@3x.png_60_60__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_settings29x29@2x.png_58_58__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_settings29x29@3x.png_87_87__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_spotlight40x40@2x.png_80_80__": true,
+		"1_80abab89a0e638b5a3f12f96ab5c8792_packages/app-mobile/ios/Joplin/Images.xcassets/AppIcon.appiconset/iphone_spotlight40x40@3x.png_120_120__": true,
+		"2_980ab814dfce30eb15adf0a90d85bb1a_Assets/macOs.iconset/icon_16x16.png_16_16__": true,
+		"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/macOs.iconset/icon_16x16@2x.png_32_32__": true,
+		"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/macOs.iconset/icon_32x32.png_32_32__": true,
+		"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/macOs.iconset/icon_32x32@2x.png_64_64__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_128x128.png_128_128__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_128x128@2x.png_256_256__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_256x256.png_256_256__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_256x256@2x.png_512_512__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_512x512.png_512_512__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/macOs.iconset/icon_512x512@2x.png_1024_1024__": true,
+		"5_ec41184ad08ccd9471bfe57eef12a0e7_packages/tools/PortableAppsLauncher/App/AppInfo/appicon.ico____": true,
+		"2_980ab814dfce30eb15adf0a90d85bb1a_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_16.png____": true,
+		"3_a7fed49fa153dc9f4e58f038011bce4d_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_32.png_32_32__": true,
+		"4_1f3d9b9736fe8787c84c8e28275c6721_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_75.png_75_75__": true,
+		"4_1f3d9b9736fe8787c84c8e28275c6721_packages/tools/PortableAppsLauncher/App/AppInfo/appicon_128.png_128_128__": true,
+		"4_1f3d9b9736fe8787c84c8e28275c6721_packages/tools/PortableAppsLauncher/App/AppInfo/Launcher/splash.jpg_144_144__": true,
+		"6_8042e442dfb3e976238ce3896383cb69_packages/app-desktop/build-win/icons/Square150x150Logo.png_150_150_99_75": true,
+		"6_8042e442dfb3e976238ce3896383cb69_packages/app-desktop/build-win/icons/SmallTile.png_70_70_46_46": true,
+		"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img-4x.webp_4820_2938__": true,
+		"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img-2x.png_2388_1456__": true,
+		"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img-2x.webp_2388_1456__": true,
+		"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img.png_1205_734__": true,
+		"8_645581f9f6de750b50fec3dbf031cee3_Assets/WebsiteAssets/images/home-top-img.webp_1205_734__": true,
+		"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn-4x.webp_4820_2938__": true,
+		"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn-2x.png_2388_1456__": true,
+		"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn-2x.webp_2388_1456__": true,
+		"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn.png_1205_734__": true,
+		"9_2f78dde9d15370ae6adc7d1a0879ed4b_Assets/WebsiteAssets/images/home-top-img-cn.webp_1205_734__": true,
+		"icns_to_icon_set_0b9e402f9c5127284d98d78c7b604123_f69848e65692758af4ac5a05007d5142_e439c7e591993f33597ab18b1dd8f6a8_277cfac6c9cdea99f30717a0e6dadfe2_f69848e65692758af4ac5a05007d5142_ae8c5643f968c45dabe2d663f88d387f_277cfac6c9cdea99f30717a0e6dadfe2_886337d6356057de4c915734b85a87fd_ae8c5643f968c45dabe2d663f88d387f_e8639f50b47004f35aa92edff2142741": true,
+		"2_980ab814dfce30eb15adf0a90d85bb1a_Assets/LinuxIcons/16x16.png_16_16__": true,
+		"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/LinuxIcons/24x24.png_24_24__": true,
+		"3_a7fed49fa153dc9f4e58f038011bce4d_Assets/LinuxIcons/32x32.png_32_32__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/48x48.png_48_48__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/72x72.png_72_72__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/96x96.png_96_96__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/128x128.png_128_128__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/144x144.png_144_144__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/256x256.png_256_256__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/512x512.png_512_512__": true,
+		"7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/1024x1024.png_1024_1024__": true,
+		"icns_to_icon_set_89ddfe84307b49fa96580655b5d7c045_216bb492f34224f24aabacb5f98c3620_fe652082bfb7427cd5c74566ecc24322_ebf1ccaf3f5b77b01ff690b763a411f9_216bb492f34224f24aabacb5f98c3620_950b970a784b14c329e09e78af827a77_ebf1ccaf3f5b77b01ff690b763a411f9_d33dafc8081155149dd1d8c1713bf03f_950b970a784b14c329e09e78af827a77_94949c497e46ed0c67082175f5bb22f8": true
+	}
+}

packages/tools/generate-images.ts

@@ -1,7 +1,8 @@
-import * as fs from 'fs-extra';
+import { pathExists, readFile, writeFile, copyFile, readdir } from 'fs-extra';
 import { dirname } from 'path';
 import { execCommand } from './tool-utils';
 import { fileExtension } from '@joplin/lib/path-utils';
+const md5File = require('md5-file');
 const sharp = require('sharp');
 
 interface Source {
@@ -18,6 +19,10 @@ interface Operation {
 	iconHeight?: number;
 }
 
+interface Results {
+	done: Record<string, boolean>;
+}
+
 const sources: Source[] = [
 	{
 		id: 1,
@@ -244,6 +249,77 @@ const operations: Operation[] = [
 		height: 1024,
 	},
 
+	// ============================================================================
+	// Linux icons
+	// ============================================================================
+
+	{
+		source: 2,
+		dest: 'Assets/LinuxIcons/16x16.png',
+		width: 16,
+		height: 16,
+	},
+	{
+		source: 3,
+		dest: 'Assets/LinuxIcons/24x24.png',
+		width: 24,
+		height: 24,
+	},
+	{
+		source: 3,
+		dest: 'Assets/LinuxIcons/32x32.png',
+		width: 32,
+		height: 32,
+	},
+	{
+		source: 7,
+		dest: 'Assets/LinuxIcons/48x48.png',
+		width: 48,
+		height: 48,
+	},
+	{
+		source: 7,
+		dest: 'Assets/LinuxIcons/72x72.png',
+		width: 72,
+		height: 72,
+	},
+	{
+		source: 7,
+		dest: 'Assets/LinuxIcons/96x96.png',
+		width: 96,
+		height: 96,
+	},
+	{
+		source: 7,
+		dest: 'Assets/LinuxIcons/128x128.png',
+		width: 128,
+		height: 128,
+	},
+	{
+		source: 7,
+		dest: 'Assets/LinuxIcons/144x144.png',
+		width: 144,
+		height: 144,
+	},
+	{
+		source: 7,
+		dest: 'Assets/LinuxIcons/256x256.png',
+		width: 256,
+		height: 256,
+	},
+	{
+		source: 7,
+		dest: 'Assets/LinuxIcons/512x512.png',
+		width: 512,
+		height: 512,
+	},
+	{
+		source: 7,
+		dest: 'Assets/LinuxIcons/1024x1024.png',
+		width: 1024,
+		height: 1024,
+	},
+
 	// ============================================================================
 	// PortableApps launcher
 	// ============================================================================
@@ -373,9 +449,43 @@ const operations: Operation[] = [
 	},
 ];
 
+const md5Dir = async (dirPath: string): Promise<string> => {
+	const files = await readdir(dirPath);
+	files.sort();
+	const output: string[] = [];
+	for (const file of files) {
+		output.push(await md5File(`${dirPath}/${file}`));
+	}
+	return output.join('_');
+};
+
+const readResults = async (filePath: string): Promise<Results> => {
+	if (!(await pathExists(filePath))) return { done: {} };
+	const content = await readFile(filePath, 'utf8');
+	return JSON.parse(content) as Results;
+};
+
+const saveResults = async (filePath: string, results: Results) => {
+	await writeFile(filePath, JSON.stringify(results, null, '\t'), 'utf8');
+};
+
+const makeOperationKey = async (source: Source, sourcePath: string, operation: Operation): Promise<string> => {
+	const output: any[] = [];
+	output.push(source.id);
+	output.push(await md5File(sourcePath));
+	output.push(operation.dest);
+	output.push(operation.width);
+	output.push(operation.height);
+	output.push(operation.iconWidth);
+	output.push(operation.iconHeight);
+	return output.join('_');
+};
+
 async function main() {
 	const rootDir = dirname(dirname(__dirname));
 	const sourceImageDir = `${rootDir}/Assets/ImageSources`;
+	const resultFilePath = `${__dirname}/generate-images.json`;
+	const results: Results = await readResults(resultFilePath);
 
 	for (const operation of operations) {
 		const source = sourceById(operation.source);
@@ -386,6 +496,14 @@ async function main() {
 		const sourceExt = fileExtension(sourcePath).toLowerCase();
 		const destExt = fileExtension(destPath).toLowerCase();
 
+		const operationKey = await makeOperationKey(source, sourcePath, operation);
+		if (results.done[operationKey]) {
+			console.info(`Skipping: ${operation.dest} (Already done)`);
+			continue;
+		} else {
+			console.info(`Processing: ${operation.dest}`);
+		}
+
 		if ((operation.width && operation.height) || (sourceExt !== destExt)) {
 			let s = sharp(sourcePath);
 
@@ -422,18 +540,30 @@ async function main() {
 
 			s = s.toFile(destPath);
 		} else {
-			await fs.copyFile(sourcePath, destPath);
+			await copyFile(sourcePath, destPath);
 		}
+
+		results.done[operationKey] = true;
 	}
 
 	if (process && process.platform === 'darwin') {
 		const icnsDest = `${rootDir}/Assets/macOs.icns`;
 		const icnsSource = `${rootDir}/Assets/macOs.iconset`;
-		console.info(`iconutil -c icns -o "${icnsDest}" "${icnsSource}"`);
-		await execCommand(`iconutil -c icns -o "${icnsDest}" "${icnsSource}"`);
+		const operationKey = ['icns_to_icon_set', await md5Dir(icnsSource)].join('_');
+		if (!results.done[operationKey]) {
+			console.info(`Processing: ${icnsDest}`);
+			console.info(`iconutil -c icns -o "${icnsDest}" "${icnsSource}"`);
+			await execCommand(`iconutil -c icns -o "${icnsDest}" "${icnsSource}"`);
+			results.done[operationKey] = true;
+		} else {
+			console.info(`Skipping: ${icnsDest} (Already done)`);
+		}
 	} else {
 		console.info('If the macOS icon has been updated, this script should be run on macOS too');
 	}
+
+	console.info(`Saving results to ${resultFilePath}`);
+	await saveResults(resultFilePath, results);
 }
 
 main().catch((error) => {

packages/tools/git-changelog.ts

@@ -132,7 +132,7 @@ function filterLogs(logs: LogEntry[], platform: Platform) {
 		// but that's not useful in a changelog especially since most people
 		// don't know country and language codes. So we catch all these and
 		// bundle them all up in a single "Updated translations" at the end.
-		if (log.message.match(/Translation: Update .*?\.po/)) {
+		if (log.message.match(/Translation:\sUpdate\s.*?(\.po|[a-zA-Z][a-zA-Z]|[a-zA-Z][a-zA-Z]_[a-zA-Z][a-zA-Z])/)) {
 			// updatedTranslations = true;
 			addIt = false;
 		}

packages/tools/locales/ar.po

@@ -88,6 +88,16 @@ msgstr "&عرض"
 msgid "%d days"
 msgstr "%d أيام"
 
+#: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137
+#: packages/lib/utils/joplinCloud.ts:138
+msgid "%d GB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134
+#: packages/lib/utils/joplinCloud.ts:135
+msgid "%d GB storage space"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1322
 msgid "%d hour"
 msgstr "%d ساعة"
@@ -96,6 +106,17 @@ msgstr "%d ساعة"
 msgid "%d hours"
 msgstr "%d ساعات"
 
+#: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125
+#: packages/lib/utils/joplinCloud.ts:126
+msgid "%d MB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122
+#: packages/lib/utils/joplinCloud.ts:123
+#, fuzzy
+msgid "%d MB per note or attachment"
+msgstr "مرفقات الملاحظات"
+
 #: packages/lib/models/Setting.ts:1319 packages/lib/models/Setting.ts:1320
 #: packages/lib/models/Setting.ts:1321
 msgid "%d minutes"
@@ -185,10 +206,10 @@ msgid ""
 "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."
 msgstr ""
-"يمكن أن يكون <todo-command> (أمر قائمة المهام) \"toggle\" (تبديل) أو \"clear"
-"\" (مسح) فقط. استخدم \"toggle\" لتبديل حال قائمة المهام المعطاة بين مكتملة و "
-"غير مكتملة (إذا كانت الملاحظة المقصودة عادية فسيتم تحويلها إلى قائمة مهام). "
-"استخدم \"clear\" لتحويل قائمة المهام ثانيةً إلى ملاحظة عادية."
+"يمكن أن يكون <todo-command> (أمر قائمة المهام) \"toggle\" (تبديل) أو "
+"\"clear\" (مسح) فقط. استخدم \"toggle\" لتبديل حال قائمة المهام المعطاة بين "
+"مكتملة و غير مكتملة (إذا كانت الملاحظة المقصودة عادية فسيتم تحويلها إلى "
+"قائمة مهام). استخدم \"clear\" لتحويل قائمة المهام ثانيةً إلى ملاحظة عادية."
 
 #: packages/lib/models/Setting.ts:1348
 msgid "A3"
@@ -284,7 +305,6 @@ msgstr ""
 msgid "Admin dashboard"
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:189
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:148
 msgid "Advanced options"
 msgstr "خيارات متقدمة"
@@ -295,7 +315,7 @@ msgstr "أدوات متقدمة"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:485
 #: packages/app-mobile/components/screens/notes.js:191
-#: packages/app-mobile/components/side-menu-content.tsx:453
+#: packages/app-mobile/components/side-menu-content.tsx:455
 msgid "All notes"
 msgstr "جميع الملاحظات"
 
@@ -324,8 +344,8 @@ msgstr ""
 
 #: packages/app-cli/app/command-mv.js:29
 msgid ""
-"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
-"\" to see the short notebook id"
+"Ambiguous notebook \"%s\". Please use short notebook id instead - press "
+"\"ti\" to see the short notebook id"
 msgstr ""
 
 #: packages/app-desktop/checkForUpdates.ts:197
@@ -344,7 +364,6 @@ msgstr "التطبيق"
 msgid "Apply"
 msgstr "تطبيق"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:44
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:45
 msgid "Are you sure you want to renew the authorisation token?"
 msgstr "هل أنت متأكد أنك تريد تجديد الرمز المميز للتصريح?"
@@ -410,14 +429,13 @@ msgstr ""
 "تنبيه: إذا غيرت هذا المكان ، تأكد من نسخ كافة المحتويات لديك إليه قبل البدء "
 "بالمزامنة ، وإلا فسيتم حذف كل الملفات! أنظر الأسئلة المتكررة لتفاصيل أكثر: %s"
 
-#: packages/app-cli/app/command-sync.ts:82
-#: packages/app-cli/app/command-sync.ts:96
+#: packages/app-cli/app/command-sync.ts:73
+#: packages/app-cli/app/command-sync.ts:87
 #: packages/app-desktop/gui/OneDriveLoginScreen.tsx:45
 msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "لم تكتمل المصادقة (لم أستلم الرمز المميز للمصادقة)."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:194
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:149
 msgid "Authorisation token:"
 msgstr "الرمز المميز للتصريح:"
@@ -451,6 +469,10 @@ msgstr "التبديل تلقائيا للتنسيق لمطابقة تنسيق
 msgid "Back"
 msgstr "عودة"
 
+#: packages/lib/utils/joplinCloud.ts:294
+msgid "Basic"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33
 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132
 msgid "Bold"
@@ -477,11 +499,10 @@ msgstr "مشاركة"
 #: packages/app-desktop/bridge.ts:196 packages/app-desktop/bridge.ts:217
 #: packages/app-desktop/checkForUpdates.ts:199
 #: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:728
-#: packages/app-desktop/gui/DialogButtonRow.min.js:38
 #: packages/app-desktop/gui/DialogButtonRow.tsx:78
 #: packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx:82
 #: packages/app-desktop/gui/NoteList/NoteList.tsx:168
-#: packages/app-desktop/gui/PromptDialog.min.js:249
+#: packages/app-desktop/gui/PromptDialog.tsx:270
 #: packages/app-desktop/gui/ResourceScreen.tsx:170
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:318
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
@@ -493,14 +514,14 @@ msgstr "مشاركة"
 #: packages/app-mobile/components/screens/Note.tsx:104
 #: packages/app-mobile/components/screens/Note.tsx:586
 #: packages/app-mobile/components/SelectDateTimeDialog.tsx:152
-#: packages/app-mobile/components/side-menu-content.tsx:163
-#: packages/app-mobile/components/side-menu-content.tsx:172
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:165
+#: packages/app-mobile/components/side-menu-content.tsx:174
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/shim-init-node.js:196
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: packages/app-cli/app/app.js:171
+#: packages/app-cli/app/app.js:138
 msgid "Cancelling background synchronisation... Please wait."
 msgstr "يجري إلغاء مزامنة الخلفية... فضلاً انتظر."
 
@@ -508,7 +529,7 @@ msgstr "يجري إلغاء مزامنة الخلفية... فضلاً انتظر
 msgid "Cancelling..."
 msgstr "الإلغاء جارٍ..."
 
-#: packages/app-cli/app/command-sync.ts:269
+#: packages/app-cli/app/command-sync.ts:260
 msgid "Cancelling... Please wait."
 msgstr "الإلغاء جارٍ... فضلاً انتظر."
 
@@ -516,7 +537,7 @@ msgstr "الإلغاء جارٍ... فضلاً انتظر."
 msgid "Cannot access %s"
 msgstr "لا يمكن الوصول إلى %s"
 
-#: packages/app-cli/app/base-command.js:15
+#: packages/app-cli/app/base-command.ts:15
 msgid "Cannot change encrypted item"
 msgstr "لا يمكن تغيير العنصر المشفَّر"
 
@@ -552,7 +573,7 @@ msgstr "لا يمكن نسخ الملاحظة إلى دفتر الملاحظات
 msgid "Cannot find \"%s\"."
 msgstr "لا يمكن العثور على \"%s\"."
 
-#: packages/app-cli/app/command-sync.ts:182
+#: packages/app-cli/app/command-sync.ts:173
 msgid "Cannot initialise synchroniser."
 msgstr "لم يتمكن من تمهيد المزامن."
 
@@ -649,7 +670,7 @@ msgid "Chrome Web Store"
 msgstr "متجر كروم الالكتروني"
 
 #: packages/app-desktop/gui/EditFolderDialog/Dialog.tsx:146
-#: packages/app-desktop/gui/PromptDialog.min.js:256
+#: packages/app-desktop/gui/PromptDialog.tsx:277
 msgid "Clear"
 msgstr "مسح"
 
@@ -665,7 +686,7 @@ msgstr ""
 "انقر \"%s\" لاستعادة الملاحظة. سيتم نسخه في دفتر الملاحظات المسمى \"%s\". لن "
 "يتم استبدال أو تعديل الإصدار الحالي من الملاحظة."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:384
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:387
 msgid "Click to add tags..."
 msgstr "اضغط لإدراج سمات..."
 
@@ -698,7 +719,7 @@ msgstr "رمز"
 msgid "Code Block"
 msgstr "كتلة للغة البرمجة"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Code View"
 msgstr "عرض بلغة البرمجة"
 
@@ -706,7 +727,7 @@ msgstr "عرض بلغة البرمجة"
 msgid "Collaborate on notebooks with others"
 msgstr "تعاون مع الآخرين على دفاتر الملاحظات"
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Collapse"
 msgstr ""
 
@@ -759,7 +780,7 @@ msgid "Compress old changes"
 msgstr ""
 
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:681
-#: packages/app-mobile/components/side-menu-content.tsx:402
+#: packages/app-mobile/components/side-menu-content.tsx:404
 msgid "Configuration"
 msgstr "الضبط"
 
@@ -788,6 +809,10 @@ msgstr "التعارضات"
 msgid "Conflicts (attachments)"
 msgstr "التعارضات (المرفقات)"
 
+#: packages/lib/utils/joplinCloud.ts:171
+msgid "Consolidated billing"
+msgstr ""
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.tsx:110
 #, fuzzy
 msgid "Content provided by %s"
@@ -803,7 +828,7 @@ msgstr "تحويل إلى قائمة مهام"
 
 #: packages/app-desktop/gui/MenuBar.tsx:492
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:13
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:782
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:783
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:157
 msgid "Copy"
 msgstr "نسخ"
@@ -847,7 +872,6 @@ msgstr[3] "نسخ روابط قابلة للمشاركة"
 msgstr[4] "نسخ روابط قابلة للمشاركة"
 msgstr[5] "نسخ روابط قابلة للمشاركة"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:208
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:153
 msgid "Copy token"
 msgstr "نسخ الرمز المميز"
@@ -907,7 +931,7 @@ msgid ""
 "again when you are connected to the internet."
 msgstr ""
 
-#: packages/app-desktop/gui/PromptDialog.min.js:235
+#: packages/app-desktop/gui/PromptDialog.tsx:256
 #, fuzzy
 msgid "Create"
 msgstr "الإنشاء"
@@ -1010,7 +1034,7 @@ msgid "Custom TLS certificates"
 msgstr "شهادات TLS خاصة"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:18
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:772
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:773
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:149
 msgid "Cut"
 msgstr "قص"
@@ -1052,7 +1076,7 @@ msgid "Decrypted items: %s / %s"
 msgstr "العناصر المفكوك تشفيرها: %s / %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:734
-#: packages/app-mobile/components/side-menu-content.tsx:411
+#: packages/app-mobile/components/side-menu-content.tsx:413
 msgid "Decrypting items: %d/%d"
 msgstr "فك تشفير العناصر: %d/%d"
 
@@ -1074,7 +1098,7 @@ msgstr "التلقائية: %s"
 #: packages/app-mobile/components/ScreenHeader.tsx:415
 #: packages/app-mobile/components/ScreenHeader.tsx:482
 #: packages/app-mobile/components/screens/Note.tsx:960
-#: packages/app-mobile/components/side-menu-content.tsx:153
+#: packages/app-mobile/components/side-menu-content.tsx:155
 msgid "Delete"
 msgstr "حذف"
 
@@ -1110,7 +1134,7 @@ msgid "Delete note?"
 msgstr "حذف الملاحظة؟"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:291
-#: packages/app-mobile/components/side-menu-content.tsx:155
+#: packages/app-mobile/components/side-menu-content.tsx:157
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
@@ -1199,7 +1223,6 @@ msgstr "تعطيل التشفير"
 msgid "Disable safe mode and restart"
 msgstr "تعطيل الوضع الآمن ثم إعادة التشغيل"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:103
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:102
 msgid "Disable Web Clipper Service"
 msgstr "تعطيل خدمة Web clipper"
@@ -1226,7 +1249,7 @@ msgstr ""
 msgid "Discard changes"
 msgstr "تجاهل التغييرات"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:451
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:454
 msgid "Dismiss"
 msgstr "صرف"
 
@@ -1304,7 +1327,6 @@ msgstr ""
 msgid "Download"
 msgstr "تحميل"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:174
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:140
 msgid "Download and install the relevant extension for your browser:"
 msgstr "قم بتنزيل و تثبيت الإضافة المذكورة في المستعرض لديك:"
@@ -1325,7 +1347,7 @@ msgstr "تم تنزيلها وتشفيرها"
 msgid "Downloading"
 msgstr "جاري التنزيل"
 
-#: packages/app-cli/app/command-sync.ts:236
+#: packages/app-cli/app/command-sync.ts:227
 msgid "Downloading resources..."
 msgstr "يجري تنزيل الموارد..."
 
@@ -1333,7 +1355,7 @@ msgstr "يجري تنزيل الموارد..."
 msgid "Dracula"
 msgstr "Dracula"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Drop notes or files here"
 msgstr "قم بإسقاط الملاحظات أو الملفات هنا"
 
@@ -1447,7 +1469,7 @@ msgstr ""
 msgid "Emails"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:195
 msgid "emphasised text"
 msgstr "نص مشدَّد علية"
 
@@ -1541,7 +1563,6 @@ msgstr "تمكين دعم صائغ الحروف"
 msgid "Enable video player"
 msgstr "تفعيل مشغّل الفيديو"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:114
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:113
 msgid "Enable Web Clipper Service"
 msgstr "تفعيل خدمة Web clipper"
@@ -1569,7 +1590,7 @@ msgstr "مشفّر"
 msgid "Encrypted items cannot be modified"
 msgstr "لا يمكن تعديل العناصر المشفَّرة"
 
-#: packages/app-mobile/components/side-menu-content.tsx:139
+#: packages/app-mobile/components/side-menu-content.tsx:141
 msgid "Encrypted notebooks cannot be renamed"
 msgstr "دفاتر الملاحظات المشفرة لا يمكن إعادة تسميتها"
 
@@ -1659,7 +1680,7 @@ msgstr "ملف تصدير Evernote (بتنسيق Markdown)"
 msgid "Exits the application."
 msgstr "الخروج من التطبيق."
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Expand"
 msgstr ""
 
@@ -1735,7 +1756,7 @@ msgid "Fetched items: %d/%d."
 msgstr "العناصر المجلوبة: %d/%d."
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:739
-#: packages/app-mobile/components/side-menu-content.tsx:416
+#: packages/app-mobile/components/side-menu-content.tsx:418
 msgid "Fetching resources: %d/%d"
 msgstr "جلب الموارد: %d/%d"
 
@@ -2095,7 +2116,6 @@ msgstr ""
 "لاستخدام مزامنة نظام الملفات، يجب الحصول على إذن الكتابة إلى وحدة التخزين "
 "الخارجية."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:142
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:130
 msgid "In order to use the web clipper, you need to do the following:"
 msgstr "تحتاج لفعل الخطوات التالية للتمكن من استخدام إضافة القصّ Web clipper:"
@@ -2104,7 +2124,7 @@ msgstr "تحتاج لفعل الخطوات التالية للتمكن من اس
 msgid "In progress"
 msgstr "قيد التقدم"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:535
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:539
 msgid "In: %s"
 msgstr "في: %s"
 
@@ -2132,7 +2152,7 @@ msgstr "نص لغة برمجة في النسق"
 msgid "Insert"
 msgstr "إدخال"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:196
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:197
 msgid "Insert Hyperlink"
 msgstr "إدراج ارتباط تشعبي"
 
@@ -2265,7 +2285,6 @@ msgstr "كلمة مرور خادم Joplin"
 msgid "Joplin Server URL"
 msgstr "عنوان URL لخادم Joplin"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:137
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:129
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
@@ -2330,7 +2349,7 @@ msgstr "آخر خطأ: %s"
 msgid "Later"
 msgstr "لاحقا"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid "Layout"
 msgstr "تخطيط"
 
@@ -2388,9 +2407,9 @@ msgstr "رابط"
 msgid "Links with protocol \"%s\" are not supported"
 msgstr "الروابط مع البروتوكول \"%s\" غير مدعومة"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:229
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:231
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:230
 #: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:232
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:233
 msgid "List item"
 msgstr "عنصر قائمة"
 
@@ -2407,7 +2426,7 @@ msgstr "تم التنزيل"
 msgid "Location"
 msgstr "المكان"
 
-#: packages/app-cli/app/command-sync.ts:137
+#: packages/app-cli/app/command-sync.ts:128
 msgid ""
 "Lock file is already being hold. If you know that no synchronisation is "
 "taking place, you may delete the lock file at \"%s\" and resume the "
@@ -2461,6 +2480,11 @@ msgstr "أدخل كلمة المرور الرئيسة:"
 msgid "Manage master password..."
 msgstr "أدخل كلمة المرور الرئيسة:"
 
+#: packages/lib/utils/joplinCloud.ts:165
+#, fuzzy
+msgid "Manage multiple users"
+msgstr "أدخل كلمة المرور الرئيسة:"
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx:320
 msgid "Manage your plugins"
 msgstr "إدارة الإضافات الخاصة بك"
@@ -2527,6 +2551,11 @@ msgstr "الاتصالات المتزامنة القصوى"
 msgid "Max Item Size"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:117
+#, fuzzy
+msgid "Max note or attachment size"
+msgstr "مرفقات الملاحظات"
+
 #: packages/server/src/routes/admin/users.ts:150
 #, fuzzy
 msgid "Max Total Size"
@@ -2545,7 +2574,7 @@ msgstr "المفاتيح الرئيسة مفقودة"
 msgid "Missing required argument: %s"
 msgstr "المعامل المطلوب %s مفقود"
 
-#: packages/app-mobile/components/side-menu-content.tsx:437
+#: packages/app-mobile/components/side-menu-content.tsx:439
 msgid "Mobile data - auto-sync disabled"
 msgstr "بيانات الجوال - تم تعطيل المزامنة التلقائية"
 
@@ -2557,7 +2586,7 @@ msgstr "معلومات اكثر"
 msgid "More information"
 msgstr "معلومات اكثر"
 
-#: packages/app-cli/app/app.js:63
+#: packages/app-cli/app/app.js:64
 msgid "More than one item match \"%s\". Please narrow down your query."
 msgstr "أكثر من عنصر واحد يطابق \"%s\". يرجى تضييق الاستعلام الخاص بك."
 
@@ -2582,11 +2611,12 @@ msgstr "النقل إلى دفتر ملاحظات..."
 msgid "Moves the given <item> to [notebook]"
 msgstr "ينقل الملاحظات المطابقة لـ <note> إلى [notebook]."
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "n"
 msgstr "لا"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "N"
 msgstr "لا"
 
@@ -2600,7 +2630,7 @@ msgstr "ملاحظة جديدة"
 msgid "New notebook"
 msgstr "دفتر ملاحظات جديد"
 
-#: packages/app-mobile/components/side-menu-content.tsx:398
+#: packages/app-mobile/components/side-menu-content.tsx:400
 msgid "New Notebook"
 msgstr "دفتر ملاحظات جديد"
 
@@ -2665,11 +2695,11 @@ msgstr "لا يوجد دفتر ملاحظات نشط."
 msgid "No item with ID %s"
 msgstr "لا يوجد عنصر بالمعرّف %s"
 
-#: packages/app-cli/app/app.js:99
+#: packages/app-cli/app/app.js:100
 msgid "No notebook has been specified."
 msgstr "لم يتم تحديد دفتر ملاحظات."
 
-#: packages/app-cli/app/app.js:93
+#: packages/app-cli/app/app.js:94
 msgid "No notebook selected."
 msgstr "لم يتم اختيار دفتر ملاحظات."
 
@@ -2685,7 +2715,7 @@ msgstr "لا توجد موارد!"
 msgid "No results"
 msgstr "لا نتائج"
 
-#: packages/app-cli/app/app.js:256
+#: packages/app-cli/app/app.js:224
 msgid "No such command: %s"
 msgstr "أمر غير موجود: %s"
 
@@ -2702,7 +2732,7 @@ msgstr "لم يعرَّف محرر نصوص. فضلاً اضبطه باستخد
 msgid "Nord"
 msgstr "Nord"
 
-#: packages/app-cli/app/command-sync.ts:106
+#: packages/app-cli/app/command-sync.ts:97
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
 "لا يمكن المصادقة باستخدام %s. يرجى التزويد بأي من بيانات اعتماد الدخول "
@@ -2803,12 +2833,12 @@ msgstr "دفاتر ملاحظات"
 msgid "Notebook list growth factor"
 msgstr "عامل نمو قائمة المفكرة"
 
-#: packages/app-mobile/components/side-menu-content.tsx:133
+#: packages/app-mobile/components/side-menu-content.tsx:135
 msgid "Notebook: %s"
 msgstr "دفتر ملاحظات: \"%s\""
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:691
-#: packages/app-mobile/components/side-menu-content.tsx:457
+#: packages/app-mobile/components/side-menu-content.tsx:459
 msgid "Notebooks"
 msgstr "دفاتر ملاحظات"
 
@@ -2838,15 +2868,14 @@ msgstr "قائمة مرقّمة"
 #: packages/app-desktop/bridge.ts:190 packages/app-desktop/bridge.ts:196
 #: packages/app-desktop/bridge.ts:217 packages/app-desktop/bridge.ts:227
 #: packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx:28
-#: packages/app-desktop/gui/DialogButtonRow.min.js:30
 #: packages/app-desktop/gui/DialogButtonRow.tsx:70
 #: packages/app-desktop/gui/MenuBar.tsx:492
-#: packages/app-desktop/gui/PromptDialog.min.js:242
+#: packages/app-desktop/gui/PromptDialog.tsx:263
 #: packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx:26
 #: packages/app-mobile/components/CameraView.tsx:190
 #: packages/app-mobile/components/ModalDialog.js:67
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:203
-#: packages/app-mobile/components/side-menu-content.tsx:157
+#: packages/app-mobile/components/side-menu-content.tsx:159
 msgid "OK"
 msgstr "موافق"
 
@@ -2972,7 +3001,7 @@ msgid "Passwords do not match!"
 msgstr "كلمات المرور غير متطابقة!"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:23
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:792
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:793
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:164
 msgid "Paste"
 msgstr "لصق"
@@ -2986,6 +3015,10 @@ msgstr "المسار:"
 msgid "PDF File"
 msgstr "ملف PDF"
 
+#: packages/lib/utils/joplinCloud.ts:355
+msgid "Per user. Minimum of %d users."
+msgstr ""
+
 #: packages/app-mobile/components/screens/Note.tsx:403
 msgid "Permission needed"
 msgstr "مطلوب الإذن"
@@ -3056,7 +3089,7 @@ msgstr "فضلاً حدّد دفتر الملاحظات الذي ترغب است
 msgid "Please upgrade Joplin to use this plugin"
 msgstr "يرجى تحديث Joplin لإستخدام هذا البرنامج الإضافي"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid ""
 "Please wait for all attachments to be downloaded and decrypted. You may also "
 "switch to %s to edit the note."
@@ -3138,10 +3171,18 @@ msgstr "الإصدارات السابقة من هذه الملاحظة"
 msgid "Print"
 msgstr "اطبع"
 
+#: packages/lib/utils/joplinCloud.ts:183
+msgid "Priority support"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:655
 msgid "Privacy Policy"
 msgstr "سياسة الخصوصية"
 
+#: packages/lib/utils/joplinCloud.ts:316
+msgid "Pro"
+msgstr ""
+
 #: packages/server/src/services/TaskService.ts:24
 msgid "Process failed payment subscriptions"
 msgstr ""
@@ -3197,6 +3238,7 @@ msgid "Publish Notes"
 msgstr "نشر الملاحظات"
 
 #: packages/app-desktop/gui/SyncWizard/Dialog.tsx:178
+#: packages/lib/utils/joplinCloud.ts:141
 msgid "Publish notes to the internet"
 msgstr "أنشر الملاحظات على الإنترنت"
 
@@ -3218,7 +3260,7 @@ msgstr "اعادة التشفير"
 msgid "Re-upload local data to sync target"
 msgstr "إعادة رفع البيانات المحليّة إلى وجهة المزامنة"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:450
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:453
 msgid "Read more about it"
 msgstr "إقرأ المزيد عن هذا"
 
@@ -3278,7 +3320,7 @@ msgstr "حذف هذا البحث من الشريط الجانبي؟"
 
 #: packages/app-desktop/gui/MainScreen/commands/renameFolder.ts:8
 #: packages/app-desktop/gui/MainScreen/commands/renameTag.ts:8
-#: packages/app-mobile/components/side-menu-content.tsx:136
+#: packages/app-mobile/components/side-menu-content.tsx:138
 msgid "Rename"
 msgstr "إعادة تسمية"
 
@@ -3295,7 +3337,6 @@ msgid "Renames the given <item> (note or notebook) to <name>."
 msgstr ""
 "يعيد تسمية <item> (عنصر) معطى (ملاحظة أو دفتر ملاحظات) ليصبح <name> (اسم)."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:222
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:159
 msgid "Renew token"
 msgstr "تجديد الرمز المميز"
@@ -3474,7 +3515,7 @@ msgstr "بحث:"
 
 #: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:167
 #: packages/app-desktop/gui/lib/SearchInput/SearchInput.tsx:65
-#: packages/app-desktop/gui/NoteSearchBar.min.js:165
+#: packages/app-desktop/gui/NoteSearchBar.min.js:164
 msgid "Search..."
 msgstr "بحث..."
 
@@ -3556,6 +3597,11 @@ msgstr ""
 msgid "Share"
 msgstr "مشاركة"
 
+#: packages/lib/utils/joplinCloud.ts:159
+#, fuzzy
+msgid "Share and collaborate on a notebook"
+msgstr "يمكن إنشاء الملاحظات فقط ضمن دفتر ملاحظات."
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:339
 msgid "Share Notebook"
 msgstr "مشاركة دفتر الملاحظات"
@@ -3564,6 +3610,10 @@ msgstr "مشاركة دفتر الملاحظات"
 msgid "Share notebook..."
 msgstr "مشاركة الملاحظة..."
 
+#: packages/lib/utils/joplinCloud.ts:177
+msgid "Sharing access control"
+msgstr ""
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:305
 msgid "Sharing notebook..."
 msgstr "تجري مشاركة الملاحظة..."
@@ -3732,7 +3782,7 @@ msgstr ""
 "بدء فك التشفير جارٍ... يرجى الانتظار حيث قد تستغرق العملية عدة دقائق بحسب "
 "كمية البيانات المطلوب فك تشفيرها."
 
-#: packages/app-cli/app/command-sync.ts:213
+#: packages/app-cli/app/command-sync.ts:204
 msgid "Starting synchronisation..."
 msgstr "يجري بدء المزامنة..."
 
@@ -3753,34 +3803,30 @@ msgstr "إحصائيات..."
 msgid "Status"
 msgstr "الحالة"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:97
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:96
 msgid "Status: %s"
 msgstr "الحالة: %s"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:91
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:90
 msgid "Status: Started on port %d"
 msgstr "الحالة: تم البدء على المنفذ %d"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:150
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:133
 msgid "Step 1: Enable the clipper service"
 msgstr "الخطوة 1: تفعيل خدمة إضافة القصّ Web clipper"
 
-#: packages/app-cli/app/command-sync.ts:92
+#: packages/app-cli/app/command-sync.ts:83
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:46
 #: packages/app-mobile/components/screens/dropbox-login.js:59
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr "الخطوة 1: إفتح عنوان URL هذا في المستعرض للتصريح للتطبيق:"
 
-#: packages/app-cli/app/command-sync.ts:94
+#: packages/app-cli/app/command-sync.ts:85
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:50
 #: packages/app-mobile/components/screens/dropbox-login.js:65
 msgid "Step 2: Enter the code provided by Dropbox:"
 msgstr "الخطوة 2: أدخل الرمز المزوّد من Dropbox:"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:169
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:139
 msgid "Step 2: Install the extension"
 msgstr "الخطوة 2: تثبيت الإضافة"
@@ -3793,11 +3839,15 @@ msgstr "قف"
 msgid "Stop external editing"
 msgstr "إيقاف التحرير خارج التطبيق"
 
+#: packages/lib/utils/joplinCloud.ts:129
+msgid "Storage space"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:19
 msgid "Strikethrough"
 msgstr "توسيط خط في النص"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:193
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
 msgid "strong text"
 msgstr "نص مشدَّد"
 
@@ -3856,6 +3906,10 @@ msgid ""
 "notebook."
 msgstr "التبديل إلى [notebook] - جميع العمليات التالية ستجري في هذا الدفتر."
 
+#: packages/lib/utils/joplinCloud.ts:147
+msgid "Sync as many devices as you want"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:564
 msgid "Sync Status"
 msgstr "حالة المزامنة"
@@ -3864,7 +3918,7 @@ msgstr "حالة المزامنة"
 msgid "Sync status (synced items / total items)"
 msgstr "حالة المزامنة (العناصر المنجزة / إجمالي العناصر)"
 
-#: packages/app-cli/app/command-sync.ts:251
+#: packages/app-cli/app/command-sync.ts:242
 msgid "Sync target must be upgraded! Run `%s` to proceed."
 msgstr "يجب ترقية هدف المزامنة! قم بتشغيل `%s` للمتابعة."
 
@@ -3892,7 +3946,7 @@ msgstr "المزامنة"
 msgid "Synchronisation interval"
 msgstr "مهلة المزامنة"
 
-#: packages/app-cli/app/command-sync.ts:132
+#: packages/app-cli/app/command-sync.ts:123
 msgid "Synchronisation is already in progress."
 msgstr "المزامنة قيد التقدم بالفعل."
 
@@ -3905,12 +3959,12 @@ msgstr "حالة المزامنة"
 msgid "Synchronisation target"
 msgstr "وجهة المزامنة"
 
-#: packages/app-cli/app/command-sync.ts:180
+#: packages/app-cli/app/command-sync.ts:171
 msgid "Synchronisation target: %s (%s)"
 msgstr "وجهة المزامنة: %s (%s)"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/commands/synchronize.ts:8
 msgid "Synchronise"
 msgstr "زامِن"
@@ -3948,7 +4002,7 @@ msgstr "تم وسمها: %d."
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:715
 #: packages/app-mobile/components/screens/Note.tsx:933
 #: packages/app-mobile/components/screens/tags.js:101
-#: packages/app-mobile/components/side-menu-content.tsx:400
+#: packages/app-mobile/components/side-menu-content.tsx:402
 msgid "Tags"
 msgstr "وسوم"
 
@@ -3966,6 +4020,10 @@ msgstr "إنشاء دفتر ملاحظات"
 msgid "Tasks"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:338
+msgid "Teams"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1343
 msgid "Text editor command"
 msgstr "أمر محرر النصوص"
@@ -4001,13 +4059,13 @@ msgstr "جرى التصريح للتطبيق بنجاح."
 msgid "The application must be restarted for these changes to take effect."
 msgstr "يجب إعادة تشغيل التطبيق حتى تصبح هذه التغييرات سارية المفعول."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:522
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:526
 msgid ""
 "The attachments will no longer be watched when you switch to a different "
 "note."
 msgstr "لن تتم مشاهدة المرفقات بعد الآن عند التبديل إلى ملاحظة مختلفة."
 
-#: packages/app-cli/app/app.js:304
+#: packages/app-cli/app/app.js:272
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "الأمر \"%s\" متوفر فقط في وضع الواجهة الرسومية"
 
@@ -4053,7 +4111,7 @@ msgstr ""
 "ينضرب مع العامل 2 سيأخذ ضِعف مساحة العنصر بمعامل 1. أعد تشغيل التطبيق لمشاهدة "
 "التغييرات."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:521
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:525
 msgid "The following attachments are being watched for changes:"
 msgstr "تتم مراقبة المرفقات التالية للتغييرات:"
 
@@ -4157,12 +4215,10 @@ msgstr ""
 msgid "The Web Clipper needs your authorisation to access your data."
 msgstr "Web Clipper بحاجة لتصريحك من أجل الوصول لبياناتك."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:84
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:84
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr "خدمة Web Clipper مفعَّلة ومضبوطة على البدء التلقائي."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:109
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:108
 msgid "The web clipper service is not enabled."
 msgstr "خدمة Web clipper غير مفعَّلة."
@@ -4247,7 +4303,6 @@ msgstr "لم يجر تنزيل هذا المرفق أو فك تشفيره حتى
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "لم يجر تنزيل هذا المرفق أو فك تشفيره حتى الآن."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:214
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:156
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
@@ -4273,7 +4328,7 @@ msgstr "ليس لدى هذه الملاحظة معلومة موقع جغرافي
 msgid "This note has been modified:"
 msgstr "جرى تعديل هذه الملاحظة:"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
 "note."
@@ -4284,7 +4339,7 @@ msgstr ""
 msgid "This note has no history"
 msgstr "هذه المذكرة ليس لها تاريخ"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:449
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:452
 msgid ""
 "This Rich Text editor has a number of limitations and it is recommended to "
 "be aware of them before using it."
@@ -4292,7 +4347,6 @@ msgstr ""
 "يحتوي محرر النص المنسق هذا على عدد من القيود ومن المستحسن أن تكون على دراية "
 "بها قبل استخدامه."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:155
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:134
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
@@ -4336,7 +4390,7 @@ msgstr "العنوان"
 msgid "Title"
 msgstr "العنوان"
 
-#: packages/app-cli/app/command-sync.ts:91
+#: packages/app-cli/app/command-sync.ts:82
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:45
 #: packages/app-mobile/components/screens/dropbox-login.js:58
 msgid ""
@@ -4445,7 +4499,6 @@ msgstr "تبديل الشريط الجانبي"
 msgid "Toggle sort order field"
 msgstr "تبديل الوضع الآمن"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:40
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:41
 msgid "Token has been copied to the clipboard!"
 msgstr "تم نسخ الرمز المميز إلى الحافظة!"
@@ -4467,6 +4520,12 @@ msgstr "الإجمالي: %d/%d"
 msgid "Try again"
 msgstr "حاول ثانية"
 
+#: packages/lib/utils/joplinCloud.ts:309 packages/lib/utils/joplinCloud.ts:331
+#: packages/lib/utils/joplinCloud.ts:353
+#, fuzzy
+msgid "Try it now"
+msgstr "إفعلها الآن"
+
 #: packages/app-cli/app/command-help.js:71
 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
@@ -4539,7 +4598,7 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "نوع صورة غير مدعوم: %s"
 
-#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:35
+#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:40
 #: packages/app-desktop/gui/NoteRevisionViewer.min.js:142
 msgid "Unsupported link or message: %s"
 msgstr "رابط أو رسالة غير مدعومان: %s"
@@ -4716,7 +4775,7 @@ msgstr "تحذير"
 msgid "Warning: not all resources shown for performance reasons (limit: %s)."
 msgstr "تحذير: لم يتم عرض كافّة الموارد لأسباب تتعلق بالأداء (الحد: %s)."
 
-#: packages/lib/models/Setting.ts:2408
+#: packages/lib/models/Setting.ts:2408 packages/lib/utils/joplinCloud.ts:153
 msgid "Web Clipper"
 msgstr "Web Clipper"
 
@@ -4769,11 +4828,12 @@ msgstr "عند إنشاء قائمة جديدة للمهام:"
 msgid "Words"
 msgstr "كلمات"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "y"
 msgstr "نعم"
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "Y"
 msgstr "نعم"
 
@@ -4828,7 +4888,7 @@ msgstr "ستتم إعادة تشفير بياناتك ومزامنتها مرة
 msgid "Your password is needed to decrypt some of your data."
 msgstr ""
 
-#: packages/app-cli/app/command-sync.ts:242
+#: packages/app-cli/app/command-sync.ts:233
 msgid ""
 "Your password is needed to decrypt some of your data. Type `:e2ee decrypt` "
 "to set it."
@@ -4936,9 +4996,9 @@ msgstr "تصغير"
 #~ "marked as \"active\"). Any of the keys might be used for decryption, "
 #~ "depending on how the notes or notebooks were originally encrypted."
 #~ msgstr ""
-#~ "لاحِظ: سيجري استخدام مفتاح رئيس واحد فقط للتشفير (المفتاح المعلَّم أنه \"نشط"
-#~ "\"). يمكن استخدام أي من المفاتيح لفك التشفير ، وهذا بحسب الطريقة التي "
-#~ "شفرت بها سابقاً الملاحظة أو دفتر الملاحظات."
+#~ "لاحِظ: سيجري استخدام مفتاح رئيس واحد فقط للتشفير (المفتاح المعلَّم أنه "
+#~ "\"نشط\"). يمكن استخدام أي من المفاتيح لفك التشفير ، وهذا بحسب الطريقة "
+#~ "التي شفرت بها سابقاً الملاحظة أو دفتر الملاحظات."
 
 #~ msgid "Encryption is:"
 #~ msgstr "التشفير هو:"

packages/tools/locales/bg_BG.po

@@ -91,6 +91,16 @@ msgstr "Изглед(&V)"
 msgid "%d days"
 msgstr "%d дни"
 
+#: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137
+#: packages/lib/utils/joplinCloud.ts:138
+msgid "%d GB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134
+#: packages/lib/utils/joplinCloud.ts:135
+msgid "%d GB storage space"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1322
 msgid "%d hour"
 msgstr "%d час"
@@ -99,6 +109,17 @@ msgstr "%d час"
 msgid "%d hours"
 msgstr "%d часа"
 
+#: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125
+#: packages/lib/utils/joplinCloud.ts:126
+msgid "%d MB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122
+#: packages/lib/utils/joplinCloud.ts:123
+#, fuzzy
+msgid "%d MB per note or attachment"
+msgstr "Прикачи файл"
+
 #: packages/lib/models/Setting.ts:1319 packages/lib/models/Setting.ts:1320
 #: packages/lib/models/Setting.ts:1321
 msgid "%d minutes"
@@ -292,7 +313,6 @@ msgstr ""
 msgid "Admin dashboard"
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:189
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:148
 msgid "Advanced options"
 msgstr "Настройки за напреднали"
@@ -304,7 +324,7 @@ msgstr "Настройки за напреднали"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:485
 #: packages/app-mobile/components/screens/notes.js:191
-#: packages/app-mobile/components/side-menu-content.tsx:453
+#: packages/app-mobile/components/side-menu-content.tsx:455
 #, fuzzy
 msgid "All notes"
 msgstr "бележка"
@@ -334,8 +354,8 @@ msgstr ""
 
 #: packages/app-cli/app/command-mv.js:29
 msgid ""
-"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
-"\" to see the short notebook id"
+"Ambiguous notebook \"%s\". Please use short notebook id instead - press "
+"\"ti\" to see the short notebook id"
 msgstr ""
 
 #: packages/app-desktop/checkForUpdates.ts:197
@@ -354,7 +374,6 @@ msgstr "Приложение"
 msgid "Apply"
 msgstr "Приложи"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:44
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:45
 msgid "Are you sure you want to renew the authorisation token?"
 msgstr ""
@@ -426,14 +445,13 @@ msgstr ""
 "съдържание там преди да синхронизирате, иначе всички файлове ще бъдат "
 "премахнати! Вижчте ЧЗВ за повече подробности: %s"
 
-#: packages/app-cli/app/command-sync.ts:82
-#: packages/app-cli/app/command-sync.ts:96
+#: packages/app-cli/app/command-sync.ts:73
+#: packages/app-cli/app/command-sync.ts:87
 #: packages/app-desktop/gui/OneDriveLoginScreen.tsx:45
 msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "Оторизирането не беше завършено (не получих оторизационен жетон)."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:194
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:149
 msgid "Authorisation token:"
 msgstr "Оторизационен жетон:"
@@ -467,6 +485,10 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
+#: packages/lib/utils/joplinCloud.ts:294
+msgid "Basic"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33
 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132
 msgid "Bold"
@@ -493,11 +515,10 @@ msgstr "Сподели"
 #: packages/app-desktop/bridge.ts:196 packages/app-desktop/bridge.ts:217
 #: packages/app-desktop/checkForUpdates.ts:199
 #: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:728
-#: packages/app-desktop/gui/DialogButtonRow.min.js:38
 #: packages/app-desktop/gui/DialogButtonRow.tsx:78
 #: packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx:82
 #: packages/app-desktop/gui/NoteList/NoteList.tsx:168
-#: packages/app-desktop/gui/PromptDialog.min.js:249
+#: packages/app-desktop/gui/PromptDialog.tsx:270
 #: packages/app-desktop/gui/ResourceScreen.tsx:170
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:318
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
@@ -509,14 +530,14 @@ msgstr "Сподели"
 #: packages/app-mobile/components/screens/Note.tsx:104
 #: packages/app-mobile/components/screens/Note.tsx:586
 #: packages/app-mobile/components/SelectDateTimeDialog.tsx:152
-#: packages/app-mobile/components/side-menu-content.tsx:163
-#: packages/app-mobile/components/side-menu-content.tsx:172
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:165
+#: packages/app-mobile/components/side-menu-content.tsx:174
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/shim-init-node.js:196
 msgid "Cancel"
 msgstr "Отмени"
 
-#: packages/app-cli/app/app.js:171
+#: packages/app-cli/app/app.js:138
 msgid "Cancelling background synchronisation... Please wait."
 msgstr "Отменя се синхронизацията течаща на заден план... Моля изчакайте."
 
@@ -524,7 +545,7 @@ msgstr "Отменя се синхронизацията течаща на за
 msgid "Cancelling..."
 msgstr "Отменям..."
 
-#: packages/app-cli/app/command-sync.ts:269
+#: packages/app-cli/app/command-sync.ts:260
 msgid "Cancelling... Please wait."
 msgstr "Отменям... Моля изчакайте."
 
@@ -532,7 +553,7 @@ msgstr "Отменям... Моля изчакайте."
 msgid "Cannot access %s"
 msgstr "Няма достъп до %s"
 
-#: packages/app-cli/app/base-command.js:15
+#: packages/app-cli/app/base-command.ts:15
 msgid "Cannot change encrypted item"
 msgstr "Криптираният обект не може да бъде променен"
 
@@ -568,7 +589,7 @@ msgstr "Не можах да копира бележката в тетрадка
 msgid "Cannot find \"%s\"."
 msgstr "Не успях да намеря \"%s\"."
 
-#: packages/app-cli/app/command-sync.ts:182
+#: packages/app-cli/app/command-sync.ts:173
 #, fuzzy
 msgid "Cannot initialise synchroniser."
 msgstr "Не успях да инициализирам синхронизатора."
@@ -670,7 +691,7 @@ msgid "Chrome Web Store"
 msgstr ""
 
 #: packages/app-desktop/gui/EditFolderDialog/Dialog.tsx:146
-#: packages/app-desktop/gui/PromptDialog.min.js:256
+#: packages/app-desktop/gui/PromptDialog.tsx:277
 msgid "Clear"
 msgstr "Изчисти"
 
@@ -687,7 +708,7 @@ msgstr ""
 "тетрадка с име \"%s\". Настоящата версия на бележката няма да бъде подменена "
 "или променена."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:384
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:387
 #, fuzzy
 msgid "Click to add tags..."
 msgstr "Провери за обновления..."
@@ -722,7 +743,7 @@ msgstr "Код"
 msgid "Code Block"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 #, fuzzy
 msgid "Code View"
 msgstr "Код"
@@ -732,7 +753,7 @@ msgstr "Код"
 msgid "Collaborate on notebooks with others"
 msgstr "Моля първо създайте тетрадка"
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Collapse"
 msgstr ""
 
@@ -788,7 +809,7 @@ msgid "Compress old changes"
 msgstr ""
 
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:681
-#: packages/app-mobile/components/side-menu-content.tsx:402
+#: packages/app-mobile/components/side-menu-content.tsx:404
 msgid "Configuration"
 msgstr "Настройки"
 
@@ -821,6 +842,10 @@ msgstr "Конфликти"
 msgid "Conflicts (attachments)"
 msgstr "Прикачи файл"
 
+#: packages/lib/utils/joplinCloud.ts:171
+msgid "Consolidated billing"
+msgstr ""
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.tsx:110
 #, fuzzy
 msgid "Content provided by %s"
@@ -836,7 +861,7 @@ msgstr "Конвертиране към задача"
 
 #: packages/app-desktop/gui/MenuBar.tsx:492
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:13
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:782
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:783
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:157
 msgid "Copy"
 msgstr "Копирай"
@@ -878,7 +903,6 @@ msgid_plural "Copy Shareable Links"
 msgstr[0] "Сподели"
 msgstr[1] "Сподели"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:208
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:153
 msgid "Copy token"
 msgstr "Копирай жетона"
@@ -935,7 +959,7 @@ msgid ""
 "again when you are connected to the internet."
 msgstr ""
 
-#: packages/app-desktop/gui/PromptDialog.min.js:235
+#: packages/app-desktop/gui/PromptDialog.tsx:256
 #, fuzzy
 msgid "Create"
 msgstr "Създаден"
@@ -1042,7 +1066,7 @@ msgid "Custom TLS certificates"
 msgstr "Допълнителни TLS сертификати"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:18
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:772
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:773
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:149
 msgid "Cut"
 msgstr "Изрежи"
@@ -1085,7 +1109,7 @@ msgid "Decrypted items: %s / %s"
 msgstr "Декриптирани обекти: %s / %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:734
-#: packages/app-mobile/components/side-menu-content.tsx:411
+#: packages/app-mobile/components/side-menu-content.tsx:413
 msgid "Decrypting items: %d/%d"
 msgstr "Декриптиране на обекти: %d/%d"
 
@@ -1108,7 +1132,7 @@ msgstr "Стойност по подразбиране: %s"
 #: packages/app-mobile/components/ScreenHeader.tsx:415
 #: packages/app-mobile/components/ScreenHeader.tsx:482
 #: packages/app-mobile/components/screens/Note.tsx:960
-#: packages/app-mobile/components/side-menu-content.tsx:153
+#: packages/app-mobile/components/side-menu-content.tsx:155
 msgid "Delete"
 msgstr "Изтрий"
 
@@ -1146,7 +1170,7 @@ msgid "Delete note?"
 msgstr "Да изтрия ли бележката?"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:291
-#: packages/app-mobile/components/side-menu-content.tsx:155
+#: packages/app-mobile/components/side-menu-content.tsx:157
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
@@ -1235,7 +1259,6 @@ msgstr "Изключване на криптирането"
 msgid "Disable safe mode and restart"
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:103
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:102
 msgid "Disable Web Clipper Service"
 msgstr "Спри услугата за уеб-клипера"
@@ -1263,7 +1286,7 @@ msgstr ""
 msgid "Discard changes"
 msgstr "Отхвърли промените"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:451
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:454
 msgid "Dismiss"
 msgstr ""
 
@@ -1344,7 +1367,6 @@ msgstr ""
 msgid "Download"
 msgstr "Свалям ресурси..."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:174
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:140
 msgid "Download and install the relevant extension for your browser:"
 msgstr "Свалете и инсталирате разширението за вашия браузър:"
@@ -1366,7 +1388,7 @@ msgstr ""
 msgid "Downloading"
 msgstr "Свалям ресурси..."
 
-#: packages/app-cli/app/command-sync.ts:236
+#: packages/app-cli/app/command-sync.ts:227
 msgid "Downloading resources..."
 msgstr "Свалям ресурси..."
 
@@ -1374,7 +1396,7 @@ msgstr "Свалям ресурси..."
 msgid "Dracula"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Drop notes or files here"
 msgstr ""
 
@@ -1492,7 +1514,7 @@ msgstr ""
 msgid "Emails"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:195
 #, fuzzy
 msgid "emphasised text"
 msgstr "наблегнат текст"
@@ -1592,7 +1614,6 @@ msgstr "Пусни синтаксис ~ниско~"
 msgid "Enable video player"
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:114
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:113
 msgid "Enable Web Clipper Service"
 msgstr "Пусни услугата за уеб-клипера"
@@ -1621,7 +1642,7 @@ msgstr "Криптирана"
 msgid "Encrypted items cannot be modified"
 msgstr "Криптирани обекти не могат да бъдат променяни"
 
-#: packages/app-mobile/components/side-menu-content.tsx:139
+#: packages/app-mobile/components/side-menu-content.tsx:141
 #, fuzzy
 msgid "Encrypted notebooks cannot be renamed"
 msgstr "Криптирани обекти не могат да бъдат променяни"
@@ -1719,7 +1740,7 @@ msgstr "Evernote експорт файл"
 msgid "Exits the application."
 msgstr "Напуска приложението."
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Expand"
 msgstr ""
 
@@ -1797,7 +1818,7 @@ msgid "Fetched items: %d/%d."
 msgstr "Взети обекти: %d/%d."
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:739
-#: packages/app-mobile/components/side-menu-content.tsx:416
+#: packages/app-mobile/components/side-menu-content.tsx:418
 msgid "Fetching resources: %d/%d"
 msgstr "Взимане на ресурси: %d/%d"
 
@@ -2091,8 +2112,8 @@ msgid ""
 "the attachments are downloaded whether you open the note or not."
 msgstr ""
 "В режим \"Ръчен\" прикачените файлове се свалят само ако натиснете на тях. В "
-"режим \"Автоматичен\" се свалят, когато отворите бележката. В режим \"Винаги"
-"\" се свалят независимо дали отворите бележката или не."
+"режим \"Автоматичен\" се свалят, когато отворите бележката. В режим "
+"\"Винаги\" се свалят независимо дали отворите бележката или не."
 
 #: packages/app-cli/app/command-help.js:77
 msgid ""
@@ -2137,7 +2158,6 @@ msgid ""
 "external storage is required."
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:142
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:130
 msgid "In order to use the web clipper, you need to do the following:"
 msgstr "За да използвате уеб-клипера, трябва да направите следното:"
@@ -2146,7 +2166,7 @@ msgstr "За да използвате уеб-клипера, трябва да
 msgid "In progress"
 msgstr "В момента върви"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:535
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:539
 msgid "In: %s"
 msgstr "В: %s"
 
@@ -2175,7 +2195,7 @@ msgstr ""
 msgid "Insert"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:196
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:197
 msgid "Insert Hyperlink"
 msgstr "Вкарай линк"
 
@@ -2319,7 +2339,6 @@ msgstr "Въведете главната парола:"
 msgid "Joplin Server URL"
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:137
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:129
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
@@ -2382,7 +2401,7 @@ msgstr "Последна грешка: %s"
 msgid "Later"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid "Layout"
 msgstr "Разположеня"
 
@@ -2437,9 +2456,9 @@ msgstr "Линк"
 msgid "Links with protocol \"%s\" are not supported"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:229
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:231
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:230
 #: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:232
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:233
 msgid "List item"
 msgstr "Елемент на списък"
 
@@ -2455,7 +2474,7 @@ msgstr ""
 msgid "Location"
 msgstr "Местоположение"
 
-#: packages/app-cli/app/command-sync.ts:137
+#: packages/app-cli/app/command-sync.ts:128
 msgid ""
 "Lock file is already being hold. If you know that no synchronisation is "
 "taking place, you may delete the lock file at \"%s\" and resume the "
@@ -2510,6 +2529,11 @@ msgstr "Въведете главната парола:"
 msgid "Manage master password..."
 msgstr "Въведете главната парола:"
 
+#: packages/lib/utils/joplinCloud.ts:165
+#, fuzzy
+msgid "Manage multiple users"
+msgstr "Въведете главната парола:"
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx:320
 msgid "Manage your plugins"
 msgstr ""
@@ -2576,6 +2600,11 @@ msgstr "Максимален брой едновременни връзки"
 msgid "Max Item Size"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:117
+#, fuzzy
+msgid "Max note or attachment size"
+msgstr "Прикачи файл"
+
 #: packages/server/src/routes/admin/users.ts:150
 #, fuzzy
 msgid "Max Total Size"
@@ -2594,7 +2623,7 @@ msgstr "Липсващи главни ключове"
 msgid "Missing required argument: %s"
 msgstr "Липсващ задължителен параметър: %s"
 
-#: packages/app-mobile/components/side-menu-content.tsx:437
+#: packages/app-mobile/components/side-menu-content.tsx:439
 msgid "Mobile data - auto-sync disabled"
 msgstr ""
 
@@ -2607,7 +2636,7 @@ msgstr "Още информация"
 msgid "More information"
 msgstr "Още информация"
 
-#: packages/app-cli/app/app.js:63
+#: packages/app-cli/app/app.js:64
 msgid "More than one item match \"%s\". Please narrow down your query."
 msgstr ""
 "Повече от едно нещо съответства на \"%s\". Моля рафинирайте търсенето си."
@@ -2635,11 +2664,12 @@ msgstr "Премести в тетрадка..."
 msgid "Moves the given <item> to [notebook]"
 msgstr "Премества бележките съответстващи на <бележка> в [тетрадка]."
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "n"
 msgstr "н"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "N"
 msgstr "Н"
 
@@ -2653,7 +2683,7 @@ msgstr "Нова бележка"
 msgid "New notebook"
 msgstr "Нова тетрадка"
 
-#: packages/app-mobile/components/side-menu-content.tsx:398
+#: packages/app-mobile/components/side-menu-content.tsx:400
 #, fuzzy
 msgid "New Notebook"
 msgstr "Нова тетрадка"
@@ -2722,11 +2752,11 @@ msgstr "Няма активна тетрадка."
 msgid "No item with ID %s"
 msgstr "Няма обект с идентификатор %s"
 
-#: packages/app-cli/app/app.js:99
+#: packages/app-cli/app/app.js:100
 msgid "No notebook has been specified."
 msgstr "Няма зададени тетрадки."
 
-#: packages/app-cli/app/app.js:93
+#: packages/app-cli/app/app.js:94
 msgid "No notebook selected."
 msgstr "Няма избрани тетрадки."
 
@@ -2743,7 +2773,7 @@ msgstr ""
 msgid "No results"
 msgstr ""
 
-#: packages/app-cli/app/app.js:256
+#: packages/app-cli/app/app.js:224
 msgid "No such command: %s"
 msgstr "Няма такава команда: %s"
 
@@ -2762,7 +2792,7 @@ msgstr ""
 msgid "Nord"
 msgstr ""
 
-#: packages/app-cli/app/command-sync.ts:106
+#: packages/app-cli/app/command-sync.ts:97
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
 "Не сме оторизирани за %s. Моля въведете липсващите оторизационни данни."
@@ -2866,13 +2896,13 @@ msgstr "Тетрадки"
 msgid "Notebook list growth factor"
 msgstr ""
 
-#: packages/app-mobile/components/side-menu-content.tsx:133
+#: packages/app-mobile/components/side-menu-content.tsx:135
 #, fuzzy
 msgid "Notebook: %s"
 msgstr "Тетрадки"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:691
-#: packages/app-mobile/components/side-menu-content.tsx:457
+#: packages/app-mobile/components/side-menu-content.tsx:459
 msgid "Notebooks"
 msgstr "Тетрадки"
 
@@ -2902,15 +2932,14 @@ msgstr "Номериран списък"
 #: packages/app-desktop/bridge.ts:190 packages/app-desktop/bridge.ts:196
 #: packages/app-desktop/bridge.ts:217 packages/app-desktop/bridge.ts:227
 #: packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx:28
-#: packages/app-desktop/gui/DialogButtonRow.min.js:30
 #: packages/app-desktop/gui/DialogButtonRow.tsx:70
 #: packages/app-desktop/gui/MenuBar.tsx:492
-#: packages/app-desktop/gui/PromptDialog.min.js:242
+#: packages/app-desktop/gui/PromptDialog.tsx:263
 #: packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx:26
 #: packages/app-mobile/components/CameraView.tsx:190
 #: packages/app-mobile/components/ModalDialog.js:67
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:203
-#: packages/app-mobile/components/side-menu-content.tsx:157
+#: packages/app-mobile/components/side-menu-content.tsx:159
 msgid "OK"
 msgstr "Добре"
 
@@ -3046,7 +3075,7 @@ msgid "Passwords do not match!"
 msgstr "Паролата не може да е празна"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:23
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:792
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:793
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:164
 msgid "Paste"
 msgstr "Постави"
@@ -3060,6 +3089,10 @@ msgstr ""
 msgid "PDF File"
 msgstr "PDF файл"
 
+#: packages/lib/utils/joplinCloud.ts:355
+msgid "Per user. Minimum of %d users."
+msgstr ""
+
 #: packages/app-mobile/components/screens/Note.tsx:403
 #, fuzzy
 msgid "Permission needed"
@@ -3131,7 +3164,7 @@ msgstr "Моля задайте тетрадка, в която да бъдат
 msgid "Please upgrade Joplin to use this plugin"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid ""
 "Please wait for all attachments to be downloaded and decrypted. You may also "
 "switch to %s to edit the note."
@@ -3212,10 +3245,18 @@ msgstr "Предишни версии на бележката"
 msgid "Print"
 msgstr "Принтиране"
 
+#: packages/lib/utils/joplinCloud.ts:183
+msgid "Priority support"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:655
 msgid "Privacy Policy"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:316
+msgid "Pro"
+msgstr ""
+
 #: packages/server/src/services/TaskService.ts:24
 msgid "Process failed payment subscriptions"
 msgstr ""
@@ -3274,6 +3315,7 @@ msgid "Publish Notes"
 msgstr ""
 
 #: packages/app-desktop/gui/SyncWizard/Dialog.tsx:178
+#: packages/lib/utils/joplinCloud.ts:141
 msgid "Publish notes to the internet"
 msgstr ""
 
@@ -3297,7 +3339,7 @@ msgstr "Криптирането е:"
 msgid "Re-upload local data to sync target"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:450
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:453
 msgid "Read more about it"
 msgstr ""
 
@@ -3357,7 +3399,7 @@ msgstr "Да премахна ли това търсене от страничн
 
 #: packages/app-desktop/gui/MainScreen/commands/renameFolder.ts:8
 #: packages/app-desktop/gui/MainScreen/commands/renameTag.ts:8
-#: packages/app-mobile/components/side-menu-content.tsx:136
+#: packages/app-mobile/components/side-menu-content.tsx:138
 msgid "Rename"
 msgstr "Преименувай"
 
@@ -3373,7 +3415,6 @@ msgstr "Преименуване на таг:"
 msgid "Renames the given <item> (note or notebook) to <name>."
 msgstr "Преименува дадения <обект> (бележка или тетрадка) на <име>."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:222
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:159
 msgid "Renew token"
 msgstr ""
@@ -3549,7 +3590,7 @@ msgstr "Търсене:"
 
 #: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:167
 #: packages/app-desktop/gui/lib/SearchInput/SearchInput.tsx:65
-#: packages/app-desktop/gui/NoteSearchBar.min.js:165
+#: packages/app-desktop/gui/NoteSearchBar.min.js:164
 msgid "Search..."
 msgstr "Търсене..."
 
@@ -3632,6 +3673,11 @@ msgstr ""
 msgid "Share"
 msgstr "Сподели"
 
+#: packages/lib/utils/joplinCloud.ts:159
+#, fuzzy
+msgid "Share and collaborate on a notebook"
+msgstr "Бележки могат да бъдат създавани само в тетрадка."
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:339
 #, fuzzy
 msgid "Share Notebook"
@@ -3642,6 +3688,10 @@ msgstr "Възстановени бележки"
 msgid "Share notebook..."
 msgstr "Възстановени бележки"
 
+#: packages/lib/utils/joplinCloud.ts:177
+msgid "Sharing access control"
+msgstr ""
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:305
 #, fuzzy
 msgid "Sharing notebook..."
@@ -3809,7 +3859,7 @@ msgstr ""
 "Започвам да декриптирам... Моля изчакайте, защото това може да отнеме "
 "няколко минути, в зависимост от колко има за декриптиране."
 
-#: packages/app-cli/app/command-sync.ts:213
+#: packages/app-cli/app/command-sync.ts:204
 msgid "Starting synchronisation..."
 msgstr "Започвам синхронизация..."
 
@@ -3833,34 +3883,30 @@ msgstr ""
 msgid "Status"
 msgstr "Статус"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:97
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:96
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:91
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:90
 msgid "Status: Started on port %d"
 msgstr "Статус: Стартирано на порт %d"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:150
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:133
 msgid "Step 1: Enable the clipper service"
 msgstr "1ва стъпка: Пуснете услугата на клипера"
 
-#: packages/app-cli/app/command-sync.ts:92
+#: packages/app-cli/app/command-sync.ts:83
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:46
 #: packages/app-mobile/components/screens/dropbox-login.js:59
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr "1ва стъпка: Отворете този адрес в браузър и оторизирайте приложението:"
 
-#: packages/app-cli/app/command-sync.ts:94
+#: packages/app-cli/app/command-sync.ts:85
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:50
 #: packages/app-mobile/components/screens/dropbox-login.js:65
 msgid "Step 2: Enter the code provided by Dropbox:"
 msgstr "2ра стъпка: Въведете кода предоставен от Dropbox:"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:169
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:139
 msgid "Step 2: Install the extension"
 msgstr "2ра стъпка: Инсталирайте браузърско разширение"
@@ -3874,11 +3920,15 @@ msgstr ""
 msgid "Stop external editing"
 msgstr "Натиснете за да спрете външното редактиране"
 
+#: packages/lib/utils/joplinCloud.ts:129
+msgid "Storage space"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:19
 msgid "Strikethrough"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:193
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
 msgid "strong text"
 msgstr "силно наблегнат текст"
 
@@ -3939,6 +3989,10 @@ msgstr ""
 "Превключва на [тетрадка] - всички нататъчни команди ще се извършват в тази "
 "тетрадка."
 
+#: packages/lib/utils/joplinCloud.ts:147
+msgid "Sync as many devices as you want"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:564
 #, fuzzy
 msgid "Sync Status"
@@ -3948,7 +4002,7 @@ msgstr "Статус"
 msgid "Sync status (synced items / total items)"
 msgstr "Статус на синхронизацията (синхронизирани / всички)"
 
-#: packages/app-cli/app/command-sync.ts:251
+#: packages/app-cli/app/command-sync.ts:242
 msgid "Sync target must be upgraded! Run `%s` to proceed."
 msgstr ""
 
@@ -3980,7 +4034,7 @@ msgstr "Синхронизация"
 msgid "Synchronisation interval"
 msgstr "Интервал на синхронизация"
 
-#: packages/app-cli/app/command-sync.ts:132
+#: packages/app-cli/app/command-sync.ts:123
 msgid "Synchronisation is already in progress."
 msgstr "Вече се извършва синхронизация."
 
@@ -3993,12 +4047,12 @@ msgstr "Статус на синхронизацията"
 msgid "Synchronisation target"
 msgstr "Цел за синхронизация"
 
-#: packages/app-cli/app/command-sync.ts:180
+#: packages/app-cli/app/command-sync.ts:171
 msgid "Synchronisation target: %s (%s)"
 msgstr "Цел за синхронизация: %s (%s)"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/commands/synchronize.ts:8
 msgid "Synchronise"
 msgstr "Синхронизация"
@@ -4038,7 +4092,7 @@ msgstr "Тагнати: %d."
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:715
 #: packages/app-mobile/components/screens/Note.tsx:933
 #: packages/app-mobile/components/screens/tags.js:101
-#: packages/app-mobile/components/side-menu-content.tsx:400
+#: packages/app-mobile/components/side-menu-content.tsx:402
 msgid "Tags"
 msgstr "Тагове"
 
@@ -4056,6 +4110,10 @@ msgstr "Създава нова тетрадка."
 msgid "Tasks"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:338
+msgid "Teams"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1343
 msgid "Text editor command"
 msgstr "Команда за стартиране на текстов редактор"
@@ -4091,13 +4149,13 @@ msgstr "Приложението бе успешно оторизирано."
 msgid "The application must be restarted for these changes to take effect."
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:522
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:526
 msgid ""
 "The attachments will no longer be watched when you switch to a different "
 "note."
 msgstr ""
 
-#: packages/app-cli/app/app.js:304
+#: packages/app-cli/app/app.js:272
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "Командата \"%s\" е приложима само в графичен режим"
 
@@ -4138,7 +4196,7 @@ msgid ""
 "factor of 1.Restart app to see changes."
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:521
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:525
 msgid "The following attachments are being watched for changes:"
 msgstr ""
 
@@ -4236,14 +4294,12 @@ msgstr ""
 msgid "The Web Clipper needs your authorisation to access your data."
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:84
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:84
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 "Услугата за уеб-клипера бе включена и конфигурирана да се стартира "
 "автоматично."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:109
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:108
 msgid "The web clipper service is not enabled."
 msgstr "Услугата за уеб-клипера не е пусната."
@@ -4317,7 +4373,6 @@ msgstr "Прикаченият файл не е свален или все ощ
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Прикаченият файл не е свален или все още не е декриптиран."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:214
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:156
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
@@ -4341,7 +4396,7 @@ msgstr "Тази бележка няма информация за геолок
 msgid "This note has been modified:"
 msgstr "Тази бележка беше променена:"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
 "note."
@@ -4353,13 +4408,12 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Тази бележка няма история"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:449
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:452
 msgid ""
 "This Rich Text editor has a number of limitations and it is recommended to "
 "be aware of them before using it."
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:155
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:134
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
@@ -4404,7 +4458,7 @@ msgstr "заглавие"
 msgid "Title"
 msgstr "заглавие"
 
-#: packages/app-cli/app/command-sync.ts:91
+#: packages/app-cli/app/command-sync.ts:82
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:45
 #: packages/app-mobile/components/screens/dropbox-login.js:58
 msgid ""
@@ -4517,7 +4571,6 @@ msgstr "Страничен панел"
 msgid "Toggle sort order field"
 msgstr "Страничен панел"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:40
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:41
 msgid "Token has been copied to the clipboard!"
 msgstr "Жетона бе копиран в клипборда!"
@@ -4539,6 +4592,11 @@ msgstr "Общо: %d/%d"
 msgid "Try again"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:309 packages/lib/utils/joplinCloud.ts:331
+#: packages/lib/utils/joplinCloud.ts:353
+msgid "Try it now"
+msgstr ""
+
 #: packages/app-cli/app/command-help.js:71
 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
@@ -4614,7 +4672,7 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Този тип изображения не се поддържа: %s"
 
-#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:35
+#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:40
 #: packages/app-desktop/gui/NoteRevisionViewer.min.js:142
 msgid "Unsupported link or message: %s"
 msgstr "Неподдържан линк или съобщение: %s"
@@ -4791,7 +4849,7 @@ msgstr ""
 msgid "Warning: not all resources shown for performance reasons (limit: %s)."
 msgstr ""
 
-#: packages/lib/models/Setting.ts:2408
+#: packages/lib/models/Setting.ts:2408 packages/lib/utils/joplinCloud.ts:153
 #, fuzzy
 msgid "Web Clipper"
 msgstr "Настройки на уеб клипера"
@@ -4846,11 +4904,12 @@ msgstr "Когато се създава нова задача:"
 msgid "Words"
 msgstr ""
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "y"
 msgstr "д"
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "Y"
 msgstr "Д"
 
@@ -4904,7 +4963,7 @@ msgstr ""
 msgid "Your password is needed to decrypt some of your data."
 msgstr ""
 
-#: packages/app-cli/app/command-sync.ts:242
+#: packages/app-cli/app/command-sync.ts:233
 msgid ""
 "Your password is needed to decrypt some of your data. Type `:e2ee decrypt` "
 "to set it."

packages/tools/locales/bs_BA.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:609
 msgid "- Camera: to allow taking a picture and attaching it to a note."
@@ -92,6 +92,16 @@ msgstr "Prikaz"
 msgid "%d days"
 msgstr "%d dana"
 
+#: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137
+#: packages/lib/utils/joplinCloud.ts:138
+msgid "%d GB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134
+#: packages/lib/utils/joplinCloud.ts:135
+msgid "%d GB storage space"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1322
 msgid "%d hour"
 msgstr "%d sat"
@@ -100,6 +110,17 @@ msgstr "%d sat"
 msgid "%d hours"
 msgstr "%d sati"
 
+#: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125
+#: packages/lib/utils/joplinCloud.ts:126
+msgid "%d MB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122
+#: packages/lib/utils/joplinCloud.ts:123
+#, fuzzy
+msgid "%d MB per note or attachment"
+msgstr "Priložene bilješke"
+
 #: packages/lib/models/Setting.ts:1319 packages/lib/models/Setting.ts:1320
 #: packages/lib/models/Setting.ts:1321
 msgid "%d minutes"
@@ -294,7 +315,6 @@ msgstr ""
 msgid "Admin dashboard"
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:189
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:148
 msgid "Advanced options"
 msgstr "Napredne opcije"
@@ -306,7 +326,7 @@ msgstr "Napredne opcije"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:485
 #: packages/app-mobile/components/screens/notes.js:191
-#: packages/app-mobile/components/side-menu-content.tsx:453
+#: packages/app-mobile/components/side-menu-content.tsx:455
 msgid "All notes"
 msgstr "Sve bilješke"
 
@@ -335,8 +355,8 @@ msgstr ""
 
 #: packages/app-cli/app/command-mv.js:29
 msgid ""
-"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
-"\" to see the short notebook id"
+"Ambiguous notebook \"%s\". Please use short notebook id instead - press "
+"\"ti\" to see the short notebook id"
 msgstr ""
 
 #: packages/app-desktop/checkForUpdates.ts:197
@@ -355,7 +375,6 @@ msgstr "Aplikacija"
 msgid "Apply"
 msgstr "Primijeni"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:44
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:45
 msgid "Are you sure you want to renew the authorisation token?"
 msgstr ""
@@ -426,14 +445,13 @@ msgstr ""
 "sinhronizacije kopirate sav sadržaj jer će, u protivnom, sve datoteke biti "
 "uklonjene! Za više detalja vidjeti često postavljana pitanja (FAQ): %s"
 
-#: packages/app-cli/app/command-sync.ts:82
-#: packages/app-cli/app/command-sync.ts:96
+#: packages/app-cli/app/command-sync.ts:73
+#: packages/app-cli/app/command-sync.ts:87
 #: packages/app-desktop/gui/OneDriveLoginScreen.tsx:45
 msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "Ovjera nije završena (nije primljena potvrda /token/)."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:194
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:149
 msgid "Authorisation token:"
 msgstr "Token za ovjeru:"
@@ -467,6 +485,10 @@ msgstr "Automatski podesi temu prema sistemskoj"
 msgid "Back"
 msgstr "Nazad"
 
+#: packages/lib/utils/joplinCloud.ts:294
+msgid "Basic"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33
 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132
 msgid "Bold"
@@ -493,11 +515,10 @@ msgstr "Podijeli"
 #: packages/app-desktop/bridge.ts:196 packages/app-desktop/bridge.ts:217
 #: packages/app-desktop/checkForUpdates.ts:199
 #: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:728
-#: packages/app-desktop/gui/DialogButtonRow.min.js:38
 #: packages/app-desktop/gui/DialogButtonRow.tsx:78
 #: packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx:82
 #: packages/app-desktop/gui/NoteList/NoteList.tsx:168
-#: packages/app-desktop/gui/PromptDialog.min.js:249
+#: packages/app-desktop/gui/PromptDialog.tsx:270
 #: packages/app-desktop/gui/ResourceScreen.tsx:170
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:318
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
@@ -509,14 +530,14 @@ msgstr "Podijeli"
 #: packages/app-mobile/components/screens/Note.tsx:104
 #: packages/app-mobile/components/screens/Note.tsx:586
 #: packages/app-mobile/components/SelectDateTimeDialog.tsx:152
-#: packages/app-mobile/components/side-menu-content.tsx:163
-#: packages/app-mobile/components/side-menu-content.tsx:172
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:165
+#: packages/app-mobile/components/side-menu-content.tsx:174
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/shim-init-node.js:196
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: packages/app-cli/app/app.js:171
+#: packages/app-cli/app/app.js:138
 msgid "Cancelling background synchronisation... Please wait."
 msgstr "Prekidam sinhronizaciju... Pričekajte."
 
@@ -524,7 +545,7 @@ msgstr "Prekidam sinhronizaciju... Pričekajte."
 msgid "Cancelling..."
 msgstr "Prekidam..."
 
-#: packages/app-cli/app/command-sync.ts:269
+#: packages/app-cli/app/command-sync.ts:260
 msgid "Cancelling... Please wait."
 msgstr "Prekidam... Pričekajte."
 
@@ -532,7 +553,7 @@ msgstr "Prekidam... Pričekajte."
 msgid "Cannot access %s"
 msgstr "Ne mogu pristupiti %s"
 
-#: packages/app-cli/app/base-command.js:15
+#: packages/app-cli/app/base-command.ts:15
 msgid "Cannot change encrypted item"
 msgstr "Nije moguće promijeniti šifriranu stavku"
 
@@ -568,7 +589,7 @@ msgstr "Bilješka se ne može kopirati u bilježnicu \"%s\""
 msgid "Cannot find \"%s\"."
 msgstr "Ne mogu pronaći \"%s\"."
 
-#: packages/app-cli/app/command-sync.ts:182
+#: packages/app-cli/app/command-sync.ts:173
 #, fuzzy
 msgid "Cannot initialise synchroniser."
 msgstr "Sinhronizovanje se ne može započeti."
@@ -669,7 +690,7 @@ msgid "Chrome Web Store"
 msgstr "Chrome Web Store"
 
 #: packages/app-desktop/gui/EditFolderDialog/Dialog.tsx:146
-#: packages/app-desktop/gui/PromptDialog.min.js:256
+#: packages/app-desktop/gui/PromptDialog.tsx:277
 msgid "Clear"
 msgstr "Počisti"
 
@@ -685,7 +706,7 @@ msgstr ""
 "Pritisnite na \"%s\" da rekonstruišete bilješku. Rezultat će biti kopiran u "
 "bilježnicu \"%s\". Trenutna verzija bilješke ostat će netaknuta."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:384
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:387
 #, fuzzy
 msgid "Click to add tags..."
 msgstr "Provjeri ažuriranja..."
@@ -720,7 +741,7 @@ msgstr "Kōd"
 msgid "Code Block"
 msgstr "Kōd (izdvojen)"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 #, fuzzy
 msgid "Code View"
 msgstr "Kōd"
@@ -730,7 +751,7 @@ msgstr "Kōd"
 msgid "Collaborate on notebooks with others"
 msgstr "Prvo kreirajte bilježnicu"
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Collapse"
 msgstr ""
 
@@ -786,7 +807,7 @@ msgid "Compress old changes"
 msgstr ""
 
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:681
-#: packages/app-mobile/components/side-menu-content.tsx:402
+#: packages/app-mobile/components/side-menu-content.tsx:404
 msgid "Configuration"
 msgstr "Konfiguracija"
 
@@ -819,6 +840,10 @@ msgstr "Sukobi"
 msgid "Conflicts (attachments)"
 msgstr "Priložene bilješke"
 
+#: packages/lib/utils/joplinCloud.ts:171
+msgid "Consolidated billing"
+msgstr ""
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.tsx:110
 #, fuzzy
 msgid "Content provided by %s"
@@ -834,7 +859,7 @@ msgstr "Preinači u zadatak"
 
 #: packages/app-desktop/gui/MenuBar.tsx:492
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:13
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:782
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:783
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:157
 msgid "Copy"
 msgstr "Kopiraj"
@@ -877,7 +902,6 @@ msgstr[0] "Dijeli vezu"
 msgstr[1] "Dijeli veze"
 msgstr[2] "Dijeli veze"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:208
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:153
 msgid "Copy token"
 msgstr "Kopiraj token"
@@ -943,7 +967,7 @@ msgid ""
 "again when you are connected to the internet."
 msgstr ""
 
-#: packages/app-desktop/gui/PromptDialog.min.js:235
+#: packages/app-desktop/gui/PromptDialog.tsx:256
 #, fuzzy
 msgid "Create"
 msgstr "Kreirano"
@@ -1049,7 +1073,7 @@ msgid "Custom TLS certificates"
 msgstr "TLS certifikati"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:18
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:772
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:773
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:149
 msgid "Cut"
 msgstr "Izreži"
@@ -1092,7 +1116,7 @@ msgid "Decrypted items: %s / %s"
 msgstr "Dešifrovane stavke: %s / %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:734
-#: packages/app-mobile/components/side-menu-content.tsx:411
+#: packages/app-mobile/components/side-menu-content.tsx:413
 msgid "Decrypting items: %d/%d"
 msgstr "Dešifrujem stavke: %d/%d"
 
@@ -1115,7 +1139,7 @@ msgstr "Prekonfigurisano: %s"
 #: packages/app-mobile/components/ScreenHeader.tsx:415
 #: packages/app-mobile/components/ScreenHeader.tsx:482
 #: packages/app-mobile/components/screens/Note.tsx:960
-#: packages/app-mobile/components/side-menu-content.tsx:153
+#: packages/app-mobile/components/side-menu-content.tsx:155
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -1153,7 +1177,7 @@ msgid "Delete note?"
 msgstr "Izbrisati bilješku?"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:291
-#: packages/app-mobile/components/side-menu-content.tsx:155
+#: packages/app-mobile/components/side-menu-content.tsx:157
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
@@ -1242,7 +1266,6 @@ msgstr "Isključi šifriranje"
 msgid "Disable safe mode and restart"
 msgstr " "
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:103
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:102
 msgid "Disable Web Clipper Service"
 msgstr "Isključi Web clipper servis"
@@ -1269,7 +1292,7 @@ msgstr ""
 msgid "Discard changes"
 msgstr "Odbaci izmjene"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:451
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:454
 msgid "Dismiss"
 msgstr "Odbaci"
 
@@ -1350,7 +1373,6 @@ msgstr ""
 msgid "Download"
 msgstr "Preuzeto"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:174
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:140
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
@@ -1373,7 +1395,7 @@ msgstr "Preuzeto i šifrirano"
 msgid "Downloading"
 msgstr "Preuzimam resurse..."
 
-#: packages/app-cli/app/command-sync.ts:236
+#: packages/app-cli/app/command-sync.ts:227
 msgid "Downloading resources..."
 msgstr "Preuzimam resurse..."
 
@@ -1381,7 +1403,7 @@ msgstr "Preuzimam resurse..."
 msgid "Dracula"
 msgstr "Dracula"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Drop notes or files here"
 msgstr "Ispustite bilješke ili datoteke ovdje"
 
@@ -1498,7 +1520,7 @@ msgstr ""
 msgid "Emails"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:195
 #, fuzzy
 msgid "emphasised text"
 msgstr "naglašeni tekst"
@@ -1597,7 +1619,6 @@ msgstr "Omogući tipografsku podršku"
 msgid "Enable video player"
 msgstr "Omogući video"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:114
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:113
 msgid "Enable Web Clipper Service"
 msgstr "Aktiviraj Web clipper servis"
@@ -1625,7 +1646,7 @@ msgstr "Šifrirano"
 msgid "Encrypted items cannot be modified"
 msgstr "Šifrirane stavke ne mogu se mijenjati"
 
-#: packages/app-mobile/components/side-menu-content.tsx:139
+#: packages/app-mobile/components/side-menu-content.tsx:141
 msgid "Encrypted notebooks cannot be renamed"
 msgstr "Šifrirane bilježnice ne mogu se preimenovati"
 
@@ -1717,7 +1738,7 @@ msgstr "Evernote datoteka za prenos (kao Markdown)"
 msgid "Exits the application."
 msgstr "Zatvara aplikaciju."
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Expand"
 msgstr ""
 
@@ -1798,7 +1819,7 @@ msgid "Fetched items: %d/%d."
 msgstr "Preuzeto stavki: %d/%d."
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:739
-#: packages/app-mobile/components/side-menu-content.tsx:416
+#: packages/app-mobile/components/side-menu-content.tsx:418
 msgid "Fetching resources: %d/%d"
 msgstr "Preuzimam resurse: %d/%d"
 
@@ -2101,8 +2122,8 @@ msgid ""
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
 "U svakoj komandi, bilješka ili bilježnica mogu se precizirati pomoću naziva "
-"ili identifikacijskog broja, odnosno pomoću kratica za naziv `$n` i broj `"
-"$b` trenutno označene bilješke ili bilježnice. `$c` se može koristiti za "
+"ili identifikacijskog broja, odnosno pomoću kratica za naziv `$n` i broj "
+"`$b` trenutno označene bilješke ili bilježnice. `$c` se može koristiti za "
 "trenutno označenu stavku."
 
 #: packages/app-mobile/components/screens/Note.tsx:402
@@ -2156,7 +2177,6 @@ msgstr ""
 "Potrebno je Vaše dopuštenje za pristup eksternim uređajima za pohranu kako "
 "bi se mogla izvršiti sinhronizacija."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:142
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:130
 msgid "In order to use the web clipper, you need to do the following:"
 msgstr "Da biste mogli koristiti Web clipper, učinite sljedeće:"
@@ -2165,7 +2185,7 @@ msgstr "Da biste mogli koristiti Web clipper, učinite sljedeće:"
 msgid "In progress"
 msgstr "U toku"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:535
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:539
 msgid "In: %s"
 msgstr "U: %s"
 
@@ -2194,7 +2214,7 @@ msgstr "Kōd (unutar teksta)"
 msgid "Insert"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:196
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:197
 msgid "Insert Hyperlink"
 msgstr "Unesi poveznicu"
 
@@ -2335,7 +2355,6 @@ msgstr "Unesite glavnu lozinku:"
 msgid "Joplin Server URL"
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:137
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:129
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
@@ -2401,7 +2420,7 @@ msgstr "Zadnja greška: %s"
 msgid "Later"
 msgstr "Poslije"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid "Layout"
 msgstr "Prikaz"
 
@@ -2457,9 +2476,9 @@ msgstr "Veza"
 msgid "Links with protocol \"%s\" are not supported"
 msgstr "Veze sa protokolom \"%s\" nisu podržane"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:229
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:231
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:230
 #: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:232
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:233
 msgid "List item"
 msgstr "Stavka nabrajanja"
 
@@ -2476,7 +2495,7 @@ msgstr "Preuzeto"
 msgid "Location"
 msgstr "Lokacija"
 
-#: packages/app-cli/app/command-sync.ts:137
+#: packages/app-cli/app/command-sync.ts:128
 msgid ""
 "Lock file is already being hold. If you know that no synchronisation is "
 "taking place, you may delete the lock file at \"%s\" and resume the "
@@ -2531,6 +2550,11 @@ msgstr "Unesite glavnu lozinku:"
 msgid "Manage master password..."
 msgstr "Unesite glavnu lozinku:"
 
+#: packages/lib/utils/joplinCloud.ts:165
+#, fuzzy
+msgid "Manage multiple users"
+msgstr "Unesite glavnu lozinku:"
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx:320
 msgid "Manage your plugins"
 msgstr ""
@@ -2599,6 +2623,11 @@ msgstr "Maksimalni broj istovremenih konekcija"
 msgid "Max Item Size"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:117
+#, fuzzy
+msgid "Max note or attachment size"
+msgstr "Priložene bilješke"
+
 #: packages/server/src/routes/admin/users.ts:150
 #, fuzzy
 msgid "Max Total Size"
@@ -2617,7 +2646,7 @@ msgstr "Nedostaju glavni ključevi"
 msgid "Missing required argument: %s"
 msgstr "Nedostaje neophodni argument: %s"
 
-#: packages/app-mobile/components/side-menu-content.tsx:437
+#: packages/app-mobile/components/side-menu-content.tsx:439
 msgid "Mobile data - auto-sync disabled"
 msgstr "Mobilna mreza - auto-sinhronacija iskljucena"
 
@@ -2630,7 +2659,7 @@ msgstr "Više informacija"
 msgid "More information"
 msgstr "Više informacija"
 
-#: packages/app-cli/app/app.js:63
+#: packages/app-cli/app/app.js:64
 msgid "More than one item match \"%s\". Please narrow down your query."
 msgstr "Više od jednog rezultata odgovara \"%s\". Molimo suzite obim pretrage."
 
@@ -2657,11 +2686,12 @@ msgstr "Premjestiti u bilježnicu..."
 msgid "Moves the given <item> to [notebook]"
 msgstr "Premješta bilješke <note> u [notebook]."
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "n"
 msgstr "n"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "N"
 msgstr "N"
 
@@ -2675,7 +2705,7 @@ msgstr "Nova bilješka"
 msgid "New notebook"
 msgstr "Nova bilježnica"
 
-#: packages/app-mobile/components/side-menu-content.tsx:398
+#: packages/app-mobile/components/side-menu-content.tsx:400
 msgid "New Notebook"
 msgstr "Nova bilježnica"
 
@@ -2743,11 +2773,11 @@ msgstr "Nema aktivne bilježnice."
 msgid "No item with ID %s"
 msgstr "Nema stavke čiji je ID %s"
 
-#: packages/app-cli/app/app.js:99
+#: packages/app-cli/app/app.js:100
 msgid "No notebook has been specified."
 msgstr "Nije precizirana bilježnica."
 
-#: packages/app-cli/app/app.js:93
+#: packages/app-cli/app/app.js:94
 msgid "No notebook selected."
 msgstr "Nije odabrana bilježnica."
 
@@ -2764,7 +2794,7 @@ msgstr "Nema resursa!"
 msgid "No results"
 msgstr "Nema resursa!"
 
-#: packages/app-cli/app/app.js:256
+#: packages/app-cli/app/app.js:224
 msgid "No such command: %s"
 msgstr "Nepostojeća komanda: %s"
 
@@ -2783,7 +2813,7 @@ msgstr ""
 msgid "Nord"
 msgstr "Nord"
 
-#: packages/app-cli/app/command-sync.ts:106
+#: packages/app-cli/app/command-sync.ts:97
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr "Nije ovjereno sa %s. Molimo unesite podatke koji nedostaju."
 
@@ -2891,12 +2921,12 @@ msgstr "Bilježnice"
 msgid "Notebook list growth factor"
 msgstr "Faktor rasta popisa bilježnica"
 
-#: packages/app-mobile/components/side-menu-content.tsx:133
+#: packages/app-mobile/components/side-menu-content.tsx:135
 msgid "Notebook: %s"
 msgstr "Bilježnica: %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:691
-#: packages/app-mobile/components/side-menu-content.tsx:457
+#: packages/app-mobile/components/side-menu-content.tsx:459
 msgid "Notebooks"
 msgstr "Bilježnice"
 
@@ -2926,15 +2956,14 @@ msgstr "Numerisano nabrajanje"
 #: packages/app-desktop/bridge.ts:190 packages/app-desktop/bridge.ts:196
 #: packages/app-desktop/bridge.ts:217 packages/app-desktop/bridge.ts:227
 #: packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx:28
-#: packages/app-desktop/gui/DialogButtonRow.min.js:30
 #: packages/app-desktop/gui/DialogButtonRow.tsx:70
 #: packages/app-desktop/gui/MenuBar.tsx:492
-#: packages/app-desktop/gui/PromptDialog.min.js:242
+#: packages/app-desktop/gui/PromptDialog.tsx:263
 #: packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx:26
 #: packages/app-mobile/components/CameraView.tsx:190
 #: packages/app-mobile/components/ModalDialog.js:67
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:203
-#: packages/app-mobile/components/side-menu-content.tsx:157
+#: packages/app-mobile/components/side-menu-content.tsx:159
 msgid "OK"
 msgstr "Uredu"
 
@@ -3069,7 +3098,7 @@ msgid "Passwords do not match!"
 msgstr "Lozinke se ne podudaraju!"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:23
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:792
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:793
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:164
 msgid "Paste"
 msgstr "Zalijepi"
@@ -3083,6 +3112,10 @@ msgstr ""
 msgid "PDF File"
 msgstr "PDF datoteka"
 
+#: packages/lib/utils/joplinCloud.ts:355
+msgid "Per user. Minimum of %d users."
+msgstr ""
+
 #: packages/app-mobile/components/screens/Note.tsx:403
 #, fuzzy
 msgid "Permission needed"
@@ -3156,7 +3189,7 @@ msgstr "Navedite bilježnicu u koju će se bilješke unijeti."
 msgid "Please upgrade Joplin to use this plugin"
 msgstr "Molimo dogradite Joplin da bi koristili ovaj dodatak"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid ""
 "Please wait for all attachments to be downloaded and decrypted. You may also "
 "switch to %s to edit the note."
@@ -3239,10 +3272,18 @@ msgstr "Ranije verzije ove bilješke"
 msgid "Print"
 msgstr "Štampaj"
 
+#: packages/lib/utils/joplinCloud.ts:183
+msgid "Priority support"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:655
 msgid "Privacy Policy"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:316
+msgid "Pro"
+msgstr ""
+
 #: packages/server/src/services/TaskService.ts:24
 msgid "Process failed payment subscriptions"
 msgstr ""
@@ -3300,6 +3341,7 @@ msgid "Publish Notes"
 msgstr ""
 
 #: packages/app-desktop/gui/SyncWizard/Dialog.tsx:178
+#: packages/lib/utils/joplinCloud.ts:141
 msgid "Publish notes to the internet"
 msgstr ""
 
@@ -3323,7 +3365,7 @@ msgstr "Šifriranje"
 msgid "Re-upload local data to sync target"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:450
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:453
 msgid "Read more about it"
 msgstr "Saznajte vise"
 
@@ -3383,7 +3425,7 @@ msgstr "Ukloniti ovu pretragu iz pomoćnog menija?"
 
 #: packages/app-desktop/gui/MainScreen/commands/renameFolder.ts:8
 #: packages/app-desktop/gui/MainScreen/commands/renameTag.ts:8
-#: packages/app-mobile/components/side-menu-content.tsx:136
+#: packages/app-mobile/components/side-menu-content.tsx:138
 msgid "Rename"
 msgstr "Preimenuj"
 
@@ -3399,7 +3441,6 @@ msgstr "Preimenujte oznaku:"
 msgid "Renames the given <item> (note or notebook) to <name>."
 msgstr "Mijenja naziv <item> (bilješka ili bilježnica) u <name>."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:222
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:159
 msgid "Renew token"
 msgstr "Preuzmi token"
@@ -3577,7 +3618,7 @@ msgstr "Pretraživanje:"
 
 #: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:167
 #: packages/app-desktop/gui/lib/SearchInput/SearchInput.tsx:65
-#: packages/app-desktop/gui/NoteSearchBar.min.js:165
+#: packages/app-desktop/gui/NoteSearchBar.min.js:164
 msgid "Search..."
 msgstr "Pretraživanje..."
 
@@ -3661,6 +3702,11 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
+#: packages/lib/utils/joplinCloud.ts:159
+#, fuzzy
+msgid "Share and collaborate on a notebook"
+msgstr "Bilješke se mogu kreirati samo unutar bilježnice."
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:339
 #, fuzzy
 msgid "Share Notebook"
@@ -3671,6 +3717,10 @@ msgstr "Podijeli bilješke"
 msgid "Share notebook..."
 msgstr "Podijeli bilješku..."
 
+#: packages/lib/utils/joplinCloud.ts:177
+msgid "Sharing access control"
+msgstr ""
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:305
 #, fuzzy
 msgid "Sharing notebook..."
@@ -3845,7 +3895,7 @@ msgstr ""
 "Počinjem sa dešifrovanjem... Molim Vas da pričekate, jer proces može trajati "
 "nekoliko minuta, zavisno od količine podataka koje treba dešifrovati."
 
-#: packages/app-cli/app/command-sync.ts:213
+#: packages/app-cli/app/command-sync.ts:204
 msgid "Starting synchronisation..."
 msgstr "Započinjem sinhronizovanje..."
 
@@ -3867,22 +3917,19 @@ msgstr "Statistika..."
 msgid "Status"
 msgstr "Status"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:97
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:96
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:91
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:90
 msgid "Status: Started on port %d"
 msgstr "Status: pokrenut preko porta %d"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:150
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:133
 msgid "Step 1: Enable the clipper service"
 msgstr "Korak 1: aktivirajte clipper servis"
 
-#: packages/app-cli/app/command-sync.ts:92
+#: packages/app-cli/app/command-sync.ts:83
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:46
 #: packages/app-mobile/components/screens/dropbox-login.js:59
 msgid "Step 1: Open this URL in your browser to authorise the application:"
@@ -3890,13 +3937,12 @@ msgstr ""
 "Korak 1: otvorite ovu adresu u Vašem internet pregledniku i ovjerite "
 "aplikaciju:"
 
-#: packages/app-cli/app/command-sync.ts:94
+#: packages/app-cli/app/command-sync.ts:85
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:50
 #: packages/app-mobile/components/screens/dropbox-login.js:65
 msgid "Step 2: Enter the code provided by Dropbox:"
 msgstr "Korak 2: unesite kōd koji Vam je poslao Dropbox:"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:169
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:139
 msgid "Step 2: Install the extension"
 msgstr "Korak 2: instalirajte dodatak"
@@ -3910,11 +3956,15 @@ msgstr ""
 msgid "Stop external editing"
 msgstr "Prekini vanjsko uređivanje"
 
+#: packages/lib/utils/joplinCloud.ts:129
+msgid "Storage space"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:19
 msgid "Strikethrough"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:193
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
 msgid "strong text"
 msgstr "podebljani tekst"
 
@@ -3973,6 +4023,10 @@ msgid ""
 "notebook."
 msgstr "Prelazi u [notebook] – sve dalje radnje vršit će se u ovoj bilježnici."
 
+#: packages/lib/utils/joplinCloud.ts:147
+msgid "Sync as many devices as you want"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:564
 msgid "Sync Status"
 msgstr "Status sinhronizacije"
@@ -3981,7 +4035,7 @@ msgstr "Status sinhronizacije"
 msgid "Sync status (synced items / total items)"
 msgstr "Status sinhronizacije (sinhronizovano / ukupno)"
 
-#: packages/app-cli/app/command-sync.ts:251
+#: packages/app-cli/app/command-sync.ts:242
 msgid "Sync target must be upgraded! Run `%s` to proceed."
 msgstr ""
 
@@ -4012,7 +4066,7 @@ msgstr "Sinhronizacija"
 msgid "Synchronisation interval"
 msgstr "Interval za sinhronizaciju"
 
-#: packages/app-cli/app/command-sync.ts:132
+#: packages/app-cli/app/command-sync.ts:123
 msgid "Synchronisation is already in progress."
 msgstr "Sinhronizovanje je u toku."
 
@@ -4025,12 +4079,12 @@ msgstr "Status sinhronizacije"
 msgid "Synchronisation target"
 msgstr "Odredište za sinhronizaciju"
 
-#: packages/app-cli/app/command-sync.ts:180
+#: packages/app-cli/app/command-sync.ts:171
 msgid "Synchronisation target: %s (%s)"
 msgstr "Odredište sinhronizacije: %s (%s)"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/commands/synchronize.ts:8
 msgid "Synchronise"
 msgstr "Sinhronizuj"
@@ -4070,7 +4124,7 @@ msgstr "Označeno: %d."
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:715
 #: packages/app-mobile/components/screens/Note.tsx:933
 #: packages/app-mobile/components/screens/tags.js:101
-#: packages/app-mobile/components/side-menu-content.tsx:400
+#: packages/app-mobile/components/side-menu-content.tsx:402
 msgid "Tags"
 msgstr "Oznake"
 
@@ -4088,6 +4142,10 @@ msgstr "Kreiraj bilježnicu"
 msgid "Tasks"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:338
+msgid "Teams"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1343
 msgid "Text editor command"
 msgstr "Komanda za uređivača teksta"
@@ -4127,13 +4185,13 @@ msgstr "Aplikacija je uspješno ovjerena."
 msgid "The application must be restarted for these changes to take effect."
 msgstr "Potrebno je restartovati aplikaciju da bi promjene bile primjenjene."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:522
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:526
 msgid ""
 "The attachments will no longer be watched when you switch to a different "
 "note."
 msgstr ""
 
-#: packages/app-cli/app/app.js:304
+#: packages/app-cli/app/app.js:272
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "Komanda \"%s\" dostupna je samo u grafičkom okruženju"
 
@@ -4182,7 +4240,7 @@ msgstr ""
 "2 zauzimati dvostruko više prostora od stavke s faktorom 1. Ponovo pokrenite "
 "aplikaciju da primijenite izmjene."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:521
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:525
 msgid "The following attachments are being watched for changes:"
 msgstr ""
 
@@ -4284,12 +4342,10 @@ msgstr ""
 msgid "The Web Clipper needs your authorisation to access your data."
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:84
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:84
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr "Web clipper servis aktiviran je i pokreće se automatski."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:109
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:108
 msgid "The web clipper service is not enabled."
 msgstr "Web clipper servis nije aktiviran."
@@ -4371,7 +4427,6 @@ msgstr "Prilog nije preuzet ili još nije dešifrovan"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Prilog nije preuzet ili još nije dešifrovan."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:214
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:156
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
@@ -4398,7 +4453,7 @@ msgstr "Ova bilješka ne sadržava informacije o geografskoj lokaciji."
 msgid "This note has been modified:"
 msgstr "Ova je bilješka izmijenjena:"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
 "note."
@@ -4410,7 +4465,7 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Bilješka nema ranijih verzija"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:449
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:452
 msgid ""
 "This Rich Text editor has a number of limitations and it is recommended to "
 "be aware of them before using it."
@@ -4418,7 +4473,6 @@ msgstr ""
 "Ovaj Text editor ima par ogranicenja i preporucujemo da budete upoznati sa "
 "njima prije koristenja."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:155
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:134
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
@@ -4463,7 +4517,7 @@ msgstr "naziv"
 msgid "Title"
 msgstr "Naziv"
 
-#: packages/app-cli/app/command-sync.ts:91
+#: packages/app-cli/app/command-sync.ts:82
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:45
 #: packages/app-mobile/components/screens/dropbox-login.js:58
 msgid ""
@@ -4580,7 +4634,6 @@ msgstr "Bočni meni"
 msgid "Toggle sort order field"
 msgstr "Bočni meni"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:40
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:41
 msgid "Token has been copied to the clipboard!"
 msgstr "Token je kopiran u spremnik!"
@@ -4602,6 +4655,12 @@ msgstr "Ukupno: %d/%d"
 msgid "Try again"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:309 packages/lib/utils/joplinCloud.ts:331
+#: packages/lib/utils/joplinCloud.ts:353
+#, fuzzy
+msgid "Try it now"
+msgstr "Učini sad"
+
 #: packages/app-cli/app/command-help.js:71
 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
@@ -4676,7 +4735,7 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nepodržana vrsta slike: %s"
 
-#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:35
+#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:40
 #: packages/app-desktop/gui/NoteRevisionViewer.min.js:142
 msgid "Unsupported link or message: %s"
 msgstr "Nepodržana veza ili poruka: %s"
@@ -4854,7 +4913,7 @@ msgstr "Upozorenje"
 msgid "Warning: not all resources shown for performance reasons (limit: %s)."
 msgstr "Upozorenje: zbog performansi nisu prikazani svi resursi (granica: %s)."
 
-#: packages/lib/models/Setting.ts:2408
+#: packages/lib/models/Setting.ts:2408 packages/lib/utils/joplinCloud.ts:153
 msgid "Web Clipper"
 msgstr "Web clipper"
 
@@ -4908,11 +4967,12 @@ msgstr "Prilikom kreiranja novog zadatka:"
 msgid "Words"
 msgstr "Riječi"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "y"
 msgstr "y"
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "Y"
 msgstr "Y"
 
@@ -4969,7 +5029,7 @@ msgstr "Vaši podaci iznova će se šifrirati i sinhronizovati."
 msgid "Your password is needed to decrypt some of your data."
 msgstr ""
 
-#: packages/app-cli/app/command-sync.ts:242
+#: packages/app-cli/app/command-sync.ts:233
 msgid ""
 "Your password is needed to decrypt some of your data. Type `:e2ee decrypt` "
 "to set it."

packages/tools/locales/ca.po

@@ -93,6 +93,16 @@ msgstr "&Visualitza"
 msgid "%d days"
 msgstr "%d dies"
 
+#: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137
+#: packages/lib/utils/joplinCloud.ts:138
+msgid "%d GB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134
+#: packages/lib/utils/joplinCloud.ts:135
+msgid "%d GB storage space"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1322
 msgid "%d hour"
 msgstr "%d hora"
@@ -101,6 +111,17 @@ msgstr "%d hora"
 msgid "%d hours"
 msgstr "%d hores"
 
+#: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125
+#: packages/lib/utils/joplinCloud.ts:126
+msgid "%d MB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122
+#: packages/lib/utils/joplinCloud.ts:123
+#, fuzzy
+msgid "%d MB per note or attachment"
+msgstr "Adjunts de la nota"
+
 #: packages/lib/models/Setting.ts:1319 packages/lib/models/Setting.ts:1320
 #: packages/lib/models/Setting.ts:1321
 msgid "%d minutes"
@@ -290,7 +311,6 @@ msgstr "Administració"
 msgid "Admin dashboard"
 msgstr "Tauler d'administració"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:189
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:148
 msgid "Advanced options"
 msgstr "Opcions avançades"
@@ -301,7 +321,7 @@ msgstr "Opcions avançades"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:485
 #: packages/app-mobile/components/screens/notes.js:191
-#: packages/app-mobile/components/side-menu-content.tsx:453
+#: packages/app-mobile/components/side-menu-content.tsx:455
 msgid "All notes"
 msgstr "Totes les notes"
 
@@ -331,8 +351,8 @@ msgstr ""
 
 #: packages/app-cli/app/command-mv.js:29
 msgid ""
-"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
-"\" to see the short notebook id"
+"Ambiguous notebook \"%s\". Please use short notebook id instead - press "
+"\"ti\" to see the short notebook id"
 msgstr ""
 
 #: packages/app-desktop/checkForUpdates.ts:197
@@ -351,7 +371,6 @@ msgstr "Aplicació"
 msgid "Apply"
 msgstr "Aplica"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:44
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:45
 msgid "Are you sure you want to renew the authorisation token?"
 msgstr "Esteu segur que voleu renovar el testimoni d'autorització?"
@@ -418,15 +437,14 @@ msgstr ""
 "contingut abans de sincronitzar; en cas contrari, se suprimiran tots els "
 "fitxers. Consulteu les FAQ per a obtenir més detalls: %s"
 
-#: packages/app-cli/app/command-sync.ts:82
-#: packages/app-cli/app/command-sync.ts:96
+#: packages/app-cli/app/command-sync.ts:73
+#: packages/app-cli/app/command-sync.ts:87
 #: packages/app-desktop/gui/OneDriveLoginScreen.tsx:45
 msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr ""
 "No s'ha completat l'autenticació (no ha rebut el testimoni d'autenticació)."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:194
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:149
 msgid "Authorisation token:"
 msgstr "Testimoni d'autorització:"
@@ -459,6 +477,10 @@ msgstr "Canvia de tema automàticament per a coincidir amb el tema del sistema"
 msgid "Back"
 msgstr "Enrere"
 
+#: packages/lib/utils/joplinCloud.ts:294
+msgid "Basic"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33
 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132
 msgid "Bold"
@@ -485,11 +507,10 @@ msgstr "Comparteix"
 #: packages/app-desktop/bridge.ts:196 packages/app-desktop/bridge.ts:217
 #: packages/app-desktop/checkForUpdates.ts:199
 #: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:728
-#: packages/app-desktop/gui/DialogButtonRow.min.js:38
 #: packages/app-desktop/gui/DialogButtonRow.tsx:78
 #: packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx:82
 #: packages/app-desktop/gui/NoteList/NoteList.tsx:168
-#: packages/app-desktop/gui/PromptDialog.min.js:249
+#: packages/app-desktop/gui/PromptDialog.tsx:270
 #: packages/app-desktop/gui/ResourceScreen.tsx:170
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:318
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
@@ -501,14 +522,14 @@ msgstr "Comparteix"
 #: packages/app-mobile/components/screens/Note.tsx:104
 #: packages/app-mobile/components/screens/Note.tsx:586
 #: packages/app-mobile/components/SelectDateTimeDialog.tsx:152
-#: packages/app-mobile/components/side-menu-content.tsx:163
-#: packages/app-mobile/components/side-menu-content.tsx:172
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:165
+#: packages/app-mobile/components/side-menu-content.tsx:174
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/shim-init-node.js:196
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: packages/app-cli/app/app.js:171
+#: packages/app-cli/app/app.js:138
 msgid "Cancelling background synchronisation... Please wait."
 msgstr "S'està cancel·lant la sincronització en segon pla... Espereu."
 
@@ -516,7 +537,7 @@ msgstr "S'està cancel·lant la sincronització en segon pla... Espereu."
 msgid "Cancelling..."
 msgstr "S'està cancel·lant..."
 
-#: packages/app-cli/app/command-sync.ts:269
+#: packages/app-cli/app/command-sync.ts:260
 msgid "Cancelling... Please wait."
 msgstr "S'està cancel·lant... Espereu."
 
@@ -524,7 +545,7 @@ msgstr "S'està cancel·lant... Espereu."
 msgid "Cannot access %s"
 msgstr "No es pot accedir a %s"
 
-#: packages/app-cli/app/base-command.js:15
+#: packages/app-cli/app/base-command.ts:15
 msgid "Cannot change encrypted item"
 msgstr "No es pot canviar un element xifrat"
 
@@ -560,7 +581,7 @@ msgstr "No es pot copiar la nota al bloc de notes «%s»"
 msgid "Cannot find \"%s\"."
 msgstr "No es pot trobar «%s»."
 
-#: packages/app-cli/app/command-sync.ts:182
+#: packages/app-cli/app/command-sync.ts:173
 msgid "Cannot initialise synchroniser."
 msgstr "No es pot inicialitzar el sincronitzador."
 
@@ -661,7 +682,7 @@ msgid "Chrome Web Store"
 msgstr "Web store de Chrome"
 
 #: packages/app-desktop/gui/EditFolderDialog/Dialog.tsx:146
-#: packages/app-desktop/gui/PromptDialog.min.js:256
+#: packages/app-desktop/gui/PromptDialog.tsx:277
 msgid "Clear"
 msgstr "Neteja"
 
@@ -677,7 +698,7 @@ msgstr ""
 "Feu clic «%s» per a restaurar la nota. Aquesta serà copiada al bloc de notes "
 "anomenat «%s». La versió actual de la nota no serà substituïda o modificada."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:384
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:387
 msgid "Click to add tags..."
 msgstr "Feu clic per a afegir etiquetes..."
 
@@ -710,7 +731,7 @@ msgstr "Codi"
 msgid "Code Block"
 msgstr "Bloc de codi"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Code View"
 msgstr "Vista de codi"
 
@@ -718,7 +739,7 @@ msgstr "Vista de codi"
 msgid "Collaborate on notebooks with others"
 msgstr "Col·laboreu en blocs de notes amb altres"
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Collapse"
 msgstr ""
 
@@ -772,7 +793,7 @@ msgid "Compress old changes"
 msgstr "Comprimeix els canvis vells"
 
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:681
-#: packages/app-mobile/components/side-menu-content.tsx:402
+#: packages/app-mobile/components/side-menu-content.tsx:404
 msgid "Configuration"
 msgstr "Configuració"
 
@@ -801,6 +822,10 @@ msgstr "Conflictes"
 msgid "Conflicts (attachments)"
 msgstr "Conflictes (adjunts)"
 
+#: packages/lib/utils/joplinCloud.ts:171
+msgid "Consolidated billing"
+msgstr ""
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.tsx:110
 msgid "Content provided by %s"
 msgstr "Contingut proporcionat per %s"
@@ -815,7 +840,7 @@ msgstr "Converteix a llistat de tasques pendents"
 
 #: packages/app-desktop/gui/MenuBar.tsx:492
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:13
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:782
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:783
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:157
 msgid "Copy"
 msgstr "Copia"
@@ -853,7 +878,6 @@ msgid_plural "Copy Shareable Links"
 msgstr[0] "Copia l'enllaç compartible"
 msgstr[1] "Copia els enllaços compartibles"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:208
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:153
 msgid "Copy token"
 msgstr "Copia testimoni"
@@ -918,7 +942,7 @@ msgstr ""
 "No s'ha pogut verificar l'estat de compartició d'aquest bloc de notes - "
 "s'està avortant. Torneu a provar quan tingueu connexió a Internet."
 
-#: packages/app-desktop/gui/PromptDialog.min.js:235
+#: packages/app-desktop/gui/PromptDialog.tsx:256
 msgid "Create"
 msgstr "Crea"
 
@@ -1017,7 +1041,7 @@ msgid "Custom TLS certificates"
 msgstr "Certificats TLS personalitzats"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:18
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:772
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:773
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:149
 msgid "Cut"
 msgstr "Retalla"
@@ -1059,7 +1083,7 @@ msgid "Decrypted items: %s / %s"
 msgstr "Elements desxifrats: %s / %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:734
-#: packages/app-mobile/components/side-menu-content.tsx:411
+#: packages/app-mobile/components/side-menu-content.tsx:413
 msgid "Decrypting items: %d/%d"
 msgstr "S'estan desxifrant els elements: %d/%d"
 
@@ -1081,7 +1105,7 @@ msgstr "Per defecte: %s"
 #: packages/app-mobile/components/ScreenHeader.tsx:415
 #: packages/app-mobile/components/ScreenHeader.tsx:482
 #: packages/app-mobile/components/screens/Note.tsx:960
-#: packages/app-mobile/components/side-menu-content.tsx:153
+#: packages/app-mobile/components/side-menu-content.tsx:155
 msgid "Delete"
 msgstr "Suprimeix"
 
@@ -1117,7 +1141,7 @@ msgid "Delete note?"
 msgstr "Voleu suprimir la nota?"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:291
-#: packages/app-mobile/components/side-menu-content.tsx:155
+#: packages/app-mobile/components/side-menu-content.tsx:157
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
@@ -1206,7 +1230,6 @@ msgstr "Desactiva el xifratge"
 msgid "Disable safe mode and restart"
 msgstr "Desactiva el mode segur i reinicia"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:103
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:102
 msgid "Disable Web Clipper Service"
 msgstr "Desactiva el servei del porta-retalls de webs"
@@ -1234,7 +1257,7 @@ msgstr ""
 msgid "Discard changes"
 msgstr "Descarta els canvis"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:451
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:454
 msgid "Dismiss"
 msgstr "Descarta"
 
@@ -1312,7 +1335,6 @@ msgstr ""
 msgid "Download"
 msgstr "Baixa"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:174
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:140
 msgid "Download and install the relevant extension for your browser:"
 msgstr "Descarregueu i instal·leu l'extensió adient per al vostre navegador:"
@@ -1333,7 +1355,7 @@ msgstr "Descarregat i xifrat"
 msgid "Downloading"
 msgstr "Descarregant"
 
-#: packages/app-cli/app/command-sync.ts:236
+#: packages/app-cli/app/command-sync.ts:227
 msgid "Downloading resources..."
 msgstr "Descarregant recursos..."
 
@@ -1341,7 +1363,7 @@ msgstr "Descarregant recursos..."
 msgid "Dracula"
 msgstr "Dràcula"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Drop notes or files here"
 msgstr "Arrossega les notes o fitxers aquí"
 
@@ -1454,7 +1476,7 @@ msgstr "Correu electrònic"
 msgid "Emails"
 msgstr "Correus electrònics"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:195
 msgid "emphasised text"
 msgstr "text ressaltat"
 
@@ -1548,7 +1570,6 @@ msgstr "Activa el suport tipogràfic"
 msgid "Enable video player"
 msgstr "Habilita el reproductor de vídeo"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:114
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:113
 msgid "Enable Web Clipper Service"
 msgstr "Activa el servei del porta-retalls de webs"
@@ -1575,7 +1596,7 @@ msgstr "Xifrat"
 msgid "Encrypted items cannot be modified"
 msgstr "Els elements xifrats no es poden modificar"
 
-#: packages/app-mobile/components/side-menu-content.tsx:139
+#: packages/app-mobile/components/side-menu-content.tsx:141
 msgid "Encrypted notebooks cannot be renamed"
 msgstr "No es pot canviar el nom dels blocs de notes xifrats"
 
@@ -1663,7 +1684,7 @@ msgstr "Exporta com a fitxer de l'Evernote (com a Markdown)"
 msgid "Exits the application."
 msgstr "Surt de l'aplicació."
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Expand"
 msgstr ""
 
@@ -1740,7 +1761,7 @@ msgid "Fetched items: %d/%d."
 msgstr "Elements obtinguts: %d/%d."
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:739
-#: packages/app-mobile/components/side-menu-content.tsx:416
+#: packages/app-mobile/components/side-menu-content.tsx:418
 msgid "Fetching resources: %d/%d"
 msgstr "Obtenint recursos: %d/%d"
 
@@ -2097,7 +2118,6 @@ msgstr ""
 "Per a utilitzar la sincronització del sistema de fitxers, cal el vostre "
 "permís per a escriure a l'emmagatzematge extern."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:142
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:130
 msgid "In order to use the web clipper, you need to do the following:"
 msgstr "Per a poder usar el porta-retalls de webs, cal que feu el següent:"
@@ -2106,7 +2126,7 @@ msgstr "Per a poder usar el porta-retalls de webs, cal que feu el següent:"
 msgid "In progress"
 msgstr "En progrés"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:535
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:539
 msgid "In: %s"
 msgstr "A: %s"
 
@@ -2134,7 +2154,7 @@ msgstr "Codi en línia"
 msgid "Insert"
 msgstr "Insereix"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:196
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:197
 msgid "Insert Hyperlink"
 msgstr "Introdueix un enllaç"
 
@@ -2267,7 +2287,6 @@ msgstr "Contrasenya del servidor del Joplin"
 msgid "Joplin Server URL"
 msgstr "URL del servidor Joplin"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:137
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:129
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
@@ -2333,7 +2352,7 @@ msgstr "Últim error: %s"
 msgid "Later"
 msgstr "Més tard"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid "Layout"
 msgstr "Disposició"
 
@@ -2386,9 +2405,9 @@ msgstr "text destacat"
 msgid "Links with protocol \"%s\" are not supported"
 msgstr "Els enllaços amb el protocol %s no estan suportats"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:229
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:231
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:230
 #: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:232
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:233
 msgid "List item"
 msgstr "Element de llista"
 
@@ -2404,7 +2423,7 @@ msgstr "S'ha carregat"
 msgid "Location"
 msgstr "Ubicació"
 
-#: packages/app-cli/app/command-sync.ts:137
+#: packages/app-cli/app/command-sync.ts:128
 msgid ""
 "Lock file is already being hold. If you know that no synchronisation is "
 "taking place, you may delete the lock file at \"%s\" and resume the "
@@ -2457,6 +2476,11 @@ msgstr "Gestiona la contrasenya mestra"
 msgid "Manage master password..."
 msgstr "Gestiona la contrasenya mestra..."
 
+#: packages/lib/utils/joplinCloud.ts:165
+#, fuzzy
+msgid "Manage multiple users"
+msgstr "Gestiona la contrasenya mestra"
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx:320
 msgid "Manage your plugins"
 msgstr "Gestioneu les extensions"
@@ -2520,6 +2544,11 @@ msgstr "Connexions simultànies màximes"
 msgid "Max Item Size"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:117
+#, fuzzy
+msgid "Max note or attachment size"
+msgstr "Adjunts de la nota"
+
 #: packages/server/src/routes/admin/users.ts:150
 #, fuzzy
 msgid "Max Total Size"
@@ -2537,7 +2566,7 @@ msgstr "Manquen les claus mestres"
 msgid "Missing required argument: %s"
 msgstr "Manca un argument requerit: %s"
 
-#: packages/app-mobile/components/side-menu-content.tsx:437
+#: packages/app-mobile/components/side-menu-content.tsx:439
 msgid "Mobile data - auto-sync disabled"
 msgstr "Dades mòbils - sincronització automàtica desactivada"
 
@@ -2549,7 +2578,7 @@ msgstr "Més informació"
 msgid "More information"
 msgstr "Més informació"
 
-#: packages/app-cli/app/app.js:63
+#: packages/app-cli/app/app.js:64
 msgid "More than one item match \"%s\". Please narrow down your query."
 msgstr ""
 "Hi ha més d'un element que coincideix amb «%s». Restringiu la consulta."
@@ -2575,11 +2604,12 @@ msgstr "Mou al bloc de notes..."
 msgid "Moves the given <item> to [notebook]"
 msgstr "Mou les notes que coincideixen amb <note> a [notebook]."
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "n"
 msgstr "n"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "N"
 msgstr "N"
 
@@ -2593,7 +2623,7 @@ msgstr "Nota nova"
 msgid "New notebook"
 msgstr "Bloc de notes nou"
 
-#: packages/app-mobile/components/side-menu-content.tsx:398
+#: packages/app-mobile/components/side-menu-content.tsx:400
 msgid "New Notebook"
 msgstr "Bloc de notes nou"
 
@@ -2658,11 +2688,11 @@ msgstr "No hi ha cap bloc de notes actiu."
 msgid "No item with ID %s"
 msgstr "No hi ha cap element amb la ID %s"
 
-#: packages/app-cli/app/app.js:99
+#: packages/app-cli/app/app.js:100
 msgid "No notebook has been specified."
 msgstr "No heu indicat cap bloc de notes."
 
-#: packages/app-cli/app/app.js:93
+#: packages/app-cli/app/app.js:94
 msgid "No notebook selected."
 msgstr "No heu seleccionat cap bloc de notes."
 
@@ -2678,7 +2708,7 @@ msgstr "No hi ha recursos!"
 msgid "No results"
 msgstr "No hi ha resultats"
 
-#: packages/app-cli/app/app.js:256
+#: packages/app-cli/app/app.js:224
 msgid "No such command: %s"
 msgstr "No existeix l'ordre: %s"
 
@@ -2697,7 +2727,7 @@ msgstr ""
 msgid "Nord"
 msgstr "Nord"
 
-#: packages/app-cli/app/command-sync.ts:106
+#: packages/app-cli/app/command-sync.ts:97
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr "No esteu autenticats amb %s. Proporcioneu les credencials que falten."
 
@@ -2795,12 +2825,12 @@ msgstr "Bloc de notes"
 msgid "Notebook list growth factor"
 msgstr "Factor de creixement de la llista de blocs de notes"
 
-#: packages/app-mobile/components/side-menu-content.tsx:133
+#: packages/app-mobile/components/side-menu-content.tsx:135
 msgid "Notebook: %s"
 msgstr "Blocs de notes: %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:691
-#: packages/app-mobile/components/side-menu-content.tsx:457
+#: packages/app-mobile/components/side-menu-content.tsx:459
 msgid "Notebooks"
 msgstr "Blocs de notes"
 
@@ -2829,15 +2859,14 @@ msgstr "Llista numerada"
 #: packages/app-desktop/bridge.ts:190 packages/app-desktop/bridge.ts:196
 #: packages/app-desktop/bridge.ts:217 packages/app-desktop/bridge.ts:227
 #: packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx:28
-#: packages/app-desktop/gui/DialogButtonRow.min.js:30
 #: packages/app-desktop/gui/DialogButtonRow.tsx:70
 #: packages/app-desktop/gui/MenuBar.tsx:492
-#: packages/app-desktop/gui/PromptDialog.min.js:242
+#: packages/app-desktop/gui/PromptDialog.tsx:263
 #: packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx:26
 #: packages/app-mobile/components/CameraView.tsx:190
 #: packages/app-mobile/components/ModalDialog.js:67
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:203
-#: packages/app-mobile/components/side-menu-content.tsx:157
+#: packages/app-mobile/components/side-menu-content.tsx:159
 msgid "OK"
 msgstr "D'acord"
 
@@ -2964,7 +2993,7 @@ msgid "Passwords do not match!"
 msgstr "Les contrasenyes no coincideixen!"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:23
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:792
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:793
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:164
 msgid "Paste"
 msgstr "Enganxa"
@@ -2978,6 +3007,10 @@ msgstr "Camí:"
 msgid "PDF File"
 msgstr "Fitxer PDF"
 
+#: packages/lib/utils/joplinCloud.ts:355
+msgid "Per user. Minimum of %d users."
+msgstr ""
+
 #: packages/app-mobile/components/screens/Note.tsx:403
 msgid "Permission needed"
 msgstr "Cal permís"
@@ -3053,7 +3086,7 @@ msgstr "Indiqueu el bloc de notes on s'haurien d'importar les notes."
 msgid "Please upgrade Joplin to use this plugin"
 msgstr "Si us plau, actualitzeu Joplin per a utilitzar aquesta extensió"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid ""
 "Please wait for all attachments to be downloaded and decrypted. You may also "
 "switch to %s to edit the note."
@@ -3135,10 +3168,19 @@ msgstr "Versions prèvies d'aquesta nota"
 msgid "Print"
 msgstr "Imprimeix"
 
+#: packages/lib/utils/joplinCloud.ts:183
+msgid "Priority support"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:655
 msgid "Privacy Policy"
 msgstr "Política de privacitat"
 
+#: packages/lib/utils/joplinCloud.ts:316
+#, fuzzy
+msgid "Pro"
+msgstr "Perfil"
+
 #: packages/server/src/services/TaskService.ts:24
 msgid "Process failed payment subscriptions"
 msgstr "Processa els pagaments de subscripcions fallits"
@@ -3193,6 +3235,7 @@ msgid "Publish Notes"
 msgstr "Publica notes"
 
 #: packages/app-desktop/gui/SyncWizard/Dialog.tsx:178
+#: packages/lib/utils/joplinCloud.ts:141
 msgid "Publish notes to the internet"
 msgstr "Publica les notes a internet"
 
@@ -3214,7 +3257,7 @@ msgstr "Xifratge"
 msgid "Re-upload local data to sync target"
 msgstr "Torna a pujar les dades locals per a sincronitzar la destinació"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:450
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:453
 msgid "Read more about it"
 msgstr "Llegiu-ne més sobre ell"
 
@@ -3274,7 +3317,7 @@ msgstr "Voleu suprimir aquesta cerca de la barra lateral?"
 
 #: packages/app-desktop/gui/MainScreen/commands/renameFolder.ts:8
 #: packages/app-desktop/gui/MainScreen/commands/renameTag.ts:8
-#: packages/app-mobile/components/side-menu-content.tsx:136
+#: packages/app-mobile/components/side-menu-content.tsx:138
 msgid "Rename"
 msgstr "Canvia el nom"
 
@@ -3290,7 +3333,6 @@ msgstr "Canvia el nom de l'etiqueta:"
 msgid "Renames the given <item> (note or notebook) to <name>."
 msgstr "Canvia el nom de la nota o bloc de notes indicat de <item> a <name>."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:222
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:159
 msgid "Renew token"
 msgstr "Renova el testimoni"
@@ -3465,7 +3507,7 @@ msgstr "Cerca:"
 
 #: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:167
 #: packages/app-desktop/gui/lib/SearchInput/SearchInput.tsx:65
-#: packages/app-desktop/gui/NoteSearchBar.min.js:165
+#: packages/app-desktop/gui/NoteSearchBar.min.js:164
 msgid "Search..."
 msgstr "Cerca..."
 
@@ -3547,6 +3589,11 @@ msgstr ""
 msgid "Share"
 msgstr "Comparteix"
 
+#: packages/lib/utils/joplinCloud.ts:159
+#, fuzzy
+msgid "Share and collaborate on a notebook"
+msgstr "Només podeu crear notes en un bloc de notes."
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:339
 msgid "Share Notebook"
 msgstr "Comparteix el quadern de notes"
@@ -3555,6 +3602,10 @@ msgstr "Comparteix el quadern de notes"
 msgid "Share notebook..."
 msgstr "Comparteix el quadern de notes..."
 
+#: packages/lib/utils/joplinCloud.ts:177
+msgid "Sharing access control"
+msgstr ""
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:305
 msgid "Sharing notebook..."
 msgstr "S'està compartint el bloc de notes."
@@ -3718,7 +3769,7 @@ msgstr ""
 "S'està iniciant el desxifratge... Espereu perquè això pot durar alguns "
 "minuts, depenent de quanta informació calgui desxifrar."
 
-#: packages/app-cli/app/command-sync.ts:213
+#: packages/app-cli/app/command-sync.ts:204
 msgid "Starting synchronisation..."
 msgstr "Està començant la sincronització..."
 
@@ -3741,34 +3792,30 @@ msgstr "Estadístiques..."
 msgid "Status"
 msgstr "Estat"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:97
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:96
 msgid "Status: %s"
 msgstr "Estat: %s"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:91
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:90
 msgid "Status: Started on port %d"
 msgstr "Estat: iniciat al port %d"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:150
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:133
 msgid "Step 1: Enable the clipper service"
 msgstr "Pas 1: Activeu el servei del porta-retalls de webs"
 
-#: packages/app-cli/app/command-sync.ts:92
+#: packages/app-cli/app/command-sync.ts:83
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:46
 #: packages/app-mobile/components/screens/dropbox-login.js:59
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr "Pas 1: Obriu aquest URL al navegador per a autoritzar l'aplicació:"
 
-#: packages/app-cli/app/command-sync.ts:94
+#: packages/app-cli/app/command-sync.ts:85
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:50
 #: packages/app-mobile/components/screens/dropbox-login.js:65
 msgid "Step 2: Enter the code provided by Dropbox:"
 msgstr "Pas 2: Introduïu el codi proporcionat per Dropbox:"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:169
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:139
 msgid "Step 2: Install the extension"
 msgstr "Pas 2: Instal·leu l'extensió"
@@ -3781,11 +3828,15 @@ msgstr "Atura"
 msgid "Stop external editing"
 msgstr "Atura l'edició externa"
 
+#: packages/lib/utils/joplinCloud.ts:129
+msgid "Storage space"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:19
 msgid "Strikethrough"
 msgstr "Ratllat"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:193
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
 msgid "strong text"
 msgstr "text destacat"
 
@@ -3844,6 +3895,10 @@ msgstr ""
 "Canvia a [notebook] - totes les operacions posteriors s'aplicaran en aquest "
 "bloc de notes."
 
+#: packages/lib/utils/joplinCloud.ts:147
+msgid "Sync as many devices as you want"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:564
 msgid "Sync Status"
 msgstr "Estat de sincronització"
@@ -3852,7 +3907,7 @@ msgstr "Estat de sincronització"
 msgid "Sync status (synced items / total items)"
 msgstr "Estat de la sincronització (element sinc. / elements totals)"
 
-#: packages/app-cli/app/command-sync.ts:251
+#: packages/app-cli/app/command-sync.ts:242
 msgid "Sync target must be upgraded! Run `%s` to proceed."
 msgstr ""
 "Cal actualitzar la destinació de sincronització! Executeu «%s» per a "
@@ -3884,7 +3939,7 @@ msgstr "Sincronització"
 msgid "Synchronisation interval"
 msgstr "Interval de sincronització"
 
-#: packages/app-cli/app/command-sync.ts:132
+#: packages/app-cli/app/command-sync.ts:123
 msgid "Synchronisation is already in progress."
 msgstr "La sincronització ja és en curs."
 
@@ -3897,12 +3952,12 @@ msgstr "Estat de la sincronització"
 msgid "Synchronisation target"
 msgstr "Objectiu de sincronització"
 
-#: packages/app-cli/app/command-sync.ts:180
+#: packages/app-cli/app/command-sync.ts:171
 msgid "Synchronisation target: %s (%s)"
 msgstr "Destinació de la sincronització: %s(%s)"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/commands/synchronize.ts:8
 msgid "Synchronise"
 msgstr "Sincronitza"
@@ -3940,7 +3995,7 @@ msgstr "Etiquetats: %d."
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:715
 #: packages/app-mobile/components/screens/Note.tsx:933
 #: packages/app-mobile/components/screens/tags.js:101
-#: packages/app-mobile/components/side-menu-content.tsx:400
+#: packages/app-mobile/components/side-menu-content.tsx:402
 msgid "Tags"
 msgstr "Etiquetes"
 
@@ -3958,6 +4013,10 @@ msgstr "Tasques"
 msgid "Tasks"
 msgstr "Tasques"
 
+#: packages/lib/utils/joplinCloud.ts:338
+msgid "Teams"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1343
 msgid "Text editor command"
 msgstr "Ordre de l'editor de text"
@@ -3998,13 +4057,13 @@ msgstr "L'aplicació s'ha autoritzat correctament."
 msgid "The application must be restarted for these changes to take effect."
 msgstr "Cal reiniciar l'aplicació perquè aquests canvis tinguin efecte."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:522
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:526
 msgid ""
 "The attachments will no longer be watched when you switch to a different "
 "note."
 msgstr "Els adjunts ja no es veuran quan canvieu a una nota diferent."
 
-#: packages/app-cli/app/app.js:304
+#: packages/app-cli/app/app.js:272
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "L'ordre «%s» només és disponible en mode IGU"
 
@@ -4055,7 +4114,7 @@ msgstr ""
 "que un element amb un factor d'1. Reinicieu l’aplicació per a veure els "
 "canvis."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:521
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:525
 msgid "The following attachments are being watched for changes:"
 msgstr "S'estan vigilant els següents adjunts per si hi ha canvis:"
 
@@ -4167,14 +4226,12 @@ msgstr ""
 "El porta-retalls web necessita autorització per a accedir a les vostres "
 "dades."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:84
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:84
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr ""
 "El servei de porta-retalls de webs és actiu i configurat per a iniciar-se "
 "automàticament."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:109
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:108
 msgid "The web clipper service is not enabled."
 msgstr "El servei del porta-retalls de webs no està activat."
@@ -4262,7 +4319,6 @@ msgstr "Aquest adjunt no ha estat descarregat o desxifrat encara"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Aquest adjunt no s'ha descarregat o no s'ha desxifrat encara."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:214
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:156
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
@@ -4289,7 +4345,7 @@ msgstr "Aquesta nota no té informació de geolocalització."
 msgid "This note has been modified:"
 msgstr "Aquesta nota s'ha modificat:"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
 "note."
@@ -4301,7 +4357,7 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Aquesta nota no té historial"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:449
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:452
 msgid ""
 "This Rich Text editor has a number of limitations and it is recommended to "
 "be aware of them before using it."
@@ -4309,7 +4365,6 @@ msgstr ""
 "Aquest editor de text enriquit té una sèrie de limitacions i es recomana ser "
 "conscient d'elles abans d'utilitzar-lo."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:155
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:134
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
@@ -4355,7 +4410,7 @@ msgstr "títol"
 msgid "Title"
 msgstr "Títol"
 
-#: packages/app-cli/app/command-sync.ts:91
+#: packages/app-cli/app/command-sync.ts:82
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:45
 #: packages/app-mobile/components/screens/dropbox-login.js:58
 msgid ""
@@ -4465,7 +4520,6 @@ msgstr "Mostra o amaga barra lateral"
 msgid "Toggle sort order field"
 msgstr "Canvia el camp d'ordenació"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:40
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:41
 msgid "Token has been copied to the clipboard!"
 msgstr "El testimoni s'ha copiat al porta-retalls!"
@@ -4487,6 +4541,12 @@ msgstr "Total: %d/%d"
 msgid "Try again"
 msgstr "Intenta-ho de nou"
 
+#: packages/lib/utils/joplinCloud.ts:309 packages/lib/utils/joplinCloud.ts:331
+#: packages/lib/utils/joplinCloud.ts:353
+#, fuzzy
+msgid "Try it now"
+msgstr "Fes-ho ara"
+
 #: packages/app-cli/app/command-help.js:71
 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
@@ -4563,7 +4623,7 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Tipus d'imatge no admesa: %s"
 
-#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:35
+#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:40
 #: packages/app-desktop/gui/NoteRevisionViewer.min.js:142
 msgid "Unsupported link or message: %s"
 msgstr "Missatge o enllaç no suportat: %s"
@@ -4740,7 +4800,7 @@ msgid "Warning: not all resources shown for performance reasons (limit: %s)."
 msgstr ""
 "Avís: no es mostren tots els recursos per motius de rendiment (límit:% s)."
 
-#: packages/lib/models/Setting.ts:2408
+#: packages/lib/models/Setting.ts:2408 packages/lib/utils/joplinCloud.ts:153
 msgid "Web Clipper"
 msgstr "Desa-retalls de webs"
 
@@ -4794,11 +4854,12 @@ msgstr "En crear un llistat de tasques pendents:"
 msgid "Words"
 msgstr "Paraules"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "y"
 msgstr "s"
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "Y"
 msgstr "S"
 
@@ -4854,7 +4915,7 @@ msgstr "Les vostres dades es tornaran a xifrar i sincronitzar."
 msgid "Your password is needed to decrypt some of your data."
 msgstr "Fa falta la contrasenya per a desxifrar part de les dades."
 
-#: packages/app-cli/app/command-sync.ts:242
+#: packages/app-cli/app/command-sync.ts:233
 msgid ""
 "Your password is needed to decrypt some of your data. Type `:e2ee decrypt` "
 "to set it."

packages/tools/locales/cs_CZ.po

@@ -94,6 +94,16 @@ msgstr "&Zobrazit"
 msgid "%d days"
 msgstr "%d dní"
 
+#: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137
+#: packages/lib/utils/joplinCloud.ts:138
+msgid "%d GB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134
+#: packages/lib/utils/joplinCloud.ts:135
+msgid "%d GB storage space"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1322
 msgid "%d hour"
 msgstr "%d hodina"
@@ -102,6 +112,17 @@ msgstr "%d hodina"
 msgid "%d hours"
 msgstr "%d hodin"
 
+#: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125
+#: packages/lib/utils/joplinCloud.ts:126
+msgid "%d MB"
+msgstr ""
+
+#: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122
+#: packages/lib/utils/joplinCloud.ts:123
+#, fuzzy
+msgid "%d MB per note or attachment"
+msgstr "Přílohy poznámky"
+
 #: packages/lib/models/Setting.ts:1319 packages/lib/models/Setting.ts:1320
 #: packages/lib/models/Setting.ts:1321
 msgid "%d minutes"
@@ -180,10 +201,10 @@ msgid ""
 "list all the tags (use -l for long option)."
 msgstr ""
 "<tag-command> může být \"add\", \"remove\", \"list\" nebo \"notetags\": "
-"přidat (\"add\") či odebrat (\"remove\") [tag] k [poznámce], vypsat (\"list"
-"\") seznam poznámek přiřazených k [tagu] nebo vypsat (\"notetags\") seznam "
-"štítků přiřazených k poznámce. Příkaz `tag list` vypíše všechny štítky (s "
-"parametrem -l pro dlouhý výpis)."
+"přidat (\"add\") či odebrat (\"remove\") [tag] k [poznámce], vypsat "
+"(\"list\") seznam poznámek přiřazených k [tagu] nebo vypsat (\"notetags\") "
+"seznam štítků přiřazených k poznámce. Příkaz `tag list` vypíše všechny "
+"štítky (s parametrem -l pro dlouhý výpis)."
 
 #: packages/app-cli/app/command-todo.js:14
 msgid ""
@@ -192,10 +213,11 @@ msgid ""
 "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."
 msgstr ""
-"<todo-command> může být buď \"toggle\" (přepnout) nebo \"clear"
-"\" (odstranit). Použijte \"toggle\" pro přepnutí daného úkolu na dokončený "
-"resp. nedokončený (pokud je cílem normální poznámka, bude konvertována na "
-"úkol). Použijte \"clear\" pro konverzi úkolu na normální poznámku."
+"<todo-command> může být buď \"toggle\" (přepnout) nebo "
+"\"clear\" (odstranit). Použijte \"toggle\" pro přepnutí daného úkolu na "
+"dokončený resp. nedokončený (pokud je cílem normální poznámka, bude "
+"konvertována na úkol). Použijte \"clear\" pro konverzi úkolu na normální "
+"poznámku."
 
 #: packages/lib/models/Setting.ts:1348
 msgid "A3"
@@ -292,7 +314,6 @@ msgstr ""
 msgid "Admin dashboard"
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:189
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:148
 msgid "Advanced options"
 msgstr "Ukázat pokročilé volby"
@@ -303,7 +324,7 @@ msgstr "Pokročilé volby"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:485
 #: packages/app-mobile/components/screens/notes.js:191
-#: packages/app-mobile/components/side-menu-content.tsx:453
+#: packages/app-mobile/components/side-menu-content.tsx:455
 msgid "All notes"
 msgstr "Všechny poznámky"
 
@@ -333,8 +354,8 @@ msgstr ""
 
 #: packages/app-cli/app/command-mv.js:29
 msgid ""
-"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
-"\" to see the short notebook id"
+"Ambiguous notebook \"%s\". Please use short notebook id instead - press "
+"\"ti\" to see the short notebook id"
 msgstr ""
 
 #: packages/app-desktop/checkForUpdates.ts:197
@@ -353,7 +374,6 @@ msgstr "Aplikace"
 msgid "Apply"
 msgstr "Použít"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:44
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:45
 msgid "Are you sure you want to renew the authorisation token?"
 msgstr "Opravdu chcete obnovit autorizační token?"
@@ -420,14 +440,13 @@ msgstr ""
 "jste do něj zkopírovali veškerý obsah, jinak budou všechny soubory "
 "odstraněny! Další podrobnosti naleznete v FAQ: % s"
 
-#: packages/app-cli/app/command-sync.ts:82
-#: packages/app-cli/app/command-sync.ts:96
+#: packages/app-cli/app/command-sync.ts:73
+#: packages/app-cli/app/command-sync.ts:87
 #: packages/app-desktop/gui/OneDriveLoginScreen.tsx:45
 msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "Autentizace nebyla dokončena (nedostali jsme autentizační token)."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:194
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:149
 msgid "Authorisation token:"
 msgstr "Autorizační token:"
@@ -461,6 +480,10 @@ msgstr "Automaticky přepnout téma vzhledu podle nastavení systému"
 msgid "Back"
 msgstr "Zpět"
 
+#: packages/lib/utils/joplinCloud.ts:294
+msgid "Basic"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33
 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132
 msgid "Bold"
@@ -487,11 +510,10 @@ msgstr "Sdílet"
 #: packages/app-desktop/bridge.ts:196 packages/app-desktop/bridge.ts:217
 #: packages/app-desktop/checkForUpdates.ts:199
 #: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:728
-#: packages/app-desktop/gui/DialogButtonRow.min.js:38
 #: packages/app-desktop/gui/DialogButtonRow.tsx:78
 #: packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx:82
 #: packages/app-desktop/gui/NoteList/NoteList.tsx:168
-#: packages/app-desktop/gui/PromptDialog.min.js:249
+#: packages/app-desktop/gui/PromptDialog.tsx:270
 #: packages/app-desktop/gui/ResourceScreen.tsx:170
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:318
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
@@ -503,14 +525,14 @@ msgstr "Sdílet"
 #: packages/app-mobile/components/screens/Note.tsx:104
 #: packages/app-mobile/components/screens/Note.tsx:586
 #: packages/app-mobile/components/SelectDateTimeDialog.tsx:152
-#: packages/app-mobile/components/side-menu-content.tsx:163
-#: packages/app-mobile/components/side-menu-content.tsx:172
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:165
+#: packages/app-mobile/components/side-menu-content.tsx:174
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/shim-init-node.js:196
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: packages/app-cli/app/app.js:171
+#: packages/app-cli/app/app.js:138
 msgid "Cancelling background synchronisation... Please wait."
 msgstr "Zastavování synchronizace, počkejte prosím..."
 
@@ -518,7 +540,7 @@ msgstr "Zastavování synchronizace, počkejte prosím..."
 msgid "Cancelling..."
 msgstr "Zastavování..."
 
-#: packages/app-cli/app/command-sync.ts:269
+#: packages/app-cli/app/command-sync.ts:260
 msgid "Cancelling... Please wait."
 msgstr "Zastavuji, chvíli strpení."
 
@@ -526,7 +548,7 @@ msgstr "Zastavuji, chvíli strpení."
 msgid "Cannot access %s"
 msgstr "Nelze otevřít %s"
 
-#: packages/app-cli/app/base-command.js:15
+#: packages/app-cli/app/base-command.ts:15
 msgid "Cannot change encrypted item"
 msgstr "Nelze editovat zašifrovanou položku"
 
@@ -562,7 +584,7 @@ msgstr "Poznámku \"%s\" nelze zkopírovat do zápisníku"
 msgid "Cannot find \"%s\"."
 msgstr "Výraz \"%s\" nebyl nalezen."
 
-#: packages/app-cli/app/command-sync.ts:182
+#: packages/app-cli/app/command-sync.ts:173
 msgid "Cannot initialise synchroniser."
 msgstr "Nelze inicializovat synchronizátor."
 
@@ -662,7 +684,7 @@ msgid "Chrome Web Store"
 msgstr "Chrome Web Store"
 
 #: packages/app-desktop/gui/EditFolderDialog/Dialog.tsx:146
-#: packages/app-desktop/gui/PromptDialog.min.js:256
+#: packages/app-desktop/gui/PromptDialog.tsx:277
 msgid "Clear"
 msgstr "Vyčistit"
 
@@ -678,7 +700,7 @@ msgstr ""
 "Pro obnovení poznámky klepněte na \"%s\". Poznámka bude zkopírována do "
 "zápisníku \"%s\". Současná verze poznámky nebude nahrazena ani změněna."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:384
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:387
 msgid "Click to add tags..."
 msgstr "Klepněte pro přidání štítku..."
 
@@ -711,7 +733,7 @@ msgstr "Kód"
 msgid "Code Block"
 msgstr "Blok kódu"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Code View"
 msgstr "Zobrazit kód"
 
@@ -720,7 +742,7 @@ msgstr "Zobrazit kód"
 msgid "Collaborate on notebooks with others"
 msgstr "Nejprve prosím vytvořte zápisník"
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Collapse"
 msgstr ""
 
@@ -775,7 +797,7 @@ msgid "Compress old changes"
 msgstr ""
 
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:681
-#: packages/app-mobile/components/side-menu-content.tsx:402
+#: packages/app-mobile/components/side-menu-content.tsx:404
 msgid "Configuration"
 msgstr "Nastavení"
 
@@ -806,6 +828,10 @@ msgstr "Konflikty"
 msgid "Conflicts (attachments)"
 msgstr "Přílohy poznámky"
 
+#: packages/lib/utils/joplinCloud.ts:171
+msgid "Consolidated billing"
+msgstr ""
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.tsx:110
 #, fuzzy
 msgid "Content provided by %s"
@@ -821,7 +847,7 @@ msgstr "Převést na úkolexpr"
 
 #: packages/app-desktop/gui/MenuBar.tsx:492
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:13
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:782
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:783
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:157
 msgid "Copy"
 msgstr "Kopírovat"
@@ -862,7 +888,6 @@ msgstr[0] "Kopírovat odkaz ke sdílení"
 msgstr[1] "Kopírovat odkazy ke sdílení"
 msgstr[2] "Kopírovat odkazy ke sdílení"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:208
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:153
 msgid "Copy token"
 msgstr "Zkopírovat token"
@@ -924,7 +949,7 @@ msgid ""
 "again when you are connected to the internet."
 msgstr ""
 
-#: packages/app-desktop/gui/PromptDialog.min.js:235
+#: packages/app-desktop/gui/PromptDialog.tsx:256
 #, fuzzy
 msgid "Create"
 msgstr "Vytvořeno"
@@ -1028,7 +1053,7 @@ msgid "Custom TLS certificates"
 msgstr "Vlastní TLS certifikát"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:18
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:772
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:773
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:149
 msgid "Cut"
 msgstr "Vyjmout"
@@ -1070,7 +1095,7 @@ msgid "Decrypted items: %s / %s"
 msgstr "Dešifrované položky: %s/%s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:734
-#: packages/app-mobile/components/side-menu-content.tsx:411
+#: packages/app-mobile/components/side-menu-content.tsx:413
 msgid "Decrypting items: %d/%d"
 msgstr "Dešifrování položek: %d/%d"
 
@@ -1092,7 +1117,7 @@ msgstr "Výchozí: %s"
 #: packages/app-mobile/components/ScreenHeader.tsx:415
 #: packages/app-mobile/components/ScreenHeader.tsx:482
 #: packages/app-mobile/components/screens/Note.tsx:960
-#: packages/app-mobile/components/side-menu-content.tsx:153
+#: packages/app-mobile/components/side-menu-content.tsx:155
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1128,7 +1153,7 @@ msgid "Delete note?"
 msgstr "Smazat poznámku?"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:291
-#: packages/app-mobile/components/side-menu-content.tsx:155
+#: packages/app-mobile/components/side-menu-content.tsx:157
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
@@ -1218,7 +1243,6 @@ msgstr "Vypnout šifrování"
 msgid "Disable safe mode and restart"
 msgstr "Vypnout nouzový režim a restartovat"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:103
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:102
 msgid "Disable Web Clipper Service"
 msgstr "Služba Web clipper vypnuta"
@@ -1245,7 +1269,7 @@ msgstr ""
 msgid "Discard changes"
 msgstr "Zahodit změny"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:451
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:454
 msgid "Dismiss"
 msgstr "Zavřít"
 
@@ -1323,7 +1347,6 @@ msgstr ""
 msgid "Download"
 msgstr "Stáhnout"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:174
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:140
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
@@ -1345,7 +1368,7 @@ msgstr "Staženo a zašifrováno"
 msgid "Downloading"
 msgstr "Stahování"
 
-#: packages/app-cli/app/command-sync.ts:236
+#: packages/app-cli/app/command-sync.ts:227
 msgid "Downloading resources..."
 msgstr "Stahování zdrojů..."
 
@@ -1353,7 +1376,7 @@ msgstr "Stahování zdrojů..."
 msgid "Dracula"
 msgstr "Dracula"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Drop notes or files here"
 msgstr "Sem přetáhněte poznámky nebo soubory"
 
@@ -1467,7 +1490,7 @@ msgstr ""
 msgid "Emails"
 msgstr ""
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:195
 msgid "emphasised text"
 msgstr "zvýrazněný text"
 
@@ -1561,7 +1584,6 @@ msgstr "Povolit podporu pro typographer"
 msgid "Enable video player"
 msgstr "Povolit přehrávač videí"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:114
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:113
 msgid "Enable Web Clipper Service"
 msgstr "Povolit službu Web clipper"
@@ -1589,7 +1611,7 @@ msgstr "Zašifrováno"
 msgid "Encrypted items cannot be modified"
 msgstr "Nelze editovat zašifrovanou položku"
 
-#: packages/app-mobile/components/side-menu-content.tsx:139
+#: packages/app-mobile/components/side-menu-content.tsx:141
 msgid "Encrypted notebooks cannot be renamed"
 msgstr "Nelze přejmenovat zašifrovanou položku"
 
@@ -1679,7 +1701,7 @@ msgstr "Soubor exportu Evernote (jako Markdown)"
 msgid "Exits the application."
 msgstr "Ukončí aplikaci."
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Expand"
 msgstr ""
 
@@ -1755,7 +1777,7 @@ msgid "Fetched items: %d/%d."
 msgstr "Získané položky: %d/%d."
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:739
-#: packages/app-mobile/components/side-menu-content.tsx:416
+#: packages/app-mobile/components/side-menu-content.tsx:418
 msgid "Fetching resources: %d/%d"
 msgstr "Stahování zdrojů: %d/%d"
 
@@ -2110,7 +2132,6 @@ msgstr ""
 "Pro použití synchronizace systému souborů je vyžadováno vaše oprávnění k "
 "zápisu do externího úložiště."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:142
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:130
 msgid "In order to use the web clipper, you need to do the following:"
 msgstr "Pro použití web clipper musíte udělat následující:"
@@ -2119,7 +2140,7 @@ msgstr "Pro použití web clipper musíte udělat následující:"
 msgid "In progress"
 msgstr "Probíhá"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:535
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:539
 msgid "In: %s"
 msgstr "V: %s"
 
@@ -2147,7 +2168,7 @@ msgstr "Vložený kód"
 msgid "Insert"
 msgstr "Vložit"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:196
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:197
 msgid "Insert Hyperlink"
 msgstr "Vložit odkaz"
 
@@ -2279,7 +2300,6 @@ msgstr "Heslo Joplin serveru"
 msgid "Joplin Server URL"
 msgstr "URL Joplin serveru"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:137
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:129
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
@@ -2343,7 +2363,7 @@ msgstr "Poslední chyba: %s"
 msgid "Later"
 msgstr "Později"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid "Layout"
 msgstr "Rozložení"
 
@@ -2398,9 +2418,9 @@ msgstr "Odkaz"
 msgid "Links with protocol \"%s\" are not supported"
 msgstr "Odkazy s protokolem \"%s\" nejsou podporovány"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:229
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:231
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:230
 #: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:232
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:233
 msgid "List item"
 msgstr "Seznam položek"
 
@@ -2417,7 +2437,7 @@ msgstr "Staženo"
 msgid "Location"
 msgstr "Poloha"
 
-#: packages/app-cli/app/command-sync.ts:137
+#: packages/app-cli/app/command-sync.ts:128
 msgid ""
 "Lock file is already being hold. If you know that no synchronisation is "
 "taking place, you may delete the lock file at \"%s\" and resume the "
@@ -2471,6 +2491,11 @@ msgstr "Zadejte hlavní heslo:"
 msgid "Manage master password..."
 msgstr "Zadejte hlavní heslo:"
 
+#: packages/lib/utils/joplinCloud.ts:165
+#, fuzzy
+msgid "Manage multiple users"
+msgstr "Zadejte hlavní heslo:"
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx:320
 msgid "Manage your plugins"
 msgstr "Správa vašich rozšíření"
@@ -2538,6 +2563,11 @@ msgstr "Maximální počet souběžných spojení"
 msgid "Max Item Size"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:117
+#, fuzzy
+msgid "Max note or attachment size"
+msgstr "Přílohy poznámky"
+
 #: packages/server/src/routes/admin/users.ts:150
 #, fuzzy
 msgid "Max Total Size"
@@ -2556,7 +2586,7 @@ msgstr "Chybí hlavní klíče"
 msgid "Missing required argument: %s"
 msgstr "Chybí povinný parametr: %s"
 
-#: packages/app-mobile/components/side-menu-content.tsx:437
+#: packages/app-mobile/components/side-menu-content.tsx:439
 msgid "Mobile data - auto-sync disabled"
 msgstr "Mobilní data - automatická synchronizace vypnutá"
 
@@ -2568,7 +2598,7 @@ msgstr "Více informací"
 msgid "More information"
 msgstr "Více informací"
 
-#: packages/app-cli/app/app.js:63
+#: packages/app-cli/app/app.js:64
 msgid "More than one item match \"%s\". Please narrow down your query."
 msgstr ""
 "Výrazu \"%s\" odpovídá více než jedna položka, upřesněte prosím hledaný text."
@@ -2594,11 +2624,12 @@ msgstr "Přesunout do zápisníku..."
 msgid "Moves the given <item> to [notebook]"
 msgstr "Přesune poznámky vyhovující <poznámka> do [zápisník]."
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "n"
 msgstr "n"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "N"
 msgstr "N"
 
@@ -2612,7 +2643,7 @@ msgstr "Nová poznámka"
 msgid "New notebook"
 msgstr "Nový zápisník"
 
-#: packages/app-mobile/components/side-menu-content.tsx:398
+#: packages/app-mobile/components/side-menu-content.tsx:400
 msgid "New Notebook"
 msgstr "Nový zápisník"
 
@@ -2677,11 +2708,11 @@ msgstr "Není vybrán žádný zápisník."
 msgid "No item with ID %s"
 msgstr "Nenalezena položka s ID %s"
 
-#: packages/app-cli/app/app.js:99
+#: packages/app-cli/app/app.js:100
 msgid "No notebook has been specified."
 msgstr "Nebyl vybrán žádný zápisník."
 
-#: packages/app-cli/app/app.js:93
+#: packages/app-cli/app/app.js:94
 msgid "No notebook selected."
 msgstr "Není vybrán žádný zápisník."
 
@@ -2697,7 +2728,7 @@ msgstr "Žádné zdroje!"
 msgid "No results"
 msgstr "Žádné výsledky"
 
-#: packages/app-cli/app/app.js:256
+#: packages/app-cli/app/app.js:224
 msgid "No such command: %s"
 msgstr "Příkaz neexistuje\" %s"
 
@@ -2716,7 +2747,7 @@ msgstr ""
 msgid "Nord"
 msgstr "Nord"
 
-#: packages/app-cli/app/command-sync.ts:106
+#: packages/app-cli/app/command-sync.ts:97
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr "Nepřihlášeno k %s. Prosím vyplňte chybějící přihlašovací údaje."
 
@@ -2815,12 +2846,12 @@ msgstr "Zápisníky"
 msgid "Notebook list growth factor"
 msgstr "Růstový faktor seznamu notebooků"
 
-#: packages/app-mobile/components/side-menu-content.tsx:133
+#: packages/app-mobile/components/side-menu-content.tsx:135
 msgid "Notebook: %s"
 msgstr "Zápisník: %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:691
-#: packages/app-mobile/components/side-menu-content.tsx:457
+#: packages/app-mobile/components/side-menu-content.tsx:459
 msgid "Notebooks"
 msgstr "Zápisníky"
 
@@ -2850,15 +2881,14 @@ msgstr "Číslovaný seznam"
 #: packages/app-desktop/bridge.ts:190 packages/app-desktop/bridge.ts:196
 #: packages/app-desktop/bridge.ts:217 packages/app-desktop/bridge.ts:227
 #: packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx:28
-#: packages/app-desktop/gui/DialogButtonRow.min.js:30
 #: packages/app-desktop/gui/DialogButtonRow.tsx:70
 #: packages/app-desktop/gui/MenuBar.tsx:492
-#: packages/app-desktop/gui/PromptDialog.min.js:242
+#: packages/app-desktop/gui/PromptDialog.tsx:263
 #: packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx:26
 #: packages/app-mobile/components/CameraView.tsx:190
 #: packages/app-mobile/components/ModalDialog.js:67
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:203
-#: packages/app-mobile/components/side-menu-content.tsx:157
+#: packages/app-mobile/components/side-menu-content.tsx:159
 msgid "OK"
 msgstr "OK"
 
@@ -2985,7 +3015,7 @@ msgid "Passwords do not match!"
 msgstr "Hesla se neshodují!"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:23
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:792
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:793
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:164
 msgid "Paste"
 msgstr "Vložit"
@@ -2999,6 +3029,10 @@ msgstr "Cesta:"
 msgid "PDF File"
 msgstr "PDF soubor"
 
+#: packages/lib/utils/joplinCloud.ts:355
+msgid "Per user. Minimum of %d users."
+msgstr ""
+
 #: packages/app-mobile/components/screens/Note.tsx:403
 msgid "Permission needed"
 msgstr "Vyžadováno oprávnění"
@@ -3069,7 +3103,7 @@ msgstr "Prosím specifikujte sešit, do kterého mají být poznámky importová
 msgid "Please upgrade Joplin to use this plugin"
 msgstr "Pro použití tohoto rozšíření prosím aktualizujte Joplin"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid ""
 "Please wait for all attachments to be downloaded and decrypted. You may also "
 "switch to %s to edit the note."
@@ -3151,10 +3185,18 @@ msgstr "Předchozí verze poznámky"
 msgid "Print"
 msgstr "Tisk"
 
+#: packages/lib/utils/joplinCloud.ts:183
+msgid "Priority support"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:655
 msgid "Privacy Policy"
 msgstr "Zásady ochrany osobních údajů"
 
+#: packages/lib/utils/joplinCloud.ts:316
+msgid "Pro"
+msgstr ""
+
 #: packages/server/src/services/TaskService.ts:24
 msgid "Process failed payment subscriptions"
 msgstr ""
@@ -3211,6 +3253,7 @@ msgid "Publish Notes"
 msgstr ""
 
 #: packages/app-desktop/gui/SyncWizard/Dialog.tsx:178
+#: packages/lib/utils/joplinCloud.ts:141
 msgid "Publish notes to the internet"
 msgstr ""
 
@@ -3232,7 +3275,7 @@ msgstr "Opětovné zašifrování"
 msgid "Re-upload local data to sync target"
 msgstr "Odeslat místní data do cíle synchronizace"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:450
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:453
 msgid "Read more about it"
 msgstr "Zjistit více"
 
@@ -3292,7 +3335,7 @@ msgstr "Smazat tento hledaný výraz z panelu?"
 
 #: packages/app-desktop/gui/MainScreen/commands/renameFolder.ts:8
 #: packages/app-desktop/gui/MainScreen/commands/renameTag.ts:8
-#: packages/app-mobile/components/side-menu-content.tsx:136
+#: packages/app-mobile/components/side-menu-content.tsx:138
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -3308,7 +3351,6 @@ msgstr "Přejmenovat štítek:"
 msgid "Renames the given <item> (note or notebook) to <name>."
 msgstr "Přejmenuje <položku> (poznámku či zápisník) na <jméno>."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:222
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:159
 msgid "Renew token"
 msgstr "Obnovit token"
@@ -3489,7 +3531,7 @@ msgstr "Hledat:"
 
 #: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:167
 #: packages/app-desktop/gui/lib/SearchInput/SearchInput.tsx:65
-#: packages/app-desktop/gui/NoteSearchBar.min.js:165
+#: packages/app-desktop/gui/NoteSearchBar.min.js:164
 msgid "Search..."
 msgstr "Hledat..."
 
@@ -3572,6 +3614,11 @@ msgstr ""
 msgid "Share"
 msgstr "Sdílet"
 
+#: packages/lib/utils/joplinCloud.ts:159
+#, fuzzy
+msgid "Share and collaborate on a notebook"
+msgstr "Poznámky mohou být vytvořeny pouze v zápisnících."
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:339
 msgid "Share Notebook"
 msgstr "Sdílet zápisník"
@@ -3580,6 +3627,10 @@ msgstr "Sdílet zápisník"
 msgid "Share notebook..."
 msgstr "Sdílet zápisník..."
 
+#: packages/lib/utils/joplinCloud.ts:177
+msgid "Sharing access control"
+msgstr ""
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:305
 msgid "Sharing notebook..."
 msgstr "Sdílení zápisníku..."
@@ -3746,7 +3797,7 @@ msgstr ""
 "Probíhá dešifrování... Počkejte prosím na jeho dokončení. Podle množství dat "
 "může zabrat i několik minut."
 
-#: packages/app-cli/app/command-sync.ts:213
+#: packages/app-cli/app/command-sync.ts:204
 msgid "Starting synchronisation..."
 msgstr "Zahajování synchronizace..."
 
@@ -3768,35 +3819,31 @@ msgstr "Statistiky..."
 msgid "Status"
 msgstr "Stav"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:97
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:96
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:91
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:90
 msgid "Status: Started on port %d"
 msgstr "Stav: běží na portu %d"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:150
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:133
 msgid "Step 1: Enable the clipper service"
 msgstr "Krok 1: Zapnout službu clipper"
 
-#: packages/app-cli/app/command-sync.ts:92
+#: packages/app-cli/app/command-sync.ts:83
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:46
 #: packages/app-mobile/components/screens/dropbox-login.js:59
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr ""
 "Krok 1: Pro ověření aplikace otevřete ve svém prohlížeči tuto URL adresu:"
 
-#: packages/app-cli/app/command-sync.ts:94
+#: packages/app-cli/app/command-sync.ts:85
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:50
 #: packages/app-mobile/components/screens/dropbox-login.js:65
 msgid "Step 2: Enter the code provided by Dropbox:"
 msgstr "Krok 2: Zadejte kód poskytnutý službou Dropbox:"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:169
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:139
 msgid "Step 2: Install the extension"
 msgstr "Krok 2: Nainstalovat rozšíření"
@@ -3809,11 +3856,15 @@ msgstr "Zastavit"
 msgid "Stop external editing"
 msgstr "Ukončit externí úpravy"
 
+#: packages/lib/utils/joplinCloud.ts:129
+msgid "Storage space"
+msgstr ""
+
 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:19
 msgid "Strikethrough"
 msgstr "Přeškrtnutí"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:193
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
 msgid "strong text"
 msgstr "tučný text"
 
@@ -3874,6 +3925,10 @@ msgstr ""
 "Přepne do zápisníku [notebook]. Všechny další operace budou prováděny na "
 "tomto zápisníku."
 
+#: packages/lib/utils/joplinCloud.ts:147
+msgid "Sync as many devices as you want"
+msgstr ""
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:564
 msgid "Sync Status"
 msgstr "Stav synchronizace"
@@ -3882,7 +3937,7 @@ msgstr "Stav synchronizace"
 msgid "Sync status (synced items / total items)"
 msgstr "Stav synchronizace (synchronizováno / celkem)"
 
-#: packages/app-cli/app/command-sync.ts:251
+#: packages/app-cli/app/command-sync.ts:242
 msgid "Sync target must be upgraded! Run `%s` to proceed."
 msgstr ""
 "Je třeba upgradovat cíl synchronizace. Chcete-li pokračovat, spusťte `%s`."
@@ -3914,7 +3969,7 @@ msgstr "Synchronizace"
 msgid "Synchronisation interval"
 msgstr "Interval synchronizace"
 
-#: packages/app-cli/app/command-sync.ts:132
+#: packages/app-cli/app/command-sync.ts:123
 msgid "Synchronisation is already in progress."
 msgstr "Synchronizace již probíhá."
 
@@ -3927,12 +3982,12 @@ msgstr "Stav synchronizace"
 msgid "Synchronisation target"
 msgstr "Cíl synchronizace"
 
-#: packages/app-cli/app/command-sync.ts:180
+#: packages/app-cli/app/command-sync.ts:171
 msgid "Synchronisation target: %s (%s)"
 msgstr "Cíl synchronizace: %s (%s)"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/commands/synchronize.ts:8
 msgid "Synchronise"
 msgstr "Synchronizovat"
@@ -3970,7 +4025,7 @@ msgstr "Označeno pomocí štítků: %d."
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:715
 #: packages/app-mobile/components/screens/Note.tsx:933
 #: packages/app-mobile/components/screens/tags.js:101
-#: packages/app-mobile/components/side-menu-content.tsx:400
+#: packages/app-mobile/components/side-menu-content.tsx:402
 msgid "Tags"
 msgstr "Štítky"
 
@@ -3988,6 +4043,10 @@ msgstr "Vytvořit nový zápisník"
 msgid "Tasks"
 msgstr ""
 
+#: packages/lib/utils/joplinCloud.ts:338
+msgid "Teams"
+msgstr ""
+
 #: packages/lib/models/Setting.ts:1343
 msgid "Text editor command"
 msgstr "Textový editor"
@@ -4023,13 +4082,13 @@ msgstr "Aplikace byla úspěšně autorizována."
 msgid "The application must be restarted for these changes to take effect."
 msgstr "Pro provedení těchto změn je potřeba aplikaci restartovat."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:522
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:526
 msgid ""
 "The attachments will no longer be watched when you switch to a different "
 "note."
 msgstr "Když přepnete na jinou poznámku, přílohy již nebudou sledovány."
 
-#: packages/app-cli/app/app.js:304
+#: packages/app-cli/app/app.js:272
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "Příkaz \"%s\" je dostupný pouze v grafickém rozhraní"
 
@@ -4078,7 +4137,7 @@ msgstr ""
 "faktorem 2 tedy zabere dvakrát tolik místa než položka s faktorem 1. Pro "
 "zobrazení změn restartujte aplikaci."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:521
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:525
 msgid "The following attachments are being watched for changes:"
 msgstr "Následující přílohy jsou sledovány, zda došlo k jejich změně:"
 
@@ -4184,12 +4243,10 @@ msgstr ""
 msgid "The Web Clipper needs your authorisation to access your data."
 msgstr ""
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:84
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:84
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr "Služba Web clipper je povolena a nastavena pro zapnutí při spuštění."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:109
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:108
 msgid "The web clipper service is not enabled."
 msgstr "Služba Web clipper není povolena."
@@ -4270,7 +4327,6 @@ msgstr "Tato příloha ještě není stažena nebo dešifrována"
 msgid "This attachment is not downloaded or not decrypted yet."
 msgstr "Tato příloha není ještě stažena nebo dešifrována."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:214
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:156
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
@@ -4297,7 +4353,7 @@ msgstr "Tato poznámka nemá informace o zeměpisné poloze."
 msgid "This note has been modified:"
 msgstr "Poznámka byla upravena:"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
 "note."
@@ -4307,7 +4363,7 @@ msgstr "Tato poznámka je prázdná. pro otevření editoru klepněte na \"%s\".
 msgid "This note has no history"
 msgstr "Tato poznámka nemá historii"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:449
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:452
 msgid ""
 "This Rich Text editor has a number of limitations and it is recommended to "
 "be aware of them before using it."
@@ -4315,7 +4371,6 @@ msgstr ""
 "Tento editor formátovaného textu má řadu omezení a při jeho používání "
 "doporučujeme mít se na pozoru."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:155
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:134
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
@@ -4361,7 +4416,7 @@ msgstr "název"
 msgid "Title"
 msgstr "Název"
 
-#: packages/app-cli/app/command-sync.ts:91
+#: packages/app-cli/app/command-sync.ts:82
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:45
 #: packages/app-mobile/components/screens/dropbox-login.js:58
 msgid ""
@@ -4473,7 +4528,6 @@ msgstr "Zobrazit/skrýt postranní lištu"
 msgid "Toggle sort order field"
 msgstr "Přepnout nouzový režim"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:40
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:41
 msgid "Token has been copied to the clipboard!"
 msgstr "Token byl zkopírován do schránky!"
@@ -4495,6 +4549,12 @@ msgstr "Celkem: %d/%d"
 msgid "Try again"
 msgstr "Zkusit znovu"
 
+#: packages/lib/utils/joplinCloud.ts:309 packages/lib/utils/joplinCloud.ts:331
+#: packages/lib/utils/joplinCloud.ts:353
+#, fuzzy
+msgid "Try it now"
+msgstr "Provést ihned"
+
 #: packages/app-cli/app/command-help.js:71
 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
@@ -4572,7 +4632,7 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nepodporovaný formát obrázku: %s"
 
-#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:35
+#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:40
 #: packages/app-desktop/gui/NoteRevisionViewer.min.js:142
 msgid "Unsupported link or message: %s"
 msgstr "Nepodporovaný odkaz či zpráva: %s"
@@ -4755,7 +4815,7 @@ msgid "Warning: not all resources shown for performance reasons (limit: %s)."
 msgstr ""
 "Upozornění: nejsou zobrazeny všechny prostředky z důvodů výkonu (limit: %s)."
 
-#: packages/lib/models/Setting.ts:2408
+#: packages/lib/models/Setting.ts:2408 packages/lib/utils/joplinCloud.ts:153
 msgid "Web Clipper"
 msgstr "Web Clipper"
 
@@ -4808,11 +4868,12 @@ msgstr "Při vytváření nového úkolu:"
 msgid "Words"
 msgstr "Slova"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "y"
 msgstr "y"
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "Y"
 msgstr "Y"
 
@@ -4868,7 +4929,7 @@ msgstr "Vaše data budou znovu zašifrována a znovu synchronizována."
 msgid "Your password is needed to decrypt some of your data."
 msgstr ""
 
-#: packages/app-cli/app/command-sync.ts:242
+#: packages/app-cli/app/command-sync.ts:233
 msgid ""
 "Your password is needed to decrypt some of your data. Type `:e2ee decrypt` "
 "to set it."

packages/tools/locales/da_DK.po

@@ -7,8 +7,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 "Last-Translator: ERYpTION\n"
 "Language-Team: \n"
 "Language: da_DK\n"
@@ -92,6 +90,16 @@ msgstr "&Vis"
 msgid "%d days"
 msgstr "%d dage"
 
+#: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137
+#: packages/lib/utils/joplinCloud.ts:138
+msgid "%d GB"
+msgstr "%d GB"
+
+#: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134
+#: packages/lib/utils/joplinCloud.ts:135
+msgid "%d GB storage space"
+msgstr "%d GB lagerplads"
+
 #: packages/lib/models/Setting.ts:1322
 msgid "%d hour"
 msgstr "%d time"
@@ -100,6 +108,16 @@ msgstr "%d time"
 msgid "%d hours"
 msgstr "%d timer"
 
+#: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125
+#: packages/lib/utils/joplinCloud.ts:126
+msgid "%d MB"
+msgstr "%d MB"
+
+#: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122
+#: packages/lib/utils/joplinCloud.ts:123
+msgid "%d MB per note or attachment"
+msgstr "%d MB pr. note eller vedhæftning"
+
 #: packages/lib/models/Setting.ts:1319 packages/lib/models/Setting.ts:1320
 #: packages/lib/models/Setting.ts:1321
 msgid "%d minutes"
@@ -177,10 +195,11 @@ msgid ""
 "to list tags associated with [note]. The command `tag list` can be used to "
 "list all the tags (use -l for long option)."
 msgstr ""
-"<tag-command> (etiket-kommando) kan enten være \"add\" (tilføj), \"remove"
-"\" (slet) eller \"list\" (liste) for at tilføje eller fjerne [tag] fra "
-"[note], eller for at liste de noter der bruger [tag]. Kommandoen `tag-list` "
-"kan bruges til at vise alle etiketter (brug -l for at vise den lange udgave)."
+"<tag-command> (etiket-kommando) kan enten være \"add\" (tilføj), "
+"\"remove\" (slet) eller \"list\" (liste) for at tilføje eller fjerne [tag] "
+"fra [note], eller for at liste de noter der bruger [tag]. Kommandoen `tag-"
+"list` kan bruges til at vise alle etiketter (brug -l for at vise den lange "
+"udgave)."
 
 #: packages/app-cli/app/command-todo.js:14
 msgid ""
@@ -287,7 +306,6 @@ msgstr "Admin"
 msgid "Admin dashboard"
 msgstr "Kontrolpanel til administration"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:189
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:148
 msgid "Advanced options"
 msgstr "Avancerede indstillinger"
@@ -298,7 +316,7 @@ msgstr "Avancerede værktøjer"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:485
 #: packages/app-mobile/components/screens/notes.js:191
-#: packages/app-mobile/components/side-menu-content.tsx:453
+#: packages/app-mobile/components/side-menu-content.tsx:455
 msgid "All notes"
 msgstr "Alle noter"
 
@@ -323,14 +341,14 @@ msgid ""
 "Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to "
 "see the short notebook id or use $b for current selected notebook"
 msgstr ""
-"Tvetydig notesbog \"%s\". Brug venligst notesbog-id i stedet - tryk på \"ti"
-"\" for at se det korte notebogs-id eller brug $b for den aktuelle valgte "
+"Tvetydig notesbog \"%s\". Brug venligst notesbog-id i stedet - tryk på "
+"\"ti\" for at se det korte notebogs-id eller brug $b for den aktuelle valgte "
 "notesbog"
 
 #: packages/app-cli/app/command-mv.js:29
 msgid ""
-"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
-"\" to see the short notebook id"
+"Ambiguous notebook \"%s\". Please use short notebook id instead - press "
+"\"ti\" to see the short notebook id"
 msgstr ""
 "Tvetydig notesbog \"%s\". Brug venligst kort notesbog-id i stedet - tryk på "
 "\"ti\" for at se det korte notebogs-id"
@@ -351,7 +369,6 @@ msgstr "Program"
 msgid "Apply"
 msgstr "Anvend"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:44
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:45
 msgid "Are you sure you want to renew the authorisation token?"
 msgstr "Er du sikker på, at du vil forny autorisationstoken?"
@@ -417,14 +434,13 @@ msgstr ""
 "dit indhold til den før du synkroniserer, ellers vil alle filer blive "
 "slettet! Læs FAQ'en for flere detaljer: %s"
 
-#: packages/app-cli/app/command-sync.ts:82
-#: packages/app-cli/app/command-sync.ts:96
+#: packages/app-cli/app/command-sync.ts:73
+#: packages/app-cli/app/command-sync.ts:87
 #: packages/app-desktop/gui/OneDriveLoginScreen.tsx:45
 msgid ""
 "Authentication was not completed (did not receive an authentication token)."
 msgstr "Godkendelse blev ikke fuldført (modtog ikke autorisationstoken)."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:194
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:149
 msgid "Authorisation token:"
 msgstr "Autoriseringstoken:"
@@ -457,6 +473,10 @@ msgstr "Skifter automatisk tema så det matcher systemets tema"
 msgid "Back"
 msgstr "Tilbage"
 
+#: packages/lib/utils/joplinCloud.ts:294
+msgid "Basic"
+msgstr "Grundlæggende"
+
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33
 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132
 msgid "Bold"
@@ -482,11 +502,10 @@ msgstr "Kan dele"
 #: packages/app-desktop/bridge.ts:196 packages/app-desktop/bridge.ts:217
 #: packages/app-desktop/checkForUpdates.ts:199
 #: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:728
-#: packages/app-desktop/gui/DialogButtonRow.min.js:38
 #: packages/app-desktop/gui/DialogButtonRow.tsx:78
 #: packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx:82
 #: packages/app-desktop/gui/NoteList/NoteList.tsx:168
-#: packages/app-desktop/gui/PromptDialog.min.js:249
+#: packages/app-desktop/gui/PromptDialog.tsx:270
 #: packages/app-desktop/gui/ResourceScreen.tsx:170
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:318
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
@@ -498,14 +517,14 @@ msgstr "Kan dele"
 #: packages/app-mobile/components/screens/Note.tsx:104
 #: packages/app-mobile/components/screens/Note.tsx:586
 #: packages/app-mobile/components/SelectDateTimeDialog.tsx:152
-#: packages/app-mobile/components/side-menu-content.tsx:163
-#: packages/app-mobile/components/side-menu-content.tsx:172
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:165
+#: packages/app-mobile/components/side-menu-content.tsx:174
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/shim-init-node.js:196
 msgid "Cancel"
 msgstr "Annullér"
 
-#: packages/app-cli/app/app.js:171
+#: packages/app-cli/app/app.js:138
 msgid "Cancelling background synchronisation... Please wait."
 msgstr "Annullerer baggrunds synkronisering... Vent venligst."
 
@@ -513,7 +532,7 @@ msgstr "Annullerer baggrunds synkronisering... Vent venligst."
 msgid "Cancelling..."
 msgstr "Annullerer..."
 
-#: packages/app-cli/app/command-sync.ts:269
+#: packages/app-cli/app/command-sync.ts:260
 msgid "Cancelling... Please wait."
 msgstr "Annullerer... Vent venligst."
 
@@ -521,7 +540,7 @@ msgstr "Annullerer... Vent venligst."
 msgid "Cannot access %s"
 msgstr "Kan ikke tilgå %s"
 
-#: packages/app-cli/app/base-command.js:15
+#: packages/app-cli/app/base-command.ts:15
 msgid "Cannot change encrypted item"
 msgstr "Kan ikke ændre krypteret emne"
 
@@ -557,7 +576,7 @@ msgstr "Kan ikke kopiere note til \"%s\" notesbog"
 msgid "Cannot find \"%s\"."
 msgstr "Kan ikke finde \"%s\"."
 
-#: packages/app-cli/app/command-sync.ts:182
+#: packages/app-cli/app/command-sync.ts:173
 msgid "Cannot initialise synchroniser."
 msgstr "Kan ikke starte synkroniseringen."
 
@@ -659,7 +678,7 @@ msgid "Chrome Web Store"
 msgstr "Chrome Web Store"
 
 #: packages/app-desktop/gui/EditFolderDialog/Dialog.tsx:146
-#: packages/app-desktop/gui/PromptDialog.min.js:256
+#: packages/app-desktop/gui/PromptDialog.tsx:277
 msgid "Clear"
 msgstr "Ryd"
 
@@ -675,7 +694,7 @@ msgstr ""
 "Klik på \"%s\" for at gendanne noten. Den vil blive kopieret til notesbogen "
 "\"%s\". Den nuværende version af noten vil ikke blive erstattet eller ændret."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:384
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:387
 msgid "Click to add tags..."
 msgstr "Klik for at tilføje etiketter..."
 
@@ -708,7 +727,7 @@ msgstr "Kode"
 msgid "Code Block"
 msgstr "Kode blok"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Code View"
 msgstr "Kodevisning"
 
@@ -716,7 +735,7 @@ msgstr "Kodevisning"
 msgid "Collaborate on notebooks with others"
 msgstr "Samarbejd med andre om notesbøger"
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Collapse"
 msgstr "Fold sammen"
 
@@ -770,7 +789,7 @@ msgid "Compress old changes"
 msgstr "Komprimér gamle ændringer"
 
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:681
-#: packages/app-mobile/components/side-menu-content.tsx:402
+#: packages/app-mobile/components/side-menu-content.tsx:404
 msgid "Configuration"
 msgstr "Indstillinger"
 
@@ -799,6 +818,10 @@ msgstr "Konflikter"
 msgid "Conflicts (attachments)"
 msgstr "Konflikter (vedhæftninger)"
 
+#: packages/lib/utils/joplinCloud.ts:171
+msgid "Consolidated billing"
+msgstr "Konsolideret fakturering"
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.tsx:110
 msgid "Content provided by %s"
 msgstr "Indhold leveret af %s"
@@ -813,7 +836,7 @@ msgstr "Konverter til opgave"
 
 #: packages/app-desktop/gui/MenuBar.tsx:492
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:13
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:782
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:783
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:157
 msgid "Copy"
 msgstr "Kopier"
@@ -852,7 +875,6 @@ msgid_plural "Copy Shareable Links"
 msgstr[0] "Kopier link til deling"
 msgstr[1] "Kopier links til deling"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:208
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:153
 msgid "Copy token"
 msgstr "Kopier token"
@@ -919,7 +941,7 @@ msgstr ""
 "Kunne ikke verificere denne notesbogs status for deling - afbryder. Prøv "
 "venligst igen, når du har forbindelse til internettet."
 
-#: packages/app-desktop/gui/PromptDialog.min.js:235
+#: packages/app-desktop/gui/PromptDialog.tsx:256
 msgid "Create"
 msgstr "Opret"
 
@@ -1018,7 +1040,7 @@ msgid "Custom TLS certificates"
 msgstr "Brugerdefinerede TLS certifikater"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:18
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:772
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:773
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:149
 msgid "Cut"
 msgstr "Klip"
@@ -1060,7 +1082,7 @@ msgid "Decrypted items: %s / %s"
 msgstr "Dekrypterede emner: %s / %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:734
-#: packages/app-mobile/components/side-menu-content.tsx:411
+#: packages/app-mobile/components/side-menu-content.tsx:413
 msgid "Decrypting items: %d/%d"
 msgstr "Dekrypterede emner: %d/%d"
 
@@ -1082,7 +1104,7 @@ msgstr "Standard: %s"
 #: packages/app-mobile/components/ScreenHeader.tsx:415
 #: packages/app-mobile/components/ScreenHeader.tsx:482
 #: packages/app-mobile/components/screens/Note.tsx:960
-#: packages/app-mobile/components/side-menu-content.tsx:153
+#: packages/app-mobile/components/side-menu-content.tsx:155
 msgid "Delete"
 msgstr "Slet"
 
@@ -1116,7 +1138,7 @@ msgid "Delete note?"
 msgstr "Slet note?"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:291
-#: packages/app-mobile/components/side-menu-content.tsx:155
+#: packages/app-mobile/components/side-menu-content.tsx:157
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
@@ -1204,7 +1226,6 @@ msgstr "Deaktiver kryptering"
 msgid "Disable safe mode and restart"
 msgstr "Deaktiver fejlsikret tilstand og genstart"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:103
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:102
 msgid "Disable Web Clipper Service"
 msgstr "Deaktiver Web-Clipper tjeneste"
@@ -1231,7 +1252,7 @@ msgstr ""
 msgid "Discard changes"
 msgstr "Kassér ændringer"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:451
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:454
 msgid "Dismiss"
 msgstr "Afvis"
 
@@ -1308,7 +1329,6 @@ msgstr "Færdig"
 msgid "Download"
 msgstr "Download"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:174
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:140
 msgid "Download and install the relevant extension for your browser:"
 msgstr "Download og installer den relevante udvidelse til din browser:"
@@ -1329,7 +1349,7 @@ msgstr "Downloadet og krypteret"
 msgid "Downloading"
 msgstr "Downloader"
 
-#: packages/app-cli/app/command-sync.ts:236
+#: packages/app-cli/app/command-sync.ts:227
 msgid "Downloading resources..."
 msgstr "Downloader ressource..."
 
@@ -1337,7 +1357,7 @@ msgstr "Downloader ressource..."
 msgid "Dracula"
 msgstr "Dracula"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Drop notes or files here"
 msgstr "Slip noter eller filer her"
 
@@ -1448,7 +1468,7 @@ msgstr "E-mail"
 msgid "Emails"
 msgstr "E-mails"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:195
 msgid "emphasised text"
 msgstr "fremhævet tekst"
 
@@ -1542,7 +1562,6 @@ msgstr "Slå typografunderstøttelse til"
 msgid "Enable video player"
 msgstr "Aktivér videoafspiller"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:114
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:113
 msgid "Enable Web Clipper Service"
 msgstr "Aktiver Web-Clipper tjeneste"
@@ -1569,7 +1588,7 @@ msgstr "Krypteret"
 msgid "Encrypted items cannot be modified"
 msgstr "Krypteret emner kan ikke rettes"
 
-#: packages/app-mobile/components/side-menu-content.tsx:139
+#: packages/app-mobile/components/side-menu-content.tsx:141
 msgid "Encrypted notebooks cannot be renamed"
 msgstr "Krypterede notesbøger kan ikke omdøbes"
 
@@ -1656,7 +1675,7 @@ msgstr "Evernote eksport fil (i Markdown)"
 msgid "Exits the application."
 msgstr "Lukker programmet."
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Expand"
 msgstr "Udvid"
 
@@ -1732,7 +1751,7 @@ msgid "Fetched items: %d/%d."
 msgstr "Hentede emner: %d/%d."
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:739
-#: packages/app-mobile/components/side-menu-content.tsx:416
+#: packages/app-mobile/components/side-menu-content.tsx:418
 msgid "Fetching resources: %d/%d"
 msgstr "Henter ressourcer: %d/%d"
 
@@ -2024,8 +2043,8 @@ msgid ""
 "note or notebook. `$c` can be used to refer to the currently selected item."
 msgstr ""
 "I enhver kommando kan en note eller notesbog refereres med titel eller ID, "
-"eller ved at bruge links `$n` eller `$b` for valgte noter eller notesbøger. `"
-"$c` kan bruges som reference til aktuel/valgt emne."
+"eller ved at bruge links `$n` eller `$b` for valgte noter eller notesbøger. "
+"`$c` kan bruges som reference til aktuel/valgt emne."
 
 #: packages/app-mobile/components/screens/Note.tsx:402
 msgid ""
@@ -2078,7 +2097,6 @@ msgstr ""
 "For at bruge filsystemsynkronisering skal du give tilladelse til at skrive "
 "til eksternt lager."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:142
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:130
 msgid "In order to use the web clipper, you need to do the following:"
 msgstr "For at bruge Web-Clipperen skal du gøre følgende:"
@@ -2087,7 +2105,7 @@ msgstr "For at bruge Web-Clipperen skal du gøre følgende:"
 msgid "In progress"
 msgstr "I gang"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:535
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:539
 msgid "In: %s"
 msgstr "I: %s"
 
@@ -2115,7 +2133,7 @@ msgstr "Inline-kode"
 msgid "Insert"
 msgstr "Indsæt"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:196
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:197
 msgid "Insert Hyperlink"
 msgstr "Indsæt hyperlink"
 
@@ -2247,7 +2265,6 @@ msgstr "Joplin Server-adgangskode"
 msgid "Joplin Server URL"
 msgstr "Joplin Server URL"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:137
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:129
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
@@ -2312,7 +2329,7 @@ msgstr "Sidste fejl: %s"
 msgid "Later"
 msgstr "Senere"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid "Layout"
 msgstr "Layout"
 
@@ -2362,9 +2379,9 @@ msgstr "Link-tekst"
 msgid "Links with protocol \"%s\" are not supported"
 msgstr "Links med \"%s\" protokollen er ikke understøttede"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:229
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:231
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:230
 #: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:232
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:233
 msgid "List item"
 msgstr "Listepunkt"
 
@@ -2380,7 +2397,7 @@ msgstr "Indlæst"
 msgid "Location"
 msgstr "Placering"
 
-#: packages/app-cli/app/command-sync.ts:137
+#: packages/app-cli/app/command-sync.ts:128
 msgid ""
 "Lock file is already being hold. If you know that no synchronisation is "
 "taking place, you may delete the lock file at \"%s\" and resume the "
@@ -2432,6 +2449,10 @@ msgstr "Administrer hovedadgangskode"
 msgid "Manage master password..."
 msgstr "Administrer hovedadgangskode..."
 
+#: packages/lib/utils/joplinCloud.ts:165
+msgid "Manage multiple users"
+msgstr "Administrer flere brugere"
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx:320
 msgid "Manage your plugins"
 msgstr "Administrer dine udvidelser"
@@ -2496,6 +2517,10 @@ msgstr "Maksimale samtidige forbindelser"
 msgid "Max Item Size"
 msgstr "Maks elementstørrelse"
 
+#: packages/lib/utils/joplinCloud.ts:117
+msgid "Max note or attachment size"
+msgstr "Maksimal størrelse af note eller vedhæftning"
+
 #: packages/server/src/routes/admin/users.ts:150
 msgid "Max Total Size"
 msgstr "Maks samlet størrelse"
@@ -2512,7 +2537,7 @@ msgstr "Manglende hovednøgler"
 msgid "Missing required argument: %s"
 msgstr "Mangler krævet argument: %s"
 
-#: packages/app-mobile/components/side-menu-content.tsx:437
+#: packages/app-mobile/components/side-menu-content.tsx:439
 msgid "Mobile data - auto-sync disabled"
 msgstr "Mobildata - auto-synk deaktiveret"
 
@@ -2524,7 +2549,7 @@ msgstr "Mere information"
 msgid "More information"
 msgstr "Mere information"
 
-#: packages/app-cli/app/app.js:63
+#: packages/app-cli/app/app.js:64
 msgid "More than one item match \"%s\". Please narrow down your query."
 msgstr "Mere end et emne matcher \"%s\".  Præciser din søgning."
 
@@ -2548,11 +2573,12 @@ msgstr "Flyt til notesbog..."
 msgid "Moves the given <item> to [notebook]"
 msgstr "Flytter det givne <item> til [notebook]."
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "n"
 msgstr "n"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "N"
 msgstr "N"
 
@@ -2566,7 +2592,7 @@ msgstr "Ny note"
 msgid "New notebook"
 msgstr "Ny notesbog"
 
-#: packages/app-mobile/components/side-menu-content.tsx:398
+#: packages/app-mobile/components/side-menu-content.tsx:400
 msgid "New Notebook"
 msgstr "Ny notesbog"
 
@@ -2631,11 +2657,11 @@ msgstr "Ingen aktiv notesbog."
 msgid "No item with ID %s"
 msgstr "Intet emne med ID'en %s"
 
-#: packages/app-cli/app/app.js:99
+#: packages/app-cli/app/app.js:100
 msgid "No notebook has been specified."
 msgstr "Ingen notesbog er specificeret."
 
-#: packages/app-cli/app/app.js:93
+#: packages/app-cli/app/app.js:94
 msgid "No notebook selected."
 msgstr "Ingen notesbog er valgt."
 
@@ -2651,7 +2677,7 @@ msgstr "Ingen ressourcer!"
 msgid "No results"
 msgstr "Ingen resultater"
 
-#: packages/app-cli/app/app.js:256
+#: packages/app-cli/app/app.js:224
 msgid "No such command: %s"
 msgstr "Kommando findes ikke: %s"
 
@@ -2670,7 +2696,7 @@ msgstr ""
 msgid "Nord"
 msgstr "Nord"
 
-#: packages/app-cli/app/command-sync.ts:106
+#: packages/app-cli/app/command-sync.ts:97
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
 "Ikke godkendt med %s. Angiv venligst eventuelle manglende "
@@ -2771,12 +2797,12 @@ msgstr "Notesbog"
 msgid "Notebook list growth factor"
 msgstr "Notesbogsliste-vækstfaktor"
 
-#: packages/app-mobile/components/side-menu-content.tsx:133
+#: packages/app-mobile/components/side-menu-content.tsx:135
 msgid "Notebook: %s"
 msgstr "Notesbog: %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:691
-#: packages/app-mobile/components/side-menu-content.tsx:457
+#: packages/app-mobile/components/side-menu-content.tsx:459
 msgid "Notebooks"
 msgstr "Notesbøger"
 
@@ -2805,15 +2831,14 @@ msgstr "Nummeret liste"
 #: packages/app-desktop/bridge.ts:190 packages/app-desktop/bridge.ts:196
 #: packages/app-desktop/bridge.ts:217 packages/app-desktop/bridge.ts:227
 #: packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx:28
-#: packages/app-desktop/gui/DialogButtonRow.min.js:30
 #: packages/app-desktop/gui/DialogButtonRow.tsx:70
 #: packages/app-desktop/gui/MenuBar.tsx:492
-#: packages/app-desktop/gui/PromptDialog.min.js:242
+#: packages/app-desktop/gui/PromptDialog.tsx:263
 #: packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx:26
 #: packages/app-mobile/components/CameraView.tsx:190
 #: packages/app-mobile/components/ModalDialog.js:67
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:203
-#: packages/app-mobile/components/side-menu-content.tsx:157
+#: packages/app-mobile/components/side-menu-content.tsx:159
 msgid "OK"
 msgstr "OK"
 
@@ -2937,7 +2962,7 @@ msgid "Passwords do not match!"
 msgstr "Adgangskoder stemmer ikke overens!"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:23
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:792
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:793
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:164
 msgid "Paste"
 msgstr "Indsæt"
@@ -2951,6 +2976,10 @@ msgstr "Sti:"
 msgid "PDF File"
 msgstr "PDF-fil"
 
+#: packages/lib/utils/joplinCloud.ts:355
+msgid "Per user. Minimum of %d users."
+msgstr "Pr. bruger. Minimum %d brugere."
+
 #: packages/app-mobile/components/screens/Note.tsx:403
 msgid "Permission needed"
 msgstr "Tilladelse nødvendig"
@@ -3025,7 +3054,7 @@ msgstr "Angiv hvilken notesbog, noterne skal importeres til."
 msgid "Please upgrade Joplin to use this plugin"
 msgstr "Opgrader venligst Joplin for at benytte denne udvidelse"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid ""
 "Please wait for all attachments to be downloaded and decrypted. You may also "
 "switch to %s to edit the note."
@@ -3107,10 +3136,18 @@ msgstr "Tidligere udgaver af denne note"
 msgid "Print"
 msgstr "Udskriv"
 
+#: packages/lib/utils/joplinCloud.ts:183
+msgid "Priority support"
+msgstr "Prioriteret support"
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:655
 msgid "Privacy Policy"
 msgstr "Privatlivspolitik"
 
+#: packages/lib/utils/joplinCloud.ts:316
+msgid "Pro"
+msgstr "Pro"
+
 #: packages/server/src/services/TaskService.ts:24
 msgid "Process failed payment subscriptions"
 msgstr "Behandl mislykkede betalingsabonnementer"
@@ -3164,6 +3201,7 @@ msgid "Publish Notes"
 msgstr "Publicer noter"
 
 #: packages/app-desktop/gui/SyncWizard/Dialog.tsx:178
+#: packages/lib/utils/joplinCloud.ts:141
 msgid "Publish notes to the internet"
 msgstr "Udgiv noter til internettet"
 
@@ -3185,7 +3223,7 @@ msgstr "Genkryptering"
 msgid "Re-upload local data to sync target"
 msgstr "Upload lokal data igen til synkroniseringsmål"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:450
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:453
 msgid "Read more about it"
 msgstr "Læs mere om det"
 
@@ -3244,7 +3282,7 @@ msgstr "Slet denne søgning fra sidebjælken?"
 
 #: packages/app-desktop/gui/MainScreen/commands/renameFolder.ts:8
 #: packages/app-desktop/gui/MainScreen/commands/renameTag.ts:8
-#: packages/app-mobile/components/side-menu-content.tsx:136
+#: packages/app-mobile/components/side-menu-content.tsx:138
 msgid "Rename"
 msgstr "Omdøb"
 
@@ -3260,7 +3298,6 @@ msgstr "Omdøb etikette:"
 msgid "Renames the given <item> (note or notebook) to <name>."
 msgstr "Omdøber det aktuelle <item> (note eller notesbog) til <name>."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:222
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:159
 msgid "Renew token"
 msgstr "Forny token"
@@ -3279,7 +3316,7 @@ msgstr "Erstat med..."
 
 #: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:257
 msgid "Replace: "
-msgstr "Erstat:"
+msgstr "Erstat: "
 
 #: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:219
 #: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:220
@@ -3316,7 +3353,7 @@ msgstr "Prøv igen"
 #: packages/app-desktop/gui/StatusScreen/StatusScreen.tsx:80
 #: packages/app-mobile/components/screens/status.js:112
 msgid "Retry All"
-msgstr "Prøv Alle"
+msgstr "Prøv alle"
 
 #: packages/app-desktop/gui/MainScreen/commands/revealResourceFile.ts:8
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:117
@@ -3432,7 +3469,7 @@ msgstr "Søg:"
 
 #: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:167
 #: packages/app-desktop/gui/lib/SearchInput/SearchInput.tsx:65
-#: packages/app-desktop/gui/NoteSearchBar.min.js:165
+#: packages/app-desktop/gui/NoteSearchBar.min.js:164
 msgid "Search..."
 msgstr "Søg..."
 
@@ -3514,6 +3551,10 @@ msgstr ""
 msgid "Share"
 msgstr "Del"
 
+#: packages/lib/utils/joplinCloud.ts:159
+msgid "Share and collaborate on a notebook"
+msgstr "Del og samarbejd om en notesbog"
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:339
 msgid "Share Notebook"
 msgstr "Del notesbog"
@@ -3522,6 +3563,10 @@ msgstr "Del notesbog"
 msgid "Share notebook..."
 msgstr "Del notesbog..."
 
+#: packages/lib/utils/joplinCloud.ts:177
+msgid "Sharing access control"
+msgstr "Adgangskontrol ved deling"
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:305
 msgid "Sharing notebook..."
 msgstr "Deler notesbog..."
@@ -3682,7 +3727,7 @@ msgstr ""
 "Dekryptering startet... Vent venligst da kan tage adskillige minutter "
 "afhængig af mængden der skal dekrypteres."
 
-#: packages/app-cli/app/command-sync.ts:213
+#: packages/app-cli/app/command-sync.ts:204
 msgid "Starting synchronisation..."
 msgstr "Starter synkronisering..."
 
@@ -3705,34 +3750,30 @@ msgstr "Statistikker..."
 msgid "Status"
 msgstr "Status"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:97
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:96
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:91
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:90
 msgid "Status: Started on port %d"
 msgstr "Status: Startet på port %d"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:150
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:133
 msgid "Step 1: Enable the clipper service"
 msgstr "Trin 1: Aktiver Web-Clipper tjenesten"
 
-#: packages/app-cli/app/command-sync.ts:92
+#: packages/app-cli/app/command-sync.ts:83
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:46
 #: packages/app-mobile/components/screens/dropbox-login.js:59
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr "Trin 1: Åben denne URL i din browser for at autorisere applikationen:"
 
-#: packages/app-cli/app/command-sync.ts:94
+#: packages/app-cli/app/command-sync.ts:85
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:50
 #: packages/app-mobile/components/screens/dropbox-login.js:65
 msgid "Step 2: Enter the code provided by Dropbox:"
 msgstr "Trin 2: Indtast koden, som oplyses af Dropbox:"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:169
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:139
 msgid "Step 2: Install the extension"
 msgstr "Trin 2: Installér udvidelsen"
@@ -3745,11 +3786,16 @@ msgstr "Stop"
 msgid "Stop external editing"
 msgstr "Stop ekstern redigering"
 
+#: packages/lib/utils/joplinCloud.ts:129
+#, fuzzy
+msgid "Storage space"
+msgstr "%d GB lagerplads"
+
 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:19
 msgid "Strikethrough"
 msgstr "Gennemstregning"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:193
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
 msgid "strong text"
 msgstr "fed (strong) tekst"
 
@@ -3807,6 +3853,10 @@ msgid ""
 msgstr ""
 "Skifter til [notebook] - alle fremtidige handlinger sker i denne notesbog."
 
+#: packages/lib/utils/joplinCloud.ts:147
+msgid "Sync as many devices as you want"
+msgstr "Synkroniser så mange enheder, du vil"
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:564
 msgid "Sync Status"
 msgstr "Synkroniseringsstatus"
@@ -3815,7 +3865,7 @@ msgstr "Synkroniseringsstatus"
 msgid "Sync status (synced items / total items)"
 msgstr "Synk status (synk'ede emner / emner i alt)"
 
-#: packages/app-cli/app/command-sync.ts:251
+#: packages/app-cli/app/command-sync.ts:242
 msgid "Sync target must be upgraded! Run `%s` to proceed."
 msgstr "Synk-mål skal opgraderes! Kør `%s` for at fortsætte."
 
@@ -3843,7 +3893,7 @@ msgstr "Synkronisering"
 msgid "Synchronisation interval"
 msgstr "Synkroniseringsinterval"
 
-#: packages/app-cli/app/command-sync.ts:132
+#: packages/app-cli/app/command-sync.ts:123
 msgid "Synchronisation is already in progress."
 msgstr "Synkronisering er allerede i gang."
 
@@ -3856,12 +3906,12 @@ msgstr "Synkroniseringsstatus"
 msgid "Synchronisation target"
 msgstr "Synkroniseringsmål"
 
-#: packages/app-cli/app/command-sync.ts:180
+#: packages/app-cli/app/command-sync.ts:171
 msgid "Synchronisation target: %s (%s)"
 msgstr "Synkroniseringsmål: %s (%s)"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/commands/synchronize.ts:8
 msgid "Synchronise"
 msgstr "Synkroniser"
@@ -3899,7 +3949,7 @@ msgstr "Etiketterede: %d."
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:715
 #: packages/app-mobile/components/screens/Note.tsx:933
 #: packages/app-mobile/components/screens/tags.js:101
-#: packages/app-mobile/components/side-menu-content.tsx:400
+#: packages/app-mobile/components/side-menu-content.tsx:402
 msgid "Tags"
 msgstr "Etiketter"
 
@@ -3916,6 +3966,10 @@ msgstr "Opgaveliste"
 msgid "Tasks"
 msgstr "Opgaver"
 
+#: packages/lib/utils/joplinCloud.ts:338
+msgid "Teams"
+msgstr "Teams"
+
 #: packages/lib/models/Setting.ts:1343
 msgid "Text editor command"
 msgstr "Tekstredigeringskomando"
@@ -3953,7 +4007,7 @@ msgstr "Denne app er succesfuldt godkendt."
 msgid "The application must be restarted for these changes to take effect."
 msgstr "Applikationen skal genstartes før disse ændringer kan træde i kraft."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:522
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:526
 msgid ""
 "The attachments will no longer be watched when you switch to a different "
 "note."
@@ -3961,7 +4015,7 @@ msgstr ""
 "Vedhæftningerne vil ikke længere blive overvåget, hvis du skifter til en "
 "anden note."
 
-#: packages/app-cli/app/app.js:304
+#: packages/app-cli/app/app.js:272
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "Kommando \"%s\" er kun til rådighed i GUI tilstand"
 
@@ -4010,7 +4064,7 @@ msgstr ""
 "Således vil et element med en faktor 2 optage dobbelt så meget plads som et "
 "element med en faktor 1. Genstart app'en for at se ændringer."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:521
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:525
 msgid "The following attachments are being watched for changes:"
 msgstr "Følgende vedhæftninger overvåges for ændringer:"
 
@@ -4120,12 +4174,10 @@ msgid "The Web Clipper needs your authorisation to access your data."
 msgstr ""
 "Web Clipper har brug for din tilladelse til at få adgang til dine data."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:84
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:84
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr "Web-clipper tjenesten er slået til og sat til at starte automatisk."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:109
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:108
 msgid "The web clipper service is not enabled."
 msgstr "Web-Clipper tjenesten er ikke slået til."
@@ -4211,7 +4263,6 @@ msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 "Denne vedhæftning er ikke downloadet eller er ikke blevet dekrypteret endnu."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:214
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:156
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
@@ -4238,7 +4289,7 @@ msgstr "Denne note har ingen geolokationsoplysninger."
 msgid "This note has been modified:"
 msgstr "Denne note er blevet ændret:"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
 "note."
@@ -4250,7 +4301,7 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Denne note har ingen historie"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:449
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:452
 msgid ""
 "This Rich Text editor has a number of limitations and it is recommended to "
 "be aware of them before using it."
@@ -4258,7 +4309,6 @@ msgstr ""
 "Denne Rich Text editor har en række begrænsninger, og det anbefales at være "
 "opmærksom på disse, før den bruges."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:155
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:134
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
@@ -4303,7 +4353,7 @@ msgstr "titel"
 msgid "Title"
 msgstr "Titel"
 
-#: packages/app-cli/app/command-sync.ts:91
+#: packages/app-cli/app/command-sync.ts:82
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:45
 #: packages/app-mobile/components/screens/dropbox-login.js:58
 msgid ""
@@ -4411,7 +4461,6 @@ msgstr "Slå sidebar til eller fra"
 msgid "Toggle sort order field"
 msgstr "Slå felt for sorteringsrækkefølge til eller fra"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:40
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:41
 msgid "Token has been copied to the clipboard!"
 msgstr "Din token er blevet kopieret til udklipsholderen!"
@@ -4432,6 +4481,11 @@ msgstr "I alt: %d/%d"
 msgid "Try again"
 msgstr "Prøv igen"
 
+#: packages/lib/utils/joplinCloud.ts:309 packages/lib/utils/joplinCloud.ts:331
+#: packages/lib/utils/joplinCloud.ts:353
+msgid "Try it now"
+msgstr "Prøv det nu"
+
 #: packages/app-cli/app/command-help.js:71
 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
@@ -4507,7 +4561,7 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Ikke-understøttet billedtype: %s"
 
-#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:35
+#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:40
 #: packages/app-desktop/gui/NoteRevisionViewer.min.js:142
 msgid "Unsupported link or message: %s"
 msgstr "Ugyldigt link eller besked: %s"
@@ -4685,7 +4739,7 @@ msgstr ""
 "Advarsel: Ikke alle ressourcer kan vises af ydelsesmæssige årsager "
 "(Begrænsning: %s)."
 
-#: packages/lib/models/Setting.ts:2408
+#: packages/lib/models/Setting.ts:2408 packages/lib/utils/joplinCloud.ts:153
 msgid "Web Clipper"
 msgstr "Web-clipper"
 
@@ -4740,11 +4794,12 @@ msgstr "Ved oprettelse af ny opgave:"
 msgid "Words"
 msgstr "Ord"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "y"
 msgstr "j"
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "Y"
 msgstr "J"
 
@@ -4800,7 +4855,7 @@ msgstr "Dine data bliver genkrypteret og synkroniseret igen."
 msgid "Your password is needed to decrypt some of your data."
 msgstr "Din adgangskode er nødvendig for at dekryptere nogle af dine data."
 
-#: packages/app-cli/app/command-sync.ts:242
+#: packages/app-cli/app/command-sync.ts:233
 msgid ""
 "Your password is needed to decrypt some of your data. Type `:e2ee decrypt` "
 "to set it."

packages/tools/locales/de_DE.po

@@ -7,8 +7,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 "Last-Translator: MrKanister <pueblos_spatulas@aleeas.com>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -16,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.2\n"
+"X-Generator: Poedit 3.2.1\n"
 
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:609
 msgid "- Camera: to allow taking a picture and attaching it to a note."
@@ -91,6 +89,16 @@ msgstr "&Ansicht"
 msgid "%d days"
 msgstr "%d Tage"
 
+#: packages/lib/utils/joplinCloud.ts:136 packages/lib/utils/joplinCloud.ts:137
+#: packages/lib/utils/joplinCloud.ts:138
+msgid "%d GB"
+msgstr "%d GB"
+
+#: packages/lib/utils/joplinCloud.ts:133 packages/lib/utils/joplinCloud.ts:134
+#: packages/lib/utils/joplinCloud.ts:135
+msgid "%d GB storage space"
+msgstr "%d GB Speicherplatz"
+
 #: packages/lib/models/Setting.ts:1322
 msgid "%d hour"
 msgstr "%d Stunde"
@@ -99,6 +107,16 @@ msgstr "%d Stunde"
 msgid "%d hours"
 msgstr "%d Stunden"
 
+#: packages/lib/utils/joplinCloud.ts:124 packages/lib/utils/joplinCloud.ts:125
+#: packages/lib/utils/joplinCloud.ts:126
+msgid "%d MB"
+msgstr "&d MB"
+
+#: packages/lib/utils/joplinCloud.ts:121 packages/lib/utils/joplinCloud.ts:122
+#: packages/lib/utils/joplinCloud.ts:123
+msgid "%d MB per note or attachment"
+msgstr "%d MB pro Notiz oder Anhang"
+
 #: packages/lib/models/Setting.ts:1319 packages/lib/models/Setting.ts:1320
 #: packages/lib/models/Setting.ts:1321
 msgid "%d minutes"
@@ -288,7 +306,6 @@ msgstr "Admin"
 msgid "Admin dashboard"
 msgstr "Admin-Übersichtsseite"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:189
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:148
 msgid "Advanced options"
 msgstr "Erweiterte Optionen"
@@ -299,7 +316,7 @@ msgstr "Erweiterte Optionen"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:485
 #: packages/app-mobile/components/screens/notes.js:191
-#: packages/app-mobile/components/side-menu-content.tsx:453
+#: packages/app-mobile/components/side-menu-content.tsx:455
 msgid "All notes"
 msgstr "Alle Notizen"
 
@@ -332,8 +349,8 @@ msgstr ""
 
 #: packages/app-cli/app/command-mv.js:29
 msgid ""
-"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
-"\" to see the short notebook id"
+"Ambiguous notebook \"%s\". Please use short notebook id instead - press "
+"\"ti\" to see the short notebook id"
 msgstr ""
 "Zweideutiges Notizbuch „%s“. Bitte verwende stattdessen die kurze Notizbuch-"
 "ID - drücke „ti“, um die kurze Notizbuch-ID zu sehen"
@@ -357,7 +374,6 @@ msgstr "Anwendung"
 msgid "Apply"
 msgstr "Anwenden"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:44
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:45
 msgid "Are you sure you want to renew the authorisation token?"
 msgstr "Bist du sicher, dass du den Berechtigungstoken erneuern möchtest?"
@@ -423,8 +439,8 @@ msgstr ""
 "neuen Ablageort kopiert hast, sonst werden alle Dateien gelöscht! Lies auch "
 "die FAQs hierzu: %s"
 
-#: packages/app-cli/app/command-sync.ts:82
-#: packages/app-cli/app/command-sync.ts:96
+#: packages/app-cli/app/command-sync.ts:73
+#: packages/app-cli/app/command-sync.ts:87
 #: packages/app-desktop/gui/OneDriveLoginScreen.tsx:45
 msgid ""
 "Authentication was not completed (did not receive an authentication token)."
@@ -432,7 +448,6 @@ msgstr ""
 "Authentifizierung wurde nicht abgeschlossen (keinen Authentifizierung-Token "
 "erhalten)."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:194
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:149
 msgid "Authorisation token:"
 msgstr "Berechtigungstoken:"
@@ -473,6 +488,10 @@ msgstr "Automatisch das Design ändern, um es dem System-Design anzupassen"
 msgid "Back"
 msgstr "Zurück"
 
+#: packages/lib/utils/joplinCloud.ts:294
+msgid "Basic"
+msgstr "Standard"
+
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:33
 #: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:132
 msgid "Bold"
@@ -498,11 +517,10 @@ msgstr "Teilen möglich"
 #: packages/app-desktop/bridge.ts:196 packages/app-desktop/bridge.ts:217
 #: packages/app-desktop/checkForUpdates.ts:199
 #: packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx:728
-#: packages/app-desktop/gui/DialogButtonRow.min.js:38
 #: packages/app-desktop/gui/DialogButtonRow.tsx:78
 #: packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx:82
 #: packages/app-desktop/gui/NoteList/NoteList.tsx:168
-#: packages/app-desktop/gui/PromptDialog.min.js:249
+#: packages/app-desktop/gui/PromptDialog.tsx:270
 #: packages/app-desktop/gui/ResourceScreen.tsx:170
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:318
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
@@ -514,14 +532,14 @@ msgstr "Teilen möglich"
 #: packages/app-mobile/components/screens/Note.tsx:104
 #: packages/app-mobile/components/screens/Note.tsx:586
 #: packages/app-mobile/components/SelectDateTimeDialog.tsx:152
-#: packages/app-mobile/components/side-menu-content.tsx:163
-#: packages/app-mobile/components/side-menu-content.tsx:172
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:165
+#: packages/app-mobile/components/side-menu-content.tsx:174
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/shim-init-node.js:196
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: packages/app-cli/app/app.js:171
+#: packages/app-cli/app/app.js:138
 msgid "Cancelling background synchronisation... Please wait."
 msgstr "Hintergrundsynchronisation wird abgebrochen … Bitte warten."
 
@@ -529,7 +547,7 @@ msgstr "Hintergrundsynchronisation wird abgebrochen … Bitte warten."
 msgid "Cancelling..."
 msgstr "Wird abgebrochen ..."
 
-#: packages/app-cli/app/command-sync.ts:269
+#: packages/app-cli/app/command-sync.ts:260
 msgid "Cancelling... Please wait."
 msgstr "Abbrechen... Bitte warten."
 
@@ -537,7 +555,7 @@ msgstr "Abbrechen... Bitte warten."
 msgid "Cannot access %s"
 msgstr "Kann nicht auf %s zugreifen"
 
-#: packages/app-cli/app/base-command.js:15
+#: packages/app-cli/app/base-command.ts:15
 msgid "Cannot change encrypted item"
 msgstr "Kann verschlüsseltes Objekt nicht ändern"
 
@@ -573,7 +591,7 @@ msgstr "Kann Notiz nicht in das Notizbuch „%s“ kopieren"
 msgid "Cannot find \"%s\"."
 msgstr "Kann „%s“ nicht finden."
 
-#: packages/app-cli/app/command-sync.ts:182
+#: packages/app-cli/app/command-sync.ts:173
 msgid "Cannot initialise synchroniser."
 msgstr "Kann Synchronisierer nicht initialisieren."
 
@@ -679,7 +697,7 @@ msgid "Chrome Web Store"
 msgstr "Chrome-Webstore"
 
 #: packages/app-desktop/gui/EditFolderDialog/Dialog.tsx:146
-#: packages/app-desktop/gui/PromptDialog.min.js:256
+#: packages/app-desktop/gui/PromptDialog.tsx:277
 msgid "Clear"
 msgstr "Leeren"
 
@@ -696,7 +714,7 @@ msgstr ""
 "namens „%s“ kopiert. Die aktuelle Version der Notiz wird nicht ersetzt oder "
 "verändert."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:384
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:387
 msgid "Click to add tags..."
 msgstr "Zum Hinzufügen von Schlagwörtern klicken ..."
 
@@ -729,7 +747,7 @@ msgstr "Code"
 msgid "Code Block"
 msgstr "Code-Block"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Code View"
 msgstr "Code-Ansicht"
 
@@ -737,7 +755,7 @@ msgstr "Code-Ansicht"
 msgid "Collaborate on notebooks with others"
 msgstr "Gemeinsam mit anderen an Notizbüchern arbeiten"
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Collapse"
 msgstr "Einklappen"
 
@@ -791,7 +809,7 @@ msgid "Compress old changes"
 msgstr "Komprimiere alte Änderungen"
 
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:681
-#: packages/app-mobile/components/side-menu-content.tsx:402
+#: packages/app-mobile/components/side-menu-content.tsx:404
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -820,6 +838,10 @@ msgstr "Konflikte"
 msgid "Conflicts (attachments)"
 msgstr "Konflikte (Anhänge)"
 
+#: packages/lib/utils/joplinCloud.ts:171
+msgid "Consolidated billing"
+msgstr "Konsolidierte Rechnung"
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.tsx:110
 msgid "Content provided by %s"
 msgstr "Von %s bereitgestellte Inhalte"
@@ -834,7 +856,7 @@ msgstr "In eine Aufgabe umwandeln"
 
 #: packages/app-desktop/gui/MenuBar.tsx:492
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:13
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:782
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:783
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:157
 msgid "Copy"
 msgstr "Kopieren"
@@ -872,7 +894,6 @@ msgid_plural "Copy Shareable Links"
 msgstr[0] "Teilbaren Link kopieren"
 msgstr[1] "Teilbare Links kopieren"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:208
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:153
 msgid "Copy token"
 msgstr "Token kopieren"
@@ -941,7 +962,7 @@ msgstr ""
 "wird abgebrochen. Bitte versuche es erneut, wenn eine Internetverbindung "
 "besteht."
 
-#: packages/app-desktop/gui/PromptDialog.min.js:235
+#: packages/app-desktop/gui/PromptDialog.tsx:256
 msgid "Create"
 msgstr "Erstellen"
 
@@ -1041,7 +1062,7 @@ msgid "Custom TLS certificates"
 msgstr "Benutzerdefinierte TLS-Zertifikate"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:18
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:772
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:773
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:149
 msgid "Cut"
 msgstr "Ausschneiden"
@@ -1083,7 +1104,7 @@ msgid "Decrypted items: %s / %s"
 msgstr "Entschlüsselte Objekte: %s / %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:734
-#: packages/app-mobile/components/side-menu-content.tsx:411
+#: packages/app-mobile/components/side-menu-content.tsx:413
 msgid "Decrypting items: %d/%d"
 msgstr "Entschlüsselte Objekte: %d/%d"
 
@@ -1105,7 +1126,7 @@ msgstr "Standard: %s"
 #: packages/app-mobile/components/ScreenHeader.tsx:415
 #: packages/app-mobile/components/ScreenHeader.tsx:482
 #: packages/app-mobile/components/screens/Note.tsx:960
-#: packages/app-mobile/components/side-menu-content.tsx:153
+#: packages/app-mobile/components/side-menu-content.tsx:155
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1139,7 +1160,7 @@ msgid "Delete note?"
 msgstr "Notiz löschen?"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:291
-#: packages/app-mobile/components/side-menu-content.tsx:155
+#: packages/app-mobile/components/side-menu-content.tsx:157
 msgid ""
 "Delete notebook \"%s\"?\n"
 "\n"
@@ -1228,7 +1249,6 @@ msgstr "Verschlüsselung deaktivieren"
 msgid "Disable safe mode and restart"
 msgstr "Sicheren Modus beenden und neu starten"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:103
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:102
 msgid "Disable Web Clipper Service"
 msgstr "Web-Clipper-Dienst deaktivieren"
@@ -1256,7 +1276,7 @@ msgstr ""
 msgid "Discard changes"
 msgstr "Änderungen verwerfen"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:451
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:454
 msgid "Dismiss"
 msgstr "Ausblenden"
 
@@ -1335,7 +1355,6 @@ msgstr "Fertig"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:174
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:140
 msgid "Download and install the relevant extension for your browser:"
 msgstr ""
@@ -1358,7 +1377,7 @@ msgstr "Heruntergeladen und verschlüsselt"
 msgid "Downloading"
 msgstr "Wird heruntergeladen"
 
-#: packages/app-cli/app/command-sync.ts:236
+#: packages/app-cli/app/command-sync.ts:227
 msgid "Downloading resources..."
 msgstr "Anhänge werden heruntergeladen ..."
 
@@ -1366,7 +1385,7 @@ msgstr "Anhänge werden heruntergeladen ..."
 msgid "Dracula"
 msgstr "Dracula"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid "Drop notes or files here"
 msgstr "Notizen oder Dateien hierher ziehen"
 
@@ -1479,7 +1498,7 @@ msgstr "E-Mail"
 msgid "Emails"
 msgstr "E-Mails"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:195
 msgid "emphasised text"
 msgstr "hervorgehobener Text"
 
@@ -1573,7 +1592,6 @@ msgstr "Typographie-Unterstützung aktivieren"
 msgid "Enable video player"
 msgstr "Videospieler aktivieren"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:114
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:113
 msgid "Enable Web Clipper Service"
 msgstr "Web-Clipper-Dienst aktivieren"
@@ -1600,7 +1618,7 @@ msgstr "Verschlüsselt"
 msgid "Encrypted items cannot be modified"
 msgstr "Verschlüsselte Elemente können nicht verändert werden"
 
-#: packages/app-mobile/components/side-menu-content.tsx:139
+#: packages/app-mobile/components/side-menu-content.tsx:141
 msgid "Encrypted notebooks cannot be renamed"
 msgstr "Verschlüsselte Notizbücher können nicht umbenannt werden"
 
@@ -1687,7 +1705,7 @@ msgstr "Evernote Export-Datei (als Markdown)"
 msgid "Exits the application."
 msgstr "Beendet die Anwendung."
 
-#: packages/app-mobile/components/side-menu-content.tsx:331
+#: packages/app-mobile/components/side-menu-content.tsx:333
 msgid "Expand"
 msgstr "Erweitern"
 
@@ -1764,7 +1782,7 @@ msgid "Fetched items: %d/%d."
 msgstr "Geladene Elemente: %d/%d."
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:739
-#: packages/app-mobile/components/side-menu-content.tsx:416
+#: packages/app-mobile/components/side-menu-content.tsx:418
 msgid "Fetching resources: %d/%d"
 msgstr "Anhänge abrufen: %d/%d"
 
@@ -2114,7 +2132,6 @@ msgstr ""
 "Deine Erlaubnis, auf externen Speicher zu schreiben, ist notwendig, um "
 "Synchronisation mit dem Dateisystem zu verwenden."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:142
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:130
 msgid "In order to use the web clipper, you need to do the following:"
 msgstr "Um den Web-Clipper zu benutzen, musst du Folgendes tun:"
@@ -2123,7 +2140,7 @@ msgstr "Um den Web-Clipper zu benutzen, musst du Folgendes tun:"
 msgid "In progress"
 msgstr "In Bearbeitung"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:535
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:539
 msgid "In: %s"
 msgstr "In: %s"
 
@@ -2151,7 +2168,7 @@ msgstr "Code im Fließtext"
 msgid "Insert"
 msgstr "Einfügen"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:196
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:197
 msgid "Insert Hyperlink"
 msgstr "Weblink einfügen"
 
@@ -2284,7 +2301,6 @@ msgstr "Joplin Server-Passwort"
 msgid "Joplin Server URL"
 msgstr "Joplin Server-URL"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:137
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:129
 msgid ""
 "Joplin Web Clipper allows saving web pages and screenshots from your browser "
@@ -2350,7 +2366,7 @@ msgstr "Letzte Fehlermeldung: %s"
 msgid "Later"
 msgstr "Später"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid "Layout"
 msgstr "Layout"
 
@@ -2400,9 +2416,9 @@ msgstr "Link-Text"
 msgid "Links with protocol \"%s\" are not supported"
 msgstr "Links mit dem Protokoll „%s“ werden nicht unterstützt"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:229
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:231
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:230
 #: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:232
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:233
 msgid "List item"
 msgstr "Listeneintrag"
 
@@ -2419,7 +2435,7 @@ msgstr "Geladen"
 msgid "Location"
 msgstr "Standort"
 
-#: packages/app-cli/app/command-sync.ts:137
+#: packages/app-cli/app/command-sync.ts:128
 msgid ""
 "Lock file is already being hold. If you know that no synchronisation is "
 "taking place, you may delete the lock file at \"%s\" and resume the "
@@ -2472,6 +2488,10 @@ msgstr "Master-Passwort verwalten"
 msgid "Manage master password..."
 msgstr "Master-Passwort verwalten..."
 
+#: packages/lib/utils/joplinCloud.ts:165
+msgid "Manage multiple users"
+msgstr "Verwalte mehrere Nutzer"
+
 #: packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx:320
 msgid "Manage your plugins"
 msgstr "Erweiterungen verwalten"
@@ -2535,6 +2555,10 @@ msgstr "Maximale Anzahl an gleichzeitigen Verbindungen"
 msgid "Max Item Size"
 msgstr "Maximale Elementgröße"
 
+#: packages/lib/utils/joplinCloud.ts:117
+msgid "Max note or attachment size"
+msgstr "Maximale Notiz- oder Anhanggröße"
+
 #: packages/server/src/routes/admin/users.ts:150
 msgid "Max Total Size"
 msgstr "Maximale Gesamtgröße"
@@ -2551,7 +2575,7 @@ msgstr "Fehlende Hauptschlüssel"
 msgid "Missing required argument: %s"
 msgstr "Fehlendes erforderliches Argument: %s"
 
-#: packages/app-mobile/components/side-menu-content.tsx:437
+#: packages/app-mobile/components/side-menu-content.tsx:439
 msgid "Mobile data - auto-sync disabled"
 msgstr "Mobile Daten - Auto-Synchronisierung deaktiviert"
 
@@ -2563,7 +2587,7 @@ msgstr "Weitere Information"
 msgid "More information"
 msgstr "Weitere Informationen"
 
-#: packages/app-cli/app/app.js:63
+#: packages/app-cli/app/app.js:64
 msgid "More than one item match \"%s\". Please narrow down your query."
 msgstr ""
 "Mehr als ein Element stimmt mit „%s“ überein. Bitte schränke deine Suche ein."
@@ -2589,11 +2613,12 @@ msgstr "In Notizbuch verschieben ..."
 msgid "Moves the given <item> to [notebook]"
 msgstr "Verschiebt das gewählte <item> nach [notebook]"
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "n"
 msgstr "n"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "N"
 msgstr "N"
 
@@ -2607,7 +2632,7 @@ msgstr "Neue Notiz"
 msgid "New notebook"
 msgstr "Neues Notizbuch"
 
-#: packages/app-mobile/components/side-menu-content.tsx:398
+#: packages/app-mobile/components/side-menu-content.tsx:400
 msgid "New Notebook"
 msgstr "Neues Notizbuch"
 
@@ -2674,11 +2699,11 @@ msgstr "Kein aktives Notizbuch."
 msgid "No item with ID %s"
 msgstr "Kein Element mit ID %s"
 
-#: packages/app-cli/app/app.js:99
+#: packages/app-cli/app/app.js:100
 msgid "No notebook has been specified."
 msgstr "Es wurde kein Notizbuch festgelegt."
 
-#: packages/app-cli/app/app.js:93
+#: packages/app-cli/app/app.js:94
 msgid "No notebook selected."
 msgstr "Kein Notizbuch ausgewählt."
 
@@ -2695,7 +2720,7 @@ msgstr "Keine Anhänge!"
 msgid "No results"
 msgstr "Keine Ergebnisse"
 
-#: packages/app-cli/app/app.js:256
+#: packages/app-cli/app/app.js:224
 msgid "No such command: %s"
 msgstr "Befehl nicht gefunden: %s"
 
@@ -2714,7 +2739,7 @@ msgstr ""
 msgid "Nord"
 msgstr "Nord"
 
-#: packages/app-cli/app/command-sync.ts:106
+#: packages/app-cli/app/command-sync.ts:97
 msgid "Not authentified with %s. Please provide any missing credentials."
 msgstr ""
 "Keine Authentifizierung mit %s. Gib bitte alle fehlenden Zugangsdaten an."
@@ -2815,12 +2840,12 @@ msgstr "Notizbuch"
 msgid "Notebook list growth factor"
 msgstr "Notizbuch-Listenwachstumsfaktor"
 
-#: packages/app-mobile/components/side-menu-content.tsx:133
+#: packages/app-mobile/components/side-menu-content.tsx:135
 msgid "Notebook: %s"
 msgstr "Notizbuch: %s"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:691
-#: packages/app-mobile/components/side-menu-content.tsx:457
+#: packages/app-mobile/components/side-menu-content.tsx:459
 msgid "Notebooks"
 msgstr "Notizbücher"
 
@@ -2851,15 +2876,14 @@ msgstr "Nummerierte Liste"
 #: packages/app-desktop/bridge.ts:190 packages/app-desktop/bridge.ts:196
 #: packages/app-desktop/bridge.ts:217 packages/app-desktop/bridge.ts:227
 #: packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx:28
-#: packages/app-desktop/gui/DialogButtonRow.min.js:30
 #: packages/app-desktop/gui/DialogButtonRow.tsx:70
 #: packages/app-desktop/gui/MenuBar.tsx:492
-#: packages/app-desktop/gui/PromptDialog.min.js:242
+#: packages/app-desktop/gui/PromptDialog.tsx:263
 #: packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx:26
 #: packages/app-mobile/components/CameraView.tsx:190
 #: packages/app-mobile/components/ModalDialog.js:67
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:203
-#: packages/app-mobile/components/side-menu-content.tsx:157
+#: packages/app-mobile/components/side-menu-content.tsx:159
 msgid "OK"
 msgstr "OK"
 
@@ -2984,7 +3008,7 @@ msgid "Passwords do not match!"
 msgstr "Passwörter sind nicht identisch!"
 
 #: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:23
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:792
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:793
 #: packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts:164
 msgid "Paste"
 msgstr "Einfügen"
@@ -2998,6 +3022,10 @@ msgstr "Pfad:"
 msgid "PDF File"
 msgstr "PDF-Datei"
 
+#: packages/lib/utils/joplinCloud.ts:355
+msgid "Per user. Minimum of %d users."
+msgstr "Pro Nutzer. Minimum von %d Nutzern."
+
 #: packages/app-mobile/components/screens/Note.tsx:403
 msgid "Permission needed"
 msgstr "Berechtigung benötigt"
@@ -3079,7 +3107,7 @@ msgid "Please upgrade Joplin to use this plugin"
 msgstr "Bitte aktualisiere Joplin, um diese Erweiterung zu nutzen"
 
 # Depending on the word that is used in %s, the preposition is either 'auf' or 'zu'.
-#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1172
+#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:1175
 msgid ""
 "Please wait for all attachments to be downloaded and decrypted. You may also "
 "switch to %s to edit the note."
@@ -3167,10 +3195,18 @@ msgstr "Vorherige Version dieser Notiz"
 msgid "Print"
 msgstr "Drucken"
 
+#: packages/lib/utils/joplinCloud.ts:183
+msgid "Priority support"
+msgstr "Premium Support"
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:655
 msgid "Privacy Policy"
 msgstr "Datenschutzrichtlinie"
 
+#: packages/lib/utils/joplinCloud.ts:316
+msgid "Pro"
+msgstr "Pro"
+
 #: packages/server/src/services/TaskService.ts:24
 msgid "Process failed payment subscriptions"
 msgstr "Verarbeite fehlgeschlagene Zahlungsabonnements"
@@ -3224,6 +3260,7 @@ msgid "Publish Notes"
 msgstr "Notizen veröffentlichen"
 
 #: packages/app-desktop/gui/SyncWizard/Dialog.tsx:178
+#: packages/lib/utils/joplinCloud.ts:141
 msgid "Publish notes to the internet"
 msgstr "Notizen im Internet veröffentlichen"
 
@@ -3245,7 +3282,7 @@ msgstr "Neuverschlüsselung"
 msgid "Re-upload local data to sync target"
 msgstr "Lade lokale Daten erneut auf das Synchronisierungsziel hoch"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:450
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:453
 msgid "Read more about it"
 msgstr "Mehr erfahren"
 
@@ -3305,7 +3342,7 @@ msgstr "Diese Suche von der Seitenleiste entfernen?"
 
 #: packages/app-desktop/gui/MainScreen/commands/renameFolder.ts:8
 #: packages/app-desktop/gui/MainScreen/commands/renameTag.ts:8
-#: packages/app-mobile/components/side-menu-content.tsx:136
+#: packages/app-mobile/components/side-menu-content.tsx:138
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -3321,7 +3358,6 @@ msgstr "Schlagwort umbenennen:"
 msgid "Renames the given <item> (note or notebook) to <name>."
 msgstr "Benennt das angegebene <item> (Notiz oder Notizbuch) zu <name> um."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:222
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:159
 msgid "Renew token"
 msgstr "Token erneuern"
@@ -3494,7 +3530,7 @@ msgstr "Suchen:"
 
 #: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:167
 #: packages/app-desktop/gui/lib/SearchInput/SearchInput.tsx:65
-#: packages/app-desktop/gui/NoteSearchBar.min.js:165
+#: packages/app-desktop/gui/NoteSearchBar.min.js:164
 msgid "Search..."
 msgstr "Suchen ..."
 
@@ -3576,6 +3612,11 @@ msgstr ""
 msgid "Share"
 msgstr "Teilen"
 
+# Plural klingt subjektiv besser als Singular.
+#: packages/lib/utils/joplinCloud.ts:159
+msgid "Share and collaborate on a notebook"
+msgstr "Teile Notizbücher und kollaboriere an ihnen"
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:339
 msgid "Share Notebook"
 msgstr "Notizbuch teilen"
@@ -3584,6 +3625,11 @@ msgstr "Notizbuch teilen"
 msgid "Share notebook..."
 msgstr "Notizbuch teilen..."
 
+# Schwierige Übersetzung. Habe es nach https://discourse.joplinapp.org/t/joplin-cloud-question-access-control/27723/3 bestmöglich versucht.
+#: packages/lib/utils/joplinCloud.ts:177
+msgid "Sharing access control"
+msgstr "Kontrolle der Zugriffsfreigaben"
+
 #: packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx:305
 msgid "Sharing notebook..."
 msgstr "Notizbuch wird geteilt ..."
@@ -3749,7 +3795,7 @@ msgstr ""
 "Entschlüsselung wird gestartet ... Bitte warten, da dies je nach Umfang der "
 "zu entschlüsselnden Daten mehrere Minuten dauern kann."
 
-#: packages/app-cli/app/command-sync.ts:213
+#: packages/app-cli/app/command-sync.ts:204
 msgid "Starting synchronisation..."
 msgstr "Synchronisation wird gestartet ..."
 
@@ -3772,35 +3818,31 @@ msgstr "Statistik ..."
 msgid "Status"
 msgstr "Status"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:97
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:96
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:91
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:90
 msgid "Status: Started on port %d"
 msgstr "Status: Gestartet auf Port %d"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:150
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:133
 msgid "Step 1: Enable the clipper service"
 msgstr "Schritt 1: Clipper-Dienst aktivieren"
 
-#: packages/app-cli/app/command-sync.ts:92
+#: packages/app-cli/app/command-sync.ts:83
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:46
 #: packages/app-mobile/components/screens/dropbox-login.js:59
 msgid "Step 1: Open this URL in your browser to authorise the application:"
 msgstr ""
 "Schritt 1: Öffne diese URL im Browser, um die Anwendung zu autorisieren:"
 
-#: packages/app-cli/app/command-sync.ts:94
+#: packages/app-cli/app/command-sync.ts:85
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:50
 #: packages/app-mobile/components/screens/dropbox-login.js:65
 msgid "Step 2: Enter the code provided by Dropbox:"
 msgstr "Schritt 2: Gib den von Dropbox bereitgestellten Code ein:"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:169
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:139
 msgid "Step 2: Install the extension"
 msgstr "Schritt 2: Erweiterung installieren"
@@ -3813,11 +3855,16 @@ msgstr "Stopp"
 msgid "Stop external editing"
 msgstr "Externe Bearbeitung stoppen"
 
+#: packages/lib/utils/joplinCloud.ts:129
+#, fuzzy
+msgid "Storage space"
+msgstr "%d GB Speicherplatz"
+
 #: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:19
 msgid "Strikethrough"
 msgstr "Durchstreichen"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:193
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:194
 msgid "strong text"
 msgstr "fetter Text"
 
@@ -3877,6 +3924,10 @@ msgstr ""
 "Wechselt zu [notebook] - alle weiteren Aktionen werden in diesem Notizbuch "
 "ausgeführt."
 
+#: packages/lib/utils/joplinCloud.ts:147
+msgid "Sync as many devices as you want"
+msgstr "Synchronisierung beliebig vieler Geräte"
+
 #: packages/app-mobile/components/screens/ConfigScreen.tsx:564
 msgid "Sync Status"
 msgstr "Synchronisationsstatus"
@@ -3885,7 +3936,7 @@ msgstr "Synchronisationsstatus"
 msgid "Sync status (synced items / total items)"
 msgstr "Synchronisationsstatus (synchronisierte Elemente / Elemente insgesamt)"
 
-#: packages/app-cli/app/command-sync.ts:251
+#: packages/app-cli/app/command-sync.ts:242
 msgid "Sync target must be upgraded! Run `%s` to proceed."
 msgstr ""
 "Das Synchronisationsziel muss aktualisiert werden! Führe `%s` aus, um "
@@ -3917,7 +3968,7 @@ msgstr "Synchronisation"
 msgid "Synchronisation interval"
 msgstr "Synchronisationsintervall"
 
-#: packages/app-cli/app/command-sync.ts:132
+#: packages/app-cli/app/command-sync.ts:123
 msgid "Synchronisation is already in progress."
 msgstr "Synchronisation wird bereits ausgeführt."
 
@@ -3930,12 +3981,12 @@ msgstr "Synchronisations-Status"
 msgid "Synchronisation target"
 msgstr "Synchronisationsziel"
 
-#: packages/app-cli/app/command-sync.ts:180
+#: packages/app-cli/app/command-sync.ts:171
 msgid "Synchronisation target: %s (%s)"
 msgstr "Synchronisationsziel: %s (%s)"
 
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:665
-#: packages/app-mobile/components/side-menu-content.tsx:424
+#: packages/app-mobile/components/side-menu-content.tsx:426
 #: packages/lib/commands/synchronize.ts:8
 msgid "Synchronise"
 msgstr "Synchronisieren"
@@ -3973,7 +4024,7 @@ msgstr "Verschlagwortet: %d."
 #: packages/app-desktop/gui/Sidebar/Sidebar.tsx:715
 #: packages/app-mobile/components/screens/Note.tsx:933
 #: packages/app-mobile/components/screens/tags.js:101
-#: packages/app-mobile/components/side-menu-content.tsx:400
+#: packages/app-mobile/components/side-menu-content.tsx:402
 msgid "Tags"
 msgstr "Schlagwörter"
 
@@ -3990,6 +4041,10 @@ msgstr "Aufgaben-Liste"
 msgid "Tasks"
 msgstr "Aufgaben"
 
+#: packages/lib/utils/joplinCloud.ts:338
+msgid "Teams"
+msgstr "Teams"
+
 #: packages/lib/models/Setting.ts:1343
 msgid "Text editor command"
 msgstr "Texteditor-Befehl"
@@ -4033,7 +4088,7 @@ msgstr ""
 "Die Anwendung muss neu gestartet werden, damit diese Änderungen wirksam "
 "werden."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:522
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:526
 msgid ""
 "The attachments will no longer be watched when you switch to a different "
 "note."
@@ -4041,7 +4096,7 @@ msgstr ""
 "Die Anhänge werden nicht mehr überwacht, wenn du zu einer anderen Notiz "
 "wechseln."
 
-#: packages/app-cli/app/app.js:304
+#: packages/app-cli/app/app.js:272
 msgid "The command \"%s\" is only available in GUI mode"
 msgstr "Der Befehl „%s“ ist nur im GUI-Modus verfügbar"
 
@@ -4092,7 +4147,7 @@ msgstr ""
 "Platz wie ein Element mit dem Faktor 1. Starte die App neu, um Änderungen zu "
 "sehen."
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:521
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:525
 msgid "The following attachments are being watched for changes:"
 msgstr "Die folgenden Anhänge werden auf Änderungen überwacht:"
 
@@ -4209,12 +4264,10 @@ msgid "The Web Clipper needs your authorisation to access your data."
 msgstr ""
 "Der Web Clipper benötigt deine Genehmigung, um auf die Daten zuzugreifen."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:84
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:84
 msgid "The web clipper service is enabled and set to auto-start."
 msgstr "Der Web-Clipper-Dienst ist aktiviert und auf Autostart eingestellt."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:109
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:108
 msgid "The web clipper service is not enabled."
 msgstr "Der Web-Clipper-Dienst ist nicht aktiviert."
@@ -4305,7 +4358,6 @@ msgid "This attachment is not downloaded or not decrypted yet."
 msgstr ""
 "Dieser Anhang wurde nicht heruntergeladen oder noch nicht entschlüsselt."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:214
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:156
 msgid ""
 "This authorisation token is only needed to allow third-party applications to "
@@ -4332,7 +4384,7 @@ msgstr "Diese Notiz hat keine Standort-Informationen."
 msgid "This note has been modified:"
 msgstr "Diese Notiz wurde verändert:"
 
-#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:613
+#: packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx:614
 msgid ""
 "This note has no content. Click on \"%s\" to toggle the editor and edit the "
 "note."
@@ -4344,7 +4396,7 @@ msgstr ""
 msgid "This note has no history"
 msgstr "Diese Notiz hat keinen Verlauf"
 
-#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:449
+#: packages/app-desktop/gui/NoteEditor/NoteEditor.tsx:452
 msgid ""
 "This Rich Text editor has a number of limitations and it is recommended to "
 "be aware of them before using it."
@@ -4352,7 +4404,6 @@ msgstr ""
 "Dieser Rich Text Editor hat eine Reihe von Unzulänglichkeiten, die bei der "
 "Nutzung beachtet werden sollten."
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:155
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:134
 msgid ""
 "This service allows the browser extension to communicate with Joplin. When "
@@ -4399,7 +4450,7 @@ msgstr "Titel"
 msgid "Title"
 msgstr "Titel"
 
-#: packages/app-cli/app/command-sync.ts:91
+#: packages/app-cli/app/command-sync.ts:82
 #: packages/app-desktop/gui/DropboxLoginScreen.tsx:45
 #: packages/app-mobile/components/screens/dropbox-login.js:58
 msgid ""
@@ -4445,8 +4496,8 @@ msgstr "Um die Konsole zu maximieren/minimieren, drücke „tc“."
 #: packages/app-cli/app/command-help.js:79
 msgid "To move from one pane to another, press Tab or Shift+Tab."
 msgstr ""
-"Um von einem Bereich zu einem anderen zu wechseln, drücke Tab oder Umschalt"
-"+Tab."
+"Um von einem Bereich zu einem anderen zu wechseln, drücke Tab oder "
+"Umschalt+Tab."
 
 #: packages/app-cli/app/command-status.js:44
 msgid ""
@@ -4512,7 +4563,6 @@ msgstr "Seitenleiste ein-/ausschalten"
 msgid "Toggle sort order field"
 msgstr "Ändere die Sortierreihenfolge"
 
-#: packages/app-desktop/gui/ClipperConfigScreen.min.js:40
 #: packages/app-desktop/gui/ClipperConfigScreen.tsx:41
 msgid "Token has been copied to the clipboard!"
 msgstr "Token wurde in die Zwischenablage kopiert!"
@@ -4533,6 +4583,11 @@ msgstr "Insgesamt: %d/%d"
 msgid "Try again"
 msgstr "Versuche es erneut"
 
+#: packages/lib/utils/joplinCloud.ts:309 packages/lib/utils/joplinCloud.ts:331
+#: packages/lib/utils/joplinCloud.ts:353
+msgid "Try it now"
+msgstr "Jetzt testen"
+
 #: packages/app-cli/app/command-help.js:71
 msgid ""
 "Type `help [command]` for more information about a command; or type `help "
@@ -4607,7 +4662,7 @@ msgstr ""
 msgid "Unsupported image type: %s"
 msgstr "Nicht unterstütztes Fotoformat: %s"
 
-#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:35
+#: packages/app-desktop/gui/MainScreen/commands/openItem.ts:40
 #: packages/app-desktop/gui/NoteRevisionViewer.min.js:142
 msgid "Unsupported link or message: %s"
 msgstr "Nicht unterstützter Link oder Nachricht: %s"
@@ -4786,7 +4841,7 @@ msgstr ""
 "Warnung: Aus Leistungsgründen werden nicht alle Anhänge angezeigt "
 "(Obergrenze: %s)."
 
-#: packages/lib/models/Setting.ts:2408
+#: packages/lib/models/Setting.ts:2408 packages/lib/utils/joplinCloud.ts:153
 msgid "Web Clipper"
 msgstr "Web Clipper"
 
@@ -4841,11 +4896,12 @@ msgstr "Wenn eine neue Aufgabe erstellt wird:"
 msgid "Words"
 msgstr "Wörter"
 
-#: packages/app-cli/app/app.js:138
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "y"
 msgstr "j"
 
-#: packages/app-cli/app/app.js:138 packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/cli-utils.js:161
+#: packages/app-cli/app/setupCommand.ts:20
 msgid "Y"
 msgstr "J"
 
@@ -4902,7 +4958,7 @@ msgstr "Deine Daten werden neu verschlüsselt und erneut synchronisiert."
 msgid "Your password is needed to decrypt some of your data."
 msgstr "Dein Passwort ist nötig, um einige deiner Daten zu entschlüsseln."
 
-#: packages/app-cli/app/command-sync.ts:242
+#: packages/app-cli/app/command-sync.ts:233
 msgid ""
 "Your password is needed to decrypt some of your data. Type `:e2ee decrypt` "
 "to set it."
@@ -5388,9 +5444,6 @@ msgstr "Herauszoomen"
 #~ msgid "Copy ([Y]ank) the [n]ote to a notebook."
 #~ msgstr "Die Notiz zu einem Notizbuch kopieren."
 
-#~ msgid "Move the note to a notebook."
-#~ msgstr "Die Notiz zu einem Notizbuch verschieben."
-
 #~ msgid ""
 #~ "The target to synchronise to. If synchronising with the file system, set "
 #~ "`sync.2.path` to specify the target directory."