1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-12-26 23:38:08 +02:00

Compare commits

..

6 Commits

Author SHA1 Message Date
Laurent Cozic
6001e07cbc update 2023-07-31 19:00:21 +01:00
Laurent Cozic
6210d85192 Merge branch 'dev' into mobile_plugins_2 2023-07-31 11:12:44 +01:00
Laurent Cozic
0c981ae4a7 fixed module import 2023-07-29 19:19:01 +01:00
Laurent Cozic
401eee568a fixed JoplinWindow 2023-07-29 17:43:58 +01:00
Laurent Cozic
0b85e16125 Merge branch 'dev' into mobile_plugins_2 2023-07-29 17:34:12 +01:00
Laurent Cozic
0368c26ead init 2023-07-28 21:21:13 +01:00
210 changed files with 55784 additions and 46744 deletions

View File

@@ -76,6 +76,7 @@ plugin_types/
readme/
packages/react-native-vosk/lib/
packages/lib/countable/Countable.js
packages/app-mobile/plugins
# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
packages/app-cli/app/LinkSelector.js
@@ -133,7 +134,6 @@ packages/app-desktop/gui/ClipperConfigScreen.js
packages/app-desktop/gui/ConfigScreen/ButtonBar.js
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js
packages/app-desktop/gui/ConfigScreen/Sidebar.js
packages/app-desktop/gui/ConfigScreen/controls/ToggleAdvancedSettingsButton.js
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js
packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js
@@ -260,7 +260,6 @@ packages/app-desktop/gui/NoteEditor/utils/types.js
packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js
packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js
packages/app-desktop/gui/NoteEditor/utils/useFolder.js
packages/app-desktop/gui/NoteEditor/utils/useFormNote.test.js
packages/app-desktop/gui/NoteEditor/utils/useFormNote.js
packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.js
packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.js
@@ -370,7 +369,6 @@ packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
packages/app-desktop/tools/notarizeMacApp.js
packages/app-desktop/utils/checkForUpdatesUtils.test.js
packages/app-desktop/utils/checkForUpdatesUtils.js
packages/app-desktop/utils/checkForUpdatesUtilsTestData.js
packages/app-desktop/utils/markupLanguageUtils.js
packages/app-mobile/PluginAssetsLoader.js
packages/app-mobile/components/ActionButton.js
@@ -411,7 +409,6 @@ packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.js
packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToolbarButton.js
packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToolbarOverflowRows.js
packages/app-mobile/components/NoteEditor/MarkdownToolbar/types.js
packages/app-mobile/components/NoteEditor/NoteEditor.test.js
packages/app-mobile/components/NoteEditor/NoteEditor.js
packages/app-mobile/components/NoteEditor/SearchPanel.js
packages/app-mobile/components/NoteEditor/SelectionFormatting.js
@@ -447,6 +444,7 @@ packages/app-mobile/root.js
packages/app-mobile/services/AlarmServiceDriver.android.js
packages/app-mobile/services/AlarmServiceDriver.ios.js
packages/app-mobile/services/e2ee/RSA.react-native.js
packages/app-mobile/services/plugins/PluginRunner.js
packages/app-mobile/services/profiles/index.js
packages/app-mobile/services/voiceTyping/vosk.android.js
packages/app-mobile/services/voiceTyping/vosk.ios.js
@@ -460,6 +458,7 @@ packages/app-mobile/utils/checkPermissions.js
packages/app-mobile/utils/createRootStyle.js
packages/app-mobile/utils/debounce.js
packages/app-mobile/utils/fs-driver-rn.js
packages/app-mobile/utils/markupLanguageUtils.js
packages/app-mobile/utils/setupNotifications.js
packages/app-mobile/utils/shareHandler.js
packages/app-mobile/utils/types.js
@@ -518,8 +517,6 @@ packages/lib/commands/index.js
packages/lib/commands/openMasterPasswordDialog.js
packages/lib/commands/synchronize.js
packages/lib/components/EncryptionConfigScreen/utils.js
packages/lib/components/shared/config/shouldShowMissingPasswordWarning.test.js
packages/lib/components/shared/config/shouldShowMissingPasswordWarning.js
packages/lib/components/shared/note-screen-shared.js
packages/lib/components/shared/reduxSharedMiddleware.js
packages/lib/database-driver-better-sqlite.js
@@ -547,7 +544,6 @@ packages/lib/htmlUtils2.test.js
packages/lib/import-enex-md-gen.test.js
packages/lib/import-enex-md-gen.js
packages/lib/import-enex.js
packages/lib/initLib.js
packages/lib/locale.test.js
packages/lib/locale.js
packages/lib/markdownUtils.test.js

View File

@@ -171,21 +171,6 @@ if [ "$IS_PULL_REQUEST" == "1" ]; then
fi
fi
# =============================================================================
# Check that the website still builds
# =============================================================================
if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
echo "Step: Check that the website still builds..."
mkdir -p ../joplin-website/docs
SKIP_SPONSOR_PROCESSING=1 yarn run buildWebsite
testResult=$?
if [ $testResult -ne 0 ]; then
exit $testResult
fi
fi
# =============================================================================
# Find out if we should run the build or not. Electron-builder gets stuck when
# building PRs so we disable it in this case. The Linux build should provide

View File

@@ -25,18 +25,17 @@ jobs:
run: |
sudo apt-get update || true
sudo apt-get install -y libsecret-1-dev
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '18'
cache: 'yarn'
- name: Install Yarn
run: |
corepack enable
- uses: actions/checkout@v2
- name: Install
run: yarn install

View File

@@ -26,7 +26,6 @@ jobs:
# We need to pin the version to 18.15, because 18.16+ fails with this error:
# https://github.com/facebook/react-native/issues/36440
node-version: '18.15.0'
cache: 'yarn'
- name: Install Yarn
run: |

View File

@@ -75,7 +75,6 @@ jobs:
# We need to pin the version to 18.15, because 18.16+ fails with this error:
# https://github.com/facebook/react-native/issues/36440
node-version: '18.15.0'
cache: 'yarn'
- name: Install Yarn
run: |
@@ -161,7 +160,6 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: '18'
cache: 'yarn'
- name: Install Yarn
run: |

10
.gitignore vendored
View File

@@ -50,7 +50,6 @@ packages/tools/github_oauth_token.txt
lerna-debug.log
.env
docs/**/*.mustache
.idea
# Yarn stuff
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
@@ -119,7 +118,6 @@ packages/app-desktop/gui/ClipperConfigScreen.js
packages/app-desktop/gui/ConfigScreen/ButtonBar.js
packages/app-desktop/gui/ConfigScreen/ConfigScreen.js
packages/app-desktop/gui/ConfigScreen/Sidebar.js
packages/app-desktop/gui/ConfigScreen/controls/ToggleAdvancedSettingsButton.js
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js
packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js
packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js
@@ -246,7 +244,6 @@ packages/app-desktop/gui/NoteEditor/utils/types.js
packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js
packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js
packages/app-desktop/gui/NoteEditor/utils/useFolder.js
packages/app-desktop/gui/NoteEditor/utils/useFormNote.test.js
packages/app-desktop/gui/NoteEditor/utils/useFormNote.js
packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.js
packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.js
@@ -356,7 +353,6 @@ packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
packages/app-desktop/tools/notarizeMacApp.js
packages/app-desktop/utils/checkForUpdatesUtils.test.js
packages/app-desktop/utils/checkForUpdatesUtils.js
packages/app-desktop/utils/checkForUpdatesUtilsTestData.js
packages/app-desktop/utils/markupLanguageUtils.js
packages/app-mobile/PluginAssetsLoader.js
packages/app-mobile/components/ActionButton.js
@@ -397,7 +393,6 @@ packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.js
packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToolbarButton.js
packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToolbarOverflowRows.js
packages/app-mobile/components/NoteEditor/MarkdownToolbar/types.js
packages/app-mobile/components/NoteEditor/NoteEditor.test.js
packages/app-mobile/components/NoteEditor/NoteEditor.js
packages/app-mobile/components/NoteEditor/SearchPanel.js
packages/app-mobile/components/NoteEditor/SelectionFormatting.js
@@ -433,6 +428,7 @@ packages/app-mobile/root.js
packages/app-mobile/services/AlarmServiceDriver.android.js
packages/app-mobile/services/AlarmServiceDriver.ios.js
packages/app-mobile/services/e2ee/RSA.react-native.js
packages/app-mobile/services/plugins/PluginRunner.js
packages/app-mobile/services/profiles/index.js
packages/app-mobile/services/voiceTyping/vosk.android.js
packages/app-mobile/services/voiceTyping/vosk.ios.js
@@ -446,6 +442,7 @@ packages/app-mobile/utils/checkPermissions.js
packages/app-mobile/utils/createRootStyle.js
packages/app-mobile/utils/debounce.js
packages/app-mobile/utils/fs-driver-rn.js
packages/app-mobile/utils/markupLanguageUtils.js
packages/app-mobile/utils/setupNotifications.js
packages/app-mobile/utils/shareHandler.js
packages/app-mobile/utils/types.js
@@ -504,8 +501,6 @@ packages/lib/commands/index.js
packages/lib/commands/openMasterPasswordDialog.js
packages/lib/commands/synchronize.js
packages/lib/components/EncryptionConfigScreen/utils.js
packages/lib/components/shared/config/shouldShowMissingPasswordWarning.test.js
packages/lib/components/shared/config/shouldShowMissingPasswordWarning.js
packages/lib/components/shared/note-screen-shared.js
packages/lib/components/shared/reduxSharedMiddleware.js
packages/lib/database-driver-better-sqlite.js
@@ -533,7 +528,6 @@ packages/lib/htmlUtils2.test.js
packages/lib/import-enex-md-gen.test.js
packages/lib/import-enex-md-gen.js
packages/lib/import-enex.js
packages/lib/initLib.js
packages/lib/locale.test.js
packages/lib/locale.js
packages/lib/markdownUtils.test.js

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -112,7 +112,7 @@
}).then(async function(result) {
if (!result.ok) {
console.error('Could not create Stripe checkout session', await result.text());
alert('The checkout session could not be created. Please contact us on the forum for support.');
alert('The checkout session could not be created. Please contact support@joplincloud.com for support.');
} else {
return result.json();
}

View File

@@ -75,10 +75,11 @@ A community maintained list of these distributions can be found here: [Unofficia
| | | | |
| :---: | :---: | :---: | :---: |
| <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) | <img width="50" src="https://avatars2.githubusercontent.com/u/2793530?s=96&v=4"/></br>[CyberXZT](https://github.com/CyberXZT) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) |
| <img width="50" src="https://avatars2.githubusercontent.com/u/14873877?s=96&v=4"/></br>[dchecks](https://github.com/dchecks) | <img width="50" src="https://avatars2.githubusercontent.com/u/56287?s=96&v=4"/></br>[fats](https://github.com/fats) | <img width="50" src="https://avatars2.githubusercontent.com/u/8030470?s=96&v=4"/></br>[Galliver7](https://github.com/Galliver7) | <img width="50" src="https://avatars2.githubusercontent.com/u/64712218?s=96&v=4"/></br>[Hegghammer](https://github.com/Hegghammer) |
| <img width="50" src="https://avatars2.githubusercontent.com/u/1310474?s=96&v=4"/></br>[jknowles](https://github.com/jknowles) | <img width="50" src="https://avatars2.githubusercontent.com/u/11947658?s=96&v=4"/></br>[KentBrockman](https://github.com/KentBrockman) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) |
| <img width="50" src="https://avatars2.githubusercontent.com/u/126279083?s=96&v=4"/></br>[matmoly](https://github.com/matmoly) | <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) | <img width="50" src="https://avatars2.githubusercontent.com/u/31054972?s=96&v=4"/></br>[saarantras](https://github.com/saarantras) | <img width="50" src="https://avatars2.githubusercontent.com/u/327998?s=96&v=4"/></br>[sif](https://github.com/sif) |
| <img width="50" src="https://avatars2.githubusercontent.com/u/765564?s=96&v=4"/></br>[taskcruncher](https://github.com/taskcruncher) | <img width="50" src="https://avatars2.githubusercontent.com/u/333944?s=96&v=4"/></br>[tateisu](https://github.com/tateisu) | | |
| <img width="50" src="https://avatars2.githubusercontent.com/u/14873877?s=96&v=4"/></br>[dchecks](https://github.com/dchecks) | <img width="50" src="https://avatars2.githubusercontent.com/u/56287?s=96&v=4"/></br>[fats](https://github.com/fats) | <img width="50" src="https://avatars2.githubusercontent.com/u/49439044?s=96&v=4"/></br>[fourstepper](https://github.com/fourstepper) | <img width="50" src="https://avatars2.githubusercontent.com/u/64712218?s=96&v=4"/></br>[Hegghammer](https://github.com/Hegghammer) |
| <img width="50" src="https://avatars2.githubusercontent.com/u/3266447?s=96&v=4"/></br>[iamwillbar](https://github.com/iamwillbar) | <img width="50" src="https://avatars2.githubusercontent.com/u/1310474?s=96&v=4"/></br>[jknowles](https://github.com/jknowles) | <img width="50" src="https://avatars2.githubusercontent.com/u/11947658?s=96&v=4"/></br>[KentBrockman](https://github.com/KentBrockman) | <img width="50" src="https://avatars2.githubusercontent.com/u/5588131?s=96&v=4"/></br>[kianenigma](https://github.com/kianenigma) |
| <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) | <img width="50" src="https://avatars2.githubusercontent.com/u/126279083?s=96&v=4"/></br>[matmoly](https://github.com/matmoly) | <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) |
| <img width="50" src="https://avatars2.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) | <img width="50" src="https://avatars2.githubusercontent.com/u/31054972?s=96&v=4"/></br>[saarantras](https://github.com/saarantras) | <img width="50" src="https://avatars2.githubusercontent.com/u/327998?s=96&v=4"/></br>[sif](https://github.com/sif) | <img width="50" src="https://avatars2.githubusercontent.com/u/765564?s=96&v=4"/></br>[taskcruncher](https://github.com/taskcruncher) |
| <img width="50" src="https://avatars2.githubusercontent.com/u/333944?s=96&v=4"/></br>[tateisu](https://github.com/tateisu) | | | |
<!-- SPONSORS-GITHUB -->
<!-- TOC -->
@@ -158,7 +159,6 @@ A community maintained list of these distributions can be found here: [Unofficia
- [Guiding principles](https://github.com/laurent22/joplin/blob/dev/readme/principles.md)
- [Stats](https://github.com/laurent22/joplin/blob/dev/readme/stats.md)
- [Brand guidelines](https://joplinapp.org/brand)
- [Release cycle](https://github.com/laurent22/joplin/blob/dev/readme/release_cycle.md)
- [Donate](https://github.com/laurent22/joplin/blob/dev/readme/donate.md)
<!-- TOC -->
@@ -232,9 +232,9 @@ Joplin is also capable of exporting to a number of other formats including HTML
# Synchronisation
One of the goals of Joplin is to avoid being tied to any particular company or service, whether it is Evernote, Google or Microsoft. As such the synchronisation is designed without any hard dependency to any particular service. Most of the synchronisation process is done at an abstract level and access to external services, such as Nextcloud or Dropbox, is done via lightweight drivers. It is easy to support new services by creating simple drivers that provide a filesystem-like interface, i.e. the ability to read, write, delete and list items. It is also simple to switch from one service to another.
One of the goals of Joplin is to avoid being tied to any particular company or service, whether it is Evernote, Google or Microsoft. As such the synchronisation is designed without any hard dependency to any particular service. Most of the synchronisation process is done at an abstract level and access to external services, such as Nextcloud or Dropbox, is done via lightweight drivers. It is easy to support new services by creating simple drivers that provide a filesystem-like interface, i.e. the ability to read, write, delete and list items. It is also simple to switch from one service to another or to even sync to multiple services at once. Each note, notebook, tags, as well as the relation between items is transmitted as plain text files during synchronisation, which means the data can also be moved to a different application, can be easily backed up, inspected, etc.
Currently, synchronisation is possible with Joplin Cloud, Nextcloud, S3, WebDAV, Dropbox, OneDrive or the local filesystem. To enable synchronisation please follow the instructions below. After that, the application will synchronise in the background whenever it is running, or you can click on "Synchronise" to start a synchronisation manually. Joplin will background sync automatically after any content change is made on the local application.
Currently, synchronisation is possible with Nextcloud, WebDAV, Dropbox, OneDrive or the local filesystem. To enable synchronisation please follow the instructions below. After that, the application will synchronise in the background whenever it is running, or you can click on "Synchronise" to start a synchronisation manually. Joplin will background sync automatically after any content change is made on the local application.
If the **terminal client** has been installed, it is possible to also synchronise outside of the user interface by typing `joplin sync` from the terminal. This can be used to setup a cron script to synchronise at a regular interval. For example, this would do it every 30 minutes:
@@ -537,47 +537,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) | 77%
<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) | 79%
<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 | 22%
<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) | 56%
<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) | | 44%
<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) | 86%
<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) | 98%
<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) | Fejby | 96%
<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 | 96%
<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) | [Mr-Kanister](mailto:viger_gtrc@simplelogin.com) | 98%
<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) | | 43%
<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) | 57%
<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) | | 45%
<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) | 88%
<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) | 99%
<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) | Fejby | 98%
<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 | 98%
<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) | 98%
<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) | | 44%
<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 Villaverde](mailto:teko.gr@gmail.com) | 95%
<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 Villaverde](mailto:teko.gr@gmail.com) | 97%
<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 | 25%
<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 | 96%
<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 | 100%
<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) | 28%
<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) | 86%
<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) | [Manuel Tassi](mailto:mannivuwiki@gmail.com) | 78%
<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) | 75%
<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) | | 76%
<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) | 86%
<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) | 85%
<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) | 53%
<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) | 88%
<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) | [Douglas Leão](mailto:djlsplays@gmail.com) | 85%
<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) | 70%
<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) | 49%
<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) | 78%
<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) | 97%
<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) | | 35%
<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) | | 75%
<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) | 97%
<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) | 98%
<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) | 97%
<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) | [Dmitriy K](mailto:dmitry@atsip.ru) | 97%
<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) | | 63%
<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) | [qx100](mailto:ztymaxwell@gmail.com) | 98%
<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) | 86%
<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) | 29%
<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) | 88%
<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) | [Manuel Tassi](mailto:mannivuwiki@gmail.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) | 77%
<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) | | 78%
<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) | 87%
<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) | 87%
<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) | 54%
<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) | 89%
<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) | [Douglas Leão](mailto:djlsplays@gmail.com) | 87%
<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) | 72%
<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) | 50%
<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) | 79%
<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) | | 36%
<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) | | 77%
<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) | 99%
<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) | 71%
<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) | 87%
<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) | [Dmitriy K](mailto:dmitry@atsip.ru) | 99%
<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) | | 64%
<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) | [wh201906](mailto:wh201906@yandex.com) | 96%
<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) | 88%
<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) | 88%
<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) | 86%
<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) | 88%
<!-- LOCALE-TABLE-AUTO-GENERATED -->
# Contributors

View File

@@ -64,27 +64,27 @@
}
},
"devDependencies": {
"@joplin/utils": "~2.12",
"@joplin/utils": "~2.11",
"@seiyab/eslint-plugin-react-hooks": "4.5.1-beta.0",
"@typescript-eslint/eslint-plugin": "5.60.0",
"@typescript-eslint/parser": "5.60.0",
"@typescript-eslint/eslint-plugin": "5.59.0",
"@typescript-eslint/parser": "5.59.0",
"cspell": "5.21.2",
"eslint": "8.43.0",
"eslint-interactive": "10.8.0",
"eslint": "8.39.0",
"eslint-interactive": "10.7.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jest": "27.2.2",
"eslint-plugin-jest": "27.2.1",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-react": "7.32.2",
"execa": "5.1.1",
"fs-extra": "11.1.1",
"glob": "10.3.3",
"glob": "10.2.7",
"gulp": "4.0.2",
"husky": "3.1.0",
"lerna": "3.22.1",
"lint-staged": "13.2.3",
"madge": "6.1.0",
"npm-package-json-lint": "6.4.0",
"typescript": "5.1.3"
"typescript": "5.0.2"
},
"dependencies": {
"@types/fs-extra": "11.0.1",
@@ -93,12 +93,11 @@
"node-gyp": "9.4.0",
"nodemon": "2.0.22"
},
"packageManager": "yarn@3.6.0",
"packageManager": "yarn@3.5.0",
"resolutions": {
"react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
"react-native-vosk@0.1.12": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch",
"eslint@8.39.0": "patch:eslint@npm%3A8.39.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
"eslint@8.43.0": "patch:eslint@npm%3A8.39.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
"eslint@^8.13.0": "patch:eslint@npm%3A8.39.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
"app-builder-lib@24.4.0": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch",
"react-native@0.71.10": "patch:react-native@npm%3A0.71.10#./.yarn/patches/react-native-animation-fix/react-native-npm-0.71.10-f9c32562d8.patch",

View File

@@ -452,8 +452,6 @@ class Application extends BaseApplication {
type: 'FOLDER_SELECT',
id: Setting.value('activeFolderId'),
});
this.startRotatingLogMaintenance(Setting.value('profileDir'));
}
}
}

View File

@@ -30,7 +30,6 @@ const { FileApiDriverLocal } = require('@joplin/lib/file-api-driver-local');
const EncryptionService = require('@joplin/lib/services/e2ee/EncryptionService').default;
const envFromArgs = require('@joplin/lib/envFromArgs');
const nodeSqlite = require('sqlite3');
const initLib = require('@joplin/lib/initLib').default;
const env = envFromArgs(process.argv);
@@ -68,10 +67,6 @@ function appVersion() {
shimInit({ sharp, keytar, appVersion, nodeSqlite });
const logger = new Logger();
Logger.initializeGlobalLogger(logger);
initLib(logger);
const application = app();
if (process.platform === 'win32') {

View File

@@ -57,7 +57,7 @@
"proper-lockfile": "4.1.2",
"read-chunk": "2.1.0",
"server-destroy": "1.0.1",
"sharp": "0.32.4",
"sharp": "0.32.1",
"sprintf-js": "1.1.2",
"sqlite3": "5.1.6",
"string-padding": "1.0.2",
@@ -66,18 +66,18 @@
"terminal-kit": "3.0.0",
"tkwidgets": "0.5.27",
"url-parse": "1.5.10",
"word-wrap": "1.2.5",
"word-wrap": "1.2.3",
"yargs-parser": "21.1.1"
},
"devDependencies": {
"@joplin/tools": "~2.12",
"@types/fs-extra": "11.0.1",
"@types/jest": "29.5.3",
"@types/node": "18.16.18",
"@types/jest": "29.5.1",
"@types/node": "18.15.13",
"@types/proper-lockfile": "^4.1.2",
"gulp": "4.0.2",
"jest": "29.5.0",
"temp": "0.9.4",
"typescript": "5.1.3"
"typescript": "5.0.2"
}
}

View File

@@ -174,7 +174,7 @@ export default class ElectronAppWrapper {
// so that it can tell us if we can really close the app or not.
// Search for "appClose" event for closing logic on renderer side.
event.preventDefault();
if (this.win_) this.win_.webContents.send('appClose');
this.win_.webContents.send('appClose');
} else {
// If the renderer process has responded, check if we can close or not
if (this.rendererProcessQuitReply_.canClose) {

View File

@@ -262,6 +262,8 @@ class Application extends BaseApplication {
if (this.initPluginServiceDone_) return;
this.initPluginServiceDone_ = true;
PlatformImplementation.instance().initialize((action: any) => this.dispatch(action));
const service = PluginService.instance();
const pluginRunner = new PluginRunner();
@@ -566,8 +568,6 @@ class Application extends BaseApplication {
await SpellCheckerService.instance().initialize(new SpellCheckerServiceDriverNative());
this.startRotatingLogMaintenance(Setting.value('profileDir'));
// await populateDatabase(reg.db(), {
// clearDatabase: true,
// folderCount: 1000,

View File

@@ -77,7 +77,7 @@ export default async function checkForUpdates(inBackground: boolean, parentWindo
try {
const releases = await fetchLatestRelease();
const release = extractVersionInfo(releases, process.platform, process.arch, shim.isPortable(), options);
const release = extractVersionInfo(releases, process.platform, options);
logger.info(`Current version: ${packageInfo.version}`);
logger.info(`Latest version: ${release.version}`);

View File

@@ -2,6 +2,7 @@ import CommandService, { CommandRuntime, CommandDeclaration } from '@joplin/lib/
import { _ } from '@joplin/lib/locale';
import { stateUtils } from '@joplin/lib/reducer';
import { DesktopCommandContext } from '../services/commands/types';
import { enabledCondition } from '../gui/NoteEditor/editorCommandDeclarations';
export const declaration: CommandDeclaration = {
name: 'toggleExternalEditing',
@@ -22,7 +23,7 @@ export const runtime = (): CommandRuntime => {
void CommandService.instance().execute('startExternalEditing', noteId);
}
},
enabledCondition: 'oneNoteSelected && !noteIsReadOnly && (!modalDialogVisible || gotoAnythingVisible)',
enabledCondition: enabledCondition(declaration.name),
mapStateToTitle: (state: any) => {
const noteId = stateUtils.selectedNoteId(state);
return state.watchedNoteFiles.includes(noteId) ? _('Stop') : '';

View File

@@ -12,17 +12,13 @@ const { connect } = require('react-redux');
const { themeStyle } = require('@joplin/lib/theme');
const pathUtils = require('@joplin/lib/path-utils');
import SyncTargetRegistry from '@joplin/lib/SyncTargetRegistry';
const shared = require('@joplin/lib/components/shared/config/config-shared.js');
const shared = require('@joplin/lib/components/shared/config-shared.js');
import ClipperConfigScreen from '../ClipperConfigScreen';
import restart from '../../services/restart';
import PluginService from '@joplin/lib/services/plugins/PluginService';
import { getDefaultPluginsInstallState, updateDefaultPluginsInstallState } from '@joplin/lib/services/plugins/defaultPlugins/defaultPluginsUtils';
import getDefaultPluginsInfo from '@joplin/lib/services/plugins/defaultPlugins/desktopDefaultPluginsInfo';
import JoplinCloudConfigScreen from '../JoplinCloudConfigScreen';
import ToggleAdvancedSettingsButton from './controls/ToggleAdvancedSettingsButton';
import shouldShowMissingPasswordWarning from '@joplin/lib/components/shared/config/shouldShowMissingPasswordWarning';
import shim from '@joplin/lib/shim';
import StyledLink from '../style/StyledLink';
const { KeymapConfigScreen } = require('../KeymapConfig/KeymapConfigScreen');
const settingKeyToControl: any = {
@@ -184,34 +180,6 @@ class ConfigScreenComponent extends React.Component<any, any> {
if (section.name === 'sync') {
const syncTargetMd = SyncTargetRegistry.idToMetadata(settings['sync.target']);
const statusStyle = { ...theme.textStyle, marginTop: 10 };
const warningStyle = { ...theme.textStyle, color: theme.colorWarn };
// Don't show the missing password warning if the user just changed the sync target (but hasn't
// saved yet).
const matchesSavedTarget = settings['sync.target'] === this.props.settings['sync.target'];
if (matchesSavedTarget && shouldShowMissingPasswordWarning(settings['sync.target'], settings)) {
const openMissingPasswordFAQ = () =>
bridge().openExternal('https://joplinapp.org/faq#why-did-my-sync-and-encryption-passwords-disappear-after-updating-joplin');
const macInfoLink = (
<StyledLink href="#"
onClick={openMissingPasswordFAQ}
style={theme.linkStyle}
>
{_('Help')}
</StyledLink>
);
// The FAQ section related to missing passwords is specific to MacOS/ARM -- only show it
// in that case.
const showMacInfoLink = shim.isMac() && process.arch === 'arm64';
settingComps.push(
<p key='missing-password-warning' style={warningStyle}>
{_('Warning: Missing password.')}{' '}{showMacInfoLink ? macInfoLink : null}
</p>
);
}
if (syncTargetMd.supportsConfigCheck) {
const messages = shared.checkSyncConfigMessages(this);
@@ -240,11 +208,17 @@ class ConfigScreenComponent extends React.Component<any, any> {
const advancedSettingsSectionStyle = { display: 'none' };
if (advancedSettingComps.length) {
const iconName = this.state.showAdvancedSettings ? 'fa fa-angle-down' : 'fa fa-angle-right';
// const advancedSettingsButtonStyle = { ...theme.buttonStyle, marginBottom: 10 };
advancedSettingsButton = (
<ToggleAdvancedSettingsButton
onClick={() => shared.advancedSettingsButton_click(this)}
advancedSettingsVisible={this.state.showAdvancedSettings}
/>
<div style={{ marginBottom: 10 }}>
<Button
level={ButtonLevel.Secondary}
onClick={() => shared.advancedSettingsButton_click(this)}
iconName={iconName}
title={_('Show Advanced Settings')}
/>
</div>
);
advancedSettingsSectionStyle.display = this.state.showAdvancedSettings ? 'block' : 'none';
}

View File

@@ -1,24 +0,0 @@
import * as React from 'react';
import Button, { ButtonLevel } from '../../Button/Button';
import { _ } from '@joplin/lib/locale';
interface Props {
onClick: ()=> void;
advancedSettingsVisible: boolean;
}
const ToggleAdvancedSettingsButton: React.FunctionComponent<Props> = props => {
const iconName = props.advancedSettingsVisible ? 'fa fa-angle-down' : 'fa fa-angle-right';
return (
<div style={{ marginBottom: 10 }}>
<Button
level={ButtonLevel.Secondary}
onClick={props.onClick}
iconName={iconName}
title={_('Show Advanced Settings')}
/>
</div>
);
};
export default ToggleAdvancedSettingsButton;

View File

@@ -10,13 +10,12 @@ import { MasterKeyEntity } from '@joplin/lib/services/e2ee/types';
import { getEncryptionEnabled, masterKeyEnabled, SyncInfo } from '@joplin/lib/services/synchronizer/syncInfoUtils';
import { getDefaultMasterKey, getMasterPasswordStatusMessage, masterPasswordIsValid, toggleAndSetupEncryption } from '@joplin/lib/services/e2ee/utils';
import Button, { ButtonLevel } from '../Button/Button';
import { useCallback, useMemo, useState } from 'react';
import { useCallback, useMemo } from 'react';
import { connect } from 'react-redux';
import { AppState } from '../../app.reducer';
import Setting from '@joplin/lib/models/Setting';
import CommandService from '@joplin/lib/services/CommandService';
import { PublicPrivateKeyPair } from '@joplin/lib/services/e2ee/ppk';
import ToggleAdvancedSettingsButton from '../ConfigScreen/controls/ToggleAdvancedSettingsButton';
interface Props {
themeId: any;
@@ -84,6 +83,34 @@ const EncryptionConfigScreen = (props: Props) => {
);
};
const renderReencryptData = () => {
if (!shim.isElectron()) return null;
if (!props.shouldReencrypt) return null;
const theme = themeStyle(props.themeId);
const buttonLabel = _('Re-encrypt data');
const intro = props.shouldReencrypt ? _('The default encryption method has been changed to a more secure one and it is recommended that you apply it to your data.') : _('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.');
let t = `${intro}\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.', buttonLabel)}`;
t = t.replace(/\n\n/g, '</p><p>');
t = t.replace(/\n/g, '<br>');
t = `<p>${t}</p>`;
return (
<div>
<h2>{_('Re-encryption')}</h2>
<p style={theme.textStyle} dangerouslySetInnerHTML={{ __html: t }}></p>
<span style={{ marginRight: 10 }}>
<button onClick={() => void reencryptData()} style={theme.buttonStyle}>{buttonLabel}</button>
</span>
{ !props.shouldReencrypt ? null : <button onClick={() => dontReencryptData()} style={theme.buttonStyle}>{_('Ignore')}</button> }
</div>
);
};
const renderMasterKey = (mk: MasterKeyEntity) => {
const theme = themeStyle(props.themeId);
@@ -94,12 +121,6 @@ const EncryptionConfigScreen = (props: Props) => {
borderColor: theme.dividerColor,
};
const missingPasswordCellStyle = {
...theme.textStyle,
border: '3px solid',
borderColor: theme.colorError,
};
const password = inputPasswords[mk.id] ? inputPasswords[mk.id] : '';
const isActive = props.activeMasterKeyId === mk.id;
const activeIcon = isActive ? '✔' : '';
@@ -114,15 +135,8 @@ const EncryptionConfigScreen = (props: Props) => {
);
} else {
return (
<td style={missingPasswordCellStyle}>
<input
type="password"
placeholder={_('Enter password')}
style={passwordStyle}
value={password}
onChange={event => onInputPasswordChange(mk, event.target.value)}
/>
{' '}
<td style={theme.textStyle}>
<input type="password" style={passwordStyle} value={password} onChange={event => onInputPasswordChange(mk, event.target.value)} />{' '}
<button style={theme.buttonStyle} onClick={() => onSavePasswordClick(mk, { ...props.passwords, ...inputPasswords })}>
{_('Save')}
</button>
@@ -225,6 +239,7 @@ const EncryptionConfigScreen = (props: Props) => {
/>
);
const needUpgradeSection = renderNeedUpgradeSection();
const reencryptDataSection = renderReencryptData();
return (
<div className="section">
@@ -239,6 +254,7 @@ const EncryptionConfigScreen = (props: Props) => {
{decryptedItemsInfo}
{toggleButton}
{needUpgradeSection}
{props.shouldReencrypt ? reencryptDataSection : null}
</div>
</div>
);
@@ -322,56 +338,6 @@ const EncryptionConfigScreen = (props: Props) => {
return nonExistingMasterKeySection;
};
const renderReencryptData = () => {
if (!shim.isElectron()) return null;
if (!props.encryptionEnabled) return null;
const theme = themeStyle(props.themeId);
const buttonLabel = _('Re-encrypt data');
const intro = props.shouldReencrypt ? _('The default encryption method has been changed to a more secure one and it is recommended that you apply it to your data.') : _('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.');
let t = `${intro}\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.', buttonLabel)}`;
t = t.replace(/\n\n/g, '</p><p>');
t = t.replace(/\n/g, '<br>');
t = `<p>${t}</p>`;
return (
<div>
<h2>{_('Re-encryption')}</h2>
<p style={theme.textStyle} dangerouslySetInnerHTML={{ __html: t }}></p>
<span style={{ marginRight: 10 }}>
<button onClick={() => void reencryptData()} style={theme.buttonStyle}>{buttonLabel}</button>
</span>
{ !props.shouldReencrypt ? null : <button onClick={() => dontReencryptData()} style={theme.buttonStyle}>{_('Ignore')}</button> }
</div>
);
};
// If the user should re-encrypt, ensure that the section is visible initially.
const [showAdvanced, setShowAdvanced] = useState<boolean>(props.shouldReencrypt);
const toggleAdvanced = useCallback(() => {
setShowAdvanced(!showAdvanced);
}, [showAdvanced]);
const renderAdvancedSection = () => {
const reEncryptSection = renderReencryptData();
if (!reEncryptSection) return null;
return (
<div>
<ToggleAdvancedSettingsButton
onClick={toggleAdvanced}
advancedSettingsVisible={showAdvanced}/>
{ showAdvanced ? reEncryptSection : null }
</div>
);
};
return (
<div className="config-screen-content">
{renderDebugSection()}
@@ -380,7 +346,6 @@ const EncryptionConfigScreen = (props: Props) => {
{renderMasterKeySection(props.masterKeys.filter(mk => masterKeyEnabled(mk)), true)}
{renderMasterKeySection(props.masterKeys.filter(mk => !masterKeyEnabled(mk)), false)}
{renderNonExistingMasterKeysSection()}
{renderAdvancedSection()}
</div>
);
};

View File

@@ -26,7 +26,6 @@ interface State {
interface Props {
message?: string;
children: any;
}
export default class ErrorBoundary extends React.Component<Props, State> {

View File

@@ -20,7 +20,6 @@ import NoteListWrapper from '../NoteListWrapper/NoteListWrapper';
import { AppState } from '../../app.reducer';
import { saveLayout, loadLayout } from '../ResizableLayout/utils/persist';
import Setting from '@joplin/lib/models/Setting';
import shouldShowMissingPasswordWarning from '@joplin/lib/components/shared/config/shouldShowMissingPasswordWarning';
import produce from 'immer';
import shim from '@joplin/lib/shim';
import bridge from '../../services/bridge';
@@ -68,7 +67,6 @@ interface Props {
shouldUpgradeSyncTarget: boolean;
hasDisabledSyncItems: boolean;
hasDisabledEncryptionItems: boolean;
hasMissingSyncCredentials: boolean;
showMissingMasterKeyMessage: boolean;
showNeedUpgradingMasterKeyMessage: boolean;
showShouldReencryptMessage: boolean;
@@ -563,16 +561,6 @@ class MainScreenComponent extends React.Component<Props, State> {
});
};
const onViewSyncSettingsScreen = () => {
this.props.dispatch({
type: 'NAV_GO',
routeName: 'Config',
props: {
defaultSection: 'sync',
},
});
};
const onViewPluginScreen = () => {
this.props.dispatch({
type: 'NAV_GO',
@@ -610,12 +598,6 @@ class MainScreenComponent extends React.Component<Props, State> {
_('Disable safe mode and restart'),
onDisableSafeModeAndRestart
);
} else if (this.props.hasMissingSyncCredentials) {
msg = this.renderNotificationMessage(
_('The synchronisation password is missing.'),
_('Set the password'),
onViewSyncSettingsScreen
);
} else if (this.props.shouldUpgradeSyncTarget) {
msg = this.renderNotificationMessage(
_('The sync target needs to be upgraded before Joplin can sync. The operation may take a few minutes to complete and the app needs to be restarted. To proceed please click on the link.'),
@@ -680,7 +662,7 @@ class MainScreenComponent extends React.Component<Props, State> {
public messageBoxVisible(props: Props = null) {
if (!props) props = this.props;
return props.hasDisabledSyncItems || props.showMissingMasterKeyMessage || props.hasMissingSyncCredentials || props.showNeedUpgradingMasterKeyMessage || props.showShouldReencryptMessage || props.hasDisabledEncryptionItems || this.props.shouldUpgradeSyncTarget || props.isSafeMode || this.showShareInvitationNotification(props) || this.props.needApiAuth || this.props.showInstallTemplatesPlugin;
return props.hasDisabledSyncItems || props.showMissingMasterKeyMessage || props.showNeedUpgradingMasterKeyMessage || props.showShouldReencryptMessage || props.hasDisabledEncryptionItems || this.props.shouldUpgradeSyncTarget || props.isSafeMode || this.showShareInvitationNotification(props) || this.props.needApiAuth || this.props.showInstallTemplatesPlugin;
}
public registerCommands() {
@@ -893,7 +875,6 @@ const mapStateToProps = (state: AppState) => {
showNeedUpgradingMasterKeyMessage: showNeedUpgradingEnabledMasterKeyMessage,
showShouldReencryptMessage: state.settings['encryption.shouldReencrypt'] >= Setting.SHOULD_REENCRYPT_YES,
shouldUpgradeSyncTarget: state.settings['sync.upgradeState'] === Setting.SYNC_UPGRADE_STATE_SHOULD_DO,
hasMissingSyncCredentials: shouldShowMissingPasswordWarning(state.settings['sync.target'], state.settings),
pluginsLegacy: state.pluginsLegacy,
plugins: state.pluginService.plugins,
pluginHtmlContents: state.pluginService.pluginHtmlContents,

View File

@@ -38,7 +38,6 @@ export const runtime = (): CommandRuntime => {
menuItem.click();
});
}
return null;
},
};
};

View File

@@ -99,7 +99,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
}
}, []);
const addListItem = useCallback((string1: string, defaultText = '') => {
const addListItem = useCallback((string1, defaultText = '') => {
if (editorRef.current) {
if (editorRef.current.somethingSelected()) {
editorRef.current.wrapSelectionsByLine(string1);

View File

@@ -141,7 +141,7 @@ export default function useScrollHandler(editorRef: any, webviewRef: any, onScro
// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied
}, []);
const editor_resize = useCallback((cm: any) => {
const editor_resize = useCallback((cm) => {
if (isCodeMirrorReady(cm)) {
// This handler is called when resized and refreshed.
// Only when resized, the scroll position is restored.

View File

@@ -1,5 +1,5 @@
import * as React from 'react';
import { useState, useEffect, useCallback, useRef, useMemo } from 'react';
import { useState, useEffect, useCallback, useRef } from 'react';
import TinyMCE from './NoteBody/TinyMCE/TinyMCE';
import CodeMirror from './NoteBody/CodeMirror/CodeMirror';
import { connect } from 'react-redux';
@@ -40,7 +40,7 @@ import Note from '@joplin/lib/models/Note';
import Folder from '@joplin/lib/models/Folder';
const bridge = require('@electron/remote').require('./bridge').default;
import NoteRevisionViewer from '../NoteRevisionViewer';
import { parseShareCache } from '@joplin/lib/services/share/reducer';
import { readFromSettings } from '@joplin/lib/services/share/reducer';
import useAsyncEffect from '@joplin/lib/hooks/useAsyncEffect';
import { ModelType } from '@joplin/lib/BaseModel';
import BaseItem from '@joplin/lib/models/BaseItem';
@@ -78,7 +78,6 @@ function NoteEditor(props: NoteEditorProps) {
const { formNote, setFormNote, isNewNote, resourceInfos } = useFormNote({
syncStarted: props.syncStarted,
decryptionStarted: props.decryptionStarted,
noteId: effectiveNoteId,
isProvisional: props.isProvisional,
titleInputRef: titleInputRef,
@@ -287,15 +286,11 @@ function NoteEditor(props: NoteEditorProps) {
// }
// }, [props.dispatch]);
const shareCache = useMemo(() => {
return parseShareCache(props.shareCacheSetting);
}, [props.shareCacheSetting]);
useAsyncEffect(async event => {
if (!formNote.id) return;
try {
const result = await itemIsReadOnly(BaseItem, ModelType.Note, ItemChange.SOURCE_UNSPECIFIED, formNote.id, props.syncUserId, shareCache);
const result = await itemIsReadOnly(BaseItem, ModelType.Note, ItemChange.SOURCE_UNSPECIFIED, formNote.id, props.syncUserId, props.shareCache);
if (event.cancelled) return;
setIsReadOnly(result);
} catch (error) {
@@ -306,7 +301,7 @@ function NoteEditor(props: NoteEditorProps) {
throw error;
}
}
}, [formNote.id, props.syncUserId, shareCache]);
}, [formNote.id, props.syncUserId, props.shareCache]);
const onBodyWillChange = useCallback((event: any) => {
handleProvisionalFlag();
@@ -329,7 +324,7 @@ function NoteEditor(props: NoteEditorProps) {
const onMessage = useMessageHandler(scrollWhenReady, setScrollWhenReady, editorRef, setLocalSearchResultCount, props.dispatch, formNote);
const externalEditWatcher_noteChange = useCallback((event: any) => {
const externalEditWatcher_noteChange = useCallback((event) => {
if (event.id === formNote.id) {
const newFormNote = {
...formNote,
@@ -342,7 +337,7 @@ function NoteEditor(props: NoteEditorProps) {
// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied
}, [formNote]);
const onNotePropertyChange = useCallback((event: any) => {
const onNotePropertyChange = useCallback((event) => {
setFormNote(formNote => {
if (formNote.id !== event.note.id) return formNote;
@@ -634,7 +629,6 @@ const mapStateToProps = (state: AppState) => {
isProvisional: state.provisionalNoteIds.includes(noteId),
editorNoteStatuses: state.editorNoteStatuses,
syncStarted: state.syncStarted,
decryptionStarted: state.decryptionWorker?.state !== 'idle',
themeId: state.settings.theme,
richTextBannerDismissed: state.settings.richTextBannerDismissed,
watchedNoteFiles: state.watchedNoteFiles,
@@ -662,7 +656,7 @@ const mapStateToProps = (state: AppState) => {
isSafeMode: state.settings.isSafeMode,
useCustomPdfViewer: false,
syncUserId: state.settings['sync.userId'],
shareCacheSetting: state.settings['sync.shareCache'],
shareCache: readFromSettings(state),
};
};

View File

@@ -78,7 +78,7 @@ export async function commandAttachFileToBody(body: string, filePaths: string[]
logger.info(`Attaching ${filePath}`);
const newBody = await shim.attachFileToNoteBody(body, filePath, options.position, {
createFileURL: options.createFileURL,
resizeLargeImages: Setting.value('imageResizing'),
resizeLargeImages: 'ask',
});
if (!newBody) {

View File

@@ -2,6 +2,7 @@
import AsyncActionQueue from '@joplin/lib/AsyncActionQueue';
import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
import { PluginStates } from '@joplin/lib/services/plugins/reducer';
import { State as ShareState } from '@joplin/lib/services/share/reducer';
import { MarkupLanguage } from '@joplin/renderer';
import { RenderResult, RenderResultPluginAsset } from '@joplin/renderer/MarkupToHtml';
import { MarkupToHtmlOptions } from './useMarkupToHtml';
@@ -27,7 +28,6 @@ export interface NoteEditorProps {
isProvisional: boolean;
editorNoteStatuses: any;
syncStarted: boolean;
decryptionStarted: boolean;
bodyEditor: string;
notesParentType: string;
selectedNoteTags: any[];
@@ -46,7 +46,7 @@ export interface NoteEditorProps {
contentMaxWidth: number;
isSafeMode: boolean;
useCustomPdfViewer: boolean;
shareCacheSetting: string;
shareCache: ShareState;
syncUserId: string;
}

View File

@@ -1,73 +0,0 @@
import Note from '@joplin/lib/models/Note';
import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
import { renderHook } from '@testing-library/react-hooks';
import useFormNote, { HookDependencies } from './useFormNote';
describe('useFormNote', () => {
beforeEach(async () => {
await setupDatabaseAndSynchronizer(1);
await switchClient(1);
});
it('should update note when decryption completes', async () => {
const testNote = await Note.save({ title: 'Test Note!' });
const makeFormNoteProps = (syncStarted: boolean, decryptionStarted: boolean): HookDependencies => {
return {
syncStarted,
decryptionStarted,
noteId: testNote.id,
isProvisional: false,
titleInputRef: null,
editorRef: null,
onBeforeLoad: ()=>{},
onAfterLoad: ()=>{},
};
};
const formNote = renderHook(props => useFormNote(props), {
initialProps: makeFormNoteProps(true, false),
});
await formNote.waitFor(() => {
expect(formNote.result.current.formNote).toMatchObject({
encryption_applied: 0,
title: testNote.title,
});
});
await Note.save({
id: testNote.id,
encryption_cipher_text: 'cipher_text',
encryption_applied: 1,
});
// Sync starting should cause a re-render
formNote.rerender(makeFormNoteProps(false, false));
await formNote.waitFor(() => {
expect(formNote.result.current.formNote).toMatchObject({
encryption_applied: 1,
});
});
formNote.rerender(makeFormNoteProps(false, true));
await Note.save({
id: testNote.id,
encryption_applied: 0,
title: 'Test Note!',
});
// Ending decryption should also cause a re-render
formNote.rerender(makeFormNoteProps(false, false));
await formNote.waitFor(() => {
expect(formNote.result.current.formNote).toMatchObject({
encryption_applied: 0,
title: 'Test Note!',
});
});
});
});

View File

@@ -18,9 +18,8 @@ export interface OnLoadEvent {
formNote: FormNote;
}
export interface HookDependencies {
interface HookDependencies {
syncStarted: boolean;
decryptionStarted: boolean;
noteId: string;
isProvisional: boolean;
titleInputRef: any;
@@ -62,21 +61,14 @@ function resourceInfosChanged(a: ResourceInfos, b: ResourceInfos): boolean {
}
export default function useFormNote(dependencies: HookDependencies) {
const {
syncStarted, decryptionStarted, noteId, isProvisional, titleInputRef, editorRef, onBeforeLoad, onAfterLoad,
} = dependencies;
const { syncStarted, noteId, isProvisional, titleInputRef, editorRef, onBeforeLoad, onAfterLoad } = dependencies;
const [formNote, setFormNote] = useState<FormNote>(defaultFormNote());
const [isNewNote, setIsNewNote] = useState(false);
const prevSyncStarted = usePrevious(syncStarted);
const prevDecryptionStarted = usePrevious(decryptionStarted);
const previousNoteId = usePrevious(formNote.id);
const [resourceInfos, setResourceInfos] = useState<ResourceInfos>({});
// Increasing the value of this counter cancels any ongoing note refreshes and starts
// a new refresh.
const [formNoteRefeshScheduled, setFormNoteRefreshScheduled] = useState<number>(0);
async function initNoteState(n: any) {
let originalCss = '';
@@ -114,7 +106,14 @@ export default function useFormNote(dependencies: HookDependencies) {
}
useEffect(() => {
if (formNoteRefeshScheduled <= 0) return () => {};
// Check that synchronisation has just finished - and
// if the note has never been changed, we reload it.
// If the note has already been changed, it's a conflict
// that's already been handled by the synchronizer.
if (!prevSyncStarted) return () => {};
if (syncStarted) return () => {};
if (formNote.hasChanged) return () => {};
reg.logger().info('Sync has finished and note has never been changed - reloading it');
@@ -133,7 +132,6 @@ export default function useFormNote(dependencies: HookDependencies) {
}
await initNoteState(n);
setFormNoteRefreshScheduled(0);
};
void loadNote();
@@ -141,34 +139,8 @@ export default function useFormNote(dependencies: HookDependencies) {
return () => {
cancelled = true;
};
}, [formNoteRefeshScheduled, noteId]);
const refreshFormNote = useCallback(() => {
// Increase the counter to cancel any ongoing refresh attempts
// and start a new one.
setFormNoteRefreshScheduled(formNoteRefeshScheduled + 1);
}, [formNoteRefeshScheduled]);
useEffect(() => {
// Check that synchronisation has just finished - and
// if the note has never been changed, we reload it.
// If the note has already been changed, it's a conflict
// that's already been handled by the synchronizer.
const decryptionJustEnded = prevDecryptionStarted && !decryptionStarted;
const syncJustEnded = prevSyncStarted && !syncStarted;
if (!decryptionJustEnded && !syncJustEnded) return;
if (formNote.hasChanged) return;
// Refresh the form note.
// This is kept separate from the above logic so that when prevSyncStarted is changed
// from true to false, it doesn't cancel the note from loading.
refreshFormNote();
}, [
prevSyncStarted, syncStarted,
prevDecryptionStarted, decryptionStarted,
formNote.hasChanged, refreshFormNote,
]);
// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied
}, [prevSyncStarted, syncStarted, formNote]);
useEffect(() => {
if (!noteId) {

View File

@@ -84,11 +84,11 @@ function NoteListItem(props: NoteListItemProps, ref: any) {
dragItemPosition = 'bottom';
}
const onTitleClick = useCallback((event: any) => {
const onTitleClick = useCallback((event) => {
props.onTitleClick(event, props.item);
}, [props.onTitleClick, props.item]);
const onCheckboxClick = useCallback((event: any) => {
const onCheckboxClick = useCallback((event) => {
props.onCheckboxClick(event, props.item);
}, [props.onCheckboxClick, props.item]);

View File

@@ -210,7 +210,7 @@ class NotePropertiesDialog extends React.Component<Props, State> {
}
public async saveProperty() {
if (!this.state.editedKey) return null;
if (!this.state.editedKey) return;
// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
return new Promise((resolve: Function) => {

View File

@@ -1,37 +1,19 @@
/* eslint-disable jest/require-top-level-describe */
const { shimInit } = require('@joplin/lib/shim-init-node');
const sqlite3 = require('sqlite3');
const SyncTargetNone = require('@joplin/lib/SyncTargetNone').default;
const { default: Logger, TargetType } = require('@joplin/utils/Logger');
// TODO: Some libraries required by test-utils.js seem to fail to import with the
// jsdom environment.
//
// Thus, require('@joplin/lib/testing/test-utils.js') fails and some setup must be
// copied.
const logger = new Logger();
logger.addTarget(TargetType.Console);
logger.setLevel(Logger.LEVEL_WARN);
Logger.initializeGlobalLogger(logger);
// Mock the S3 sync target -- the @aws-s3 libraries depend on an old version
// of uuid that doesn't work with jest without additional configuration.
jest.doMock('@joplin/lib/SyncTargetAmazonS3', () => {
return SyncTargetNone;
});
// @electron/remote requires electron to be running. Mock it.
jest.mock('@electron/remote', () => {
return {
require: () => {
return {
default: {},
};
},
};
return { require };
});
// Import after mocking problematic libraries
const { afterEachCleanUp, afterAllCleanUp } = require('@joplin/lib/testing/test-utils.js');
shimInit({ nodeSqlite: sqlite3 });
afterEach(async () => {
await afterEachCleanUp();
});
afterAll(async () => {
await afterAllCleanUp();
});

View File

@@ -29,7 +29,6 @@ const EncryptionService = require('@joplin/lib/services/e2ee/EncryptionService')
const { FileApiDriverLocal } = require('@joplin/lib/file-api-driver-local');
const React = require('react');
const nodeSqlite = require('sqlite3');
const initLib = require('@joplin/lib/initLib').default;
// Security: If we attempt to navigate away from the root HTML page, it's likely because
// of an improperly sanitized link. Prevent this by closing the window before we can
@@ -133,10 +132,6 @@ document.addEventListener('click', (event) => {
event.preventDefault();
});
const logger = new Logger();
Logger.initializeGlobalLogger(logger);
initLib(logger);
app().start(bridge().processArgv()).then((result) => {
if (!result || !result.action) {
require('./gui/Root');

View File

@@ -1,6 +1,6 @@
{
"name": "@joplin/app-desktop",
"version": "2.12.11",
"version": "2.12.10",
"description": "Joplin for Desktop",
"main": "main.js",
"private": true,
@@ -110,21 +110,21 @@
"@electron/rebuild": "3.2.13",
"@joplin/tools": "~2.12",
"@testing-library/react-hooks": "8.0.1",
"@types/jest": "29.5.3",
"@types/node": "18.16.18",
"@types/react": "18.0.24",
"@types/jest": "29.5.1",
"@types/node": "18.15.13",
"@types/react": "16.14.41",
"@types/react-redux": "7.1.25",
"@types/styled-components": "5.1.26",
"electron": "25.3.1",
"electron-builder": "24.4.0",
"glob": "10.3.3",
"glob": "10.2.7",
"gulp": "4.0.2",
"jest": "29.5.0",
"jest-environment-jsdom": "29.5.0",
"js-sha512": "0.8.0",
"nan": "2.17.0",
"react-test-renderer": "18.2.0",
"typescript": "5.1.3"
"typescript": "5.0.2"
},
"optionalDependencies": {
"7zip-bin-linux": "^1.0.1",
@@ -163,7 +163,7 @@
"react-datetime": "3.2.0",
"react-dom": "18.2.0",
"react-redux": "8.1.1",
"react-select": "5.7.4",
"react-select": "5.7.3",
"react-toggle-button": "2.2.0",
"react-tooltip": "4.5.1",
"redux": "4.2.1",

View File

@@ -5,6 +5,8 @@ import { VersionInfo } from '@joplin/lib/services/plugins/api/types';
import Setting from '@joplin/lib/models/Setting';
import { reg } from '@joplin/lib/registry';
import BasePlatformImplementation, { Joplin } from '@joplin/lib/services/plugins/BasePlatformImplementation';
import { Dispatch } from 'redux';
import { readFile } from 'fs-extra';
const { clipboard, nativeImage } = require('electron');
const packageInfo = require('../../packageInfo');
@@ -20,12 +22,17 @@ export default class PlatformImplementation extends BasePlatformImplementation {
private static instance_: PlatformImplementation;
private joplin_: Joplin;
private components_: Components;
private dispatch_: Dispatch|null = null;
public static instance(): PlatformImplementation {
if (!this.instance_) this.instance_ = new PlatformImplementation();
return this.instance_;
}
public initialize(dispatch: Dispatch) {
this.dispatch_ = dispatch;
}
public get versionInfo(): VersionInfo {
return {
version: packageInfo.version,
@@ -45,6 +52,14 @@ export default class PlatformImplementation extends BasePlatformImplementation {
public get window(): WindowImplementation {
return {
injectCustomStyles: injectCustomStyles,
loadNoteCssFile: async (filePath) => {
const cssString = await readFile(filePath, 'utf8');
this.dispatch_({
type: 'CUSTOM_CSS_APPEND',
css: cssString,
});
},
};
}

View File

@@ -73,7 +73,7 @@ export default async (params: Params) => {
teamId: process.env.APPLE_ASC_PROVIDER,
tool: 'notarytool',
} as any);
});
} catch (error) {
console.error(error);
process.exit(1);

File diff suppressed because it is too large Load Diff

View File

@@ -1,23 +1,22 @@
import { fileExtension } from '@joplin/lib/path-utils';
import shim from '@joplin/lib/shim';
export interface CheckForUpdateOptions {
includePreReleases?: boolean;
}
interface GitHubReleaseAsset {
name: string;
browser_download_url: string;
}
export interface GitHubRelease {
tag_name: string;
prerelease: boolean;
body: string;
assets: GitHubReleaseAsset[];
assets: {
name: string;
browser_download_url: string;
}[];
html_url: string;
}
export interface Release {
interface Release {
version: string;
prerelease: boolean;
downloadUrl: string;
@@ -25,17 +24,13 @@ export interface Release {
pageUrl: string;
}
export type Platform = typeof process.platform;
export type Architecture = typeof process.arch;
function getMajorMinorTagName(tagName: string) {
const s = tagName.split('.');
s.pop();
return s.join('.');
}
export const extractVersionInfo = (releases: GitHubRelease[], platform: Platform, arch: Architecture, portable: boolean, options: CheckForUpdateOptions) => {
export const extractVersionInfo = (releases: GitHubRelease[], platform: typeof process.platform, options: CheckForUpdateOptions) => {
options = { includePreReleases: false, ...options };
if (!releases.length) throw new Error('Cannot get latest release info (JSON)');
@@ -72,43 +67,28 @@ export const extractVersionInfo = (releases: GitHubRelease[], platform: Platform
}
}
let foundAsset: GitHubReleaseAsset = null;
let downloadUrl = null;
for (let i = 0; i < release.assets.length; i++) {
const asset = release.assets[i];
let found = false;
const ext = fileExtension(asset.name);
if (platform === 'win32' && ext === 'exe') {
if (shim.isPortable()) {
found = asset.name === 'JoplinPortable.exe';
} else {
found = !!asset.name.match(/^Joplin-Setup-[\d.]+\.exe$/);
}
} else if (platform === 'darwin' && ext === 'dmg' && !asset.name.endsWith('arm64.dmg')) { // We don't return the arm64 version for now
found = true;
} else if (platform === 'linux' && ext === '.AppImage') {
found = true;
}
if (platform === 'win32' && portable) {
foundAsset = release.assets.find(asset => {
return asset.name === 'JoplinPortable.exe';
});
}
if (!foundAsset && platform === 'win32') {
foundAsset = release.assets.find(asset => {
return !!asset.name.match(/^Joplin-Setup-[\d.]+\.exe$/);
});
}
if (platform === 'darwin' && arch === 'arm64') {
foundAsset = release.assets.find(asset => {
return asset.name.endsWith('arm64.dmg');
});
}
if (!foundAsset && platform === 'darwin') {
foundAsset = release.assets.find(asset => {
return fileExtension(asset.name) === 'dmg' && !asset.name.endsWith('arm64.dmg');
});
}
if (platform === 'linux') {
foundAsset = release.assets.find(asset => {
return fileExtension(asset.name) === 'AppImage';
});
}
let downloadUrl: string = null;
if (foundAsset) {
downloadUrl = foundAsset.browser_download_url.replace('github.com/laurent22/joplin/releases/download', 'objects.joplinusercontent.com');
downloadUrl.concat('?source=DesktopApp&type=Update');
if (found) {
downloadUrl = asset.browser_download_url.replace('github.com/laurent22/joplin/releases/download', 'objects.joplinusercontent.com');
downloadUrl.concat('?source=DesktopApp&type=Update');
break;
}
}
function cleanUpReleaseNotes(releaseNotes: string[]) {

File diff suppressed because it is too large Load Diff

View File

@@ -47,7 +47,7 @@ react {
// hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
//
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
// hermesFlags = ["-O", "-output-source-map"]
hermesFlags = ["-O", "-output-source-map"]
}
/**

View File

@@ -2,7 +2,7 @@ import { useEffect, useState, useMemo, useRef } from 'react';
import shim from '@joplin/lib/shim';
import Setting from '@joplin/lib/models/Setting';
const { themeStyle } = require('../../global-style.js');
import markupLanguageUtils from '@joplin/lib/markupLanguageUtils';
import markupLanguageUtils from '../../../utils/markupLanguageUtils';
import Logger from '@joplin/utils/Logger';
const { assetsToHeaders } = require('@joplin/renderer');

View File

@@ -1,6 +1,6 @@
const React = require('react');
import { ReactElement, useCallback, useMemo, useState } from 'react';
import { ReactElement, useCallback, useState } from 'react';
import { LayoutChangeEvent, ScrollView, View, ViewStyle } from 'react-native';
import ToggleOverflowButton from './ToggleOverflowButton';
import ToolbarButton, { buttonSize } from './ToolbarButton';
@@ -18,22 +18,19 @@ const Toolbar = (props: ToolbarProps) => {
const [overflowButtonsVisible, setOverflowPopupVisible] = useState(false);
const [maxButtonsEachSide, setMaxButtonsEachSide] = useState(0);
const allButtonSpecs = useMemo(() => {
const buttons = props.buttons.reduce((accumulator: ButtonSpec[], current: ButtonGroup) => {
const newItems: ButtonSpec[] = [];
for (const item of current.items) {
if (item.visible ?? true) {
newItems.push(item);
}
const allButtonSpecs = props.buttons.reduce((accumulator: ButtonSpec[], current: ButtonGroup) => {
const newItems: ButtonSpec[] = [];
for (const item of current.items) {
if (item.visible ?? true) {
newItems.push(item);
}
}
return accumulator.concat(...newItems);
}, []);
return accumulator.concat(...newItems);
}, []);
// Sort from highest priority to lowest
buttons.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
return buttons;
}, [props.buttons]);
// Sort from highest priority to lowest
allButtonSpecs.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
const allButtonComponents: ReactElement[] = [];
let key = 0;
@@ -70,9 +67,7 @@ const Toolbar = (props: ToolbarProps) => {
);
const mainButtons: ReactElement[] = [];
if (maxButtonsEachSide >= allButtonComponents.length) {
mainButtons.push(...allButtonComponents);
} else if (maxButtonsEachSide > 0) {
if (maxButtonsEachSide < allButtonComponents.length) {
// We want the menu to look something like this:
// B I (…) 🔍 ⌨
// where (…) shows/hides overflow.
@@ -82,7 +77,7 @@ const Toolbar = (props: ToolbarProps) => {
mainButtons.push(toggleOverflowButton);
mainButtons.push(...allButtonComponents.slice(-maxButtonsEachSide));
} else {
mainButtons.push(toggleOverflowButton);
mainButtons.push(...allButtonComponents);
}
const styles = props.styleSheet.styles;

View File

@@ -1,72 +0,0 @@
import * as React from 'react';
import { describe, it, expect, beforeEach } from '@jest/globals';
import { act, fireEvent, render, screen, waitFor } from '@testing-library/react-native';
import '@testing-library/jest-native';
import NoteEditor from './NoteEditor';
import Setting from '@joplin/lib/models/Setting';
import { _ } from '@joplin/lib/locale';
import { MenuProvider } from 'react-native-popup-menu';
import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
describe('NoteEditor', () => {
beforeEach(async () => {
// Required to use ExtendedWebView
await setupDatabaseAndSynchronizer(0);
await switchClient(0);
});
it('should hide the markdown toolbar when the window is small', async () => {
const wrappedNoteEditor = render(
<MenuProvider>
<NoteEditor
themeId={Setting.THEME_ARITIM_DARK}
initialText='Testing...'
style={{}}
toolbarEnabled={true}
readOnly={false}
onChange={()=>{}}
onSelectionChange={()=>{}}
onUndoRedoDepthChange={()=>{}}
onAttach={()=>{}}
/>
</MenuProvider>
);
// Maps from screen height to whether the markdown toolbar should be visible.
const testCases: [number, boolean][] = [
[10, false],
[1000, true],
[100, false],
[80, false],
[600, true],
];
const noteEditorRoot = await wrappedNoteEditor.findByTestId('note-editor-root');
const setRootHeight = (height: number) => {
act(() => {
// See https://stackoverflow.com/a/61774123
fireEvent(noteEditorRoot, 'layout', {
nativeEvent: {
layout: { height },
},
});
});
};
for (const [height, visible] of testCases) {
setRootHeight(height);
await waitFor(async () => {
const showMoreButton = await screen.queryByLabelText(_('Show more actions'));
if (visible) {
expect(showMoreButton).not.toBeNull();
} else {
expect(showMoreButton).toBeNull();
}
});
}
});
});

View File

@@ -8,7 +8,7 @@ import ExtendedWebView from '../ExtendedWebView';
const React = require('react');
import { forwardRef, RefObject, useImperativeHandle } from 'react';
import { useEffect, useMemo, useState, useCallback, useRef } from 'react';
import { LayoutChangeEvent, View, ViewStyle } from 'react-native';
import { View, ViewStyle } from 'react-native';
const { editorFont } = require('../global-style');
import SelectionFormatting from './SelectionFormatting';
@@ -368,19 +368,6 @@ function NoteEditor(props: Props, ref: any) {
console.error('NoteEditor: webview error');
}, []);
const [hasSpaceForToolbar, setHasSpaceForToolbar] = useState(true);
const toolbarEnabled = props.toolbarEnabled && hasSpaceForToolbar;
const onContainerLayout = useCallback((event: LayoutChangeEvent) => {
const containerHeight = event.nativeEvent.layout.height;
if (containerHeight < 140) {
setHasSpaceForToolbar(false);
} else {
setHasSpaceForToolbar(true);
}
}, []);
const toolbar = <MarkdownToolbar
style={{
// Don't show the markdown toolbar if there isn't enough space
@@ -398,14 +385,10 @@ function NoteEditor(props: Props, ref: any) {
// - `scrollEnabled` prevents iOS from scrolling the document (has no effect on Android)
// when an editable region (e.g. a the full-screen NoteEditor) is focused.
return (
<View
testID='note-editor-root'
onLayout={onContainerLayout}
style={{
...props.style,
flexDirection: 'column',
}}
>
<View style={{
...props.style,
flexDirection: 'column',
}}>
<EditLinkDialog
visible={linkDialogVisible}
themeId={props.themeId}
@@ -436,7 +419,7 @@ function NoteEditor(props: Props, ref: any) {
searchState={searchState}
/>
{toolbarEnabled ? toolbar : null}
{props.toolbarEnabled ? toolbar : null}
</View>
);
}

View File

@@ -20,7 +20,7 @@ const { _ } = require('@joplin/lib/locale');
const { BaseScreenComponent } = require('../../base-screen.js');
const { Dropdown } = require('../../Dropdown');
const { themeStyle } = require('../../global-style.js');
const shared = require('@joplin/lib/components/shared/config/config-shared.js');
const shared = require('@joplin/lib/components/shared/config-shared.js');
import SyncTargetRegistry from '@joplin/lib/SyncTargetRegistry';
import { openDocumentTree } from '@joplin/react-native-saf-x';
import biometricAuthenticate from '../../biometrics/biometricAuthenticate';

View File

@@ -36,7 +36,7 @@ const { BaseScreenComponent } = require('../base-screen.js');
const { themeStyle, editorFont } = require('../global-style.js');
const { dialogs } = require('../../utils/dialogs.js');
const DialogBox = require('react-native-dialogbox').default;
import ImageResizer from '@bam.tech/react-native-image-resizer';
const ImageResizer = require('react-native-image-resizer').default;
import shared from '@joplin/lib/components/shared/note-screen-shared';
import { ImagePickerResponse, launchImageLibrary } from 'react-native-image-picker';
import SelectDateTimeDialog from '../SelectDateTimeDialog';
@@ -572,30 +572,34 @@ class NoteScreenComponent extends BaseScreenComponent {
public async resizeImage(localFilePath: string, targetPath: string, mimeType: string) {
const maxSize = Resource.IMAGE_MAX_DIMENSION;
const dimensions: any = await this.imageDimensions(localFilePath);
reg.logger().info('Original dimensions ', dimensions);
const saveOriginalImage = async () => {
await shim.fsDriver().copy(localFilePath, targetPath);
return true;
};
const saveResizedImage = async () => {
let mustResize = dimensions.width > maxSize || dimensions.height > maxSize;
if (mustResize) {
const buttonId = await dialogs.pop(this, _('You are about to attach a large image (%dx%d pixels). Would you like to resize it down to %d pixels before attaching it?', dimensions.width, dimensions.height, maxSize), [
{ text: _('Yes'), id: 'yes' },
{ text: _('No'), id: 'no' },
{ text: _('Cancel'), id: 'cancel' },
]);
if (buttonId === 'cancel') return false;
mustResize = buttonId === 'yes';
}
if (mustResize) {
dimensions.width = maxSize;
dimensions.height = maxSize;
reg.logger().info('New dimensions ', dimensions);
const format = mimeType === 'image/png' ? 'PNG' : 'JPEG';
reg.logger().info(`Resizing image ${localFilePath}`);
const resizedImage = await ImageResizer.createResizedImage(
localFilePath,
dimensions.width,
dimensions.height,
format,
85, // quality
undefined, // rotation
undefined, // outputPath
true // keep metadata
);
const resizedImage = await ImageResizer.createResizedImage(localFilePath, dimensions.width, dimensions.height, format, 85); // , 0, targetPath);
const resizedImagePath = resizedImage.uri;
reg.logger().info('Resized image ', resizedImagePath);
@@ -608,27 +612,11 @@ class NoteScreenComponent extends BaseScreenComponent {
} catch (error) {
reg.logger().warn('Error when unlinking cached file: ', error);
}
return true;
};
const canResize = dimensions.width > maxSize || dimensions.height > maxSize;
if (canResize) {
const resizeLargeImages = Setting.value('imageResizing');
if (resizeLargeImages === 'alwaysAsk') {
const userAnswer = await dialogs.pop(this, `${_('You are about to attach a large image (%dx%d pixels). Would you like to resize it down to %d pixels before attaching it?', dimensions.width, dimensions.height, maxSize)}\n\n${_('(You may disable this prompt in the options)')}`, [
{ text: _('Yes'), id: 'yes' },
{ text: _('No'), id: 'no' },
{ text: _('Cancel'), id: 'cancel' },
]);
if (userAnswer === 'yes') return await saveResizedImage();
if (userAnswer === 'no') return await saveOriginalImage();
if (userAnswer === 'cancel') return false;
} else if (resizeLargeImages === 'alwaysResize') {
return await saveResizedImage();
}
} else {
await shim.fsDriver().copy(localFilePath, targetPath);
}
return await saveOriginalImage();
return true;
}
public async attachFile(pickerResponse: any, fileType: string) {

View File

@@ -1,6 +1,6 @@
import * as React from 'react';
import { useState, useEffect, useCallback } from 'react';
import { Banner, ActivityIndicator } from 'react-native-paper';
import { Banner, ActivityIndicator, Modal } from 'react-native-paper';
import { _, languageName } from '@joplin/lib/locale';
import useAsyncEffect, { AsyncEffectEvent } from '@joplin/lib/hooks/useAsyncEffect';
import { getVosk, Recorder, startRecording, Vosk } from '../../services/voiceTyping/vosk';
@@ -107,16 +107,18 @@ export default (props: Props) => {
};
return (
<Banner
visible={true}
icon={renderIcon()}
actions={[
{
label: _('Done'),
onPress: onDismiss,
},
]}>
{`${_('Voice typing...')}\n${renderContent()}`}
</Banner>
<Modal visible={true} style={{ display: 'flex', flexDirection: 'column', justifyContent: 'flex-end' }}>
<Banner
visible={true}
icon={renderIcon()}
actions={[
{
label: _('Done'),
onPress: onDismiss,
},
]}>
{`${_('Voice typing...')}\n${renderContent()}`}
</Banner>
</Modal>
);
};

View File

@@ -328,7 +328,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export NODE_BINARY=/usr/local/bin/node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
shellScript = "export NODE_BINARY=/usr/local/bin/node\nexport SOURCEMAP_FILE=\"$(pwd)/../main.jsbundle.map\";\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
};
027E2AA6B101F8CFCA582EC1 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;

View File

@@ -343,7 +343,7 @@ PODS:
- React-Core
- react-native-camera/RN (4.2.1):
- React-Core
- react-native-document-picker (9.0.1):
- react-native-document-picker (8.2.1):
- React-Core
- react-native-fingerprint-scanner (6.0.0):
- React
@@ -351,17 +351,17 @@ PODS:
- React-Core
- react-native-get-random-values (1.9.0):
- React-Core
- react-native-image-picker (5.6.0):
- react-native-image-picker (5.4.2):
- React-Core
- react-native-image-resizer (3.0.5):
- react-native-image-resizer (1.4.5):
- React-Core
- react-native-netinfo (9.4.1):
- react-native-netinfo (9.3.11):
- React-Core
- react-native-rsa-native (2.0.5):
- React
- react-native-saf-x (2.12.0):
- React-Core
- react-native-safe-area-context (4.6.4):
- react-native-safe-area-context (4.5.5):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
@@ -465,9 +465,9 @@ PODS:
- React-Core
- RNCPushNotificationIOS (1.11.0):
- React-Core
- RNDateTimePicker (7.3.0):
- RNDateTimePicker (7.1.0):
- React-Core
- RNDeviceInfo (10.7.0):
- RNDeviceInfo (10.6.1):
- React-Core
- RNExitApp (1.1.0):
- React
@@ -584,7 +584,7 @@ DEPENDENCIES:
- "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
- react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
- react-native-image-picker (from `../node_modules/react-native-image-picker`)
- "react-native-image-resizer (from `../node_modules/@bam.tech/react-native-image-resizer`)"
- react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
- react-native-rsa-native (from `../node_modules/react-native-rsa-native`)
- "react-native-saf-x (from `../node_modules/@joplin/react-native-saf-x`)"
@@ -703,7 +703,7 @@ EXTERNAL SOURCES:
react-native-image-picker:
:path: "../node_modules/react-native-image-picker"
react-native-image-resizer:
:path: "../node_modules/@bam.tech/react-native-image-resizer"
:path: "../node_modules/react-native-image-resizer"
react-native-netinfo:
:path: "../node_modules/@react-native-community/netinfo"
react-native-rsa-native:
@@ -819,16 +819,16 @@ SPEC CHECKSUMS:
React-logger: ef2269b3afa6ba868da90496c3e17a4ec4f4cee0
react-native-alarm-notification: 0732f97be04975a23ba60e675bdb961a0aaf6aa6
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
react-native-document-picker: 2b8f18667caee73a96708a82b284a4f40b30a156
react-native-document-picker: 69ca2094d8780cfc1e7e613894d15290fdc54bba
react-native-fingerprint-scanner: ac6656f18c8e45a7459302b84da41a44ad96dbbe
react-native-geolocation: 0f7fe8a4c2de477e278b0365cce27d089a8c5903
react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
react-native-image-picker: db60857e03d63721f19b6f4027de20429ddd9cba
react-native-image-resizer: 00ceb0e05586c7aadf061eea676957a6c2ec60fa
react-native-netinfo: fefd4e98d75cbdd6e85fc530f7111a8afdf2b0c5
react-native-image-picker: 77f552291e993f3fdcdf48cc3c280ef7f11789c8
react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
react-native-netinfo: 3a48f51c18dbd9253440621955e11de71bc51b32
react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
react-native-saf-x: 129cd2ddf120a1f6164c724b2846d172666b33de
react-native-safe-area-context: 68b07eabfb0d14547d36f6929c0e98d818064f02
react-native-safe-area-context: 33e71d7408dffe148b08968d97a524009634ccc8
react-native-slider: 33b8d190b59d4f67a541061bb91775d53d617d9d
react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9
@@ -849,8 +849,8 @@ SPEC CHECKSUMS:
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8
RNDateTimePicker: 01e6d27ba2e0931cd05049c5bff6171c3c027ea8
RNDeviceInfo: 25d818c85db769cc0e7083d39efaa01a6f450df3
RNDateTimePicker: 7ecd54a97fc3749f38c3c89a171f6cbd52f3c142
RNDeviceInfo: ab292735ad4fccc5f2aec0c773f7a7f03c7073ae
RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3
RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688

View File

@@ -33,21 +33,6 @@ document.createRange = () => {
shimInit({ nodeSqlite: sqlite3 });
// This library has the following error when running within Jest:
// Invariant Violation: `new NativeEventEmitter()` requires a non-null argument.
jest.mock('react-native-device-info', () => {
return {
hasNotch: () => false,
};
});
// react-native-webview expects native iOS/Android code so needs to be mocked.
jest.mock('react-native-webview', () => {
const { View } = require('react-native');
return {
WebView: View,
};
});
// react-native-fs's CachesDirectoryPath export doesn't work in a testing environment.
// Use a temporary folder instead.

View File

@@ -13,15 +13,17 @@
const path = require('path');
const localPackages = {
'@joplin/fork-htmlparser2': path.resolve(__dirname, '../fork-htmlparser2/'),
'@joplin/fork-sax': path.resolve(__dirname, '../fork-sax/'),
'@joplin/fork-uslug': path.resolve(__dirname, '../fork-uslug/'),
'@joplin/lib': path.resolve(__dirname, '../lib/'),
'@joplin/react-native-alarm-notification': path.resolve(__dirname, '../react-native-alarm-notification/'),
'@joplin/react-native-saf-x': path.resolve(__dirname, '../react-native-saf-x/'),
'@joplin/renderer': path.resolve(__dirname, '../renderer/'),
'@joplin/tools': path.resolve(__dirname, '../tools/'),
'@joplin/turndown-plugin-gfm': path.resolve(__dirname, '../turndown-plugin-gfm/'),
'@joplin/turndown': path.resolve(__dirname, '../turndown/'),
'@joplin/utils': path.resolve(__dirname, '../utils/'),
'@joplin/fork-htmlparser2': path.resolve(__dirname, '../fork-htmlparser2/'),
'@joplin/fork-uslug': path.resolve(__dirname, '../fork-uslug/'),
'@joplin/react-native-saf-x': path.resolve(__dirname, '../react-native-saf-x/'),
'@joplin/react-native-alarm-notification': path.resolve(__dirname, '../react-native-alarm-notification/'),
'@joplin/fork-sax': path.resolve(__dirname, '../fork-sax/'),
};
const remappedPackages = {
@@ -32,7 +34,12 @@ const remappedPackages = {
// versions. For example, this allows us to `import {resolve} from 'path'` rather than
// `const { resolve } = require('path-browserify')` ('path-browerify' doesn't have its own type
// definitions).
const browserifiedPackages = ['path'];
const browserifiedPackages = [
'http',
'https',
'os',
'path',
];
for (const package of browserifiedPackages) {
remappedPackages[package] = path.resolve(__dirname, `./node_modules/${package}-browserify/`);
}
@@ -74,6 +81,30 @@ module.exports = {
},
}
),
// Documentation at https://facebook.github.io/metro/docs/configuration/
resolveRequest: (context, moduleName, platform) => {
// console.info('Module: ' + moduleName + ' / ' + context.originModulePath);
// This can be used to allow importing a module that requires `fs`
// somewhere. For example, the `css` package which is used to parse
// CSS strings has a `loadFile()` function that we don't need, but
// that makes it import the `fs` package.
//
// So by having this here, we can use those packages as long as we
// don't use the specific methods that require `fs`. It's something
// to keep in mind if we get weird-related fs errors - it may be
// because the package is trying to access the mocked `fs` package.
if (moduleName === 'fs') {
return {
filePath: path.resolve(__dirname, 'mock-fs.js'),
type: 'sourceFile',
};
}
// Default resolver
return context.resolveRequest(context, moduleName, platform);
},
},
projectRoot: path.resolve(__dirname),
watchFolders: watchedFolders,

View File

@@ -0,0 +1,13 @@
function traceMethodCalls(obj) {
const handler = {
get(_target, propKey, _receiver) {
if (propKey === '$$typeof') return 'object';
throw new Error(`Trying to access member of mocked fs package: \`fs.${propKey}\``);
},
};
return new Proxy(obj, handler);
}
const mockFs = {};
module.exports = traceMethodCalls(mockFs);

View File

@@ -18,16 +18,15 @@
"postinstall": "jetify && yarn run build"
},
"dependencies": {
"@bam.tech/react-native-image-resizer": "3.0.5",
"@joplin/lib": "~2.12",
"@joplin/react-native-alarm-notification": "~2.12",
"@joplin/react-native-saf-x": "~2.12",
"@joplin/renderer": "~2.12",
"@joplin/utils": "~2.12",
"@react-native-community/clipboard": "1.5.1",
"@react-native-community/datetimepicker": "7.4.1",
"@react-native-community/datetimepicker": "7.1.0",
"@react-native-community/geolocation": "3.0.6",
"@react-native-community/netinfo": "9.4.1",
"@react-native-community/netinfo": "9.3.11",
"@react-native-community/push-notification-ios": "1.11.0",
"@react-native-community/slider": "4.4.2",
"assert-browserify": "2.0.0",
@@ -36,18 +35,22 @@
"crypto-browserify": "3.12.0",
"deprecated-react-native-prop-types": "4.0.0",
"events": "3.3.0",
"http-browserify": "1.7.0",
"https-browserify": "1.0.0",
"jsc-android": "241213.1.0",
"lodash": "4.17.21",
"md5": "2.3.0",
"os-browserify": "0.3.0",
"path-browserify": "1.0.1",
"prop-types": "15.8.1",
"punycode": "2.3.0",
"react": "18.2.0",
"react-native": "0.71.10",
"react-native-action-button": "2.8.5",
"react-native-camera": "4.2.1",
"react-native-device-info": "10.7.0",
"react-native-device-info": "10.6.1",
"react-native-dialogbox": "0.6.10",
"react-native-document-picker": "9.0.1",
"react-native-document-picker": "8.2.1",
"react-native-drawer-layout": "3.2.1",
"react-native-dropdownalert": "4.5.1",
"react-native-exit-app": "1.1.0",
@@ -57,14 +60,15 @@
"react-native-gesture-handler": "2.12.0",
"react-native-get-random-values": "1.9.0",
"react-native-image-picker": "5.6.0",
"react-native-image-resizer": "1.4.5",
"react-native-localize": "3.0.2",
"react-native-modal-datetime-picker": "15.0.1",
"react-native-paper": "5.9.1",
"react-native-paper": "5.8.0",
"react-native-popup-menu": "0.16.1",
"react-native-quick-actions": "0.3.13",
"react-native-reanimated": "3.3.0",
"react-native-rsa-native": "2.0.5",
"react-native-safe-area-context": "4.6.4",
"react-native-safe-area-context": "4.6.0",
"react-native-securerandom": "1.0.1",
"react-native-share": "8.2.2",
"react-native-sqlite-storage": "6.0.1",
@@ -104,15 +108,15 @@
"@joplin/tools": "~2.12",
"@lezer/highlight": "1.1.4",
"@testing-library/jest-native": "5.4.2",
"@testing-library/react-native": "12.1.3",
"@testing-library/react-native": "12.1.2",
"@tsconfig/react-native": "2.0.2",
"@types/fs-extra": "11.0.1",
"@types/jest": "29.5.3",
"@types/jest": "29.5.1",
"@types/react": "18.0.24",
"@types/react-native": "0.70.6",
"@types/react-redux": "7.1.25",
"@types/tar-stream": "2.2.2",
"babel-jest": "29.5.0",
"babel-jest": "29.2.1",
"babel-plugin-module-resolver": "4.1.0",
"execa": "4.1.0",
"fs-extra": "11.1.1",
@@ -126,10 +130,10 @@
"nodemon": "2.0.22",
"react-test-renderer": "18.2.0",
"sqlite3": "5.1.6",
"ts-jest": "29.1.1",
"ts-jest": "29.1.0",
"ts-loader": "9.4.4",
"ts-node": "10.9.1",
"typescript": "5.1.3",
"typescript": "5.0.2",
"uglify-js": "3.17.4",
"webpack": "5.74.0"
}

View File

@@ -0,0 +1,7 @@
const initPlugin = joplin => {
!function(t){var e={};function o(n){if(e[n])return e[n].exports;var r=e[n]={i:n,l:!1,exports:{}};return t[n].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.m=t,o.c=e,o.d=function(t,e,n){o.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(t,e){if(1&e&&(t=o(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)o.d(n,r,function(e){return t[e]}.bind(null,r));return n},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,"a",e),e},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o.p="",o(o.s=0)}([function(t,e,o){"use strict";var n=this&&this.__awaiter||function(t,e,o,n){return new(o||(o=Promise))((function(r,i){function u(t){try{c(n.next(t))}catch(t){i(t)}}function l(t){try{c(n.throw(t))}catch(t){i(t)}}function c(t){var e;t.done?r(t.value):(e=t.value,e instanceof o?e:new o((function(t){t(e)}))).then(u,l)}c((n=n.apply(t,e||[])).next())}))};Object.defineProperty(e,"__esModule",{value:!0});const r=o(1),i=o(2);r.default.plugins.register({onStart:function(){return n(this,void 0,void 0,(function*(){yield r.default.contentScripts.register(i.ContentScriptType.MarkdownItPlugin,"todoTxtMd","./todoTxtMdRule.js"),yield r.default.contentScripts.register(i.ContentScriptType.CodeMirrorPlugin,"todoTxtMdCtrl","./todoTxtMdCtrl.js"),yield r.default.contentScripts.onMessage("todoTxtMd",t=>{r.default.commands.execute("editor.execCommand",{name:"todoTxtAction",args:[t]}),r.default.commands.execute("editor.focus")})}))}})},function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=joplin},function(t,e,o){"use strict";var n;Object.defineProperty(e,"__esModule",{value:!0}),e.ContentScriptType=e.SettingStorage=e.AppType=e.SettingItemType=e.ToolbarButtonLocation=e.isContextMenuItemLocation=e.MenuItemLocation=e.ImportModuleOutputFormat=e.FileSystemItem=void 0,function(t){t.File="file",t.Directory="directory"}(e.FileSystemItem||(e.FileSystemItem={})),function(t){t.Markdown="md",t.Html="html"}(e.ImportModuleOutputFormat||(e.ImportModuleOutputFormat={})),function(t){t.File="file",t.Edit="edit",t.View="view",t.Note="note",t.Tools="tools",t.Help="help",t.Context="context",t.NoteListContextMenu="noteListContextMenu",t.EditorContextMenu="editorContextMenu",t.FolderContextMenu="folderContextMenu",t.TagContextMenu="tagContextMenu"}(n=e.MenuItemLocation||(e.MenuItemLocation={})),e.isContextMenuItemLocation=function(t){return[n.Context,n.NoteListContextMenu,n.EditorContextMenu,n.FolderContextMenu,n.TagContextMenu].includes(t)},function(t){t.NoteToolbar="noteToolbar",t.EditorToolbar="editorToolbar"}(e.ToolbarButtonLocation||(e.ToolbarButtonLocation={})),function(t){t[t.Int=1]="Int",t[t.String=2]="String",t[t.Bool=3]="Bool",t[t.Array=4]="Array",t[t.Object=5]="Object",t[t.Button=6]="Button"}(e.SettingItemType||(e.SettingItemType={})),function(t){t.Desktop="desktop",t.Mobile="mobile",t.Cli="cli"}(e.AppType||(e.AppType={})),function(t){t[t.Database=1]="Database",t[t.File=2]="File"}(e.SettingStorage||(e.SettingStorage={})),function(t){t.MarkdownItPlugin="markdownItPlugin",t.CodeMirrorPlugin="codeMirrorPlugin"}(e.ContentScriptType||(e.ContentScriptType={}))}]);
}
module.exports = { initPlugin };

View File

@@ -0,0 +1,12 @@
{
"manifest_version": 1,
"id": "com.hieuthi.joplin.metis",
"app_min_version": "2.2",
"version": "0.1.5",
"name": "Metis",
"description": "A Simple Task Manager Plugin for Joplin based on Todo.txt Specification",
"author": "Hieu-Thi Luong",
"homepage_url": "https://github.com/hieuthi/joplin-plugin-metis",
"repository_url": "https://github.com/hieuthi/joplin-plugin-metis",
"keywords": ["joplin-plugin","todo","todotxt","task management"]
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,163 @@
ul.todotxt {
--color-default: #999;
--color-faded: #999;
--color-A: rgb(247, 210, 110); /* yellow* */
--color-B: rgb(152, 104, 1); /* red */
--color-C: rgb(80, 161, 79); /* green */
--color-D: rgb(21, 91, 218); /* blue */
--project-background-color: rgb(247, 210, 110);
--project-color: black;
--context-color: rgb(152, 104, 1);
--transition-duration: 0.15s;
}
ul.todotxt { list-style:none; }
ul.todotxt li {
list-style-type:none;
border-bottom: dashed 1px;
margin-bottom: 4px;
line-height: 1.2em;
}
ul.todotxt li.todotxt-header {
font-size: 10px;
}
.todo-priority {
display: inline-block;
width: 1.2em;
overflow: hidden;
color: var(--color-default);
vertical-align: text-bottom;
}
.todo-priority select {
appearance: none;
background-color: transparent;
border-color: transparent;
color: inherit;
font-size: inherit;
font-weight: 700;
cursor: pointer;
}
.todo-priority select:focus-visible {
outline: none;
}
.todo-priority select:hover {
text-decoration: underline;
}
.todo-panel {
display: block;
font-size: 12px;
line-height: 1em;
text-align: right;
margin: 2px 0 4px 0;
color: var(--color-faded);
}
.todo-completion, .todo-creation {
display: inline-block;
min-width: 6em;
}
.todo-project {
background-color: var(--project-background-color);
color: var(--project-color);
border-radius: 2px;
}
.todo-context {
color: var(--context-color);
}
.todo-count {
color: var(--color-faded);
}
.todo-count::before{
content: '/';
}
.todo-meta {
color: var(--color-faded);
}
.todo-select {
display: inline-block;
min-width: 3em;
text-decoration: none;
}
.todo-checkbox {
margin-left: -1.9em;
margin-right: 0.5em;
display: inline-block;
vertical-align: text-top;
position: relative;
cursor: pointer;
user-select: none;
}
.todo-checkbox input {
position: absolute;
display: none;
}
.todo-checkbox .todo-checkmark {
width : 1.2em;
height: 1.2em;
position: relative;
display : inline-block;
overflow: hidden;
text-align: center;
color: white;
border: solid 1px var(--color-default);
border-radius: 100%;
transition: background-color var(--transition-duration) ease-in;
}
.todo-checkbox input:checked ~ .todo-checkmark {
background-color: var(--color-default);
}
.todo-checkbox .todo-checkmark:after {
content: '×';
position: relative;
display: inline-block;
transition: opacity var(--transition-duration);
opacity: 0;
}
.todo-checkbox input:checked ~ .todo-checkmark:after {
opacity: 1.0;
}
/* Color scheme */
.prior-A .todo-priority {
color: var(--color-A);
}
.prior-A .todo-checkbox .todo-checkmark {
border-color: var(--color-A);
color: black;
}
.prior-A .todo-checkbox input:checked ~ .todo-checkmark {
background-color: var(--color-A);
}
.prior-B .todo-priority {
color: var(--color-B);
}
.prior-B .todo-checkbox .todo-checkmark {
border-color: var(--color-B);
}
.prior-B .todo-checkbox input:checked ~ .todo-checkmark {
background-color: var(--color-B);
}
.prior-C .todo-priority {
color: var(--color-C);
}
.prior-C .todo-checkbox .todo-checkmark {
border-color: var(--color-C);
}
.prior-C .todo-checkbox input:checked ~ .todo-checkmark {
background-color: var(--color-C);
}
.prior-D .todo-priority {
color: var(--color-D);
}
.prior-D .todo-checkbox .todo-checkmark {
border-color: var(--color-D);
}
.prior-D .todo-checkbox input:checked ~ .todo-checkmark {
background-color: var(--color-D);
}

View File

@@ -0,0 +1,38 @@
document.addEventListener('joplin-noteDidUpdate', makeTodoViewActionable );
if (/WebKit/i.test(navigator.userAgent)) { // sniff
var _timer_todotxt = setInterval(function() {
if (/loaded|complete/.test(document.readyState)) {
makeTodoViewActionable()
}
}, 10);
}
function makeTodoViewActionable() {
if (_timer_todotxt) clearInterval(_timer_todotxt);
const todoTxts = document.getElementsByClassName('todotxt');
for (var i=0; i<todoTxts.length; i++){
const todoTxt = todoTxts[i];
const todos = todoTxt.getElementsByClassName('todo');
for (var j=0; j<todos.length; j++){
const todo = todos[j];
const lineIdx = todo.getAttribute("data-lineIdx");
const checkbox = todo.getElementsByClassName('todo-checkbox')[0].getElementsByTagName('input')[0];
const priority = todo.getElementsByClassName('todo-priority')[0].getElementsByTagName('select')[0];
const selectButton = todo.getElementsByClassName('todo-select')[0];
checkbox.onclick = function (){
setTimeout(()=> {webviewApi.postMessage('todoTxtMd', `toggleStatus:${lineIdx}`)}, 170);
}
priority.onchange = function(option) {
var value = option.target.value;
webviewApi.postMessage('todoTxtMd', `changePriority:${lineIdx}:${value}`);
}
selectButton.onclick = function () {
webviewApi.postMessage('todoTxtMd', `selectLine:${lineIdx}`);
}
}
}
}

View File

@@ -0,0 +1,17 @@
const initPlugin = joplin => {
joplin.plugins.register({
onStart: async function() {
await joplin.contentScripts.register(
'markdownItPlugin',
'abc_music_sheet',
'./markdownItPlugin.js'
);
},
});
//!function(t){var e={};function n(o){if(e[o])return e[o].exports;var r=e[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=t,n.c=e,n.d=function(t,e,o){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:o})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(o,r,function(e){return t[e]}.bind(null,r));return o},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";var o=this&&this.__awaiter||function(t,e,n,o){return new(n||(n=Promise))((function(r,i){function u(t){try{c(o.next(t))}catch(t){i(t)}}function l(t){try{c(o.throw(t))}catch(t){i(t)}}function c(t){var e;t.done?r(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(u,l)}c((o=o.apply(t,e||[])).next())}))};Object.defineProperty(e,"__esModule",{value:!0});const r=n(1),i=n(2);r.default.plugins.register({onStart:function(){return o(this,void 0,void 0,(function*(){yield r.default.contentScripts.register(i.ContentScriptType.MarkdownItPlugin,"abc_music_sheet","./markdownItPlugin.js"),setInterval(()=>{console.log("AAAAAAAAAAAAAAA")},1e3)}))}})},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=joplin},function(t,e,n){"use strict";var o;Object.defineProperty(e,"__esModule",{value:!0}),e.ContentScriptType=e.SettingStorage=e.AppType=e.SettingItemType=e.ToolbarButtonLocation=e.isContextMenuItemLocation=e.MenuItemLocation=e.ImportModuleOutputFormat=e.FileSystemItem=void 0,function(t){t.File="file",t.Directory="directory"}(e.FileSystemItem||(e.FileSystemItem={})),function(t){t.Markdown="md",t.Html="html"}(e.ImportModuleOutputFormat||(e.ImportModuleOutputFormat={})),function(t){t.File="file",t.Edit="edit",t.View="view",t.Note="note",t.Tools="tools",t.Help="help",t.Context="context",t.NoteListContextMenu="noteListContextMenu",t.EditorContextMenu="editorContextMenu",t.FolderContextMenu="folderContextMenu",t.TagContextMenu="tagContextMenu"}(o=e.MenuItemLocation||(e.MenuItemLocation={})),e.isContextMenuItemLocation=function(t){return[o.Context,o.NoteListContextMenu,o.EditorContextMenu,o.FolderContextMenu,o.TagContextMenu].includes(t)},function(t){t.NoteToolbar="noteToolbar",t.EditorToolbar="editorToolbar"}(e.ToolbarButtonLocation||(e.ToolbarButtonLocation={})),function(t){t[t.Int=1]="Int",t[t.String=2]="String",t[t.Bool=3]="Bool",t[t.Array=4]="Array",t[t.Object=5]="Object",t[t.Button=6]="Button"}(e.SettingItemType||(e.SettingItemType={})),function(t){t.Desktop="desktop",t.Mobile="mobile",t.Cli="cli"}(e.AppType||(e.AppType={})),function(t){t[t.Database=1]="Database",t[t.File=2]="File"}(e.SettingStorage||(e.SettingStorage={})),function(t){t.MarkdownItPlugin="markdownItPlugin",t.CodeMirrorPlugin="codeMirrorPlugin"}(e.ContentScriptType||(e.ContentScriptType={}))}]);
}
module.exports = { initPlugin };

View File

@@ -0,0 +1,16 @@
{
"manifest_version": 1,
"id": "org.joplinapp.plugins.AbcSheetMusic",
"app_min_version": "2.2",
"version": "1.0.2",
"name": "ABC Sheet Music Plugin",
"description": "Turns ABC text notation into sheet music",
"author": "Laurent Cozic",
"homepage_url": "https://github.com/joplin/plugin-abc-sheet-music",
"repository_url": "https://github.com/joplin/plugin-abc-sheet-music",
"keywords": [
"sheet music",
"abc",
"notation"
]
}

View File

@@ -0,0 +1,14 @@
const initPlugin = joplin => {
joplin.plugins.register({
onStart: async function() {
// eslint-disable-next-line no-console
console.info('RUNNING AS PLUGIN 1: ', await joplin.plugins.id()); // await joplin.plugins.id());
// const folder = await joplin.data.post(['folders'], null, { title: "my plugin folder" });
// await joplin.data.post(['notes'], null, { parent_id: folder.id, title: "testing plugin!" });
},
});
}
module.exports = { initPlugin };

View File

@@ -0,0 +1,12 @@
{
"id": "org.joplinapp.plugins.Simple",
"manifest_version": 1,
"app_min_version": "1.4",
"name": "Joplin Simple Plugin",
"version": "1.0.0",
"description": "To test loading and running a plugin",
"homepage_url": "https://joplinapp.org",
"permissions": [
"model"
]
}

View File

@@ -0,0 +1,14 @@
const initPlugin = joplin => {
joplin.plugins.register({
onStart: async function() {
// eslint-disable-next-line no-console
console.info('RUNNING AS PLUGIN 2: ', await joplin.plugins.id());
// const folder = await joplin.data.post(['folders'], null, { title: "my plugin folder" });
// await joplin.data.post(['notes'], null, { parent_id: folder.id, title: "testing plugin!" });
},
});
}
module.exports = { initPlugin };

View File

@@ -0,0 +1,12 @@
{
"id": "org.joplinapp.plugins.Simple2",
"manifest_version": 1,
"app_min_version": "1.4",
"name": "Joplin Simple Plugin",
"version": "1.0.0",
"description": "To test loading and running a plugin",
"homepage_url": "https://joplinapp.org",
"permissions": [
"model"
]
}

View File

@@ -85,7 +85,7 @@ const SyncTargetWebDAV = require('@joplin/lib/SyncTargetWebDAV.js');
const SyncTargetDropbox = require('@joplin/lib/SyncTargetDropbox.js');
const SyncTargetAmazonS3 = require('@joplin/lib/SyncTargetAmazonS3.js');
import BiometricPopup from './components/biometrics/BiometricPopup';
import initLib from '@joplin/lib/initLib';
import PluginService from '@joplin/lib/services/plugins/PluginService';
SyncTargetRegistry.addClass(SyncTargetNone);
SyncTargetRegistry.addClass(SyncTargetOneDrive);
@@ -121,6 +121,7 @@ import { ReactNode } from 'react';
import userFetcher, { initializeUserFetcher } from '@joplin/lib/utils/userFetcher';
import { parseShareCache } from '@joplin/lib/services/share/reducer';
import autodetectTheme, { onSystemColorSchemeChange } from './utils/autodetectTheme';
import PluginRunner from './services/plugins/PluginRunner';
type SideMenuPosition = 'left' | 'right';
@@ -439,6 +440,97 @@ const initializeTempDir = async () => {
return tempDir;
};
const simplePlugin1 = require('./plugins/org.joplinapp.plugins.Simple/index.js');
const simplePluginManifest1 = `{
"id": "org.joplinapp.plugins.Simple",
"manifest_version": 1,
"app_min_version": "1.4",
"name": "Joplin Simple Plugin",
"version": "1.0.0",
"description": "To test loading and running a plugin",
"homepage_url": "https://joplinapp.org",
"permissions": [
"model"
]
}`;
const simplePlugin2 = require('./plugins/org.joplinapp.plugins.Simple2/index.js');
const simplePluginManifest2 = `{
"id": "org.joplinapp.plugins.Simple2",
"manifest_version": 1,
"app_min_version": "1.4",
"name": "Joplin Simple Plugin",
"version": "1.0.0",
"description": "To test loading and running a plugin",
"homepage_url": "https://joplinapp.org",
"permissions": [
"model"
]
}`;
// const abcPlugin = require('./plugins/org.joplinapp.plugins.AbcSheetMusic/index.js');
// const abcPluginManifest = `{
// "manifest_version": 1,
// "id": "org.joplinapp.plugins.AbcSheetMusic",
// "app_min_version": "2.2",
// "version": "1.0.2",
// "name": "ABC Sheet Music Plugin",
// "description": "Turns ABC text notation into sheet music",
// "author": "Laurent Cozic",
// "homepage_url": "https://github.com/joplin/plugin-abc-sheet-music",
// "repository_url": "https://github.com/joplin/plugin-abc-sheet-music",
// "keywords": [
// "sheet music",
// "abc",
// "notation"
// ]
// }`;
// const abcPluginContentScript = require('./plugins/org.joplinapp.plugins.AbcSheetMusic/markdownItPlugin.js');
const metisPlugin = require('./plugins/com.hieuthi.joplin.metis/index.js');
const metisManifest = `{
"manifest_version": 1,
"id": "com.hieuthi.joplin.metis",
"app_min_version": "2.2",
"version": "0.1.5",
"name": "Metis",
"description": "A Simple Task Manager Plugin for Joplin based on Todo.txt Specification",
"author": "Hieu-Thi Luong",
"homepage_url": "https://github.com/hieuthi/joplin-plugin-metis",
"repository_url": "https://github.com/hieuthi/joplin-plugin-metis",
"keywords": ["joplin-plugin","todo","todotxt","task management"]
}`;
const metisContentScript = require('./plugins/com.hieuthi.joplin.metis/todoTxtMdRule.js');
const initPluginService = async () => {
const service = PluginService.instance();
const runner = new PluginRunner();
service.initialize(
'2.12.1',
{
joplin: {},
},
runner,
{
dispatch: () => {},
getState: () => {},
}
);
const plugin1 = await PluginService.instance().loadPluginFromModule({ main: simplePlugin1 }, simplePluginManifest1);
await PluginService.instance().runPlugin(plugin1);
const plugin2 = await PluginService.instance().loadPluginFromModule({ main: simplePlugin2 }, simplePluginManifest2);
await PluginService.instance().runPlugin(plugin2);
// const plugin3 = await PluginService.instance().loadPluginFromModule({ main: abcPlugin, contentScripts: { ['markdownItPlugin.js']: abcPluginContentScript } }, abcPluginManifest);
// await PluginService.instance().runPlugin(plugin3);
const plugin4 = await PluginService.instance().loadPluginFromModule({ main: metisPlugin, contentScripts: { ['todoTxtMdView.js']: metisContentScript } }, metisManifest);
await PluginService.instance().runPlugin(plugin4);
};
// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
async function initialize(dispatch: Function) {
shimInit();
@@ -475,7 +567,6 @@ async function initialize(dispatch: Function) {
}
Logger.initializeGlobalLogger(mainLogger);
initLib(mainLogger);
reg.setLogger(mainLogger);
reg.setShowErrorMessageBoxHandler((message: string) => { alert(message); });
@@ -707,6 +798,8 @@ async function initialize(dispatch: Function) {
// and it cannot collect anything when the app is not active.
RevisionService.instance().runInBackground(1000 * 30);
await initPluginService();
// ----------------------------------------------------------------------------
// Keep this below to test react-native-rsa-native
// ----------------------------------------------------------------------------

View File

@@ -0,0 +1,15 @@
import Global from '@joplin/lib/services/plugins/api/Global';
import BasePluginRunner from '@joplin/lib/services/plugins/BasePluginRunner';
import Plugin from '@joplin/lib/services/plugins/Plugin';
import Logger from '@joplin/utils/Logger';
const logger = Logger.create('PluginRunner');
export default class PluginRunner extends BasePluginRunner {
public async run(plugin: Plugin, sandbox: Global): Promise<void> {
logger.info(`Run plugin: ${plugin.id}`);
plugin.module.main.initPlugin(sandbox.joplin);
}
}

View File

@@ -256,12 +256,8 @@ export default class FsDriverRN extends FsDriverBase {
return output ? output : null;
}
public resolve(path: string) {
throw new Error(`Not implemented: resolve(): ${path}`);
}
public resolveRelativePathWithinDir(_baseDir: string, relativePath: string) {
throw new Error(`Not implemented: resolveRelativePathWithinDir(): ${relativePath}`);
public resolve(...pathSegments: string[]) {
return resolve(...pathSegments);
}
public async md5File(path: string): Promise<string> {
@@ -351,7 +347,7 @@ export default class FsDriverRN extends FsDriverBase {
} else {
// the result is an array
if (multiple) {
result = await DocumentPicker.pick({ allowMultiSelection: true });
result = await DocumentPicker.pickMultiple();
} else {
result = [await DocumentPicker.pick()];
}

View File

@@ -0,0 +1,21 @@
import { MarkupLanguageUtils as BaseMarkupLanguageUtils } from '@joplin/lib/markupLanguageUtils';
import { PluginStates } from '@joplin/lib/services/plugins/reducer';
import { contentScriptsToRendererRules } from '@joplin/lib/services/plugins/utils/loadContentScripts';
import { Options } from '@joplin/renderer/MarkupToHtml';
class MarkupLanguageUtils extends BaseMarkupLanguageUtils {
public newMarkupToHtml(plugins: PluginStates = null, options: Options = null) {
plugins = plugins || {};
return super.newMarkupToHtml(null, {
extraRendererRules: contentScriptsToRendererRules(plugins),
...options,
});
}
}
const markupLanguageUtils = new MarkupLanguageUtils();
export default markupLanguageUtils;

View File

@@ -45,16 +45,16 @@
"entities": "2.2.0"
},
"devDependencies": {
"@types/jest": "29.5.3",
"@types/node": "18.16.18",
"@typescript-eslint/eslint-plugin": "5.60.0",
"@typescript-eslint/parser": "5.60.0",
"@types/jest": "29.5.1",
"@types/node": "18.15.13",
"@typescript-eslint/eslint-plugin": "5.59.0",
"@typescript-eslint/parser": "5.59.0",
"coveralls": "3.1.1",
"eslint": "8.43.0",
"eslint": "8.39.0",
"jest": "29.5.0",
"prettier": "2.8.8",
"ts-jest": "29.1.1",
"typescript": "5.1.3"
"ts-jest": "29.1.0",
"typescript": "5.0.2"
},
"jest": {
"preset": "ts-jest",

View File

@@ -1,6 +1,6 @@
{
"name": "generate-plugin-doc",
"packageManager": "yarn@3.6.0",
"packageManager": "yarn@3.3.1",
"scripts": {
"buildPluginDoc_": "typedoc --name 'Joplin Plugin API Documentation' --mode file -theme '../../Assets/PluginDocTheme/' --readme '../../Assets/PluginDocTheme/index.md' --excludeNotExported --excludeExternals --excludePrivate --excludeProtected --out ../../../joplin-website/docs/api/references/plugin_api ../lib/services/plugins/api/"
},

View File

@@ -59,6 +59,7 @@ import Resource from './models/Resource';
import { ProfileConfig } from './services/profileConfig/types';
import initProfile from './services/profileConfig/initProfile';
import { parseShareCache } from './services/share/reducer';
import RotatingLogs from './RotatingLogs';
const appLogger: LoggerWrapper = Logger.create('App');
@@ -68,7 +69,6 @@ const appLogger: LoggerWrapper = Logger.create('App');
interface StartOptions {
keychainEnabled?: boolean;
setupGlobalLogger?: boolean;
}
export default class BaseApplication {
@@ -547,7 +547,7 @@ export default class BaseApplication {
const newState = store.getState();
if (this.hasGui() && ['NOTE_UPDATE_ONE', 'NOTE_DELETE', 'FOLDER_UPDATE_ONE', 'FOLDER_DELETE'].indexOf(action.type) >= 0) {
if (!(await reg.syncTarget().syncStarted())) void reg.scheduleSync(15 * 1000, { syncSteps: ['update_remote', 'delete_remote'] });
if (!(await reg.syncTarget().syncStarted())) void reg.scheduleSync(1000, { syncSteps: ['update_remote', 'delete_remote'] });
SearchEngine.instance().scheduleSyncTables();
}
@@ -735,24 +735,9 @@ export default class BaseApplication {
return toSystemSlashes(output, 'linux');
}
protected startRotatingLogMaintenance(profileDir: string) {
this.rotatingLogs = new RotatingLogs(profileDir);
const processLogs = async () => {
try {
await this.rotatingLogs.cleanActiveLogFile();
await this.rotatingLogs.deleteNonActiveLogFiles();
} catch (error) {
appLogger.error(error);
}
};
shim.setTimeout(() => { void processLogs(); }, 60000);
shim.setInterval(() => { void processLogs(); }, 24 * 60 * 60 * 1000);
}
public async start(argv: string[], options: StartOptions = null): Promise<any> {
options = {
keychainEnabled: true,
setupGlobalLogger: true,
...options,
};
@@ -815,15 +800,18 @@ export default class BaseApplication {
const extraFlags = await this.readFlagsFromFile(`${profileDir}/flags.txt`);
initArgs = { ...initArgs, ...extraFlags };
const globalLogger = Logger.globalLogger;
if (options.setupGlobalLogger) {
globalLogger.addTarget(TargetType.File, { path: `${profileDir}/log.txt` });
if (Setting.value('appType') === 'desktop') {
globalLogger.addTarget(TargetType.Console);
}
globalLogger.setLevel(initArgs.logLevel);
const globalLogger = new Logger();
globalLogger.addTarget(TargetType.File, { path: `${profileDir}/log.txt` });
if (Setting.value('appType') === 'desktop') {
globalLogger.addTarget(TargetType.Console);
}
globalLogger.setLevel(initArgs.logLevel);
Logger.initializeGlobalLogger(globalLogger);
reg.setLogger(Logger.create('') as Logger);
// reg.dispatch = () => {};
@@ -946,6 +934,18 @@ export default class BaseApplication {
await MigrationService.instance().run();
this.rotatingLogs = new RotatingLogs(profileDir);
const processLogs = async () => {
try {
await this.rotatingLogs.cleanActiveLogFile();
await this.rotatingLogs.deleteNonActiveLogFiles();
} catch (error) {
appLogger.error(error);
}
};
shim.setTimeout(() => { void processLogs(); }, 60000);
shim.setInterval(() => { void processLogs(); }, 24 * 60 * 60 * 1000);
return argv;
}
}

View File

@@ -26,12 +26,6 @@ export default class BaseSyncTarget {
return false;
}
// Returns true if the sync target expects a non-empty sync.{id}.password
// setting.
public static requiresPassword() {
return false;
}
public static description(): string {
return '';
}

View File

@@ -114,7 +114,7 @@ export default class ClipperServer {
} catch (error) {
this.setStartState(StartState.Idle);
this.logger().error(error);
return null;
return;
}
this.server_ = require('http').createServer();

View File

@@ -0,0 +1,56 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
Object.defineProperty(exports, "__esModule", { value: true });
const shim_1 = require("./shim");
class RotatingLogs {
constructor(logFilesDir, maxFileSize = null, inactiveMaxAge = null) {
this.maxFileSize = 1024 * 1024 * 100;
this.inactiveMaxAge = 90 * 24 * 60 * 60 * 1000;
this.logFilesDir = logFilesDir;
if (maxFileSize)
this.maxFileSize = maxFileSize;
if (inactiveMaxAge)
this.inactiveMaxAge = inactiveMaxAge;
}
cleanActiveLogFile() {
return __awaiter(this, void 0, void 0, function* () {
const stats = yield this.fsDriver().stat(this.logFileFullpath());
if (stats.size >= this.maxFileSize) {
const newLogFile = this.logFileFullpath(this.getNameToNonActiveLogFile());
yield this.fsDriver().move(this.logFileFullpath(), newLogFile);
}
});
}
getNameToNonActiveLogFile() {
return `log-${Date.now()}.txt`;
}
deleteNonActiveLogFiles() {
return __awaiter(this, void 0, void 0, function* () {
const files = yield this.fsDriver().readDirStats(this.logFilesDir);
for (const file of files) {
if (!file.path.match(/^log-[0-9]+.txt$/gi))
continue;
const ageOfTheFile = Date.now() - file.birthtime;
if (ageOfTheFile >= this.inactiveMaxAge) {
yield this.fsDriver().remove(this.logFileFullpath(file.path));
}
}
});
}
logFileFullpath(fileName = 'log.txt') {
return `${this.logFilesDir}/${fileName}`;
}
fsDriver() {
return shim_1.default.fsDriver();
}
}
exports.default = RotatingLogs;
//# sourceMappingURL=RotatingLogs.js.map

View File

@@ -0,0 +1,56 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
Object.defineProperty(exports, "__esModule", { value: true });
const fs_extra_1 = require("fs-extra");
const test_utils_1 = require("./testing/test-utils");
const RotatingLogs_1 = require("./RotatingLogs");
const createTestLogFile = (dir) => __awaiter(void 0, void 0, void 0, function* () {
yield (0, fs_extra_1.writeFile)(`${dir}/log.txt`, 'some content');
});
describe('RotatingLogs', () => {
test('should rename log.txt to log-TIMESTAMP.txt', () => __awaiter(void 0, void 0, void 0, function* () {
let dir;
try {
dir = yield (0, test_utils_1.createTempDir)();
yield createTestLogFile(dir);
let files = yield (0, fs_extra_1.readdir)(dir);
expect(files.find(file => file.match(/^log.txt$/gi))).toBeTruthy();
expect(files.length).toBe(1);
const rotatingLogs = new RotatingLogs_1.default(dir, 1, 1);
yield rotatingLogs.cleanActiveLogFile();
files = yield (0, fs_extra_1.readdir)(dir);
expect(files.find(file => file.match(/^log.txt$/gi))).toBeFalsy();
expect(files.find(file => file.match(/^log-[0-9]+.txt$/gi))).toBeTruthy();
expect(files.length).toBe(1);
}
finally {
yield (0, fs_extra_1.remove)(dir);
}
}));
test('should delete inative log file after 1ms', () => __awaiter(void 0, void 0, void 0, function* () {
let dir;
try {
dir = yield (0, test_utils_1.createTempDir)();
yield createTestLogFile(dir);
const rotatingLogs = new RotatingLogs_1.default(dir, 1, 1);
yield rotatingLogs.cleanActiveLogFile();
yield (0, test_utils_1.msleep)(1);
yield rotatingLogs.deleteNonActiveLogFiles();
const files = yield (0, fs_extra_1.readdir)(dir);
expect(files.find(file => file.match(/^log-[0-9]+.txt$/gi))).toBeFalsy();
expect(files.length).toBe(0);
}
finally {
yield (0, fs_extra_1.remove)(dir);
}
}));
});
//# sourceMappingURL=RotatingLogs.test.js.map

View File

@@ -12,7 +12,7 @@ describe('RotatingLogs', () => {
try {
dir = await createTempDir();
await createTestLogFile(dir);
let files = await readdir(dir);
let files: string[] = await readdir(dir);
expect(files.find(file => file.match(/^log.txt$/gi))).toBeTruthy();
expect(files.length).toBe(1);
const rotatingLogs: RotatingLogs = new RotatingLogs(dir, 1, 1);
@@ -26,7 +26,7 @@ describe('RotatingLogs', () => {
}
});
test('should delete inactive log file after 1ms', async () => {
test('should delete inative log file after 1ms', async () => {
let dir: string;
try {
dir = await createTempDir();
@@ -42,21 +42,4 @@ describe('RotatingLogs', () => {
await remove(dir);
}
});
test('should not delete the log-timestamp.txt right after its be created', async () => {
let dir: string;
try {
dir = await createTempDir();
await createTestLogFile(dir);
await msleep(100);
const rotatingLogs: RotatingLogs = new RotatingLogs(dir, 1, 100);
await rotatingLogs.cleanActiveLogFile();
await rotatingLogs.deleteNonActiveLogFiles();
const files = await readdir(dir);
expect(files.find(file => file.match(/^log-[0-9]+.txt$/gi))).toBeTruthy();
expect(files.length).toBe(1);
} finally {
await remove(dir);
}
});
});

View File

@@ -29,8 +29,7 @@ export default class RotatingLogs {
const files: Stat[] = await this.fsDriver().readDirStats(this.logFilesDir);
for (const file of files) {
if (!file.path.match(/^log-[0-9]+.txt$/gi)) continue;
const timestamp: number = parseInt(file.path.match(/[0-9]+/g)[0], 10);
const ageOfTheFile: number = Date.now() - timestamp;
const ageOfTheFile: number = Date.now() - file.birthtime;
if (ageOfTheFile >= this.inactiveMaxAge) {
await this.fsDriver().remove(this.logFileFullpath(file.path));
}

View File

@@ -36,10 +36,6 @@ class SyncTargetAmazonS3 extends BaseSyncTarget {
return true;
}
static requiresPassword() {
return true;
}
static s3BucketName() {
return Setting.value('sync.8.path');
}

View File

@@ -49,10 +49,6 @@ export default class SyncTargetJoplinCloud extends BaseSyncTarget {
return true;
}
public static requiresPassword() {
return true;
}
public async fileApi(): Promise<FileApi> {
return super.fileApi();
}

View File

@@ -65,10 +65,6 @@ export default class SyncTargetJoplinServer extends BaseSyncTarget {
return true;
}
public static requiresPassword() {
return true;
}
public async fileApi(): Promise<FileApi> {
return super.fileApi();
}

View File

@@ -33,10 +33,6 @@ class SyncTargetNextcloud extends BaseSyncTarget {
return true;
}
static requiresPassword() {
return true;
}
static async checkConfig(options) {
return SyncTargetWebDAV.checkConfig(options);
}

View File

@@ -32,10 +32,6 @@ class SyncTargetWebDAV extends BaseSyncTarget {
return true;
}
static requiresPassword() {
return true;
}
static async newFileApi_(syncTargetId, options) {
const apiOptions = {
baseUrl: () => options.path(),

View File

@@ -272,7 +272,7 @@ export default class Synchronizer {
}
public async cancel() {
if (this.cancelling_ || this.state() === 'idle') return null;
if (this.cancelling_ || this.state() === 'idle') return;
// Stop queue but don't set it to null as it may be used to
// retrieve the last few downloads.

View File

@@ -1,7 +1,7 @@
const Setting = require('../../../models/Setting').default;
const SyncTargetRegistry = require('../../../SyncTargetRegistry').default;
const ObjectUtils = require('../../../ObjectUtils');
const { _ } = require('../../../locale');
const Setting = require('../../models/Setting').default;
const SyncTargetRegistry = require('../../SyncTargetRegistry').default;
const ObjectUtils = require('../../ObjectUtils');
const { _ } = require('../../locale');
const { createSelector } = require('reselect');
const Logger = require('@joplin/utils/Logger').default;

View File

@@ -1,42 +0,0 @@
import SyncTargetRegistry from '../../../SyncTargetRegistry';
import shouldShowMissingPasswordWarning from './shouldShowMissingPasswordWarning';
// Maps targets to whether each target requires a password.
// A subset of all sync targets.
const targetToRequiresPassword: Record<string, boolean> = {
'nextcloud': true,
'webdav': true,
'amazon_s3': true,
'joplinServer': true,
'joplinCloud': true,
'onedrive': false,
'dropbox': false,
};
describe('shouldShowMissingPasswordWarning', () => {
it('should return true when sync target requires a password and the password is missing', () => {
for (const targetName in targetToRequiresPassword) {
const targetId = SyncTargetRegistry.nameToId(targetName);
const expected = targetToRequiresPassword[targetName];
expect(shouldShowMissingPasswordWarning(targetId, {})).toBe(expected);
// Should also consider an empty string to be missing
const settings = {
[`sync.${targetId}.password`]: '',
};
expect(shouldShowMissingPasswordWarning(targetId, settings)).toBe(expected);
}
});
it('should return false when a password is present', () => {
for (const targetName in targetToRequiresPassword) {
const targetId = SyncTargetRegistry.nameToId(targetName);
const settings = {
[`sync.${targetId}.password`]: 'some nonempty',
};
expect(shouldShowMissingPasswordWarning(targetId, settings)).toBe(false);
}
});
});

View File

@@ -1,9 +0,0 @@
import SyncTargetRegistry from '../../../SyncTargetRegistry';
const shouldShowMissingPasswordWarning = (syncTargetId: number, settings: any) => {
const syncTargetClass = SyncTargetRegistry.classById(syncTargetId);
return syncTargetClass.requiresPassword() && !settings[`sync.${syncTargetId}.password`];
};
export default shouldShowMissingPasswordWarning;

View File

@@ -158,6 +158,20 @@ export default class FsDriverBase {
};
}
public resolve(..._pathSegments: string[]): string {
throw new Error('Not implemented');
}
// Resolves the provided relative path to an absolute path within baseDir. The function
// also checks that the absolute path is within baseDir, to avoid security issues.
// It is expected that baseDir is a safe path (not user-provided).
public resolveRelativePathWithinDir(baseDir: string, relativePath: string) {
const resolvedBaseDir = this.resolve(baseDir);
const resolvedPath = this.resolve(baseDir, relativePath);
if (resolvedPath.indexOf(resolvedBaseDir) !== 0) throw new Error(`Resolved path for relative path "${relativePath}" is not within base directory "${baseDir}" (Was resolved to ${resolvedPath})`);
return resolvedPath;
}
public async tarExtract(_options: any) {
throw new Error('Not implemented');
}

View File

@@ -186,18 +186,8 @@ export default class FsDriverNode extends FsDriverBase {
throw new Error(`Unsupported encoding: ${encoding}`);
}
public resolve(path: string) {
return require('path').resolve(path);
}
// Resolves the provided relative path to an absolute path within baseDir. The function
// also checks that the absolute path is within baseDir, to avoid security issues.
// It is expected that baseDir is a safe path (not user-provided).
public resolveRelativePathWithinDir(baseDir: string, relativePath: string) {
const resolvedBaseDir = nodeResolve(baseDir);
const resolvedPath = nodeResolve(baseDir, relativePath);
if (resolvedPath.indexOf(resolvedBaseDir) !== 0) throw new Error(`Resolved path for relative path "${relativePath}" is not within base directory "${baseDir}" (Was resolved to ${resolvedPath})`);
return resolvedPath;
public resolve(...pathSegments: string[]) {
return nodeResolve(...pathSegments);
}
public async md5File(path: string): Promise<string> {

View File

@@ -1,9 +0,0 @@
import Logger from '@joplin/utils/Logger';
// @joplin/lib has its own copy of the Logger class, however we want it to be
// initialised with the same logger instance as the calling application, so that
// the lib and app share the same log. This initLib() function is used for this
// and must be called by any "app" package that makes use of the lib package.
export default (globalLogger: Logger) => {
Logger.initializeGlobalLogger(globalLogger);
};

View File

@@ -76,7 +76,7 @@
"Application": "Anwendung",
"Apply": "Anwenden",
"Are you sure you want to renew the authorisation token?": "Bist du sicher, dass du den Berechtigungstoken erneuern möchtest?",
"Are you sure you want to return to the default layout? The current layout configuration will be lost.": "Sicher, dass du zum Standardlayout zurückkehren möchtest? Das aktuelle Layout geht dabei verloren.",
"Are you sure you want to return to the default layout? The current layout configuration will be lost.": "Sicher, dass du zum Standardlayout zurückkehren möchtest? Das aktuelle Layout geht dabei verloren",
"Arguments:": "Kommandozeilenargumente:",
"Aritim Dark": "Aritim dunkel",
"Attach": "Anhängen",
@@ -99,7 +99,6 @@
"Automatically switch theme to match system theme": "Automatisch das Design ändern, um es dem System-Design anzupassen",
"Back": "Zurück",
"Basic": "Standard",
"Biometric unlock is not setup on the device. Please set it up in order to unlock Joplin. If the device is on lockout, consider switching it off and on to reset biometrics scanning.": "Biometrisches Entsperren ist auf diesem Gerät nicht eingerichtet. Bitte richte es ein, um Joplin zu entsperren. Falls das Gerät gesperrt ist, solltest du es aus- und wieder einschalten, um das biometrische Scannen zurückzusetzen.",
"Bold": "Fett",
"Browse all plugins": "Alle Erweiterungen durchsuchen",
"Browse...": "Durchsuchen ...",
@@ -170,7 +169,6 @@
"Continue": "Fortfahren",
"Convert to note": "In eine Notiz umwandeln",
"Convert to todo": "In eine Aufgabe umwandeln",
"Converting speech to text...": "Wandle Sprache in Text um...",
"Copy": "Kopieren",
"Copy dev mode command to clipboard": "Entwicklermodus-Befehl in Zwischenablage kopieren",
"Copy external link": "Externen Link kopieren",
@@ -189,7 +187,6 @@
"Could not switch profile: %s": "Konnte das Profil nicht wechseln: %s",
"Could not upgrade master key: %s": "Konnte Hauptschlüssel nicht aktualisieren: %s",
"Could not verify the share status of this notebook - aborting. Please try again when you are connected to the internet.": "Der Freigabestatus dieses Notizbuchs konnte nicht überprüft werden - Vorgang wird abgebrochen. Bitte versuche es erneut, wenn eine Internetverbindung besteht.",
"Could not verify your identify: %s": "Konnte deine Identität nicht verifizieren: %s",
"Create": "Erstellen",
"Create a new notebook under a parent notebook.": "Erstelle ein neues Notizbuch unter einem übergeordneten Notizbuch.",
"Create a notebook": "Notizbuch erstellen",
@@ -280,7 +277,6 @@
"Downloaded and decrypted": "Heruntergeladen und entschlüsselt",
"Downloaded and encrypted": "Heruntergeladen und verschlüsselt",
"Downloading": "Wird heruntergeladen",
"Downloading %s language files...": "Lade %s Sprachdateien herunter...",
"Downloading resources...": "Anhänge werden heruntergeladen ...",
"Dracula": "Dracula",
"Drop notes or files here": "Notizen oder Dateien hierher ziehen",
@@ -330,7 +326,6 @@
"Enable soft breaks": "Weiche Zeilenumbrüche aktivieren",
"Enable spellcheck in the text editor": "Aktiviere die Rechtschreibprüfung im Text-Editor",
"Enable table of contents extension": "Inhaltsverzeichnis-Erweiterung aktivieren",
"Enable the Markdown toolbar": "Markdown Werkzeugleiste aktivieren",
"Enable typographer support": "Typographie-Unterstützung aktivieren",
"Enable video player": "Videospieler aktivieren",
"Enable Web Clipper Service": "Web-Clipper-Dienst aktivieren",
@@ -411,7 +406,6 @@
"Headers": "Kopfzeilen",
"Heading": "Überschrift",
"Help": "Hilfe",
"Hermes enabled: %d": "Hermes aktiviert: %d",
"Hide %s": "%s ausblenden",
"Hide advanced": "Erweitertes verstecken",
"Hide disabled": "Deaktiviertes verstecken",
@@ -495,7 +489,6 @@
"Later": "Später",
"Layout": "Layout",
"Layout button sequence": "Layout-Reihenfolge",
"Leave it blank to download the language files from the default website": "Lasse es leer, um die Sprachdateien von der Standardseite herunterzuladen.",
"Leave notebook...": "Verlasse Notizbuch...",
"Legal": "Legal",
"Letter": "Letter",
@@ -509,7 +502,6 @@
"List item": "Listeneintrag",
"Lists": "Listen",
"Loaded": "Geladen",
"Loading...": "Lade...",
"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.",
"Log": "Protokoll",
@@ -650,7 +642,6 @@
"Please enter your password in the master key list below before upgrading the key.": "Bitte gib zuerst dein Passwort in der unten stehenden Liste der Hauptschlüssel ein, bevor du den Schlüssel aktualisierst.",
"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.": "Wenn das Notizbuch sehr groß ist, kann es ein paar Minuten dauern, bis alle Notizen auf dem Empfängergerät erscheinen.",
"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.": "Bitte öffne die folgende URL in deinem Browser, um die Anwendung zu authentifizieren. Die Anwendung erstellt ein Verzeichnis in „Apps/Joplin“ und kann nur Dateien in diesem Verzeichnis lesen und schreiben. Sie hat weder Zugriff auf Dateien außerhalb dieses Verzeichnisses noch auf andere persönliche Daten. Es werden keine Daten an Dritte weitergegeben.",
"Please record your voice...": "Bitte nehme deine Stimme auf...",
"Please select a notebook first.": "Bitte wähle erst ein Notizbuch aus.",
"Please select the note or notebook to be deleted first.": "Bitte wähle zuerst eine Notiz oder ein Notizbuch aus, das gelöscht werden soll.",
"Please select where the sync status should be exported to": "Bitte wähle aus, wohin der Synchronisations-Status exportiert werden soll",
@@ -760,7 +751,6 @@
"Select all": "Alles auswählen",
"Select emoji...": "Emoji auswählen...",
"Select file...": "Datei auswählen...",
"Select parent notebook": "Eltern-Notizbuch auswählen",
"Server is already running on port %d": "Server läuft bereits auf Port %d",
"Server is not running.": "Server läuft nicht.",
"Server is running on port %d": "Server läuft auf Port %d",
@@ -1006,8 +996,6 @@
"View them now": "Zeige sie jetzt an",
"Viewer": "Vorschau",
"Vim": "Vim",
"Voice typing language files (URL)": "Sprachdateien für die Spracheingabe (URL)",
"Voice typing...": "Spracheingabe...",
"Warning": "Warnung",
"Warning: not all resources shown for performance reasons (limit: %s).": "Warnung: Aus Leistungsgründen werden nicht alle Anhänge angezeigt (Obergrenze: %s).",
"Web Clipper": "Web Clipper",
@@ -1017,7 +1005,6 @@
"WebDAV username": "WebDAV-Benutzername",
"Website and documentation": "Webseite und Dokumentation",
"Welcome to Joplin!\n\nType `:help shortcuts` for the list of keyboard shortcuts, or just `:help` for usage information.\n\nFor example, to create a notebook press `mb`; to create a note press `mn`.": "Willkommen bei Joplin!\n\nTippe `:help shortcuts` für eine Liste der Shortcuts oder `:help` für Informationen zur Benutzung ein.\n\nUm zum Beispiel ein Notizbuch zu erstellen, drücke `mb`; um eine Notiz zu erstellen drücke `mn`.",
"Welcome!": "Willkommen!",
"When creating a new note:": "Wenn eine neue Notiz erstellt wird:",
"When creating a new to-do:": "Wenn eine neue Aufgabe erstellt wird:",
"Words": "Wörter",

View File

@@ -1,15 +1,10 @@
{
"\"%s\" is missing the required \"%s\" property.": "Το \"%s\" δεν διαθέτει την απαιτούμενη ιδιότητα \"%s\".",
"%d days": "%d ημέρες",
"%d GB": "%d GB",
"%d GB storage space": "%d GB αποθηκευτικού χώρου",
"%d hour": "%d ώρα",
"%d hours": "%d ώρες",
"%d MB": "%d MB",
"%d MB per note or attachment": "%d MB ανά σημείωση ή συνημμένο",
"%d minutes": "%d΄λεπτά",
"%d notes match this pattern. Delete them?": "%d σημειώσεις ταιριάζουν. Θέλετε να διαγραφούν;",
"%s": "%s",
"%s %s (%s, %s)": "%s %s (%s, %s)",
"%s (%s) could not be uploaded: %s": "%s (%s) δεν μπορούν να ανέβουν: %s",
"%s (%s) would like to share a notebook with you.": "%s (%s) θα ήθελε να μοιραστεί μαζί σας ένα σημειωματάριο.",
@@ -32,7 +27,6 @@
"&Tools": "&Εργαλεία",
"&View": "&Εμφάνιση",
"(%s)": "(%s)",
"(In plugin: %s)": "(Στο plugin: %s)",
"(None)": "(Κανένας)",
"(wysiwyg: %s)": "(wysiwyg: %s)",
"- Camera: to allow taking a picture and attaching it to a note.": "- Φωτογραφική μηχανή: για να μπορείτε να τραβήξετε μια φωτογραφία και να την προσαρτήσετε σε μια σημείωση.",
@@ -48,13 +42,11 @@
"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": "Αποδοχή",
"Account": "Λογαριασμός",
"Action": "Ενέργεια",
"Actions": "Ενέργειες",
"Active": "Ενεργό",
"Actual Size": "Πραγματικό μέγεθος",
"Add body": "Προσθήκη σώματος κειμένου",
"Add new": "Προσθήκη νέου",
"Add or remove tags:": "Προσθήκη ή διαγραφή ετικετών:",
"Add recipient:": "Προσθήκη παραλήπτη:",
"Add title": "Προσθήκη τίτλου",
@@ -63,23 +55,17 @@
"Admin dashboard": "Πίνακας ελέγχου διαχειριστή",
"Advanced options": "Επιλογές για προχωρημένους",
"Advanced tools": "Προηγμένα εργαλεία",
"All data, including notes, notebooks and tags will be permanently deleted.": "Όλα τα δεδομένα, συμπεριλαμβανομένων των σημειώσεων, των σημειωματάριων και των ετικετών, θα διαγραφούν οριστικά.",
"All notes": "Όλες οι σημειώσεις",
"All potential ports are in use - please report the issue at %s": "Όλες οι πιθανές θύρες χρησιμοποιούνται - αναφέρετε το ζήτημα στο %s",
"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\". Παρακαλούμε χρησιμοποιήστε το σύντομο αναγνωριστικό σημειωματάριου - πατήστε \"ti\" για να δείτε το σύντομο αναγνωριστικό σημειωματάριου",
"An update is available, do you want to download it now?": "Υπάρχει διαθέσιμη μια ενημέρωση, θέλετε να την κατεβάσετε τώρα;",
"Appearance": "Εμφάνιση",
"Application": "Εφαρμογή",
"Apply": "Εφαρμογή",
"Are you sure you want to renew the authorisation token?": "Είστε βέβαιοι ότι θέλετε να ανανεώσετε το διακριτικό εξουσιοδότησης;",
"Are you sure you want to return to the default layout? The current layout configuration will be lost.": "Είστε σίγουροι ότι θέλετε να επιστρέψετε στην προεπιλεγμένη διάταξη; Η τρέχουσα διαμόρφωση της διάταξης θα χαθεί.",
"Arguments:": "Παράμετροι:",
"Aritim Dark": "Aritim Dark",
"Attach": "Επισύναψη",
"Attach file": "Επισύναψη αρχείου",
"Attach photo": "Επισυνάψτε μία φωτογραφία",
"Attach...": "Επισύναψη...",
@@ -98,13 +84,10 @@
"Automatically check for updates": "Αυτόματος έλεγχος για ενημερώσεις",
"Automatically switch theme to match system theme": "Αυτόματη εναλλαγή θέματος ώστε να ταιριάζει με το θέμα συστήματος",
"Back": "Πίσω",
"Basic": "Βασικό",
"Biometric unlock is not setup on the device. Please set it up in order to unlock Joplin. If the device is on lockout, consider switching it off and on to reset biometrics scanning.": "Το βιομετρικό ξεκλείδωμα δεν έχει ρυθμιστεί στη συσκευή. Παρακαλούμε ρυθμίστε το για να ξεκλειδώσετε το Joplin. Εάν η συσκευή είναι κλειδωμένη, σκεφτείτε να την απενεργοποιήσετε και να την ενεργοποιήσετε για να επαναφέρετε τη βιομετρική σάρωση.",
"Bold": "Έντονη γραφή",
"Browse all plugins": "Αναζήτηση όλων των plugin",
"Browse...": "Αναζήτηση...",
"Bulleted List": "Λίστα με κουκκίδες",
"Can Share": "Μπορεί να μοιραστεί",
"Cancel": "Άκυρο",
"Cancelling background synchronisation... Please wait.": "Ακύρωση συγχρονισμού ... Παρακαλώ περιμένετε.",
"Cancelling...": "Ακύρωση...",
@@ -113,7 +96,6 @@
"Cannot change encrypted item": "Δεν είναι δυνατή η αλλαγή κρυπτογραφημένου στοιχείου",
"Cannot copy note to \"%s\" notebook": "Δεν είναι δυνατή η αντιγραφή της σημείωσης στο σημειωματάριο \"%s\"",
"Cannot find \"%s\".": "Δεν είναι δυνατή η εύρεση του \"%s\".",
"Cannot find: \"%s\"": "Δεν είναι δυνατή η εύρεση του: \"%s\".",
"Cannot initialise synchroniser.": "Δεν είναι δυνατή η προετοιμασία του συγχρονιστή.",
"Cannot load \"%s\" module for format \"%s\" and output \"%s\"": "Δεν είναι δυνατή η φόρτωση του \"%s\" module με μορφή \"%s\" και έξοδο \"%s\"",
"Cannot load \"%s\" module for format \"%s\" and target \"%s\"": "Δεν είναι δυνατή η φόρτωση του module \"%s\" για τη μορφοποίηση σε \"%s\" και την εξαγωγή σε \"%s\"",
@@ -123,7 +105,6 @@
"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": "Case sensitive",
"Change application layout": "Αλλαγή διάταξης εφαρμογής",
"Change language": "Αλλαγή γλώσσας",
"Characters": "Χαρακτήρες",
@@ -141,13 +122,11 @@
"Click to add tags...": "Κάντε κλικ για να προσθέσετε ετικέτες...",
"Client ID: %s": "Αναγνωριστικό προγράμματος-πελάτη: %s",
"Close": "Κλείσιμο",
"Close dropdown": "Κλείσιμο πτυσσόμενου μενού",
"Close Window": "Κλείσιμο παραθύρου",
"Code": "Κώδικας",
"Code Block": "Μπλοκ Κώδικα",
"Code View": "Προβολή κώδικα",
"Collaborate on notebooks with others": "Συνεργασία σε σημειωματάρια με άλλους",
"Collapse": "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": "εντολή",
@@ -165,12 +144,9 @@
"Conflicted: %d": "Με διένεξη: %d",
"Conflicts": "Διενέξεις",
"Conflicts (attachments)": "Διενέξεις (συνημμένα)",
"Consolidated billing": "Ενοποιημένη χρέωση",
"Content provided by %s": "Περιεχόμενο που παρέχεται από %s",
"Continue": "Συνεχίστε",
"Convert to note": "Μετατροπή σε σημείωση",
"Convert to todo": "Μετατροπή σε to-do",
"Converting speech to text...": "Μετατροπή της ομιλίας σε κείμενο...",
"Copy": "Αντιγραφή",
"Copy dev mode command to clipboard": "Αντιγραφή dev mode εντολής στο πρόχειρο",
"Copy external link": "Αντιγραφή εξωτερικού συνδέσμου",
@@ -186,14 +162,9 @@
"Could not export notes: %s": "Δεν ήταν δυνατή η εξαγωγή σημειώσεων: %s",
"Could not install plugin: %s": "Δεν ήταν δυνατή η εγκατάσταση του plugin: %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 switch profile: %s": "Δεν ήταν δυνατή η αλλαγή του plugin: %s",
"Could not upgrade master key: %s": "Δεν ήταν δυνατή η αναβάθμιση του master κλειδιού: %s",
"Could not verify the share status of this notebook - aborting. Please try again when you are connected to the internet.": "Δεν ήταν δυνατή η επαλήθευση της κατάστασης κοινής χρήσης αυτού του φορητού υπολογιστή - διακοπή. Προσπαθήστε ξανά όταν συνδεθείτε στο διαδίκτυο.",
"Could not verify your identify: %s": "Δεν ήταν δυνατή η επαλήθευση της ταυτότητάς σας: %s",
"Create": "Δημιουργία",
"Create a new notebook under a parent notebook.": "Δημιουργήστε ένα νέο σημειωματάριο κάτω από ένα γονικό σημειωματάριο.",
"Create a notebook": "Δημιουργία σημειωματάριου",
"Create new profile...": "Δημιουργία νέου προφίλ...",
"Create notebook": "Δημιουργία σημειωματαρίου",
"Create user": "Δημιουργία χρήστη",
"Created": "Δημιουργήθηκε",
@@ -222,7 +193,6 @@
"Date": "Ημερομηνία",
"Date format": "Μορφή ημερομηνίας",
"days": "ημέρες",
"Decrease indent level": "Μείωση του επιπέδου εσοχής",
"Decrypted items: %d": "Αποκρυπτογραφημένα στοιχεία: %d",
"Decrypted items: %s / %s": "Αποκρυπτογραφημένα στοιχεία: %s / %s",
"Decrypting items: %d/%d": "Αποκρυπτογράφηση αντικειμένων: %d/%d",
@@ -239,11 +209,8 @@
"Delete notebook \"%s\"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.": "Διαγραφή σημειωματάριου \"%s\";\n\nΌλες οι σημειώσεις και τα υπο-σημειωματάρια που περιέχει θα διαγραφούν επίσης.",
"Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.": "Διαγραφή σημειωματάριου; Όλες οι σημειώσεις και τα υπο-σημειωματάρια θα διαγραφούν επίσης.",
"Delete plugin \"%s\"?": "Διαγραφή plugin \"%s\";",
"Delete profile \"%s\"": "Διαγραφή προφίλ \"%s\";",
"Delete selected notes": "Διαγραφή επιλεγμένων σημειώσεων",
"Delete these %d notes?": "Διαγραφή των σημειώσεων %d;",
"Delete this invitation? The recipient will no longer have access to this shared notebook.": "Να διαγραφεί αυτή την πρόσκληση; Ο παραλήπτης δεν θα έχει πλέον πρόσβαση σε αυτό το κοινόχρηστο σημειωματάριο.",
"Delete this profile?": "Να διαγραφεί αυτό το προφίλ;",
"Deleted local items: %d.": "Διαγραμμένα τοπικά στοιχεία: %d.",
"Deleted remote items: %d.": "Διαγραμμένα απομακρυσμένα στοιχεία: %d.",
"Deletes the given notebook.": "Διαγράφει το καθορισμένο σημειωματάριο.",
@@ -273,7 +240,6 @@
"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": "Έχουν ληφθεί",
@@ -287,21 +253,17 @@
"Dropbox Login": "Σύνδεση Dropbox",
"Duplicate": "Δημιουργία αντιγράφου",
"Duplicate line": "Διπλασιασμός γραμμής",
"Duplicate selected notes": "Διπλασιασμός επιλεγμένων γραμμών",
"Duplicates the notes matching <note> to [notebook]. If no notebook is specified the note is duplicated in the current notebook.": "Αντιγράφει τις σημειώσεις που ταιριάζουν με τη <note> στο [σημειωματάριο]. Εάν δεν έχει οριστεί κανένα σημειωματάριο, η σημείωση αντιγράφεται στον τρέχον.",
"Edit": "Επεξεργασία",
"Edit in external editor": "Επεξεργασία σε εξωτερικό editor",
"Edit link": "Επεξεργασία συνδέσμου",
"Edit note.": "Eπεξεργασία σημείωσης.",
"Edit notebook": "Επεξεργασία σημειωματάριου",
"Edit profile": "Επεξεργασία προφίλ",
"Editor": "Επεξεργασία",
"Editor font": "Γραμματοσειρά editor",
"Editor font family": "Οικογένεια γραμματοσειράς editor",
"Editor font size": "Μέγεθος γραμματοσειράς editor",
"Editor maximum width": "Μέγιστο πλάτος editor",
"Editor monospace font family": "Οικογένεια μονοδιαστημικών γραμματοσειρών επεξεργαστή",
"Editor: %s": "Συντάκτης: %s",
"Either \"text\" or \"json\"": "Είτε \"text\" ή \"json\"",
"Emacs": "Emacs",
"Email": "Email",
@@ -313,7 +275,6 @@
"Enable ^sup^ syntax": "Ενεργοποίηση ^sup^ syntax",
"Enable abbreviation syntax": "Ενεργοποίηση abbreviation syntax",
"Enable audio player": "Ενεργοποίηση προγράμματος αναπαραγωγής ήχου",
"Enable biometrics authentication?": "Ενεργοποίηση βιομετρικού ελέγχου ταυτότητας;",
"Enable deflist syntax": "Ενεργοποίηση deflist syntax",
"Enable encryption": "Ενεργοποίηση κρυπτογράφησης",
"Enable footnotes": "Ενεργοποίηση footnotes",
@@ -326,9 +287,7 @@
"Enable note history": "Ενεργοποίηση ιστορικού σημειώσεων",
"Enable PDF viewer": "Ενεργοποίηση προβολής PDF",
"Enable soft breaks": "Ενεργοποίηση soft breaks",
"Enable spellcheck in the text editor": "Ενεργοποίηση του ορθογραφικού ελέγχου στον επεξεργαστή κειμένου",
"Enable table of contents extension": "Ενεργοποίηση επέκτασης table of contents",
"Enable the Markdown toolbar": "Ενεργοποίηση της γραμμής εργαλείων Markdown",
"Enable typographer support": "Ενεργοποίηση υποστήριξης typographer",
"Enable video player": "Ενεργοποίηση προγράμματος αναπαραγωγής βίντεο",
"Enable Web Clipper Service": "Ενεργοποίηση υπηρεσίας Web Clipper",
@@ -355,7 +314,6 @@
"Evernote Export File (as HTML)": "Αρχείο εξαγωγής Evernote (σαν HTML)",
"Evernote Export File (as Markdown)": "Αρχείο εξαγωγής Evernote (σαν Markdown)",
"Exits the application.": "Βγαίνει από την εφαρμογή.",
"Expand": "Επέκταση",
"Export": "Εξαγωγή",
"Export all": "Εξαγωγή όλων",
"Export debug report": "Εξαγωγή Debug report",
@@ -374,9 +332,6 @@
"Fetching resources: %d/%d": "Λήψη πόρων: %d/%d",
"File": "Αρχείο",
"File system": "Σύστημα Αρχείων",
"Filter tags": "Φίλτρο ετικετών",
"Find and replace": "Εύρεση και αντικατάσταση",
"Find: ": "Found: %d.",
"Firefox Extension": "Επέκταση Firefox",
"Fix search index": "Διόρθωση ευρετηρίων αναζήτησης",
"Fixing search index...": "Διόρθωση ευρετηρίων αναζήτησης...",
@@ -385,17 +340,14 @@
"Focus title": "Eστίαση στον τίτλο",
"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:": "Για περισσότερες πληροφορίες σχετικά με την κρυπτογράφηση End-To-End (E2EE) και συμβουλές σχετικά με τον τρόπο ενεργοποίησής της, ελέγξτε το εγχειρίδιο:",
"For the list of keyboard shortcuts and config options, type `help keymap`": "Για τη λίστα των συντομεύσεων πληκτρολογίου και των ρυθμίσεων, πληκτρολογήστε `help keymap`",
"Force path style": "Επιβολή path style",
"Formatting": "Μορφοποίηση",
"Forward": "Μπροστά",
"Found: %d.": "Βρέθηκε: %d.",
"FTS enabled: %d": "FTS ενεργοποιημένο: %d",
"Full changelog": "Πλήρες αρχείο αλλαγών",
"Full name": "Ονοματεπώνυμο",
"General": "Γενικά",
"Generated": "Δημιουργήθηκε",
"Generating link...": "Δημιουργία συνδέσμου...",
@@ -405,18 +357,11 @@
"Go to source URL": "Μεταβείτε στη διεύθυνση URL προέλευσης",
"Goto Anything...": "Γρήγορη Μετακίνηση...",
"Grant authorisation": "Έγκριση εξουσιοδότησης",
"Header %d": "Επικεφαλίδα %d",
"Headers": "Κεφαλίδες",
"Heading": "Επικεφαλίδα",
"Help": "Βοήθεια",
"Hermes enabled: %d": "Hermes ενεργοποιημένο: %d",
"Hide %s": "Απόκρυψη %s",
"Hide advanced": "Απόκρυψη προηγμένων",
"Hide disabled": "Απόκρυψη απενεργοποιημένων",
"Hide disabled keys": "Απόκρυψη απενεργοποιημένων κλειδιών",
"Hide Joplin": "Κρύψε το Joplin",
"Hide keyboard": "Απόκρυψη πληκτρολογίου",
"Hide more actions": "Απόκρυψη περισσότερων ενεργειών",
"Highlight": "Επισήμανση",
"Home": "Home",
"Horizontal Rule": "Οριζόντια Διαγράμμιση",
@@ -441,14 +386,12 @@
"In order to use the web clipper, you need to do the following:": "Για να χρησιμοποιήσετε το web clipper, πρέπει να κάνετε τα εξής:",
"In progress": "Σε εξέλιξη",
"In: %s": "Στο: %s",
"Increase indent level": "Αύξηση του επιπέδου εσοχής",
"Indent less": "Μείωση εσοχής",
"Indent more": "Αύξηση εσοχής",
"Information": "Πληροφορίες",
"Inline Code": "Ενσωματωμένος κώδικας",
"Insert": "Εισαγωγή",
"Insert Hyperlink": "Εισαγωγή υπερσύνδεσης",
"Insert time": "Εισαγωγή ώρας",
"Install": "Εγκατάσταση",
"Install from file": "Εγκατάσταση από αρχείο",
"Installed": "Εγκαταστάθηκε",
@@ -464,7 +407,6 @@
"Items": "Στοιχεία",
"Items that cannot be decrypted": "Στοιχεία που δεν μπορούν αποκρυπτογραφηθούν",
"Items that cannot be synchronised": "Στοιχεία που δεν μπορούν να συγχρονιστούν",
"Join us on Twitter": "Ακολουθήστε μας στο Twitter",
"Joplin can synchronise your notes using various providers. Select one from the list below.": "Το Joplin μπορεί να συγχρονίσει τις σημειώσεις σας χρησιμοποιώντας διάφορους παρόχους. Επιλέξτε έναν από τον παρακάτω κατάλογο.",
"Joplin Cloud": "Joplin Cloud",
"Joplin Cloud email": "Joplin Cloud email",
@@ -480,7 +422,6 @@
"Joplin Web Clipper allows saving web pages and screenshots from your browser to Joplin.": "Το Joplin Web Clipper επιτρέπει την αποθήκευση ιστοσελίδων και screenshots από το πρόγραμμα περιήγησης στο Joplin.",
"Joplin website": "Joplin website",
"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": "Συντόμευση πληκτρολογίου",
@@ -498,15 +439,10 @@
"Letter": "Letter",
"Light": "Light",
"Lines": "Γραμμές",
"Link": "Σύνδεσμος",
"Link description": "Περιγραφή συνδέσμου",
"Link has been copied to clipboard!": "Ο σύνδεσμος έχει αντιγραφεί στο πρόχειρο!",
"Link text": "Κείμενο συνδέσμου",
"Links with protocol \"%s\" are not supported": "Σύνδεσμοι με πρωτόκολλο \"%s\" δεν υποστηρίζονται",
"List item": "Στοιχείο λίστας",
"Lists": "Λίστες",
"Loaded": "Φορτωμένα",
"Loading...": "Φόρτωση...",
"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\" και να συνεχίσετε τη λειτουργία.",
"Log": "Log",
@@ -519,8 +455,6 @@
"Make a donation": "Κάντε μια δωρεά",
"Manage master password": "Διαχείριση κύριου κωδικού πρόσβασης",
"Manage master password...": "Διαχείριση κύριου κωδικού πρόσβασης...",
"Manage multiple users": "Διαχείριση πολλαπλών χρηστών",
"Manage profiles": "Διαχείριση προφίλ",
"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": "Χειροκίνητα",
@@ -533,13 +467,9 @@
"Master password": "Κύριος κωδικός πρόσβασης",
"Master password:": "Κύριος κωδικός πρόσβασης:",
"Max concurrent connections": "Μέγιστος αριθμός ταυτόχρονων συνδέσεων",
"Max Item Size": "Μέγιστο μέγεθος αντικειμένου",
"Max note or attachment size": "Μέγιστο μέγεθος σημείωσης ή συνημμένου",
"Max Total Size": "Μέγιστο συνολικό μέγεθος",
"Missing keys": "Απουσία κλειδιών",
"Missing Master Keys": "Απουσία κυρίως κλειδιών",
"Missing required argument: %s": "Λείπει το απαιτούμενο όρισμα: %s",
"Missing required flag value: %s": "Λείπει το απαιτούμενο flag: %s",
"Mobile data - auto-sync disabled": "Δεδομένα κινητής τηλεφωνίας - ο αυτόματος συγχρονισμός απενεργοποιήθηκε",
"More info": "Περισσότερες πληροφορίες",
"More information": "Περισσότερες πληροφορίες",
@@ -548,7 +478,6 @@
"Move to notebook": "Μετακίνηση στο σημειωματάριο",
"Move to notebook...": "Μετακίνηση στο σημειωματάριο...",
"Move to notebook:": "Μετακίνηση στο σημειωματάριο:",
"Moves the given <item> to [notebook]": "Μετακινεί το συγκεκριμένο <item> στο [notebook]",
"n": "ο",
"N": "Ο",
"New note": "Νέα σημείωση",
@@ -559,7 +488,6 @@
"New tags:": "Νέες ετικέτες:",
"New to-do": "Νέο to-do",
"New version: %s": "Νέα έκδοση: %s",
"Next match": "Επόμενη αντιστοίχιση",
"Nextcloud": "Nextcloud",
"Nextcloud password": "Nextcloud password",
"Nextcloud username": "Nextcloud username",
@@ -580,7 +508,6 @@
"Not authentified with %s. Please provide any missing credentials.": "Δεν έγινε επαλήθευση με το %s. Παρακαλώ καταχωρίστε τα διαπιστευτήρια που λείπουν.",
"Not downloaded": "Δεν έγινε λήψη",
"Not generated": "Δεν δημιουργήθηκαν",
"Not now": "Αργότερα",
"note": "σημείωση",
"Note": "Σημείωση",
"Note area growth factor": "Συντελεστής ανάπτυξης περιοχής σημειώσεων",
@@ -588,7 +515,6 @@
"Note attachments...": "Επισυναπτόμενα...",
"Note body": "Σώμα σημειώσεων",
"Note does not exist: \"%s\". Create it?": "Δεν υπάρχει η σημείωση : \"%s\". Να δημιουργηθεί;",
"Note editor": "Συντάκτης σημείωσης",
"Note has been saved.": "Η σημείωση έχει αποθηκευτεί.",
"Note History": "Ιστορικό Σημειώσεων",
"Note is not a to-do: \"%s\"": "Η σημείωση δεν είναι to-do: \"%s\"",
@@ -619,14 +545,12 @@
"Only one note can be printed at a time.": "Μόνο μία σημείωση τη φορά μπορεί να εκτυπωθεί.",
"Open": "Άνοιγμα",
"Open %s": "Άνοιγμα %s",
"Open PDF viewer": "Άνοιγμα προγράμματος προβολής PDF",
"Open profile directory": "Άνοιγμα φακέλου προφίλ",
"Open Sync Wizard...": "Άνοιγμα Οδηγού συγχρονισμού...",
"Open...": "Άνοιγμα...",
"Operation cancelled": "Η λειτουργία ακυρώθηκε",
"Options": "Επιλογές",
"Or create an account.": "Ή δημιουργείστε ένα λογαριασμό.",
"Ordered list": "Ταξινομημένη λίστα",
"Other applications...": "Άλλες εφαρμογές...",
"Output format: %s": "Μορφή εξόδου: %s",
"Page orientation for PDF export": "Προσανατολισμός σελίδας για εξαγωγή PDF",
@@ -636,18 +560,14 @@
"Password:": "Κωδικός:",
"Passwords do not match!": "Ο κωδικός πρόσβασης δεν μπορεί να είναι κενός!",
"Paste": "Επικόλληση",
"Paste as text": "Επικόλληση ως κείμενο",
"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.": "Εισαγάγετε τον κωδικό πρόσβασής σας στη λίστα του master κλειδιού πριν αναβαθμίσετε το κλειδί.",
"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.": "Παρακαλώ ανοίξτε την ακόλουθη διεύθυνση URL στο πρόγραμμα περιήγησής σας για να πιστοποιήσετε την εφαρμογή. Η εφαρμογή θα δημιουργήσει έναν φάκελο στο \"Apps / Joplin\" και θα διαβάζει και θα γράφει μόνο αρχεία σε αυτόν. Δεν θα έχει πρόσβαση σε αρχεία εκτός αυτού του φακέλου ούτε σε άλλα προσωπικά δεδομένα. Δεν πρόκειται να κοινοποιηθούν δεδομένα σε τρίτους.",
"Please record your voice...": "Παρακαλώ καταγράψτε τη φωνή σας...",
"Please select a notebook first.": "Παρακαλώ επιλέξτε πρώτα σημειωματάριο.",
"Please select the note or notebook to be deleted first.": "Παρακαλώ πρώτα επιλέξτε τη σημείωση ή το σημειωματάριο που θέλετε να διαγραφτεί.",
"Please select where the sync status should be exported to": "Επιλέξτε την τοποθεσία στην οποία θα εξαχθεί η κατάσταση του συγχρονισμού",
@@ -669,24 +589,15 @@
"Press the shortcut": "Πατήστε τη συντόμευση",
"Press the shortcut and then press ENTER. Or, press BACKSPACE to clear the shortcut.": "Πατήστε τη συντόμευση και, στη συνέχεια, πατήστε το πλήκτρο ENTER. Εναλλακτικά, πατήστε το πλήκτρο BACKSPACE για να καταργήσετε τη συντόμευση.",
"Press to set the decryption password.": "Πατήστε για να ορίσετε τον κωδικό αποκρυπτογράφησης.",
"Previous match": "Προηγούμενη αντιστοίχιση",
"Previous versions of this note": "Προηγούμενες εκδόσεις αυτής της σημείωσης",
"Print": "Εκτύπωση",
"Priority support": "Υποστήριξη προτεραιότητας",
"Privacy Policy": "Πολιτική Προστασίας Προσωπικών Δεδομένων",
"Pro": "Pro",
"Process failed payment subscriptions": "Επεξεργασία αποτυχημένων συνδρομών πληρωμής",
"Process oversized accounts": "Επεξεργασία υπερμεγεθών λογαριασμών",
"Process user deletions": "Επεξεργασία διαγραφών χρηστών",
"Profile": "Προφιλ",
"Profile name": "Όνομα προφίλ",
"Profile name:": "Όνομα προφιλ:",
"Profile Version: %s": "Έκδοση προφίλ: %s",
"Profiles": "Προφιλ",
"Properties": "Ιδιότητες",
"Proxy enabled": "Ενεργοποίηση διακομιστή μεσολάβησης",
"Proxy timeout (seconds)": "Χρονικό όριο μεσολάβησης (δευτερόλεπτα)",
"Proxy URL": "URL διακομιστή μεσολάβησης",
"Public-private key pair:": "Ζεύγος δημόσιου-ιδιωτικού κλειδιού:",
"Publish note...": "Δημοσίευση σημείωσης...",
"Publish Notes": "Δημοσίευση σημειώσεων",
@@ -703,7 +614,6 @@
"Recipients:": "Αποδέκτες:",
"Redo": "Επανάληψη",
"Refresh": "Ανανέωση",
"Regular expression": "Regular expression",
"Reject": "Απόρριψη",
"Remove": "Κατάργηση",
"Remove tag \"%s\" from all notes?": "Κατάργηση της ετικέτας \"%s\" από όλες τις σημειώσεις;",
@@ -713,11 +623,6 @@
"Rename tag:": "Μετονομασία ετικέτας:",
"Renames the given <item> (note or notebook) to <name>.": "Μετονομάζει το καθορισμένο <item> (σημείωση ή σημειωματάριο) στο <name>.",
"Renew token": "Ανανέωση token",
"Replace": "Αντικατάσταση",
"Replace all": "Αντικατάσταση όλων",
"Replace with...": "Αντικατάσταση με...",
"Replace: ": "Αντικατάσταση: ",
"Reset application layout": "Αλλαγή διάταξης εφαρμογής",
"Reset master password": "Επαναφορά κύριου κωδικού πρόσβασης",
"Resources: %d.": "Πόροι: %d.",
"Restart and upgrade": "Επανεκκίνηση και αναβάθμιση",
@@ -740,13 +645,11 @@
"Safe mode is currently active. Note rendering and all plugins are temporarily disabled.": "Η ασφαλής λειτουργία είναι ενεργή αυτήν τη στιγμή. Σημειώστε ότι η απόδοση και όλα τα πρόσθετα απενεργοποιούνται προσωρινά.",
"Save": "Αποθήκευση",
"Save alarm": "Αποθήκευση ειδοποίησης",
"Save as %s": "Αποθήκευση ως %s",
"Save as...": "Αποθήκευση ως...",
"Save changes": "Αποθήκευση αλλαγών",
"Save geo-location with notes": "Αποθήκευση της γεωγραφικής τοποθεσίας μαζί με της σημειώσεις",
"Search": "Εύρεση",
"Search for plugins...": "Αναζήτηση για plugins...",
"Search for...": "Αναζήτηση για...",
"Search in all the notes": "Αναζήτηση σε όλες τις σημειώσεις",
"Search in current note": "Αναζήτηση στην τρέχουσα σημείωση",
"Search...": "Αναζήτηση...",
@@ -757,7 +660,6 @@
"Select all": "Επιλογή όλων",
"Select emoji...": "Επιλογή emoji...",
"Select file...": "Επιλογή φακέλου...",
"Select parent notebook": "Επιλέξτε γονικό σημειωματάριο",
"Server is already running on port %d": "Ο διακομιστής εκτελείται ήδη στη θύρα %d",
"Server is not running.": "Ο διακομιστής δεν εκτελείται.",
"Server is running on port %d": "Ο διακομιστής εκτελείται στη θύρα %d",
@@ -767,23 +669,17 @@
"Set the password": "Ορισμός κωδικού πρόσβασης",
"Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s": "Ορίζει την ιδιότητα <name> του καθορισμένου <note> στην καθορισμένη [τιμή]. Πιθανές ιδιότητες είναι:\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": "Εμφάνιση επιλογών για προχωρημένους",
"Show Advanced Settings": "Εμφάνιση επιλογών για προχωρημένους",
"Show all": "Εμφάνιση όλων",
"Show completed to-dos": "Εμφάνιση ολοκληρωμένων to-dos",
"Show disabled": "Εμφάνιση απενεργοποιημένων",
"Show disabled keys": "Εμφάνιση απενεργοποιημένων κλειδιών",
"Show more actions": "Εμφάνιση περισσότερων ενεργειών",
"Show note counts": "Εμφάνιση πλήθους σημειώσεων",
"Show sort order buttons": "Εμφάνιση κουμπιών σειράς ταξινόμησης",
"Show tray icon": "Εμφάνιση εικονιδίου στη γραμμή εργασιών",
"Show/hide the sidebar": "Εμφάνιση/απόκρυψη της πλευρικής μπάρας",
"Sidebar": "Πλευρική μπάρα",
"Size": "Μέγεθος",
"Skip this version": "Παραλείψτε αυτή την έκδοση",
@@ -819,7 +715,6 @@
"Step 2: Install the extension": "Βήμα 2: Εγκαταστήστε την επέκταση",
"Stop": "Σταμάτημα",
"Stop external editing": "Διακοπή εξωτερικής επεξεργασίας",
"Storage space": "Χώρος αποθήκευσης",
"Strikethrough": "Διακριτή διαγραφή",
"strong text": "έντονη γραφή",
"Submit": "Yποβολή",
@@ -829,12 +724,9 @@
"Swap line down": "Αλλαγή γραμμής με την κάτω",
"Swap line up": "Αλλαγή γραμμής με την πανω",
"Switch between note and to-do type": "Εναλλαγή μεταξύ σημείωσης και to-do",
"Switch profile": "Αλλαγή προφίλ",
"Switch to note type": "Αλλαγή σε σημείωση",
"Switch to profile %d": "Αλλαγή στο προφίλ %d",
"Switch to to-do type": "Αλλαγή σε to-do",
"Switches to [notebook] - all further operations will happen within this 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` για να συνεχίσετε.",
@@ -854,18 +746,13 @@
"Synchronising...": "Συγχρονισμός...",
"Synchronizing...": "Συγχρονισμός...",
"Tabloid": "Tabloid",
"tag1, tag2, ...": "tag1, tag2, ...",
"Tagged: %d.": "Με ετικέτα: %d.",
"Tags": "Ετικέτες",
"Take photo": "Βγάλτε μια φωτογραφία",
"Task list": "Λίστα εργασιών",
"Tasks": "Εργασίες",
"Teams": "Ομάδες",
"Text editor command": "Εντολή \"Επεξεργαστή κειμένου\"",
"Thank you! Your Joplin Cloud account is now setup and ready to use.": "Ευχαριστώ! Ο λογαριασμός σας στο Joplin Cloud είναι τώρα ρυθμισμένος και έτοιμος για χρήση.",
"The active profile cannot be deleted. Switch to a different profile and try again.": "Το ενεργό προφίλ δεν μπορεί να διαγραφεί. Μεταβείτε σε ένα άλλο προφίλ και δοκιμάστε ξανά.",
"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 has been authorised - you may now close this browser tab.": "Η εφαρμογή έχει εξουσιοδοτηθεί - μπορείτε τώρα να κλείσετε αυτήν την καρτέλα του προγράμματος περιήγησης.",
"The application has been authorised!": "Η εφαρμογή έχει εγκριθεί!",
"The application has been successfully authorised.": "Η εφαρμογή έχει εξουσιοδοτηθεί με επιτυχία.",
@@ -875,7 +762,6 @@
"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 profile cannot be deleted": "Το προεπιλεγμένο προφίλ δεν μπορεί να διαγραφεί",
"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.": "Η εντολή του 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:": "Τα ακόλουθα συνημμένα παρακολουθούνται για αλλαγές:",
@@ -897,10 +783,8 @@
"The Web Clipper needs your authorisation to access your data.": "Το Web Clipper χρειάζεται την άδειά σας για να αποκτήσει πρόσβαση στα δεδομένα σας.",
"The web clipper service is enabled and set to auto-start.": "Η υπηρεσία web clipper είναι ενεργοποιημένη και έχει ρυθμιστεί για αυτόματη εκκίνηση.",
"The web clipper service is not enabled.": "Η υπηρεσία Web Clipper δεν είναι ενεργοποιημένη.",
"The WebDAV implementation of %s is incompatible with Joplin, and as such is no longer supported. Please use a different sync method.": "Η υλοποίηση WebDAV του %s δεν είναι συμβατή με το Joplin και ως εκ τούτου δεν υποστηρίζεται πλέον. Παρακαλούμε χρησιμοποιήστε μια διαφορετική μέθοδο συγχρονισμού.",
"Theme": "Θέμα",
"There are currently no notes. Create one by clicking on the (+) button.": "Δεν υπάρχουν προς το παρόν σημειώσεις. Δημιουργήστε μία κάνοντας κλικ στο κουμπί (+).",
"There are unsaved changes.": "Υπάρχουν μη αποθηκευμένες αλλαγές.",
"There is currently no notebook. Create one by clicking on \"New notebook\".": "Δεν υπάρχει κανένα σημειωματάριο. Δημιουργήστε ένα πατώντας στο \"Νέο σημειωματάριο\".",
"There is no data to export.": "Δεν υπάρχουν δεδομένα για εξαγωγή.",
"There was a [conflict](%s) on the attachment below.\n\n%s": "Υπήρξε μια [διένεξη](%s) στο παρακάτω συνημμένο.\n\n%s",
@@ -934,10 +818,8 @@
"To maximise/minimise the console, press \"tc\".": "Για μεγιστοποιήση/ελαχιστοποιήση της κονσόλας, πατήστε \"tc\".",
"To move from one pane to another, press Tab or Shift+Tab.": "Για να μετακινηθείτε από ένα παράθυρο σε άλλο, πατήστε Tab ή Shift + Tab.",
"To retry decryption of these items. Run `e2ee decrypt --retry-failed-items`": "Για να επαναλάβετε την αποκρυπτογράφηση αυτών των στοιχείων. Τρέξτε `e2ee decrypt --retry-failed-items`",
"To switch the profile, the app is going to close and you will need to restart it.": "Για να αλλάξετε το προφίλ, η εφαρμογή θα κλείσει και θα πρέπει να την επανεκκινήσετε.",
"To work correctly, the app needs the following permissions. Please enable them in your phone settings, in Apps > Joplin > Permissions": "Για να λειτουργήσει σωστά, η εφαρμογή χρειάζεται τα ακόλουθα δικαιώματα. Ενεργοποιήστε τα στις ρυθμίσεις του τηλεφώνου σας, στο Apps> Joplin> Permissions",
"to-do": "to-do",
"to-do: %s": "to-do: %s",
"Toggle comment": "Εναλλαγή σχολίου",
"Toggle development tools": "Εναλλαγή εργαλείων προγραμματισμού",
"Toggle editor layout": "Εναλλαγή διάταξης editor",
@@ -950,10 +832,8 @@
"Toggle sort order field": "Εναλλαγή του πεδίου ταξινόμησης",
"Token has been copied to the clipboard!": "Το Token έχει αντιγραφεί στο πρόχειρο!",
"Tools": "Εργαλεία",
"Total Size": "Συνολικό μέγεθος",
"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.": "Πληκτρολογήστε έναν τίτλο σημείωσης ή μέρος του περιεχομένου του για να μεταβείτε σε αυτόν. Ή πληκτρολογήστε # ακολουθούμενο από ένα όνομα ετικέτας ή @ ακολουθούμενο από ένα σημειωματάριο. Ή πληκτρολογίστε : για να ψάξετε για εντολές.",
@@ -963,7 +843,6 @@
"Undo": "Αναίρεση",
"Unknown flag: %s": "Άγνωστο flag: %s",
"Unknown item type downloaded - please upgrade Joplin to the latest version": "Λήψη άγνωστου τύπου στοιχείου - αναβαθμίστε το Joplin στην πιο πρόσφατη έκδοση",
"Unordered list": "Μη ταξινομημένη λίστα",
"Unpublish note": "Αποδημοσίευση σημείωσης",
"Unshare": "Κατάργηση κοινής χρήσης",
"Unshare this notebook? The recipients will no longer have access to its content.": "Διακόψτε την κοινή χρήση σε αυτό το σημειωματάριο; Οι παραλήπτες δεν θα έχουν πλέον πρόσβαση στο περιεχόμενό του.",
@@ -985,25 +864,21 @@
"Upgrade the sync target to the latest version.": "Αναβαθμίστε το στόχο συγχρονισμού στην πιο πρόσφατη έκδοση.",
"URL": "URL",
"Usage: %s": "Χρήση: %s",
"Use biometrics to secure access to the app": "Χρησιμοποιήστε βιομετρικά στοιχεία για να διασφαλίσετε την πρόσβαση στην εφαρμογή",
"Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for to-dos), TITLE": "Χρησιμοποιήστε τη μορφή μακράς λίστας. Η μορφή είναι ID, NOTE_COUNT (για σημειωματάριο), DATE, TODO_CHECKED (για to-dos), TITLE",
"Use spell checker": "Χρήση ορθογραφικού ελέγχου",
"Use the arrows and page up/down to scroll the lists and text areas (including this console).": "Χρησιμοποιήστε τα βελάκια πατώντας πάνω/κάτω για να μετακινηθείτε στις λίστες και τις περιοχές κειμένου (συμπεριλαμβανομένης αυτής της κονσόλας).",
"Use the arrows to move the layout items. Press \"Escape\" to exit.": "Χρησιμοποιήστε τα βέλη για να μετακινήσετε τα στοιχεία διάταξης. Πατήστε \"Escape\" για έξοδο.",
"Use this to rebuild the search index if there is a problem with search. It may take a long time depending on the number of notes.": "Χρησιμοποιήστε το για να ξαναφτιάξετε το ευρετήριο αναζήτησης, εάν υπάρχει πρόβλημα με την αναζήτηση. Μπορεί να χρειαστεί πολύς χρόνος ανάλογα με τον αριθμό των σημειώσεων.",
"Use your biometrics to secure access to your application. You can always set it up later in Settings.": "Χρησιμοποιήστε τα βιομετρικά σας στοιχεία για να εξασφαλίσετε την πρόσβαση στην εφαρμογή σας. Μπορείτε πάντα να το ρυθμίσετε αργότερα στις Ρυθμίσεις.",
"Used for most text in the markdown editor. If not found, a generic proportional (variable width) font is used.": "Χρησιμοποιείται για το μεγαλύτερο μέρος του κειμένου στο πρόγραμμα επεξεργασίας σημειώσεων. Εάν δεν βρεθεί, χρησιμοποιείται μια γενική αναλογική γραμματοσειρά (μεταβλητού πλάτους).",
"Used where a fixed width font is needed to lay out text legibly (e.g. tables, checkboxes, code). If not found, a generic monospace (fixed width) font is used.": "Χρησιμοποιείται όταν απαιτείται γραμματοσειρά σταθερού πλάτους για την ευανάκριβη δημιουργία κειμένου (π.χ. πίνακες, πλαίσια ελέγχου, κωδικός). Εάν δεν βρεθεί, χρησιμοποιείται μια γενική μονοδιάστημα (σταθερού πλάτους).",
"User deletions": "Διαγραφές χρήστη",
"Users": "Χρήστες",
"Valid": "Έγκυρo",
"Verify your identity": "Επαληθεύστε την ταυτότητα σας",
"View": "Προβολή",
"View on map": "Προβολή στο χάρτη",
"View them now": "Προβολή τώρα",
"Viewer": "Εμφάνιση",
"Vim": "Vim",
"Voice typing...": "Φωνητική πληκτρολόγηση...",
"Warning": "Προειδοποίηση",
"Warning: not all resources shown for performance reasons (limit: %s).": "Προειδοποίηση: δεν εμφανίζονται όλοι οι πόροι για λόγους απόδοσης (όριο:% s).",
"Web Clipper": "Web Clipper",
@@ -1013,7 +888,6 @@
"WebDAV username": "WebDAV username",
"Website and documentation": "Ιστοσελίδα και εγχειρίδια",
"Welcome to Joplin!\n\nType `:help shortcuts` for the list of keyboard shortcuts, or just `:help` for usage information.\n\nFor example, to create a notebook press `mb`; to create a note press `mn`.": "Καλώς ήλθατε στο Joplin!\n\nΠληκτρολογίστε `:help shortcuts` για τη λίστα συντομεύσεων πληκτρολογίου ή απλά `:help` για πληροφορίες χρήσης.\n\nΓια παράδειγμα, για να δημιουργήσετε ένα σημειωματάριο πατήστε `mb` ενώ για να δημιουργήσετε μια σημείωση πατήστε `mn`.",
"Welcome!": "Καλώς ήρθατε!",
"When creating a new note:": "Κατά τη δημιουργία μιας νέας σημείωσης:",
"When creating a new to-do:": "Κατά τη δημιουργία ενός νέου to-do:",
"Words": "Λέξεις",
@@ -1028,7 +902,6 @@
"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.": "Μπορείτε να χρησιμοποιήσετε το παρακάτω εργαλείο για να κρυπτογραφήσετε εκ νέου τα δεδομένα σας, για παράδειγμα, εάν γνωρίζετε ότι ορισμένες από τις σημειώσεις σας είναι κρυπτογραφημένες με μια παρωχημένη μέθοδο κρυπτογράφησης.",
"Your choice: ": "Η επιλογή σας: ",
"Your data is going to be re-encrypted and synced again.": "Τα δεδομένα σας πρόκειται να κρυπτογραφηθούν και να συγχρονιστούν ξανά.",
"Your password is needed to decrypt some of your data.": "Ο κωδικός πρόσβασής σας είναι απαραίτητος για την αποκρυπτογράφηση ορισμένων δεδομένων σας.",
"Your password is needed to decrypt some of your data. Type `:e2ee decrypt` to set it.": "Ο κωδικός πρόσβασής σας είναι απαραίτητος για την αποκρυπτογράφηση ορισμένων δεδομένων σας. Πληκτρολογήστε `:e2ee decrypt` για να τον ορίσετε.",
"Your permission to use your camera is required.": "Απαιτείται η άδειά σας για τη χρήση της φωτογραφικής σας μηχανής.",
"Your version: %s": "Η έκδοσή σου: %s",

View File

@@ -48,8 +48,6 @@
"Accelerator \"%s\" is not valid.": "Le raccourci \"%s\" n'est pas valide.",
"Accelerator \"%s\" is used for \"%s\" and \"%s\" commands. This may lead to unexpected behaviour.": "Le raccourci \"%s\" est utilisé par les commandes \"%s\" et \"%s\", ce qui peut causer des problèmes.",
"Accept": "Accepter",
"Access denied: Please check your username and password": "Accès non-autorisé : Veuillez vérifier votre nom et mot de passe",
"Access denied: Please re-enter your password and/or username": "Accès non-autorisé : Veuillez ré-entrer votre nom ou mot de passe",
"Account": "Compte",
"Action": "Action",
"Actions": "Actions",
@@ -74,7 +72,6 @@
"Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to see the short notebook id or use $b for current selected notebook": "Titre ambigu \"%s\". Veuillez entrer l'identifiant du carnet - pressez \"ti\" pour afficher les identifiants, ou utilisez $b pour le carnet en cours",
"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti\" to see the short notebook id": "Titre ambigu \"%s\". Veuillez entrer l'identifiant du carnet - pressez \"ti\" pour afficher les identifiants",
"An update is available, do you want to download it now?": "Une mise à jour est disponible, souhaitez vous la télécharger maintenant ?",
"Any email sent to this address will be converted into a note and added to your collection. The note will be saved into the Inbox notebook": "Un email envoyé à cette adresse sera converti en note et ajouté à votre collection. La note sera sauvé dans votre carnet \"Inbox\"",
"Appearance": "Apparence",
"Application": "Application",
"Apply": "Appliquer",
@@ -108,8 +105,6 @@
"Browse...": "Parcourir…",
"Bulleted List": "Liste à puces",
"Can Share": "Peut partager",
"Can view": "Lecture seule",
"Can view and edit": "Lecture et édition",
"Cancel": "Annuler",
"Cancelling background synchronisation... Please wait.": "Annulation de la synchronisation… Veuillez patienter.",
"Cancelling...": "Annulation…",
@@ -117,7 +112,6 @@
"Cannot access %s": "Impossible d'accéder à %s",
"Cannot change encrypted item": "Un objet chiffré ne peut pas être modifié",
"Cannot copy note to \"%s\" notebook": "Impossible de copier la note vers le carnet \"%s\"",
"Cannot create a new note: %s": "Impossible de créer une nouvelle note : %s",
"Cannot find \"%s\".": "Impossible de trouver \"%s\".",
"Cannot find: \"%s\"": "Impossible de trouver : \"%s\"",
"Cannot initialise synchroniser.": "Impossible d'initialiser la synchronisation.",
@@ -185,7 +179,6 @@
"Copy Markdown link": "Copier lien Markdown",
"Copy path to clipboard": "Copier le chemin",
"Copy Shareable Link": "Copier lien partageable",
"Copy to clipboard": "Copier",
"Copy token": "Copier le code",
"Could not authorise application:\n\n%s\n\nPlease try again.": "Impossible d'autoriser le logiciel :\n\n%s\n\nVeuillez réessayer.",
"Could not connect to Joplin Server. Please check the Synchronisation options in the config screen. Full error was:\n\n%s": "Impossible de se connecter au server Joplin. Veuillez vérifier la configuration. L'erreur complète était :\n\n%s",
@@ -241,16 +234,13 @@
"Delete expired tokens": "Supprimer les tokens expirés",
"Delete line": "Supprimer la ligne",
"Delete local data and re-download from sync target": "Supprimer les données locales et re‑télécharger depuis la cible de synchronisation",
"Delete note": "Supprimer la note",
"Delete note \"%s\"?": "Supprimer note \"%s\" ?",
"Delete note?": "Supprimer la note ?",
"Delete notebook": "Supprimer le carnet",
"Delete notebook \"%s\"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.": "Effacer le carnet \"%s\" ?\n\nToutes les notes et sous‑carnets dans ce carnet seront également effacés.",
"Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.": "Effacer le carnet ? Toutes les notes et sous‑carnets dans ce carnet seront également effacés.",
"Delete plugin \"%s\"?": "Supprimer plugin \"%s\" ?",
"Delete profile \"%s\"": "Supprimer profil \"%s\" ?",
"Delete selected notes": "Supprimer les notes sélectionnées",
"Delete the Inbox notebook?\n\nIf you delete the inbox notebook, any email that's recently been sent to it may be lost.": "Supprimer le carnet \"Inbox\" ?\n\nSi vous le supprimez, tout email qui lui a été récemment envoyé peut être perdu.",
"Delete these %d notes?": "Supprimer ces %d notes ?",
"Delete this invitation? The recipient will no longer have access to this shared notebook.": "Supprimer cette invitation ? Le destinataire n'aura plus accès au carnet partagé.",
"Delete this profile?": "Supprimer ce profil ?",
@@ -317,8 +307,6 @@
"Either \"text\" or \"json\"": "Soit \"text\" soit \"json\"",
"Emacs": "Emacs",
"Email": "Email",
"Email to note": "Conversion email en note",
"Email to Note": "Conversion email en note",
"Emails": "Emails",
"emphasised text": "texte en italique",
"Enable": "Activer",
@@ -372,14 +360,11 @@
"Expand": "Ouvrir",
"Export": "Exporter",
"Export all": "Tout exporter",
"Export all notes as JEX": "Exporter toutes les notes en JEX",
"Export debug report": "Exporter rapport de débogage",
"Export Debug Report": "Exporter rapport de débogage",
"Export profile": "Exporter le profil",
"Exported successfully!": "Exporté avec succès !",
"Exporting profile...": "Exportation du profil…",
"Exporting to \"%s\" as \"%s\" format. Please wait...": "Exportation en cours vers \"%s\" au format \"%s\". Veuillez patienter…",
"Exporting...": "Exportation...",
"Exports Joplin data to the given path. By default, it will export the complete database including notebooks, notes, tags and resources.": "Exporter les données de Joplin. Par défaut, la base de donnée complète sera exportée, y compris les carnets, notes, tags et ressources.",
"Exports only the given note.": "Exporter uniquement la note spécifiée.",
"Exports only the given notebook.": "Exporter uniquement le carnet spécifié.",
@@ -785,7 +770,6 @@
"Set the password": "Définir le mot de passe",
"Sets the property <name> of the given <note> to the given [value]. Possible properties are:\n\n%s": "Assigner la valeur [value] à la propriété <name> de la <note> donnée. Les valeurs possibles sont :\n\n%s",
"Share": "Partager",
"Share a copy of all notes in a file format that can be imported by Joplin on a computer.": "Partager une copie de toutes vos notes dans un format qui peut être importé par Joplin sur un ordinateur.",
"Share and collaborate on a notebook": "Partager et collaborer sur un carnet",
"Share Notebook": "Partager le carnet",
"Share notebook...": "Partager carnet…",
@@ -931,9 +915,6 @@
"This attachment is not downloaded or not decrypted yet.": "Cette pièce jointe n'est pas téléchargée ou pas encore déchiffrée.",
"This authorisation token is only needed to allow third-party applications to access Joplin.": "Ce code d'authentification est nécessaire uniquement pour permettre aux logiciels tiers d'accéder aux données de Joplin.",
"This is an advanced tool to show the attachments that are linked to your notes. Please be careful when deleting one of them as they cannot be restored afterwards.": "Ceci est un outil pour lister les fichiers qui sont attachés à vos notes. Veuillez noter que lorsqu'un fichier est supprimé ici, il ne peut pas être restauré par la suite.",
"This note could not be deleted: %s": "Cette note n'a pas pu être supprimée : %s",
"This note could not be duplicated: %s": "Cette note n'a pas pu être dupliquée : %s",
"This note could not be moved: %s": "Cette note n'a pas pu être déplacée : %s",
"This note does not have geolocation information.": "Cette note n'a pas d'information de géolocalisation.",
"This note has been modified:": "Cette note a été modifiée :",
"This note has no content. Click on \"%s\" to toggle the editor and edit the note.": "Cette note n'a pas de contenu. Cliquer sur \"%s\" pour basculer vers l'éditeur et éditer cette note.",
@@ -981,7 +962,6 @@
"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.": "Entrez le titre d’une note, ou entrez # suivi du nom d’une étiquette, ou @ suivi du nom d’un carnet. Ou entrez : pour chercher une commande.",
"Type new tags or select from list": "Entrez de nouvelles étiquettes ou sélectionnez de la liste",
"Type: %s.": "Type : %s.",
"Unable to export or share data. Reason: %s": "Impossible d'exporter les données : %s",
"Uncompleted to-dos on top": "Tâches non‑terminées en haut",
"Undo": "Annuler",
"Unknown flag: %s": "Paramètre inconnu : %s",
@@ -1030,7 +1010,6 @@
"Voice typing...": "Saisie vocale...",
"Warning": "Avertissement",
"Warning: not all resources shown for performance reasons (limit: %s).": "Attention : tous les fichiers ne sont pas affichés pour des raisons de performance (limite : %s).",
"Warnings:\n%s": "Avertissements:\n%s",
"Web Clipper": "Web Clipper",
"WebDAV": "WebDAV",
"WebDAV password": "WebDAV : Mot de passe",

View File

@@ -280,7 +280,6 @@
"Downloaded and decrypted": "Preuzeto i dešifrirano",
"Downloaded and encrypted": "Preuzeto i šifrirano",
"Downloading": "Preuzimanje",
"Downloading %s language files...": "Preuzimanje jezičnih datoteka za %s …",
"Downloading resources...": "Preuzimanje resursa …",
"Dracula": "Drakula",
"Drop notes or files here": "Ispusti bilješke ili dokumente ovdje",
@@ -411,7 +410,6 @@
"Headers": "Zaglavlja",
"Heading": "Naslov",
"Help": "Pomoć",
"Hermes enabled: %d": "Hermes aktiviran: %d",
"Hide %s": "Sakrij %s",
"Hide advanced": "Sakrij napredne",
"Hide disabled": "Sakrij deaktivirane",
@@ -495,7 +493,6 @@
"Later": "Kasnije",
"Layout": "Raspored",
"Layout button sequence": "Slijed gumbova rasporeda",
"Leave it blank to download the language files from the default website": "Ostavi prazno za preuzimanje jezičnih datoteka sa standardne web stranice",
"Leave notebook...": "Napusti bilježnicu …",
"Legal": "Legal",
"Letter": "Letter",
@@ -719,7 +716,7 @@
"Replace": "Zamijeni",
"Replace all": "Zamijeni sve",
"Replace with...": "Zamijeni sa …",
"Replace: ": "Zamijeni: ",
"Replace: ": "Zamijeni:",
"Reset application layout": "Obnovi raspored programa",
"Reset master password": "Obnovi glavnu lozinku",
"Resources: %d.": "Resursi: %d.",
@@ -760,7 +757,6 @@
"Select all": "Označi sve",
"Select emoji...": "Odaberi emoji …",
"Select file...": "Odaberi datoteku …",
"Select parent notebook": "Obriši nadređenu bilježnicu",
"Server is already running on port %d": "Poslužitelj je već pokrenut na priključku %d",
"Server is not running.": "Poslužitelj ne radi.",
"Server is running on port %d": "Poslužitelj se pokreće na priključku %d",
@@ -1006,8 +1002,7 @@
"View them now": "Pogledaj ih sada",
"Viewer": "Preglednik",
"Vim": "Vim",
"Voice typing language files (URL)": "Jezične datoteke za tipkanje glasom (URL)",
"Voice typing...": "Tipkanje glasom …",
"Voice typing...": "Tipkanje glasa …",
"Warning": "Upozorenje",
"Warning: not all resources shown for performance reasons (limit: %s).": "Upozorenje: za brže izvođenje, ne prikazuju se svi resursi (ograničenje: %s).",
"Web Clipper": "Web Clipper",
@@ -1017,7 +1012,6 @@
"WebDAV username": "WebDAV korisničko ime",
"Website and documentation": "Web-stranica i dokumentacija",
"Welcome to Joplin!\n\nType `:help shortcuts` for the list of keyboard shortcuts, or just `:help` for usage information.\n\nFor example, to create a notebook press `mb`; to create a note press `mn`.": "Dobro došao, dobro došla u Joplin!\n\nUpiši `:help shortcuts` za popis tipkovnih prečaca ili samo`:help` za informacije o korištenju.\n\nNa primjer, za stvaranje bilježnice pritisni `mb`; za stvaranje bilješke pritisni `mn`.",
"Welcome!": "Dobro došao, dobro došla!",
"When creating a new note:": "Prilikom stvaranja nove bilješke:",
"When creating a new to-do:": "Prilikom stvaranja novog zadatka:",
"Words": "Broj riječi",

View File

@@ -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":77};
stats['ar'] = {"percentDone":79};
stats['eu'] = {"percentDone":22};
stats['bs_BA'] = {"percentDone":56};
stats['bg_BG'] = {"percentDone":44};
stats['ca'] = {"percentDone":86};
stats['hr_HR'] = {"percentDone":98};
stats['cs_CZ'] = {"percentDone":96};
stats['da_DK'] = {"percentDone":96};
stats['bs_BA'] = {"percentDone":57};
stats['bg_BG'] = {"percentDone":45};
stats['ca'] = {"percentDone":88};
stats['hr_HR'] = {"percentDone":99};
stats['cs_CZ'] = {"percentDone":98};
stats['da_DK'] = {"percentDone":98};
stats['de_DE'] = {"percentDone":98};
stats['et_EE'] = {"percentDone":43};
stats['et_EE'] = {"percentDone":44};
stats['en_GB'] = {"percentDone":100};
stats['en_US'] = {"percentDone":100};
stats['es_ES'] = {"percentDone":95};
stats['es_ES'] = {"percentDone":97};
stats['eo'] = {"percentDone":25};
stats['fi_FI'] = {"percentDone":96};
stats['fi_FI'] = {"percentDone":98};
stats['fr_FR'] = {"percentDone":100};
stats['gl_ES'] = {"percentDone":28};
stats['id_ID'] = {"percentDone":86};
stats['it_IT'] = {"percentDone":78};
stats['hu_HU'] = {"percentDone":75};
stats['nl_BE'] = {"percentDone":76};
stats['nl_NL'] = {"percentDone":86};
stats['nb_NO'] = {"percentDone":85};
stats['fa'] = {"percentDone":53};
stats['pl_PL'] = {"percentDone":88};
stats['pt_BR'] = {"percentDone":85};
stats['pt_PT'] = {"percentDone":70};
stats['ro'] = {"percentDone":49};
stats['sl_SI'] = {"percentDone":78};
stats['sv'] = {"percentDone":97};
stats['th_TH'] = {"percentDone":35};
stats['vi'] = {"percentDone":75};
stats['tr_TR'] = {"percentDone":97};
stats['uk_UA'] = {"percentDone":98};
stats['el_GR'] = {"percentDone":97};
stats['ru_RU'] = {"percentDone":97};
stats['sr_RS'] = {"percentDone":63};
stats['zh_CN'] = {"percentDone":98};
stats['zh_TW'] = {"percentDone":86};
stats['gl_ES'] = {"percentDone":29};
stats['id_ID'] = {"percentDone":88};
stats['it_IT'] = {"percentDone":80};
stats['hu_HU'] = {"percentDone":77};
stats['nl_BE'] = {"percentDone":78};
stats['nl_NL'] = {"percentDone":87};
stats['nb_NO'] = {"percentDone":87};
stats['fa'] = {"percentDone":54};
stats['pl_PL'] = {"percentDone":89};
stats['pt_BR'] = {"percentDone":87};
stats['pt_PT'] = {"percentDone":72};
stats['ro'] = {"percentDone":50};
stats['sl_SI'] = {"percentDone":79};
stats['sv'] = {"percentDone":99};
stats['th_TH'] = {"percentDone":36};
stats['vi'] = {"percentDone":77};
stats['tr_TR'] = {"percentDone":99};
stats['uk_UA'] = {"percentDone":71};
stats['el_GR'] = {"percentDone":87};
stats['ru_RU'] = {"percentDone":99};
stats['sr_RS'] = {"percentDone":64};
stats['zh_CN'] = {"percentDone":96};
stats['zh_TW'] = {"percentDone":88};
stats['ja_JP'] = {"percentDone":88};
stats['ko'] = {"percentDone":86};
stats['ko'] = {"percentDone":88};
module.exports = { locales: locales, stats: stats };

View File

@@ -1,10 +1,8 @@
{
"\"%s\" is missing the required \"%s\" property.": "\"%s\" は必須の \"%s\" プロパティを持っていません。",
"%d days": "%d 日",
"%d GB": "%d GB",
"%d hour": "%d 時間",
"%d hours": "%d 時間",
"%d MB": "%d MB",
"%d minutes": "%d 分",
"%d notes match this pattern. Delete them?": "%d 個のノートが一致しました。削除しますか?",
"%s %s (%s, %s)": "%s %s (%s, %s)",
@@ -57,7 +55,6 @@
"Admin dashboard": "管理者ダッシュボード",
"Advanced options": "詳細な設定",
"Advanced tools": "高度なツール",
"All data, including notes, notebooks and tags will be permanently deleted.": "ノート、ノートブック、タグを含むすべてのデータが完全に削除されます。",
"All notes": "すべてのノート",
"All potential ports are in use - please report the issue at %s": "使用候補のポートはすべて利用中です - 問題を %s に報告してください",
"Also displays unset and hidden config variables.": "未設定または非表示の設定項目も表示します。",
@@ -70,7 +67,6 @@
"Are you sure you want to renew the authorisation token?": "認証トークンを更新してもよろしいですか?",
"Arguments:": "引数:",
"Aritim Dark": "Aritim Dark",
"Attach": "添付",
"Attach file": "ファイルを添付する",
"Attach photo": "写真を添付",
"Attach...": "添付...",
@@ -218,7 +214,6 @@
"Delete plugin \"%s\"?": "プラグイン \"%s\" を削除しますか?",
"Delete these %d notes?": "これら %d のノートを削除しますか?",
"Delete this invitation? The recipient will no longer have access to this shared notebook.": "この招待を削除しますか? 削除後は招待の受信者がこの共有ノートブックにアクセスできなくなります。",
"Delete this profile?": "このプロファイルを削除しますか?",
"Deleted local items: %d.": "ローカルアイテムの削除: %d.",
"Deleted remote items: %d.": "リモートアイテムの削除: %d.",
"Deletes the given notebook.": "指定されたノートブックを削除します。",
@@ -264,10 +259,8 @@
"Duplicates the notes matching <note> to [notebook]. If no notebook is specified the note is duplicated in the current notebook.": "<note>に一致するノートを[notebook]に複製します。[notebook]が指定されていない場合は、現在のノートブックに複製を行います。",
"Edit": "編集",
"Edit in external editor": "外部エディターで編集",
"Edit link": "リンクの編集",
"Edit note.": "ノートを編集する。",
"Edit notebook": "ノートブックの編集",
"Edit profile": "プロファイルを編集",
"Edit profile configuration...": "プロファイル設定を編集...",
"Editor": "エディター",
"Editor font": "エディターのフォント",
@@ -299,7 +292,6 @@
"Enable note history": "ノートの履歴を有効にする",
"Enable PDF viewer": "PDFビューアーを有効にする",
"Enable soft breaks": "ソフトブレークを有効にする",
"Enable spellcheck in the text editor": "テキストエディタでスペルチェックを有効にする",
"Enable table of contents extension": "目次拡張を有効にする",
"Enable typographer support": "Typographer(記号文字)を有効にする",
"Enable video player": "動画プレーヤーを有効にする",
@@ -376,7 +368,6 @@
"Hide %s": "%s を隠す",
"Hide disabled keys": "無効化したキーを表示しない",
"Hide Joplin": "Joplinを隠す",
"Hide keyboard": "キーボードを隠す",
"Highlight": "ハイライト",
"Home": "ホーム",
"Horizontal Rule": "横線",
@@ -407,7 +398,6 @@
"Inline Code": "インラインコード",
"Insert": "挿入線",
"Insert Hyperlink": "ハイパーリンクの挿入",
"Insert time": "日時の挿入",
"Install": "インストール",
"Install from file": "ファイルからインストール",
"Installed": "インストール済み",
@@ -438,7 +428,6 @@
"Joplin Web Clipper allows saving web pages and screenshots from your browser to Joplin.": "Joplin WebクリッパーはブラウザーからWebページとスクリーンショットをJoplinへ保存します。",
"Joplin website": "JoplinのWebサイト",
"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": "ショートカットキー",
@@ -472,7 +461,6 @@
"Make a donation": "寄付する",
"Manage master password": "マスターパスワードの管理",
"Manage master password...": "マスターパスワードの管理...",
"Manage profiles": "プロファイルの管理",
"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": "手動",
@@ -563,7 +551,6 @@
"Only one note can be printed at a time.": "一度に印刷できるノートは1つだけです。",
"Open": "開く",
"Open %s": "%s を開く",
"Open PDF viewer": "PDFビューアーを開く",
"Open profile directory": "プロファイルディレクトリを開く",
"Open Sync Wizard...": "同期ウィザードを開く...",
"Open...": "開く...",
@@ -579,7 +566,6 @@
"Password:": "パスワード:",
"Passwords do not match!": "パスワードが一致しません!",
"Paste": "貼り付け",
"Paste as text": "テキストとして貼り付け",
"Path:": "パス:",
"PDF File": "PDF ファイル",
"Permission needed": "許可が必要",
@@ -617,10 +603,8 @@
"Process oversized accounts": "容量オーバーのアカウントを処理する",
"Process user deletions": "ユーザー削除を実施する",
"Profile": "プロファイル",
"Profile name": "プロファイル名",
"Profile name:": "プロファイル名:",
"Profile Version: %s": "プロファイルバージョン: %s",
"Profiles": "プロファイル",
"Properties": "プロパティ",
"Public-private key pair:": "公開鍵・秘密鍵ペア:",
"Publish note...": "ノートを公開...",
@@ -638,7 +622,6 @@
"Recipients:": "受信者:",
"Redo": "やり直す",
"Refresh": "更新",
"Regular expression": "正規表現",
"Reject": "拒否",
"Remove": "削除",
"Remove tag \"%s\" from all notes?": "すべてのノートからタグ \"%s\" を削除しますか?",
@@ -648,7 +631,6 @@
"Rename tag:": "タグの変更:",
"Renames the given <item> (note or notebook) to <name>.": "<item> (ノートまたはノートブック)の名前を、<name>に変更します。",
"Renew token": "トークンを更新する",
"Reset application layout": "画面レイアウトをリセット",
"Reset master password": "マスターパスワードをリセット",
"Resources: %d.": "リソース: %d.",
"Restart and upgrade": "再起動してアップグレード",
@@ -816,7 +798,6 @@
"The web clipper service is not enabled.": "Webクリッパーサービスは有効になっていません。",
"Theme": "テーマ",
"There are currently no notes. Create one by clicking on the (+) button.": "ノートがありません。(+)ボタンを押して新しいノートを作成してください。",
"There are unsaved changes.": "保存されていない変更があります。",
"There is currently no notebook. Create one by clicking on \"New notebook\".": "ノートブックがありません。新しいノートブックを作成してください。",
"There is no data to export.": "エクスポートするデータがありません。",
"There was a [conflict](%s) on the attachment below.\n\n%s": "下記の添付ファイルで[衝突](%s)が発生しました。\n\n%s",
@@ -911,8 +892,6 @@
"View them now": "今すぐ表示",
"Viewer": "ビューアー",
"Vim": "Vim",
"Voice typing language files (URL)": "音声入力言語ファイル (URL)",
"Voice typing...": "音声入力…",
"Warning": "警告",
"Warning: not all resources shown for performance reasons (limit: %s).": "注意: 性能上の理由により、リソースは最大 %s 件までしか表示されません。",
"Web Clipper": "Webクリッパー",

View File

@@ -280,7 +280,6 @@
"Downloaded and decrypted": "Загружено и расшифровано",
"Downloaded and encrypted": "Загружено и зашифровано",
"Downloading": "Загрузка",
"Downloading %s language files...": "Загрузка %s языковые файлы..",
"Downloading resources...": "Загрузка ресурсов...",
"Dracula": "Дракула",
"Drop notes or files here": "Перетащите сюда заметки или файлы",
@@ -411,7 +410,6 @@
"Headers": "Заголовки",
"Heading": "Заголовок",
"Help": "Помощь",
"Hermes enabled: %d": "Hermes включен: %d",
"Hide %s": "Скрыть %s",
"Hide advanced": "Скрыть расширенные",
"Hide disabled": "Скрыть отключенный",
@@ -759,7 +757,6 @@
"Select all": "Выбрать все",
"Select emoji...": "Выбрать эмодзи...",
"Select file...": "Выбрать файл...",
"Select parent notebook": "Выбрать родительский блокнот",
"Server is already running on port %d": "Сервер уже запущен. Порт: %d",
"Server is not running.": "Сервер не запущен.",
"Server is running on port %d": "Сервер запущен. Порт: %d",
@@ -1005,7 +1002,6 @@
"View them now": "Просмотреть сейчас",
"Viewer": "Просмотрщик",
"Vim": "Vim",
"Voice typing language files (URL)": "Языковые файлы голосового набора (URL)",
"Voice typing...": "Голосовой набор...",
"Warning": "Предупреждение",
"Warning: not all resources shown for performance reasons (limit: %s).": "Предупреждение: не все данные показаны по соображениям производительности (ограничение:%s).",
@@ -1016,7 +1012,6 @@
"WebDAV username": "Имя пользователя WebDAV",
"Website and documentation": "Сайт и документация",
"Welcome to Joplin!\n\nType `:help shortcuts` for the list of keyboard shortcuts, or just `:help` for usage information.\n\nFor example, to create a notebook press `mb`; to create a note press `mn`.": "Добро пожаловать в Joplin!\n\nВведите `:help shortcuts` для просмотра списка клавиатурных сочетаний или просто `:help` для просмотра справочной информации.\n\nНапример, для создания блокнота введите `mb`, для создания заметки - `mn`.",
"Welcome!": "Добро пожаловать!",
"When creating a new note:": "При создании новой заметки:",
"When creating a new to-do:": "При создании новой задачи:",
"Words": "Cлова",

View File

@@ -54,7 +54,7 @@
"Active": "Aktif",
"Actual Size": "Asıl Boyut",
"Add body": "Gövde Ekle",
"Add new": "Yeni bir şey ekle",
"Add new": "Yeni bir şey ekle: ",
"Add or remove tags:": "Etiket ekle veya kaldır:",
"Add recipient:": "Alıcı ekle:",
"Add title": "Başlık ekle",
@@ -377,7 +377,7 @@
"File system": "Dosya sistemi",
"Filter tags": "Etikerleri filtrele",
"Find and replace": "Bul ve değiştir",
"Find: ": "Ara: ",
"Find: ": "Ara:",
"Firefox Extension": "Firefox Eklentisi",
"Fix search index": "Arama indeksini düzelt",
"Fixing search index...": "Arama indeksi düzeltiliyor...",
@@ -410,7 +410,6 @@
"Headers": "Başlıklar",
"Heading": "Başlık",
"Help": "Yardım",
"Hermes enabled: %d": "Hermes aktif edildi: %d",
"Hide %s": "Şunu Gizle: %s",
"Hide advanced": "Gelişmiş'leri gizle",
"Hide disabled": "İptal edilmişleri gizle",
@@ -717,7 +716,7 @@
"Replace": "Değiştir",
"Replace all": "Tümünü değiştir",
"Replace with...": "Şununla değiştir...",
"Replace: ": "Değiştir: ",
"Replace: ": "Değiştir:",
"Reset application layout": "Ugulama görünümünü sıfırla",
"Reset master password": "Ana parolayı sıfırla",
"Resources: %d.": "Kaynaklar: %d.",
@@ -758,7 +757,6 @@
"Select all": "Tümünü seç",
"Select emoji...": "Emoji seç...",
"Select file...": "Dosya seç...",
"Select parent notebook": "Ana not defterini seç",
"Server is already running on port %d": "Sunucu zaten %d portunda çalışıyor",
"Server is not running.": "Sunucu çalışmıyor.",
"Server is running on port %d": "Sunucu %d portunda çalışıyor",
@@ -876,7 +874,7 @@
"The default admin password is insecure and has not been changed! [Change it now](%s)": "Varsayılan admin parolası güvenli değil ve de henüz güncellenmedi! [Şimdi güncelle](%s)",
"The default encryption method has been changed to a more secure one and it is recommended that you apply it to your data.": "Varsayılan şifreleme yolu daha güvenli bir yola güncellendi, bu sebeple tüm verinizi yeniden şifrelemenizi öneriyoruz.",
"The default encryption method has been changed, you should re-encrypt your data.": "Varsayılan şifreleme yolu daha güvenli bir yola güncellendi, bu sebeple tüm verinizi yeniden şifrelemelisiniz.",
"The default profile cannot be deleted": "Varsayılan profil silinemez",
"The default profile cannot be deleted": "Varsayılan profil silinemez.",
"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.": "Editör komutu (argüman içerebilir) not açmak için kullanılacaktır. Eğer sağlanmadıysa, varsayılan düzenleyiciyi otomatik olarak algılamaya çalışır.",
"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.": "Faktör özelliği, dosyanın diğer dosyaların da ebatına sadık kalarak yeterli alan olduğu sürece hangi değerle büyüyüp ufalacağını tanımlar. Faktör değeri 2 olan bir bileşen, faktör değeri 1 olana nazaran 2 kat fazla alan kaplar. Değişiklikleri görmek için uygulamayı yeniden başlatın.",
"The following attachments are being watched for changes:": "Şu ek dosyaları değişiklikler için izlenmekte:",
@@ -1014,7 +1012,6 @@
"WebDAV username": "WebDAV kullanıcı adı",
"Website and documentation": "Web sitesi ve dökümanlar",
"Welcome to Joplin!\n\nType `:help shortcuts` for the list of keyboard shortcuts, or just `:help` for usage information.\n\nFor example, to create a notebook press `mb`; to create a note press `mn`.": "Joplin'e Hoş Geldiniz!\n\nKlavye kısayollarının listesi için `:help shortcuts` yazın veya kullanım bilgileri için sadece `:help` yazın.\n\nÖrneğin, bir not defteri oluşturmak için `mb`; Bir not oluşturmak için `mn` tuşuna basın.",
"Welcome!": "Hoş Geldiniz!",
"When creating a new note:": "Yeni bir not oluştururken:",
"When creating a new to-do:": "Yeni bir yapılacak oluşturulurken:",
"Words": "Kelime",

Some files were not shown because too many files have changed in this diff Show More