1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-27 20:29:45 +02:00

Compare commits

...

78 Commits

Author SHA1 Message Date
Laurent Cozic
075e55c077 Android release v1.0.269 2019-06-15 01:23:12 +01:00
Laurent Cozic
dc818e8a0c Electron release v1.0.160 2019-06-15 00:57:36 +01:00
Laurent Cozic
caa58dd913 name 2019-06-15 00:57:13 +01:00
Laurent Cozic
c84c3cd026 Merge pull request #1655 from laurent22/react-native-5-9
React Native 5 9
2019-06-14 23:32:12 +01:00
Laurent Cozic
bda5ac9fb5 Upgraded RNdocument-picker 2019-06-14 23:23:01 +01:00
Laurent Cozic
f928f645e5 Upgraded RNSqlite to remove warnings 2019-06-14 23:16:37 +01:00
Laurent Cozic
53d7e906d4 Removed unneeded class that was causing a require cycle 2019-06-14 23:04:05 +01:00
Laurent Cozic
e670b5d03f Upgraded RNDialogbox to remove warnings 2019-06-14 23:02:35 +01:00
Laurent Cozic
2a7d555859 Replaced deprecated Slider component 2019-06-14 22:59:27 +01:00
Laurent Cozic
e6675f500c Removed no longer used WebView module 2019-06-14 22:46:08 +01:00
Laurent Cozic
c3f20d3ebc Getting latest RNCamera to work with Android 2019-06-14 22:45:35 +01:00
Laurent Cozic
ff257060d1 Trying get RNCamera to work in iOS 2019-06-14 22:31:01 +01:00
Laurent Cozic
68cde202a4 Added JSC to improve performances of Android app 2019-06-14 18:37:46 +01:00
Laurent Cozic
1a7a87e170 Remove this for now as are not on AndroidX yet 2019-06-14 18:30:16 +01:00
Laurent Cozic
2990642923 Trying to fix rn-camera but cannot be full fixed yet due to https://github.com/react-native-community/react-native-camera/pull/2306 2019-06-14 09:15:38 +01:00
Laurent Cozic
0818de036e Fixing issue with webview so that WebKit rendering can be used 2019-06-14 09:14:01 +01:00
Laurent Cozic
122bc29035 Mobile: Upgraded WebView 2019-06-14 08:11:15 +01:00
Laurent Cozic
861cf8a1b2 Merge branch 'master' into react-native-5-9 2019-06-14 07:22:57 +01:00
Laurent Cozic
7d6959e9e4 Merge branch 'master' of github.com:laurent22/joplin 2019-06-14 07:22:38 +01:00
Laurent Cozic
85091052e7 iOS: Fixed missing Confirm and Cancel buttons on Alarm dialog 2019-06-14 07:22:25 +01:00
Laurent Cozic
f46ad5bfda Upgrading to React Native 5.9 2019-06-14 07:12:24 +01:00
Laurent Cozic
29f7937fc2 Merge branch 'master' of github.com:laurent22/joplin 2019-06-13 08:48:30 +01:00
Laurent Cozic
7fae9fda10 Desktop: Fixes #1443: Allow opening external editor on new notes 2019-06-13 08:48:19 +01:00
Laurent Cozic
a37961dccc Desktop: Removed placeholder in tag list because it repeats the label 2019-06-13 08:47:47 +01:00
Helmut K. C. Tessarek
55155646aa Clipper release v1.0.15 2019-06-12 19:38:32 -04:00
Laurent Cozic
7bffe86439 Merge branch 'master' of github.com:laurent22/joplin 2019-06-13 00:26:55 +01:00
Laurent Cozic
86136e0c6c Clipper: Fixes #1622: Import named anchors from clipped pages 2019-06-13 00:26:19 +01:00
Helmut K. C. Tessarek
21ae447d9c Clipper: Create a zip file of the source (for validation by Firefox reviewers) (#1648)
The file `joplin-webclipper-source.zip` will be in the `dist` directory of the webclipper.
2019-06-12 23:11:24 +01:00
Laurent Cozic
ad211b4b4e Clipper: Fixes #1600: Handle SVG images and fix issue with invalid file extensions 2019-06-12 09:45:31 +01:00
Laurent Cozic
d6218f35fe Clipper: Fixes #1526: Local files can be clipped again 2019-06-11 01:09:48 +01:00
Laurent Cozic
7af0dcd19a Merge branch 'master' of github.com:laurent22/joplin 2019-06-11 00:11:57 +01:00
Laurent Cozic
e1a52c5606 CLI: Remove Welcome notes because they are mostly relevent to desktop and mobile, and there is already intro text on CLI 2019-06-11 00:11:49 +01:00
Helmut K. C. Tessarek
468c345527 Desktop: Improved: Added shortuct for tags (Cmd+Opt+T / Ctrl+Alt+T) (#1638)
fixes #1626
2019-06-10 23:45:49 +01:00
Caleb John
041bdc08a2 Desktop: New: Highlight notebooks based on depth (#1634)
* Highlight notebooks based on depth

* Adjusted notebook depth targets, and dark theme select color
2019-06-10 23:44:51 +01:00
Laurent Cozic
7535f1a8c6 Update website 2019-06-10 23:41:32 +01:00
Laurent Cozic
0b24433db3 CLI v1.0.140 2019-06-10 08:56:11 +01:00
Laurent Cozic
f7de0c5ffd Merge branch 'master' of github.com:laurent22/joplin 2019-06-10 08:55:46 +01:00
Laurent Cozic
62c48b9a46 CLI: Fixed regression which was preventing decryption on newly created profiles 2019-06-10 08:55:36 +01:00
Helmut K. C. Tessarek
3fafda9684 Desktop: Added menu item to format inline code (#1641)
* Revert "Fix for #1426, aded backticks to auto-wrapping quotes."

This reverts commit 7dee93076a.

* changes to backtick behavior

- add shortcut ``` cmd+` ``` / ``` ctrl+` ```
- add menu item for `Inline code`

* rename menu item Inline Code -> Code
2019-06-10 08:05:20 +01:00
Helmut K. C. Tessarek
2cf1cda128 Update de_DE.po (#1640) 2019-06-10 01:18:07 -04:00
Laurent Cozic
fedee9499b Funding: Remove name for now because it causes an error 2019-06-08 10:38:42 +01:00
Laurent Cozic
7c6c7f34ba Android release v1.0.261 2019-06-08 00:49:41 +01:00
Laurent Cozic
0d65edd0e8 Electron release v1.0.159 2019-06-08 00:47:09 +01:00
Laurent Cozic
d57520c66a Merge branch 'master' of github.com:laurent22/joplin 2019-06-08 00:23:35 +01:00
Laurent Cozic
fa28ae1433 Mobile: Improved and cleaned up config screen 2019-06-08 00:23:17 +01:00
Laurent Cozic
0acf9823e5 Added missing test 2019-06-07 23:39:34 +01:00
Caleb John
799ad5f1da Desktop: Improved tag dialog to make it easier to add and remove tags (#1589) 2019-06-07 23:33:06 +01:00
Laurent Cozic
9f6b3ccf40 All: Improved: Allow using multiple connections to download items while synchronising (#1633)
* Task queue

* All: Improved sync speed by downloading items in parallel

* Improved download queue
2019-06-07 23:20:08 +01:00
Laurent Cozic
df714c357d All: Improved: Better handling of items that cannot be decrypted, including those that cause crashes 2019-06-07 23:11:08 +01:00
Laurent Cozic
de5fdc84f8 Added simple Key-Value store to support temporary data 2019-06-07 08:05:15 +00:00
Laurent Cozic
b5b228af15 Merge branch 'master' of github.com:laurent22/joplin 2019-06-06 16:05:26 +01:00
Laurent Cozic
7a85628f46 Doc: added Twitter feed and Product Hunt page 2019-06-06 16:05:14 +01:00
MichipX
075e76fc4b [Update] Language file: pl_PL.po (#1625)
Addition of strings and correction of mistakes.
2019-06-06 13:40:51 +01:00
Gustavo Reis
172a98fed4 Desktop: Fix icon path and directory in Linux install script (#1612) 2019-06-05 23:14:19 +01:00
Caleb John
409bdd7b78 Desktop, mobile: Upgrade TOC plugin version to 4.0.0 to fix various issues (#1603) 2019-06-05 23:13:00 +01:00
Caleb John
d012c689e1 Desktop: Improve how font size is applied (#1601) 2019-06-05 23:11:18 +01:00
Caleb John
89ec0629e6 Bump version of multimd-tables for mobile (#1597) 2019-06-05 23:02:10 +01:00
Laurent Cozic
b3475ae195 Android release v1.0.260 2019-06-05 18:31:59 +01:00
Laurent Cozic
a72ab67473 CLI v1.0.139 2019-06-05 18:09:10 +01:00
Laurent Cozic
90fbfec914 Update translations 2019-06-05 18:07:11 +01:00
Germán Martín
49ef023a90 Complete Spanish translation (#1613)
* Complete Spanish translation

Add missing translations

* Fix translation

* Review translation with Poedit
2019-06-05 18:02:36 +01:00
abonte
64bfd74f18 Translation: update it_IT.po (#1616)
* update Italian translation

* small fix
2019-06-05 18:02:20 +01:00
Laurent Cozic
655e35056e Merge branch 'master' of github.com:laurent22/joplin 2019-06-05 17:41:40 +01:00
Laurent Cozic
a13ba63ab8 Desktop: New: Added option to open development tools, to make it easier to create custom CSS 2019-06-05 17:41:30 +01:00
Laurent Cozic
e2e00d4c87 Doc: Added info to submit a web clipper bug 2019-06-05 15:09:22 +01:00
Helmut K. C. Tessarek
159dc44f6c Update website 2019-05-28 22:43:54 -04:00
Laurent Cozic
8fe2091926 Desktop, CLI: Fixes #1583: Handle multiple lines in attributes when importing Enex files 2019-05-28 22:52:09 +01:00
Laurent Cozic
c362c38dc0 Merge branch 'master' of github.com:laurent22/joplin 2019-05-28 22:05:25 +01:00
Laurent Cozic
316a52bbc2 All: Improved workflow of downloading and decrypting data during sync 2019-05-28 22:05:11 +01:00
Helmut K. C. Tessarek
0de9f6f944 Merge pull request #1596 from mmahmoudian/Update-Persian-localization
Improved and fixed Persian (fa) translation
2019-05-28 13:48:03 -04:00
Laurent Cozic
3ba021fdd9 Fixed test for Welcome notebook 2019-05-28 18:17:59 +01:00
Laurent Cozic
04c6579f2c All: Fix: Fix issue with revisions being needlessly created when decrypting notes 2019-05-28 18:10:21 +01:00
Mehrad Mahmoudian
bc7bd456a7 [update] Persian (fa) Language 2019-05-28 19:02:02 +03:00
Laurent Cozic
6d7511efbb Electron release v1.0.158 2019-05-27 19:54:04 +01:00
Caleb John
a0fb99d78f Desktop, Mobile: Improved: Enable more options on multimd-table plugin (#1586)
* Update multimd-table and enable options

* Add `options` option to markdown plugins
2019-05-27 19:53:02 +01:00
Laurent Cozic
685a52c2c5 Desktop, Mobile: Fixes #1587: Fix internal note links 2019-05-27 19:49:18 +01:00
Laurent Cozic
fc77419ca1 Desktop: Fixed empty separators in menu 2019-05-27 19:48:09 +01:00
Laurent Cozic
bab3a12e92 Doc: Updated build instructions for Windows 2019-05-27 18:04:24 +01:00
191 changed files with 7100 additions and 4523 deletions

1
.github/FUNDING.yml vendored
View File

@@ -1,5 +1,4 @@
# These are supported funding model platforms
github: laurent22
patreon: joplin
custom: https://joplinapp.org/donate/

View File

@@ -59,6 +59,8 @@ If node-gyp does not works (MSBUILD: error MSB3428: Could not load the Visual C+
If `yarn dist` fails, it may need administrative rights.
If you get an `error MSB8020: The build tools for v140 cannot be found.` try to run with a different toolset version, eg `npm install --toolset=v141` (See [here](https://github.com/mapbox/node-sqlite3/issues/1124) for more info).
The [building\_win32\_tips on this page](./readme/building_win32_tips.md) might be helpful.
# Building the Mobile application

View File

@@ -1,16 +1,16 @@
# User support
The [Joplin Forum](https://discourse.joplinapp.org/) is the community driven place for user support, general discussion about Joplin, problems with installation, new features and software development questions. It is possible to login with your GitHub account.
The [Joplin Forum](https://discourse.joplinapp.org/) is the community driven place for user support, general discussion about Joplin, problems with installation, new features and software development questions. It is possible to login with your GitHub account. Don't use the issue tracker for support questions.
# Reporting a bug
File bugs in the [Github Issue Tracker](https://github.com/laurent22/joplin/issues?utf8=%E2%9C%93&q=is%3Aissue). Please follow these guidelines:
- Search existing issues first, make sure yours hasn't already been reported.
- Don't use the issue tracker for support questions.
- Consider [enabling debug mode](https://github.com/laurent22/joplin/blob/master/readme/debugging.md) so that you can provide as much details as possible when reporting the issue.
- Consider [enabling debug mode](https://joplinapp.org/debugging/) so that you can provide as much details as possible when reporting the issue.
- Stay on topic, but describe the issue in detail so that others can reproduce it.
- **Provide a screenshot** if possible. A screenshot showing the problem is often more useful than a paragraph describing it.
- For web clipper bugs, **please provide the URL causing the issue**. Sometimes the clipper works in one page but not in another so it is important to know what URL has a problem.
# Feature requests
@@ -24,7 +24,7 @@ Avoid listing multiple requests in one report in the [Github Issue Tracker](http
## Contributing to Joplin's translation
Joplin is available in multiple languages thanks to the help of its users. You can help translate Joplin to your language or keep it up to date. Please read the documentation about [Localisation](https://github.com/laurent22/joplin#localisation).
Joplin is available in multiple languages thanks to the help of its users. You can help translate Joplin to your language or keep it up to date. Please read the documentation about [Localisation](https://joplinapp.org/#localisation).
## Contributing to Joplin's code

View File

@@ -378,8 +378,6 @@ class Application extends BaseApplication {
return this.stdout(object);
});
await WelcomeUtils.install(this.dispatch.bind(this));
// If we have some arguments left at this point, it's a command
// so execute it.
if (argv.length) {

View File

@@ -706,6 +706,9 @@ msgstr "موقع الويب و التوثيق"
msgid "Make a donation"
msgstr "تبرَّع"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "افتح %s"
@@ -933,9 +936,6 @@ msgstr "عنوان دفتر الملاحظات:"
msgid "Add or remove tags:"
msgstr "إضافة أو حذف وسوم:"
msgid "Separate each tag by a comma."
msgstr ""
msgid "Rename notebook:"
msgstr "إعادة تسمية دفتر الملاحظات:"
@@ -957,8 +957,9 @@ msgstr "لا يمكن مزامنة بعض العناصر."
msgid "View them now"
msgstr "عرضها الآن"
msgid "Some items cannot be decrypted."
msgstr "لا يمكن فك تشفير بعض العناصر."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "أدخل كلمة المرور الرئيسة:"
msgid "Set the password"
msgstr "ضبط كلمة المرور"
@@ -1160,6 +1161,9 @@ msgstr "جلب الموارد: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "فضلاً اختر أين سيتم تصدير حالة المزامنة"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "إضافة أو حذف وسوم"
@@ -1359,6 +1363,58 @@ msgstr ""
"تنبيه: إذا غيرت هذا المكان ، تأكد من نسخ كافة المحتويات لديك إليه قبل البدء "
"بالمزامنة ، وإلا فسيتم حذف كل الملفات! أنظر الأسئلة المتكررة لتفاصيل أكثر: %s"
msgid "Synchronisation target"
msgstr "وجهة المزامنة"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"الوجهة المستهدفة المزامنة إليها. كل وجهة مزامنة مستهدفة قد يكون لها معلمات "
"إضافية تكون مسماة بـ `sync.NUM.NAME` (جميعها موثقة أدناه)."
msgid "Directory to synchronise with (absolute path)"
msgstr "الدليل الذي تتم المزامنة معه (المسار المطلق)"
msgid "Nextcloud WebDAV URL"
msgstr "عنوان URL لـ Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "اسم مستخدم Nextcloud"
msgid "Nextcloud password"
msgstr "كلمة مرور Nextcloud"
msgid "WebDAV URL"
msgstr "عنوان URL لـ WebDAV"
msgid "WebDAV username"
msgstr "اسم مستخدم WebDAV"
msgid "WebDAV password"
msgstr "كلمة مرور WebDAV"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "اللغة"
@@ -1516,55 +1572,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "إظهار خيارات متقدمة"
msgid "Synchronisation target"
msgstr "وجهة المزامنة"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"الوجهة المستهدفة المزامنة إليها. كل وجهة مزامنة مستهدفة قد يكون لها معلمات "
"إضافية تكون مسماة بـ `sync.NUM.NAME` (جميعها موثقة أدناه)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "الدليل الذي تتم المزامنة معه (المسار المطلق)"
msgid "Nextcloud WebDAV URL"
msgstr "عنوان URL لـ Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "اسم مستخدم Nextcloud"
msgid "Nextcloud password"
msgstr "كلمة مرور Nextcloud"
msgid "WebDAV URL"
msgstr "عنوان URL لـ WebDAV"
msgid "WebDAV username"
msgstr "اسم مستخدم WebDAV"
msgid "WebDAV password"
msgstr "كلمة مرور WebDAV"
msgid "Custom TLS certificates"
msgstr "شهادات TLS خاصة"
@@ -1671,14 +1678,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "العناصر التي لا يمكن مزامنتها"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "لم نتمكن من فتح هذا الملف: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "لم نتمكن من فتح هذا الملف: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1688,6 +1687,24 @@ msgstr ""
"تجد هذه العناصر ، عليك إما البحث عن العنوان أو المعرِّف (وهو معروض أعلاه بين "
"قوسين)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "لم نتمكن من فتح هذا الملف: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "لم نتمكن من فتح هذا الملف: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "العناصر التي لا يمكن مزامنتها"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "حالة المزامنة (العناصر المنجزة / إجمالي العناصر)"
@@ -1808,6 +1825,10 @@ msgstr "وسوم جديدة:"
msgid "Type new tags or select from list"
msgstr "أكتب وسوماً جديدة أو اخترها من القائمة"
#, fuzzy
msgid "More information"
msgstr "الضبط"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1950,6 +1971,9 @@ msgstr "ليس لديك دفاتر ملاحظات حالياً. أنشئ واح
msgid "Welcome"
msgstr "مرحباً"
#~ msgid "Some items cannot be decrypted."
#~ msgstr "لا يمكن فك تشفير بعض العناصر."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -738,6 +738,9 @@ msgstr "Lloc web i documentació"
msgid "Make a donation"
msgstr "Donatius"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Obre %s"
@@ -971,9 +974,6 @@ msgstr "Títol del bloc de notes:"
msgid "Add or remove tags:"
msgstr "Afegeix o suprimeix etiquetes:"
msgid "Separate each tag by a comma."
msgstr "Separeu les etiquetes amb comes."
msgid "Rename notebook:"
msgstr "Canvia el nom del bloc de notes:"
@@ -995,8 +995,9 @@ msgstr "Alguns elements no s'han pogut sincronitzar."
msgid "View them now"
msgstr "Mostra'ls ara"
msgid "Some items cannot be decrypted."
msgstr "Alguns elements no s'han pogut desxifrar."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Introduïu una contrasenya mestra:"
msgid "Set the password"
msgstr "Establiu la contrasenya"
@@ -1200,6 +1201,9 @@ msgstr "Recursos: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Seleccioneu on s'hauria d'exportar l'estat de la sincronització"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Afegeix o suprimeix etiquetes"
@@ -1400,6 +1404,58 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Objectiu de sincronització"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"L'objectiu on se sincronitzarà. Cada objectiu pot tenir paràmetres "
"addicionals que s'anomenen com a «sync.NUM.NAME» (es documenten a sota)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Directori on es farà la sincronització (camí absolut)"
msgid "Nextcloud WebDAV URL"
msgstr "URL del Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "Nom d'usuari del Nextcloud"
msgid "Nextcloud password"
msgstr "Contrasenya del Nextcloud"
msgid "WebDAV URL"
msgstr "URL de WebDAV"
msgid "WebDAV username"
msgstr "Nom d'usuari WebDAV"
msgid "WebDAV password"
msgstr "Contrasenya de WebDAV"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Llengua"
@@ -1559,55 +1615,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Mostra les opcions avançades"
msgid "Synchronisation target"
msgstr "Objectiu de sincronització"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"L'objectiu on se sincronitzarà. Cada objectiu pot tenir paràmetres "
"addicionals que s'anomenen com a «sync.NUM.NAME» (es documenten a sota)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Directori on es farà la sincronització (camí absolut)"
msgid "Nextcloud WebDAV URL"
msgstr "URL del Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "Nom d'usuari del Nextcloud"
msgid "Nextcloud password"
msgstr "Contrasenya del Nextcloud"
msgid "WebDAV URL"
msgstr "URL de WebDAV"
msgid "WebDAV username"
msgstr "Nom d'usuari WebDAV"
msgid "WebDAV password"
msgstr "Contrasenya de WebDAV"
msgid "Custom TLS certificates"
msgstr ""
@@ -1715,14 +1722,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Elements que no s'han pogut sincronitzar"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "No s'ha pogut desar el bloc de notes: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "No s'ha pogut desar el bloc de notes: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1732,6 +1731,24 @@ msgstr ""
"destinació de sincronització. Per a poder trobar aquests elements, podeu "
"cercar pel títol o la ID (que es mostra entre claus a sobre)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "No s'ha pogut desar el bloc de notes: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "No s'ha pogut desar el bloc de notes: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Elements que no s'han pogut sincronitzar"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Estat de la sincronització (element sinc. / elements totals)"
@@ -1851,6 +1868,10 @@ msgstr "Etiquetes noves:"
msgid "Type new tags or select from list"
msgstr "Escriviu etiquetes noves o seleccioneu-ne de la llista"
#, fuzzy
msgid "More information"
msgstr "Configuració"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -2000,6 +2021,12 @@ msgstr ""
msgid "Welcome"
msgstr "Benvingut"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separeu les etiquetes amb comes."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Alguns elements no s'han pogut desxifrar."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -719,6 +719,9 @@ msgstr "Web a dokumentace"
msgid "Make a donation"
msgstr "Přispět"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Otevřít %s"
@@ -948,9 +951,6 @@ msgstr "Název zápisníku:"
msgid "Add or remove tags:"
msgstr "Přidat či odebrat tagy:"
msgid "Separate each tag by a comma."
msgstr "Tagy oddělujte čárkami."
msgid "Rename notebook:"
msgstr "Přejmenovat zápisník:"
@@ -972,8 +972,9 @@ msgstr "Některé položky nelze synchronizovat."
msgid "View them now"
msgstr "Zobrazit"
msgid "Some items cannot be decrypted."
msgstr "Některé položky nelze rozšifrovat."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Zadejte master heslo:"
msgid "Set the password"
msgstr "Nastavit heslo"
@@ -1173,6 +1174,9 @@ msgstr "Stahování zdrojů: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Prosím vyberte, kam má být stav synchronizace exportován"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Přidat či odebrat tagy"
@@ -1378,6 +1382,58 @@ msgstr ""
"jste do něj zkopírovali veškerý obsah, jinak budou všechny soubory "
"odstraněny! Další podrobnosti naleznete v FAQ: % s"
msgid "Synchronisation target"
msgstr "Cíl synchronizace"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Cíl synchronizace. Každý cíl může mít další parametry ve formátu `sync.NUM."
"NAME` (dokumentace níže)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Složka k synchronizaci (absolutní cesta)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud uživatelské jméno"
msgid "Nextcloud password"
msgstr "Nextcloud heslo"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV uživatelské jméno"
msgid "WebDAV password"
msgstr "WebDAV heslo"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Jazyk"
@@ -1534,55 +1590,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Ukázat pokročilé volby"
msgid "Synchronisation target"
msgstr "Cíl synchronizace"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Cíl synchronizace. Každý cíl může mít další parametry ve formátu `sync.NUM."
"NAME` (dokumentace níže)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Složka k synchronizaci (absolutní cesta)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud uživatelské jméno"
msgid "Nextcloud password"
msgstr "Nextcloud heslo"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV uživatelské jméno"
msgid "WebDAV password"
msgstr "WebDAV heslo"
msgid "Custom TLS certificates"
msgstr "Vlastní TLS certifikát"
@@ -1689,14 +1696,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Položky jež nelze synchronizovat"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Soubor se nepodařilo otevřít: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Soubor se nepodařilo otevřít: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1706,6 +1705,24 @@ msgstr ""
"synchronizace. Pro přístup k těmto souborům hledejte jejich název nebo ID (v "
"hranatých závorkách)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Soubor se nepodařilo otevřít: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Soubor se nepodařilo otevřít: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Položky jež nelze synchronizovat"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Stav synchronizace (synchronizováno / celkem)"
@@ -1829,6 +1846,10 @@ msgstr "Nové tagy:"
msgid "Type new tags or select from list"
msgstr "Zadejte nové tagy, nebo vyberte existující ze seznamu"
#, fuzzy
msgid "More information"
msgstr "Nastavení"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1973,6 +1994,12 @@ msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na tlačítko (+
msgid "Welcome"
msgstr "Vítejte"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Tagy oddělujte čárkami."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Některé položky nelze rozšifrovat."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -725,6 +725,9 @@ msgstr "Joplins hjemmeside og dokumentation"
msgid "Make a donation"
msgstr "Giv en donation"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Åben %s"
@@ -950,9 +953,6 @@ msgstr "Notesbogs titel:"
msgid "Add or remove tags:"
msgstr "Tilføj eller slet mærker:"
msgid "Separate each tag by a comma."
msgstr "Adskil hver mærke med komma."
msgid "Rename notebook:"
msgstr "Omdøb notesbog:"
@@ -976,8 +976,9 @@ msgstr "Nogle emner kan ikke synkroniseres."
msgid "View them now"
msgstr "Vis dem nu"
msgid "Some items cannot be decrypted."
msgstr "Nogle emner kan ikke krypteres."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Indtast Hoved kodeord:"
msgid "Set the password"
msgstr "Indstil kodeord"
@@ -1176,6 +1177,9 @@ msgstr "Ressourcer: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Vælg hvor sync status skal eksporteres til"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Tilføj eller slet mærker"
@@ -1381,6 +1385,58 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Synkroniserings mål"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Synkroniserings mål. Hver synk. mål kan have ekstra parametre som navngives "
"som `sync.NUM.NAME` (se dokumentation herunder)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Mappe der skal synkroniseres med (absolut sti)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud brugernavn"
msgid "Nextcloud password"
msgstr "Nextcloud kodeord"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV brugernavn"
msgid "WebDAV password"
msgstr "WebDAV kodeord"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Sprog"
@@ -1541,55 +1597,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Vis avancerede indstillinger"
msgid "Synchronisation target"
msgstr "Synkroniserings mål"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Synkroniserings mål. Hver synk. mål kan have ekstra parametre som navngives "
"som `sync.NUM.NAME` (se dokumentation herunder)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Mappe der skal synkroniseres med (absolut sti)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud brugernavn"
msgid "Nextcloud password"
msgstr "Nextcloud kodeord"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV brugernavn"
msgid "WebDAV password"
msgstr "WebDAV kodeord"
msgid "Custom TLS certificates"
msgstr ""
@@ -1697,14 +1704,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Emner kan ikke synkroniseres"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Notesbogen kan ikke gemmes: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Notesbogen kan ikke gemmes: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1714,6 +1713,24 @@ msgstr ""
"For at finde disse emner; enten søg efter titel eller ID (som er vist i "
"klammer herover)"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Notesbogen kan ikke gemmes: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Notesbogen kan ikke gemmes: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Emner kan ikke synkroniseres"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Synk status (synk' emner / emner i alt)"
@@ -1834,6 +1851,10 @@ msgstr "Nye tags:"
msgid "Type new tags or select from list"
msgstr "Indtast nye tags eller vælg fra listen"
#, fuzzy
msgid "More information"
msgstr "Indstillinger"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1975,6 +1996,12 @@ msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
msgid "Welcome"
msgstr "Velkommen"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Adskil hver mærke med komma."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Nogle emner kan ikke krypteres."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -737,6 +737,9 @@ msgstr "Webseite und Dokumentation"
msgid "Make a donation"
msgstr "Spenden"
msgid "Toggle development tools"
msgstr "Entwicklerwerkzeuge ein-/ausschalten"
#, javascript-format
msgid "Open %s"
msgstr "Öffne %s"
@@ -974,9 +977,6 @@ msgstr "Notizbuch-Titel:"
msgid "Add or remove tags:"
msgstr "Schlagwörter hinzufügen oder entfernen:"
msgid "Separate each tag by a comma."
msgstr "Trenne jedes Schlagwort mit einem Komma."
msgid "Rename notebook:"
msgstr "Notizbuch umbenennen:"
@@ -998,8 +998,8 @@ msgstr "Manche Objekte können nicht synchronisiert werden."
msgid "View them now"
msgstr "Zeige sie jetzt an"
msgid "Some items cannot be decrypted."
msgstr "Einige Objekte können nicht entschlüsselt werden."
msgid "One or more master keys need a password."
msgstr "Mindestens ein Hauptschlüssel benötigt ein Passwort."
msgid "Set the password"
msgstr "Setze ein Passwort"
@@ -1209,6 +1209,9 @@ msgid "Please select where the sync status should be exported to"
msgstr ""
"Bitte wähle aus, wohin der Synchronisations-Status exportiert werden soll"
msgid "Retry"
msgstr "Erneut versuchen"
msgid "Add or remove tags"
msgstr "Schlagwörter hinzufügen oder entfernen"
@@ -1412,6 +1415,63 @@ msgstr ""
"neuen Ablageort kopiert hast, sonst werden alle Dateien gelöscht! Lies auch "
"die FAQs hierzu: %s"
msgid "Synchronisation target"
msgstr "Synchronisationsziel"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Das Ziel, mit dem synchronisiert werden soll. Jedes Synchronisationsziel "
"kann zusätzliche Parameter haben, die als `sync.NUM.NAME` (alle unten "
"dokumentiert) bezeichnet werden."
msgid "Directory to synchronise with (absolute path)"
msgstr "Verzeichnis mit dem synchronisiert werden soll (absoluter Pfad)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV-URL"
msgid "Nextcloud username"
msgstr "Nextcloud-Benutzername"
msgid "Nextcloud password"
msgstr "Nextcloud-Passwort"
msgid "WebDAV URL"
msgstr "WebDAV-URL"
msgid "WebDAV username"
msgstr "WebDAV-Benutzername"
msgid "WebDAV password"
msgstr "WebDAV-Passwort"
msgid "Attachment download behaviour"
msgstr "Verhalten für das Herunterladen von Anhängen"
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
"Im \"Manuell\" Modus werden die Anhänge nur heruntergeladen wenn Du auf sie "
"klickst. Bei \"Automatisch\" werden sie heruntergeladen sobald die Notiz "
"geöffnet wird. Bei \"Immer\" werden die Anhänge heruntergeladen egal ob die "
"Notiz geöffnet wird oder nicht."
msgid "Always"
msgstr "Immer"
msgid "Manual"
msgstr "Manuell"
msgid "Auto"
msgstr "Automatisch"
msgid "Max concurrent connections"
msgstr "Maximale Anzahl an gleichzeitigen Verbindungen"
msgid "Language"
msgstr "Sprache"
@@ -1569,60 +1629,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Erweiterte Optionen anzeigen"
msgid "Synchronisation target"
msgstr "Synchronisationsziel"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Das Ziel, mit dem synchronisiert werden soll. Jedes Synchronisationsziel "
"kann zusätzliche Parameter haben, die als `sync.NUM.NAME` (alle unten "
"dokumentiert) bezeichnet werden."
msgid "Attachment download behaviour"
msgstr "Verhalten für das Herunterladen von Anhängen"
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
"Im \"Manuell\" Modus werden die Anhänge nur heruntergeladen wenn Du auf sie "
"klickst. Bei \"Automatisch\" werden sie heruntergeladen sobald die Notiz "
"geöffnet wird. Bei \"Immer\" werden die Anhänge heruntergeladen egal ob die "
"Notiz geöffnet wird oder nicht."
msgid "Always"
msgstr "Immer"
msgid "Manual"
msgstr "Manuell"
msgid "Auto"
msgstr "Automatisch"
msgid "Directory to synchronise with (absolute path)"
msgstr "Verzeichnis mit dem synchronisiert werden soll (absoluter Pfad)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV-URL"
msgid "Nextcloud username"
msgstr "Nextcloud-Benutzername"
msgid "Nextcloud password"
msgstr "Nextcloud-Passwort"
msgid "WebDAV URL"
msgstr "WebDAV-URL"
msgid "WebDAV username"
msgstr "WebDAV-Benutzername"
msgid "WebDAV password"
msgstr "WebDAV-Passwort"
msgid "Custom TLS certificates"
msgstr "Benutzerdefinierte TLS-Zertifikate"
@@ -1732,14 +1738,6 @@ msgstr "Wiederhergestellte Notizen"
msgid "Items that cannot be synchronised"
msgstr "Objekte können nicht synchronisiert werden"
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) konnte nicht hochgeladen werden: %s"
#, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Eintrag \"%s\" konnte nicht heruntergeladen werden: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1749,6 +1747,27 @@ msgstr ""
"Synchronisationsziel hochgeladen. Um diese Objekte zu finden, suchst du "
"entweder nach dem Titel oder der ID (die oben in Klammern angezeigt wird)."
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) konnte nicht hochgeladen werden: %s"
#, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Eintrag \"%s\" konnte nicht heruntergeladen werden: %s"
msgid "Items that cannot be decrypted"
msgstr "Objekte, die nicht entschlüsselt werden konnten"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
"Joplin konnte diese Objekte trotz mehrfacher Versuche nicht entschlüsseln, "
"weil sie wahrscheinlich entweder kaputt oder zu groß sind. Diese Objekte "
"bleiben auf dem Gerat, aber Joplin wird nicht mehr versuchen sie zu "
"entschlüsseln."
msgid "Sync status (synced items / total items)"
msgstr "Synchronisationsstatus (synchronisierte Objekte / gesamte Objekte)"
@@ -1874,6 +1893,9 @@ msgstr "Neue Schlagwörter:"
msgid "Type new tags or select from list"
msgstr "Neues Schlagwort eingeben oder aus der Liste auswählen"
msgid "More information"
msgstr "Weitere Information"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -2023,6 +2045,12 @@ msgstr ""
msgid "Welcome"
msgstr "Willkommen"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Trenne jedes Schlagwort mit einem Komma."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Einige Objekte können nicht entschlüsselt werden."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -646,6 +646,9 @@ msgstr ""
msgid "Make a donation"
msgstr ""
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr ""
@@ -854,9 +857,6 @@ msgstr ""
msgid "Add or remove tags:"
msgstr ""
msgid "Separate each tag by a comma."
msgstr ""
msgid "Rename notebook:"
msgstr ""
@@ -878,7 +878,7 @@ msgstr ""
msgid "View them now"
msgstr ""
msgid "Some items cannot be decrypted."
msgid "One or more master keys need a password."
msgstr ""
msgid "Set the password"
@@ -1074,6 +1074,9 @@ msgstr ""
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr ""
@@ -1263,6 +1266,56 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr ""
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr ""
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
msgid "Nextcloud password"
msgstr ""
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
msgid "WebDAV password"
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr ""
@@ -1412,53 +1465,6 @@ msgstr ""
msgid "Show advanced options"
msgstr ""
msgid "Synchronisation target"
msgstr ""
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr ""
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
msgid "Nextcloud password"
msgstr ""
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
msgid "WebDAV password"
msgstr ""
msgid "Custom TLS certificates"
msgstr ""
@@ -1558,6 +1564,12 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr ""
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr ""
@@ -1566,10 +1578,13 @@ msgstr ""
msgid "Item \"%s\" could not be downloaded: %s"
msgstr ""
msgid "Items that cannot be decrypted"
msgstr ""
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
@@ -1687,6 +1702,9 @@ msgstr ""
msgid "Type new tags or select from list"
msgstr ""
msgid "More information"
msgstr ""
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"

View File

@@ -652,6 +652,9 @@ msgstr ""
msgid "Make a donation"
msgstr ""
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr ""
@@ -872,9 +875,6 @@ msgstr ""
msgid "Add or remove tags:"
msgstr ""
msgid "Separate each tag by a comma."
msgstr ""
msgid "Rename notebook:"
msgstr ""
@@ -896,7 +896,7 @@ msgstr "Some items cannot be synchronized."
msgid "View them now"
msgstr ""
msgid "Some items cannot be decrypted."
msgid "One or more master keys need a password."
msgstr ""
msgid "Set the password"
@@ -1092,6 +1092,9 @@ msgstr ""
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr ""
@@ -1283,6 +1286,58 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Synchronization target"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"The target to synchonize to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Directory to synchronize with (absolute path)"
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
msgid "Nextcloud password"
msgstr ""
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
msgid "WebDAV password"
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr ""
@@ -1435,55 +1490,6 @@ msgstr ""
msgid "Show advanced options"
msgstr ""
msgid "Synchronisation target"
msgstr "Synchronization target"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"The target to synchonize to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Directory to synchronize with (absolute path)"
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
msgid "Nextcloud password"
msgstr ""
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
msgid "WebDAV password"
msgstr ""
msgid "Custom TLS certificates"
msgstr ""
@@ -1583,6 +1589,12 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Items that cannot be synchronized"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr ""
@@ -1591,10 +1603,14 @@ msgstr ""
msgid "Item \"%s\" could not be downloaded: %s"
msgstr ""
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Items that cannot be synchronized"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
@@ -1717,6 +1733,9 @@ msgstr ""
msgid "Type new tags or select from list"
msgstr ""
msgid "More information"
msgstr ""
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"

View File

@@ -1,9 +1,11 @@
# Joplin translation to Spanish (Spain)
# Copyright (C) 2017 Lucas Vieites
# Copyright (C) 2019 Andros Fenollosa
# Copyright (C) 2019 Germán Martín
# This file is distributed under the same license as the Joplin-CLI package.
# Lucas Vieites <lucas.vieites@gmail.com>, 2017.
# Andros Fenollosa <andros@fenollosa.email>, 2019.
# Germán Martín <gmag11@gmail.com>, 2019.
#
msgid ""
msgstr ""
@@ -15,7 +17,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.1\n"
"X-Generator: Poedit 2.2.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: UTF-8\n"
@@ -132,8 +134,8 @@ msgid ""
"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
"`status`, `decrypt-file` and `target-status`."
msgstr ""
"Maneja la configuración E2EE. Comandos disponibles `enable`, `disable`, "
"`decrypt`, `status` y `target-status`."
"Maneja la configuración E2EE. Los comandos disponibles son: `enable`, "
"`disable`, `decrypt`, `status` y `target-status`."
msgid "Enter master password:"
msgstr "Introduzca la contraseña maestra:"
@@ -641,7 +643,7 @@ msgid "About Joplin"
msgstr "Acerca de Joplin"
msgid "Preferences..."
msgstr ""
msgstr "Preferencias..."
msgid "Check for updates..."
msgstr "Comprobar actualizaciones..."
@@ -663,7 +665,7 @@ msgid "Quit"
msgstr "Salir"
msgid "Close Window"
msgstr ""
msgstr "Cerrar Ventana"
msgid "&Edit"
msgstr "&Editar"
@@ -725,6 +727,9 @@ msgstr "Sitio web y documentación"
msgid "Make a donation"
msgstr "Hacer una donación"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Abrir %s"
@@ -828,6 +833,8 @@ msgid ""
"This authorisation token is only needed to allow third-party applications to "
"access Joplin."
msgstr ""
"Este token de autorización se necesita solamente para permitir a "
"aplicaciones de terceros acceder a Joplin."
#, javascript-format
msgid "Notes and settings are stored in: %s"
@@ -955,9 +962,6 @@ msgstr "Título de libreta:"
msgid "Add or remove tags:"
msgstr "Agregar o borrar etiquetas:"
msgid "Separate each tag by a comma."
msgstr "Separar cada etiqueta por una coma."
msgid "Rename notebook:"
msgstr "Renombrar libreta:"
@@ -979,8 +983,9 @@ msgstr "No se han podido sincronizar algunos de los elementos."
msgid "View them now"
msgstr "Verlos ahora"
msgid "Some items cannot be decrypted."
msgstr "No se han podido descifrar algunos elementos."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Introduzca la contraseña maestra:"
msgid "Set the password"
msgstr "Establecer la contraseña"
@@ -998,32 +1003,34 @@ msgstr "Localización"
msgid "URL"
msgstr "URL"
#, fuzzy
msgid "Note History"
msgstr "Lista de notas"
msgstr ""
"Historial\n"
" de notas"
msgid "Previous versions of this note"
msgstr ""
msgstr "Versiones anteriores de esta nota"
msgid "Note properties"
msgstr "Propiedades de nota"
#, javascript-format
msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
msgstr ""
msgstr "La nota \"%s\" se ha restaurado correctamente en la libreta \"%s\"."
#, fuzzy
msgid "This note has no history"
msgstr "Esta nota ha sido modificada:"
msgstr "Esta nota no dispone de historial"
msgid "Restore"
msgstr ""
msgstr "Restaurar"
#, javascript-format
msgid ""
"Click \"%s\" to restore the note. It will be copied in the notebook named "
"\"%s\". The current version of the note will not be replaced or modified."
msgstr ""
"Pulse \"%s\" para restaurar la nota. Se copiará en la libreta \"%s\". La "
"versión actual de la nota no se reemplazará ni se modificará."
msgid "Open..."
msgstr "Abrir..."
@@ -1182,6 +1189,9 @@ msgstr "Obteniendo refuersos: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Seleccione a dónde se debería exportar el estado de sincronización"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Añadir o borrar etiquetas"
@@ -1216,9 +1226,11 @@ msgid ""
"Type a note title to jump to it. Or type # followed by a tag name, or @ "
"followed by a notebook name."
msgstr ""
"Escriba el título de una nota para abrirla. O escriba # seguido de un nombre "
"de etiqueta, o @ seguido del nombre de una libreta."
msgid "Goto Anything..."
msgstr ""
msgstr "Ir a..."
#, javascript-format
msgid "Usage: %s"
@@ -1335,6 +1347,8 @@ msgstr "La sincronización ya está en progreso. Estado: %s"
msgid ""
"Unknown item type downloaded - please upgrade Joplin to the latest version"
msgstr ""
"Se ha descargado un elemento de tipo desconocido - actualice Joplin a la "
"última versión"
msgid "Encrypted"
msgstr "Cifrado"
@@ -1383,6 +1397,63 @@ msgstr ""
"antes de sincronizarlo, de lo contrario todos los archivos serán eliminados. "
"Consulte las preguntas frecuentes para obtener más detalles: %s"
msgid "Synchronisation target"
msgstr "Destino de sincronización"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"El destino de la sincronización. Cada destino de la sincronización puede "
"tener parámetros adicionales los cuales son llamados como `sync.NUM.NAME` "
"(todos abajo documentados)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Directorio con el que sincronizarse (ruta completa)"
msgid "Nextcloud WebDAV URL"
msgstr "Servidor WebDAV de Nextcloud"
msgid "Nextcloud username"
msgstr "Usuario de Nextcloud"
msgid "Nextcloud password"
msgstr "Contraseña de Nextcloud"
msgid "WebDAV URL"
msgstr "Servidor WebDAV"
msgid "WebDAV username"
msgstr "Usuario de WebDAV"
msgid "WebDAV password"
msgstr "Contraseña de WebDAV"
msgid "Attachment download behaviour"
msgstr "Comportamiento de descarga de adjuntos"
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
"En modo \"Manual\", los archivos adjuntos se descargan solamente al pulsar "
"sobre ellos. En modo \"Auto\", se descargan cuando se abre la nota. En modo "
"\"Always\", se descargan todos los archivos adjuntos aunque la nota no esté "
"abierta."
msgid "Always"
msgstr "Siempre"
msgid "Manual"
msgstr "Manual"
msgid "Auto"
msgstr "Automático"
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Idioma"
@@ -1413,7 +1484,6 @@ msgstr "Ordenar notas por"
msgid "Reverse sort order"
msgstr "Invierte el orden"
#, fuzzy
msgid "Sort notebooks by"
msgstr "Ordenar notas por"
@@ -1433,41 +1503,40 @@ msgid "When creating a new note:"
msgstr "Cuando se crear una nota nueva:"
msgid "Enable soft breaks"
msgstr ""
msgstr "Activar saltos de línea"
#, fuzzy
msgid "Enable math expressions"
msgstr "Habilitar cifrado"
msgstr "Habilitar expresiones matemáticas"
msgid "Enable ==mark== syntax"
msgstr ""
msgstr "Activar sintaxis ==mark=="
msgid "Enable footnotes"
msgstr ""
msgstr "Activar notas al pie"
msgid "Enable table of contents extension"
msgstr ""
msgstr "Activar extensión de tabla de contenidos"
msgid "Enable ~sub~ syntax"
msgstr ""
msgstr "Activar sintaxis ~sub~"
msgid "Enable ^sup^ syntax"
msgstr ""
msgstr "Activar sintaxis ^sup^"
msgid "Enable deflist syntax"
msgstr ""
msgstr "Activar sintaxis Deflist"
msgid "Enable abbreviation syntax"
msgstr ""
msgstr "Activar sintaxis de abreviaturas"
msgid "Enable markdown emoji"
msgstr ""
msgstr "Activa sintaxis de emojis"
msgid "Enable ++insert++ syntax"
msgstr ""
msgstr "Activar sintaxis ++insert++"
msgid "Enable multimarkdown table extension"
msgstr ""
msgstr "Activar extensión de tablas multimarkdown"
msgid "Show tray icon"
msgstr "Mostrar icono en la bandeja"
@@ -1543,56 +1612,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Mostrar opciones avanzadas"
msgid "Synchronisation target"
msgstr "Destino de sincronización"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"El destino de la sincronización. Cada destino de la sincronización puede "
"tener parámetros adicionales los cuales son llamados como `sync.NUM.NAME` "
"(todos abajo documentados)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Directorio con el que sincronizarse (ruta completa)"
msgid "Nextcloud WebDAV URL"
msgstr "Servidor WebDAV de Nextcloud"
msgid "Nextcloud username"
msgstr "Usuario de Nextcloud"
msgid "Nextcloud password"
msgstr "Contraseña de Nextcloud"
msgid "WebDAV URL"
msgstr "Servidor WebDAV"
msgid "WebDAV username"
msgstr "Usuario de WebDAV"
msgid "WebDAV password"
msgstr "Contraseña de WebDAV"
msgid "Custom TLS certificates"
msgstr "Certificados TLS personalizados"
@@ -1611,19 +1630,18 @@ msgstr ""
msgid "Ignore TLS certificate errors"
msgstr "Ignorar errores en certificados TLS"
#, fuzzy
msgid "Enable note history"
msgstr "Habilitar cifrado"
msgstr "Habilitar historial de notas"
msgid "days"
msgstr ""
msgstr "días"
#, javascript-format
msgid "%d days"
msgstr ""
msgstr "%d días"
msgid "Keep note history for"
msgstr ""
msgstr "Mantener historial de la nota durante"
#, javascript-format
msgid "Invalid option value: \"%s\". Possible values are: %s."
@@ -1642,7 +1660,7 @@ msgid "Note"
msgstr "Nota"
msgid "Plugins"
msgstr ""
msgstr "Plugins"
msgid "Application"
msgstr "Aplicación"
@@ -1695,19 +1713,11 @@ msgid "Please specify the notebook where the notes should be imported to."
msgstr "Por favor especifique la libreta donde las notas deben ser importadas."
msgid "Restored Notes"
msgstr ""
msgstr "Notas restauradas"
msgid "Items that cannot be synchronised"
msgstr "Elementos que no se pueden sincronizar"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "No se ha podido abrir este archivo: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "No se ha podido abrir este archivo: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1717,6 +1727,24 @@ msgstr ""
"destino de sincronización. Para encontrar dichos elementos busca en el "
"título o en el ID (el cual se muestra arriba entre corchetes)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "No se ha podido subir el archivo %s (%s): %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "No se ha podido abrir el archivo %s (%s): %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Elementos que no se pueden sincronizar"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Estado de sincronización (elementos sincronizados/elementos totales)"
@@ -1839,6 +1867,10 @@ msgstr "Nuevas etiquetas:"
msgid "Type new tags or select from list"
msgstr "Escriba nuevas etiquetas o seleccionelas de la lista"
#, fuzzy
msgid "More information"
msgstr "Configuración"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1987,6 +2019,12 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenido"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separar cada etiqueta por una coma."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "No se han podido descifrar algunos elementos."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -732,6 +732,9 @@ msgstr "Web orria eta dokumentazioa (en)"
msgid "Make a donation"
msgstr "Web orria eta dokumentazioa (en)"
msgid "Toggle development tools"
msgstr ""
#, fuzzy, javascript-format
msgid "Open %s"
msgstr "On %s: %s"
@@ -958,9 +961,6 @@ msgstr "Koadernoaren izenburua: "
msgid "Add or remove tags:"
msgstr "Gehitu edo ezabatu etiketak:"
msgid "Separate each tag by a comma."
msgstr "Banatu etiketak koma erabiliaz."
msgid "Rename notebook:"
msgstr "Berrizendatu koadernoa:"
@@ -984,8 +984,9 @@ msgstr "Zenbait item ezin dira sinkronizatu."
msgid "View them now"
msgstr "Ikusi hori orain"
msgid "Some items cannot be decrypted."
msgstr "Zenbait item ezin dira deszifratu."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Sartu pasahitz nagusia:"
msgid "Set the password"
msgstr "Ezarri pasahitza"
@@ -1189,6 +1190,9 @@ msgstr "Baliabideak: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Aukeratu nora esportatu sinkronizazioaren egoera, mesedez"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Gehitu edo ezabatu etiketak"
@@ -1395,6 +1399,62 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Sinkronizazio helbudua"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Sinkronizazio helburua. Sinkronizazio aukera bakoitzak izan ditzake "
"parametro gehigarriak, horrela izendatuta `sync.NUM.NAME` (dena beherago "
"dokumentatuta)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Sinkronizatzeko direktorioa (bide-izena osorik)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud erabiltzaile-izena"
msgid "Nextcloud password"
msgstr "Nextcloud pasahitza"
#, fuzzy
msgid "WebDAV URL"
msgstr "Nextcloud WebDAV URL"
#, fuzzy
msgid "WebDAV username"
msgstr "Nextcloud erabiltzaile-izena"
#, fuzzy
msgid "WebDAV password"
msgstr "Ezarri pasahitza"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Hizkuntza"
@@ -1557,59 +1617,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Erakutsi aukera aurreratuak"
msgid "Synchronisation target"
msgstr "Sinkronizazio helbudua"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Sinkronizazio helburua. Sinkronizazio aukera bakoitzak izan ditzake "
"parametro gehigarriak, horrela izendatuta `sync.NUM.NAME` (dena beherago "
"dokumentatuta)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Sinkronizatzeko direktorioa (bide-izena osorik)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud erabiltzaile-izena"
msgid "Nextcloud password"
msgstr "Nextcloud pasahitza"
#, fuzzy
msgid "WebDAV URL"
msgstr "Nextcloud WebDAV URL"
#, fuzzy
msgid "WebDAV username"
msgstr "Nextcloud erabiltzaile-izena"
#, fuzzy
msgid "WebDAV password"
msgstr "Ezarri pasahitza"
msgid "Custom TLS certificates"
msgstr ""
@@ -1718,6 +1725,14 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Itemok ezin sinkronizatu"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
"Itemok gailuan geratuko dira baina ez dira sinkronizatuko. Horiek aurkitzeko "
"bilaketak egin titulu edo goiko parentesien arteko IDaren arabera."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Koadernoa ezin gorde daiteke: %s"
@@ -1726,13 +1741,15 @@ msgstr "Koadernoa ezin gorde daiteke: %s"
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Koadernoa ezin gorde daiteke: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Itemok ezin sinkronizatu"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
"Itemok gailuan geratuko dira baina ez dira sinkronizatuko. Horiek aurkitzeko "
"bilaketak egin titulu edo goiko parentesien arteko IDaren arabera."
msgid "Sync status (synced items / total items)"
msgstr "Sinkronizazio egoera (sinkronizatutako itemak/itemak guztira)"
@@ -1854,6 +1871,10 @@ msgstr ""
msgid "Type new tags or select from list"
msgstr ""
#, fuzzy
msgid "More information"
msgstr "Konfigurazioa"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1996,6 +2017,12 @@ msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
msgid "Welcome"
msgstr "Ongi etorri!"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Banatu etiketak koma erabiliaz."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Zenbait item ezin dira deszifratu."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.2\n"
"X-Generator: Poedit 2.2.3\n"
"Plural-Forms: nplurals=2; plural=(n==0 || n==1);\n"
msgid "To delete a tag, untag the associated notes."
@@ -68,7 +68,7 @@ msgstr "کمبود آرگمان در دستور: %s"
#, javascript-format
msgid "%s: %s"
msgstr ""
msgstr "%s: %s"
msgid "Your choice: "
msgstr "انتخاب شما: "
@@ -113,7 +113,7 @@ msgid ""
msgstr ""
msgid "Marks a to-do as done."
msgstr ""
msgstr "علامت زدن فهرست کارها به عنوان انجام شده."
#, javascript-format
msgid "Note is not a to-do: \"%s\""
@@ -182,7 +182,7 @@ msgstr ""
#, javascript-format
msgid "Destination format: %s"
msgstr ""
msgstr "فرمت مقصد: %s"
msgid "Exports only the given note."
msgstr "فقط یادداشت مشخص شده را خروجی بده."
@@ -244,7 +244,7 @@ msgstr "بارگذاری اطلاعات در جاپلین."
#, javascript-format
msgid "Source format: %s"
msgstr ""
msgstr "فرمت مبدا: %s"
msgid "Do not ask for confirmation."
msgstr "برای تایید سوال نکن."
@@ -417,7 +417,7 @@ msgid "Downloading resources..."
msgstr ""
msgid "Cancelling... Please wait."
msgstr ""
msgstr "در حال لغو... لطفا منتظر بمانید."
msgid ""
"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
@@ -449,7 +449,7 @@ msgstr ""
#, javascript-format
msgid "%s %s (%s)"
msgstr ""
msgstr "%s %s (%s)"
msgid "Enum"
msgstr ""
@@ -467,7 +467,7 @@ msgid "Default: %s"
msgstr "پیشفرض: %s"
msgid "Possible keys/values:"
msgstr ""
msgstr "کلید ها یا مقادیر ممکن:"
msgid "Type `joplin help` for usage information."
msgstr ""
@@ -491,7 +491,7 @@ msgid ""
msgstr ""
msgid "Search:"
msgstr ""
msgstr "جستجو:"
msgid ""
"Welcome to Joplin!\n"
@@ -514,16 +514,16 @@ msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr ""
msgid "Sidebar"
msgstr ""
msgstr "نوار کناری"
msgid "Note list"
msgstr ""
msgstr "لیست یادداشت"
msgid "Note title"
msgstr ""
msgstr "موضوع یادداشت"
msgid "Note body"
msgstr ""
msgstr "بدنه ی یادداشت"
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
@@ -540,7 +540,7 @@ msgid "New note"
msgstr "یادداشت جدید"
msgid "New to-do"
msgstr ""
msgstr "فهرست کارهای جدید"
msgid "New notebook"
msgstr "دفترچه جدید"
@@ -577,7 +577,7 @@ msgid "Import"
msgstr "بارگذاری"
msgid "Export"
msgstr ""
msgstr "خروجی"
#, fuzzy
msgid "Synchronise"
@@ -585,7 +585,7 @@ msgstr "سینک کردن"
#, javascript-format
msgid "Hide %s"
msgstr ""
msgstr "پنهان کردن %s"
msgid "Quit"
msgstr "بستن"
@@ -615,7 +615,7 @@ msgid "Italic"
msgstr ""
msgid "Link"
msgstr ""
msgstr "لینک"
msgid "Insert Date Time"
msgstr "وارد کردن تاریخ و ساعت"
@@ -624,10 +624,10 @@ msgid "Edit in external editor"
msgstr "تنظیم ویرایشگر خارجی"
msgid "Search in all the notes"
msgstr ""
msgstr "جستجو در تمام یادداشت ها"
msgid "Search in current note"
msgstr ""
msgstr "جستجو در همین یادداشت"
msgid "&View"
msgstr ""
@@ -642,10 +642,10 @@ msgid "Focus"
msgstr ""
msgid "&Tools"
msgstr ""
msgstr "&ابزارها"
msgid "&Help"
msgstr ""
msgstr "&کمک"
msgid "Website and documentation"
msgstr ""
@@ -653,6 +653,9 @@ msgstr ""
msgid "Make a donation"
msgstr ""
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "باز کردن %s"
@@ -667,7 +670,7 @@ msgid "Cancel"
msgstr "لغو"
msgid "Current version is up-to-date."
msgstr ""
msgstr "ورژن فعلی به‌روز است."
#, javascript-format
msgid "%s (pre-release)"
@@ -743,7 +746,7 @@ msgid "Authorisation token:"
msgstr ""
msgid "Copy token"
msgstr ""
msgstr "کپی کرد توکن"
msgid ""
"This authorisation token is only needed to allow third-party applications to "
@@ -860,10 +863,7 @@ msgid "Notebook title:"
msgstr "موضوع دفترچه:"
msgid "Add or remove tags:"
msgstr "اضافه یا حذف برچسب"
msgid "Separate each tag by a comma."
msgstr "هر برچسب را با ویرگول شده کنید."
msgstr "اضافه یا حذف برچسب:"
msgid "Rename notebook:"
msgstr "تغییر نام دفترچه:"
@@ -886,8 +886,9 @@ msgstr ""
msgid "View them now"
msgstr ""
msgid "Some items cannot be decrypted."
msgstr ""
#, fuzzy
msgid "One or more master keys need a password."
msgstr "رمز اصلی را وارد کنید:"
msgid "Set the password"
msgstr ""
@@ -898,28 +899,30 @@ msgstr ""
msgid ""
"There is currently no notebook. Create one by clicking on \"New notebook\"."
msgstr ""
"در حال حاظر هیچ یادداشتی وجود ندارد. با کلیک بر روی «یادداشت جدید» یک "
"یادداشت جدید ایجاد کنید."
msgid "Location"
msgstr ""
msgstr "مکان"
msgid "URL"
msgstr ""
msgid "Note History"
msgstr ""
msgstr "تاریخچه ی یادداشت"
msgid "Previous versions of this note"
msgstr ""
msgid "Note properties"
msgstr ""
msgstr "جزییات یادداشت"
#, javascript-format
msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
msgstr ""
msgid "This note has no history"
msgstr ""
msgstr "این یادداشت هیچ تاریخچه ای ندارد"
msgid "Restore"
msgstr "بازگرداندن"
@@ -968,24 +971,25 @@ msgstr ""
msgid "emphasized text"
msgstr ""
#, fuzzy
msgid "List item"
msgstr ""
msgstr "لیست"
msgid "Insert Hyperlink"
msgstr ""
msgstr "وارد کردن لینک"
msgid "Attach file"
msgstr ""
msgstr "پیوست فایل"
msgid "Tags"
msgstr ""
msgstr "برچسب‌ها"
msgid "Set alarm"
msgstr ""
#, javascript-format
msgid "In: %s"
msgstr ""
msgstr "در: %s"
msgid "Hyperlink"
msgstr "لینک"
@@ -993,32 +997,36 @@ msgstr "لینک"
msgid "Code"
msgstr "کد"
#, fuzzy
msgid "Numbered List"
msgstr ""
msgstr "لیست ترتیبی"
#, fuzzy
msgid "Bulleted List"
msgstr ""
msgstr "لیست بدون ترتیب"
#, fuzzy
msgid "Checkbox"
msgstr ""
msgstr "گزینه (چک‌باکس)"
msgid "Heading"
msgstr ""
msgid "Horizontal Rule"
msgstr ""
msgstr "خط افقی"
#, fuzzy
msgid "Click to stop external editing"
msgstr ""
msgstr "کلیک کنید تا ویرایشگر خارجی را متوقف کنید"
msgid "Watching..."
msgstr ""
msgid "to-do"
msgstr ""
msgstr "فهرست کارها"
msgid "note"
msgstr ""
msgstr "یادداشت"
#, javascript-format
msgid "Creating new %s..."
@@ -1027,8 +1035,9 @@ msgstr ""
msgid "Refresh"
msgstr ""
#, fuzzy
msgid "Clear"
msgstr ""
msgstr "پاک"
msgid "OneDrive Login"
msgstr "ورود به OneDrive"
@@ -1046,7 +1055,7 @@ msgid "Encryption Options"
msgstr "گزینه های رمزنگاری"
msgid "Clipper Options"
msgstr ""
msgstr "تنظیمات کلیپر"
#, javascript-format
msgid ""
@@ -1060,7 +1069,7 @@ msgid "Remove tag \"%s\" from all notes?"
msgstr ""
msgid "Remove this search from the sidebar?"
msgstr ""
msgstr "این جستجو را از نواک کناری حذف شود؟"
msgid "Delete"
msgstr "پاک کردن"
@@ -1077,11 +1086,14 @@ msgstr ""
#, fuzzy, javascript-format
msgid "Fetching resources: %d/%d"
msgstr "منابع: %d."
msgstr "آیتم های دریافت شده: %d از %d"
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr ""
@@ -1106,11 +1118,11 @@ msgstr "کپی کردن لینک Markdown"
#, javascript-format
msgid "Delete note \"%s\"?"
msgstr ""
msgstr "یادداشت «%s» پاک شود؟"
#, javascript-format
msgid "Delete these %d notes?"
msgstr ""
msgstr "تعداد %d یادداشت پاک شود؟"
msgid ""
"Type a note title to jump to it. Or type # followed by a tag name, or @ "
@@ -1122,7 +1134,7 @@ msgstr "رفنت به هر چیزی..."
#, javascript-format
msgid "Usage: %s"
msgstr ""
msgstr "کارکرد: %s"
#, javascript-format
msgid "Unknown flag: %s"
@@ -1201,14 +1213,14 @@ msgstr ""
#, javascript-format
msgid "Fetched items: %d/%d."
msgstr ""
msgstr "آیتم های دریافت شده: %d از %d"
msgid "Cancelling..."
msgstr "در حال لغو..."
#, javascript-format
msgid "Completed: %s"
msgstr ""
msgstr "کامل شد: %s"
#, javascript-format
msgid "Last error: %s"
@@ -1222,7 +1234,7 @@ msgstr "درحال انجام"
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr ""
msgstr "سینک کردن در حال انجام است. وضعیت: %s"
msgid ""
"Unknown item type downloaded - please upgrade Joplin to the latest version"
@@ -1245,11 +1257,11 @@ msgid "Conflicts"
msgstr "تداخل ها"
msgid "Cannot move notebook to this location"
msgstr ""
msgstr "دفترچه را نمیتوان به این مکان انتقال داد"
#, javascript-format
msgid "Notebooks cannot be named \"%s\", which is a reserved title."
msgstr ""
msgstr "دفترچه نمیتوان نام «%s» داشته باشد، این نام رزرو شده."
msgid "created date"
msgstr "تاریخ ایجاد"
@@ -1259,11 +1271,11 @@ msgstr ""
#, javascript-format
msgid "Cannot copy note to \"%s\" notebook"
msgstr ""
msgstr "نمیتوان یادداشت را به دفترچه ی «%s» کپی کرد"
#, javascript-format
msgid "Cannot move note to \"%s\" notebook"
msgstr ""
msgstr "نمیتوان یادداشت را به دفترچه ی «%s» انتقال داد"
#, javascript-format
msgid ""
@@ -1272,14 +1284,65 @@ msgid ""
"more details: %s"
msgstr ""
#, fuzzy
msgid "Synchronisation target"
msgstr "هدف سینک"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr ""
msgid "Nextcloud WebDAV URL"
msgstr "آدرس Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "نام کاربری Nextcloud"
msgid "Nextcloud password"
msgstr "رمز Nextcloud"
msgid "WebDAV URL"
msgstr "آدرس WebDAV"
msgid "WebDAV username"
msgstr "نام کاربری WebDAV"
msgid "WebDAV password"
msgstr "رمز WebDAV"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr "همیشه"
msgid "Manual"
msgstr "دستی"
msgid "Auto"
msgstr "خودکار"
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "زبان"
msgid "Date format"
msgstr ""
msgstr "فرمت تاریخ"
msgid "Time format"
msgstr ""
msgstr "فرمت ساعت"
msgid "Theme"
msgstr ""
@@ -1333,7 +1396,7 @@ msgid "Enable footnotes"
msgstr "فعال سازی پاورقی"
msgid "Enable table of contents extension"
msgstr ""
msgstr "فعال کردن افزونه ی لیست مطالب"
msgid "Enable ~sub~ syntax"
msgstr ""
@@ -1410,8 +1473,9 @@ msgstr "%d ساعت"
msgid "%d hours"
msgstr "%d ساعت"
#, fuzzy
msgid "Text editor command"
msgstr ""
msgstr "دستور ویراستار متنی"
msgid ""
"The editor command (may include arguments) that will be used to open a note. "
@@ -1421,54 +1485,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "نمایش گزینه های پیشرفته"
#, fuzzy
msgid "Synchronisation target"
msgstr "هدف سینک"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr ""
msgid "Nextcloud WebDAV URL"
msgstr "آدرس Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "نام کاربری Nextcloud"
msgid "Nextcloud password"
msgstr "رمز Nextcloud"
msgid "WebDAV URL"
msgstr "آدرس WebDAV"
msgid "WebDAV username"
msgstr "نام کاربری WebDAV"
msgid "WebDAV password"
msgstr "رمز WebDAV"
msgid "Custom TLS certificates"
msgstr ""
@@ -1486,21 +1502,21 @@ msgid "Enable note history"
msgstr "فعال سایز ثبت تاریخچه ی یادداشت"
msgid "days"
msgstr ""
msgstr "روز"
#, javascript-format
msgid "%d days"
msgstr ""
msgstr "%d روز"
msgid "Keep note history for"
msgstr ""
msgstr "تاریخچه ی یادداشت را نگه دار به مدت"
#, javascript-format
msgid "Invalid option value: \"%s\". Possible values are: %s."
msgstr ""
msgid "General"
msgstr ""
msgstr "کلی"
msgid "Synchronisation"
msgstr ""
@@ -1519,22 +1535,22 @@ msgstr "نرم‌افزار"
#, javascript-format
msgid "The tag \"%s\" already exists. Please choose a different name."
msgstr ""
msgstr "برچسب «%s» وجود دارد. لطفا نام دیگری انتخاب کنی"
msgid "Joplin Export File"
msgstr ""
msgstr "فایل خروجی Joplin"
msgid "Markdown"
msgstr ""
msgid "Joplin Export Directory"
msgstr ""
msgstr "فولدر خروجی Joplin"
msgid "Evernote Export File"
msgstr ""
msgstr "فولدر خروجی Evernote"
msgid "Json Export Directory"
msgstr ""
msgstr "فولدر خروجی JSON"
msgid "File"
msgstr "فایل"
@@ -1568,6 +1584,12 @@ msgstr "یادداشت های بازیابی شده"
msgid "Items that cannot be synchronised"
msgstr ""
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr ""
@@ -1576,10 +1598,13 @@ msgstr ""
msgid "Item \"%s\" could not be downloaded: %s"
msgstr ""
msgid "Items that cannot be decrypted"
msgstr ""
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
@@ -1591,7 +1616,7 @@ msgstr ""
#, javascript-format
msgid "Total: %d/%d"
msgstr ""
msgstr "مجموع: %d از %d"
#, javascript-format
msgid "Conflicted: %d"
@@ -1634,10 +1659,10 @@ msgid "Export Debug Report"
msgstr ""
msgid "Encryption Config"
msgstr ""
msgstr "تنظیمات رمزنگاری"
msgid "Configuration"
msgstr "تینظیمات"
msgstr "تنظیمات"
msgid "Move to notebook..."
msgstr "انتقال به دفترچه..."
@@ -1656,7 +1681,7 @@ msgid "Save alarm"
msgstr ""
msgid "Select date"
msgstr ""
msgstr "انتخاب تاریخ"
msgid "Confirm"
msgstr "تایید"
@@ -1670,7 +1695,7 @@ msgid "Checking... Please wait."
msgstr "در حال چک کرد... لطفا صبر کنید."
msgid "Success! Synchronisation configuration appears to be correct."
msgstr ""
msgstr "موفقیت! تنظیمات سینک به نظر صحیح است."
msgid ""
"Error. Please check that URL, username, password, etc. are correct and that "
@@ -1691,7 +1716,7 @@ msgstr ""
#, javascript-format
msgid "Decrypted items: %s / %s"
msgstr ""
msgstr "موارد رمزگشایی شده: %s از %s"
msgid "New tags:"
msgstr "برچسب جدید:"
@@ -1699,6 +1724,10 @@ msgstr "برچسب جدید:"
msgid "Type new tags or select from list"
msgstr ""
#, fuzzy
msgid "More information"
msgstr "تنظیمات"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1716,29 +1745,29 @@ msgid "- Location: to allow attaching geo-location information to a note."
msgstr ""
msgid "Joplin website"
msgstr "سایت جاپلین"
msgstr "سایت Joplin"
#, javascript-format
msgid "Database v%s"
msgstr ""
msgstr "پایگاه داده ورژن %s"
#, javascript-format
msgid "FTS enabled: %d"
msgstr ""
msgid "Login with Dropbox"
msgstr ""
msgstr "ورود با Dropbox"
msgid "Enter code here"
msgstr "کد را اینجا وارد کنید"
#, javascript-format
#, fuzzy, javascript-format
msgid "Master Key %s"
msgstr ""
msgstr "رمز اصلی %s"
#, javascript-format
msgid "Created: %s"
msgstr ""
msgstr "ایجاد شده: %s"
msgid "Password:"
msgstr "رمز:"
@@ -1799,13 +1828,15 @@ msgid "Convert to note"
msgstr "تبدیل به یادداشت"
msgid "Convert to todo"
msgstr ""
msgstr "تبدیل به فهرست کارها"
#, fuzzy
msgid "Hide metadata"
msgstr ""
msgstr "پنهان کردن متادیتا"
#, fuzzy
msgid "Show metadata"
msgstr ""
msgstr "نمایش متادیتا"
msgid "View on map"
msgstr "نمایش بر روی نقشه"
@@ -1817,7 +1848,7 @@ msgid "Edit"
msgstr "ویرایش"
msgid "Delete notebook"
msgstr ""
msgstr "پاک کردن دفترچه"
msgid "Login with OneDrive"
msgstr "ورود با OneDrive"
@@ -1832,6 +1863,11 @@ msgstr ""
msgid "You currently have no notebook. Create one by clicking on (+) button."
msgstr ""
"شما هیچ دفترچه ای ندارید. با کلیک کردن بر روی (+) یک دفترچه ی جدید ایجاد "
"کنید."
msgid "Welcome"
msgstr ""
msgstr "خوش آمدید"
#~ msgid "Separate each tag by a comma."
#~ msgstr "هر برچسب را با ویرگول شده کنید."

View File

@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.1\n"
"X-Generator: Poedit 2.0.3\n"
msgid "To delete a tag, untag the associated notes."
msgstr "Pour supprimer une vignette, enlever là des notes associées."
@@ -722,6 +722,9 @@ msgstr "Documentation en ligne"
msgid "Make a donation"
msgstr "Faire un don"
msgid "Toggle development tools"
msgstr "Monter/Cacher les outils de développement"
#, javascript-format
msgid "Open %s"
msgstr "Ouvrir %s"
@@ -959,9 +962,6 @@ msgstr "Titre du carnet :"
msgid "Add or remove tags:"
msgstr "Modifier les étiquettes :"
msgid "Separate each tag by a comma."
msgstr "Séparez chaque étiquette par une virgule."
msgid "Rename notebook:"
msgstr "Renommer le carnet :"
@@ -983,8 +983,8 @@ msgstr "Certains objets ne peuvent être synchronisés."
msgid "View them now"
msgstr "Les voir maintenant"
msgid "Some items cannot be decrypted."
msgstr "Certains objets ne peuvent être déchiffrés."
msgid "One or more master keys need a password."
msgstr "L'une des clefs maîtres requiert un mot de passe :"
msgid "Set the password"
msgstr "Définir le mot de passe"
@@ -1193,6 +1193,9 @@ msgid "Please select where the sync status should be exported to"
msgstr ""
"Veuillez sélectionner un répertoire ou exporter l'état de la synchronisation"
msgid "Retry"
msgstr "Réessayer"
msgid "Add or remove tags"
msgstr "Gérer les étiquettes"
@@ -1395,6 +1398,63 @@ msgstr ""
"de synchroniser, sinon tous les fichiers seront supprimés ! Consulter la FAQ "
"pour plus de détails : %s"
msgid "Synchronisation target"
msgstr "Cible de la synchronisation"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"La cible avec laquelle synchroniser. Chaque cible de synchronisation peut "
"avoir des paramètres supplémentaires sous le nom `sync.NUM.NOM` (documentés "
"ci-dessous)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Répertoire avec lequel synchroniser (chemin absolu)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud : URL WebDAV"
msgid "Nextcloud username"
msgstr "Nextcloud : Nom utilisateur"
msgid "Nextcloud password"
msgstr "Nextcloud : Mot de passe"
msgid "WebDAV URL"
msgstr "WebDAV : URL"
msgid "WebDAV username"
msgstr "WebDAV : Nom utilisateur"
msgid "WebDAV password"
msgstr "WebDAV : Mot de passe"
msgid "Attachment download behaviour"
msgstr "Téléchargement des ressources"
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
"En mode \"manuel\", les ressources sont téléchargées uniquement lorsque vous "
"cliquez dessus. En mode \"auto\", elle sont téléchargée lorsque vous ouvrez "
"la note. En mode \"toujours\", toutes les ressources sont téléchargées, que "
"vous ayez ouvert la note ou pas."
msgid "Always"
msgstr "Toujours"
msgid "Manual"
msgstr "Manuel"
msgid "Auto"
msgstr "Auto"
msgid "Max concurrent connections"
msgstr "Nombre maxi de connections simultanées"
msgid "Language"
msgstr "Langue"
@@ -1552,60 +1612,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Montrer les options avancées"
msgid "Synchronisation target"
msgstr "Cible de la synchronisation"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"La cible avec laquelle synchroniser. Chaque cible de synchronisation peut "
"avoir des paramètres supplémentaires sous le nom `sync.NUM.NOM` (documentés "
"ci-dessous)."
msgid "Attachment download behaviour"
msgstr "Téléchargement des ressources"
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
"En mode \"manuel\", les ressources sont téléchargées uniquement lorsque vous "
"cliquez dessus. En mode \"auto\", elle sont téléchargée lorsque vous ouvrez "
"la note. En mode \"toujours\", toutes les ressources sont téléchargées, que "
"vous ayez ouvert la note ou pas."
msgid "Always"
msgstr "Toujours"
msgid "Manual"
msgstr "Manuel"
msgid "Auto"
msgstr "Auto"
msgid "Directory to synchronise with (absolute path)"
msgstr "Répertoire avec lequel synchroniser (chemin absolu)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud : URL WebDAV"
msgid "Nextcloud username"
msgstr "Nextcloud : Nom utilisateur"
msgid "Nextcloud password"
msgstr "Nextcloud : Mot de passe"
msgid "WebDAV URL"
msgstr "WebDAV : URL"
msgid "WebDAV username"
msgstr "WebDAV : Nom utilisateur"
msgid "WebDAV password"
msgstr "WebDAV : Mot de passe"
msgid "Custom TLS certificates"
msgstr "Certificats TLS personnalisés"
@@ -1712,14 +1718,6 @@ msgstr "Notes restaurées"
msgid "Items that cannot be synchronised"
msgstr "Objets qui ne peuvent pas être synchronisés"
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) n'a pas pu être envoyé : %s"
#, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "L'objet \"%s\" n'a pas pu être téléchargé : %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1729,6 +1727,26 @@ msgstr ""
"de la synchronisation. Pour trouver ces objets, faite une recherche sur le "
"titre ou l'identifiant de l'objet (affiché ci-dessus entre parenthèses)."
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) n'a pas pu être envoyé : %s"
#, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "L'objet \"%s\" n'a pas pu être téléchargé : %s"
msgid "Items that cannot be decrypted"
msgstr "Objets qui ne peuvent pas être déchiffrés"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
"Joplin n'a pas pu déchiffrer ces objets à plusieurs reprises, peut-être "
"parce qu'ils sont corrompus ou trop larges. Ces objets vont rester sur "
"l'appareil mais Joplin n'essayera plus de les déchiffrer."
msgid "Sync status (synced items / total items)"
msgstr "Status de la synchronisation (objets synchro. / total)"
@@ -1853,6 +1871,9 @@ msgstr "Nouvelles étiquettes :"
msgid "Type new tags or select from list"
msgstr "Entrez de nouvelles étiquettes ou sélectionnez de la liste"
msgid "More information"
msgstr "Plus d'information"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -2001,6 +2022,12 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenue"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Séparez chaque étiquette par une virgule."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Certains objets ne peuvent être déchiffrés."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s) : %s"

View File

@@ -725,6 +725,9 @@ msgstr "Sitio web e documentación"
msgid "Make a donation"
msgstr "Doar"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Abrir %s"
@@ -948,9 +951,6 @@ msgstr "Título do caderno:"
msgid "Add or remove tags:"
msgstr "Engadir ou eliminar etiquetas:"
msgid "Separate each tag by a comma."
msgstr "Separar cada etiqueta por unha coma."
msgid "Rename notebook:"
msgstr "Renomear caderno:"
@@ -973,8 +973,9 @@ msgstr "Non é posíbel sincronizar algúns elementos."
msgid "View them now"
msgstr "Visualizar agora"
msgid "Some items cannot be decrypted."
msgstr "Non é posíbel descifrar algúns elementos."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Introducir contrasinal mestre:"
msgid "Set the password"
msgstr "Estabelecer un contrasinal"
@@ -1176,6 +1177,9 @@ msgstr "Recursos: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Seleccione onde exportar o estado da sincronización"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Engadir ou eliminar etiquetas"
@@ -1381,6 +1385,58 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Destino da sincronización"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Destino co que sincronizar. Cada destino da sincronización pode ter "
"parámetros adicionais que se chaman «sync.NUM.NAME» (documentados arriba)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Cartafol a sincronizar con (ruta absoluta)"
msgid "Nextcloud WebDAV URL"
msgstr "URL de Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "Usuario de Nextcloud"
msgid "Nextcloud password"
msgstr "Contrasinal do Nextcloud"
msgid "WebDAV URL"
msgstr "URL do WebDAV"
msgid "WebDAV username"
msgstr "Usuario de WebDAV"
msgid "WebDAV password"
msgstr "Contrasinal do WebDAV"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Idioma"
@@ -1541,55 +1597,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Mostrar opcións avanzadas"
msgid "Synchronisation target"
msgstr "Destino da sincronización"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Destino co que sincronizar. Cada destino da sincronización pode ter "
"parámetros adicionais que se chaman «sync.NUM.NAME» (documentados arriba)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Cartafol a sincronizar con (ruta absoluta)"
msgid "Nextcloud WebDAV URL"
msgstr "URL de Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "Usuario de Nextcloud"
msgid "Nextcloud password"
msgstr "Contrasinal do Nextcloud"
msgid "WebDAV URL"
msgstr "URL do WebDAV"
msgid "WebDAV username"
msgstr "Usuario de WebDAV"
msgid "WebDAV password"
msgstr "Contrasinal do WebDAV"
msgid "Custom TLS certificates"
msgstr ""
@@ -1697,14 +1704,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Elementos que non se poden sincronizar"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Non foi posíbel gardar o caderno: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Non foi posíbel gardar o caderno: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1714,6 +1713,24 @@ msgstr ""
"de sincronización. Co fin de atopar estes elementos pode buscalos polo "
"título ou polo ID (mostrados entre corchetes arriba)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Non foi posíbel gardar o caderno: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Non foi posíbel gardar o caderno: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Elementos que non se poden sincronizar"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Estado da sincronización (elementos sincronizados / elementos totais)"
@@ -1834,6 +1851,10 @@ msgstr "Etiquetas novas:"
msgid "Type new tags or select from list"
msgstr "Escriba etiquetas novas ou seleccione da lista"
#, fuzzy
msgid "More information"
msgstr "Configuración"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1975,6 +1996,12 @@ msgstr "Non ten cadernos actualmente. Cree un premendo no botón (+)."
msgid "Welcome"
msgstr "Benvido/a"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separar cada etiqueta por unha coma."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Non é posíbel descifrar algúns elementos."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -730,6 +730,9 @@ msgstr "Website i dokumentacija"
msgid "Make a donation"
msgstr "Website i dokumentacija"
msgid "Toggle development tools"
msgstr ""
#, fuzzy, javascript-format
msgid "Open %s"
msgstr "On %s: %s"
@@ -944,9 +947,6 @@ msgstr "Naslov bilježnice:"
msgid "Add or remove tags:"
msgstr "Dodaj ili makni oznake:"
msgid "Separate each tag by a comma."
msgstr "Odvoji oznake zarezom."
msgid "Rename notebook:"
msgstr "Preimenuj bilježnicu:"
@@ -970,9 +970,8 @@ msgstr "Neke stavke se ne mogu sinkronizirati."
msgid "View them now"
msgstr "Pogledaj ih sada"
#, fuzzy
msgid "Some items cannot be decrypted."
msgstr "Neke stavke se ne mogu sinkronizirati."
msgid "One or more master keys need a password."
msgstr ""
msgid "Set the password"
msgstr ""
@@ -1175,6 +1174,9 @@ msgstr "Resursi: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Dodaj ili makni oznake"
@@ -1378,6 +1380,56 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Sinkroniziraj sa"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Direktorij za sinkroniziranje (apsolutna putanja)"
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
msgid "Nextcloud password"
msgstr ""
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
msgid "WebDAV password"
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Jezik"
@@ -1539,53 +1591,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Prikaži napredne opcije"
msgid "Synchronisation target"
msgstr "Sinkroniziraj sa"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Direktorij za sinkroniziranje (apsolutna putanja)"
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
msgid "Nextcloud password"
msgstr ""
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
msgid "WebDAV password"
msgstr ""
msgid "Custom TLS certificates"
msgstr ""
@@ -1694,6 +1699,12 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Stavke koje se ne mogu sinkronizirati"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Bilježnicu nije moguće snimiti: %s"
@@ -1702,10 +1713,14 @@ msgstr "Bilježnicu nije moguće snimiti: %s"
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Bilježnicu nije moguće snimiti: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Stavke koje se ne mogu sinkronizirati"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
@@ -1828,6 +1843,10 @@ msgstr ""
msgid "Type new tags or select from list"
msgstr ""
#, fuzzy
msgid "More information"
msgstr "Konfiguracija"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1971,6 +1990,13 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
msgid "Welcome"
msgstr "Dobro došli"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Odvoji oznake zarezom."
#, fuzzy
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Neke stavke se ne mogu sinkronizirati."
#, fuzzy
#~ msgid "%s (%s): %s"
#~ msgstr "%s %s (%s)"

View File

@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2\n"
"X-Generator: Poedit 2.2.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "To delete a tag, untag the associated notes."
@@ -591,18 +591,16 @@ msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr "Esportazione da \"%s\" come formato \"%s\". Si prega di attendere..."
msgid "Sidebar"
msgstr ""
msgstr "Barra laterale"
msgid "Note list"
msgstr ""
msgstr "Lista delle note"
#, fuzzy
msgid "Note title"
msgstr "Titolo del Taccuino:"
msgstr "Titolo della nota"
#, fuzzy
msgid "Note body"
msgstr "Taccuini"
msgstr "Corpo della nota"
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
@@ -639,18 +637,17 @@ msgstr "Opzioni Web Clipper"
msgid "%s %s (%s, %s)"
msgstr "%s %s (%s, %s)"
#, fuzzy
msgid "&File"
msgstr "File"
msgstr "&File"
msgid "About Joplin"
msgstr "Informazione su Joplin"
msgid "Preferences..."
msgstr ""
msgstr "Preferenze..."
msgid "Check for updates..."
msgstr "Controlla aggiornamenti ..."
msgstr "Controlla aggiornamenti..."
msgid "Import"
msgstr "Importa"
@@ -669,11 +666,10 @@ msgid "Quit"
msgstr "Esci"
msgid "Close Window"
msgstr ""
msgstr "Chiudi finestra"
#, fuzzy
msgid "&Edit"
msgstr "Modifica"
msgstr "&Modifica"
msgid "Copy"
msgstr "Copia"
@@ -694,7 +690,7 @@ msgid "Italic"
msgstr "Corsivo"
msgid "Link"
msgstr ""
msgstr "Link"
msgid "Insert Date Time"
msgstr "Inserisci data e ora"
@@ -708,9 +704,8 @@ msgstr "Cerca in tutte le note"
msgid "Search in current note"
msgstr "Cerca nella nota corrente"
#, fuzzy
msgid "&View"
msgstr "Vista"
msgstr "&Vista"
msgid "Toggle sidebar"
msgstr "Attiva / disattiva barra laterale"
@@ -718,17 +713,14 @@ msgstr "Attiva / disattiva barra laterale"
msgid "Toggle editor layout"
msgstr "Attiva / disattiva il layout dell'editor"
#, fuzzy
msgid "Focus"
msgstr "Focus sul testo"
msgstr "Focus"
#, fuzzy
msgid "&Tools"
msgstr "Strumenti"
msgstr "&Strumenti"
#, fuzzy
msgid "&Help"
msgstr "Aiuto"
msgstr "&Aiuto"
msgid "Website and documentation"
msgstr "Sito web e documentazione"
@@ -736,6 +728,9 @@ msgstr "Sito web e documentazione"
msgid "Make a donation"
msgstr "Fai una donazione"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Aprire %s"
@@ -761,11 +756,11 @@ msgstr "È disponibile un aggiornamento, vuoi scaricarlo ora?"
#, javascript-format
msgid "Your version: %s"
msgstr ""
msgstr "Tua versione: %s"
#, javascript-format
msgid "New version: %s"
msgstr ""
msgstr "Nuova versione: %s"
msgid "Yes"
msgstr "Sì"
@@ -774,7 +769,7 @@ msgid "No"
msgstr "No"
msgid "Token has been copied to the clipboard!"
msgstr ""
msgstr "Il token è stato copiato negli appunti!"
msgid "The web clipper service is enabled and set to auto-start."
msgstr ""
@@ -825,20 +820,21 @@ msgstr "Passaggio 2: installare l'estensione"
msgid "Download and install the relevant extension for your browser:"
msgstr "Scarica e installa l'estensione adatta per il tuo browser:"
#, fuzzy
msgid "Advanced options"
msgstr "Mostra opzioni avanzate"
msgstr "Opzioni avanzate"
msgid "Authorisation token:"
msgstr ""
msgstr "Token autorizzativo:"
msgid "Copy token"
msgstr ""
msgstr "Copia token"
msgid ""
"This authorisation token is only needed to allow third-party applications to "
"access Joplin."
msgstr ""
"Il token autorizzativo è necessario solo per permettere ad applicazioni di "
"terze parti di accedere a Joplin."
#, javascript-format
msgid "Notes and settings are stored in: %s"
@@ -848,7 +844,7 @@ msgid "Check synchronisation configuration"
msgstr "Controlla la configurazione della sincronizzazione"
msgid "Browse..."
msgstr ""
msgstr "Naviga..."
msgid "Apply"
msgstr "Applica"
@@ -945,9 +941,8 @@ msgstr "Stato"
msgid "Encryption is:"
msgstr "La crittografia è:"
#, fuzzy
msgid "Usage"
msgstr "Uso: %s"
msgstr "Uso"
msgid "Back"
msgstr "Indietro"
@@ -969,9 +964,6 @@ msgstr "Titolo del Taccuino:"
msgid "Add or remove tags:"
msgstr "Aggiungi or rimuovi etichetta:"
msgid "Separate each tag by a comma."
msgstr "Separa ogni etichetta da una virgola."
msgid "Rename notebook:"
msgstr "Rinomina il Taccuino:"
@@ -993,8 +985,9 @@ msgstr "Alcuni elementi non possono essere sincronizzati."
msgid "View them now"
msgstr "Mostrali ora"
msgid "Some items cannot be decrypted."
msgstr "Alcuni elementi non possono essere decodificati."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Inserisci password principale:"
msgid "Set the password"
msgstr "Imposta la password"
@@ -1009,40 +1002,41 @@ msgstr ""
"\"."
msgid "Location"
msgstr ""
msgstr "Posizione"
msgid "URL"
msgstr ""
msgstr "URL"
#, fuzzy
msgid "Note History"
msgstr "Taccuini"
msgstr "Cronologia nota"
msgid "Previous versions of this note"
msgstr ""
msgstr "Versione precedente di questa nota"
msgid "Note properties"
msgstr ""
msgstr "Proprietà della nota"
#, javascript-format
msgid "The note \"%s\" has been successfully restored to the notebook \"%s\"."
msgstr ""
msgstr "La nota \"%s\" è stata ripristinata con successo nel taccuino \"%s\"."
#, fuzzy
msgid "This note has no history"
msgstr "Questa note è stata modificata:"
msgstr "Questa nota non ha cronologia"
msgid "Restore"
msgstr ""
msgstr "Ripristina"
#, javascript-format
msgid ""
"Click \"%s\" to restore the note. It will be copied in the notebook named "
"\"%s\". The current version of the note will not be replaced or modified."
msgstr ""
"Clicca \"%s\" per ripristinare la nota. Verrà copiata nel taccuino "
"denominato \"%s\". La versione corrente della nota non verrà sostituita o "
"modificata."
msgid "Open..."
msgstr "Apri ..."
msgstr "Apri..."
#, javascript-format
msgid "This file could not be opened: %s"
@@ -1073,7 +1067,7 @@ msgstr ""
"modificare la nota."
msgid "Only one note can be printed or exported to PDF at a time."
msgstr ""
msgstr "Solo una nota alla volta può essere stampata o esportata come PDF."
msgid "strong text"
msgstr "Testo grasseto"
@@ -1127,12 +1121,11 @@ msgstr "Fare clic per interrompere le modifiche esterne"
msgid "Watching..."
msgstr "Osservare..."
#, fuzzy
msgid "to-do"
msgstr "Nuovo \"Cose-da-fare\""
msgstr "\"Cose-da-fare\""
msgid "note"
msgstr "Nota"
msgstr "nota"
#, javascript-format
msgid "Creating new %s..."
@@ -1162,18 +1155,19 @@ msgstr "Opzioni di crittografia"
msgid "Clipper Options"
msgstr "Opzioni Clipper"
#, fuzzy, javascript-format
#, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Eliminare taccuino? Anche tutte le note e cartelle di questo taccuino "
"saranno cancellati."
"Eliminare taccuino \"%s\"?\n"
"\n"
"Anche tutte le note e cartelle di questo taccuino saranno cancellati."
#, fuzzy, javascript-format
#, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Rimuovere questa etichetta da tutte le note?"
msgstr "Rimuovere l’etichetta \"%s\" da tutte le note?"
msgid "Remove this search from the sidebar?"
msgstr "Rimuovere questa ricerca dalla barra laterale?"
@@ -1198,6 +1192,9 @@ msgstr "Risorse: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Aggiungi o rimuovi etichetta"
@@ -1220,13 +1217,13 @@ msgstr "Converti in \"Cose-da-fare\""
msgid "Copy Markdown link"
msgstr "Copia il link Markdown"
#, fuzzy, javascript-format
#, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Eliminare il taccuino \"%s\"?"
msgstr "Eliminare la nota \"%s\"?"
#, fuzzy, javascript-format
#, javascript-format
msgid "Delete these %d notes?"
msgstr "Cancellare queste note?"
msgstr "Cancellare queste %d note?"
msgid ""
"Type a note title to jump to it. Or type # followed by a tag name, or @ "
@@ -1359,10 +1356,10 @@ msgid "Encrypted items cannot be modified"
msgstr "Gli elementi crittografati non possono essere modificati"
msgid "title"
msgstr "Titolo"
msgstr "titolo"
msgid "updated date"
msgstr "Data di aggiornamento"
msgstr "data di aggiornamento"
msgid "Conflicts"
msgstr "Conflitti"
@@ -1375,7 +1372,7 @@ msgid "Notebooks cannot be named \"%s\", which is a reserved title."
msgstr "I blocchi non possono essere chiamati \"%s\". È un titolo riservato."
msgid "created date"
msgstr "Data di creazione"
msgstr "data di creazione"
msgid "This note does not have geolocation information."
msgstr "Questa nota non ha informazione sulla geolocalizzazione."
@@ -1395,6 +1392,58 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Destinazione di sincronizzazione"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Ogni target di sincronizzazione può avere parametri aggiuntivi denominati "
"come `sync.NUM.NAME` (tutti documentati di seguito)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Cartella da sincronizzare con (percorso assoluto)"
msgid "Nextcloud WebDAV URL"
msgstr "URL Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "Nome Utente Nextcloud"
msgid "Nextcloud password"
msgstr "Password Nextcloud"
msgid "WebDAV URL"
msgstr "URL WebDAV"
msgid "WebDAV username"
msgstr "Nome Utente WebDAV"
msgid "WebDAV password"
msgstr "Password WebDAV"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr "Sempre"
msgid "Manual"
msgstr "Manuale"
msgid "Auto"
msgstr "Auto"
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Linguaggio"
@@ -1425,9 +1474,8 @@ msgstr "Ordina le note per"
msgid "Reverse sort order"
msgstr "Inverti l'ordine"
#, fuzzy
msgid "Sort notebooks by"
msgstr "Ordina le note per"
msgstr "Ordina i taccuini per"
msgid "Save geo-location with notes"
msgstr "Salva geolocalizzazione con le note"
@@ -1447,15 +1495,14 @@ msgstr "Quando si crea una nuova nota:"
msgid "Enable soft breaks"
msgstr ""
#, fuzzy
msgid "Enable math expressions"
msgstr "Attiva Crittografia"
msgstr "Attiva espressioni matematiche"
msgid "Enable ==mark== syntax"
msgstr ""
msgid "Enable footnotes"
msgstr ""
msgstr "Attiva note a piè pagina"
msgid "Enable table of contents extension"
msgstr ""
@@ -1555,55 +1602,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Mostra opzioni avanzate"
msgid "Synchronisation target"
msgstr "Destinazione di sincronizzazione"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Ogni target di sincronizzazione può avere parametri aggiuntivi denominati "
"come `sync.NUM.NAME` (tutti documentati di seguito)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Cartella da sincronizzare con (percorso assoluto)"
msgid "Nextcloud WebDAV URL"
msgstr "URL Nextcloud WebDAV"
msgid "Nextcloud username"
msgstr "Nome Utente Nextcloud"
msgid "Nextcloud password"
msgstr "Password Nextcloud"
msgid "WebDAV URL"
msgstr "URL WebDAV"
msgid "WebDAV username"
msgstr "Nome Utente WebDAV"
msgid "WebDAV password"
msgstr "Password WebDAV"
msgid "Custom TLS certificates"
msgstr "Certificati TLS personalizzati"
@@ -1622,16 +1620,15 @@ msgstr ""
msgid "Ignore TLS certificate errors"
msgstr "Ignora gli errori del certificato TLS"
#, fuzzy
msgid "Enable note history"
msgstr "Attiva Crittografia"
msgstr "Attiva cronologia della nota"
msgid "days"
msgstr ""
msgstr "giorni"
#, javascript-format
msgid "%d days"
msgstr ""
msgstr "%d giorni"
msgid "Keep note history for"
msgstr ""
@@ -1640,27 +1637,23 @@ msgstr ""
msgid "Invalid option value: \"%s\". Possible values are: %s."
msgstr "Opzione non valida: \"%s\". I valori possibili sono: %s."
#, fuzzy
msgid "General"
msgstr "Opzioni Generali"
msgstr "Generale"
#, fuzzy
msgid "Synchronisation"
msgstr "Stato di sincronizzazione"
msgstr "Sincronizzazione"
msgid "Appearance"
msgstr ""
msgstr "Apparenza"
#, fuzzy
msgid "Note"
msgstr "Taccuini"
msgstr "Nota"
msgid "Plugins"
msgstr ""
#, fuzzy
msgid "Application"
msgstr "Esci dall'applicazione."
msgstr "Applicazione"
#, javascript-format
msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1710,19 +1703,11 @@ msgid "Please specify the notebook where the notes should be imported to."
msgstr "Si prega di specificare il Taccuino in cui importare le note."
msgid "Restored Notes"
msgstr ""
msgstr "Ripristina note"
msgid "Items that cannot be synchronised"
msgstr "Elementi che non possono essere sincronizzati"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Questo file non può essere aperto: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Questo file non può essere aperto: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1732,6 +1717,24 @@ msgstr ""
"destinazione di sincronizzazione. Per trovare questi elementi, cercare il "
"titolo o l'ID (che viene visualizzato tra parentesi qui sopra)."
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) non può essere caricato: %s"
#, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Elemento \"%s\" non può essere scaricato: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Elementi che non possono essere sincronizzati"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Stato di sincronizzazione (Elementi sincronizzati / Elementi totali)"
@@ -1769,7 +1772,7 @@ msgid "Permission to use camera"
msgstr "Permesso di usare la fotocamera"
msgid "Your permission to use your camera is required."
msgstr ""
msgstr "E’ richiesto il permesso di usare la fotocamera."
msgid "There are currently no notes. Create one by clicking on the (+) button."
msgstr "Al momento non ci sono note. Creane una cliccando sul bottone (+)."
@@ -1799,9 +1802,8 @@ msgstr "Spostare le note %d sul Taccuino \"%s\"?"
msgid "Press to set the decryption password."
msgstr "Premere per impostare la password di decrittografia."
#, fuzzy
msgid "Clear alarm"
msgstr "Imposta Allarme"
msgstr "Rimuovi Allarme"
msgid "Save alarm"
msgstr "Salva Allarme"
@@ -1815,22 +1817,20 @@ msgstr "Conferma"
msgid "Cancel synchronisation"
msgstr "Cancella la sincronizzazione"
#, fuzzy
msgid "Checking... Please wait."
msgstr "Cancellazione... Attendere per favore."
msgstr "Controllo... Attendere per favore."
#, fuzzy
msgid "Success! Synchronisation configuration appears to be correct."
msgstr "Controlla la configurazione della sincronizzazione"
msgstr ""
"Successo! La configurazione della sincronizzazione sembra essere corretta."
msgid ""
"Error. Please check that URL, username, password, etc. are correct and that "
"the sync target is accessible. The reported error was:"
msgstr ""
#, fuzzy
msgid "The application has been authorised!"
msgstr "L'applicazione è stata autorizzata con successo."
msgstr "L'applicazione è stata autorizzata con successo!"
#, javascript-format
msgid ""
@@ -1841,9 +1841,9 @@ msgid ""
"Please try again."
msgstr ""
#, fuzzy, javascript-format
#, javascript-format
msgid "Decrypted items: %s / %s"
msgstr "Decrittografia Elementi: %d/%d"
msgstr "Elementi decriptati: %s / %s"
msgid "New tags:"
msgstr "Nuovi tag:"
@@ -1851,6 +1851,10 @@ msgstr "Nuovi tag:"
msgid "Type new tags or select from list"
msgstr "Digita nuovi tag o seleziona dalla lista"
#, fuzzy
msgid "More information"
msgstr "Configurazione"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -2000,6 +2004,12 @@ msgstr ""
msgid "Welcome"
msgstr "Benvenuto"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separa ogni etichetta da una virgola."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Alcuni elementi non possono essere decodificati."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -718,6 +718,9 @@ msgstr "Webサイトとドキュメント"
msgid "Make a donation"
msgstr "寄付する"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "%s を開く"
@@ -949,9 +952,6 @@ msgstr "ノートブックの題名:"
msgid "Add or remove tags:"
msgstr "タグの追加・削除:"
msgid "Separate each tag by a comma."
msgstr "それぞれのタグをカンマ(,)で区切ってください。"
msgid "Rename notebook:"
msgstr "ノートブックの名前を変更:"
@@ -973,8 +973,9 @@ msgstr "いくつかの項目は同期されませんでした。"
msgid "View them now"
msgstr "今すぐ表示"
msgid "Some items cannot be decrypted."
msgstr "いくつかの項目は復号されませんでした。"
#, fuzzy
msgid "One or more master keys need a password."
msgstr "マスターパスワードを入力してください:"
msgid "Set the password"
msgstr "パスワードの設定"
@@ -1175,6 +1176,9 @@ msgstr "取得中のリソース: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "同期状況の出力先を選択してください"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "タグの追加と削除"
@@ -1377,6 +1381,58 @@ msgstr ""
"ておきましょう。そうしないとすべてのファイルが削除されていまいます! 詳しくは"
"次のFAQをご覧ください: %s"
msgid "Synchronisation target"
msgstr "同期先"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"同期する先です。いずれの同期先も `sync.NUM.NAME` のように追加のパラメーターを"
"持つことができるでしょう(すべてのドキュメントは下にあります)。"
msgid "Directory to synchronise with (absolute path)"
msgstr "同期先のディレクトリ(絶対パス)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud ユーザー名"
msgid "Nextcloud password"
msgstr "Nextcloud パスワード"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV ユーザー名"
msgid "WebDAV password"
msgstr "WevDAV パスワード"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "言語"
@@ -1534,55 +1590,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "詳細な設定の表示"
msgid "Synchronisation target"
msgstr "同期先"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"同期する先です。いずれの同期先も `sync.NUM.NAME` のように追加のパラメーターを"
"持つことができるでしょう(すべてのドキュメントは下にあります)。"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "同期先のディレクトリ(絶対パス)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud ユーザー名"
msgid "Nextcloud password"
msgstr "Nextcloud パスワード"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV ユーザー名"
msgid "WebDAV password"
msgstr "WevDAV パスワード"
msgid "Custom TLS certificates"
msgstr "TLS証明書のカスタマイズ"
@@ -1693,14 +1700,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "同期ができなかったアイテム"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "次のファイルは開くことができません:%s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "次のファイルは開くことができません:%s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1710,6 +1709,24 @@ msgstr ""
"のようなアイテムを探すには、タイトルまたはID(上記の括弧内に表示されている)で"
"検索してください。"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "次のファイルは開くことができません:%s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "次のファイルは開くことができません:%s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "同期ができなかったアイテム"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "同期状況 (同期済/総数)"
@@ -1832,6 +1849,10 @@ msgstr "新しいタグ:"
msgid "Type new tags or select from list"
msgstr "新しいタグを入力するか、リストから選択してください"
#, fuzzy
msgid "More information"
msgstr "設定"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1978,6 +1999,12 @@ msgstr ""
msgid "Welcome"
msgstr "ようこそ"
#~ msgid "Separate each tag by a comma."
#~ msgstr "それぞれのタグをカンマ(,)で区切ってください。"
#~ msgid "Some items cannot be decrypted."
#~ msgstr "いくつかの項目は復号されませんでした。"
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -646,6 +646,9 @@ msgstr ""
msgid "Make a donation"
msgstr ""
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr ""
@@ -854,9 +857,6 @@ msgstr ""
msgid "Add or remove tags:"
msgstr ""
msgid "Separate each tag by a comma."
msgstr ""
msgid "Rename notebook:"
msgstr ""
@@ -878,7 +878,7 @@ msgstr ""
msgid "View them now"
msgstr ""
msgid "Some items cannot be decrypted."
msgid "One or more master keys need a password."
msgstr ""
msgid "Set the password"
@@ -1074,6 +1074,9 @@ msgstr ""
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr ""
@@ -1263,6 +1266,56 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr ""
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr ""
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
msgid "Nextcloud password"
msgstr ""
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
msgid "WebDAV password"
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr ""
@@ -1412,53 +1465,6 @@ msgstr ""
msgid "Show advanced options"
msgstr ""
msgid "Synchronisation target"
msgstr ""
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr ""
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
msgid "Nextcloud password"
msgstr ""
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
msgid "WebDAV password"
msgstr ""
msgid "Custom TLS certificates"
msgstr ""
@@ -1558,6 +1564,12 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr ""
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr ""
@@ -1566,10 +1578,13 @@ msgstr ""
msgid "Item \"%s\" could not be downloaded: %s"
msgstr ""
msgid "Items that cannot be decrypted"
msgstr ""
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
@@ -1687,6 +1702,9 @@ msgstr ""
msgid "Type new tags or select from list"
msgstr ""
msgid "More information"
msgstr ""
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"

View File

@@ -715,6 +715,9 @@ msgstr "웹사이트 및 각종 문서"
msgid "Make a donation"
msgstr "기부하기"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "%s 열기"
@@ -943,9 +946,6 @@ msgstr "노트북 제목:"
msgid "Add or remove tags:"
msgstr "태그 추가 및 제거:"
msgid "Separate each tag by a comma."
msgstr "각각의 태그를 쉼표로 구분합니다."
msgid "Rename notebook:"
msgstr "노트북 이름 바꾸기:"
@@ -967,8 +967,9 @@ msgstr "일부 항목들은 동기화할 수 없습니다."
msgid "View them now"
msgstr "지금 보여주기"
msgid "Some items cannot be decrypted."
msgstr "일부 항목들은 암호화할 수 없습니다."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "관리자 비밀번호를 입력하세요:"
msgid "Set the password"
msgstr "암호 설정"
@@ -1169,6 +1170,9 @@ msgstr "리소스 가져오는 중: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "동기화 상태를 내보낼 대상을 선택하세요"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "태그 추가 및 제거"
@@ -1368,6 +1372,58 @@ msgstr ""
"주의: 이 위치를 변경하시려면, 동기화 전에 모든 컨텐트를 복사했는지 확인하세"
"요, 그렇지 않으면 모든 파일이 삭제됩니다! 자세한 정보는 FAQ를 참조하세요: %s"
msgid "Synchronisation target"
msgstr "동기화 대상"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"동기화를 할 대상을 선택합니다. 각각의 동기화 대상은 `sync.NUM.NAME` 형식으로 "
"된 추가적인 매개 변수를 포함할 수 있습니다(아래에 문서화되어 있습니다)."
msgid "Directory to synchronise with (absolute path)"
msgstr "동기화를 할 폴더 (절대적 경로)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud 사용자 이름"
msgid "Nextcloud password"
msgstr "Nextcloud 암호"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV 사용자 이름"
msgid "WebDAV password"
msgstr "WebDAV 암호"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "언어"
@@ -1526,55 +1582,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "고급 옵션"
msgid "Synchronisation target"
msgstr "동기화 대상"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"동기화를 할 대상을 선택합니다. 각각의 동기화 대상은 `sync.NUM.NAME` 형식으로 "
"된 추가적인 매개 변수를 포함할 수 있습니다(아래에 문서화되어 있습니다)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "동기화를 할 폴더 (절대적 경로)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud 사용자 이름"
msgid "Nextcloud password"
msgstr "Nextcloud 암호"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV 사용자 이름"
msgid "WebDAV password"
msgstr "WebDAV 암호"
msgid "Custom TLS certificates"
msgstr "임의의 TLS 인증서"
@@ -1685,14 +1692,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "동기화를 할 수 없는 항목"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "다음 파일을 열 수 없습니다: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "다음 파일을 열 수 없습니다: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1702,6 +1701,24 @@ msgstr ""
"런 항목을 찾으려면 제목 또는 ID로 검색하세요. (상단에 괄호 안에 표시되어 있습"
"니다)"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "다음 파일을 열 수 없습니다: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "다음 파일을 열 수 없습니다: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "동기화를 할 수 없는 항목"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "동기화 상태 (동기화 완료 항목 / 전체 항목)"
@@ -1824,6 +1841,10 @@ msgstr "새 태그:"
msgid "Type new tags or select from list"
msgstr "새 태그를 입력하거나 목록에서 선택하세요"
#, fuzzy
msgid "More information"
msgstr "설정"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1967,6 +1988,12 @@ msgstr "노트북이 없습니다. (+) 버튼을 눌러 새로 만드세요."
msgid "Welcome"
msgstr "환영합니다"
#~ msgid "Separate each tag by a comma."
#~ msgstr "각각의 태그를 쉼표로 구분합니다."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "일부 항목들은 암호화할 수 없습니다."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -713,6 +713,9 @@ msgstr "Nettsted og dokumentasjon"
msgid "Make a donation"
msgstr "Gi et bidrag"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Åpne %s"
@@ -946,9 +949,6 @@ msgstr "Tittel på notatbok:"
msgid "Add or remove tags:"
msgstr "Legge til eller fjern merkelapper:"
msgid "Separate each tag by a comma."
msgstr "Separer hver merkelapp med komma."
msgid "Rename notebook:"
msgstr "Gi nytt navn til notatbok:"
@@ -970,8 +970,9 @@ msgstr "Noen elementer kan ikke synkroniseres."
msgid "View them now"
msgstr "Vis nå"
msgid "Some items cannot be decrypted."
msgstr "Noen elementer kan ikke dekrypteres."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Skriv inn masterpassordet:"
msgid "Set the password"
msgstr "Sett passord"
@@ -1174,6 +1175,9 @@ msgstr "Henter ressurser: %d"
msgid "Please select where the sync status should be exported to"
msgstr "Velg hvor synkroniseringsstatusen skal eksporteres til"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Legg til eller fjern merkelapper"
@@ -1374,6 +1378,58 @@ msgstr ""
"innhold dit før du synkroniserer. Hvis ikke blir alle filer fjernet! Se FAQ "
"for flere detaljer: %s"
msgid "Synchronisation target"
msgstr "Synkroniseringsmål"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Målet å synkronisere til. Hvert synkroniseringsmål kan ha tilleggsparametere "
"som er navngitt som `sync.NUM.NAME` (dokumentert nedenfor)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Katalog å synkronisere med (absolutt sti)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV-URL"
msgid "Nextcloud username"
msgstr "Nextcloud-brukernavn"
msgid "Nextcloud password"
msgstr "Nextcloud-passord"
msgid "WebDAV URL"
msgstr "WebDAV-URL"
msgid "WebDAV username"
msgstr "WebDAV-brukernavn"
msgid "WebDAV password"
msgstr "WebDAV-passord"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Språk"
@@ -1535,55 +1591,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Vis avanserte innstillinger"
msgid "Synchronisation target"
msgstr "Synkroniseringsmål"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Målet å synkronisere til. Hvert synkroniseringsmål kan ha tilleggsparametere "
"som er navngitt som `sync.NUM.NAME` (dokumentert nedenfor)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Katalog å synkronisere med (absolutt sti)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV-URL"
msgid "Nextcloud username"
msgstr "Nextcloud-brukernavn"
msgid "Nextcloud password"
msgstr "Nextcloud-passord"
msgid "WebDAV URL"
msgstr "WebDAV-URL"
msgid "WebDAV username"
msgstr "WebDAV-brukernavn"
msgid "WebDAV password"
msgstr "WebDAV-passord"
msgid "Custom TLS certificates"
msgstr "Egendefinerte TLS-sertifikater"
@@ -1690,14 +1697,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Elementer som ikke vil synkronisere"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Filen kunne ikke åpnes: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Filen kunne ikke åpnes: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1707,6 +1706,24 @@ msgstr ""
"synkroniseringsmålet. For å finne disse elementene, enten søk etter tittel "
"eller ID (som vises i parentes over)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Filen kunne ikke åpnes: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Filen kunne ikke åpnes: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Elementer som ikke vil synkronisere"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Synkroniseringsstatus (synkroniserte elementer / totale elementer)"
@@ -1829,6 +1846,10 @@ msgstr "Nye merkelapper:"
msgid "Type new tags or select from list"
msgstr "Skriv inn nye merkelapper eller velg fra listen"
#, fuzzy
msgid "More information"
msgstr "Konfigurasjon"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1972,6 +1993,12 @@ msgstr "Du har enda ingen notatbok. Opprett en ved å klikke på (+)-knappen."
msgid "Welcome"
msgstr "Velkommen"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separer hver merkelapp med komma."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Noen elementer kan ikke dekrypteres."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -734,6 +734,9 @@ msgstr "Website en documentatie"
msgid "Make a donation"
msgstr "Website en documentatie"
msgid "Toggle development tools"
msgstr ""
#, fuzzy, javascript-format
msgid "Open %s"
msgstr "Op %s: %s"
@@ -960,9 +963,6 @@ msgstr "Notitieboek titel:"
msgid "Add or remove tags:"
msgstr "Voeg tag toe of verwijder tag"
msgid "Separate each tag by a comma."
msgstr "Scheid iedere tag met een komma."
msgid "Rename notebook:"
msgstr "Hernoem notitieboek:"
@@ -986,8 +986,9 @@ msgstr "Sommige items kunnen niet gesynchroniseerd worden."
msgid "View them now"
msgstr "Bekijk ze nu"
msgid "Some items cannot be decrypted."
msgstr "Sommige items kunnen niet gedecodeerd worden."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Voeg hoofdsleutel in:"
msgid "Set the password"
msgstr "Stel wachtwoord in"
@@ -1193,6 +1194,9 @@ msgstr "Middelen: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Selecteer waar de synchronisatie status naar geëxporteerd moet worden"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Voeg tag toe of verwijder tag"
@@ -1400,6 +1404,58 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Synchronisatiedoel"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Folder om mee te synchroniseren (absolute pad)"
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
#, fuzzy
msgid "Nextcloud password"
msgstr "Stel wachtwoord in"
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
#, fuzzy
msgid "WebDAV password"
msgstr "Stel wachtwoord in"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Taal"
@@ -1562,55 +1618,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Toon geavanceerde opties"
msgid "Synchronisation target"
msgstr "Synchronisatiedoel"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Folder om mee te synchroniseren (absolute pad)"
msgid "Nextcloud WebDAV URL"
msgstr ""
msgid "Nextcloud username"
msgstr ""
#, fuzzy
msgid "Nextcloud password"
msgstr "Stel wachtwoord in"
msgid "WebDAV URL"
msgstr ""
msgid "WebDAV username"
msgstr ""
#, fuzzy
msgid "WebDAV password"
msgstr "Stel wachtwoord in"
msgid "Custom TLS certificates"
msgstr ""
@@ -1719,14 +1726,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Items die niet gesynchroniseerd kunnen worden"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Het notitieboek kon niet opgeslaan worden: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Het notitieboek kon niet opgeslaan worden: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1736,6 +1735,24 @@ msgstr ""
"geüpload worden naar het synchronistatiedoel. Om deze items te vinden, zoek "
"naar de titel of het ID (afgebeeld bovenaan tussen haakjes)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Het notitieboek kon niet opgeslaan worden: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Het notitieboek kon niet opgeslaan worden: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Items die niet gesynchroniseerd kunnen worden"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Sync status (gesynchroniseerde items / totaal aantal items)"
@@ -1857,6 +1874,10 @@ msgstr ""
msgid "Type new tags or select from list"
msgstr ""
#, fuzzy
msgid "More information"
msgstr "Configuratie"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -2001,6 +2022,12 @@ msgstr ""
msgid "Welcome"
msgstr "Welkom"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Scheid iedere tag met een komma."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Sommige items kunnen niet gedecodeerd worden."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -734,6 +734,9 @@ msgstr "Website en documentatie"
msgid "Make a donation"
msgstr "Doneren"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "%s openen"
@@ -968,9 +971,6 @@ msgstr "Titel van notitieboek:"
msgid "Add or remove tags:"
msgstr "Labels toevoegen of verwijderen:"
msgid "Separate each tag by a comma."
msgstr "Scheidt elk label met een komma."
msgid "Rename notebook:"
msgstr "Notitieboeknaam wijzigen:"
@@ -992,8 +992,9 @@ msgstr "Sommige items kunnen niet worden gesynchroniseerd."
msgid "View them now"
msgstr "Items tonen"
msgid "Some items cannot be decrypted."
msgstr "Sommige items kunnen niet worden ontsleuteled."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Voer het hoofdwachtwoord in:"
msgid "Set the password"
msgstr "Wachtwoord instellen"
@@ -1198,6 +1199,9 @@ msgstr "Bronnen: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Kies waar de synchronisatiestatus naar moet worden geëxporteerd"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Labels toevoegen of verwijderen"
@@ -1397,6 +1401,59 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Synchronisatiedoel"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Het doel waarnaar gesynchroniseerd moet worden. Elk doel mag extra "
"argumenten bevatten, welke `sync.NUM.NAME` worden genoemd (wordt hieronder "
"uitgelegd)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Map waarnaar gesynchroniseerd moet worden (absoluut pad)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV-URL"
msgid "Nextcloud username"
msgstr "Nextcloud-gebruikersnaam"
msgid "Nextcloud password"
msgstr "Nextcloud-wachtwoord"
msgid "WebDAV URL"
msgstr "WebDAV-URL"
msgid "WebDAV username"
msgstr "WebDAV-gebruikersnaam"
msgid "WebDAV password"
msgstr "WebDAV-wachtwoord"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Taal"
@@ -1555,56 +1612,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Geavanceerde opties tonen"
msgid "Synchronisation target"
msgstr "Synchronisatiedoel"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Het doel waarnaar gesynchroniseerd moet worden. Elk doel mag extra "
"argumenten bevatten, welke `sync.NUM.NAME` worden genoemd (wordt hieronder "
"uitgelegd)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Map waarnaar gesynchroniseerd moet worden (absoluut pad)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV-URL"
msgid "Nextcloud username"
msgstr "Nextcloud-gebruikersnaam"
msgid "Nextcloud password"
msgstr "Nextcloud-wachtwoord"
msgid "WebDAV URL"
msgstr "WebDAV-URL"
msgid "WebDAV username"
msgstr "WebDAV-gebruikersnaam"
msgid "WebDAV password"
msgstr "WebDAV-wachtwoord"
msgid "Custom TLS certificates"
msgstr "Aangepaste TLS-certificaten"
@@ -1718,14 +1725,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Items die niet kunnen worden gesynchroniseerd"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Dit bestand kan niet worden geopend: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Dit bestand kan niet worden geopend: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1735,6 +1734,24 @@ msgstr ""
"synchronisatiedoel. Als je deze items wilt vinden, moet je zoeken naar de "
"titel of ID ervan (welke hierboven tussen haakjes wordt getoond)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Dit bestand kan niet worden geopend: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Dit bestand kan niet worden geopend: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Items die niet kunnen worden gesynchroniseerd"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr ""
"Synchronisatiestatus (aantal gesynchroniseerde items / totaal aantal items)"
@@ -1857,6 +1874,10 @@ msgstr "Nieuwe labels:"
msgid "Type new tags or select from list"
msgstr "Typ nieuwe labels of kies ze uit de lijst"
#, fuzzy
msgid "More information"
msgstr "Configuratie"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -2004,6 +2025,12 @@ msgstr ""
msgid "Welcome"
msgstr "Welkom"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Scheidt elk label met een komma."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Sommige items kunnen niet worden ontsleuteled."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -231,7 +231,7 @@ msgid ""
"all` for the complete usage information."
msgstr ""
"Wpisz `help [komenda]` aby uzyskać więcej informacji o komendzie; lub wpisz "
"`help all` aby wszystkie informacje na temat funkcji programu."
"`help all` aby uzyskać wszystkie informacje na temat funkcji programu."
msgid "The possible commands are:"
msgstr "Dostępne komendy:"
@@ -324,7 +324,7 @@ msgstr "Wyświetla jedynie pierwsze <num> notatek."
msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
msgstr ""
"Sortuje obiekty po <field> (np. tytuł, data aktualizacji, data utworzenia)."
"Sortuje obiekty po <field> (np. tytuł, data_aktualizacji, data_utworzenia)."
msgid "Reverses the sorting order."
msgstr "Odwraca kierunek sortowania."
@@ -434,7 +434,8 @@ msgstr ""
"poniżej:"
msgid "Step 1: Open this URL in your browser to authorise the application:"
msgstr "Krok 1: Otwórz URL w swojej przeglądarce aby autoryzować aplikację:"
msgstr ""
"Krok 1: Otwórz odnośnik w swojej przeglądarce aby autoryzować aplikację:"
msgid "Step 2: Enter the code provided by Dropbox:"
msgstr "Krok 2: Wpisz kod podany przez Dropbox:"
@@ -731,6 +732,9 @@ msgstr "Strona internetowa i dokumentacja"
msgid "Make a donation"
msgstr "Przekaż datek"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Otwórz %s"
@@ -964,9 +968,6 @@ msgstr "Tytuł notatnika:"
msgid "Add or remove tags:"
msgstr "Dodaj lub usuń znaczniki:"
msgid "Separate each tag by a comma."
msgstr "Oddziel każdy znacznik przecinkiem."
msgid "Rename notebook:"
msgstr "Zmień nazwę notatnika:"
@@ -988,8 +989,9 @@ msgstr "Niektóre przedmioty nie mogą być zsynchornizowane."
msgid "View them now"
msgstr "Wyświetl je teraz"
msgid "Some items cannot be decrypted."
msgstr "Niektóre obiekty nie mogą być odszyfrowane."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Wprowadź hasło główne:"
msgid "Set the password"
msgstr "Ustaw hasło"
@@ -1195,6 +1197,9 @@ msgstr "Pobieranie zasobów: %d"
msgid "Please select where the sync status should be exported to"
msgstr "Proszę wybrać gdzie powinen zostać eksportowany status synchronizacji"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Dodaj lub usuń znaczniki"
@@ -1401,6 +1406,62 @@ msgstr ""
"innym wypadku wszystkie pliki będą usunięte! Sprawdź FAQ w celu uzyskania "
"informacji: %s"
msgid "Synchronisation target"
msgstr "Serwis synchronizacji"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Serwis z którym nastąpi snychronizacja. Każdy serwis może zawierać dodatkowe "
"parametry, które są nazwane jako `sync.NUM.NAME` (udokumentowane poniżej)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Katalog z którym nastąpi synchronizacja (ścieżka absolutna)"
msgid "Nextcloud WebDAV URL"
msgstr "Odnośnik WebDAV Nextcloud"
msgid "Nextcloud username"
msgstr "Nazwa użytkownika Nextcloud"
msgid "Nextcloud password"
msgstr "Hasło użytkownika Nextcloud"
msgid "WebDAV URL"
msgstr "Odnośnik WebDAV"
msgid "WebDAV username"
msgstr "Nazwa użytkownika WebDAV"
msgid "WebDAV password"
msgstr "Hasło użytkownika WebDAV"
msgid "Attachment download behaviour"
msgstr "Zachowanie przy pobieraniu załączników"
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
"W trybie \"Ręczny\", załączniki zostaną pobrane po naciśnięciu.W trybie "
"\"Automatyczny\", załączniki zostaną pobrane przy otwieraniu notatki. W "
"trybie \"Zawsze\", wszystkie załączniki zostaną pobrane bez względu "
"naotwarcie notatki."
msgid "Always"
msgstr "Zawsze"
msgid "Manual"
msgstr "Ręczny"
msgid "Auto"
msgstr "Automatyczny"
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Język"
@@ -1537,7 +1598,7 @@ msgstr "Interwał synchronizacji"
#, javascript-format
msgid "%d minutes"
msgstr "%d minuta"
msgstr "%d minut"
#, javascript-format
msgid "%d hour"
@@ -1561,55 +1622,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Wyświetl opcje zaawansowane"
msgid "Synchronisation target"
msgstr "Serwis synchronizacji"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Serwis z którym nastąpi snychronizacja. Każdy serwis może zawierać dodatkowe "
"parametry, które są nazwane jako `sync.NUM.NAME` (udokumentowane poniżej)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Katalog z którym nastąpi synchronizacja (ścieżka absolutna)"
msgid "Nextcloud WebDAV URL"
msgstr "Odnośnik WebDAV Nextcloud"
msgid "Nextcloud username"
msgstr "Nazwa użytkownika Nextcloud"
msgid "Nextcloud password"
msgstr "Hasło użytkownika Nextcloud"
msgid "WebDAV URL"
msgstr "Odnośnik WebDAV"
msgid "WebDAV username"
msgstr "Nazwa użytkownika WebDAV"
msgid "WebDAV password"
msgstr "Hasło użytkownika WebDAV"
msgid "Custom TLS certificates"
msgstr "Niestandardowe ceryfikaty TLS"
@@ -1716,14 +1728,6 @@ msgstr "Przywrócone notatki"
msgid "Items that cannot be synchronised"
msgstr "Obiekty nie mogą być zsynchronizowane"
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) nie może być wysłany: %s"
#, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Obiekt \"%s\" nie może być pobrany: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1733,6 +1737,24 @@ msgstr ""
"synchronizacji. W celu wyszukania tych obiektów, proszę szukać po tytule lub "
"po ID (które jest wyświetlane w klamrach poniżej)."
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) nie może być wysłany: %s"
#, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Obiekt \"%s\" nie może być pobrany: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Obiekty nie mogą być zsynchronizowane"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Status synchronizacji (obiekty zsynchronizowane / obiekty ogółem)"
@@ -1855,6 +1877,10 @@ msgstr "Nowe znaczniki:"
msgid "Type new tags or select from list"
msgstr "Wprowadź nowe znaczniki lub wybierz z listy"
#, fuzzy
msgid "More information"
msgstr "Konfiguracja"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -2002,3 +2028,9 @@ msgstr "Brak notatników. Utwórz nowy naciskając przycisk (+)."
msgid "Welcome"
msgstr "Witaj"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Oddziel każdy znacznik przecinkiem."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Niektóre obiekty nie mogą być odszyfrowane."

View File

@@ -720,6 +720,9 @@ msgstr "Website e documentação"
msgid "Make a donation"
msgstr "Fazer uma doação"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Abrir %s"
@@ -952,9 +955,6 @@ msgstr "Título do caderno:"
msgid "Add or remove tags:"
msgstr "Adicionar ou remover tags:"
msgid "Separate each tag by a comma."
msgstr "Separe cada tag por vírgula."
msgid "Rename notebook:"
msgstr "Renomear caderno:"
@@ -976,8 +976,9 @@ msgstr "Alguns itens não podem ser sincronizados."
msgid "View them now"
msgstr "Visualizar agora"
msgid "Some items cannot be decrypted."
msgstr "Alguns itens não podem ser decriptados."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Entre a senha master:"
msgid "Set the password"
msgstr "Configurar a senha"
@@ -1181,6 +1182,9 @@ msgstr ""
"Favor selecionar o local para onde o status de sincronia deveria ser "
"exportado"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Adicionar ou remover tags"
@@ -1386,6 +1390,58 @@ msgstr ""
"conteúdo para lá antes de sincronizar, do contrário todos os seus arquivos "
"serão removidos! Veja o FAQ para mais detalhes: %s"
msgid "Synchronisation target"
msgstr "Alvo de sincronização"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"O alvo para onde sincronizar. Cada alvo pode ter parâmetros adicionais que "
"são nomeados como `sync.NUM.NAME` (todos documentados abaixo)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Diretório para sincronizar (caminho absoluto)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Usuário da Nextcloud"
msgid "Nextcloud password"
msgstr "Senha da Nextcloud"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "Usuário do WebDAV"
msgid "WebDAV password"
msgstr "Senha do WebDAV"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Idioma"
@@ -1543,55 +1599,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Mostrar opções avançadas"
msgid "Synchronisation target"
msgstr "Alvo de sincronização"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"O alvo para onde sincronizar. Cada alvo pode ter parâmetros adicionais que "
"são nomeados como `sync.NUM.NAME` (todos documentados abaixo)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Diretório para sincronizar (caminho absoluto)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Usuário da Nextcloud"
msgid "Nextcloud password"
msgstr "Senha da Nextcloud"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "Usuário do WebDAV"
msgid "WebDAV password"
msgstr "Senha do WebDAV"
msgid "Custom TLS certificates"
msgstr "Certificados TLS customizados"
@@ -1699,14 +1706,6 @@ msgstr "Notas restauradas"
msgid "Items that cannot be synchronised"
msgstr "Os itens não podem ser sincronizados"
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) não pôde ser enviado: %s"
#, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Item \"%s\" não pôde ser baixado: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1716,6 +1715,24 @@ msgstr ""
"sincronização. Para encontrar esses itens, ou pesquise pelo título ou pelo "
"ID (que é exibido nos colchetes acima)"
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) não pôde ser enviado: %s"
#, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Item \"%s\" não pôde ser baixado: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Os itens não podem ser sincronizados"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Status de sincronização (sincronizados / totais)"
@@ -1839,6 +1856,10 @@ msgstr "Novas tags:"
msgid "Type new tags or select from list"
msgstr "Digite novsa tags, ou selecione da lista"
#, fuzzy
msgid "More information"
msgstr "Configuração"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1985,6 +2006,12 @@ msgstr "Você não possui cadernos. Crie um clicando no botão (+)."
msgid "Welcome"
msgstr "Bem-vindo"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separe cada tag por vírgula."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Alguns itens não podem ser decriptados."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -668,6 +668,9 @@ msgstr "Website și documentație"
msgid "Make a donation"
msgstr "Faceți o donație"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Deschideți %s"
@@ -878,9 +881,6 @@ msgstr "Titlul caietului de notițe:"
msgid "Add or remove tags:"
msgstr "Adăugați ori eliminați etichete:"
msgid "Separate each tag by a comma."
msgstr "Separați fiecare etichetă printr-o virgulă."
msgid "Rename notebook:"
msgstr "Redenumiți caietul de notițe:"
@@ -902,8 +902,8 @@ msgstr "Câțiva itemi nu pot fi sincronizați."
msgid "View them now"
msgstr "Vizualizați-le acum"
msgid "Some items cannot be decrypted."
msgstr "Câțiva itemi nu pot fi descriptați."
msgid "One or more master keys need a password."
msgstr ""
msgid "Set the password"
msgstr "Setați parola"
@@ -1100,6 +1100,9 @@ msgstr "Resurse: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Adăugați ori eliminați etichete"
@@ -1292,6 +1295,56 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr ""
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr ""
msgid "Nextcloud WebDAV URL"
msgstr "URL NextCloud WebDAV"
msgid "Nextcloud username"
msgstr "Nume utilizator Nextcloud"
msgid "Nextcloud password"
msgstr "Parolă Nextcloud"
msgid "WebDAV URL"
msgstr "URL-ul WebDAV"
msgid "WebDAV username"
msgstr "Nume utilizator WebDAV"
msgid "WebDAV password"
msgstr "Parolă WebDAV"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Limbă"
@@ -1444,53 +1497,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Afișați opțiunile avansate"
msgid "Synchronisation target"
msgstr ""
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr ""
msgid "Nextcloud WebDAV URL"
msgstr "URL NextCloud WebDAV"
msgid "Nextcloud username"
msgstr "Nume utilizator Nextcloud"
msgid "Nextcloud password"
msgstr "Parolă Nextcloud"
msgid "WebDAV URL"
msgstr "URL-ul WebDAV"
msgid "WebDAV username"
msgstr "Nume utilizator WebDAV"
msgid "WebDAV password"
msgstr "Parolă WebDAV"
msgid "Custom TLS certificates"
msgstr "Certificate TLS cusomizate"
@@ -1595,6 +1601,12 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Itemii nu pot fi sincronizați"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Acest fișier nu a putut fi deschis: %s"
@@ -1603,10 +1615,14 @@ msgstr "Acest fișier nu a putut fi deschis: %s"
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Acest fișier nu a putut fi deschis: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Itemii nu pot fi sincronizați"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
@@ -1726,6 +1742,10 @@ msgstr "Etichete noi:"
msgid "Type new tags or select from list"
msgstr ""
#, fuzzy
msgid "More information"
msgstr "Configurare"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1867,6 +1887,12 @@ msgstr ""
msgid "Welcome"
msgstr "Bine ați venit"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separați fiecare etichetă printr-o virgulă."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Câțiva itemi nu pot fi descriptați."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -726,6 +726,9 @@ msgstr "Сайт и документация"
msgid "Make a donation"
msgstr "Сделать пожертвование"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Открыть %s"
@@ -959,9 +962,6 @@ msgstr "Название блокнота:"
msgid "Add or remove tags:"
msgstr "Добавить или удалить метки:"
msgid "Separate each tag by a comma."
msgstr "Разделяйте каждую метку запятой."
msgid "Rename notebook:"
msgstr "Переименовать блокнот:"
@@ -983,8 +983,9 @@ msgstr "Некоторые элементы не могут быть синхр
msgid "View them now"
msgstr "Просмотреть их сейчас"
msgid "Some items cannot be decrypted."
msgstr "Некоторые элементы не могут быть расшифрованы."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Введите мастер-пароль:"
msgid "Set the password"
msgstr "Установить пароль"
@@ -1187,6 +1188,9 @@ msgid "Please select where the sync status should be exported to"
msgstr ""
"Пожалуйста, выберите, куда должен быть экспортирован статус синхронизации"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Добавить или удалить метки"
@@ -1388,6 +1392,58 @@ msgstr ""
"содержимое перед синхронизацией, в противном случае все файлы будут удалены! "
"Смотрите FAQ для получения подробной информации: %s"
msgid "Synchronisation target"
msgstr "Цель синхронизации"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Цель синхронизации. Каждая цель синхронизации может иметь дополнительные "
"параметры, именованные как `sync.NUM.NAME` (все документировано ниже)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Каталог синхронизации (абсолютный путь)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Имя пользователя Nextcloud"
msgid "Nextcloud password"
msgstr "Пароль Nextcloud"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "Имя пользователя WebDAV"
msgid "WebDAV password"
msgstr "Пароль WebDAV"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Язык"
@@ -1548,55 +1604,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Показывать расширенные настройки"
msgid "Synchronisation target"
msgstr "Цель синхронизации"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Цель синхронизации. Каждая цель синхронизации может иметь дополнительные "
"параметры, именованные как `sync.NUM.NAME` (все документировано ниже)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Каталог синхронизации (абсолютный путь)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Имя пользователя Nextcloud"
msgid "Nextcloud password"
msgstr "Пароль Nextcloud"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "Имя пользователя WebDAV"
msgid "WebDAV password"
msgstr "Пароль WebDAV"
msgid "Custom TLS certificates"
msgstr "Пользовательские сертификаты TLS"
@@ -1705,14 +1712,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Элементы, которые не могут быть синхронизированы"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Этот файл не может быть открыт: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Этот файл не может быть открыт: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1722,6 +1721,24 @@ msgstr ""
"синхронизации. Чтобы найти эти элементы, воспользуйтесь поиском по названию "
"или ID (который указывается в скобках выше)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Этот файл не может быть открыт: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Этот файл не может быть открыт: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Элементы, которые не могут быть синхронизированы"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Статус синхронизации (синхронизировано / всего)"
@@ -1844,6 +1861,10 @@ msgstr "Новые метки:"
msgid "Type new tags or select from list"
msgstr "Введите новые метки или выберите из списка"
#, fuzzy
msgid "More information"
msgstr "Конфигурация"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1991,6 +2012,12 @@ msgstr "У вас сейчас нет блокнота. Создайте его
msgid "Welcome"
msgstr "Добро пожаловать"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Разделяйте каждую метку запятой."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Некоторые элементы не могут быть расшифрованы."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -731,6 +731,9 @@ msgstr "Spletna stran in dokumentacija"
msgid "Make a donation"
msgstr "Doniraj"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Odpri %s"
@@ -957,9 +960,6 @@ msgstr "Naslov beležnice:"
msgid "Add or remove tags:"
msgstr "Dodaj ali odstrani oznako:"
msgid "Separate each tag by a comma."
msgstr "Loči vsako oznako z vejico."
msgid "Rename notebook:"
msgstr "Preimenuj beležnico:"
@@ -983,8 +983,9 @@ msgstr "Nekateri premeti ne morejo biti sinhronizirani."
msgid "View them now"
msgstr "Prikaži jih sedaj"
msgid "Some items cannot be decrypted."
msgstr "Nekateri predmeti ne morejo biti dekriptirani."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Vnesite glavno geslo:"
msgid "Set the password"
msgstr "Nastavi geslo"
@@ -1191,6 +1192,9 @@ msgstr "Viri: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Prosim izberite, kam želite izvoziti sinhronizacijski status"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Dodaj ali odstrani oznake"
@@ -1396,6 +1400,58 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "Sinhronizacijski cilj"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Ciljno sinhronizacijsko mesto. Vsak sinhronizacijski cilj ima lahko dodatne "
"parametre imenovano kot `sync.NUM.NAME` (vse je dokumentirano spodaj)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Mesto ciljne sinhronizacije (absolutna pot)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud uporabniško ime"
msgid "Nextcloud password"
msgstr "Nextcloud geslo"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV uporabniško ime"
msgid "WebDAV password"
msgstr "WebDAV geslo"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Jezik"
@@ -1556,55 +1612,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Pokaži napredne možnosti"
msgid "Synchronisation target"
msgstr "Sinhronizacijski cilj"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Ciljno sinhronizacijsko mesto. Vsak sinhronizacijski cilj ima lahko dodatne "
"parametre imenovano kot `sync.NUM.NAME` (vse je dokumentirano spodaj)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Mesto ciljne sinhronizacije (absolutna pot)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud uporabniško ime"
msgid "Nextcloud password"
msgstr "Nextcloud geslo"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV uporabniško ime"
msgid "WebDAV password"
msgstr "WebDAV geslo"
msgid "Custom TLS certificates"
msgstr ""
@@ -1712,14 +1719,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Predmeti ne morejo biti sinhronizirani"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Beležnica ne more biti shranjena: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Beležnica ne more biti shranjena: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1729,6 +1728,24 @@ msgstr ""
"sinhronizacijski cilj. Če želite najti te predmete, iščite po ali naslovu "
"ali ID(je prikazan zgoraj v oklepajih)"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Beležnica ne more biti shranjena: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Beležnica ne more biti shranjena: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Predmeti ne morejo biti sinhronizirani"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Status sinhronizacije(sinhronizirani predmeti / vse datoteke)"
@@ -1849,6 +1866,10 @@ msgstr ""
msgid "Type new tags or select from list"
msgstr ""
#, fuzzy
msgid "More information"
msgstr "Nastavitve"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1990,6 +2011,12 @@ msgstr "Trenutno nimate nobene beležnice. Ustvarite jo s klikom na (+) gumb."
msgid "Welcome"
msgstr "Dobrodošli"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Loči vsako oznako z vejico."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Nekateri predmeti ne morejo biti dekriptirani."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -732,6 +732,9 @@ msgstr "Webbplats och dokumentation"
msgid "Make a donation"
msgstr "Gör en donation"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Öppna %s"
@@ -965,9 +968,6 @@ msgstr "Titel på anteckningsbok:"
msgid "Add or remove tags:"
msgstr "Lägg till eller ta bort taggar:"
msgid "Separate each tag by a comma."
msgstr "Separera varje tagg med ett komma."
msgid "Rename notebook:"
msgstr "Byt namn på anteckningsbok:"
@@ -989,8 +989,9 @@ msgstr "Några objekt kan inte synkroniseras."
msgid "View them now"
msgstr "Visa dem nu"
msgid "Some items cannot be decrypted."
msgstr "Några objekt kan inte dekrypteras."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Ange huvudlösenord:"
msgid "Set the password"
msgstr "Ställ in lösenord"
@@ -1194,6 +1195,9 @@ msgstr "Hämtar resurser: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Välj vart synkroniseringstillståndet ska exporteras till"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "Lägg till eller ta bort taggar"
@@ -1397,6 +1401,58 @@ msgstr ""
"innehåll innan du synkroniserar. Annars kommer samtliga filer att raderas. "
"Läs FAQ för mer information: %s"
msgid "Synchronisation target"
msgstr "Synkroniseringsmål"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Målet att synkronisera till. Varje synkroniseringsmål kan ha ytterligare "
"parametrar som heter `sync.NUM.NAME` (alla dokumenterade nedan)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Katalog för att synkronisera med (absolut sökväg)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud-WebDAV-webbadress"
msgid "Nextcloud username"
msgstr "Nextcloud-användarnamn"
msgid "Nextcloud password"
msgstr "Nextcloud-lösenord"
msgid "WebDAV URL"
msgstr "WebDAV-webbadress"
msgid "WebDAV username"
msgstr "WebDAV-användarnamn"
msgid "WebDAV password"
msgstr "WebDAV-lösenord"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Språk"
@@ -1557,55 +1613,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Visa avancerade inställningar"
msgid "Synchronisation target"
msgstr "Synkroniseringsmål"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Målet att synkronisera till. Varje synkroniseringsmål kan ha ytterligare "
"parametrar som heter `sync.NUM.NAME` (alla dokumenterade nedan)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Katalog för att synkronisera med (absolut sökväg)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud-WebDAV-webbadress"
msgid "Nextcloud username"
msgstr "Nextcloud-användarnamn"
msgid "Nextcloud password"
msgstr "Nextcloud-lösenord"
msgid "WebDAV URL"
msgstr "WebDAV-webbadress"
msgid "WebDAV username"
msgstr "WebDAV-användarnamn"
msgid "WebDAV password"
msgstr "WebDAV-lösenord"
msgid "Custom TLS certificates"
msgstr "Anpassade TLS-certifikat"
@@ -1714,14 +1721,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Objekt som inte kan synkroniseras"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Den här filen kunde inte öppnas: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Den här filen kunde inte öppnas: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1731,6 +1730,24 @@ msgstr ""
"till synkroniseringsmålet. För att hitta dessa objekt, sök antingen efter "
"titel eller ID (som visas i parentes ovan)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Den här filen kunde inte öppnas: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Den här filen kunde inte öppnas: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Objekt som inte kan synkroniseras"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Synkroniseringstillstånd (synkroniserade objekt / totalt antal objekt)"
@@ -1855,6 +1872,10 @@ msgstr "Nya taggar:"
msgid "Type new tags or select from list"
msgstr "Skriv nya taggar eller välj från listan"
#, fuzzy
msgid "More information"
msgstr "Konfiguration"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -2006,6 +2027,12 @@ msgstr ""
msgid "Welcome"
msgstr "Välkommen"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separera varje tagg med ett komma."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Några objekt kan inte dekrypteras."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -699,6 +699,9 @@ msgstr "Web sitesi ve dökümanlar"
msgid "Make a donation"
msgstr "Bağış yapın"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "Aç %s"
@@ -934,9 +937,6 @@ msgstr "Not defteri başlığı:"
msgid "Add or remove tags:"
msgstr "Etiket ekle veya kaldır:"
msgid "Separate each tag by a comma."
msgstr "Her etiketi virgülle ayırın."
msgid "Rename notebook:"
msgstr "Not defterini yeniden adlandır:"
@@ -958,8 +958,9 @@ msgstr "Bazı öğeler senkronize edilemiyor."
msgid "View them now"
msgstr "Şimdi onları görüntüle"
msgid "Some items cannot be decrypted."
msgstr "Bazı öğelerin şifresi çözülemez."
#, fuzzy
msgid "One or more master keys need a password."
msgstr "Ana şifreyi girin:"
msgid "Set the password"
msgstr "Şifreyi ayarla"
@@ -1163,6 +1164,9 @@ msgstr "Kaynaklar alınıyor: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "Lütfen senkronizasyon durumunun nereye aktarılacağını seçin"
msgid "Retry"
msgstr ""
#, fuzzy
msgid "Add or remove tags"
msgstr "Etiket ekle veya kaldır"
@@ -1365,6 +1369,58 @@ msgstr ""
"kopyaladığınızdan emin olun, aksi takdirde tüm dosyalar kaldırılır! Daha "
"fazla bilgi için SSS bölümüne bakın: %s"
msgid "Synchronisation target"
msgstr "Senkronizasyon hedefi"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Senkronize edilecek hedef. Her senkronizasyon hedefi, `sync.NUM.NAME` olarak "
"adlandırılan ek parametrelere sahip olabilir (tümü aşağıda belgelenmiştir)."
msgid "Directory to synchronise with (absolute path)"
msgstr "Eşitlenecek dizin (kesin yol)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud kullanıcı adı"
msgid "Nextcloud password"
msgstr "Nextcloud şifresi"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV kullanıcı adı"
msgid "WebDAV password"
msgstr "WebDAV şifresi"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "Dil"
@@ -1524,55 +1580,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "Gelişmiş ayarları göster"
msgid "Synchronisation target"
msgstr "Senkronizasyon hedefi"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"Senkronize edilecek hedef. Her senkronizasyon hedefi, `sync.NUM.NAME` olarak "
"adlandırılan ek parametrelere sahip olabilir (tümü aşağıda belgelenmiştir)."
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "Eşitlenecek dizin (kesin yol)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud kullanıcı adı"
msgid "Nextcloud password"
msgstr "Nextcloud şifresi"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV kullanıcı adı"
msgid "WebDAV password"
msgstr "WebDAV şifresi"
msgid "Custom TLS certificates"
msgstr "Özel TLS sertifikaları"
@@ -1680,14 +1687,6 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "Senkronize edilemeyen öğeler"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Bu dosya açılamadı: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Bu dosya açılamadı: %s"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
@@ -1697,6 +1696,24 @@ msgstr ""
"bulmak için, başlığı veya kimliği aratın (yukarıdaki parantez içerisinde "
"görüntülenir)."
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "Bu dosya açılamadı: %s"
#, fuzzy, javascript-format
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "Bu dosya açılamadı: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "Senkronize edilemeyen öğeler"
msgid ""
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
msgid "Sync status (synced items / total items)"
msgstr "Senkronizasyon durumu (senkronize öğeler / toplam öğeler)"
@@ -1819,6 +1836,10 @@ msgstr "Yeni etiketler:"
msgid "Type new tags or select from list"
msgstr "Yeni etiketler yazın veya listeden seçin"
#, fuzzy
msgid "More information"
msgstr "Yapılandırma"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1965,6 +1986,12 @@ msgstr ""
msgid "Welcome"
msgstr "Hoşgeldiniz"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Her etiketi virgülle ayırın."
#~ msgid "Some items cannot be decrypted."
#~ msgstr "Bazı öğelerin şifresi çözülemez."
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -685,6 +685,9 @@ msgstr "网站与文档"
msgid "Make a donation"
msgstr "捐赠"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "打开 %s"
@@ -904,9 +907,6 @@ msgstr "笔记本标题:"
msgid "Add or remove tags:"
msgstr "添加或删除标签:"
msgid "Separate each tag by a comma."
msgstr "用半角逗号“,”分开每个标签。"
msgid "Rename notebook:"
msgstr "重命名笔记本:"
@@ -928,8 +928,9 @@ msgstr "一些项目无法被同步。"
msgid "View them now"
msgstr "立刻查看"
msgid "Some items cannot be decrypted."
msgstr "一些项目无法被解密。"
#, fuzzy
msgid "One or more master keys need a password."
msgstr "输入主密码:"
msgid "Set the password"
msgstr "设置密码"
@@ -1129,6 +1130,9 @@ msgstr "正在获取资源:%d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "请选择同步状态的导出位置"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "添加或删除标签"
@@ -1327,6 +1331,57 @@ msgstr ""
"注意:如果您更改该位置,请确保在同步之前将所有内容复制到该位置,否则将删除所"
"有文件! 更多详细信息请参阅常见问题解答(FAQ):%s"
msgid "Synchronisation target"
msgstr "同步目标"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"所同步的目标。每个同步目标都可能有名为 `sync.NUM.NAME` 的附加参数(见下文)。"
msgid "Directory to synchronise with (absolute path)"
msgstr "待同步的目录(绝对路径)。"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud 用户名"
msgid "Nextcloud password"
msgstr "Nextcloud 密码"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV 用户名"
msgid "WebDAV password"
msgstr "WebDAV 密码"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "语言"
@@ -1482,54 +1537,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "显示高级选项"
msgid "Synchronisation target"
msgstr "同步目标"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"所同步的目标。每个同步目标都可能有名为 `sync.NUM.NAME` 的附加参数(见下文)。"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "待同步的目录(绝对路径)。"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV URL"
msgid "Nextcloud username"
msgstr "Nextcloud 用户名"
msgid "Nextcloud password"
msgstr "Nextcloud 密码"
msgid "WebDAV URL"
msgstr "WebDAV URL"
msgid "WebDAV username"
msgstr "WebDAV 用户名"
msgid "WebDAV password"
msgstr "WebDAV 密码"
msgid "Custom TLS certificates"
msgstr "自定义 TLS 证书"
@@ -1632,6 +1639,14 @@ msgstr "已恢复的笔记"
msgid "Items that cannot be synchronised"
msgstr "无法同步项目"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
"这些项目将只保存在本设备上,不会上传到同步目标。若需查找这些项目,请搜索标题"
"或 ID(显示在上方括号中)。"
#, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "%s (%s) 无法上传到:%s"
@@ -1640,13 +1655,15 @@ msgstr "%s (%s) 无法上传到:%s"
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "项目 \"%s\" 无法从 %s 中下载"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "无法同步项目"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
"这些项目将只保存在本设备上,不会上传到同步目标。若需查找这些项目,请搜索标题"
"或 ID(显示在上方括号中)。"
msgid "Sync status (synced items / total items)"
msgstr "同步状态(已同步项目/项目总数)"
@@ -1770,6 +1787,10 @@ msgstr "新建标签:"
msgid "Type new tags or select from list"
msgstr "输入新的标签或从列表中选择"
#, fuzzy
msgid "More information"
msgstr "配置"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1909,6 +1930,12 @@ msgstr "您目前未有笔记本。点击 (+) 按钮创建。"
msgid "Welcome"
msgstr "欢迎"
#~ msgid "Separate each tag by a comma."
#~ msgstr "用半角逗号“,”分开每个标签。"
#~ msgid "Some items cannot be decrypted."
#~ msgstr "一些项目无法被解密。"
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -697,6 +697,9 @@ msgstr "官方網站及線上說明"
msgid "Make a donation"
msgstr "捐助"
msgid "Toggle development tools"
msgstr ""
#, javascript-format
msgid "Open %s"
msgstr "開啟 %s"
@@ -918,9 +921,6 @@ msgstr "記事本標題:"
msgid "Add or remove tags:"
msgstr "新增或移除標籤:"
msgid "Separate each tag by a comma."
msgstr "您可用逗號分隔每個標籤。"
msgid "Rename notebook:"
msgstr "重新命名記事本:"
@@ -942,8 +942,9 @@ msgstr "有些項目不能同步。"
msgid "View them now"
msgstr "立即檢視"
msgid "Some items cannot be decrypted."
msgstr "有些項目不能解密。"
#, fuzzy
msgid "One or more master keys need a password."
msgstr "輸入主密碼:"
msgid "Set the password"
msgstr "設置密碼"
@@ -1140,6 +1141,9 @@ msgstr "資源: %d/%d"
msgid "Please select where the sync status should be exported to"
msgstr "請選擇將同步狀態導出到的位置"
msgid "Retry"
msgstr ""
msgid "Add or remove tags"
msgstr "新增或移除標籤"
@@ -1336,6 +1340,58 @@ msgid ""
"more details: %s"
msgstr ""
msgid "Synchronisation target"
msgstr "同步目標"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"要同步的目標。每個同步目標可能有附加的參數,它們被命名為 `sync.NUM.NAME` (全"
"部記錄如下)。"
msgid "Directory to synchronise with (absolute path)"
msgstr "要同步的目錄 (絕對路徑)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV 網址"
msgid "Nextcloud username"
msgstr "Nextcloud 用戶名稱"
msgid "Nextcloud password"
msgstr "Nextcloud 密碼"
msgid "WebDAV URL"
msgstr "WebDAV 網址"
msgid "WebDAV username"
msgstr "WebDAV 用戶名稱"
msgid "WebDAV password"
msgstr "WebDAV 密碼"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Max concurrent connections"
msgstr ""
msgid "Language"
msgstr "語言"
@@ -1492,55 +1548,6 @@ msgstr ""
msgid "Show advanced options"
msgstr "顯示進階選項"
msgid "Synchronisation target"
msgstr "同步目標"
msgid ""
"The target to synchonise to. Each sync target may have additional parameters "
"which are named as `sync.NUM.NAME` (all documented below)."
msgstr ""
"要同步的目標。每個同步目標可能有附加的參數,它們被命名為 `sync.NUM.NAME` (全"
"部記錄如下)。"
msgid "Attachment download behaviour"
msgstr ""
msgid ""
"In \"Manual\" mode, attachments are downloaded only when you click on them. "
"In \"Auto\", they are downloaded when you open the note. In \"Always\", all "
"the attachments are downloaded whether you open the note or not."
msgstr ""
msgid "Always"
msgstr ""
msgid "Manual"
msgstr ""
msgid "Auto"
msgstr ""
msgid "Directory to synchronise with (absolute path)"
msgstr "要同步的目錄 (絕對路徑)"
msgid "Nextcloud WebDAV URL"
msgstr "Nextcloud WebDAV 網址"
msgid "Nextcloud username"
msgstr "Nextcloud 用戶名稱"
msgid "Nextcloud password"
msgstr "Nextcloud 密碼"
msgid "WebDAV URL"
msgstr "WebDAV 網址"
msgid "WebDAV username"
msgstr "WebDAV 用戶名稱"
msgid "WebDAV password"
msgstr "WebDAV 密碼"
msgid "Custom TLS certificates"
msgstr "自訂 TLS 證書"
@@ -1649,6 +1656,14 @@ msgstr ""
msgid "Items that cannot be synchronised"
msgstr "無法同步的項目"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
"這些頊目將保留在設備上,但不會上載到同步目標。要尋找這些項目,請以標題或 ID "
"(在上面的括弧中顯示) 搜索。"
#, fuzzy, javascript-format
msgid "%s (%s) could not be uploaded: %s"
msgstr "無法開啟檔案: %s"
@@ -1657,13 +1672,15 @@ msgstr "無法開啟檔案: %s"
msgid "Item \"%s\" could not be downloaded: %s"
msgstr "無法開啟檔案: %s"
#, fuzzy
msgid "Items that cannot be decrypted"
msgstr "無法同步的項目"
msgid ""
"These items will remain on the device but will not be uploaded to the sync "
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
"Joplin failed to decrypt these items multiple times, possibly because they "
"are corrupted or too large. These items will remain on the device but Joplin "
"will no longer attempt to decrypt them."
msgstr ""
"這些頊目將保留在設備上,但不會上載到同步目標。要尋找這些項目,請以標題或 ID "
"(在上面的括弧中顯示) 搜索。"
msgid "Sync status (synced items / total items)"
msgstr "同步狀態 (已同步項目 / 項目總數)"
@@ -1784,6 +1801,10 @@ msgstr "新增標籤:"
msgid "Type new tags or select from list"
msgstr "輸入新標籤,或在清單中選擇"
#, fuzzy
msgid "More information"
msgstr "設置"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
@@ -1924,6 +1945,12 @@ msgstr "您當前沒有任何筆記本。通過按一下 (+) 鍵去建立一本
msgid "Welcome"
msgstr "歡迎"
#~ msgid "Separate each tag by a comma."
#~ msgstr "您可用逗號分隔每個標籤。"
#~ msgid "Some items cannot be decrypted."
#~ msgstr "有些項目不能解密。"
#~ msgid "%s (%s): %s"
#~ msgstr "%s (%s): %s"

View File

@@ -1,6 +1,6 @@
{
"name": "joplin",
"version": "1.0.137",
"version": "1.0.140",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -20,18 +20,18 @@
"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
},
"acorn-globals": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz",
"integrity": "sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==",
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz",
"integrity": "sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==",
"requires": {
"acorn": "^6.0.1",
"acorn-walk": "^6.0.1"
},
"dependencies": {
"acorn": {
"version": "6.0.6",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.6.tgz",
"integrity": "sha512-5M3G/A4uBSMIlfJ+h9W125vJvPFH/zirISsW5qfxF5YzEvXJCtolLoQvM5yZft0DvMcUrPGKPOlgEu55I6iUtA=="
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="
}
}
},
@@ -454,14 +454,14 @@
}
},
"cssom": {
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz",
"integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog=="
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz",
"integrity": "sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A=="
},
"cssstyle": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.1.1.tgz",
"integrity": "sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==",
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.2.tgz",
"integrity": "sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==",
"requires": {
"cssom": "0.3.x"
}
@@ -661,9 +661,9 @@
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
"escodegen": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
"integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
"integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
"requires": {
"esprima": "^3.1.3",
"estraverse": "^4.2.0",
@@ -1437,10 +1437,11 @@
"dev": true
},
"joplin-turndown": {
"version": "4.0.11",
"resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.11.tgz",
"integrity": "sha512-2oiwWX0nKYi1NVcaprSsrXQkYdGoRtPWFmnXdWQnQW44jlgjFV38B4VrgliwX5ZMq7cbx6A9IBwfXcBL2YV2NA==",
"version": "4.0.12",
"resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.12.tgz",
"integrity": "sha512-HlxkcIiNFSMLBvYktoXqLLHFGuwQYlcPclo0Peeatw3cPe6iFqSsEgEGY/0bYM/fubA/zpPULrJcjST99BO9wQ==",
"requires": {
"html-entities": "^1.2.1",
"jsdom": "^11.9.0"
}
},
@@ -1499,9 +1500,9 @@
},
"dependencies": {
"ajv": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz",
"integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==",
"version": "6.10.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
"integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
"requires": {
"fast-deep-equal": "^2.0.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -1515,9 +1516,9 @@
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
},
"combined-stream": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
"requires": {
"delayed-stream": "~1.0.0"
}
@@ -1557,16 +1558,16 @@
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
},
"mime-db": {
"version": "1.37.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
"version": "1.40.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
},
"mime-types": {
"version": "2.1.21",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
"integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
"version": "2.1.24",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
"integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
"requires": {
"mime-db": "~1.37.0"
"mime-db": "1.40.0"
}
},
"oauth-sign": {
@@ -2030,9 +2031,9 @@
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
},
"nwsapi": {
"version": "2.0.9",
"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.9.tgz",
"integrity": "sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ=="
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
"integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="
},
"oauth-sign": {
"version": "0.8.2",
@@ -2411,21 +2412,28 @@
}
},
"request-promise-core": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
"integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
"integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
"requires": {
"lodash": "^4.13.1"
"lodash": "^4.17.11"
},
"dependencies": {
"lodash": {
"version": "4.17.11",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
}
}
},
"request-promise-native": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz",
"integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=",
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
"integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
"requires": {
"request-promise-core": "1.1.1",
"stealthy-require": "^1.1.0",
"tough-cookie": ">=2.3.3"
"request-promise-core": "1.1.2",
"stealthy-require": "^1.1.1",
"tough-cookie": "^2.3.3"
}
},
"requires-port": {
@@ -2852,9 +2860,9 @@
"integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
},
"symbol-tree": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
"integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
},
"syswide-cas": {
"version": "5.2.0",

View File

@@ -20,7 +20,7 @@
],
"owner": "Laurent Cozic"
},
"version": "1.0.137",
"version": "1.0.140",
"bin": {
"joplin": "./main.js"
},
@@ -43,7 +43,7 @@
"html-minifier": "^3.5.15",
"image-data-uri": "^2.0.0",
"image-type": "^3.0.0",
"joplin-turndown": "^4.0.11",
"joplin-turndown": "^4.0.12",
"joplin-turndown-plugin-gfm": "^1.0.8",
"jssha": "^2.3.0",
"levenshtein": "^1.0.5",

View File

@@ -3,5 +3,4 @@ set -e
CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
bash "$CLIENT_DIR/build.sh" && node "$CLIENT_DIR/build/main.js" --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "$@"
# bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/.config/joplin --stack-trace-enabled --log-level debug "$@"
# bash "$CLIENT_DIR/build.sh" && node "$CLIENT_DIR/build/main.js" --profile ~/.config/joplin --stack-trace-enabled --log-level debug --env dev "$@"

View File

@@ -36,10 +36,12 @@ npm test tests-build/models_Setting.js
npm test tests-build/models_Tag.js
npm test tests-build/pathUtils.js
npm test tests-build/services_InteropService.js
npm test tests-build/services_KvStore.js
npm test tests-build/services_ResourceService.js
npm test tests-build/services_rest_Api.js
npm test tests-build/services_SearchEngine.js
npm test tests-build/services_Revision.js
npm test tests-build/StringUtils.js
npm test tests-build/TaskQueue.js
npm test tests-build/synchronizer.js
npm test tests-build/urlUtils.js

View File

@@ -37,12 +37,22 @@ describe('HtmlToMd', function() {
const htmlPath = basePath + '/' + htmlFilename;
const mdPath = basePath + '/' + filename(htmlFilename) + '.md';
// if (htmlFilename !== 'picture.html') continue;
// if (htmlFilename !== 'anchor_local.html') continue;
const htmlToMdOptions = {}
if (htmlFilename === 'anchor_local.html') {
// Normally the list of anchor names in the document are retrieved from the HTML code
// This is straightforward when the document is still in DOM format, as with the clipper,
// but otherwise it would need to be somehow parsed out from the HTML. Here we just
// hard code the anchors that we know are in the file.
htmlToMdOptions.anchorNames = ['first', 'second']
}
const html = await shim.fsDriver().readFile(htmlPath);
let expectedMd = await shim.fsDriver().readFile(mdPath);
let actualMd = await htmlToMd.parse('<div>' + html + '</div>', []);
let actualMd = await htmlToMd.parse('<div>' + html + '</div>', htmlToMdOptions);
if (os.EOL === '\r\n') {
expectedMd = expectedMd.replace(/\r\n/g, '\n')

View File

@@ -0,0 +1,57 @@
require('app-module-path').addPath(__dirname);
const { asyncTest, fileContentEqual, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
const TaskQueue = require('lib/TaskQueue.js');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
});
describe('TaskQueue', function() {
beforeEach(async (done) => {
await setupDatabaseAndSynchronizer(1);
await switchClient(1);
done();
});
it('should queue and execute tasks', asyncTest(async () => {
const queue = new TaskQueue();
queue.push(1, async () => { await sleep(0.5); return 'a'; });
queue.push(2, async () => { await sleep(0.5); return 'b'; });
queue.push(3, async () => { await sleep(0.5); return 'c'; });
const results = [];
results.push(await queue.waitForResult(1));
results.push(await queue.waitForResult(2));
results.push(await queue.waitForResult(3));
expect(results[0].id).toBe(1);
expect(results[0].result).toBe('a');
expect(results[1].id).toBe(2);
expect(results[1].result).toBe('b');
expect(results[2].id).toBe(3);
expect(results[2].result).toBe('c');
}));
it('should handle errors', asyncTest(async () => {
const queue = new TaskQueue();
queue.push(1, async () => { await sleep(0.5); return 'a'; });
queue.push(2, async () => { await sleep(0.5); throw new Error('e'); });
const results = [];
results.push(await queue.waitForResult(1));
results.push(await queue.waitForResult(2));
expect(results[0].id).toBe(1);
expect(results[0].result).toBe('a');
expect(results[1].id).toBe(2);
expect(!results[1].result).toBe(true);
expect(results[1].error.message).toBe('e');
}));
});

View File

@@ -0,0 +1,5 @@
<img src="https://joplinapp.org/images/Icon512.png" alt="multiple
lines
are
possible
I guess"/><img src="https://joplinapp.org/images/Icon512.png" alt="This should ] be escaped"/>

View File

@@ -0,0 +1 @@
![multiple lines are possible I guess](https://joplinapp.org/images/Icon512.png)![This should \] be escaped](https://joplinapp.org/images/Icon512.png)

View File

@@ -0,0 +1,6 @@
<p><a href="#first">First</a></p>
<p><a href="#second">Second</a></p>
<p>Third</p>
<p><a name="first"></a>First</p>
<p><a id="second"></a>Second</p>
<p><a id="third"></a>Third</p>

View File

@@ -0,0 +1,11 @@
[First](#first)
[Second](#second)
Third
<a id="first"></a>First
<a id="second"></a>Second
Third

View File

@@ -1 +1 @@
[Some text]()
Some text

View File

@@ -0,0 +1,107 @@
require('app-module-path').addPath(__dirname);
const { asyncTest, fileContentEqual, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
const KvStore = require('lib/services/KvStore.js');
process.on('unhandledRejection', (reason, p) => {
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
});
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
function setupStore() {
const store = KvStore.instance();
store.setDb(db());
return store;
}
describe('services_KvStore', function() {
beforeEach(async (done) => {
await setupDatabaseAndSynchronizer(1);
await switchClient(1);
done();
});
it('should set and get values', asyncTest(async () => {
const store = setupStore();
await store.setValue('a', 123);
expect(await store.value('a')).toBe(123);
await store.setValue('a', 123);
expect(await store.countKeys()).toBe(1);
expect(await store.value('a')).toBe(123);
await store.setValue('a', 456);
expect(await store.countKeys()).toBe(1);
expect(await store.value('a')).toBe(456);
await store.setValue('b', 789);
expect(await store.countKeys()).toBe(2);
expect(await store.value('a')).toBe(456);
expect(await store.value('b')).toBe(789);
}));
it('should set and get values with the right type', asyncTest(async () => {
const store = setupStore();
await store.setValue('string', 'something');
await store.setValue('int', 123);
expect(await store.value('string')).toBe('something');
expect(await store.value('int')).toBe(123);
}));
it('should increment values', asyncTest(async () => {
const store = setupStore();
await store.setValue('int', 1);
const newValue = await store.incValue('int');
expect(newValue).toBe(2);
expect(await store.value('int')).toBe(2);
expect(await store.incValue('int2')).toBe(1);
expect(await store.countKeys()).toBe(2);
}));
it('should handle non-existent values', asyncTest(async () => {
const store = setupStore();
expect(await store.value('nope')).toBe(null);
}));
it('should delete values', asyncTest(async () => {
const store = setupStore();
await store.setValue('int', 1);
expect(await store.countKeys()).toBe(1);
await store.deleteValue('int');
expect(await store.countKeys()).toBe(0);
await store.deleteValue('int'); // That should not throw
}));
it('should increment in an atomic way', asyncTest(async () => {
const store = setupStore();
await store.setValue('int', 0);
const promises = [];
for (let i = 0; i < 20; i++) {
promises.push(store.incValue('int'));
}
await Promise.all(promises);
expect(await store.value('int')).toBe(20);
}));
it('should search by prefix', asyncTest(async () => {
const store = setupStore();
await store.setValue('testing:1', 1);
await store.setValue('testing:2', 2);
const results = await store.searchByPrefix('testing:');
expect(results.length).toBe(2);
const numbers = results.map(r => r.value).sort();
expect(numbers[0]).toBe(1);
expect(numbers[1]).toBe(2);
}));
});

View File

@@ -1,7 +1,7 @@
require('app-module-path').addPath(__dirname);
const { time } = require('lib/time-utils.js');
const { setupDatabase, allSyncTargetItemsEncrypted, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, checkThrowAsync, asyncTest } = require('test-utils.js');
const { setupDatabase, allSyncTargetItemsEncrypted, kvStore, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, checkThrowAsync, asyncTest } = require('test-utils.js');
const { shim } = require('lib/shim.js');
const fs = require('fs-extra');
const Folder = require('lib/models/Folder.js');
@@ -1170,11 +1170,6 @@ describe('Synchronizer', function() {
const f1_1 = await Folder.load(f1.id);
expect(f1_1.title).toBe('Welcome MOD');
// Now check that it created the duplicate tag
const tags = await Tag.modelSelectAll('SELECT * FROM tags WHERE title = "organising"');
expect(tags.length).toBe(2);
}));
it("should not save revisions when updating a note via sync", asyncTest(async () => {
@@ -1385,4 +1380,100 @@ describe('Synchronizer', function() {
expect(!!resource.encryption_blob_encrypted).toBe(false);
}));
it('should not create revisions when item is modified as a result of decryption', asyncTest(async () => {
// Handle this scenario:
// - C1 creates note
// - C1 never changes it
// - E2EE is enabled
// - C1 sync
// - More than one week later (as defined by oldNoteCutOffDate_), C2 sync
// - C2 enters master password and note gets decrypted
//
// Technically at this point the note is modified (from encrypted to non-encrypted) and thus a ItemChange
// object is created. The note is also older than oldNoteCutOffDate. However, this should not lead to the
// creation of a revision because that change was not the result of a user action.
// I guess that's the general rule - changes that come from user actions should result in revisions,
// while automated changes (sync, decryption) should not.
const dateInPast = revisionService().oldNoteCutOffDate_() - 1000;
const note1 = await Note.save({ title: 'ma note', updated_time: dateInPast, created_time: dateInPast }, { autoTimestamp: false });
const masterKey = await loadEncryptionMasterKey();
await encryptionService().enableEncryption(masterKey, '123456');
await encryptionService().loadMasterKeysFromSettings();
await synchronizer().start();
await switchClient(2);
await synchronizer().start();
Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
await encryptionService().loadMasterKeysFromSettings();
await decryptionWorker().start();
await revisionService().collectRevisions();
expect((await Revision.all()).length).toBe(0);
}));
it('should stop trying to decrypt item after a few attempts', asyncTest(async () => {
let hasThrown;
const note = await Note.save({ title: 'ma note' });
const masterKey = await loadEncryptionMasterKey();
await encryptionService().enableEncryption(masterKey, '123456');
await encryptionService().loadMasterKeysFromSettings();
await synchronizer().start();
await switchClient(2);
await synchronizer().start();
// First, simulate a broken note and check that the decryption worker
// gives up decrypting after a number of tries. This is mainly relevant
// for data that crashes the mobile application - we don't want to keep
// decrypting these.
const encryptedNote = await Note.load(note.id);
const goodCipherText = encryptedNote.encryption_cipher_text;
await Note.save({ id: note.id, encryption_cipher_text: 'doesntlookright' });
Setting.setObjectKey('encryption.passwordCache', masterKey.id, '123456');
await encryptionService().loadMasterKeysFromSettings();
hasThrown = await checkThrowAsync(async () => await decryptionWorker().start({ errorHandler: 'throw' }));
expect(hasThrown).toBe(true);
hasThrown = await checkThrowAsync(async () => await decryptionWorker().start({ errorHandler: 'throw' }));
expect(hasThrown).toBe(true);
// Third time, an error is logged and no error is thrown
hasThrown = await checkThrowAsync(async () => await decryptionWorker().start({ errorHandler: 'throw' }));
expect(hasThrown).toBe(false);
const disabledItems = await decryptionWorker().decryptionDisabledItems();
expect(disabledItems.length).toBe(1);
expect(disabledItems[0].id).toBe(note.id);
expect((await kvStore().all()).length).toBe(1);
await kvStore().clear();
// Now check that if it fails once but succeed the second time, the note
// is correctly decrypted and the counters are cleared.
hasThrown = await checkThrowAsync(async () => await decryptionWorker().start({ errorHandler: 'throw' }));
expect(hasThrown).toBe(true);
await Note.save({ id: note.id, encryption_cipher_text: goodCipherText });
hasThrown = await checkThrowAsync(async () => await decryptionWorker().start({ errorHandler: 'throw' }));
expect(hasThrown).toBe(false);
const decryptedNote = await Note.load(note.id);
expect(decryptedNote.title).toBe('ma note');
expect((await kvStore().all()).length).toBe(0);
expect((await decryptionWorker().decryptionDisabledItems()).length).toBe(0);
}));
});

View File

@@ -33,6 +33,7 @@ const EncryptionService = require('lib/services/EncryptionService.js');
const DecryptionWorker = require('lib/services/DecryptionWorker.js');
const ResourceService = require('lib/services/ResourceService.js');
const RevisionService = require('lib/services/RevisionService.js');
const KvStore = require('lib/services/KvStore.js');
const WebDavApi = require('lib/WebDavApi');
const DropboxApi = require('lib/DropboxApi');
@@ -42,6 +43,7 @@ let encryptionServices_ = [];
let revisionServices_ = [];
let decryptionWorkers_ = [];
let resourceServices_ = [];
let kvStores_ = [];
let fileApi_ = null;
let currentClient_ = 1;
@@ -154,6 +156,7 @@ async function clearDatabase(id = null) {
'sync_items',
'notes_normalized',
'revisions',
'key_values',
];
const queries = [];
@@ -223,6 +226,7 @@ async function setupDatabaseAndSynchronizer(id = null) {
decryptionWorkers_[id] = new DecryptionWorker();
decryptionWorkers_[id].setEncryptionService(encryptionServices_[id]);
resourceServices_[id] = new ResourceService();
kvStores_[id] = new KvStore();
await fileApi().clearRoot();
}
@@ -242,6 +246,13 @@ function encryptionService(id = null) {
return encryptionServices_[id];
}
function kvStore(id = null) {
if (id === null) id = currentClient_;
const o = kvStores_[id];
o.setDb(db(id));
return o;
}
function revisionService(id = null) {
if (id === null) id = currentClient_;
return revisionServices_[id];
@@ -249,7 +260,9 @@ function revisionService(id = null) {
function decryptionWorker(id = null) {
if (id === null) id = currentClient_;
return decryptionWorkers_[id];
const o = decryptionWorkers_[id];
o.setKvStore(kvStore(id));
return o;
}
function resourceService(id = null) {
@@ -379,4 +392,4 @@ async function allSyncTargetItemsEncrypted() {
return totalCount === encryptedCount;
}
module.exports = { resourceService, allSyncTargetItemsEncrypted, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest };
module.exports = { kvStore, resourceService, allSyncTargetItemsEncrypted, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest };

View File

@@ -30,6 +30,7 @@ describe('urlUtils', function() {
expect(urlUtils.prependBaseUrl('mailto:emailme@example.com', 'http://example.com')).toBe('mailto:emailme@example.com');
expect(urlUtils.prependBaseUrl('javascript:var%20testing=true', 'http://example.com')).toBe('javascript:var%20testing=true');
expect(urlUtils.prependBaseUrl('http://alreadyabsolute.com', 'http://example.com')).toBe('http://alreadyabsolute.com');
expect(urlUtils.prependBaseUrl('#local-anchor', 'http://example.com')).toBe('#local-anchor');
done();
});

View File

@@ -23,11 +23,12 @@ window.joplinEnv = function() {
return env_;
}
async function browserCaptureVisibleTabs(windowId, options) {
if (browserSupportsPromises_) return browser_.tabs.captureVisibleTab(windowId, { format: 'jpeg' });
async function browserCaptureVisibleTabs(windowId) {
const options = { format: 'jpeg' };
if (browserSupportsPromises_) return browser_.tabs.captureVisibleTab(windowId, options);
return new Promise((resolve, reject) => {
browser_.tabs.captureVisibleTab(windowId, { format: 'jpeg' }, (image) => {
browser_.tabs.captureVisibleTab(windowId, options, (image) => {
resolve(image);
});
});
@@ -56,7 +57,7 @@ browser_.runtime.onMessage.addListener(async (command) => {
const zoom = await browserGetZoom();
const imageDataUrl = await browserCaptureVisibleTabs(null, { format: 'jpeg' });
const imageDataUrl = await browserCaptureVisibleTabs(null);
content = Object.assign({}, command.content);
content.image_data_url = imageDataUrl;

View File

@@ -19,7 +19,7 @@
const protocol = url.toLowerCase().split(':')[0];
if (['http', 'https', 'file'].indexOf(protocol) >= 0) return url;
if (url.indexOf('//')) {
if (url.indexOf('//') === 0) {
return location.protocol + url;
} else if (url[0] === '/') {
return location.protocol + '//' + location.host + url;
@@ -34,8 +34,20 @@
return document.title.trim();
}
function pageLocationOrigin() {
// location.origin normally returns the protocol + domain + port (eg. https://example.com:8080)
// but for file:// protocol this is browser dependant and in particular Firefox returns "null"
// in this case.
if (location.protocol === 'file:') {
return 'file://';
} else {
return location.origin;
}
}
function baseUrl() {
let output = location.origin + location.pathname;
let output = pageLocationOrigin() + location.pathname;
if (output[output.length - 1] !== '/') {
output = output.split('/');
output.pop();
@@ -60,6 +72,20 @@
return output;
}
function getAnchorNames(element) {
const anchors = element.getElementsByTagName('a');
const output = [];
for (let i = 0; i < anchors.length; i++) {
const anchor = anchors[i];
if (anchor.id) {
output.push(anchor.id);
} else if (anchor.name) {
output.push(anchor.name);
}
}
return output;
}
// Cleans up element by removing all its invisible children (which we don't want to render as Markdown)
function cleanUpElement(element, imageSizes) {
const childNodes = element.childNodes;
@@ -117,16 +143,17 @@
async function prepareCommandResponse(command) {
console.info('Got command: ' + command.name);
const clippedContentResponse = (title, html, imageSizes) => {
const clippedContentResponse = (title, html, imageSizes, anchorNames) => {
return {
name: 'clippedContent',
title: title,
html: html,
base_url: baseUrl(),
url: location.origin + location.pathname + location.search,
url: pageLocationOrigin() + location.pathname + location.search,
parent_id: command.parent_id,
tags: command.tags || '',
image_sizes: imageSizes,
anchor_names: anchorNames,
};
}
@@ -143,7 +170,7 @@
response.warning = 'Could not retrieve simplified version of page - full page has been saved instead.';
return response;
}
return clippedContentResponse(article.title, article.body, getImageSizes(document));
return clippedContentResponse(article.title, article.body, getImageSizes(document), getAnchorNames(document));
} else if (command.name === "isProbablyReaderable") {
@@ -156,14 +183,14 @@
const cleanDocument = document.body.cloneNode(true);
const imageSizes = getImageSizes(document, true);
cleanUpElement(cleanDocument, imageSizes);
return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, imageSizes);
return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, imageSizes, getAnchorNames(document));
} else if (command.name === "selectedHtml") {
const range = window.getSelection().getRangeAt(0);
const container = document.createElement('div');
container.appendChild(range.cloneContents());
return clippedContentResponse(pageTitle(), container.innerHTML, getImageSizes(document));
return clippedContentResponse(pageTitle(), container.innerHTML, getImageSizes(document), getAnchorNames(document));
} else if (command.name === 'screenshot') {
@@ -265,7 +292,7 @@
const content = {
title: pageTitle(),
crop_rect: selectionArea,
url: location.origin + location.pathname,
url: pageLocationOrigin() + location.pathname,
parent_id: command.parent_id,
tags: command.tags,
};
@@ -286,8 +313,8 @@
} else if (command.name === "pageUrl") {
let url = location.origin + location.pathname + location.search;
return clippedContentResponse(pageTitle(), url, getImageSizes(document));
let url = pageLocationOrigin() + location.pathname + location.search;
return clippedContentResponse(pageTitle(), url, getImageSizes(document), getAnchorNames(document));
} else {
throw new Error('Unknown command: ' + JSON.stringify(command));

View File

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

View File

@@ -34,6 +34,7 @@ class Bridge {
parent_id: command.parent_id,
tags: command.tags || '',
image_sizes: command.image_sizes || {},
anchor_names: command.anchor_names || [],
};
this.dispatch({ type: 'CLIPPED_CONTENT_SET', content: content });

View File

@@ -50,6 +50,7 @@ const appDefaultState = Object.assign({}, defaultState, {
windowContentSize: bridge().windowContentSize(),
watchedNoteFiles: [],
lastEditorScrollPercents: {},
noteDevToolsVisible: false,
});
class Application extends BaseApplication {
@@ -187,6 +188,12 @@ class Application extends BaseApplication {
newState.lastEditorScrollPercents = newPercents;
break;
case 'NOTE_DEVTOOLS_TOGGLE':
newState = Object.assign({}, state);
newState.noteDevToolsVisible = !newState.noteDevToolsVisible;
break;
}
} catch (error) {
error.message = 'In reducer: ' + error.message + ' Action: ' + JSON.stringify(action);
@@ -661,6 +668,16 @@ class Application extends BaseApplication {
name: 'textLink',
});
},
}, {
label: _('Code'),
screens: ['Main'],
accelerator: 'CommandOrControl+`',
click: () => {
this.dispatch({
type: 'WINDOW_COMMAND',
name: 'textCode',
});
},
}, {
type: 'separator',
screens: ['Main'],
@@ -687,6 +704,16 @@ class Application extends BaseApplication {
name: 'commandStartExternalEditing',
});
},
}, {
label: _('Tags'),
screens: ['Main'],
accelerator: 'CommandOrControl+Alt+T',
click: () => {
this.dispatch({
type: 'WINDOW_COMMAND',
name: 'setTags',
});
},
}, {
type: 'separator',
screens: ['Main'],
@@ -787,6 +814,17 @@ class Application extends BaseApplication {
label: _('Check for updates...'),
visible: shim.isMac() ? false : true,
click: () => _checkForUpdates(this)
}, {
type: 'separator',
screens: ['Main'],
}, {
label: _('Toggle development tools'),
visible: true,
click: () => {
this.dispatch({
type: 'NOTE_DEVTOOLS_TOGGLE',
});
},
}, {
type: 'separator',
visible: shim.isMac() ? false : true,
@@ -806,6 +844,24 @@ class Application extends BaseApplication {
rootMenus.file = rootMenuFile;
}
// It seems the "visible" property of separators is ignored by Electron, making
// it display separators that we want hidden. So this function iterates through
// them and remove them completely.
const cleanUpSeparators = items => {
const output = [];
for (const item of items) {
if ('visible' in item && item.type === 'separator' && !item.visible) continue;
output.push(item);
}
return output;
}
for (const key in rootMenus) {
if (!rootMenus.hasOwnProperty(key)) continue;
if (!rootMenus[key].submenu) continue;
rootMenus[key].submenu = cleanUpSeparators(rootMenus[key].submenu);
}
const pluginMenuItems = PluginManager.instance().menuItems();
for (const item of pluginMenuItems) {
let itemParent = rootMenus[item.parent] ? rootMenus[item.parent] : 'tools';
@@ -1039,6 +1095,7 @@ class Application extends BaseApplication {
// Make it available to the console window - useful to call revisionService.collectRevisions()
window.revisionService = RevisionService.instance();
window.migrationService = MigrationService.instance();
window.decryptionWorker = DecryptionWorker.instance();
}
}

View File

@@ -132,16 +132,19 @@ class MainScreenComponent extends React.Component {
});
} else if (command.name === 'setTags') {
const tags = await Tag.tagsByNoteId(command.noteId);
const tagTitles = tags.map((a) => { return a.title }).sort();
const noteTags = tags.map((a) => { return {value: a.id, label: a.title } }).sort((a, b) => { return a.label.localeCompare(b.label); });
const allTags = await Tag.allWithNotes();
const tagSuggestions = allTags.map((a) => { return {value: a.id, label: a.title } });
this.setState({
promptOptions: {
label: _('Add or remove tags:'),
description: _('Separate each tag by a comma.'),
value: tagTitles.join(', '),
inputType: 'tags',
value: noteTags,
autocomplete: tagSuggestions,
onClose: async (answer) => {
if (answer !== null) {
const tagTitles = answer.split(',').map((a) => { return a.trim() });
const tagTitles = answer.map((a) => { return a.label.trim() });
await Tag.setNoteTagsByTitles(command.noteId, tagTitles);
}
this.setState({ promptOptions: null });
@@ -448,7 +451,7 @@ class MainScreenComponent extends React.Component {
if (this.props.hasDisabledSyncItems) {
msg = <span>{_('Some items cannot be synchronised.')} <a href="#" onClick={() => { onViewDisabledItemsClick() }}>{_('View them now')}</a></span>
} else if (this.props.showMissingMasterKeyMessage) {
msg = <span>{_('Some items cannot be decrypted.')} <a href="#" onClick={() => { onViewMasterKeysClick() }}>{_('Set the password')}</a></span>
msg = <span>{_('One or more master keys need a password.')} <a href="#" onClick={() => { onViewMasterKeysClick() }}>{_('Set the password')}</a></span>
}
messageComp = (
@@ -496,7 +499,7 @@ class MainScreenComponent extends React.Component {
<VerticalResizer style={styles.verticalResizer} onDrag={this.sidebar_onDrag}/>
<NoteList style={styles.noteList} />
<VerticalResizer style={styles.verticalResizer} onDrag={this.noteList_onDrag}/>
<NoteText style={styles.noteText} visiblePanes={this.props.noteVisiblePanes} />
<NoteText style={styles.noteText} visiblePanes={this.props.noteVisiblePanes} noteDevToolsVisible={this.props.noteDevToolsVisible}/>
{pluginDialog}
</div>
@@ -521,6 +524,7 @@ const mapStateToProps = (state) => {
noteListWidth: state.settings['style.noteList.width'],
selectedNoteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null,
plugins: state.plugins,
noteDevToolsVisible: state.noteDevToolsVisible,
};
};

View File

@@ -382,7 +382,23 @@ class NoteTextComponent extends React.Component {
ExternalEditWatcher.instance().off('noteChange', this.externalEditWatcher_noteChange);
}
async saveIfNeeded(saveIfNewNote = false) {
componentDidUpdate(prevProps) {
if (this.webviewRef() && this.props.noteDevToolsVisible !== this.webviewRef().isDevToolsOpened()) {
if (this.props.noteDevToolsVisible) {
this.webviewRef().openDevTools();
} else {
this.webviewRef().closeDevTools();
}
}
}
webviewRef() {
if (!this.webviewRef_.current || !this.webviewRef_.current.wrappedInstance) return null;
if (!this.webviewRef_.current.wrappedInstance.domReady()) return null;
return this.webviewRef_.current.wrappedInstance;
}
async saveIfNeeded(saveIfNewNote = false, options = {}) {
const forceSave = saveIfNewNote && (this.state.note && !this.state.note.id);
if (this.scheduleSaveTimeout_) clearTimeout(this.scheduleSaveTimeout_);
@@ -390,7 +406,7 @@ class NoteTextComponent extends React.Component {
if (!forceSave) {
if (!shared.isModified(this)) return;
}
await shared.saveNoteButton_press(this);
await shared.saveNoteButton_press(this, null, options);
ExternalEditWatcher.instance().updateNoteFile(this.state.note);
}
@@ -757,7 +773,6 @@ class NoteTextComponent extends React.Component {
// When using the file:// protocol, openExternal doesn't work (does nothing) with URL-encoded paths
require('electron').shell.openExternal(urlDecode(msg));
} else {
console.info('OPEN URL');
require('electron').shell.openExternal(msg);
}
} else if (msg.indexOf('#') === 0) {
@@ -881,9 +896,6 @@ class NoteTextComponent extends React.Component {
}
return output;
}
//fixes #1426 but this is an Ace issue, so it can be removed if ace/brace is updated.
this.editor_.editor.getSession().getMode().$quotes = {'"': '"', "'": "'", "`": "`"};
// Disable Markdown auto-completion (eg. auto-adding a dash after a line with a dash.
// https://github.com/ajaxorg/ace/issues/2754
@@ -1007,6 +1019,8 @@ class NoteTextComponent extends React.Component {
fn = this.commandStartExternalEditing;
} else if (command.name === 'showLocalSearch') {
fn = this.commandShowLocalSearch;
} else if (command.name === 'textCode') {
fn = this.commandTextCode;
}
}
@@ -1158,6 +1172,9 @@ class NoteTextComponent extends React.Component {
async commandStartExternalEditing() {
try {
await this.saveIfNeeded(true, {
autoTitle: false,
});
await ExternalEditWatcher.instance().openAndWatch(this.state.note);
} catch (error) {
bridge().showErrorMessageBox(_('Error opening note in editor: %s', error.message));

View File

@@ -9,6 +9,7 @@ class NoteTextViewerComponent extends React.Component {
super();
this.initialized_ = false;
this.domReady_ = false;
this.webviewRef_ = React.createRef();
this.webviewListeners_ = null;
@@ -18,6 +19,7 @@ class NoteTextViewerComponent extends React.Component {
}
webview_domReady(event) {
this.domReady_ = true;
if (this.props.onDomReady) this.props.onDomReady(event);
}
@@ -25,6 +27,10 @@ class NoteTextViewerComponent extends React.Component {
if (this.props.onIpcMessage) this.props.onIpcMessage(event);
}
domReady() {
return this.domReady_;
}
initWebview() {
const wv = this.webviewRef_.current;
@@ -65,6 +71,9 @@ class NoteTextViewerComponent extends React.Component {
const fn = this.webviewListeners_[n];
wv.removeEventListener(n, fn);
}
this.initialized_ = false;
this.domReady_ = false;
}
tryInit() {
@@ -116,6 +125,14 @@ class NoteTextViewerComponent extends React.Component {
return this.webviewRef_.current.openDevTools();
}
closeDevTools() {
return this.webviewRef_.current.closeDevTools();
}
isDevToolsOpened() {
return this.webviewRef_.current.isDevToolsOpened();
}
// ----------------------------------------------------------------
// Wrap WebView functions (END)
// ----------------------------------------------------------------

View File

@@ -5,9 +5,17 @@ const moment = require('moment');
const { themeStyle } = require('../theme.js');
const { time } = require('lib/time-utils.js');
const Datetime = require('react-datetime');
const CreatableSelect = require('react-select/lib/Creatable').default;
const makeAnimated = require('react-select/lib/animated').default;
class PromptDialog extends React.Component {
constructor() {
super();
this.answerInput_ = React.createRef();
}
componentWillMount() {
this.setState({
visible: false,
@@ -28,7 +36,7 @@ class PromptDialog extends React.Component {
}
componentDidUpdate() {
if (this.focusInput_ && this.answerInput_) this.answerInput_.focus();
if (this.focusInput_ && this.answerInput_.current) this.answerInput_.current.focus();
this.focusInput_ = false;
}
@@ -53,15 +61,16 @@ class PromptDialog extends React.Component {
height: height - paddingTop,
backgroundColor: 'rgba(0,0,0,0.6)',
display: visible ? 'flex' : 'none',
alignItems: 'flex-start',
justifyContent: 'center',
paddingTop: paddingTop + 'px',
alignItems: 'flex-start',
justifyContent: 'center',
paddingTop: paddingTop + 'px',
};
this.styles_.promptDialog = {
backgroundColor: theme.backgroundColor,
padding: 16,
display: 'inline-block',
maxWidth: width * 0.5,
boxShadow: '6px 6px 20px rgba(0,0,0,0.5)',
};
@@ -80,7 +89,7 @@ class PromptDialog extends React.Component {
fontSize: theme.fontSize,
color: theme.color,
fontFamily: theme.fontFamily,
verticalAlign: 'top',
verticalAlign: 'middle',
};
this.styles_.input = {
@@ -92,6 +101,41 @@ class PromptDialog extends React.Component {
borderColor: theme.dividerColor,
};
this.styles_.tagList = {
control: (provided) => (Object.assign(provided, {
minWidth: width * 0.2,
maxWidth: width * 0.5,
})),
input: (provided) => (Object.assign(provided, {
minWidth: '20px',
color: theme.color,
})),
menu: (provided) => (Object.assign(provided, {
color: theme.color,
fontFamily: theme.fontFamily,
backgroundColor: theme.backgroundColor,
})),
multiValueLabel: (provided) => (Object.assign(provided, {
fontFamily: theme.fontFamily,
})),
multiValueRemove: (provided) => (Object.assign(provided, {
color: theme.color,
})),
};
this.styles_.tagListTheme = (tagTheme) => (Object.assign(tagTheme, {
borderRadius: 2,
colors: Object.assign(tagTheme.colors, {
primary: theme.raisedBackgroundColor,
primary25: theme.raisedBackgroundColor,
neutral0: theme.backgroundColor,
neutral10: theme.raisedBackgroundColor,
neutral80: theme.color,
danger: theme.backgroundColor,
dangerLight: theme.colorError2,
}),
}));
this.styles_.desc = Object.assign({}, theme.textStyle, {
marginTop: 10,
});
@@ -135,8 +179,13 @@ class PromptDialog extends React.Component {
this.setState({ answer: momentObject });
}
const onTagsChange = (newTags) => {
this.setState({ answer: newTags });
this.focusInput_ = true;
}
const onKeyDown = (event) => {
if (event.key === 'Enter') {
if (event.key === 'Enter' && this.props.inputType !== 'tags') {
onClose(true);
} else if (event.key === 'Escape') {
onClose(false);
@@ -155,10 +204,25 @@ class PromptDialog extends React.Component {
timeFormat={time.timeFormat()}
onChange={(momentObject) => onDateTimeChange(momentObject)}
/>
} else if (this.props.inputType === 'tags') {
inputComp = <CreatableSelect
styles={styles.tagList}
theme={styles.tagListTheme}
ref={this.answerInput_}
value={this.state.answer}
placeholder=""
components={makeAnimated()}
isMulti={true}
isClearable={false}
backspaceRemovesValue={true}
options={this.props.autocomplete}
onChange={onTagsChange}
onKeyDown={(event) => onKeyDown(event)}
/>
} else {
inputComp = <input
style={styles.input}
ref={input => this.answerInput_ = input}
ref={this.answerInput_}
value={this.state.answer}
type="text"
onChange={(event) => onChange(event)}

View File

@@ -103,7 +103,7 @@ class SideBarComponent extends React.Component {
};
}
style() {
style(depth) {
const theme = themeStyle(this.props.theme);
const itemHeight = 25;
@@ -118,6 +118,8 @@ class SideBarComponent extends React.Component {
// paddingLeft: 14,
display: "flex",
alignItems: "stretch",
// Allow 3 levels of color depth
backgroundColor: theme.depthColor.replace('OPACITY', Math.min(depth * 0.1, 0.3)),
},
listItem: {
fontFamily: theme.fontFamily,
@@ -417,7 +419,7 @@ class SideBarComponent extends React.Component {
const itemTitle = Folder.displayTitle(folder);
let containerStyle = Object.assign({}, this.style().listItemContainer);
let containerStyle = Object.assign({}, this.style(depth).listItemContainer);
if (selected) containerStyle = Object.assign(containerStyle, this.style().listItemSelected);
let expandLinkStyle = Object.assign({}, this.style().listItemExpandIcon);

View File

@@ -48,6 +48,7 @@ class StatusScreenComponent extends React.Component {
const style = this.props.style;
const headerStyle = Object.assign({}, theme.headerStyle, { width: style.width });
const retryStyle = Object.assign({}, theme.urlStyle, {marginLeft: 5});
const containerPadding = 10;
@@ -60,16 +61,34 @@ class StatusScreenComponent extends React.Component {
return <h2 key={'section_' + key} style={theme.h2Style}>{title}</h2>
}
function renderSectionHtml(key, section) {
const renderSectionHtml = (key, section) => {
let itemsHtml = [];
itemsHtml.push(renderSectionTitleHtml(section.title, section.title));
for (let n in section.body) {
if (!section.body.hasOwnProperty(n)) continue;
let text = section.body[n];
let item = section.body[n];
let text = '';
let retryLink = null;
if (typeof item === 'object') {
if (item.canRetry) {
const onClick = async () => {
await item.retryHandler();
this.resfreshScreen();
}
retryLink = <a href="#" onClick={onClick} style={retryStyle}>{_('Retry')}</a>;
}
text = item.text;
} else {
text = item;
}
if (!text) text = '\xa0';
itemsHtml.push(<div style={theme.textStyle} key={'item_' + n}>{text}</div>);
itemsHtml.push(<div style={theme.textStyle} key={'item_' + n}><span>{text}</span>{retryLink}</div>);
}
return (

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "1.0.157",
"version": "1.0.160",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -28,6 +28,115 @@
"integrity": "sha512-uPHXapEmUtlUKTBx4asWMlxtFUWXzEY0KVEgU7QKhgO2LJzzM3kYxM6yOyUZTtYE6mhK4dDn3FDut9SCQWHzgg==",
"optional": true
},
"@babel/helper-module-imports": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
"integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
"requires": {
"@babel/types": "^7.0.0"
}
},
"@babel/runtime": {
"version": "7.4.5",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
"integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
"requires": {
"regenerator-runtime": "^0.13.2"
},
"dependencies": {
"regenerator-runtime": {
"version": "0.13.2",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
"integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
}
}
},
"@babel/types": {
"version": "7.4.4",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
"integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
"requires": {
"esutils": "^2.0.2",
"lodash": "^4.17.11",
"to-fast-properties": "^2.0.0"
},
"dependencies": {
"lodash": {
"version": "4.17.11",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
},
"to-fast-properties": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
}
}
},
"@emotion/babel-utils": {
"version": "0.6.10",
"resolved": "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.10.tgz",
"integrity": "sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow==",
"requires": {
"@emotion/hash": "^0.6.6",
"@emotion/memoize": "^0.6.6",
"@emotion/serialize": "^0.9.1",
"convert-source-map": "^1.5.1",
"find-root": "^1.1.0",
"source-map": "^0.7.2"
},
"dependencies": {
"convert-source-map": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
"requires": {
"safe-buffer": "~5.1.1"
}
},
"source-map": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
}
}
},
"@emotion/hash": {
"version": "0.6.6",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz",
"integrity": "sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ=="
},
"@emotion/memoize": {
"version": "0.6.6",
"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz",
"integrity": "sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ=="
},
"@emotion/serialize": {
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.9.1.tgz",
"integrity": "sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==",
"requires": {
"@emotion/hash": "^0.6.6",
"@emotion/memoize": "^0.6.6",
"@emotion/unitless": "^0.6.7",
"@emotion/utils": "^0.8.2"
}
},
"@emotion/stylis": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.7.1.tgz",
"integrity": "sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ=="
},
"@emotion/unitless": {
"version": "0.6.7",
"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.6.7.tgz",
"integrity": "sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg=="
},
"@emotion/utils": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.8.2.tgz",
"integrity": "sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw=="
},
"@types/node": {
"version": "10.14.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.5.tgz",
@@ -50,18 +159,18 @@
"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
},
"acorn-globals": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz",
"integrity": "sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==",
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz",
"integrity": "sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==",
"requires": {
"acorn": "^6.0.1",
"acorn-walk": "^6.0.1"
},
"dependencies": {
"acorn": {
"version": "6.0.5",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.5.tgz",
"integrity": "sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg=="
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="
}
}
},
@@ -579,6 +688,35 @@
"babel-runtime": "^6.22.0"
}
},
"babel-plugin-emotion": {
"version": "9.2.11",
"resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz",
"integrity": "sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ==",
"requires": {
"@babel/helper-module-imports": "^7.0.0",
"@emotion/babel-utils": "^0.6.4",
"@emotion/hash": "^0.6.2",
"@emotion/memoize": "^0.6.1",
"@emotion/stylis": "^0.7.0",
"babel-plugin-macros": "^2.0.0",
"babel-plugin-syntax-jsx": "^6.18.0",
"convert-source-map": "^1.5.0",
"find-root": "^1.1.0",
"mkdirp": "^0.5.1",
"source-map": "^0.5.7",
"touch": "^2.0.1"
}
},
"babel-plugin-macros": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.5.1.tgz",
"integrity": "sha512-xN3KhAxPzsJ6OQTktCanNpIFnnMsCV+t8OloKxIL72D6+SUZYFn9qfklPgef5HyyDtzYZqqb+fs1S12+gQY82Q==",
"requires": {
"@babel/runtime": "^7.4.2",
"cosmiconfig": "^5.2.0",
"resolve": "^1.10.0"
}
},
"babel-plugin-syntax-flow": {
"version": "6.18.0",
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
@@ -588,8 +726,7 @@
"babel-plugin-syntax-jsx": {
"version": "6.18.0",
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
"integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
"dev": true
"integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
},
"babel-plugin-transform-flow-strip-types": {
"version": "6.22.0",
@@ -1095,6 +1232,27 @@
"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
"dev": true
},
"caller-callsite": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
"integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
"requires": {
"callsites": "^2.0.0"
}
},
"caller-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
"integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
"requires": {
"caller-callsite": "^2.0.0"
}
},
"callsites": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
"integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
},
"camelcase": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
@@ -1383,8 +1541,7 @@
"convert-source-map": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
"dev": true
"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU="
},
"core-js": {
"version": "1.2.7",
@@ -1396,6 +1553,51 @@
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
"cosmiconfig": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
"integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
"requires": {
"import-fresh": "^2.0.0",
"is-directory": "^0.3.1",
"js-yaml": "^3.13.1",
"parse-json": "^4.0.0"
},
"dependencies": {
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
"parse-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
"requires": {
"error-ex": "^1.3.1",
"json-parse-better-errors": "^1.0.1"
}
}
}
},
"create-emotion": {
"version": "9.2.12",
"resolved": "https://registry.npmjs.org/create-emotion/-/create-emotion-9.2.12.tgz",
"integrity": "sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA==",
"requires": {
"@emotion/hash": "^0.6.2",
"@emotion/memoize": "^0.6.1",
"@emotion/stylis": "^0.7.0",
"@emotion/unitless": "^0.6.2",
"csstype": "^2.5.2",
"stylis": "^3.5.0",
"stylis-rule-sheet": "^0.0.10"
}
},
"create-error-class": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
@@ -1438,18 +1640,23 @@
"dev": true
},
"cssom": {
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz",
"integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog=="
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz",
"integrity": "sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A=="
},
"cssstyle": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.1.1.tgz",
"integrity": "sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==",
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.2.tgz",
"integrity": "sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==",
"requires": {
"cssom": "0.3.x"
}
},
"csstype": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.4.tgz",
"integrity": "sha512-lAJUJP3M6HxFXbqtGRc0iZrdyeN+WzOWeY0q/VnFzI+kqVrYIzC7bWlKqCW7oCIdzoPkvfp82EVvrTlQ8zsWQg=="
},
"currently-unhandled": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -1603,6 +1810,14 @@
}
}
},
"dom-helpers": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
"integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
"requires": {
"@babel/runtime": "^7.1.2"
}
},
"domexception": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
@@ -1946,6 +2161,15 @@
}
}
},
"emotion": {
"version": "9.2.12",
"resolved": "https://registry.npmjs.org/emotion/-/emotion-9.2.12.tgz",
"integrity": "sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ==",
"requires": {
"babel-plugin-emotion": "^9.2.11",
"create-emotion": "^9.2.12"
}
},
"encoding": {
"version": "0.1.12",
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
@@ -1978,7 +2202,6 @@
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
"dev": true,
"requires": {
"is-arrayish": "^0.2.1"
}
@@ -2000,9 +2223,9 @@
"dev": true
},
"escodegen": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
"integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
"version": "1.11.1",
"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
"integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
"requires": {
"esprima": "^3.1.3",
"estraverse": "^4.2.0",
@@ -2027,8 +2250,7 @@
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
},
"estraverse": {
"version": "4.2.0",
@@ -2224,6 +2446,11 @@
"to-regex-range": "^5.0.1"
}
},
"find-root": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
"integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
},
"find-up": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
@@ -3243,6 +3470,15 @@
"file-type": "^4.1.0"
}
},
"import-fresh": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
"integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
"requires": {
"caller-path": "^2.0.0",
"resolve-from": "^3.0.0"
}
},
"import-lazy": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
@@ -3300,8 +3536,7 @@
"is-arrayish": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
"dev": true
"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
},
"is-binary-path": {
"version": "1.0.1",
@@ -3336,6 +3571,11 @@
"ci-info": "^2.0.0"
}
},
"is-directory": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
},
"is-dotfile": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
@@ -3512,10 +3752,11 @@
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
},
"joplin-turndown": {
"version": "4.0.11",
"resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.11.tgz",
"integrity": "sha512-2oiwWX0nKYi1NVcaprSsrXQkYdGoRtPWFmnXdWQnQW44jlgjFV38B4VrgliwX5ZMq7cbx6A9IBwfXcBL2YV2NA==",
"version": "4.0.12",
"resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.12.tgz",
"integrity": "sha512-HlxkcIiNFSMLBvYktoXqLLHFGuwQYlcPclo0Peeatw3cPe6iFqSsEgEGY/0bYM/fubA/zpPULrJcjST99BO9wQ==",
"requires": {
"html-entities": "^1.2.1",
"jsdom": "^11.9.0"
}
},
@@ -3584,6 +3825,11 @@
"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
"dev": true
},
"json-parse-better-errors": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
},
"json-schema": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -3695,9 +3941,9 @@
}
},
"linkify-it": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",
"integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz",
"integrity": "sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==",
"requires": {
"uc.micro": "^1.0.1"
}
@@ -3933,31 +4179,23 @@
"integrity": "sha1-RqGqlHEFrtgYiXjgoBYXnkBPQsc="
},
"markdown-it-multimd-table": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-3.1.3.tgz",
"integrity": "sha1-l5Jr4N87WWdhGEZM5D0C03nKNNw=",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-3.2.0.tgz",
"integrity": "sha512-dBtYHVtyAnoWslzYLYDh0d9jX2/qroyMIsJ1BjFdIcLgZjzqBIBGwZ1j3AaaWh+IIfe3KVm5Irqn5Uzadm5kQA==",
"requires": {
"markdown-it": "^5.0.3"
"markdown-it": "^8.4.2"
},
"dependencies": {
"linkify-it": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
"integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
"requires": {
"uc.micro": "^1.0.1"
}
},
"markdown-it": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-5.1.0.tgz",
"integrity": "sha1-JShrhGW6xJbz8bd+7VRGQ+m9cY0=",
"version": "8.4.2",
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
"integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
"requires": {
"argparse": "~1.0.3",
"argparse": "^1.0.7",
"entities": "~1.1.1",
"linkify-it": "~1.2.0",
"mdurl": "~1.0.1",
"uc.micro": "^1.0.0"
"linkify-it": "^2.0.0",
"mdurl": "^1.0.1",
"uc.micro": "^1.0.5"
}
}
}
@@ -3973,9 +4211,9 @@
"integrity": "sha1-y5yf+RpSVawI8/09YyhuFd8KH8M="
},
"markdown-it-toc-done-right": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-3.0.1.tgz",
"integrity": "sha512-pppqoXWFyMD/JCLL7YZSYPnxJHr7DH7psXfHzTOXWof8b6XGhbCDYYha6Vi6EDwDEKY+dthNVtMSLHPlk0c1xw=="
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.0.0.tgz",
"integrity": "sha512-jaoIC02ehqUrT6RpbNZMe+ug7BaW3V6G1qTi/hTtcswuFWunP2H2GzmVobWIyOb3nQ4HNBXHqdbsv8fEsMCKWA=="
},
"match-at": {
"version": "0.1.1",
@@ -4015,6 +4253,11 @@
"p-is-promise": "^2.0.0"
}
},
"memoize-one": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.0.4.tgz",
"integrity": "sha512-P0z5IeAH6qHHGkJIXWw0xC2HNEgkx/9uWWBQw64FJj3/ol14VYdfVGWWr0fXfjhhv3TKVIqUq65os6O4GUNksA=="
},
"meow": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -4371,9 +4614,9 @@
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
},
"nwsapi": {
"version": "2.0.9",
"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.9.tgz",
"integrity": "sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ=="
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
"integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="
},
"oauth-sign": {
"version": "0.8.2",
@@ -4717,6 +4960,11 @@
"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
"dev": true
},
"path-parse": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
},
"path-type": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
@@ -4905,6 +5153,14 @@
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
"integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg=="
},
"raf": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
"requires": {
"performance-now": "^2.1.0"
}
},
"random-bytes": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
@@ -5023,11 +5279,24 @@
"prop-types": "^15.6.0"
}
},
"react-input-autosize": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.1.tgz",
"integrity": "sha512-3+K4CD13iE4lQQ2WlF8PuV5htfmTRLH6MDnfndHM6LuBRszuXnuyIfE7nhSKt8AzRBZ50bu0sAhkNMeS5pxQQA==",
"requires": {
"prop-types": "^15.5.8"
}
},
"react-is": {
"version": "16.8.6",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
"integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
},
"react-lifecycles-compat": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"react-onclickoutside": {
"version": "6.7.1",
"resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.7.1.tgz",
@@ -5053,6 +5322,20 @@
}
}
},
"react-select": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/react-select/-/react-select-2.4.3.tgz",
"integrity": "sha512-cmxNaiHpviRYkojeW9rGEUJ4jpX7QTmPe2wcscwA4d1lStzw/cJtr4ft5H2O/YhfpkrcwaLghu3XmEYdXhBo8Q==",
"requires": {
"classnames": "^2.2.5",
"emotion": "^9.1.2",
"memoize-one": "^5.0.0",
"prop-types": "^15.6.0",
"raf": "^3.4.0",
"react-input-autosize": "^2.2.1",
"react-transition-group": "^2.2.1"
}
},
"react-tooltip": {
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.10.0.tgz",
@@ -5062,6 +5345,37 @@
"prop-types": "^15.6.0"
}
},
"react-transition-group": {
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
"integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
"requires": {
"dom-helpers": "^3.4.0",
"loose-envify": "^1.4.0",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
},
"dependencies": {
"loose-envify": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"requires": {
"js-tokens": "^3.0.0 || ^4.0.0"
}
},
"prop-types": {
"version": "15.7.2",
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
"integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
"requires": {
"loose-envify": "^1.4.0",
"object-assign": "^4.1.1",
"react-is": "^16.8.1"
}
}
}
},
"read-chunk": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz",
@@ -5288,21 +5602,28 @@
}
},
"request-promise-core": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
"integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
"integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
"requires": {
"lodash": "^4.13.1"
"lodash": "^4.17.11"
},
"dependencies": {
"lodash": {
"version": "4.17.11",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
}
}
},
"request-promise-native": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz",
"integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=",
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
"integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
"requires": {
"request-promise-core": "1.1.1",
"stealthy-require": "^1.1.0",
"tough-cookie": ">=2.3.3"
"request-promise-core": "1.1.2",
"stealthy-require": "^1.1.1",
"tough-cookie": "^2.3.3"
}
},
"require-directory": {
@@ -5322,6 +5643,19 @@
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
},
"resolve": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
"integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
"requires": {
"path-parse": "^1.0.6"
}
},
"resolve-from": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
},
"restore-cursor": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
@@ -5507,8 +5841,7 @@
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
},
"source-map-support": {
"version": "0.4.18",
@@ -5689,6 +6022,16 @@
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
},
"stylis": {
"version": "3.5.4",
"resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
"integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="
},
"stylis-rule-sheet": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
"integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="
},
"sumchecker": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
@@ -5710,9 +6053,9 @@
"integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
},
"symbol-tree": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
"integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
},
"syswide-cas": {
"version": "5.1.0",
@@ -5849,6 +6192,24 @@
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
"integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
},
"touch": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/touch/-/touch-2.0.2.tgz",
"integrity": "sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A==",
"requires": {
"nopt": "~1.0.10"
},
"dependencies": {
"nopt": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
"integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
"requires": {
"abbrev": "1"
}
}
}
},
"tough-cookie": {
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",

View File

@@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "1.0.157",
"version": "1.0.160",
"description": "Joplin for Desktop",
"main": "main.js",
"scripts": {
@@ -101,7 +101,7 @@
"highlight.js": "^9.15.6",
"html-entities": "^1.2.1",
"image-type": "^3.0.0",
"joplin-turndown": "^4.0.11",
"joplin-turndown": "^4.0.12",
"joplin-turndown-plugin-gfm": "^1.0.8",
"jssha": "^2.3.1",
"katex": "^0.10.0",
@@ -117,10 +117,10 @@
"markdown-it-ins": "^2.0.0",
"markdown-it-katex": "^2.0.3",
"markdown-it-mark": "^2.0.0",
"markdown-it-multimd-table": "^3.1.3",
"markdown-it-multimd-table": "^3.2.0",
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
"markdown-it-toc-done-right": "^3.0.1",
"markdown-it-toc-done-right": "^4.0.0",
"md5": "^2.2.1",
"mime": "^2.3.1",
"moment": "^2.22.2",
@@ -134,6 +134,7 @@
"react-datetime": "^2.14.0",
"react-dom": "^16.4.0",
"react-redux": "^5.0.7",
"react-select": "^2.4.3",
"react-tooltip": "^3.10.0",
"read-chunk": "^2.1.0",
"readability-node": "^0.1.0",

View File

@@ -82,6 +82,7 @@ const lightStyle = {
urlColor: '#155BDA',
backgroundColor2: "#162B3D",
depthColor: 'rgb(100, 182, 253, OPACITY)',
color2: "#f5f5f5",
selectedColor2: "#0269C2",
colorError2: "#ff6c6c",
@@ -119,8 +120,9 @@ const darkStyle = {
urlColor: '#4E87EE',
backgroundColor2: "#181A1D",
depthColor: 'rgb(200, 200, 200, OPACITY)',
color2: "#ffffff",
selectedColor2: "#333333",
selectedColor2: "#013F74",
colorError2: "#ff6c6c",
raisedBackgroundColor: "#474747",
@@ -247,10 +249,13 @@ function themeStyle(theme) {
const cacheKey = [theme, zoomRatio, editorFontSize].join('-');
if (themeCache_[cacheKey]) return themeCache_[cacheKey];
// Font size are not theme specific, but they must be referenced
// and computed here to allow them to respond to settings changes
// without the need to restart
let fontSizes = {
fontSize: Math.round(12 * zoomRatio),
fontSize: Math.round(globalStyle.fontSize * zoomRatio),
editorFontSize: editorFontSize,
textAreaLineHeight: Math.round(17 * editorFontSize / 12),
textAreaLineHeight: Math.round(globalStyle.textAreaLineHeight * editorFontSize / 12),
// For WebView - must correspond to the properties above
htmlFontSize: Math.round(15 * zoomRatio) + 'px',

3
ElectronClient/package-lock.json generated Normal file
View File

@@ -0,0 +1,3 @@
{
"lockfileVersion": 1
}

View File

@@ -56,7 +56,8 @@ if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$version" ]]; t
# Download icon
echo 'Downloading icon...'
wget -nv -O ~/.joplin/Icon512.png https://joplinapp.org/images/Icon512.png
mkdir -p ~/.local/share/icons/hicolor/512x512/apps
wget -nv -O ~/.local/share/icons/hicolor/512x512/apps/joplin.png https://joplinapp.org/images/Icon512.png
echo "${COLOR_GREEN}OK${COLOR_RESET}"
# Detect desktop environment
@@ -83,7 +84,7 @@ if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$version" ]]; t
# On some systems this directory doesn't exist by default
mkdir -p ~/.local/share/applications
echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nComment=Joplin for Desktop\nExec=/home/$USER/.joplin/Joplin.AppImage\nIcon=/home/$USER/.joplin/Icon512.png\nStartupWMClass=Joplin\nType=Application\nCategories=Application;\n$APPIMAGE_VERSION" >> ~/.local/share/applications/appimagekit-joplin.desktop
echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nComment=Joplin for Desktop\nExec=/home/$USER/.joplin/Joplin.AppImage\nIcon=joplin\nStartupWMClass=Joplin\nType=Application\nCategories=Application;\n$APPIMAGE_VERSION" >> ~/.local/share/applications/appimagekit-joplin.desktop
echo "${COLOR_GREEN}OK${COLOR_RESET}"
else
echo "${COLOR_RED}NOT DONE${COLOR_RESET}"

View File

@@ -20,15 +20,15 @@ Three types of applications are available: for the **desktop** (Windows, macOS a
Operating System | Download | Alternative
-----------------|--------|-------------------
Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-Setup-1.0.152.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-1.0.152.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.152/Joplin-1.0.152-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`
Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.159/Joplin-Setup-1.0.159.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> | Or get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.159/JoplinPortable.exe'>Portable version</a><br><br>The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.159/Joplin-1.0.159.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> | You can also use Homebrew: `brew cask install joplin`
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.159/Joplin-1.0.159-x86_64.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a> | An Arch Linux package [is also available](#terminal-application).<br><br>If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:<br><br> `wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh \| bash`
## Mobile applications
Operating System | Download | Alt. Download
-----------------|----------|----------------
Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.255/joplin-v1.0.255.apk)
Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.269/joplin-v1.0.269.apk)
iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplinapp.org/images/BadgeIOS.png'/></a> | -
## Terminal application
@@ -337,6 +337,7 @@ Please see the [donation page](https://joplinapp.org/donate/) for information on
- Also see here for information about [the latest releases and general news](https://discourse.joplinapp.org/c/news).
- For bug reports and feature requests, go to the [GitHub Issue Tracker](https://github.com/laurent22/joplin/issues).
- The latest news are posted [on the Patreon page](https://www.patreon.com/joplin).
- You can also follow us on [the Twitter feed](https://twitter.com/joplinapp).
# Contributing
@@ -360,34 +361,34 @@ Current translations:
<!-- LOCALE-TABLE-AUTO-GENERATED -->
&nbsp; | Language | Po File | Last translator | Percent done
---|---|---|---|---
![](https://joplinapp.org/images/flags/country-4x3/arableague.png) | Arabic | [ar](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ar.po) | عبد الناصر سعيد (as@althobaity.com) | 92%
![](https://joplinapp.org/images/flags/es/basque_country.png) | Basque | [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po) | juan.abasolo@ehu.eus | 52%
![](https://joplinapp.org/images/flags/es/catalonia.png) | Catalan | [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po) | jmontane, 2018 | 75%
![](https://joplinapp.org/images/flags/country-4x3/arableague.png) | Arabic | [ar](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ar.po) | عبد الناصر سعيد (as@althobaity.com) | 91%
![](https://joplinapp.org/images/flags/es/basque_country.png) | Basque | [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po) | juan.abasolo@ehu.eus | 51%
![](https://joplinapp.org/images/flags/es/catalonia.png) | Catalan | [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po) | jmontane, 2018 | 73%
![](https://joplinapp.org/images/flags/country-4x3/hr.png) | Croatian | [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po) | Hrvoje Mandić (trbuhom@net.hr) | 42%
![](https://joplinapp.org/images/flags/country-4x3/cz.png) | Czech | [cs_CZ](https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po) | Lukas Helebrandt (lukas@aiya.cz) | 92%
![](https://joplinapp.org/images/flags/country-4x3/dk.png) | Dansk | [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po) | Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk. | 67%
![](https://joplinapp.org/images/flags/country-4x3/de.png) | Deutsch | [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po) | Michael Sonntag (ms@editorei.de) | 100%
![](https://joplinapp.org/images/flags/country-4x3/cz.png) | Czech | [cs_CZ](https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po) | Lukas Helebrandt (lukas@aiya.cz) | 91%
![](https://joplinapp.org/images/flags/country-4x3/dk.png) | Dansk | [da_DK](https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po) | Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk. | 66%
![](https://joplinapp.org/images/flags/country-4x3/de.png) | Deutsch | [de_DE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po) | Michael Sonntag (ms@editorei.de) | 98%
![](https://joplinapp.org/images/flags/country-4x3/gb.png) | English (UK) | [en_GB](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_GB.po) | | 100%
![](https://joplinapp.org/images/flags/country-4x3/us.png) | English (US) | [en_US](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_US.po) | | 100%
![](https://joplinapp.org/images/flags/country-4x3/es.png) | Español | [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po) | Andros Fenollosa (andros@fenollosa.email) | 92%
![](https://joplinapp.org/images/flags/country-4x3/es.png) | Español | [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po) | Andros Fenollosa (andros@fenollosa.email) | 98%
![](https://joplinapp.org/images/flags/country-4x3/fr.png) | Français | [fr_FR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po) | Laurent Cozic | 100%
![](https://joplinapp.org/images/flags/es/galicia.png) | Galician | [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po) | Marcos Lans (marcoslansgarza@gmail.com) | 66%
![](https://joplinapp.org/images/flags/country-4x3/it.png) | Italiano | [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po) | | 82%
![](https://joplinapp.org/images/flags/es/galicia.png) | Galician | [gl_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po) | Marcos Lans (marcoslansgarza@gmail.com) | 65%
![](https://joplinapp.org/images/flags/country-4x3/it.png) | Italiano | [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po) | | 92%
![](https://joplinapp.org/images/flags/country-4x3/be.png) | Nederlands | [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po) | | 52%
![](https://joplinapp.org/images/flags/country-4x3/nl.png) | Nederlands | [nl_NL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po) | Heimen Stoffels (vistausss@outlook.com) | 80%
![](https://joplinapp.org/images/flags/country-4x3/no.png) | Norwegian | [nb_NO](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po) | Mats Estensen (code@mxe.no) | 93%
![](https://joplinapp.org/images/flags/country-4x3/ir.png) | Persian | [fa](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fa.po) | Mehrad Mahmoudian (mehrad@mahmoudian.me) | 36%
![](https://joplinapp.org/images/flags/country-4x3/nl.png) | Nederlands | [nl_NL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po) | Heimen Stoffels (vistausss@outlook.com) | 79%
![](https://joplinapp.org/images/flags/country-4x3/no.png) | Norwegian | [nb_NO](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po) | Mats Estensen (code@mxe.no) | 91%
![](https://joplinapp.org/images/flags/country-4x3/ir.png) | Persian | [fa](https://github.com/laurent22/joplin/blob/master/CliClient/locales/fa.po) | Mehrad Mahmoudian (mehrad@mahmoudian.me) | 49%
![](https://joplinapp.org/images/flags/country-4x3/pl.png) | Polski | [pl_PL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pl_PL.po) | | 98%
![](https://joplinapp.org/images/flags/country-4x3/br.png) | Português (Brasil) | [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po) | Renato Nunes Bastos (rnbastos@gmail.com) | 98%
![](https://joplinapp.org/images/flags/country-4x3/ro.png) | Română | [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po) | | 52%
![](https://joplinapp.org/images/flags/country-4x3/si.png) | Slovenian | [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po) | | 65%
![](https://joplinapp.org/images/flags/country-4x3/se.png) | Svenska | [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po) | Jonatan Nyberg (jonatan@autistici.org) | 89%
![](https://joplinapp.org/images/flags/country-4x3/tr.png) | Türkçe | [tr_TR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/tr_TR.po) | Zorbey Doğangüneş (zorbeyd@gmail.com) | 87%
![](https://joplinapp.org/images/flags/country-4x3/ru.png) | Русский | [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po) | Artyom Karlov (artyom.karlov@gmail.com) | 92%
![](https://joplinapp.org/images/flags/country-4x3/cn.png) | 中文 (简体) | [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po) | | 98%
![](https://joplinapp.org/images/flags/country-4x3/tw.png) | 中文 (繁體) | [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po) | penguinsam (samliu@gmail.com) | 80%
![](https://joplinapp.org/images/flags/country-4x3/jp.png) | 日本語 | [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po) | AWASHIRO Ikuya (ikunya@gmail.com) | 87%
![](https://joplinapp.org/images/flags/country-4x3/kr.png) | 한국말 | [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po) | | 88%
![](https://joplinapp.org/images/flags/country-4x3/br.png) | Português (Brasil) | [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po) | Renato Nunes Bastos (rnbastos@gmail.com) | 97%
![](https://joplinapp.org/images/flags/country-4x3/ro.png) | Română | [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po) | | 51%
![](https://joplinapp.org/images/flags/country-4x3/si.png) | Slovenian | [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po) | | 64%
![](https://joplinapp.org/images/flags/country-4x3/se.png) | Svenska | [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po) | Jonatan Nyberg (jonatan@autistici.org) | 88%
![](https://joplinapp.org/images/flags/country-4x3/tr.png) | Türkçe | [tr_TR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/tr_TR.po) | Zorbey Doğangüneş (zorbeyd@gmail.com) | 85%
![](https://joplinapp.org/images/flags/country-4x3/ru.png) | Русский | [ru_RU](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po) | Artyom Karlov (artyom.karlov@gmail.com) | 91%
![](https://joplinapp.org/images/flags/country-4x3/cn.png) | 中文 (简体) | [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po) | | 96%
![](https://joplinapp.org/images/flags/country-4x3/tw.png) | 中文 (繁體) | [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po) | penguinsam (samliu@gmail.com) | 79%
![](https://joplinapp.org/images/flags/country-4x3/jp.png) | 日本語 | [ja_JP](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ja_JP.po) | AWASHIRO Ikuya (ikunya@gmail.com) | 85%
![](https://joplinapp.org/images/flags/country-4x3/kr.png) | 한국말 | [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po) | | 87%
<!-- LOCALE-TABLE-AUTO-GENERATED -->
# Known bugs

View File

@@ -1,3 +0,0 @@
{
"presets": ["module:metro-react-native-babel-preset"]
}

View File

@@ -19,7 +19,6 @@
[libs]
node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow
flow/
[options]
emoji=true
@@ -44,4 +43,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
unsafe.enable_getters_and_setters=true
[version]
^0.42.0
^0.92.0

View File

@@ -8,23 +8,13 @@
# - `buck install -r android/app` - compile, install and run application
#
load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
lib_deps = []
for jarfile in glob(['libs/*.jar']):
name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
lib_deps.append(':' + name)
prebuilt_jar(
name = name,
binary_jar = jarfile,
)
create_aar_targets(glob(["libs/*.aar"]))
for aarfile in glob(['libs/*.aar']):
name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
lib_deps.append(':' + name)
android_prebuilt_aar(
name = name,
aar = aarfile,
)
create_jar_targets(glob(["libs/*.jar"]))
android_library(
name = "all-libs",

View File

@@ -84,24 +84,29 @@ def enableProguardInReleaseBuilds = false
android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig {
applicationId "net.cozic.joplin"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097491
versionName "1.0.255"
versionCode 2097505
versionName "1.0.269"
ndk {
abiFilters "armeabi-v7a", "x86"
}
missingDimensionStrategy 'react-native-camera', 'general'
}
splits {
abi {
reset()
enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK
include "armeabi-v7a", "x86"
include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
}
}
signingConfigs {
@@ -126,7 +131,7 @@ android {
variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here:
// http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
def versionCodes = ["armeabi-v7a":1, "x86":2]
def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants
output.versionCodeOverride =
@@ -134,21 +139,28 @@ android {
}
}
}
packagingOptions {
pickFirst '**/libjsc.so'
pickFirst '**/libc++_shared.so'
}
}
dependencies {
implementation project(':@react-native-community_slider')
implementation "org.webkit:android-jsc:r241213"
implementation project(':react-native-webview')
compile project(':react-native-push-notification')
implementation (project(':react-native-camera')) {
// This is required because com.google.firebase requires v16.0.x of com.google.android.gms
// while react-native-camera requires v15.x, which results in broken dependencies with
// this error message:
//
// The library com.google.android.gms:play-services-base is being requested by various other libraries at [[15.0.1,15.0.1]], but resolves to 16.0.1
//
// For the record: found solution by removing all Firebase stuff here and running "gradlew.bat :app:dependencies"
// That shows that react-native-camera was the one requiring v15.0.1.
exclude group: "com.google.android.gms"
}
// implementation (project(':react-native-camera')) {
// // This is required because com.google.firebase requires v16.0.x of com.google.android.gms
// // while react-native-camera requires v15.x, which results in broken dependencies with
// // this error message:
// //
// // The library com.google.android.gms:play-services-base is being requested by various other libraries at [[15.0.1,15.0.1]], but resolves to 16.0.1
// //
// // For the record: found solution by removing all Firebase stuff here and running "gradlew.bat :app:dependencies"
// // That shows that react-native-camera was the one requiring v15.0.1.
// exclude group: "com.google.android.gms"
// }
implementation project(':react-native-file-viewer')
implementation project(':react-native-securerandom')
implementation project(':react-native-fs')
@@ -164,6 +176,7 @@ dependencies {
implementation project(':react-native-image-resizer')
implementation project(':react-native-share-extension')
implementation project(':react-native-version-info')
implementation project(':react-native-camera')
implementation "com.facebook.react:react-native:+"
// implementation "com.google.android.gms:play-services-base:16.0.1" // For Firebase

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
</manifest>

View File

@@ -3,8 +3,9 @@ package net.cozic.joplin;
import android.app.Application;
import com.facebook.react.ReactApplication;
import com.reactnativecommunity.slider.ReactSliderPackage;
import com.reactnativecommunity.webview.RNCWebViewPackage;
import com.dieam.reactnativepushnotification.ReactNativePushNotificationPackage;
import org.reactnative.camera.RNCameraPackage;
import com.vinzscam.reactnativefileviewer.RNFileViewerPackage;
import net.rhogan.rnsecurerandom.RNSecureRandomPackage;
import com.imagepicker.ImagePickerPackage;
@@ -19,6 +20,7 @@ import com.RNFetchBlob.RNFetchBlobPackage;
import com.rnfs.RNFSPackage;
import fr.bamlab.rnimageresizer.ImageResizerPackage;
import org.pgsqlite.SQLitePluginPackage;
import org.reactnative.camera.RNCameraPackage;
import com.alinz.parkerdan.shareextension.SharePackage;
@@ -39,9 +41,10 @@ public class MainApplication extends Application implements ReactApplication {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new ReactSliderPackage(),
new RNCWebViewPackage(),
new ReactNativePushNotificationPackage(),
new ImageResizerPackage(),
new RNCameraPackage(),
new RNFileViewerPackage(),
new RNSecureRandomPackage(),
new ImagePickerPackage(),
@@ -51,6 +54,7 @@ public class MainApplication extends Application implements ReactApplication {
new SQLitePluginPackage(),
new VectorIconsPackage(),
new SharePackage(),
new RNCameraPackage(),
new RNVersionInfoPackage()
);
}

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