1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-30 20:39:46 +02:00

Compare commits

...

74 Commits

Author SHA1 Message Date
Laurent Cozic
2168090b96 Electron release v1.0.135 2019-02-27 22:52:08 +00:00
Laurent Cozic
33f7b680bc Desktop: Fixes #1273: Trying to improve accuracy of sidebar resizing 2019-02-27 22:44:10 +00:00
Laurent Cozic
0957298cb8 Desktop: Fixes #1268: Fix exporting to PDF and printing, which were broken following upgrade to Electron 4 2019-02-27 22:35:26 +00:00
Laurent Cozic
08f2f982cf Update website 2019-02-27 15:04:34 +00:00
Laurent Cozic
4a31e5fe73 Electron release v1.0.134 2019-02-27 10:03:07 +00:00
Laurent Cozic
baacec5ba6 Electron release v1.0.133 2019-02-27 00:14:24 +00:00
Laurent Cozic
95188b71b8 Desktop: Fixes #1265: Fixed column resize on Windows. Also increased minimum and maximum sizes of columns. 2019-02-27 00:13:56 +00:00
Laurent Cozic
cf57be6e98 Merge branch 'master' of github.com:laurent22/joplin 2019-02-26 23:40:16 +00:00
Laurent Cozic
b691092d7a iOS v10.0.30 2019-02-26 23:39:52 +00:00
Helmut K. C. Tessarek
03e60fc028 Merge pull request #1262 from cybertramp/patch-1
한국말 -> 한국어
2019-02-26 16:52:16 -05:00
Andros Fenollosa
2e25ec318f Update language es_ES (#1257)
* Update language es_ES

* Add Last-Translator

* Translation fix
2019-02-26 16:51:51 -05:00
cybertramp
7236e5e9ae 한국말 -> 한국어
"한국말" -> "한국어"
Korean translation error update.
2019-02-26 19:36:45 +09:00
Helmut K. C. Tessarek
6f7dd51a98 Merge pull request #1261 from tessus/localization-de_DE
Update de_DE.po
2019-02-25 20:32:09 -05:00
Helmut K. C. Tessarek
db1dab9293 Update de_DE.po 2019-02-25 20:24:59 -05:00
Laurent Cozic
06f1b9e4d7 Electron release v1.0.132 2019-02-24 23:46:17 +00:00
Laurent Cozic
8f958ac931 Desktop: Trying to fix sign server 2019-02-24 23:46:05 +00:00
Laurent Cozic
eae63bfb79 Electron release v1.0.131 2019-02-24 19:30:09 +00:00
Laurent Cozic
8adfc81c30 Trying to fix Windows build 2019-02-24 19:30:04 +00:00
Laurent Cozic
0c516443e3 Android release v1.0.239 2019-02-24 18:08:54 +00:00
Laurent Cozic
ad9bc0bf63 Electron release v1.0.130 2019-02-24 18:06:09 +00:00
Laurent Cozic
b0596670a6 Revert "New tag adding dialogue (#1206)"
This reverts commit 229dd7a6dd.
2019-02-24 18:04:25 +00:00
Laurent Cozic
998011ff43 Mobile: Apply tag duplication fix to mobile too 2019-02-24 18:02:50 +00:00
Laurent Cozic
081e1c5b62 Electron release v1.0.129 2019-02-24 17:27:11 +00:00
Laurent Cozic
edfd2c4d54 Desktop: Updated build process to fix buggy electron-builder https://github.com/electron-userland/electron-builder/issues/3660#issuecomment-465461491 2019-02-24 17:26:46 +00:00
Laurent Cozic
9d65a3a34c Android release v1.0.238 2019-02-24 12:53:00 +00:00
Laurent Cozic
1a86cbdb9d Electron release v1.0.128 2019-02-24 12:48:14 +00:00
Laurent Cozic
849cb4456c Update website 2019-02-24 12:38:20 +00:00
Laurent Cozic
1736717f2e Api: Require token for search end point, fixed a few issues and added doc 2019-02-24 12:37:37 +00:00
Laurent Cozic
50b75e1e63 API: Resolves #1148: Added support for search end-point and improved error handling 2019-02-24 12:24:55 +00:00
Laurent Cozic
179005dd6c All: Resolves #1198: In search results, give more weight to more recent notes and less to completed to-dos 2019-02-24 12:00:06 +00:00
Laurent Cozic
6b3fe6b2cb Update translations 2019-02-24 11:27:47 +00:00
Helmut K. C. Tessarek
c34872bb26 when deleting notebook or tag, display name (#1253)
The delete dialog for notebooks and tags does not display the name of the item to be deleted.
This can lead to an undesired result.

closes #1245
2019-02-24 11:11:34 +00:00
Helmut K. C. Tessarek
4845a21287 change notebook icon in toolbar and search result (#1252)
see f6f0bcf1c3
2019-02-24 11:10:55 +00:00
Laurent Cozic
ddd513fe09 Small tweaks to avoid confusion with enum name 2019-02-24 11:10:22 +00:00
Helmut K. C. Tessarek
4ce118d459 add shortcut to start a sync (#1231)
see https://github.com/laurent22/joplin/issues/1151#issuecomment-463845158
2019-02-24 11:09:15 +00:00
ruuti
99da184ba5 Set theme based background color to note webview to avoid white background on scroll when dark theme is enabled. (#1230) 2019-02-24 11:07:49 +00:00
Polshakov Dmitry
e2e4e62c4f Desktop: Fix alt key using (#1216)
Fix #934

On linux if you try to change the layout with Alt + Shift, the menu
will open instead
2019-02-24 11:07:07 +00:00
Caleb John
229dd7a6dd New tag adding dialogue (#1206)
* Update tag adding dialogue
- use datalist to autocomplete tags
- display tags with TagList

* Move the tagItem highlight color to theme.js
2019-02-24 10:55:19 +00:00
Mats Estensen
1e0c4cc5cd Desktop: Add type 'info' and 'OK' button to update dialog when version up-to-date (#1148)
* Add type 'info' and 'OK' button to update dialogue when current version is up to date

* remove whitespace and fix space to tabs

* remove created newline at end of file
2019-02-24 10:54:50 +00:00
Laurent Cozic
b40ccc7a15 All: Fixes #1251: Handle Show Uncompleted Tasks option when selecting a tag 2019-02-24 10:38:06 +00:00
Laurent Cozic
7d6b7e588c Desktop: use nodeIntegration 2019-02-24 10:17:37 +00:00
Laurent Cozic
22cacd2c5b Update website 2019-02-23 15:54:49 +00:00
Laurent Cozic
6a22e7836a Website: Add prerelease page 2019-02-23 15:54:34 +00:00
Laurent Cozic
32a67b9b33 minor tweaks 2019-02-23 15:53:14 +00:00
Laurent Cozic
b5dff09c28 All: Simplify Welcome notes and folders to avoid sync problems. Duplicate items will have to be manually deleted. 2019-02-23 15:47:29 +00:00
Laurent Cozic
c56d8153e8 Merge branch 'master' of github.com:laurent22/joplin 2019-02-18 18:12:00 +00:00
Laurent Cozic
eb5950d126 Desktop: Adding support for Mermaid 2019-02-18 18:11:53 +00:00
Helmut K. C. Tessarek
4241436e40 Merge pull request #1235 from tessus/localization-de_DE
Update de_DE.po
2019-02-18 12:04:47 -05:00
Helmut K. C. Tessarek
e93af7aed5 Update de_DE.po 2019-02-18 11:55:41 -05:00
Helmut K. C. Tessarek
d2416f850e Merge pull request #1234 from sczhg/master
Fix unclear Chinese translation.
2019-02-18 04:25:27 -05:00
Hao Huang
7af22eb006 Fix unclear Chinese translation. 2019-02-18 17:13:51 +08:00
Laurent Cozic
3f1be5e7e7 Merge branch 'master' of github.com:laurent22/joplin 2019-02-18 00:43:21 +00:00
Laurent Cozic
a4e649c82d Desktop: Clean up adding custom CSS and remove top margin and padding from rendered html 2019-02-18 00:42:52 +00:00
Laurent Cozic
cde1a8f0a8 Clipper: Fixed build error following package upgrade 2019-02-18 00:40:26 +00:00
Caleb John
cda6eb7c2f Fix little white corner between scrollbars (#1229) 2019-02-17 02:16:32 +00:00
Laurent Cozic
3c3e6aeca0 Merge branch 'master' of github.com:laurent22/joplin 2019-02-16 13:13:39 +00:00
Andros Fenollosa
99156311db Less verbose and visually more informative (#1226) 2019-02-16 13:13:33 +00:00
Laurent Cozic
91b2e5e703 Added Russian translation 2019-02-16 13:12:46 +00:00
Andros Fenollosa
573fd816d0 Update es_ES.po (#1227) 2019-02-16 13:10:54 +00:00
Laurent Cozic
e6aa002758 Desktop: Fixes #1215: Updated single instance logic for Electron 4 2019-02-16 13:10:37 +00:00
Laurent Cozic
361d46ac5d Clean up 2019-02-16 01:17:43 +00:00
Laurent Cozic
9bc7c2fd65 Added comments 2019-02-16 01:15:30 +00:00
Laurent Cozic
ce49f5f8b7 Merge branch 'master' of github.com:laurent22/joplin 2019-02-16 01:12:53 +00:00
Laurent Cozic
81e4cd319d Desktop: Allow resizing left panels 2019-02-16 01:12:43 +00:00
Zorbey Doğangüneş
71f905535f Turkish Language Improving (#1218)
* Fix & Improve

* Update tr_TR.po

Added missing " #, fuzzy " lanes.

* Update tr_TR.po

letter correction

* Update tr_TR.po

removed duplicate lanes.

* Update tr_TR.po

unnecessary space removed
2019-02-15 19:11:04 +00:00
0ndrey
d3bff0a9e3 Update ru_RU.po (#1219) 2019-02-15 19:10:37 +00:00
Laurent Cozic
88e6315d09 Security: Updated a few packages to fix CVE-2018-16469 2019-02-15 18:01:04 +00:00
Laurent Cozic
3d933c5244 Desktop: Trying to upgrade to Electron 4.0.4 2019-02-15 00:30:03 +00:00
Laurent Cozic
73af19314d Desktop: Trying to upgrade to Electron 4.0.4 2019-02-15 00:29:48 +00:00
Laurent Cozic
1d71712c8a Security: Updated parse-url to fix CVE-2018-3774 2019-02-14 23:18:17 +00:00
Laurent Cozic
1333c35389 Update website 2019-02-14 23:13:32 +00:00
ruuti
e0f5f47a15 Load background color from theme colours and set it for top and bottom safe area to respect iOS style guide. (#1195) 2019-02-14 23:09:21 +00:00
N Jannasch
34323042d5 Clipper: Feature added for storing urls (#1173)
* Clipper: Feature added for storing urls

* Clipper: Clip URL variable nameing changed
2019-02-14 23:05:28 +00:00
Joybin Chen
aa86fa9986 Clipper: bugfix, joplin icon not show up in Firefox using 32px size. (#1152) 2019-02-14 23:03:01 +00:00
130 changed files with 17960 additions and 11826 deletions

View File

@@ -113,6 +113,11 @@ class Command extends BaseCommand {
lines.push('\tcurl http://localhost:41184/tags?fields=id');
lines.push('');
lines.push('# Error handling');
lines.push('');
lines.push('In case of an error, an HTTP status code >= 400 will be returned along with a JSON object that provides more info about the error. The JSON object is in the format `{ "error": "description of error" }`.');
lines.push('');
lines.push('# About the property types');
lines.push('');
lines.push('* Text is UTF-8.');
@@ -125,6 +130,11 @@ class Command extends BaseCommand {
lines.push('Call **GET /ping** to check if the service is available. It should return "JoplinClipperServer" if it works.');
lines.push('');
lines.push('# Searching');
lines.push('');
lines.push('Call **GET /search?query=YOUR_QUERY** to search for notes. This end-point supports the `field` parameter which is recommended to use so that you only get the data that you need. The query syntax is as described in the main documentation: https://joplin.cozic.net/#searching');
lines.push('');
for (let i = 0; i < models.length; i++) {
const model = models[i];
const ModelClass = BaseItem.getClassByItemType(model.type);

View File

@@ -610,7 +610,8 @@ msgstr "S'està important des de «%s» com a format «%s». Espereu..."
msgid "PDF File"
msgstr "Fitxer PDF"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Fitxer"
msgid "New note"
@@ -628,6 +629,9 @@ msgstr "Importació"
msgid "Export"
msgstr "Exportació"
msgid "Synchronise"
msgstr "Sincronitza"
msgid "Print"
msgstr "Imprimeix"
@@ -638,7 +642,8 @@ msgstr "Amaga %s"
msgid "Quit"
msgstr "Surt"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Edita"
msgid "Copy"
@@ -676,7 +681,8 @@ msgstr "Cerca a totes les notes"
msgid "Search in current note"
msgstr "Cerca a totes les notes"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Visualització"
msgid "Toggle sidebar"
@@ -689,7 +695,8 @@ msgstr "Canvia el disseny de l'editor"
msgid "Focus"
msgstr "Vés al cos"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Eines"
msgid "Synchronisation status"
@@ -704,7 +711,8 @@ msgstr "Opcions del xifratge"
msgid "General Options"
msgstr "Opcions generals"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Ajuda"
msgid "Website and documentation"
@@ -956,9 +964,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:"
@@ -1125,7 +1130,17 @@ msgstr "Opcions de xifratge"
msgid "Clipper Options"
msgstr "Opcions del desa-retalls"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Voleu suprimir el bloc de notes? També se suprimiran tots els sub-blocs "
"d'aquest bloc de notes."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Voleu suprimir aquesta etiqueta de totes les notes?"
msgid "Remove this search from the sidebar?"
@@ -1137,9 +1152,6 @@ msgstr "Suprimeix"
msgid "Rename"
msgstr "Canvia el nom"
msgid "Synchronise"
msgstr "Sincronitza"
msgid "Notebooks"
msgstr "Blocs de notes"
@@ -1154,6 +1166,9 @@ msgstr "Recursos: %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 "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Afegeix o suprimeix etiquetes"
@@ -1554,6 +1569,9 @@ msgstr "Fitxer d'exportació de l'Evernote"
msgid "Json Export Directory"
msgstr "Directori d'exportació del Joplin"
msgid "File"
msgstr "Fitxer"
msgid "Directory"
msgstr "Directori"
@@ -1841,6 +1859,9 @@ msgstr "Mostra-ho al mapa"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Edita"
msgid "Delete notebook"
msgstr "Suprimeix el bloc de notes"
@@ -1864,6 +1885,9 @@ msgstr ""
msgid "Welcome"
msgstr "Benvingut"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separeu les etiquetes amb comes."
#~ msgid "State: %s."
#~ msgstr "Estat: %s"

View File

@@ -592,7 +592,8 @@ msgstr "Importuji z \"%s\" jako formát \"%s\". Chvíli strpení..."
msgid "PDF File"
msgstr "PDF soubor"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Soubor"
msgid "New note"
@@ -610,6 +611,9 @@ msgstr "Import"
msgid "Export"
msgstr "Export"
msgid "Synchronise"
msgstr "Synchronizovat"
msgid "Print"
msgstr "Tisk"
@@ -620,7 +624,8 @@ msgstr "Schovat %s"
msgid "Quit"
msgstr "Ukončit"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Upravit"
msgid "Copy"
@@ -658,7 +663,8 @@ msgstr "Hledat ve všech poznámkách"
msgid "Search in current note"
msgstr "Hledat ve všech poznámkách"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Zobrazit"
msgid "Toggle sidebar"
@@ -671,7 +677,8 @@ msgstr "Změňit layout editoru"
msgid "Focus"
msgstr "Vybrat text poznámky"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Nástroje"
msgid "Synchronisation status"
@@ -686,7 +693,8 @@ msgstr "Nastavení šifrování"
msgid "General Options"
msgstr "Obecná nastavení"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Nápověda"
msgid "Website and documentation"
@@ -926,9 +934,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:"
@@ -1094,7 +1099,15 @@ msgstr "Nastavení šifrování"
msgid "Clipper Options"
msgstr "Obecná nastavení"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr "Smazat zápisník? Budou smazány i všechny poznámky v něm obsažené."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Odebrat tento tag ze všech poznámek?"
msgid "Remove this search from the sidebar?"
@@ -1106,9 +1119,6 @@ msgstr "Smazat"
msgid "Rename"
msgstr "Přejmenovat"
msgid "Synchronise"
msgstr "Synchronizovat"
msgid "Notebooks"
msgstr "Zápisníky"
@@ -1123,6 +1133,9 @@ msgstr "Zdroje: %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 "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Přidat či odebrat tagy"
@@ -1529,6 +1542,9 @@ msgstr "Soubor Evernote Exportu"
msgid "Json Export Directory"
msgstr "Složka pro export"
msgid "File"
msgstr "Soubor"
msgid "Directory"
msgstr "Adresář"
@@ -1810,6 +1826,9 @@ msgstr "Zobrazit na map+"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Upravit"
msgid "Delete notebook"
msgstr "Smazat zápisník"
@@ -1832,6 +1851,9 @@ 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 "State: %s."
#~ msgstr "Stav: %s."

View File

@@ -597,7 +597,8 @@ msgstr "Importerer fra \"%s\" som \"%s\"-format. Vent venligst..."
msgid "PDF File"
msgstr "PDF fil"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Fil"
msgid "New note"
@@ -615,6 +616,9 @@ msgstr "Importer"
msgid "Export"
msgstr "Eksporter"
msgid "Synchronise"
msgstr "Synkroniser"
msgid "Print"
msgstr "Udskriv"
@@ -625,7 +629,8 @@ msgstr "Skjul %s"
msgid "Quit"
msgstr "Afslut"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Ret"
msgid "Copy"
@@ -663,7 +668,8 @@ msgstr "Søg i alle noter"
msgid "Search in current note"
msgstr "Søg i alle noter"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Vis"
msgid "Toggle sidebar"
@@ -676,7 +682,8 @@ msgstr "Skift editor layout"
msgid "Focus"
msgstr "Fokuser på brødtekst"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Værktøjer"
msgid "Synchronisation status"
@@ -691,7 +698,8 @@ msgstr "Krypterings muligheder"
msgid "General Options"
msgstr "Generelle indstillinger"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Hjælp"
msgid "Website and documentation"
@@ -935,9 +943,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:"
@@ -1103,7 +1108,15 @@ msgstr "Krypterings indstillinger"
msgid "Clipper Options"
msgstr "Generelle indstillinger"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr "Slet notesbog? Alle noter i notesbogen bliver også slettet."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Slet denne markering fra alle noter?"
msgid "Remove this search from the sidebar?"
@@ -1115,9 +1128,6 @@ msgstr "Slet"
msgid "Rename"
msgstr "Omdøb"
msgid "Synchronise"
msgstr "Synkroniser"
msgid "Notebooks"
msgstr "Notesbøger"
@@ -1132,6 +1142,9 @@ msgstr "Ressourcer: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Vælg hvor sync status skal eksporteres til"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Tilføj eller slet mærker"
@@ -1538,6 +1551,9 @@ msgstr "Evernote eksport fil"
msgid "Json Export Directory"
msgstr "Joplin eksport mappe"
msgid "File"
msgstr "Fil"
msgid "Directory"
msgstr "Indeks"
@@ -1819,6 +1835,9 @@ msgstr "Vis på kort"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Ret"
msgid "Delete notebook"
msgstr "Slet notesbog"
@@ -1841,6 +1860,9 @@ 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 "State: %s."
#~ msgstr "Tilstand: %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.1.1\n"
"X-Generator: Poedit 2.2.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "To delete a tag, untag the associated notes."
@@ -599,18 +599,16 @@ msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr "Exportiere „%s“ ins „%s“ Format. Bitte warten..."
msgid "Sidebar"
msgstr ""
msgstr "Seitenleiste"
msgid "Note list"
msgstr ""
msgstr "Notizen-Liste"
#, fuzzy
msgid "Note title"
msgstr "Notizbuch-Titel:"
msgstr "Notiz Titel"
#, fuzzy
msgid "Note body"
msgstr "Notizbücher"
msgstr "Notiz Text"
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
@@ -619,8 +617,8 @@ msgstr "Importiere „%s“ ins „%s“ Format. Bitte warten..."
msgid "PDF File"
msgstr "PDF-Datei"
msgid "File"
msgstr "Datei"
msgid "&File"
msgstr "&Datei"
msgid "New note"
msgstr "Neue Notiz"
@@ -637,6 +635,9 @@ msgstr "Importieren"
msgid "Export"
msgstr "Exportieren"
msgid "Synchronise"
msgstr "Synchronisieren"
msgid "Print"
msgstr "Drucken"
@@ -647,8 +648,8 @@ msgstr "%s ausblenden"
msgid "Quit"
msgstr "Verlassen"
msgid "Edit"
msgstr "Bearbeiten"
msgid "&Edit"
msgstr "&Bearbeiten"
msgid "Copy"
msgstr "Kopieren"
@@ -669,7 +670,7 @@ msgid "Italic"
msgstr "Kursiv"
msgid "Link"
msgstr ""
msgstr "Link"
msgid "Insert Date Time"
msgstr "Datum / Uhrzeit einfügen"
@@ -683,8 +684,8 @@ msgstr "Alle Notizen durchsuchen"
msgid "Search in current note"
msgstr "Aktuelle Notiz durchsuchen"
msgid "View"
msgstr "Ansicht"
msgid "&View"
msgstr "&Ansicht"
msgid "Toggle sidebar"
msgstr "Seitenleiste umschalten"
@@ -692,12 +693,11 @@ msgstr "Seitenleiste umschalten"
msgid "Toggle editor layout"
msgstr "Editor-Layout umschalten"
#, fuzzy
msgid "Focus"
msgstr "Fokussiere Inhalt"
msgstr "Fokus"
msgid "Tools"
msgstr "Werkzeuge"
msgid "&Tools"
msgstr "&Werkzeuge"
msgid "Synchronisation status"
msgstr "Status der Synchronisation"
@@ -711,8 +711,8 @@ msgstr "Verschlüsselungsoptionen"
msgid "General Options"
msgstr "Allgemeine Einstellungen"
msgid "Help"
msgstr "Hilfe"
msgid "&Help"
msgstr "&Hilfe"
msgid "Website and documentation"
msgstr "Webseite und Dokumentation"
@@ -748,7 +748,7 @@ msgstr "Die aktuelle Version ist auf dem neuesten Stand."
#, javascript-format
msgid "%s (pre-release)"
msgstr ""
msgstr "%s (Vorabversion)"
msgid "An update is available, do you want to download it now?"
msgstr ""
@@ -756,11 +756,11 @@ msgstr ""
#, javascript-format
msgid "Your version: v%s"
msgstr ""
msgstr "Deine Version: v%s"
#, javascript-format
msgid "New version: v%s"
msgstr ""
msgstr "Neue Version: v%s"
msgid "Yes"
msgstr "Ja"
@@ -769,7 +769,7 @@ msgid "No"
msgstr "Nein"
msgid "Token has been copied to the clipboard!"
msgstr "Token wurde in die Zwischenablage kopiert."
msgstr "Token wurde in die Zwischenablage kopiert!"
msgid "The web clipper service is enabled and set to auto-start."
msgstr ""
@@ -843,7 +843,7 @@ msgid "Notes and settings are stored in: %s"
msgstr "Notizen und Einstellungen werden gespeichert in: %s"
msgid "Browse..."
msgstr ""
msgstr "Durchsuche..."
msgid "Check synchronisation configuration"
msgstr "Überprüfen der Synchronisationseinstellungen"
@@ -941,9 +941,9 @@ msgstr "Status"
msgid "Encryption is:"
msgstr "Die Verschlüsselung ist:"
#, fuzzy
# 'Nutzung', 'Gebrauch', or 'Verwendung' - depends on the context
msgid "Usage"
msgstr "Nutzung: %s"
msgstr "Nutzung"
msgid "Back"
msgstr "Zurück"
@@ -967,9 +967,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:"
@@ -1050,7 +1047,7 @@ msgstr ""
"und die Notiz zu bearbeiten."
msgid "Only one note can be printed or exported to PDF at a time."
msgstr ""
msgstr "Nur eine Notiz kann gedruckt oder als PDF exportiert werden."
msgid "strong text"
msgstr "Fetter Text"
@@ -1138,8 +1135,19 @@ msgstr "Verschlüsselungsoptionen"
msgid "Clipper Options"
msgstr "Clipper-Einstellungen"
msgid "Remove this tag from all the notes?"
msgstr "Dieses Schlagwort von allen Notizen entfernen?"
#, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Notizbuch \"%s\" wirklich löschen?\n"
"\n"
"Alle Notizen und Unternotizen darin werden ebenfalls gelöscht."
#, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Schlagwort \"%s\" von allen Notizen entfernen?"
msgid "Remove this search from the sidebar?"
msgstr "Diese Suche von der Seitenleiste entfernen?"
@@ -1150,9 +1158,6 @@ msgstr "Löschen"
msgid "Rename"
msgstr "Umbenennen"
msgid "Synchronise"
msgstr "Synchronisieren"
msgid "Notebooks"
msgstr "Notizbücher"
@@ -1168,6 +1173,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 "Remove?"
msgstr "Löschen?"
msgid "Add or remove tags"
msgstr "Schlagwörter hinzufügen oder entfernen"
@@ -1190,13 +1198,13 @@ msgstr "Zu To-Do-Typ wechseln"
msgid "Copy Markdown link"
msgstr "Markdown-Link kopieren"
#, fuzzy, javascript-format
#, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Notizbuch \"%s\" löschen?"
msgstr "Notiz \"%s\" löschen?"
#, fuzzy, javascript-format
#, javascript-format
msgid "Delete these %d notes?"
msgstr "Sollen diese Notizen gelöscht werden?"
msgstr "Sollen diese %d Notizen gelöscht werden?"
#, javascript-format
msgid "Usage: %s"
@@ -1431,11 +1439,11 @@ msgid "Automatically update the application"
msgstr "Die Applikation automatisch aktualisieren"
msgid "Get pre-releases when checking for updates"
msgstr ""
msgstr "Lade auch Vorabversionen herunter"
#, javascript-format
msgid "See the pre-release page for more details: %s"
msgstr ""
msgstr "Weitere Informationen findest Du auf der Vorabversionsseite: %s"
msgid "Synchronisation interval"
msgstr "Synchronisationsinterval"
@@ -1536,25 +1544,21 @@ msgstr "Ignoriere TLS-Zertifikatfehler"
msgid "Invalid option value: \"%s\". Possible values are: %s."
msgstr "Ungültiger Optionswert: \"%s\". Mögliche Werte sind: %s."
#, fuzzy
msgid "General"
msgstr "Allgemeine Einstellungen"
msgstr "Allgemeines"
#, fuzzy
msgid "Synchronisation"
msgstr "Status der Synchronisation"
msgstr "Synchronisation"
msgid "Appearance"
msgstr ""
msgstr "Erscheinungsbild"
#, fuzzy
msgid "Note"
msgstr "Notizbücher"
msgstr "Notiz"
# Please note: The term 'Location' is assumed to be the geographical location where the note has been created. For this the german word 'Standort' fits better than the previously used 'Ablageort'. The latter one is used for the folder where files are stored.
#, fuzzy
# 'Applikation' or 'Anwendung' - both translations are correct.
msgid "Application"
msgstr "Standort"
msgstr "Applikation"
#, javascript-format
msgid "The tag \"%s\" already exists. Please choose a different name."
@@ -1576,6 +1580,9 @@ msgstr "Evernote Export Datei"
msgid "Json Export Directory"
msgstr "Json Export Verzeichnis"
msgid "File"
msgstr "Datei"
msgid "Directory"
msgstr "Verzeichnis"
@@ -1717,7 +1724,7 @@ msgstr ""
"korrekt sind und das das Synchronisierungsziel erreichbar ist. Fehlermeldung:"
msgid "The application has been authorised!"
msgstr "Das Programm wurde erfolgreich autorisiert."
msgstr "Das Programm wurde erfolgreich autorisiert!"
#, javascript-format
msgid ""
@@ -1868,6 +1875,9 @@ msgstr "Auf der Karte anzeigen"
msgid "Go to source URL"
msgstr "Zur Quell-URL gehen"
msgid "Edit"
msgstr "Bearbeiten"
msgid "Delete notebook"
msgstr "Notizbuch löschen"
@@ -1893,6 +1903,9 @@ msgstr ""
msgid "Welcome"
msgstr "Willkommen"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Trenne jedes Schlagwort mit einem Komma."
#~ msgid "Delete notes?"
#~ msgstr "Notizen löschen?"

View File

@@ -527,7 +527,7 @@ msgstr ""
msgid "PDF File"
msgstr ""
msgid "File"
msgid "&File"
msgstr ""
msgid "New note"
@@ -545,6 +545,9 @@ msgstr ""
msgid "Export"
msgstr ""
msgid "Synchronise"
msgstr ""
msgid "Print"
msgstr ""
@@ -555,7 +558,7 @@ msgstr ""
msgid "Quit"
msgstr ""
msgid "Edit"
msgid "&Edit"
msgstr ""
msgid "Copy"
@@ -591,7 +594,7 @@ msgstr ""
msgid "Search in current note"
msgstr ""
msgid "View"
msgid "&View"
msgstr ""
msgid "Toggle sidebar"
@@ -603,7 +606,7 @@ msgstr ""
msgid "Focus"
msgstr ""
msgid "Tools"
msgid "&Tools"
msgstr ""
msgid "Synchronisation status"
@@ -618,7 +621,7 @@ msgstr ""
msgid "General Options"
msgstr ""
msgid "Help"
msgid "&Help"
msgstr ""
msgid "Website and documentation"
@@ -845,9 +848,6 @@ msgstr ""
msgid "Add or remove tags:"
msgstr ""
msgid "Separate each tag by a comma."
msgstr ""
msgid "Rename notebook:"
msgstr ""
@@ -1009,7 +1009,15 @@ msgstr ""
msgid "Clipper Options"
msgstr ""
msgid "Remove this tag from all the notes?"
#, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
#, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr ""
msgid "Remove this search from the sidebar?"
@@ -1021,9 +1029,6 @@ msgstr ""
msgid "Rename"
msgstr ""
msgid "Synchronise"
msgstr ""
msgid "Notebooks"
msgstr ""
@@ -1038,6 +1043,9 @@ msgstr ""
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr ""
@@ -1410,6 +1418,9 @@ msgstr ""
msgid "Json Export Directory"
msgstr ""
msgid "File"
msgstr ""
msgid "Directory"
msgstr ""
@@ -1679,6 +1690,9 @@ msgstr ""
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr ""
msgid "Delete notebook"
msgstr ""

View File

@@ -1,21 +1,25 @@
# Joplin translation to Spanish (Spain)
# Copyright (C) 2017 Lucas Vieites
# Copyright (C) 2019 Andros Fenollosa
# 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.
#
msgid ""
msgstr ""
"Project-Id-Version: Joplin-CLI 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: Fernando Martín <f@mrtn.es>\n"
"Last-Translator: Andros Fenollosa <andros@fenollosa.email>\n"
"Language-Team: Spanish <lucas.vieites@gmail.com>\n"
"Language: es_ES\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
"X-Generator: Poedit 2.2.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: UTF-8\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
msgid "To delete a tag, untag the associated notes."
msgstr "Desmarque las notas asociadas para eliminar una etiqueta."
@@ -35,7 +39,7 @@ msgid "No notebook selected."
msgstr "No se ha seleccionado ninguna libreta."
msgid "No notebook has been specified."
msgstr "Ninguna libreta fue especificada"
msgstr "Ninguna libreta fue especificada."
msgid "Y"
msgstr "Y"
@@ -458,12 +462,11 @@ msgid "Starting synchronisation..."
msgstr "Iniciando sincronización..."
msgid "Downloading resources..."
msgstr ""
msgstr "Descargando recursos..."
msgid "Cancelling... Please wait."
msgstr "Cancelando... Por favor espere."
#, fuzzy
msgid ""
"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
"[tag] from [note], or to list the notes associated with [tag]. The command "
@@ -586,18 +589,16 @@ msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr "Exportando el formato de \"%s\" a \"%s\". Por favor espere..."
msgid "Sidebar"
msgstr ""
msgstr "Barra lateral"
msgid "Note list"
msgstr ""
msgstr "Lista de notas"
#, fuzzy
msgid "Note title"
msgstr "Título de libreta:"
msgstr "Titulo de nota"
#, fuzzy
msgid "Note body"
msgstr "Libretas"
msgstr "Cuerpo de nota"
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
@@ -606,8 +607,8 @@ msgstr "Importando el formato de \"%s\" a \"%s\". Por favor espere..."
msgid "PDF File"
msgstr "Archivo PDF"
msgid "File"
msgstr "Archivo"
msgid "&File"
msgstr "&Archivo"
msgid "New note"
msgstr "Nueva nota"
@@ -624,6 +625,9 @@ msgstr "Importar"
msgid "Export"
msgstr "Exportar"
msgid "Synchronise"
msgstr "Sincronizar"
msgid "Print"
msgstr "Imprimir"
@@ -634,8 +638,8 @@ msgstr "Oculta %s"
msgid "Quit"
msgstr "Salir"
msgid "Edit"
msgstr "Editar"
msgid "&Edit"
msgstr "&Editar"
msgid "Copy"
msgstr "Copiar"
@@ -646,9 +650,8 @@ msgstr "Cortar"
msgid "Paste"
msgstr "Pegar"
#, fuzzy
msgid "Select all"
msgstr "Seleccione fecha"
msgstr "Seleccionar todo"
msgid "Bold"
msgstr "Negrita"
@@ -657,7 +660,7 @@ msgid "Italic"
msgstr "Cursiva"
msgid "Link"
msgstr ""
msgstr "Enlace"
msgid "Insert Date Time"
msgstr "Introduce fecha"
@@ -668,12 +671,11 @@ msgstr "Editar con un editor externo"
msgid "Search in all the notes"
msgstr "Buscar en todas las notas"
#, fuzzy
msgid "Search in current note"
msgstr "Buscar en todas las notas"
msgstr "Buscar en nota actual"
msgid "View"
msgstr "Ver"
msgid "&View"
msgstr "&Ver"
msgid "Toggle sidebar"
msgstr "Cambia la barra lateral"
@@ -681,12 +683,11 @@ msgstr "Cambia la barra lateral"
msgid "Toggle editor layout"
msgstr "Cambia el diseño del editor"
#, fuzzy
msgid "Focus"
msgstr "Foco en el cuerpo"
msgstr "Foco"
msgid "Tools"
msgstr "Herramientas"
msgid "&Tools"
msgstr "&Herramientas"
msgid "Synchronisation status"
msgstr "Estado de la sincronización"
@@ -700,8 +701,8 @@ msgstr "Opciones de cifrado"
msgid "General Options"
msgstr "Opciones generales"
msgid "Help"
msgstr "Ayuda"
msgid "&Help"
msgstr "&Ayuda"
msgid "Website and documentation"
msgstr "Sitio web y documentación"
@@ -737,18 +738,18 @@ msgstr "La versión actual está actualizada."
#, javascript-format
msgid "%s (pre-release)"
msgstr ""
msgstr "%s (pre-lanzamiento)"
msgid "An update is available, do you want to download it now?"
msgstr "Hay disponible una actualización. ¿Quiere descargarla ahora?"
#, javascript-format
msgid "Your version: v%s"
msgstr ""
msgstr "Tu versión: v%s"
#, javascript-format
msgid "New version: v%s"
msgstr ""
msgstr "Nueva versión: v%s"
msgid "Yes"
msgstr "Sí"
@@ -757,7 +758,7 @@ msgid "No"
msgstr "No"
msgid "Token has been copied to the clipboard!"
msgstr ""
msgstr "¡El token ha sido copiado al portapapeles!"
msgid "The web clipper service is enabled and set to auto-start."
msgstr ""
@@ -809,15 +810,14 @@ msgstr "Paso 2: Instalar la extensión"
msgid "Download and install the relevant extension for your browser:"
msgstr "Descargar e instalar para su navegador:"
#, fuzzy
msgid "Advanced options"
msgstr "Mostrar opciones avanzadas"
msgstr "Opciones avanzadas"
msgid "Authorisation token:"
msgstr ""
msgstr "Token de autorización:"
msgid "Copy token"
msgstr ""
msgstr "Copiar token"
msgid ""
"This authorisation token is only needed to allow third-party applications to "
@@ -829,7 +829,7 @@ msgid "Notes and settings are stored in: %s"
msgstr "Las notas y los ajustes se guardan en: %s"
msgid "Browse..."
msgstr ""
msgstr "Explorar..."
msgid "Check synchronisation configuration"
msgstr "Comprobar sincronización"
@@ -927,9 +927,8 @@ msgstr "Estado"
msgid "Encryption is:"
msgstr "El cifrado está:"
#, fuzzy
msgid "Usage"
msgstr "Uso: %s"
msgstr "Uso"
msgid "Back"
msgstr "Atrás"
@@ -949,10 +948,7 @@ msgid "Notebook title:"
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."
msgstr "Agregar o borrar etiquetas:"
msgid "Rename notebook:"
msgstr "Renombrar libreta:"
@@ -989,13 +985,13 @@ msgid ""
msgstr "No hay ninguna libreta. Cree una pulsando en «Libreta nueva»."
msgid "Location"
msgstr ""
msgstr "Localización"
msgid "URL"
msgstr ""
msgstr "URL"
msgid "Note properties"
msgstr ""
msgstr "Propiedades de nota"
msgid "Open..."
msgstr "Abrir..."
@@ -1014,7 +1010,7 @@ msgid "Copy Link Address"
msgstr "Copiar enlace"
msgid "This attachment is not downloaded or not decrypted yet."
msgstr ""
msgstr "El adjunto no ha sido descargado o desencriptado todavía."
#, javascript-format
msgid "Unsupported link or message: %s"
@@ -1029,7 +1025,7 @@ msgstr ""
"editar la nota."
msgid "Only one note can be printed or exported to PDF at a time."
msgstr ""
msgstr "Solo una nota puede ser impresa o exportada a PDF a la vez."
msgid "strong text"
msgstr "texto destacado"
@@ -1117,8 +1113,19 @@ msgstr "Opciones de cifrado"
msgid "Clipper Options"
msgstr "Opciones de recorte"
msgid "Remove this tag from all the notes?"
msgstr "¿Desea eliminar esta etiqueta de todas las notas?"
#, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Borrar Libreta \"%s\"?\n"
"\n"
"Todas las notas y sublibretas de esta libreta serán borradas."
#, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Desea borrar las etiquetas pertenecientes a \"%s\" de todas las notas?"
msgid "Remove this search from the sidebar?"
msgstr "¿Desea eliminar esta búsqueda de la barra lateral?"
@@ -1129,23 +1136,23 @@ msgstr "Eliminar"
msgid "Rename"
msgstr "Renombrar"
msgid "Synchronise"
msgstr "Sincronizar"
msgid "Notebooks"
msgstr "Libretas"
#, javascript-format
msgid "Decrypting items: %d/%d"
msgstr "Descifrando elementos: %d/%d."
msgstr "Descifrando elementos: %d/%d"
#, fuzzy, javascript-format
#, javascript-format
msgid "Fetching resources: %d"
msgstr "Recursos: %d."
msgstr "Obteniendo refuersos: %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 "Remove?"
msgstr "¿Borrar?"
msgid "Add or remove tags"
msgstr "Añadir o borrar etiquetas"
@@ -1159,24 +1166,22 @@ msgstr "%s - Copiar"
msgid "Switch between note and to-do type"
msgstr "Cambiar entre nota y lista de tareas"
#, fuzzy
msgid "Switch to note type"
msgstr "Cambiar entre nota y lista de tareas"
msgstr "Cambiar a nota"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Cambiar entre nota y lista de tareas"
msgstr "Cambiar a lista de tareas"
msgid "Copy Markdown link"
msgstr "Copiar el enlace de Markdown"
#, fuzzy, javascript-format
#, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Elimina una libreta \"%s\"?"
msgstr "¿Borrar nota \"%s\"?"
#, fuzzy, javascript-format
#, javascript-format
msgid "Delete these %d notes?"
msgstr "¿Desea borrar estas notas?"
msgstr "Borrar %d notas?"
#, javascript-format
msgid "Usage: %s"
@@ -1383,16 +1388,18 @@ msgid ""
"this setting so that your notes are constantly being synchronised, thus "
"reducing the number of conflicts."
msgstr ""
"Esto permitirá que Joplin se ejecute en segundo plano. Se recomienda "
"habilitar esta configuración para que sus notas estén sincronizadas "
"constantemente, reduciendo así el número de conflictos."
msgid "Start application minimised in the tray icon"
msgstr ""
msgstr "Iniciar aplicación minimizada en el icono de la bandeja"
msgid "Global zoom percentage"
msgstr "Establecer el porcentaje de aumento de la aplicación"
#, fuzzy
msgid "Editor font size"
msgstr "Fuente del editor"
msgstr "Editar tamaño de fuente"
msgid "Editor font family"
msgstr "Fuente del editor"
@@ -1409,11 +1416,11 @@ msgid "Automatically update the application"
msgstr "Actualizar la aplicación automáticamente"
msgid "Get pre-releases when checking for updates"
msgstr ""
msgstr "Obtenga pre-lanzamientos cuando busque actualizaciones"
#, javascript-format
msgid "See the pre-release page for more details: %s"
msgstr ""
msgstr "Ver la página de pre-lanzamiento para más detalles: %s"
msgid "Synchronisation interval"
msgstr "Intervalo de sincronización"
@@ -1474,6 +1481,9 @@ msgid ""
"to it before syncing, otherwise all files will be removed! See the FAQ for "
"more details: %s"
msgstr ""
"Atención: Si cambias esta ubicación, asegúrate de copiar todo tu contenido "
"antes de sincronizarlo, de lo contrario todos los archivos serán eliminados. "
"Consulte las preguntas frecuentes para obtener más detalles: %s"
msgid "Nextcloud username"
msgstr "Usuario de Nextcloud"
@@ -1512,28 +1522,24 @@ msgstr "Ignorar errores en certificados TLS"
msgid "Invalid option value: \"%s\". Possible values are: %s."
msgstr "Opción inválida: «%s». Los valores posibles son: %s."
#, fuzzy
msgid "General"
msgstr "Opciones generales"
msgstr "General"
#, fuzzy
msgid "Synchronisation"
msgstr "Estado de la sincronización"
msgstr "Sincronización"
msgid "Appearance"
msgstr ""
msgstr "Apariencia"
#, fuzzy
msgid "Note"
msgstr "Libretas"
msgstr "Nota"
#, fuzzy
msgid "Application"
msgstr "Salir de la aplicación."
msgstr "Aplicación"
#, javascript-format
msgid "The tag \"%s\" already exists. Please choose a different name."
msgstr ""
msgstr "La etiqueta \"%s\" ya existe. Por favor, busque un nuevo nombre."
msgid "Joplin Export File"
msgstr "Archivo de exportación de Joplin"
@@ -1547,9 +1553,11 @@ msgstr "Directorio para exportar de Joplin"
msgid "Evernote Export File"
msgstr "Archivo exportado de Evernote"
#, fuzzy
msgid "Json Export Directory"
msgstr "Directorio para exportar de Joplin"
msgstr "Directorio para exportar JSON"
msgid "File"
msgstr "Archivo"
msgid "Directory"
msgstr "Directorio"
@@ -1626,10 +1634,10 @@ msgid "On %s: %s"
msgstr "En %s: %s"
msgid "Permission to use camera"
msgstr ""
msgstr "Permiso para usar tu cámara"
msgid "Your permission to use your camera is required."
msgstr ""
msgstr "El permiso para usar tu cámara es necesario."
msgid "There are currently no notes. Create one by clicking on the (+) button."
msgstr "No hay notas. Cree una pulsando en el botón (+)."
@@ -1659,9 +1667,8 @@ msgstr "¿Desea mover %d notas a libreta «%s»?"
msgid "Press to set the decryption password."
msgstr "Presione para establecer la contraseña de descifrado."
#, fuzzy
msgid "Clear alarm"
msgstr "Establecer alarma"
msgstr "Quitar alarma"
msgid "Save alarm"
msgstr "Establecer alarma"
@@ -1675,22 +1682,21 @@ msgstr "Confirmar"
msgid "Cancel synchronisation"
msgstr "Cancelar sincronización"
#, fuzzy
msgid "Checking... Please wait."
msgstr "Cancelando... Por favor espere."
msgstr "Comprobando... Por favor espere."
#, fuzzy
msgid "Success! Synchronisation configuration appears to be correct."
msgstr "Comprobar sincronización"
msgstr "¡Éxito! La configuración de sincronización es correcta."
msgid ""
"Error. Please check that URL, username, password, etc. are correct and that "
"the sync target is accessible. The reported error was:"
msgstr ""
"Error. Por favor comprueba URL, nombre de usuario, contraseña, etc. son "
"correctos y el servicio a sincronizar este accesible. El código de error fue:"
#, fuzzy
msgid "The application has been authorised!"
msgstr "La aplicacion ha sido autorizada éxitosamente."
msgstr "¡La aplicacion ha sido autorizada!"
#, javascript-format
msgid ""
@@ -1700,10 +1706,15 @@ msgid ""
"\n"
"Please try again."
msgstr ""
"No se pudo autorizar aplicación:\n"
"\n"
"%s\n"
"\n"
"Por favor, vuelva a intentarlo."
#, fuzzy, javascript-format
#, javascript-format
msgid "Decrypted items: %s / %s"
msgstr "Descifrando elementos: %d/%d."
msgstr "Descifrando elementos: %s / %s"
msgid "New tags:"
msgstr "Nuevas etiquetas:"
@@ -1737,24 +1748,23 @@ msgstr ""
msgid "Joplin website"
msgstr "Sitio web de Joplin"
#, fuzzy, javascript-format
#, javascript-format
msgid "Joplin v%s"
msgstr "Sitio web de Joplin"
msgstr "Joplin v%s"
#, javascript-format
msgid "Database v%s"
msgstr ""
msgstr "Base de datos v%s"
#, fuzzy, javascript-format
#, javascript-format
msgid "FTS enabled: %d"
msgstr "Borrar: %d"
msgstr "FTS activado: %d"
msgid "Login with Dropbox"
msgstr "Acceder con Dropbox"
#, fuzzy
msgid "Enter code here"
msgstr "Entrar en modo línea de comandos"
msgstr "Introduce código aquí"
#, javascript-format
msgid "Master Key %s"
@@ -1808,9 +1818,8 @@ msgstr ""
msgid "Unsupported image type: %s"
msgstr "Tipo de imagen no soportado: %s"
#, fuzzy
msgid "Take photo"
msgstr "Adjuntar foto"
msgstr "Tomar foto"
msgid "Attach photo"
msgstr "Adjuntar foto"
@@ -1837,7 +1846,10 @@ msgid "View on map"
msgstr "Ver en un mapa"
msgid "Go to source URL"
msgstr ""
msgstr "Ir a origen URL"
msgid "Edit"
msgstr "Editar"
msgid "Delete notebook"
msgstr "Borrar libreta"
@@ -1862,6 +1874,9 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenido"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separar cada etiqueta por una coma."
#~ msgid "Delete notes?"
#~ msgstr "¿Desea eliminar notas?"

View File

@@ -604,7 +604,8 @@ msgstr ""
msgid "PDF File"
msgstr "Fitxategia"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Fitxategia"
msgid "New note"
@@ -623,6 +624,9 @@ msgstr "Inportatu"
msgid "Export"
msgstr "Inportatu"
msgid "Synchronise"
msgstr "Sinkronizatu"
msgid "Print"
msgstr ""
@@ -633,7 +637,8 @@ msgstr ""
msgid "Quit"
msgstr "Irten"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Editatu"
msgid "Copy"
@@ -671,7 +676,7 @@ msgstr "Bilatu ohar guztietan"
msgid "Search in current note"
msgstr "Bilatu ohar guztietan"
msgid "View"
msgid "&View"
msgstr ""
msgid "Toggle sidebar"
@@ -683,7 +688,8 @@ msgstr ""
msgid "Focus"
msgstr ""
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Tresnak"
msgid "Synchronisation status"
@@ -698,7 +704,8 @@ msgstr "Zifratzeko aukerak"
msgid "General Options"
msgstr "Ezarpenak"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Laguntza"
msgid "Website and documentation"
@@ -944,9 +951,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:"
@@ -1116,7 +1120,15 @@ msgstr "Zifratzeko aukerak"
msgid "Clipper Options"
msgstr "Ezarpenak"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr "Koadernoa ezabatu? Dituen ohar guztiak ere ezabatuko dira."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Kendu etiketa hori ohar guztietatik?"
msgid "Remove this search from the sidebar?"
@@ -1128,9 +1140,6 @@ msgstr "Ezabatu"
msgid "Rename"
msgstr "Berrizendatu"
msgid "Synchronise"
msgstr "Sinkronizatu"
msgid "Notebooks"
msgstr "Koadernoak"
@@ -1146,6 +1155,9 @@ msgstr "Baliabideak: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Aukeratu nora esportatu sinkronizazioaren egoera, mesedez"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Gehitu edo ezabatu etiketak"
@@ -1560,6 +1572,9 @@ msgstr "Evernotetik esportatutako fitxategiak"
msgid "Json Export Directory"
msgstr "Evernotetik esportatutako fitxategiak"
msgid "File"
msgstr "Fitxategia"
msgid "Directory"
msgstr ""
@@ -1840,6 +1855,9 @@ msgstr "Ikusi mapan"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Editatu"
msgid "Delete notebook"
msgstr "Ezabatu koadernoa"
@@ -1862,6 +1880,9 @@ 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."
#, fuzzy
#~ msgid "State: %s."
#~ msgstr "Egoera: \"%s\"."

View File

@@ -602,8 +602,8 @@ msgstr "Importer depuis \"%s\" au format \"%s\". Veuillez patienter..."
msgid "PDF File"
msgstr "Fichier PDF"
msgid "File"
msgstr "Fichier"
msgid "&File"
msgstr "&Fichier"
msgid "New note"
msgstr "Nouvelle note"
@@ -620,6 +620,9 @@ msgstr "Importer"
msgid "Export"
msgstr "Exporter"
msgid "Synchronise"
msgstr "Synchroniser"
msgid "Print"
msgstr "Imprimer"
@@ -630,8 +633,8 @@ msgstr "Cacher %s"
msgid "Quit"
msgstr "Quitter"
msgid "Edit"
msgstr "Édition"
msgid "&Edit"
msgstr "&Édition"
msgid "Copy"
msgstr "Copier"
@@ -666,8 +669,8 @@ msgstr "Chercher dans toutes les notes"
msgid "Search in current note"
msgstr "Chercher dans la note en cours"
msgid "View"
msgstr "Affichage"
msgid "&View"
msgstr "&Affichage"
msgid "Toggle sidebar"
msgstr "Basculer barre latérale"
@@ -678,8 +681,8 @@ msgstr "Basculer l'agencement de l'éditeur"
msgid "Focus"
msgstr "Naviguer"
msgid "Tools"
msgstr "Outils"
msgid "&Tools"
msgstr "&Outils"
msgid "Synchronisation status"
msgstr "État de la synchronisation"
@@ -693,8 +696,8 @@ msgstr "Options de chiffrement"
msgid "General Options"
msgstr "Options générales"
msgid "Help"
msgstr "Aide"
msgid "&Help"
msgstr "&Aide"
msgid "Website and documentation"
msgstr "Documentation en ligne"
@@ -949,9 +952,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 :"
@@ -1120,8 +1120,19 @@ msgstr "Options de chiffrement"
msgid "Clipper Options"
msgstr "Options du Web Clipper"
msgid "Remove this tag from all the notes?"
msgstr "Enlever cette étiquette de toutes les notes ?"
#, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Effacer le carnet \"%s\" ?\n"
"\n"
"Toutes les notes et sous-carnets dans ce carnet seront également effacés."
#, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Enlever l’étiquette \"%s\" de toutes les notes ?"
msgid "Remove this search from the sidebar?"
msgstr "Enlever cette recherche de la barre latérale ?"
@@ -1132,9 +1143,6 @@ msgstr "Supprimer"
msgid "Rename"
msgstr "Renommer"
msgid "Synchronise"
msgstr "Synchroniser"
msgid "Notebooks"
msgstr "Carnets"
@@ -1150,6 +1158,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 "Remove?"
msgstr "Supprimer ?"
msgid "Add or remove tags"
msgstr "Gérer les étiquettes"
@@ -1551,6 +1562,9 @@ msgstr "Fichiers d'export Evernote"
msgid "Json Export Directory"
msgstr "Dossier d'export JSON"
msgid "File"
msgstr "Fichier"
msgid "Directory"
msgstr "Dossier"
@@ -1841,6 +1855,9 @@ msgstr "Voir sur carte"
msgid "Go to source URL"
msgstr "Aller à l'URL source"
msgid "Edit"
msgstr "Édition"
msgid "Delete notebook"
msgstr "Supprimer le carnet"
@@ -1865,6 +1882,9 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenue"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Séparez chaque étiquette par une virgule."
#~ msgid "Delete notes?"
#~ msgstr "Supprimer les notes ?"

View File

@@ -597,7 +597,8 @@ msgstr "Importando de «%s» como formato «%s». Agarde..."
msgid "PDF File"
msgstr "Ficheiro PDF"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Ficheiro"
msgid "New note"
@@ -615,6 +616,9 @@ msgstr "Importar"
msgid "Export"
msgstr "Exportar"
msgid "Synchronise"
msgstr "Sincronizar"
msgid "Print"
msgstr "Imprimir"
@@ -625,7 +629,8 @@ msgstr "Ocultar %s"
msgid "Quit"
msgstr "Saír"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Edtar"
msgid "Copy"
@@ -663,7 +668,8 @@ msgstr "Buscar en todas as notas"
msgid "Search in current note"
msgstr "Buscar en todas as notas"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Vista"
msgid "Toggle sidebar"
@@ -676,7 +682,8 @@ msgstr "Cambiar a disposición do editor"
msgid "Focus"
msgstr "Focar no corpo"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Ferramentas"
msgid "Synchronisation status"
@@ -691,7 +698,8 @@ msgstr "Opcións de cifrado"
msgid "General Options"
msgstr "Opcións xerais"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Axuda"
msgid "Website and documentation"
@@ -933,9 +941,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:"
@@ -1102,7 +1107,16 @@ msgstr "Opcións de cifrado"
msgid "Clipper Options"
msgstr "Opcións xerais"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Desexa eliminar o caderno? Tamén se eliminarán todas as notas deste caderno."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Desexa eliminar esta etiqueta de todas as notas?"
msgid "Remove this search from the sidebar?"
@@ -1114,9 +1128,6 @@ msgstr "Eliminar"
msgid "Rename"
msgstr "Renomear"
msgid "Synchronise"
msgstr "Sincronizar"
msgid "Notebooks"
msgstr "Cadernos"
@@ -1131,6 +1142,9 @@ msgstr "Recursos: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Seleccione onde exportar o estado da sincronización"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Engadir ou eliminar etiquetas"
@@ -1537,6 +1551,9 @@ msgstr "Ficheiro de exportación de Evernote"
msgid "Json Export Directory"
msgstr "Cartafol de exportación do Joplin"
msgid "File"
msgstr "Ficheiro"
msgid "Directory"
msgstr "Cartafol"
@@ -1818,6 +1835,9 @@ msgstr "Ver no mapa"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Edtar"
msgid "Delete notebook"
msgstr "Eliminar caderno"
@@ -1840,6 +1860,9 @@ 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 "State: %s."
#~ msgstr "Estado: %s."

View File

@@ -601,7 +601,8 @@ msgstr ""
msgid "PDF File"
msgstr "Datoteka"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Datoteka"
msgid "New note"
@@ -620,6 +621,9 @@ msgstr "Uvoz"
msgid "Export"
msgstr "Uvoz"
msgid "Synchronise"
msgstr "Sinkroniziraj"
msgid "Print"
msgstr ""
@@ -630,7 +634,8 @@ msgstr ""
msgid "Quit"
msgstr "Izađi"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Uredi"
msgid "Copy"
@@ -668,7 +673,7 @@ msgstr "Pretraži u svim bilješkama"
msgid "Search in current note"
msgstr "Pretraži u svim bilješkama"
msgid "View"
msgid "&View"
msgstr ""
msgid "Toggle sidebar"
@@ -681,7 +686,8 @@ msgstr ""
msgid "Focus"
msgstr "Naslov bilješke:"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Alati"
msgid "Synchronisation status"
@@ -697,7 +703,8 @@ msgstr ""
msgid "General Options"
msgstr "Opcije"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Pomoć"
msgid "Website and documentation"
@@ -931,9 +938,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:"
@@ -1103,7 +1107,16 @@ msgstr ""
msgid "Clipper Options"
msgstr "Opcije"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Obrisati bilježnicu? Sve bilješke u toj bilježnici će također biti obrisane."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Makni ovu oznaku iz svih bilješki?"
msgid "Remove this search from the sidebar?"
@@ -1115,9 +1128,6 @@ msgstr "Obriši"
msgid "Rename"
msgstr "Preimenuj"
msgid "Synchronise"
msgstr "Sinkroniziraj"
msgid "Notebooks"
msgstr "Bilježnice"
@@ -1132,6 +1142,9 @@ msgstr "Resursi: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Dodaj ili makni oznake"
@@ -1538,6 +1551,9 @@ msgstr "Evernote izvozne datoteke"
msgid "Json Export Directory"
msgstr "Evernote izvozne datoteke"
msgid "File"
msgstr "Datoteka"
msgid "Directory"
msgstr ""
@@ -1817,6 +1833,9 @@ msgstr "Vidi na karti"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Uredi"
msgid "Delete notebook"
msgstr "Obriši bilježnicu"
@@ -1839,6 +1858,9 @@ 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 "State: %s."
#~ msgstr "Stanje: \"%s\"."

View File

@@ -610,7 +610,8 @@ msgstr "Importazione da \"%s\" come formato \"%s\". Si prega di attendere..."
msgid "PDF File"
msgstr "PDF File"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "File"
msgid "New note"
@@ -628,6 +629,9 @@ msgstr "Importa"
msgid "Export"
msgstr "Esporta"
msgid "Synchronise"
msgstr "Sincronizza"
msgid "Print"
msgstr "Stampa"
@@ -638,7 +642,8 @@ msgstr "Nascondi %s"
msgid "Quit"
msgstr "Esci"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Modifica"
msgid "Copy"
@@ -674,7 +679,8 @@ msgstr "Cerca in tutte le note"
msgid "Search in current note"
msgstr "Cerca nella nota corrente"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Vista"
msgid "Toggle sidebar"
@@ -687,7 +693,8 @@ msgstr "Attiva / disattiva il layout dell'editor"
msgid "Focus"
msgstr "Focus sul testo"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Strumenti"
msgid "Synchronisation status"
@@ -702,7 +709,8 @@ msgstr "Opzioni Crittografia"
msgid "General Options"
msgstr "Opzioni Generali"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Aiuto"
msgid "Website and documentation"
@@ -954,9 +962,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:"
@@ -1123,7 +1128,17 @@ msgstr "Opzioni di crittografia"
msgid "Clipper Options"
msgstr "Opzioni Clipper"
msgid "Remove this tag from all the notes?"
#, fuzzy, 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."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Rimuovere questa etichetta da tutte le note?"
msgid "Remove this search from the sidebar?"
@@ -1135,9 +1150,6 @@ msgstr "Elimina"
msgid "Rename"
msgstr "Rinomina"
msgid "Synchronise"
msgstr "Sincronizza"
msgid "Notebooks"
msgstr "Taccuini"
@@ -1152,6 +1164,9 @@ msgstr "Risorse: %d."
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Aggiungi o rimuovi etichetta"
@@ -1554,6 +1569,9 @@ msgstr "Esporta files di Evernote"
msgid "Json Export Directory"
msgstr "Cartella di esportazione JSON"
msgid "File"
msgstr "File"
msgid "Directory"
msgstr "Cartella"
@@ -1841,6 +1859,9 @@ msgstr "Guarda sulla mappa"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Modifica"
msgid "Delete notebook"
msgstr "Cancella Taccuino"
@@ -1864,6 +1885,9 @@ msgstr ""
msgid "Welcome"
msgstr "Benvenuto"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separa ogni etichetta da una virgola."
#~ msgid "Delete notes?"
#~ msgstr "Eliminare le note?"

View File

@@ -592,7 +592,8 @@ msgstr ""
msgid "PDF File"
msgstr "PDF ファイル"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "ファイル"
msgid "New note"
@@ -610,6 +611,9 @@ msgstr "インポート"
msgid "Export"
msgstr "エクスポート"
msgid "Synchronise"
msgstr "同期"
msgid "Print"
msgstr "印刷"
@@ -620,7 +624,8 @@ msgstr "%s を隠す"
msgid "Quit"
msgstr "終了"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "編集"
msgid "Copy"
@@ -656,7 +661,8 @@ msgstr "すべてのノートを検索"
msgid "Search in current note"
msgstr "現在のノートを検索"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "表示"
msgid "Toggle sidebar"
@@ -669,7 +675,8 @@ msgstr "エディターレイアウトの表示切り替え"
msgid "Focus"
msgstr "本文にフォーカス"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "ツール"
msgid "Synchronisation status"
@@ -684,7 +691,8 @@ msgstr "暗号化のオプション"
msgid "General Options"
msgstr "全般のオプション"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "ヘルプ"
msgid "Website and documentation"
@@ -934,9 +942,6 @@ msgstr "ノートブックの題名:"
msgid "Add or remove tags:"
msgstr "タグの追加・削除:"
msgid "Separate each tag by a comma."
msgstr "それぞれのタグをカンマ(,)で区切ってください。"
msgid "Rename notebook:"
msgstr "ノートブックの名前を変更:"
@@ -1100,7 +1105,17 @@ msgstr "暗号化のオプション"
msgid "Clipper Options"
msgstr "Clipperのオプション"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"ノートブックを削除しますか? このノートブックにあるノートとサブノートはすべ"
"て消えてしまいます。"
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "すべてのノートからこのタグを削除しますか?"
msgid "Remove this search from the sidebar?"
@@ -1112,9 +1127,6 @@ msgstr "削除"
msgid "Rename"
msgstr "名前の変更"
msgid "Synchronise"
msgstr "同期"
msgid "Notebooks"
msgstr "ノートブック"
@@ -1129,6 +1141,9 @@ msgstr "取得中のリソース: %d"
msgid "Please select where the sync status should be exported to"
msgstr "同期状況の出力先を選択してください"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "タグの追加と削除"
@@ -1532,6 +1547,9 @@ msgstr "Evernote エクスポートファイル"
msgid "Json Export Directory"
msgstr "Json エクスポートディレクトリ"
msgid "File"
msgstr "ファイル"
msgid "Directory"
msgstr "ディレクトリ"
@@ -1818,6 +1836,9 @@ msgstr "地図上に表示"
msgid "Go to source URL"
msgstr "ソースURLに行く"
msgid "Edit"
msgstr "編集"
msgid "Delete notebook"
msgstr "ノートブックを削除"
@@ -1842,6 +1863,9 @@ msgstr ""
msgid "Welcome"
msgstr "ようこそ"
#~ msgid "Separate each tag by a comma."
#~ msgstr "それぞれのタグをカンマ(,)で区切ってください。"
#~ msgid "State: %s."
#~ msgstr "状態: \"%s\"."

View File

@@ -527,7 +527,7 @@ msgstr ""
msgid "PDF File"
msgstr ""
msgid "File"
msgid "&File"
msgstr ""
msgid "New note"
@@ -545,6 +545,9 @@ msgstr ""
msgid "Export"
msgstr ""
msgid "Synchronise"
msgstr ""
msgid "Print"
msgstr ""
@@ -555,7 +558,7 @@ msgstr ""
msgid "Quit"
msgstr ""
msgid "Edit"
msgid "&Edit"
msgstr ""
msgid "Copy"
@@ -591,7 +594,7 @@ msgstr ""
msgid "Search in current note"
msgstr ""
msgid "View"
msgid "&View"
msgstr ""
msgid "Toggle sidebar"
@@ -603,7 +606,7 @@ msgstr ""
msgid "Focus"
msgstr ""
msgid "Tools"
msgid "&Tools"
msgstr ""
msgid "Synchronisation status"
@@ -618,7 +621,7 @@ msgstr ""
msgid "General Options"
msgstr ""
msgid "Help"
msgid "&Help"
msgstr ""
msgid "Website and documentation"
@@ -845,9 +848,6 @@ msgstr ""
msgid "Add or remove tags:"
msgstr ""
msgid "Separate each tag by a comma."
msgstr ""
msgid "Rename notebook:"
msgstr ""
@@ -1009,7 +1009,15 @@ msgstr ""
msgid "Clipper Options"
msgstr ""
msgid "Remove this tag from all the notes?"
#, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
#, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr ""
msgid "Remove this search from the sidebar?"
@@ -1021,9 +1029,6 @@ msgstr ""
msgid "Rename"
msgstr ""
msgid "Synchronise"
msgstr ""
msgid "Notebooks"
msgstr ""
@@ -1038,6 +1043,9 @@ msgstr ""
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr ""
@@ -1410,6 +1418,9 @@ msgstr ""
msgid "Json Export Directory"
msgstr ""
msgid "File"
msgstr ""
msgid "Directory"
msgstr ""
@@ -1679,6 +1690,9 @@ msgstr ""
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr ""
msgid "Delete notebook"
msgstr ""

View File

@@ -589,7 +589,8 @@ msgstr "\"%s\"에서 \"%s\" 포맷으로 가져오는 중입니다. 잠시만
msgid "PDF File"
msgstr "PDF 파일"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "파일"
msgid "New note"
@@ -607,6 +608,9 @@ msgstr "가져오기"
msgid "Export"
msgstr "내보내기"
msgid "Synchronise"
msgstr "동기화"
msgid "Print"
msgstr "인쇄"
@@ -617,7 +621,8 @@ msgstr "%s 숨기기"
msgid "Quit"
msgstr "종료"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "편집"
msgid "Copy"
@@ -653,7 +658,8 @@ msgstr "모든 노트에서 검색"
msgid "Search in current note"
msgstr "현재 노트에서 검색"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "보기"
msgid "Toggle sidebar"
@@ -666,7 +672,8 @@ msgstr "편집기 배치 형태 전환"
msgid "Focus"
msgstr "내용에 포커스"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "도구"
msgid "Synchronisation status"
@@ -681,7 +688,8 @@ msgstr "암호화 옵션"
msgid "General Options"
msgstr "일반 옵션"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "도움말"
msgid "Website and documentation"
@@ -928,9 +936,6 @@ msgstr "노트북 제목:"
msgid "Add or remove tags:"
msgstr "태그 추가 및 제거:"
msgid "Separate each tag by a comma."
msgstr "각각의 태그를 쉼표로 구분합니다."
msgid "Rename notebook:"
msgstr "노트북 이름 바꾸기:"
@@ -1094,7 +1099,17 @@ msgstr "암호화 옵션"
msgid "Clipper Options"
msgstr "수집기 옵션"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"노트북을 삭제할까요? 이 노트북 안에 있는 모든 노트와 하위 노트북들도 함께 삭"
"제됩니다."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "모든 노트에서 이 태그를 제거할까요?"
msgid "Remove this search from the sidebar?"
@@ -1106,9 +1121,6 @@ msgstr "삭제"
msgid "Rename"
msgstr "이름 바꾸기"
msgid "Synchronise"
msgstr "동기화"
msgid "Notebooks"
msgstr "노트북"
@@ -1123,6 +1135,9 @@ msgstr "리소스 가져오는 중: %d."
msgid "Please select where the sync status should be exported to"
msgstr "동기화 상태를 내보낼 대상을 선택하세요"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "태그 추가 및 제거"
@@ -1524,6 +1539,9 @@ msgstr "에버노트 내보내기 파일"
msgid "Json Export Directory"
msgstr "Json 내보내기 폴더"
msgid "File"
msgstr "파일"
msgid "Directory"
msgstr "폴더"
@@ -1809,6 +1827,9 @@ msgstr "지도에 표시"
msgid "Go to source URL"
msgstr "소스 URL로 이동"
msgid "Edit"
msgstr "편집"
msgid "Delete notebook"
msgstr "노트북 삭제"
@@ -1831,6 +1852,9 @@ msgstr "노트북이 없습니다. (+) 버튼을 눌러 새로 만드세요."
msgid "Welcome"
msgstr "환영합니다"
#~ msgid "Separate each tag by a comma."
#~ msgstr "각각의 태그를 쉼표로 구분합니다."
#~ msgid "State: %s."
#~ msgstr "상태: %s."

View File

@@ -597,7 +597,8 @@ msgstr "Importerer fra \"%s\" i \"%s\"-format. Vennligst vent..."
msgid "PDF File"
msgstr "PDF-fil"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Fil"
msgid "New note"
@@ -615,6 +616,9 @@ msgstr "Importer"
msgid "Export"
msgstr "Eksport"
msgid "Synchronise"
msgstr "Synkroniser"
msgid "Print"
msgstr "Skriv ut"
@@ -625,7 +629,8 @@ msgstr "Skjul %s"
msgid "Quit"
msgstr "Avslutt"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Rediger"
msgid "Copy"
@@ -662,7 +667,8 @@ msgstr "Søk i alle notater"
msgid "Search in current note"
msgstr "Søk i nåværende notat"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Vis"
msgid "Toggle sidebar"
@@ -675,7 +681,8 @@ msgstr "Bytt editorutseende"
msgid "Focus"
msgstr "Fokuser på brødtekst"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Verktøy"
msgid "Synchronisation status"
@@ -690,7 +697,8 @@ msgstr "Krypteringsvalg"
msgid "General Options"
msgstr "Generelle innstillinger"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Hjelp"
msgid "Website and documentation"
@@ -943,9 +951,6 @@ msgstr "Tittel på notatbok:"
msgid "Add or remove tags:"
msgstr "Legge til eller fjern merkelapp:"
msgid "Separate each tag by a comma."
msgstr "Separer hver merkelapp med komma."
msgid "Rename notebook:"
msgstr "Gi nytt navn til notatbok:"
@@ -1109,7 +1114,17 @@ msgstr "Krypteringsinnstillinger"
msgid "Clipper Options"
msgstr "Clipper-innstillinger"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Slette notatbok? Alle notater og underliggende notatbøker i denne notatboken "
"vil også bli slettet."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Fjern denne merkelappen fra alle notater?"
msgid "Remove this search from the sidebar?"
@@ -1121,9 +1136,6 @@ msgstr "Slett"
msgid "Rename"
msgstr "Gi nytt navn"
msgid "Synchronise"
msgstr "Synkroniser"
msgid "Notebooks"
msgstr "Notatbøker"
@@ -1138,6 +1150,9 @@ msgstr "Henter ressurser: %d"
msgid "Please select where the sync status should be exported to"
msgstr "Velg hvor synkroniseringsstatusen skal eksporteres til"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Legg til eller fjern merkelapper"
@@ -1542,6 +1557,9 @@ msgstr "Evernote-eksportert fil"
msgid "Json Export Directory"
msgstr "Json-eksportert katalog"
msgid "File"
msgstr "Fil"
msgid "Directory"
msgstr "Katalog"
@@ -1828,6 +1846,9 @@ msgstr "Se på kart"
msgid "Go to source URL"
msgstr "Gå til kilde-URL"
msgid "Edit"
msgstr "Rediger"
msgid "Delete notebook"
msgstr "Slett notatbok"
@@ -1849,3 +1870,6 @@ msgstr "Du har enda ingen notatbok. Lag en ved å klikke på (+)-knappen."
msgid "Welcome"
msgstr "Velkommen"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separer hver merkelapp med komma."

View File

@@ -606,7 +606,8 @@ msgstr ""
msgid "PDF File"
msgstr "Bestand"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Bestand"
msgid "New note"
@@ -625,6 +626,9 @@ msgstr "Importeer"
msgid "Export"
msgstr "Importeer"
msgid "Synchronise"
msgstr "Synchroniseer"
msgid "Print"
msgstr ""
@@ -635,7 +639,8 @@ msgstr ""
msgid "Quit"
msgstr "Stop"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Bewerk"
msgid "Copy"
@@ -673,7 +678,7 @@ msgstr "Zoek in alle notities"
msgid "Search in current note"
msgstr "Zoek in alle notities"
msgid "View"
msgid "&View"
msgstr ""
msgid "Toggle sidebar"
@@ -685,7 +690,8 @@ msgstr ""
msgid "Focus"
msgstr ""
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Tools"
msgid "Synchronisation status"
@@ -700,7 +706,8 @@ msgstr "Versleutelopties"
msgid "General Options"
msgstr "Algemene opties"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Help"
msgid "Website and documentation"
@@ -946,9 +953,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:"
@@ -1119,7 +1123,17 @@ msgstr "Versleutelopties"
msgid "Clipper Options"
msgstr "Algemene opties"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Notitieboek verwijderen? Alle notities in dit notitieboek zullen ook "
"verwijderd worden."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Deze tag verwijderen van alle notities?"
msgid "Remove this search from the sidebar?"
@@ -1131,9 +1145,6 @@ msgstr "Verwijderen"
msgid "Rename"
msgstr "Hernoem"
msgid "Synchronise"
msgstr "Synchroniseer"
msgid "Notebooks"
msgstr "Notitieboeken"
@@ -1148,6 +1159,9 @@ msgstr "Middelen: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Selecteer waar de synchronisatie status naar geëxporteerd moet worden"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Voeg tag toe of verwijder tag"
@@ -1560,6 +1574,9 @@ msgstr "Exporteer Evernote bestanden"
msgid "Json Export Directory"
msgstr "Exporteer Evernote bestanden"
msgid "File"
msgstr "Bestand"
msgid "Directory"
msgstr ""
@@ -1842,6 +1859,9 @@ msgstr "Toon op de kaart"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Bewerk"
msgid "Delete notebook"
msgstr "Verwijder notitieboek"
@@ -1866,6 +1886,9 @@ msgstr ""
msgid "Welcome"
msgstr "Welkom"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Scheid iedere tag met een komma."
#, fuzzy
#~ msgid "State: %s."
#~ msgstr "Status: \"%s\""

View File

@@ -606,7 +606,8 @@ msgstr "Bezig met importeren van \"%s\" in het formaat \"%s\". Even geduld..."
msgid "PDF File"
msgstr "PDF-bestand"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Bestand"
msgid "New note"
@@ -624,6 +625,9 @@ msgstr "Importeren"
msgid "Export"
msgstr "Exporteren"
msgid "Synchronise"
msgstr "Synchroniseren"
msgid "Print"
msgstr "Afdrukken"
@@ -634,7 +638,8 @@ msgstr "%s verbergen"
msgid "Quit"
msgstr "Afsluiten"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Bewerken"
msgid "Copy"
@@ -672,7 +677,8 @@ msgstr "Alle notities doorzoeken"
msgid "Search in current note"
msgstr "Alle notities doorzoeken"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Beeld"
msgid "Toggle sidebar"
@@ -685,7 +691,8 @@ msgstr "Bewerkindeling tonen/verbergen"
msgid "Focus"
msgstr "Inhoud focussen"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Hulpmiddelen"
msgid "Synchronisation status"
@@ -700,7 +707,8 @@ msgstr "Versleutelingsopties"
msgid "General Options"
msgstr "Algemene opties"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Hulp"
msgid "Website and documentation"
@@ -953,9 +961,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:"
@@ -1123,7 +1128,17 @@ msgstr "Versleutelopties"
msgid "Clipper Options"
msgstr "Webclipperopties"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Notitieboek verwijderen? Alle notities en sub-notitieboeken worden eveneens "
"verwijderd."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Wil je dit label verwijderen van alle notities?"
msgid "Remove this search from the sidebar?"
@@ -1135,9 +1150,6 @@ msgstr "Verwijderen"
msgid "Rename"
msgstr "Naam wijzigen"
msgid "Synchronise"
msgstr "Synchroniseren"
msgid "Notebooks"
msgstr "Notitieboeken"
@@ -1152,6 +1164,9 @@ msgstr "Bronnen: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Kies waar de synchronisatiestatus naar moet worden geëxporteerd"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Labels toevoegen of verwijderen"
@@ -1556,6 +1571,9 @@ msgstr "Evernote-exportbestand"
msgid "Json Export Directory"
msgstr "Joplin-exportmap"
msgid "File"
msgstr "Bestand"
msgid "Directory"
msgstr "Map"
@@ -1844,6 +1862,9 @@ msgstr "Tonen op kaart"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Bewerken"
msgid "Delete notebook"
msgstr "Notitieboek verwijderen"
@@ -1868,6 +1889,9 @@ msgstr ""
msgid "Welcome"
msgstr "Welkom"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Scheidt elk label met een komma."
#~ msgid "State: %s."
#~ msgstr "Status: %s."

View File

@@ -603,7 +603,8 @@ msgstr "Importando de \"%s\" com o formato \"%s\". Por favor, aguarde..."
msgid "PDF File"
msgstr "Arquivo PDF"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Arquivo"
msgid "New note"
@@ -621,6 +622,9 @@ msgstr "Importar"
msgid "Export"
msgstr "Exportar"
msgid "Synchronise"
msgstr "Sincronizar"
msgid "Print"
msgstr "Imprimir"
@@ -631,7 +635,8 @@ msgstr "Ocultar %s"
msgid "Quit"
msgstr "Sair"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Editar"
msgid "Copy"
@@ -667,7 +672,8 @@ msgstr "Pesquisar em todas as notas"
msgid "Search in current note"
msgstr "Pesquisar na nota atual"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Visualizar"
msgid "Toggle sidebar"
@@ -680,7 +686,8 @@ msgstr "Alternar layout do editor"
msgid "Focus"
msgstr "Focar no corpo"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Ferramentas"
msgid "Synchronisation status"
@@ -695,7 +702,8 @@ msgstr "Opções de Encriptação"
msgid "General Options"
msgstr "Opções Gerais"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Ajuda"
msgid "Website and documentation"
@@ -947,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:"
@@ -1113,7 +1118,17 @@ msgstr "Opções de Encriptação"
msgid "Clipper Options"
msgstr "Opções do clipper"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Excluir o caderno? Todas as notas e sub-cadernos dentro deste também serão "
"excluídas."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Remover esta tag de todas as notas?"
msgid "Remove this search from the sidebar?"
@@ -1125,9 +1140,6 @@ msgstr "Excluir"
msgid "Rename"
msgstr "Renomear"
msgid "Synchronise"
msgstr "Sincronizar"
msgid "Notebooks"
msgstr "Cadernos"
@@ -1144,6 +1156,9 @@ msgstr ""
"Favor selecionar o local para onde o status de sincronia deveria ser "
"exportado"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Adicionar ou remover tags"
@@ -1549,6 +1564,9 @@ msgstr "Arquivo de Exportação do Evernote"
msgid "Json Export Directory"
msgstr "Diretório de Exportação JSON"
msgid "File"
msgstr "Arquivo"
msgid "Directory"
msgstr "Diretório"
@@ -1840,6 +1858,9 @@ msgstr "Ver no mapa"
msgid "Go to source URL"
msgstr "Ir para a URL de origem"
msgid "Edit"
msgstr "Editar"
msgid "Delete notebook"
msgstr "Excluir caderno"
@@ -1862,6 +1883,9 @@ 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 "Delete notes?"
#~ msgstr "Excluir notas?"

View File

@@ -542,7 +542,8 @@ msgstr ""
msgid "PDF File"
msgstr "Fișier PDF"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Fișier"
msgid "New note"
@@ -560,6 +561,9 @@ msgstr "Importați"
msgid "Export"
msgstr "Exportați"
msgid "Synchronise"
msgstr "Sincronizați"
msgid "Print"
msgstr "Printați"
@@ -570,7 +574,8 @@ msgstr "Ascundeți %s"
msgid "Quit"
msgstr "Ieșiți"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Editați"
msgid "Copy"
@@ -608,7 +613,8 @@ msgstr "Căutați în toate notițele"
msgid "Search in current note"
msgstr "Căutați în toate notițele"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Vizualizați"
msgid "Toggle sidebar"
@@ -620,7 +626,8 @@ msgstr ""
msgid "Focus"
msgstr ""
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Unelte"
msgid "Synchronisation status"
@@ -635,7 +642,8 @@ msgstr "Opțiuni de criptare"
msgid "General Options"
msgstr "Opțiuni Generale"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Ajutor"
msgid "Website and documentation"
@@ -864,9 +872,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:"
@@ -1028,7 +1033,15 @@ msgstr "Opțiuni de criptare"
msgid "Clipper Options"
msgstr "Opțiuni Clipper"
msgid "Remove this tag from all the notes?"
#, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
#, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr ""
msgid "Remove this search from the sidebar?"
@@ -1040,9 +1053,6 @@ msgstr "Ștergeți"
msgid "Rename"
msgstr "Redenumiți"
msgid "Synchronise"
msgstr "Sincronizați"
msgid "Notebooks"
msgstr "Caiete de notițe"
@@ -1057,6 +1067,9 @@ msgstr "Resurse: %d."
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Adăugați ori eliminați etichete"
@@ -1437,6 +1450,9 @@ msgstr ""
msgid "Json Export Directory"
msgstr ""
msgid "File"
msgstr "Fișier"
msgid "Directory"
msgstr ""
@@ -1709,6 +1725,9 @@ msgstr "Vizualizați pe hartă"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Editați"
msgid "Delete notebook"
msgstr "Ștergeți caiet de notițe"
@@ -1732,6 +1751,9 @@ msgstr ""
msgid "Welcome"
msgstr "Bine ați venit"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separați fiecare etichetă printr-o virgulă."
#~ msgid "State: %s."
#~ msgstr "Statut: %s."

View File

@@ -13,22 +13,25 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.6\n"
"X-Generator: Poedit 2.2.1\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
msgid "To delete a tag, untag the associated notes."
msgstr "Для удаления тега, уберите его из связанных с ним заметок."
msgstr "Для удаления метки, открепите ее от связанных с ней заметок."
msgid "Please select the note or notebook to be deleted first."
msgstr "Пожалуйста, выберите заметку или блокнот, которые будут удалены в первую очередь."
msgstr ""
"Пожалуйста, выберите заметку или блокнот, которые будут удалены в первую "
"очередь."
msgid "Press Ctrl+D or type \"exit\" to exit the application"
msgstr "Для выхода из приложения нажмите Ctrl+D или введите \"exit\""
#, javascript-format
msgid "More than one item match \"%s\". Please narrow down your query."
msgstr "Более одного элемента соответствуют \"%s\". Пожалуйста, уточните ваш запрос."
msgstr ""
"Более одного элемента соответствуют \"%s\". Пожалуйста, уточните ваш запрос."
msgid "No notebook selected."
msgstr "Блокнот не выбран."
@@ -160,8 +163,11 @@ msgstr "Шифрование: %s"
msgid "Edit note."
msgstr "Редактировать заметку."
msgid "No text editor is defined. Please set it using `config editor <editor-path>`"
msgstr "Текстовый редактор не определен. Задайте его, используя `config editor <editor-path>`"
msgid ""
"No text editor is defined. Please set it using `config editor <editor-path>`"
msgstr ""
"Текстовый редактор не определен. Задайте его, используя `config editor "
"<editor-path>`"
msgid "No active notebook."
msgstr "Нет активного блокнота."
@@ -171,7 +177,9 @@ msgid "Note does not exist: \"%s\". Create it?"
msgstr "Заметка не существует: \"%s\". Создать?"
msgid "Starting to edit note. Close the editor to get back to the prompt."
msgstr "Запуск редактирования заметки. Закройте редактор, чтобы вернуться к подсказке."
msgstr ""
"Запуск редактирования заметки. Закройте редактор, чтобы вернуться к "
"приглашению."
#, javascript-format
msgid "Error opening note in editor: %s"
@@ -188,7 +196,7 @@ msgid ""
"complete database including notebooks, notes, tags and resources."
msgstr ""
"Экспортирует данные Joplin по заданному пути. По умолчанию экспортируется "
"полная база данных, включая блокноты, заметки, теги и ресурсы."
"полная база данных, включая блокноты, заметки, метки и ресурсы."
#, javascript-format
msgid "Destination format: %s"
@@ -240,10 +248,9 @@ msgid ""
"Use the arrows and page up/down to scroll the lists and text areas "
"(including this console)."
msgstr ""
"Используйте стрелки и клавиши перелистывания страницы вверх/вниз для "
"прокрутки списков и текстовых областей (включая эту консоль)."
"Используйте стрелки и клавиши page up/page down для прокрутки списков и "
"текстовых областей (включая эту консоль)."
#, fuzzy
msgid "To maximise/minimise the console, press \"tc\"."
msgstr "Чтобы развернуть/свернуть консоль, нажимайте \"tc\"."
@@ -256,7 +263,8 @@ msgstr "Чтобы выйти из режима командной строки,
msgid ""
"For the list of keyboard shortcuts and config options, type `help keymap`"
msgstr ""
"Чтобы получить список сочетаний клавиш и настроек конфигурации введите `help keymap`"
"Чтобы получить список сочетаний клавиш и настроек конфигурации введите `help "
"keymap`"
msgid "Imports data into Joplin."
msgstr "Импортирует данные в Joplin."
@@ -290,7 +298,7 @@ msgstr "Ресурсов: %d."
#, javascript-format
msgid "Tagged: %d."
msgstr "С тегами: %d."
msgstr "С метками: %d."
msgid "Importing notes..."
msgstr "Импорт заметок..."
@@ -321,9 +329,9 @@ msgid ""
"for to-dos, or `nt` for notes and to-dos (eg. `-tt` would display only the "
"to-dos, while `-ttd` would display notes and to-dos."
msgstr ""
"Отображает только элементы указанного типа(ов). Может быть `n` для заметок, `t` для "
"задач или `nt` для заметок и задач (напр. `-tt` выведет только задачи, в "
"то время как `-ttd` выведет заметки и задачи)."
"Отображает только элементы указанного типа(ов). Может быть `n` для заметок, "
"`t` для задач или `nt` для заметок и задач (напр. `-tt` выведет только "
"задачи, в то время как `-ttd` выведет заметки и задачи)."
msgid "Either \"text\" or \"json\""
msgstr "Также \"text\" или \"json\""
@@ -362,11 +370,12 @@ msgstr "Удаляет заданный блокнот."
msgid "Deletes the notebook without asking for confirmation."
msgstr "Удаляет блокнот без запроса подтверждения."
#, fuzzy
msgid ""
"Delete notebook? All notes and sub-notebooks within this notebook will also "
"be deleted."
msgstr "Удалить блокнот? Все заметки и вложенные блокноты в этом блокноте также будут."
msgstr ""
"Удалить блокнот? Все заметки и вложенные блокноты в этом блокноте также "
"будут удалены."
msgid "Deletes the notes matching <note-pattern>."
msgstr "Удаляет заметки, соответствующие <note-pattern>."
@@ -404,7 +413,8 @@ msgstr "Синхронизирует с удаленным хранилищем.
msgid "Sync to provided target (defaults to sync.target config value)"
msgstr ""
"Синхронизация с заданной целью (по умолчанию используется значение конфигурации sync.target"
"Синхронизация с заданной целью (по умолчанию используется значение "
"конфигурации sync.target"
msgid ""
"Authentication was not completed (did not receive an authentication token)."
@@ -412,10 +422,13 @@ msgstr "Аутентификация не была завершена (не по
msgid ""
"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
msgstr "Чтобы разрешить Joplin синхронизироваться с Dropbox, выполните следующие действия."
msgstr ""
"Чтобы разрешить Joplin синхронизироваться с Dropbox, выполните следующие "
"действия:"
msgid "Step 1: Open this URL in your browser to authorise the application:"
msgstr "Шаг 1: Откройте этот URL в вашем браузере, чтобы авторизовать приложение:"
msgstr ""
"Шаг 1: Откройте этот URL в вашем браузере, чтобы авторизовать приложение:"
msgid "Step 2: Enter the code provided by Dropbox:"
msgstr "Шаг 2: Введите код, предоставленный Dropbox:"
@@ -454,16 +467,15 @@ msgstr "Загрузка ресурсов..."
msgid "Cancelling... Please wait."
msgstr "Отмена... Пожалуйста, подождите."
#, fuzzy
msgid ""
"<tag-command> can be \"add\", \"remove\" or \"list\" to assign or remove "
"[tag] from [note], or to list the notes associated with [tag]. The command "
"`tag list` can be used to list all the tags (use -l for long option)."
msgstr ""
"<tag-command> может быть \"add\", \"remove\" или \"list\", чтобы назначить или "
"убрать [tag] с [note], или чтобы вывести список заметок, ассоциированых с "
"[tag]. Команда `tag list` может быть использована для вывода списка всех "
"тегов."
"<tag-command> может быть \"add\", \"remove\" или \"list\", чтобы назначить "
"или убрать [tag] с [note], или чтобы вывести список заметок, ассоциированых "
"с [tag]. Команда `tag list` может быть использована для вывода списка всех "
"меток."
#, javascript-format
msgid "Invalid command: \"%s\""
@@ -475,10 +487,10 @@ msgid ""
"target is a regular note it will be converted to a to-do). Use \"clear\" to "
"convert the to-do back to a regular note."
msgstr ""
"<todo-command> может быть \"toggle\" или \"clear\". \"toggle\" используется для "
"переключения статуса заданной задачи на завершенную или незавершенную (если "
"применить к обычной заметке, она будет преобразована в задачу). \"clear\" "
"используется для преобразования задачи обратно в обычную заметку."
"<todo-command> может быть \"toggle\" или \"clear\". \"toggle\" используется "
"для переключения статуса заданной задачи на завершенную или незавершенную "
"(если применить к обычной заметке, она будет преобразована в задачу). \"clear"
"\" используется для преобразования задачи обратно в обычную заметку."
msgid "Marks a to-do as non-completed."
msgstr "Помечает задачу как незавершенную."
@@ -536,8 +548,8 @@ msgid ""
"will be shared with any third party."
msgstr ""
"Откройте следующую ссылку в вашем браузере для аутентификации приложения. "
"Приложением будет создан каталог \"Apps/Joplin\". Чтение и запись файлов будет "
"осуществляться только в нем. У приложения не будет доступа к каким-"
"Приложением будет создан каталог \"Apps/Joplin\". Чтение и запись файлов "
"будет осуществляться только в нем. У приложения не будет доступа к каким-"
"либо файлам за пределами этого каталога и другим личным данным. Никакая "
"информация не будет передана третьим лицам."
@@ -576,18 +588,16 @@ msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr "Экспорт в \"%s\" в формате \"%s\". Пожалуйста, подождите..."
msgid "Sidebar"
msgstr ""
msgstr "Боковая панель"
msgid "Note list"
msgstr ""
msgstr "Список заметок"
#, fuzzy
msgid "Note title"
msgstr "Название блокнота:"
msgstr "Название заметки"
#, fuzzy
msgid "Note body"
msgstr "Блокноты"
msgstr "Тело заметки"
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
@@ -596,7 +606,8 @@ msgstr "Импорт из \"%s\" в формате \"%s\". Пожалуйста,
msgid "PDF File"
msgstr "Файл PDF"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Файл"
msgid "New note"
@@ -614,6 +625,9 @@ msgstr "Импорт"
msgid "Export"
msgstr "Экспорт"
msgid "Synchronise"
msgstr "Синхронизировать"
msgid "Print"
msgstr "Печать"
@@ -624,8 +638,9 @@ msgstr "Скрыть %s"
msgid "Quit"
msgstr "Выход"
msgid "Edit"
msgstr "Редактировать"
#, fuzzy
msgid "&Edit"
msgstr "Правка"
msgid "Copy"
msgstr "Копировать"
@@ -636,21 +651,20 @@ msgstr "Вырезать"
msgid "Paste"
msgstr "Вставить"
#, fuzzy
msgid "Select all"
msgstr "Выбрать все"
msgid "Bold"
msgstr "Bold"
msgstr "Жирный"
msgid "Italic"
msgstr "Italic"
msgstr "Наклонный"
msgid "Link"
msgstr ""
msgstr "Ссылка"
msgid "Insert Date Time"
msgstr "Введите дату и время"
msgstr "Вставить дату и время"
msgid "Edit in external editor"
msgstr "Редактировать во внешнем редакторе"
@@ -658,25 +672,25 @@ msgstr "Редактировать во внешнем редакторе"
msgid "Search in all the notes"
msgstr "Поиск во всех заметках"
#, fuzzy
msgid "Search in current note"
msgstr "Поиск в текущей заметке"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Вид"
msgid "Toggle sidebar"
msgstr "Переключить панель"
msgstr "Переключить боковую панель"
msgid "Toggle editor layout"
msgstr "Переключить вид редактора"
#, fuzzy
msgid "Focus"
msgstr "Фокус на содержимом"
msgstr "Фокус"
msgid "Tools"
msgstr "Инструменты"
#, fuzzy
msgid "&Tools"
msgstr "Сервис"
msgid "Synchronisation status"
msgstr "Статус синхронизации"
@@ -690,7 +704,8 @@ msgstr "Настройки шифрования"
msgid "General Options"
msgstr "Основные настройки"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Помощь"
msgid "Website and documentation"
@@ -750,13 +765,13 @@ msgid "Token has been copied to the clipboard!"
msgstr "Токен скопирован в буфер обмена!"
msgid "The web clipper service is enabled and set to auto-start."
msgstr "Служба веб-клиппера включена и настроена на автоматический запуск"
msgstr "Служба веб-клиппера включена и настроена на автоматический запуск."
#, javascript-format
msgid "Status: Started on port %d"
msgstr "Статус: запущен. Порт %d"
#, fuzzy, javascript-format
#, javascript-format
msgid "Status: %s"
msgstr "Статус: %s"
@@ -764,7 +779,7 @@ msgid "Disable Web Clipper Service"
msgstr "Отключить службу веб-клиппера"
msgid "The web clipper service is not enabled."
msgstr "Слуюба веб-клиппера не включена"
msgstr "Служба веб-клиппера не включена."
msgid "Enable Web Clipper Service"
msgstr "Включить службу веб-клиппера"
@@ -772,7 +787,9 @@ msgstr "Включить службу веб-клиппера"
msgid ""
"Joplin Web Clipper allows saving web pages and screenshots from your browser "
"to Joplin."
msgstr "Веб-клиппер Joplin позволяет сохранять веб-страницы и скриншоты из вашего браузера в Joplin."
msgstr ""
"Веб-клиппер Joplin позволяет сохранять веб-страницы и скриншоты из вашего "
"браузера в Joplin."
msgid "In order to use the web clipper, you need to do the following:"
msgstr "Для того, чтобы использовать веб-клиппер, вам нужно сделать следующее:"
@@ -784,22 +801,22 @@ msgid ""
"This service allows the browser extension to communicate with Joplin. When "
"enabling it your firewall may ask you to give permission to Joplin to listen "
"to a particular port."
msgstr "Эта служба позволяет расширению браузера общаться с Joplin. "
"После ее включения брандмауэр ОС может запросить разрешение на "
"использование Joplin определенного порта."
msgstr ""
"Эта служба позволяет расширению браузера общаться с Joplin. После ее "
"включения брандмауэр ОС может запросить разрешение на использование Joplin "
"определенного порта."
msgid "Step 2: Install the extension"
msgstr "Шаг 2: установите расширение"
msgid "Download and install the relevant extension for your browser:"
msgstr "Скачайте и установите расширение для вашего браузера"
msgstr "Скачайте и установите расширение для вашего браузера:"
#, fuzzy
msgid "Advanced options"
msgstr "Расширенные настройки"
msgid "Authorisation token:"
msgstr "Токен авторизации"
msgstr "Токен авторизации:"
msgid "Copy token"
msgstr "Скопировать токен"
@@ -807,7 +824,8 @@ msgstr "Скопировать токен"
msgid ""
"This authorisation token is only needed to allow third-party applications to "
"access Joplin."
msgstr "Этот токен авторизации необходим только для разрешения сторонним приложениям "
msgstr ""
"Этот токен авторизации необходим только для разрешения сторонним приложениям "
"получать доступ к Joplin."
#, javascript-format
@@ -815,7 +833,7 @@ msgid "Notes and settings are stored in: %s"
msgstr "Заметки и настройки сохранены в: %s"
msgid "Browse..."
msgstr ""
msgstr "Обзор..."
msgid "Check synchronisation configuration"
msgstr "Проверить настройки синхронизации"
@@ -905,8 +923,9 @@ msgstr ""
msgid ""
"For more information about End-To-End Encryption (E2EE) and advices on how "
"to enable it please check the documentation:"
msgstr "Для получения дополнительной информации о сквозном шифровании (E2EE) и советах о том, "
"как его включить, пожалуйста, обратитесь к документации:"
msgstr ""
"Для получения дополнительной информации о сквозном шифровании (E2EE) и "
"советах о том, как его включить, пожалуйста, обратитесь к документации:"
msgid "Status"
msgstr "Статус"
@@ -914,7 +933,6 @@ msgstr "Статус"
msgid "Encryption is:"
msgstr "Шифрование:"
#, fuzzy
msgid "Usage"
msgstr "Использование: %s"
@@ -924,7 +942,8 @@ msgstr "Назад"
#, javascript-format
msgid ""
"New notebook \"%s\" will be created and file \"%s\" will be imported into it"
msgstr "Будет создан новый блокнот \"%s\" и в него будет импортирован файл \"%s\""
msgstr ""
"Будет создан новый блокнот \"%s\" и в него будет импортирован файл \"%s\""
msgid "Please create a notebook first."
msgstr "Пожалуйста, сначала создайте блокнот."
@@ -936,25 +955,20 @@ msgid "Notebook title:"
msgstr "Название блокнота:"
msgid "Add or remove tags:"
msgstr "Добавить или удалить теги:"
msgid "Separate each tag by a comma."
msgstr "Разделяйте каждый тег запятой."
msgstr "Добавить или удалить метки:"
msgid "Rename notebook:"
msgstr "Переименовать блокнот:"
#, fuzzy
msgid "Rename tag:"
msgstr "Переименовать тег"
msgstr "Переименовать метку:"
msgid "Set alarm:"
msgstr "Установить напоминание:"
msgid "Layout"
msgstr "Вид"
msgstr "Разметка"
#, fuzzy
msgid "Search..."
msgstr "Поиск..."
@@ -971,11 +985,11 @@ msgid "Set the password"
msgstr "Установить пароль"
msgid "No notes in here. Create one by clicking on \"New note\"."
msgstr "Здесь нет заметок. Создайте новую, нажав на \"New note\"."
msgstr "Здесь нет заметок. Создайте новую, нажав на \"Новая заметка\"."
msgid ""
"There is currently no notebook. Create one by clicking on \"New notebook\"."
msgstr "Сейчас здесь нет блокнотов. Создайте новый, нажав \"New notebook\"."
msgstr "Сейчас здесь нет блокнотов. Создайте новый, нажав \"Новый блокнот\"."
msgid "Location"
msgstr "Местоположение"
@@ -989,7 +1003,7 @@ msgstr "Свойства заметки"
msgid "Open..."
msgstr "Открыть..."
#, fuzzy, javascript-format
#, javascript-format
msgid "This file could not be opened: %s"
msgstr "Этот файл не может быть открыт: %s"
@@ -1007,18 +1021,19 @@ msgstr "Это вложение еще не загружено или еще н
#, javascript-format
msgid "Unsupported link or message: %s"
msgstr "Неподдерживаемая ссыка или сообщение: %s"
msgstr "Неподдерживаемая ссылка или сообщение: %s"
#, javascript-format
msgid ""
"This note has no content. Click on \"%s\" to toggle the editor and edit the "
"note."
msgstr ""
"Эта заметка не имеет содержания. Нажмите на \"%s\", чтобы переключиться в редактор и "
"отредактировать ее."
"Эта заметка не имеет содержания. Нажмите на \"%s\", чтобы переключиться в "
"редактор и отредактировать ее."
msgid "Only one note can be printed or exported to PDF at a time."
msgstr "Только одна заметка может быть напечатана или экспортирована в PDF за раз."
msgstr ""
"Только одна заметка может быть напечатана или экспортирована в PDF за раз."
msgid "strong text"
msgstr "выделенный текст"
@@ -1027,7 +1042,7 @@ msgid "emphasized text"
msgstr "подчеркнутый текст"
msgid "List item"
msgstr "Список элементов"
msgstr "Список"
msgid "Insert Hyperlink"
msgstr "Вставить гиперссылку"
@@ -1036,12 +1051,12 @@ msgid "Attach file"
msgstr "Прикрепить файл"
msgid "Tags"
msgstr "Теги"
msgstr "Метки"
msgid "Set alarm"
msgstr "Установить напоминание"
#, fuzzy, javascript-format
#, javascript-format
msgid "In: %s"
msgstr "В: %s"
@@ -1058,18 +1073,17 @@ msgid "Bulleted List"
msgstr "Маркированный список"
msgid "Checkbox"
msgstr "Флажок"
msgstr "Пометка"
msgid "Heading"
msgstr "Заголовок"
msgid "Horizontal Rule"
msgstr "Горизотальный порядок"
msgstr "Горизотальный разделитель"
msgid "Click to stop external editing"
msgstr "Нажмите, чтобы не использовать внешнее редактирование"
msgstr "Нажмите, чтобы остановить внешнее редактирование"
#, fuzzy
msgid "Watching..."
msgstr "Наблюдение..."
@@ -1104,12 +1118,21 @@ msgstr "Статус синхронизации"
msgid "Encryption Options"
msgstr "Настройки шифрования"
#, fuzzy
msgid "Clipper Options"
msgstr "Основные клиппера"
msgstr "Настройки клиппера"
msgid "Remove this tag from all the notes?"
msgstr "Удалить этот тег из всех заметок?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Удалить блокнот? Все заметки и вложенные блокноты в этом блокноте также "
"будут удалены."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Удалить эту метку из всех заметок?"
msgid "Remove this search from the sidebar?"
msgstr "Удалить этот поиск из боковой панели?"
@@ -1120,60 +1143,57 @@ msgstr "Удалить"
msgid "Rename"
msgstr "Переименовать"
msgid "Synchronise"
msgstr "Синхронизировать"
msgid "Notebooks"
msgstr "Блокноты"
#, fuzzy, javascript-format
#, javascript-format
msgid "Decrypting items: %d/%d"
msgstr "Расшифровано элементов: %d/%d."
msgstr "Расшифровано элементов: %d/%d"
#, fuzzy, javascript-format
#, javascript-format
msgid "Fetching resources: %d"
msgstr "Извлечение ресурсов: %d."
msgstr "Получение ресурсов: %d"
msgid "Please select where the sync status should be exported to"
msgstr "Пожалуйста, выберите, куда должен быть экспортирован статус синхронизации"
msgstr ""
"Пожалуйста, выберите, куда должен быть экспортирован статус синхронизации"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Добавить или удалить теги"
msgstr "Добавить или удалить метки"
#, fuzzy
msgid "Duplicate"
msgstr "Выйти из приложения."
msgstr "Дубликат"
#, fuzzy, javascript-format
#, javascript-format
msgid "%s - Copy"
msgstr "Копировать"
msgstr "%s - Копия"
msgid "Switch between note and to-do type"
msgstr "Переключить тип между заметкой и задачей"
msgstr "Переключить между заметкой и задачей"
#, fuzzy
msgid "Switch to note type"
msgstr "Переключить тип между заметкой и задачей"
msgstr "Переключить тип на заметку"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Переключить тип между заметкой и задачей"
msgstr "Переключить тип на задачу"
#, fuzzy
msgid "Copy Markdown link"
msgstr "Markdown"
msgstr "Копировать ссылку Markdown"
#, fuzzy, javascript-format
#, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Удалить заметки?"
msgstr "Удалить заметку \"%s\"?"
#, fuzzy, javascript-format
#, javascript-format
msgid "Delete these %d notes?"
msgstr "Удалить эти заметки?"
msgstr "Удалить эти %d заметки?"
#, javascript-format
msgid "Usage: %s"
msgstr "Использование: %s"
msgstr "Использовано: %s"
#, javascript-format
msgid "Unknown flag: %s"
@@ -1292,23 +1312,20 @@ msgstr "Зашифрованные элементы не могут быть и
msgid "Conflicts"
msgstr "Конфликты"
#, fuzzy
msgid "Cannot move notebook to this location"
msgstr "Не удается переместить блокнот в это расположение"
#, javascript-format
msgid "Notebooks cannot be named \"%s\", which is a reserved title."
msgstr "Блокнот не может быть назван \"%s\", так как это зарезервированное название."
msgstr ""
"Блокнот не может быть назван \"%s\", так как это зарезервированное название."
#, fuzzy
msgid "title"
msgstr "заголовок"
#, fuzzy
msgid "updated date"
msgstr "дата обновления"
#, fuzzy
msgid "created date"
msgstr "дата создания"
@@ -1344,7 +1361,6 @@ msgstr "Темная"
msgid "Uncompleted to-dos on top"
msgstr "Незавершенные задачи сверху"
#, fuzzy
msgid "Show completed to-dos"
msgstr "Показать незавершенные задачи"
@@ -1379,8 +1395,9 @@ msgid ""
"This will allow Joplin to run in the background. It is recommended to enable "
"this setting so that your notes are constantly being synchronised, thus "
"reducing the number of conflicts."
msgstr "Это позволит Joplin работать в фоновом режиме. Рекомендуется включить "
"этот параметр, чтобы ваши заметки синхронизировались постоянно, таким образом, "
msgstr ""
"Это позволит Joplin работать в фоновом режиме. Рекомендуется включить этот "
"параметр, чтобы ваши заметки синхронизировались постоянно, таким образом, "
"уменьшая количество конфликтов."
msgid "Start application minimised in the tray icon"
@@ -1389,20 +1406,18 @@ msgstr "Запускать приложение свернутым в трее"
msgid "Global zoom percentage"
msgstr "Глобальный масштаб в процентах"
#, fuzzy
msgid "Editor font size"
msgstr "Размер шрифта редактора"
msgid "Editor font family"
msgstr "Семейство шрифтов редактора"
#, fuzzy
msgid ""
"This must be *monospace* font or it will not work properly. If the font is "
"incorrect or empty, it will default to a generic monospace font."
msgstr ""
"Название шрифта не проверяется. Если оно указано некорректно или не задано, "
"будет использоваться стандартный моноширинный шрифт."
"Это должен быть моноширинный шрифт или он не будет работать корректно. Если "
"название некорректно или пустое, будет использован шрифт по умолчанию."
msgid "Automatically update the application"
msgstr "Автоматически обновлять приложение"
@@ -1412,7 +1427,9 @@ msgstr "Получать предварительные релизы при пр
#, javascript-format
msgid "See the pre-release page for more details: %s"
msgstr "См. страницу предварительных выпусков для получения более подробной информации: %s"
msgstr ""
"См. страницу предварительных выпусков для получения более подробной "
"информации: %s"
msgid "Synchronisation interval"
msgstr "Интервал синхронизации"
@@ -1429,17 +1446,16 @@ msgstr "%d час"
msgid "%d hours"
msgstr "%d часов"
#, fuzzy
msgid "Text editor command"
msgstr "Текстовый редактор"
msgstr "Команда текстового редактора"
#, fuzzy
msgid ""
"The editor command (may include arguments) that will be used to open a note. "
"If none is provided it will try to auto-detect the default editor."
msgstr ""
"Редактор, в котором будут открываться заметки (может включать аргументы). Если не задан, будет "
"произведена попытка автоматического определения редактора по умолчанию."
"Редактор, в котором будут открываться заметки (может включать аргументы). "
"Если не задан, будет произведена попытка автоматического определения "
"редактора по умолчанию."
msgid "Show advanced options"
msgstr "Показывать расширенные настройки"
@@ -1472,9 +1488,10 @@ msgid ""
"Attention: If you change this location, make sure you copy all your content "
"to it before syncing, otherwise all files will be removed! See the FAQ for "
"more details: %s"
msgstr "Внимание: если вы измените это местоположение, обязательно скопируйте все содержимое "
"перед синхронизацией, в противном случае все файлы будут удалены! Смотрите FAQ для "
"получения подробной информации: %s"
msgstr ""
"Внимание: если вы измените это местоположение, обязательно скопируйте все "
"содержимое перед синхронизацией, в противном случае все файлы будут удалены! "
"Смотрите FAQ для получения подробной информации: %s"
msgid "Nextcloud username"
msgstr "Имя пользователя Nextcloud"
@@ -1499,10 +1516,12 @@ msgid ""
"or path to individual cert files. For example: /my/cert_dir, /other/custom."
"pem. Note that if you make changes to the TLS settings, you must save your "
"changes before clicking on \"Check synchronisation configuration\"."
msgstr "Разделенный запятыми список путей к каталогам для загрузки сертификатов "
"из отдельных файлов сертификатов или путей к ним. Например: /my/cert_dir, /other/custom. "
"Обратите внимание, что если вы вносите изменения в настройки TLS, вы должны "
"сохранить их перед нажатием на \"Проверить настройки синхронизации\"."
msgstr ""
"Разделенный запятыми список путей к каталогам для загрузки сертификатов из "
"отдельных файлов сертификатов или путей к ним. Например: /my/cert_dir, /"
"other/custom. Обратите внимание, что если вы вносите изменения в настройки "
"TLS, вы должны сохранить их перед нажатием на \"Проверить настройки "
"синхронизации\"."
msgid "Ignore TLS certificate errors"
msgstr "Игнорировать ошибки сертификата TLS"
@@ -1511,28 +1530,24 @@ msgstr "Игнорировать ошибки сертификата TLS"
msgid "Invalid option value: \"%s\". Possible values are: %s."
msgstr "Неверное значение параметра: \"%s\". Доступные значения: %s."
#, fuzzy
msgid "General"
msgstr "Основные настройки"
msgstr "Основные"
#, fuzzy
msgid "Synchronisation"
msgstr "Статус синхронизации"
msgstr "Синхронизация"
msgid "Appearance"
msgstr ""
msgstr "Внешний вид"
#, fuzzy
msgid "Note"
msgstr "Блокноты"
msgstr "Заметки"
#, fuzzy
msgid "Application"
msgstr "Выйти из приложения."
msgstr "Приложение"
#, javascript-format
msgid "The tag \"%s\" already exists. Please choose a different name."
msgstr "Тег \"%s\" уже существует. Пожалуйста, выберите другое имя."
msgstr "Метка \"%s\" уже существует. Пожалуйста, выберите другое имя."
msgid "Joplin Export File"
msgstr "Файл экспорта Joplin"
@@ -1546,10 +1561,12 @@ msgstr "Каталог экспорта Joplin"
msgid "Evernote Export File"
msgstr "Файл экспорта Evernote"
#, fuzzy
msgid "Json Export Directory"
msgstr "Каталог экспорта Joplin"
msgid "File"
msgstr "Файл"
msgid "Directory"
msgstr "Каталог"
@@ -1588,9 +1605,9 @@ msgid ""
"target. In order to find these items, either search for the title or the ID "
"(which is displayed in brackets above)."
msgstr ""
"Эти элементы останутся на устройстве, но не будут загружены в целевой "
"объект синхронизации. Чтобы найти эти элементы, воспользуйтесь поиском по "
"названию или ID (который указывается в скобках выше)."
"Эти элементы останутся на устройстве, но не будут загружены в целевой объект "
"синхронизации. Чтобы найти эти элементы, воспользуйтесь поиском по названию "
"или ID (который указывается в скобках выше)."
msgid "Sync status (synced items / total items)"
msgstr "Статус синхронизации (синхронизировано / всего)"
@@ -1605,7 +1622,7 @@ msgstr "Всего: %d/%d"
#, javascript-format
msgid "Conflicted: %d"
msgstr "Конфликтующих: %d"
msgstr "Конфликтов: %d"
#, javascript-format
msgid "To delete: %d"
@@ -1619,7 +1636,7 @@ msgid "%s: %d notes"
msgstr "%s: %d заметок"
msgid "Coming alarms"
msgstr "Грядущие напоминания"
msgstr "Ближайшие напоминания"
#, javascript-format
msgid "On %s: %s"
@@ -1638,7 +1655,7 @@ msgid "Delete these notes?"
msgstr "Удалить эти заметки?"
msgid "Log"
msgstr "Лог"
msgstr "Журнал"
msgid "Export Debug Report"
msgstr "Экспортировать отладочный отчет"
@@ -1659,11 +1676,9 @@ msgstr "Переместить %d заметок в блокнот \"%s\"?"
msgid "Press to set the decryption password."
msgstr "Нажмите, чтобы установить пароль для расшифровки."
#, fuzzy
msgid "Clear alarm"
msgstr "Очистить напоминание"
#, fuzzy
msgid "Save alarm"
msgstr "Сохранить напоминание"
@@ -1676,21 +1691,19 @@ msgstr "Подтвердить"
msgid "Cancel synchronisation"
msgstr "Отменить синхронизацию"
#, fuzzy
msgid "Checking... Please wait."
msgstr "Проверка... Пожалуйста, подождите."
#, fuzzy
msgid "Success! Synchronisation configuration appears to be correct."
msgstr "Успешно! Конфигурация синхронизации является корректной."
msgid ""
"Error. Please check that URL, username, password, etc. are correct and that "
"the sync target is accessible. The reported error was:"
msgstr "Ошибка. Пожалуйста, убедитесь, что URL-адрес, имя пользователя, пароль и т.д. верны "
"и что цель синхронизации доступна. Сообщение об ошибке:"
msgstr ""
"Ошибка. Пожалуйста, убедитесь, что URL-адрес, имя пользователя, пароль и т."
"д. верны и что цель синхронизации доступна. Сообщение об ошибке:"
#, fuzzy
msgid "The application has been authorised!"
msgstr "Приложение было авторизовано!"
@@ -1701,43 +1714,49 @@ msgid ""
"%s\n"
"\n"
"Please try again."
msgstr "Не удалось авторизовать приложение:\n"
msgstr ""
"Не удалось авторизовать приложение:\n"
"\n"
"%s\n"
"\n"
"Попробуйте снова."
#, fuzzy, javascript-format
#, javascript-format
msgid "Decrypted items: %s / %s"
msgstr "Расшифровано элементов: %s / %s"
msgid "New tags:"
msgstr "Новые теги"
msgstr "Новые метки:"
msgid "Type new tags or select from list"
msgstr "Введите новые теги или выберите из списка"
msgstr "Введите новые метки или выберите из списка"
msgid ""
"To work correctly, the app needs the following permissions. Please enable "
"them in your phone settings, in Apps > Joplin > Permissions"
msgstr "Для корректной работы приложению необходимы следующие разрешения. Пожалуйста, включите "
"их в настройках телефона, в Приложения > Joplin> Разрешения"
msgstr ""
"Для корректной работы приложению необходимы следующие разрешения. "
"Пожалуйста, включите их в настройках телефона, в Приложения > Joplin> "
"Разрешения"
msgid ""
"- Storage: to allow attaching files to notes and to enable filesystem "
"synchronisation."
msgstr "- Хранилище: чтобы разрешить прикрепление файлов к заметкам и включить синхронизацию "
"файловой системы."
msgstr ""
"- Хранилище: чтобы разрешить прикрепление файлов к заметкам и включить "
"синхронизацию файловой системы."
msgid "- Camera: to allow taking a picture and attaching it to a note."
msgstr "- Камера: позволяет сделать снимок и прикрепить его к заметке."
msgid "- Location: to allow attaching geo-location information to a note."
msgstr "- Местоположение: позволяет прикрепить геолокационную информацию к заметке."
msgstr ""
"- Местоположение: позволяет прикрепить геолокационную информацию к заметке."
msgid "Joplin website"
msgstr "Сайт Joplin"
#, fuzzy, javascript-format
#, javascript-format
msgid "Joplin v%s"
msgstr "Joplin v%s"
@@ -1745,15 +1764,13 @@ msgstr "Joplin v%s"
msgid "Database v%s"
msgstr "База данных v%s"
#, fuzzy, javascript-format
#, javascript-format
msgid "FTS enabled: %d"
msgstr "FTS включен: %d"
#, fuzzy
msgid "Login with Dropbox"
msgstr "Войти с Dropbox"
#, fuzzy
msgid "Enter code here"
msgstr "Введите код здесь"
@@ -1802,13 +1819,14 @@ msgstr "Нет элементов с ID %s"
#, javascript-format
msgid "The Joplin mobile app does not currently support this type of link: %s"
msgstr "Мобильное приложение Joplin в настоящее время не поддерживает этот тип ссылки: %s"
msgstr ""
"Мобильное приложение Joplin в настоящее время не поддерживает этот тип "
"ссылки: %s"
#, javascript-format
msgid "Unsupported image type: %s"
msgstr "Неподдерживаемый формат изображения: %s"
#, fuzzy
msgid "Take photo"
msgstr "Сделать фото"
@@ -1839,6 +1857,9 @@ msgstr "Посмотреть на карте"
msgid "Go to source URL"
msgstr "Перейти к исходному URL"
msgid "Edit"
msgstr "Правка"
msgid "Delete notebook"
msgstr "Удалить блокнот"
@@ -1860,3 +1881,6 @@ msgstr "У вас сейчас нет блокнота. Создайте его
msgid "Welcome"
msgstr "Добро пожаловать"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Разделяйте каждую метку запятой."

View File

@@ -603,7 +603,8 @@ msgstr "Uvažam v \"%s\" kot \"%s\" format. Prosim počakajte..."
msgid "PDF File"
msgstr "PDF datoteka"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Datoteka"
msgid "New note"
@@ -621,6 +622,9 @@ msgstr "Uvozi"
msgid "Export"
msgstr "Izvozi"
msgid "Synchronise"
msgstr "Sinhroniziraj"
msgid "Print"
msgstr "Natisni"
@@ -631,7 +635,8 @@ msgstr "Skrij %s"
msgid "Quit"
msgstr "Izhod"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Uredi"
msgid "Copy"
@@ -669,7 +674,8 @@ msgstr "Išči znotraj vseh zabeležk"
msgid "Search in current note"
msgstr "Išči znotraj vseh zabeležk"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Pogled"
msgid "Toggle sidebar"
@@ -682,7 +688,8 @@ msgstr "Spremeni izgled urejevalnika"
msgid "Focus"
msgstr "Fokusiraj vsebino"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Orodja"
msgid "Synchronisation status"
@@ -697,7 +704,8 @@ msgstr "Možnosti enkripcije"
msgid "General Options"
msgstr "Splošne možnosti"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Pomoč"
msgid "Website and documentation"
@@ -942,9 +950,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:"
@@ -1116,7 +1121,17 @@ msgstr "Možnosti enkripcije"
msgid "Clipper Options"
msgstr "Splošne možnosti"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Želite izbrisati beležnico? Vse zabeležke znotraj beležke bodo hkrati "
"izbrisane."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Odstranite to oznako iz vseh zabeležk?"
msgid "Remove this search from the sidebar?"
@@ -1128,9 +1143,6 @@ msgstr "Izbriši"
msgid "Rename"
msgstr "Preimenuj"
msgid "Synchronise"
msgstr "Sinhroniziraj"
msgid "Notebooks"
msgstr "Beležnice"
@@ -1145,6 +1157,9 @@ msgstr "Viri: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Prosim izberite, kam želite izvoziti sinhronizacijski status"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Dodaj ali odstrani oznake"
@@ -1551,6 +1566,9 @@ msgstr "Evernote izvozna datoteka"
msgid "Json Export Directory"
msgstr "Joplin izvozno mesto"
msgid "File"
msgstr "Datoteka"
msgid "Directory"
msgstr "Mesto datoteke"
@@ -1832,6 +1850,9 @@ msgstr "Prikaži na zemljevidu"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "Uredi"
msgid "Delete notebook"
msgstr "Izbriši beležnico"
@@ -1854,6 +1875,9 @@ 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 "State: %s."
#~ msgstr "Stanje: %s."

View File

@@ -607,7 +607,8 @@ msgstr "Importerar från \"%s\" som \"%s\" format. Vänta..."
msgid "PDF File"
msgstr "PDF-fil"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Fil"
msgid "New note"
@@ -625,6 +626,9 @@ msgstr "Importera"
msgid "Export"
msgstr "Exportera"
msgid "Synchronise"
msgstr "Synkronisera"
msgid "Print"
msgstr "Skriv ut"
@@ -635,7 +639,8 @@ msgstr "Dölj %s"
msgid "Quit"
msgstr "Avsluta"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Redigera"
msgid "Copy"
@@ -671,7 +676,8 @@ msgstr "Sök i alla anteckningarna"
msgid "Search in current note"
msgstr "Sök i aktuell anteckning"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "Visa"
msgid "Toggle sidebar"
@@ -683,7 +689,8 @@ msgstr "Växla redigeringslayout"
msgid "Focus"
msgstr "Fokus"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Verktyg"
msgid "Synchronisation status"
@@ -698,7 +705,8 @@ msgstr "Krypteringsinställningar"
msgid "General Options"
msgstr "Allmänna inställningar"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Hjälp"
msgid "Website and documentation"
@@ -950,9 +958,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:"
@@ -1119,7 +1124,17 @@ msgstr "Krypteringsinställningar"
msgid "Clipper Options"
msgstr "Clipper-inställningar"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Ta bort anteckningsboken? Alla anteckningar och delanteckningsböcker i den "
"här anteckningsboken tas bort också."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Ta bort den här taggen från alla anteckningar?"
msgid "Remove this search from the sidebar?"
@@ -1131,9 +1146,6 @@ msgstr "Ta bort"
msgid "Rename"
msgstr "Byt namn"
msgid "Synchronise"
msgstr "Synkronisera"
msgid "Notebooks"
msgstr "Anteckningsböcker"
@@ -1148,6 +1160,9 @@ msgstr "Hämtar resurser: %d"
msgid "Please select where the sync status should be exported to"
msgstr "Välj vart synkroniseringstillståndet ska exporteras till"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "Lägg till eller ta bort taggar"
@@ -1553,6 +1568,9 @@ msgstr "Evernote-exporteringsfil"
msgid "Json Export Directory"
msgstr "Joplin-exportkatalog"
msgid "File"
msgstr "Fil"
msgid "Directory"
msgstr "Katalog"
@@ -1845,6 +1863,9 @@ msgstr "Visa på karta"
msgid "Go to source URL"
msgstr "Gå till källans URL"
msgid "Edit"
msgstr "Redigera"
msgid "Delete notebook"
msgstr "Ta bort anteckningsbok"
@@ -1870,6 +1891,9 @@ msgstr ""
msgid "Welcome"
msgstr "Välkommen"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Separera varje tagg med ett komma."
#~ msgid "State: %s."
#~ msgstr "Tillstånd: %s."

View File

@@ -139,6 +139,8 @@ msgid ""
"Starting decryption... Please wait as it may take several minutes depending "
"on how much there is to decrypt."
msgstr ""
"Şifre çözme başlatılıyor... Çözülecek dosya sayısına bağlı olarak biraz "
"zaman alabilir, lütfen bekleyiniz."
msgid "Completed decryption."
msgstr "Şifre çözümü tamamlandı."
@@ -159,6 +161,8 @@ msgstr "Notu düzenle."
msgid ""
"No text editor is defined. Please set it using `config editor <editor-path>`"
msgstr ""
"Hiçbir metin editörü tanımlanmadı. Lütfen `config editor <editor-path>` ı "
"kullanarak editörü ayarlayınız."
msgid "No active notebook."
msgstr "Aktif not defteri yok."
@@ -172,7 +176,7 @@ msgstr ""
#, javascript-format
msgid "Error opening note in editor: %s"
msgstr ""
msgstr "Editörde not açılırken hata oluştu: %s"
msgid "Note has been saved."
msgstr "Not kaydedildi."
@@ -228,7 +232,7 @@ msgid ""
msgstr ""
msgid "To move from one pane to another, press Tab or Shift+Tab."
msgstr ""
msgstr "Bir bölmeden diğerine geçmek için Tab veya Shift+Tab tuşlarına basın."
msgid ""
"Use the arrows and page up/down to scroll the lists and text areas "
@@ -236,13 +240,13 @@ msgid ""
msgstr ""
msgid "To maximise/minimise the console, press \"tc\"."
msgstr ""
msgstr "Konsolu büyütmek/küçültmek için, \"tc\" ye basınız."
msgid "To enter command line mode, press \":\""
msgstr "Komut satırı moduna girmek için \":\" e basın"
msgid "To exit command line mode, press ESCAPE"
msgstr ""
msgstr "Komut satırı modundan çıkmak için ESC tuşuna basın."
msgid ""
"For the list of keyboard shortcuts and config options, type `help keymap`"
@@ -270,7 +274,7 @@ msgstr "Yaratıldı: %d."
#, javascript-format
msgid "Updated: %d."
msgstr "Güncellendi: %d."
msgstr "Güncellenme: %d."
#, javascript-format
msgid "Skipped: %d."
@@ -295,12 +299,16 @@ msgid ""
"Displays the notes in the current notebook. Use `ls /` to display the list "
"of notebooks."
msgstr ""
"Geçerli not defterindeki notları görüntüler. Not defteri listesini "
"görüntülemek için `ls /` kullanın."
msgid "Displays only the first top <num> notes."
msgstr ""
msgstr "Yalnızca ilk üstteki <num> notlarını görüntüler."
msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
msgstr ""
"Öğeyi <field> olarak sıralar (örneğin, başlık, güncellenme_zamanı, "
"oluşturulma_zamanı)."
msgid "Reverses the sorting order."
msgstr "Sıralama düzenini tersine çevirir."
@@ -312,7 +320,7 @@ msgid ""
msgstr ""
msgid "Either \"text\" or \"json\""
msgstr ""
msgstr "\"metin\" ya da \"json\""
msgid ""
"Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, "
@@ -366,7 +374,7 @@ msgid "Delete note?"
msgstr "Notu sil?"
msgid "Searches for the given <pattern> in all the notes."
msgstr ""
msgstr "Tüm notlarda girilen <pattern> i arar."
#, javascript-format
msgid ""
@@ -384,10 +392,12 @@ msgstr "Uzak depolama ile senkronize eder."
msgid "Sync to provided target (defaults to sync.target config value)"
msgstr ""
"Sağlanan hedefe senkronize et (varsayılan olarak sync.target değeri "
"kullanılır)"
msgid ""
"Authentication was not completed (did not receive an authentication token)."
msgstr ""
msgstr "Yetkilendirme tamamlanmadı (yetkilendirme anahtarı karşılanmadı)"
msgid ""
"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
@@ -403,7 +413,7 @@ msgstr "Adım 2: Dropbox tarafından sağlanan kodu girin:"
#, javascript-format
msgid "Not authentified with %s. Please provide any missing credentials."
msgstr ""
msgstr "%s ile doğrulama sağlanamadı. Lütfen eksik olan tüm bilgileri girin."
msgid "Synchronisation is already in progress."
msgstr "Senkronizasyon zaten devam ediyor."
@@ -414,6 +424,8 @@ msgid ""
"taking place, you may delete the lock file at \"%s\" and resume the "
"operation."
msgstr ""
"Kilit dosyası zaten tutuluyor. Eşitleme yapılmadığını biliyorsanız, kilit "
"dosyasını \"%s\" konumunda silebilir ve işleme devam edebilirsiniz."
#, javascript-format
msgid "Synchronisation target: %s (%s)"
@@ -449,19 +461,21 @@ msgid ""
msgstr ""
msgid "Marks a to-do as non-completed."
msgstr ""
msgstr "Yapılacağı tamamlanmamış olarak işaretler."
msgid ""
"Switches to [notebook] - all further operations will happen within this "
"notebook."
msgstr ""
"[notebook] 'a geçer - daha sonraki tüm işlemler bu not defterinde "
"gerçekleşecektir."
msgid "Displays version information"
msgstr "Sürüm bilgisini görüntüler"
#, javascript-format
msgid "%s %s (%s)"
msgstr ""
msgstr "%s %s (%s)"
msgid "Enum"
msgstr "Enum"
@@ -502,6 +516,11 @@ msgid ""
"any files outside this directory nor to any other personal data. No data "
"will be shared with any third party."
msgstr ""
"Lütfen uygulamayı doğrulamak için tarayıcınızda aşağıdaki URL'yi açın. "
"Uygulama \"Uygulamalar/Joplin\" de bir dizin oluşturacak ve sadece bu "
"dizindeki dosyaları okuyacak ve yazacaktır. Bu dizin dışındaki hiçbir "
"dosyaya veya diğer kişisel verilere erişemeyecektir. Hiçbir veri üçüncü "
"şahıslarla paylaşılmayacaktır."
msgid "Search:"
msgstr "Ara:"
@@ -556,7 +575,8 @@ msgstr "\"%s\" den \"%s\" biçiminde içe aktarılıyor. Lütfen bekleyin..."
msgid "PDF File"
msgstr "PDF Dosyası"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "Dosya"
msgid "New note"
@@ -574,8 +594,11 @@ msgstr "İçe aktar"
msgid "Export"
msgstr "Dışa aktar"
msgid "Synchronise"
msgstr "Senkronize"
msgid "Print"
msgstr "Yazır"
msgstr "Yazdır"
#, javascript-format
msgid "Hide %s"
@@ -584,7 +607,8 @@ msgstr "Gizle %s"
msgid "Quit"
msgstr "Çıkış"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "Düzenle"
msgid "Copy"
@@ -620,7 +644,8 @@ msgstr "Tüm notlarda ara"
msgid "Search in current note"
msgstr "Mevcut notta ara"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "İncele"
msgid "Toggle sidebar"
@@ -632,14 +657,15 @@ msgstr "Editör düzenini aç / kapat"
msgid "Focus"
msgstr "Odaklan"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "Araçlar"
msgid "Synchronisation status"
msgstr "Senkronizasyon durumu"
msgid "Web clipper options"
msgstr ""
msgstr "Web alıntılama ayarları"
msgid "Encryption options"
msgstr "Şifreleme seçenekleri"
@@ -647,7 +673,8 @@ msgstr "Şifreleme seçenekleri"
msgid "General Options"
msgstr "Genel seçenekler"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "Yardım"
msgid "Website and documentation"
@@ -704,10 +731,11 @@ msgid "No"
msgstr "Hayır"
msgid "Token has been copied to the clipboard!"
msgstr ""
msgstr "Anahtar panoya kopyalandı!"
msgid "The web clipper service is enabled and set to auto-start."
msgstr ""
"Web alıntılama servisi aktif edildi ve otomatik başlatılması için ayarlandı."
#, javascript-format
msgid "Status: Started on port %d"
@@ -718,24 +746,26 @@ msgid "Status: %s"
msgstr "Durum: %s"
msgid "Disable Web Clipper Service"
msgstr ""
msgstr "Web Alıntılama Servisini Kapat"
msgid "The web clipper service is not enabled."
msgstr ""
msgstr "Web alıntılama servisi aktif edilmedi."
msgid "Enable Web Clipper Service"
msgstr ""
msgstr "Web Alıntılama Servisini Aç"
msgid ""
"Joplin Web Clipper allows saving web pages and screenshots from your browser "
"to Joplin."
msgstr ""
"Joplin Web Alıntılama, tarayıcınızdaki web sayfalarını ve ekran "
"görüntülerini Joplin'e kaydetmenizi sağlar."
msgid "In order to use the web clipper, you need to do the following:"
msgstr ""
msgstr "Web alıntı aracını kullanmak için aşağıdakileri yapmanız gerekir:"
msgid "Step 1: Enable the clipper service"
msgstr ""
msgstr "Adım 1: Alıntılama servisini aktif et"
msgid ""
"This service allows the browser extension to communicate with Joplin. When "
@@ -756,10 +786,10 @@ msgid "Advanced options"
msgstr "Gelişmiş seçenekler"
msgid "Authorisation token:"
msgstr ""
msgstr "Yetkilendirme anahtarı:"
msgid "Copy token"
msgstr ""
msgstr "Anahtarı kopyala"
msgid ""
"This authorisation token is only needed to allow third-party applications to "
@@ -802,6 +832,11 @@ msgid ""
"password as, for security purposes, this will be the *only* way to decrypt "
"the data! To enable encryption, please enter your password below."
msgstr ""
"Şifrelemeyi aktif etmek *tüm* notlarınızın ve eklerinizin yeniden senkronize "
"edileceği ve senkronizasyon hedefine şifrelenmiş olarak gönderileceği "
"anlamına gelir. Şifrenizi kaybetmeyin, verilerinizin şifresini çözmenin "
"\"*tek yolu* bu şifreyi girmek olacaktır. Şifrelemeyi etkinleştirmek için "
"lütfen şifrenizi aşağıya girin."
msgid "Disable encryption"
msgstr "Şifrelemeyi devre dışı bırak"
@@ -893,9 +928,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:"
@@ -969,6 +1001,8 @@ msgid ""
"This note has no content. Click on \"%s\" to toggle the editor and edit the "
"note."
msgstr ""
"Bu nota içerik girilmemiş. Editöre geçiş yapıp notu düzenlemek için \"%s\" "
"butonuna tıklayın."
msgid "Only one note can be printed or exported to PDF at a time."
msgstr ""
@@ -998,7 +1032,7 @@ msgstr "Alarm kur"
#, javascript-format
msgid "In: %s"
msgstr ""
msgstr "İçinde: %s"
msgid "Hyperlink"
msgstr "Köprü"
@@ -1059,9 +1093,18 @@ msgid "Encryption Options"
msgstr "Şifreleme Seçenekleri"
msgid "Clipper Options"
msgstr ""
msgstr "Alıntılama Seçenekleri"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr ""
"Not defterini sil? Bu defterdeki tüm notlar ve alt defterler de silinecek."
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "Bu etiket tüm notlardan kaldırılsın mı?"
msgid "Remove this search from the sidebar?"
@@ -1073,9 +1116,6 @@ msgstr "Sil"
msgid "Rename"
msgstr "Yeniden adlandır"
msgid "Synchronise"
msgstr "Senkronize"
msgid "Notebooks"
msgstr "Not defterleri"
@@ -1090,17 +1130,20 @@ msgstr "Kaynaklar alınıyor: %d"
msgid "Please select where the sync status should be exported to"
msgstr "Lütfen senkronizasyon durumunun nereye aktarılacağını seçin"
msgid "Remove?"
msgstr ""
#, fuzzy
msgid "Add or remove tags"
msgstr "Etiket ekle veya kaldır:"
msgstr "Etiket ekle veya kaldır"
#, fuzzy
msgid "Duplicate"
msgstr "Uygulama"
msgstr "Tekrarla"
#, fuzzy, javascript-format
msgid "%s - Copy"
msgstr "Kopyala"
msgstr "%s - Kopyala"
msgid "Switch between note and to-do type"
msgstr ""
@@ -1116,11 +1159,11 @@ msgstr "Markdown bağlantısını kopyala"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Notu sil?"
msgstr "\"%s\" Notunu sil?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Bu notlar silinsin mi?"
msgstr "Bu notlar ( %d ) silinsin mi?"
#, javascript-format
msgid "Usage: %s"
@@ -1128,7 +1171,7 @@ msgstr "Kullanım: %s"
#, javascript-format
msgid "Unknown flag: %s"
msgstr ""
msgstr "Bilinmeyen etiket: %s"
msgid "Dropbox"
msgstr "Dropbox"
@@ -1150,16 +1193,18 @@ msgstr "WebDAV"
#, javascript-format
msgid "Unknown log level: %s"
msgstr ""
msgstr "Bilinmeyen log seviyesi: %s"
#, javascript-format
msgid "Unknown level ID: %s"
msgstr ""
msgstr "Bilinmeyen ID seviyesi: %s"
msgid ""
"Cannot refresh token: authentication data is missing. Starting the "
"synchronisation again may fix the problem."
msgstr ""
"Anahtar yenilenemiyor: kimlik doğrulama verileri eksik. Senkronizasyonu "
"tekrar başlatmak sorunu çözebilir."
msgid "Untitled"
msgstr "Başlıksız"
@@ -1172,6 +1217,12 @@ msgid ""
"\n"
"Please consider using a regular OneDrive account."
msgstr ""
"OneDrive ile senkronize edilemedi.\n"
"\n"
"Ne yazık ki bu hata genelde desteklenemeyen OneDrive İş'i kullanırken "
"meydana gelir.\n"
"\n"
"Lütfen normal bir OneDrive hesabı kullanmayı deneyin."
#, javascript-format
msgid "Cannot access %s"
@@ -1179,31 +1230,31 @@ msgstr "%s erişilemiyor"
#, javascript-format
msgid "Created local items: %d."
msgstr ""
msgstr "Oluşturulan yerel öğeler: %d."
#, javascript-format
msgid "Updated local items: %d."
msgstr ""
msgstr "Güncellenen yerel öğeler: %d."
#, javascript-format
msgid "Created remote items: %d."
msgstr ""
msgstr "Oluşturulan uzak öğeler: %d."
#, javascript-format
msgid "Updated remote items: %d."
msgstr ""
msgstr "Güncellenen uzak öğeler: %d."
#, javascript-format
msgid "Deleted local items: %d."
msgstr ""
msgstr "Silinen yerel öğeler: %d."
#, javascript-format
msgid "Deleted remote items: %d."
msgstr ""
msgstr "Silinen uzaktaki öğeler: %d."
#, javascript-format
msgid "Fetched items: %d/%d."
msgstr ""
msgstr "Alınan öğeler: %d/%d."
msgid "Cancelling..."
msgstr "İptal ediliyor..."
@@ -1217,14 +1268,14 @@ msgid "Last error: %s"
msgstr "Son hata: %s"
msgid "Idle"
msgstr ""
msgstr "Boşta"
msgid "In progress"
msgstr "Devam etmekte"
#, javascript-format
msgid "Synchronisation is already in progress. State: %s"
msgstr ""
msgstr "Senkronizasyon zaten devam ediyor. Durum: %s"
msgid "Encrypted"
msgstr "Şifrelenmiş"
@@ -1233,14 +1284,14 @@ msgid "Encrypted items cannot be modified"
msgstr "Şifrelenmiş öğeler değiştirilemez"
msgid "Conflicts"
msgstr ""
msgstr "Çakışmalar"
msgid "Cannot move notebook to this location"
msgstr "Not defteri bu konuma taşınamıyor"
#, javascript-format
msgid "Notebooks cannot be named \"%s\", which is a reserved title."
msgstr ""
msgstr "Not defterine ayrılmış bir başlık adı olan \"%s\" adı verilemez."
msgid "title"
msgstr "başlık"
@@ -1281,10 +1332,10 @@ msgid "Dark"
msgstr "Karanlık"
msgid "Uncompleted to-dos on top"
msgstr ""
msgstr "Tamamlanmamış yap-list yukarıda"
msgid "Show completed to-dos"
msgstr ""
msgstr "Tamamlanan yap-lis göster"
msgid "Sort notes by"
msgstr "Notları sırala"
@@ -1296,13 +1347,13 @@ msgid "Save geo-location with notes"
msgstr "Coğrafi konumu notlarla kaydedin"
msgid "When creating a new to-do:"
msgstr ""
msgstr "Yeni bir yapılacak oluşturulurken:"
msgid "Focus title"
msgstr ""
msgstr "Başlığa odaklan"
msgid "Focus body"
msgstr ""
msgstr "Gövde kısmına odaklan"
msgid "When creating a new note:"
msgstr "Yeni bir not oluştururken:"
@@ -1338,6 +1389,9 @@ msgid ""
"This must be *monospace* font or it will not work properly. If the font is "
"incorrect or empty, it will default to a generic monospace font."
msgstr ""
"Bu font *monospace* olmalıdır, aksi halde düzgün çalışmayacaktır. Yazı tipi "
"yanlış seçilmiş veya boş bırakılmışsa, varsayılan monospace yazı tipi "
"kullanılacaktır."
msgid "Automatically update the application"
msgstr "Uygulamayı otomatik olarak güncelle"
@@ -1481,6 +1535,9 @@ msgstr "Evernote Dosya Dışa Aktarım"
msgid "Json Export Directory"
msgstr "Json Dışa Aktarım Dizini"
msgid "File"
msgstr "Dosya"
msgid "Directory"
msgstr "Dizin"
@@ -1535,7 +1592,7 @@ msgstr "Toplam: %d/%d"
#, javascript-format
msgid "Conflicted: %d"
msgstr "Çelişki: %d"
msgstr "Çakışan: %d"
#, javascript-format
msgid "To delete: %d"
@@ -1692,7 +1749,7 @@ msgstr "Ana Şifre %s"
#, javascript-format
msgid "Created: %s"
msgstr "Oluşturuldu: %s"
msgstr "Oluşturulma: %s"
msgid "Password:"
msgstr "Şifre:"
@@ -1768,6 +1825,9 @@ msgstr "Haritada gör"
msgid "Go to source URL"
msgstr "URL kaynağına git"
msgid "Edit"
msgstr "Düzenle"
msgid "Delete notebook"
msgstr "Not defterini sil"
@@ -1790,3 +1850,6 @@ msgstr ""
msgid "Welcome"
msgstr "Hoşgeldiniz"
#~ msgid "Separate each tag by a comma."
#~ msgstr "Her etiketi virgülle ayırın."

View File

@@ -566,7 +566,8 @@ msgstr "从 \"%s\" 导入,导入格式为 \"%s\" 。请稍等…"
msgid "PDF File"
msgstr "PDF 文件"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "文件"
msgid "New note"
@@ -584,6 +585,9 @@ msgstr "导入"
msgid "Export"
msgstr "导出"
msgid "Synchronise"
msgstr "同步"
msgid "Print"
msgstr "打印"
@@ -594,7 +598,8 @@ msgstr "隐藏 %s"
msgid "Quit"
msgstr "退出"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "编辑"
msgid "Copy"
@@ -630,7 +635,8 @@ msgstr "在所有笔记内搜索"
msgid "Search in current note"
msgstr "在当前笔记内搜索"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "视图"
msgid "Toggle sidebar"
@@ -642,7 +648,8 @@ msgstr "切换编辑器布局"
msgid "Focus"
msgstr "聚焦于"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "工具"
msgid "Synchronisation status"
@@ -657,7 +664,8 @@ msgstr "加密选项"
msgid "General Options"
msgstr "通用选项"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "帮助"
msgid "Website and documentation"
@@ -895,9 +903,6 @@ msgstr "笔记本标题:"
msgid "Add or remove tags:"
msgstr "添加或删除标签:"
msgid "Separate each tag by a comma."
msgstr "用半角逗号 \",\" 分开每个标签。"
msgid "Rename notebook:"
msgstr "重命名笔记本:"
@@ -1059,7 +1064,15 @@ msgstr "加密选项"
msgid "Clipper Options"
msgstr "网页剪辑选项"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr "是否删除笔记本?所有在该笔记本内的笔记也将同时被删除。"
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "从所有笔记中删除该标签?"
msgid "Remove this search from the sidebar?"
@@ -1071,9 +1084,6 @@ msgstr "删除"
msgid "Rename"
msgstr "重命名"
msgid "Synchronise"
msgstr "同步"
msgid "Notebooks"
msgstr "笔记本"
@@ -1088,6 +1098,9 @@ msgstr "获取资源:%d。"
msgid "Please select where the sync status should be exported to"
msgstr "请选择同步状态的导出位置"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "添加或删除标签"
@@ -1477,6 +1490,9 @@ msgstr "Evernote 导出文件"
msgid "Json Export Directory"
msgstr "Json 导出目录"
msgid "File"
msgstr "文件"
msgid "Directory"
msgstr "文件目录"
@@ -1728,7 +1744,7 @@ msgid "Unsupported image type: %s"
msgstr "不支持的图片格式:%s"
msgid "Take photo"
msgstr "附加照片"
msgstr "拍照"
msgid "Attach photo"
msgstr "附加照片"
@@ -1740,10 +1756,10 @@ msgid "Share"
msgstr "分享"
msgid "Convert to note"
msgstr "转换笔记"
msgstr "转换笔记"
msgid "Convert to todo"
msgstr "转换待办事项"
msgstr "转换待办事项"
msgid "Hide metadata"
msgstr "隐藏元数据"
@@ -1757,6 +1773,9 @@ msgstr "查看地图"
msgid "Go to source URL"
msgstr "定位到源 URL"
msgid "Edit"
msgstr "编辑"
msgid "Delete notebook"
msgstr "删除笔记本"
@@ -1777,6 +1796,9 @@ msgstr "您目前未有笔记本。点击 (+) 按钮创建。"
msgid "Welcome"
msgstr "欢迎"
#~ msgid "Separate each tag by a comma."
#~ msgstr "用半角逗号 \",\" 分开每个标签。"
#~ msgid "State: %s."
#~ msgstr "状态:%s。"

View File

@@ -569,7 +569,8 @@ msgstr "從 \"%s\" 匯入為 \"%s\" 格式。請稍候..."
msgid "PDF File"
msgstr "PDF 檔案"
msgid "File"
#, fuzzy
msgid "&File"
msgstr "檔案"
msgid "New note"
@@ -587,6 +588,9 @@ msgstr "匯入"
msgid "Export"
msgstr "匯出"
msgid "Synchronise"
msgstr "進行同步"
msgid "Print"
msgstr "列印"
@@ -597,7 +601,8 @@ msgstr "隱藏 %s"
msgid "Quit"
msgstr "結束"
msgid "Edit"
#, fuzzy
msgid "&Edit"
msgstr "編輯"
msgid "Copy"
@@ -635,7 +640,8 @@ msgstr "在所有記事中搜尋"
msgid "Search in current note"
msgstr "在所有記事中搜尋"
msgid "View"
#, fuzzy
msgid "&View"
msgstr "檢視"
msgid "Toggle sidebar"
@@ -648,7 +654,8 @@ msgstr "切換編輯器佈局"
msgid "Focus"
msgstr "游標置於內文"
msgid "Tools"
#, fuzzy
msgid "&Tools"
msgstr "工具"
msgid "Synchronisation status"
@@ -663,7 +670,8 @@ msgstr "加密選項"
msgid "General Options"
msgstr "一般選項"
msgid "Help"
#, fuzzy
msgid "&Help"
msgstr "說明"
msgid "Website and documentation"
@@ -903,9 +911,6 @@ msgstr "記事本標題:"
msgid "Add or remove tags:"
msgstr "新增或移除標籤:"
msgid "Separate each tag by a comma."
msgstr "您可用逗號分隔每個標籤。"
msgid "Rename notebook:"
msgstr "重新命名記事本:"
@@ -1067,7 +1072,15 @@ msgstr "加密選項"
msgid "Clipper Options"
msgstr "Clipper 選項"
msgid "Remove this tag from all the notes?"
#, fuzzy, javascript-format
msgid ""
"Delete notebook \"%s\"?\n"
"\n"
"All notes and sub-notebooks within this notebook will also be deleted."
msgstr "決定刪除記事本?此記事本中的所有記事和子記事本也將被刪除。"
#, fuzzy, javascript-format
msgid "Remove tag \"%s\" from all notes?"
msgstr "是否從所有記事中刪除此標籤?"
msgid "Remove this search from the sidebar?"
@@ -1079,9 +1092,6 @@ msgstr "刪除"
msgid "Rename"
msgstr "重新命名"
msgid "Synchronise"
msgstr "進行同步"
msgid "Notebooks"
msgstr "記事本"
@@ -1096,6 +1106,9 @@ msgstr "資源: %d。"
msgid "Please select where the sync status should be exported to"
msgstr "請選擇將同步狀態導出到的位置"
msgid "Remove?"
msgstr ""
msgid "Add or remove tags"
msgstr "新增或移除標籤"
@@ -1490,6 +1503,9 @@ msgstr "Evernote 匯出檔"
msgid "Json Export Directory"
msgstr "Joplin 匯出目錄"
msgid "File"
msgstr "檔案"
msgid "Directory"
msgstr "目錄"
@@ -1768,6 +1784,9 @@ msgstr "在地圖上顯示"
msgid "Go to source URL"
msgstr ""
msgid "Edit"
msgstr "編輯"
msgid "Delete notebook"
msgstr "刪除記事本"
@@ -1788,6 +1807,9 @@ msgstr "您當前沒有任何筆記本。通過按一下 (+) 鍵去建立一本
msgid "Welcome"
msgstr "歡迎"
#~ msgid "Separate each tag by a comma."
#~ msgstr "您可用逗號分隔每個標籤。"
#~ msgid "State: %s."
#~ msgstr "狀態: %s。"

View File

@@ -111,6 +111,58 @@ describe('services_SearchEngine', function() {
expect(rows[4].id).toBe(n5.id);
}));
it('should order search results by relevance (last updated first)', asyncTest(async () => {
let rows;
const n1 = await Note.save({ title: "abcd" });
await sleep(0.1);
const n2 = await Note.save({ title: "abcd" });
await sleep(0.1);
const n3 = await Note.save({ title: "abcd" });
await sleep(0.1);
await engine.syncTables();
rows = await engine.search('abcd');
expect(rows[0].id).toBe(n3.id);
expect(rows[1].id).toBe(n2.id);
expect(rows[2].id).toBe(n1.id);
await Note.save({ id: n1.id, title: "abcd" });
await engine.syncTables();
rows = await engine.search('abcd');
expect(rows[0].id).toBe(n1.id);
expect(rows[1].id).toBe(n3.id);
expect(rows[2].id).toBe(n2.id);
}));
it('should order search results by relevance (completed to-dos last)', asyncTest(async () => {
let rows;
const n1 = await Note.save({ title: "abcd", is_todo: 1 });
await sleep(0.1);
const n2 = await Note.save({ title: "abcd", is_todo: 1 });
await sleep(0.1);
const n3 = await Note.save({ title: "abcd", is_todo: 1 });
await sleep(0.1);
await engine.syncTables();
rows = await engine.search('abcd');
expect(rows[0].id).toBe(n3.id);
expect(rows[1].id).toBe(n2.id);
expect(rows[2].id).toBe(n1.id);
await Note.save({ id: n3.id, todo_completed: Date.now() });
await engine.syncTables();
rows = await engine.search('abcd');
expect(rows[0].id).toBe(n2.id);
expect(rows[1].id).toBe(n1.id);
expect(rows[2].id).toBe(n3.id);
}));
it('should supports various query types', asyncTest(async () => {
let rows;

View File

@@ -1100,11 +1100,8 @@ describe('Synchronizer', function() {
expect(note2.title).toBe("un UPDATE");
}));
it("should sync Welcome notebook and not duplicate it", asyncTest(async () => {
// Create the Welcome items on two separate clients and verify
// that they appear only once (due to having hard-coded IDs), that they are not duplicated.
Setting.setConstant('env', 'prod');
it("should create a new Welcome notebook on each client", asyncTest(async () => {
// Create the Welcome items on two separate clients
await WelcomeUtils.createWelcomeItems();
await synchronizer().start();
@@ -1114,7 +1111,7 @@ describe('Synchronizer', function() {
await WelcomeUtils.createWelcomeItems();
const beforeFolderCount = (await Folder.all()).length;
const beforeNoteCount = (await Note.all()).length;
expect(beforeFolderCount >= 1).toBe(true);
expect(beforeFolderCount === 1).toBe(true);
expect(beforeNoteCount > 1).toBe(true);
await synchronizer().start();
@@ -1122,8 +1119,8 @@ describe('Synchronizer', function() {
const afterFolderCount = (await Folder.all()).length;
const afterNoteCount = (await Note.all()).length;
expect(afterFolderCount).toBe(beforeFolderCount);
expect(afterNoteCount).toBe(beforeNoteCount);
expect(afterFolderCount).toBe(beforeFolderCount * 2);
expect(afterNoteCount).toBe(beforeNoteCount * 2);
// Changes to the Welcome items should be synced to all clients
@@ -1136,8 +1133,13 @@ describe('Synchronizer', function() {
await synchronizer().start();
const f1_1 = (await Folder.all())[0];
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);
}));
});

View File

@@ -249,6 +249,10 @@
return {};
} else if (command.name === "pageUrl") {
let url = location.origin + location.pathname + location.search;
return clippedContentResponse(pageTitle(), url, getImageSizes(document));
} else {
throw new Error('Unknown command: ' + JSON.stringify(command));
}

View File

@@ -5,6 +5,7 @@
"description": "Capture and save web pages and screenshots from your browser to Joplin.",
"homepage_url": "https://joplin.cozic.net",
"icons": {
"32": "icons/32.png",
"48": "icons/48.png",
"96": "icons/96.png"
},

File diff suppressed because it is too large Load Diff

View File

@@ -7,7 +7,7 @@
"react": "^16.3.2",
"react-dom": "^16.3.2",
"react-redux": "^5.0.7",
"react-scripts": "1.1.4",
"react-scripts": "^2.1.5",
"redux": "^4.0.0"
},
"scripts": {
@@ -19,7 +19,13 @@
"postinstall": "node scripts/postinstall.js"
},
"devDependencies": {
"cra-build-watch": "^1.0.1",
"cra-build-watch": "^1.4.0",
"fs-extra": "^6.0.1"
}
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
]
}

View File

@@ -49,6 +49,12 @@ class AppComponent extends Component {
});
}
this.clipUrl_click = () => {
bridge().sendCommandToActiveTab({
name: 'pageUrl',
});
}
this.clipScreenshot_click = async () => {
try {
const baseUrl = await bridge().clipperServerBaseUrl();
@@ -296,6 +302,7 @@ class AppComponent extends Component {
<li><a className="Button" onClick={this.clipComplete_click}>Clip complete page</a></li>
<li><a className="Button" onClick={this.clipSelection_click}>Clip selection</a></li>
<li><a className="Button" onClick={this.clipScreenshot_click}>Clip screenshot</a></li>
<li><a className="Button" onClick={this.clipUrl_click}>Clip URL</a></li>
</ul>
</div>
{ foldersComp() }

View File

@@ -54,6 +54,9 @@ class ElectronAppWrapper {
y: windowState.y,
width: windowState.width,
height: windowState.height,
webPreferences: {
nodeIntegration: true,
},
};
// Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098
@@ -191,19 +194,24 @@ class ElectronAppWrapper {
ensureSingleInstance() {
if (this.env_ === 'dev') return false;
return new Promise((resolve, reject) => {
const alreadyRunning = this.electronApp_.makeSingleInstance((commandLine, workingDirectory) => {
const win = this.window();
if (!win) return;
if (win.isMinimized()) win.restore();
win.show();
win.focus();
});
const gotTheLock = this.electronApp_.requestSingleInstanceLock();
if (alreadyRunning) this.electronApp_.quit();
if (!gotTheLock) {
// Another instance is already running - exit
this.electronApp_.quit();
return true;
}
resolve(alreadyRunning);
// Someone tried to open a second instance - focus our window instead
this.electronApp_.on('second-instance', (event, commandLine, workingDirectory) => {
const win = this.window();
if (!win) return;
if (win.isMinimized()) win.restore();
win.show();
win.focus();
});
return false;
}
async start() {
@@ -211,8 +219,8 @@ class ElectronAppWrapper {
// the "ready" event. So we use the function below to make sure that the app is ready.
await this.waitForElectronAppReady();
const alreadyRunning = await this.ensureSingleInstance();
if (alreadyRunning) return;
const alreadyRunning = this.ensureSingleInstance();
if (alreadyRunning) return;
this.createWindow();

View File

@@ -368,7 +368,11 @@ class Application extends BaseApplication {
const template = [
{
label: _('File'),
label: _('&File'),
/* `&` before one of the char in the label name mean, that
* <Alt + F> will open this menu. It's needed becase electron
* opens the first menu on Alt press if no hotkey assigned.
* Issue: https://github.com/laurent22/joplin/issues/934 */
submenu: [{
label: _('New note'),
accelerator: 'CommandOrControl+N',
@@ -408,6 +412,18 @@ class Application extends BaseApplication {
submenu: exportItems,
}, {
type: 'separator',
}, {
label: _('Synchronise'),
accelerator: 'CommandOrControl+S',
screens: ['Main'],
click: async () => {
this.dispatch({
type: 'WINDOW_COMMAND',
name: 'synchronize',
});
}
}, {
type: 'separator',
}, {
label: _('Print'),
accelerator: 'CommandOrControl+P',
@@ -434,7 +450,7 @@ class Application extends BaseApplication {
click: () => { bridge().electronApp().quit() }
}]
}, {
label: _('Edit'),
label: _('&Edit'),
submenu: [{
label: _('Copy'),
role: 'copy',
@@ -535,7 +551,7 @@ class Application extends BaseApplication {
},
}],
}, {
label: _('View'),
label: _('&View'),
submenu: [{
label: _('Toggle sidebar'),
screens: ['Main'],
@@ -596,7 +612,7 @@ class Application extends BaseApplication {
submenu: focusItems,
}],
}, {
label: _('Tools'),
label: _('&Tools'),
submenu: [{
label: _('Synchronisation status'),
click: () => {
@@ -635,7 +651,7 @@ class Application extends BaseApplication {
}
}],
}, {
label: _('Help'),
label: _('&Help'),
submenu: [{
label: _('Website and documentation'),
accelerator: 'F1',

View File

@@ -120,7 +120,11 @@ function checkForUpdates(inBackground, window, logFilePath, options) {
autoUpdateLogger_.info('Is Pre-release:', release.prerelease);
if (compareVersions(release.version, packageInfo.version) <= 0) {
if (!checkInBackground_) dialog.showMessageBox({ message: _('Current version is up-to-date.') })
if (!checkInBackground_) dialog.showMessageBox({
type: 'info',
message: _('Current version is up-to-date.'),
buttons: [_('OK')],
})
} else {
const releaseNotes = release.notes.trim() ? "\n\n" + release.notes.trim() : '';
const newVersionString = release.prerelease ? _('%s (pre-release)', release.version) : release.version;

View File

@@ -17,6 +17,7 @@ const { _ } = require('lib/locale.js');
const layoutUtils = require('lib/layout-utils.js');
const { bridge } = require('electron').remote.require('./bridge');
const eventManager = require('../eventManager');
const VerticalResizer = require('./VerticalResizer.min');
class MainScreenComponent extends React.Component {
@@ -24,6 +25,16 @@ class MainScreenComponent extends React.Component {
super();
this.notePropertiesDialog_close = this.notePropertiesDialog_close.bind(this);
this.sidebar_onDrag = this.sidebar_onDrag.bind(this);
this.noteList_onDrag = this.noteList_onDrag.bind(this);
}
sidebar_onDrag(event) {
Setting.setValue('style.sidebar.width', this.props.sidebarWidth + event.deltaX);
}
noteList_onDrag(event) {
Setting.setValue('style.noteList.width', Setting.value('style.noteList.width') + event.deltaX);
}
notePropertiesDialog_close() {
@@ -265,8 +276,8 @@ class MainScreenComponent extends React.Component {
}
}
styles(themeId, width, height, messageBoxVisible, isSidebarVisible) {
const styleKey = themeId + '_' + width + '_' + height + '_' + messageBoxVisible + '_' + (+isSidebarVisible);
styles(themeId, width, height, messageBoxVisible, isSidebarVisible, sidebarWidth, noteListWidth) {
const styleKey = [themeId, width, height, messageBoxVisible, (+isSidebarVisible), sidebarWidth, noteListWidth].join('_');
if (styleKey === this.styleKey_) return this.styles_;
const theme = themeStyle(themeId);
@@ -288,10 +299,16 @@ class MainScreenComponent extends React.Component {
backgroundColor: theme.warningBackgroundColor,
}
this.styles_.verticalResizer = {
width: 5,
height: height,
display: 'inline-block',
};
const rowHeight = height - theme.headerHeight - (messageBoxVisible ? this.styles_.messageBox.height : 0);
this.styles_.sideBar = {
width: Math.floor(layoutUtils.size(width * .2, 150, 300)),
width: sidebarWidth - this.styles_.verticalResizer.width,
height: rowHeight,
display: 'inline-block',
verticalAlign: 'top',
@@ -303,14 +320,14 @@ class MainScreenComponent extends React.Component {
}
this.styles_.noteList = {
width: Math.floor(layoutUtils.size(width * .2, 150, 300)),
width: noteListWidth - this.styles_.verticalResizer.width,
height: rowHeight,
display: 'inline-block',
verticalAlign: 'top',
};
this.styles_.noteText = {
width: Math.floor(layoutUtils.size(width - this.styles_.sideBar.width - this.styles_.noteList.width, 0)),
width: Math.floor(width - this.styles_.sideBar.width - this.styles_.noteList.width - 10),
height: rowHeight,
display: 'inline-block',
verticalAlign: 'top',
@@ -346,7 +363,7 @@ class MainScreenComponent extends React.Component {
const notes = this.props.notes;
const messageBoxVisible = this.props.hasDisabledSyncItems || this.props.showMissingMasterKeyMessage;
const sidebarVisibility = this.props.sidebarVisibility;
const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible, sidebarVisibility);
const styles = this.styles(this.props.theme, style.width, style.height, messageBoxVisible, sidebarVisibility, this.props.sidebarWidth, this.props.noteListWidth);
const selectedFolderId = this.props.selectedFolderId;
const onConflictFolder = this.props.selectedFolderId === Folder.conflictFolderId();
@@ -375,7 +392,7 @@ class MainScreenComponent extends React.Component {
headerItems.push({
title: _('New notebook'),
iconName: 'fa-folder-o',
iconName: 'fa-book',
onClick: () => { this.doCommand({ name: 'newNotebook' }) },
});
@@ -462,7 +479,9 @@ class MainScreenComponent extends React.Component {
<Header style={styles.header} showBackButton={false} items={headerItems} />
{messageComp}
<SideBar style={styles.sideBar} />
<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} />
</div>
);
@@ -482,6 +501,8 @@ const mapStateToProps = (state) => {
showMissingMasterKeyMessage: state.notLoadedMasterKeys.length && state.masterKeys.length,
selectedFolderId: state.selectedFolderId,
sidebarVisibility: state.sidebarVisibility,
sidebarWidth: state.settings['style.sidebar.width'],
noteListWidth: state.settings['style.noteList.width'],
};
};

View File

@@ -17,7 +17,7 @@ class NavigatorComponent extends Component {
}
updateWindowTitle(title) {
bridge().window().setTitle(title);
if (bridge().window()) bridge().window().setTitle(title);
}
render() {

View File

@@ -381,7 +381,7 @@ class NoteListComponent extends React.Component {
const theme = themeStyle(this.props.theme);
const style = this.props.style;
let notes = this.props.notes.slice();
if (!notes.length) {
const padding = 10;
const emptyDivStyle = Object.assign({
@@ -396,16 +396,16 @@ class NoteListComponent extends React.Component {
return <div style={emptyDivStyle}>{ this.props.folders.length ? _('No notes in here. Create one by clicking on "New note".') : _('There is currently no notebook. Create one by clicking on "New notebook".')}</div>
}
return (
return (
<ItemList
ref={this.itemListRef}
itemHeight={this.style().listItem.height}
style={style}
className={"note-list"}
items={notes}
style={style}
itemRenderer={this.itemRenderer}
onKeyDown={this.onKeyDown}
></ItemList>
/>
);
}

View File

@@ -909,6 +909,7 @@ class NoteTextComponent extends React.Component {
}, 100);
},
postMessageSyntax: 'ipcProxySendToHost',
userCss: options.useCustomCss ? this.props.customCss : '',
};
const theme = themeStyle(this.props.theme);
@@ -924,8 +925,6 @@ class NoteTextComponent extends React.Component {
bodyToRender = '*' + _('This note has no content. Click on "%s" to toggle the editor and edit the note.', _('Layout')) + '*';
}
if (options.useCustomCss) bodyToRender = '<style>' + this.props.customCss + '</style>\n' + bodyToRender;
bodyHtml = this.mdToHtml().render(bodyToRender, theme, mdOptions);
this.setState({ bodyHtml: bodyHtml });
@@ -1374,7 +1373,7 @@ class NoteTextComponent extends React.Component {
if (note && this.state.folder && ['Search', 'Tag'].includes(this.props.notesParentType)) {
toolbarItems.push({
title: _('In: %s', this.state.folder.title),
iconName: 'fa-folder-o',
iconName: 'fa-book',
enabled: false,
});
}

View File

@@ -73,11 +73,21 @@ class NoteTextViewerComponent extends React.Component {
}
printToPDF(options, callback) {
return this.webviewRef_.current.printToPDF(options, callback);
// In Electron 4x, printToPDF is broken so need to use this hack:
// https://github.com/electron/electron/issues/16171#issuecomment-451090245
// return this.webviewRef_.current.printToPDF(options, callback);
return this.webviewRef_.current.getWebContents().printToPDF(options, callback);
}
print(options = {}) {
return this.webviewRef_.current.print(options);
// In Electron 4x, print is broken so need to use this hack:
// https://github.com/electron/electron/issues/16219#issuecomment-451454948
// Note that this is not a perfect workaround since it means the options are ignored
// In particular it means that background images and colours won't be printed (printBackground property will be ignored)
// return this.webviewRef_.current.getWebContents().print({});
return this.webviewRef_.current.getWebContents().executeJavaScript("window.print()")
}
openDevTools() {

View File

@@ -13,6 +13,7 @@ const { bridge } = require("electron").remote.require("./bridge");
const Menu = bridge().Menu;
const MenuItem = bridge().MenuItem;
const InteropServiceHelper = require("../InteropServiceHelper.js");
const { substrWithEllipsis } = require('lib/string-utils');
const { shim } = require('lib/shim');
class SideBarComponent extends React.Component {
@@ -219,6 +220,8 @@ class SideBarComponent extends React.Component {
if (anchorRef) anchorRef.current.focus();
}
}
} else if (command.name === 'synchronize') {
this.sync_click();
} else {
commandProcessed = false;
}
@@ -259,7 +262,7 @@ class SideBarComponent extends React.Component {
}
}
itemContextMenu(event) {
async itemContextMenu(event) {
const itemId = event.target.getAttribute("data-id");
if (itemId === Folder.conflictFolderId()) return;
@@ -268,9 +271,11 @@ class SideBarComponent extends React.Component {
let deleteMessage = "";
if (itemType === BaseModel.TYPE_FOLDER) {
deleteMessage = _("Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.");
const folder = await Folder.load(itemId);
deleteMessage = _('Delete notebook "%s"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.', substrWithEllipsis(folder.title, 0, 32));
} else if (itemType === BaseModel.TYPE_TAG) {
deleteMessage = _("Remove this tag from all the notes?");
const tag = await Tag.load(itemId);
deleteMessage = _('Remove tag "%s" from all notes?', substrWithEllipsis(tag.title, 0, 32));
} else if (itemType === BaseModel.TYPE_SEARCH) {
deleteMessage = _("Remove this search from the sidebar?");
}
@@ -728,7 +733,8 @@ class SideBarComponent extends React.Component {
return (
<div ref={this.rootRef} onKeyDown={this.onKeyDown} className="side-bar" style={style}>
<div style={{flex:1, overflowY: 'auto'}}>
<div style={{flex:1, overflowX: 'hidden', overflowY: 'auto'}}>
{items}
</div>
<div style={{flex:0}}>

View File

@@ -0,0 +1,102 @@
const React = require("react");
const electron = require('electron');
class VerticalResizer extends React.PureComponent {
constructor() {
super();
this.state = {
parentRight: 0,
parentHeight: 0,
parentWidth: 0,
drag: {
startX: 0,
lastX: 0,
},
};
this.onDragStart = this.onDragStart.bind(this);
this.onDrag = this.onDrag.bind(this);
this.onDragEnd = this.onDragEnd.bind(this);
this.document_onDragOver = this.document_onDragOver.bind(this);
}
document_onDragOver(event) {
// This is just to prevent the cursor from changing to a "+" as it's dragged
// over other elements. With this it stays a normal cursor.
event.dataTransfer.dropEffect = 'none';
}
onDragStart(event) {
document.addEventListener('dragover', this.document_onDragOver)
event.dataTransfer.dropEffect= 'none';
const cursor = electron.screen.getCursorScreenPoint();
this.setState({
drag: {
startX: cursor.x,
lastX: cursor.x,
}
});
if (this.props.onDragStart) this.props.onDragStart({});
}
onDrag(event) {
// If we got a drag event with no buttons pressed, it's the last drag event
// that we should ignore, because it's sometimes use to put the dragged element
// back to its original position (if there was no valid drop target), which we don't want.
// Also if clientX, screenX, etc. are 0, it's also the last event and we want to ignore these buggy values.
// const e = event.nativeEvent;
// if (!e.buttons || (!e.clientX && !e.clientY && !e.screenX && !e.screenY)) return;
const cursor = electron.screen.getCursorScreenPoint();
const newX = cursor.x;
const delta = newX - this.state.drag.lastX;
if (!delta) return;
this.setState({
drag: Object.assign({}, this.state.drag, { lastX: newX }),
}, () => {
this.props.onDrag({ deltaX: delta });
});
}
onDragEnd(event) {
document.removeEventListener('dragover', this.document_onDragOver);
}
componentWillUnmount() {
document.removeEventListener('dragover', this.document_onDragOver);
}
render() {
const debug = false;
const rootStyle = Object.assign({}, {
height: '100%',
width:5,
borderColor:'red',
borderWidth: debug ? 1 : 0,
borderStyle:'solid',
cursor: 'col-resize',
boxSizing: 'border-box',
opacity: 0,
}, this.props.style);
return (
<div
style={rootStyle}
draggable={true}
onDragStart={this.onDragStart}
onDrag={this.onDrag}
onDragEnd={this.onDragEnd}
/>
);
}
}
module.exports = VerticalResizer;

View File

@@ -35,6 +35,7 @@
<body id="body">
<div id="hlScriptContainer"></div>
<div id="mermaidScriptContainer"></div>
<div id="markScriptContainer"></div>
<div id="content" ondragstart="return false;" ondrop="return false;"></div>
<script src="./lib.js"></script>
@@ -141,6 +142,23 @@
setPercentScroll(percentScroll_);
}
const loadedScripts_ = {};
function lazyLoadScript(url, containerId, onReady) {
if (loadedScripts_[url]) {
onReady();
return;
}
console.info('Loading script: ' + url);
const script = document.createElement('script');
script.onload = onReady;
script.src = url;
document.getElementById(containerId).appendChild(script);
loadedScripts_[url] = url;
}
ipc.setHtml = (event) => {
const html = event.html;
@@ -184,6 +202,12 @@
}
}, 1);
}
if (document.getElementsByClassName('mermaid').length) {
lazyLoadScript('../../node_modules/mermaid/dist/mermaid.min.js', 'mermaidScriptContainer', () => {
mermaid.init();
});
}
}
let ignoreNextScrollEvent = false;

View File

@@ -2,6 +2,11 @@
<html>
<head>
<meta charset="UTF-8">
<!--
No CPS because we need to allow everything due to some dependencies (eg. depd, which comes from maybe Node or Electron
uses 'eval'.
<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline' 'unsafe-eval'">
-->
<title>Joplin</title>
<link rel="stylesheet" href="style.css">
<link rel="stylesheet" href="css/fork-awesome.min.css">

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 it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "1.0.127",
"version": "1.0.135",
"description": "Joplin for Desktop",
"main": "main.js",
"scripts": {
@@ -8,7 +8,7 @@
"pack": "node_modules/.bin/electron-builder --dir",
"dist": "node_modules/.bin/electron-builder",
"publish": "build -p always",
"postinstall": "node compile.js && node compile-package-info.js && node ../../Tools/copycss.js --copy-fonts && install-app-deps",
"postinstall": "node compile.js && node compile-package-info.js && node ../../Tools/copycss.js --copy-fonts && electron-rebuild",
"compile": "node compile.js && node compile-package-info.js && node ../../Tools/copycss.js --copy-fonts"
},
"repository": {
@@ -22,10 +22,12 @@
},
"build": {
"appId": "net.cozic.joplin-desktop",
"npmRebuild": false,
"extraResources": [
"build/icons/*"
],
"win": {
"rfc3161TimeStampServer": "http://sha256timestamp.ws.symantec.com/sha256/timestamp",
"icon": "../../Assets/Joplin.ico",
"target": [
{
@@ -70,8 +72,9 @@
"app-builder-bin": "^1.9.11",
"babel-cli": "^6.26.0",
"babel-preset-react": "^6.24.1",
"electron": "^1.8.7",
"electron-builder": "20.14.7"
"electron": "4.0.5",
"electron-builder": "20.38.5",
"electron-rebuild": "^1.8.4"
},
"optionalDependencies": {
"7zip-bin-linux": "^1.0.1",
@@ -106,7 +109,7 @@
"markdown-it": "^8.4.1",
"markdown-it-katex": "^2.0.3",
"md5": "^2.2.1",
"mermaid": "^8.0.0-rc.8",
"mermaid": "^8.0.0",
"mime": "^2.3.1",
"moment": "^2.22.2",
"multiparty": "^4.2.1",
@@ -125,13 +128,13 @@
"server-destroy": "^1.0.1",
"smalltalk": "^2.5.1",
"sprintf-js": "^1.1.1",
"sqlite3": "^4.0.4",
"sqlite3": "^4.0.6",
"string-padding": "^1.0.2",
"string-to-stream": "^1.1.1",
"syswide-cas": "^5.1.0",
"tar": "^4.4.4",
"tcp-port-used": "^0.1.2",
"url-parse": "^1.4.1",
"url-parse": "^1.4.3",
"uuid": "^3.2.1",
"valid-url": "^1.0.9",
"xml2js": "^0.4.19"

View File

@@ -24,6 +24,11 @@ table td, table th {
::-webkit-scrollbar {
width: 7px;
height: 7px;
}
::-webkit-scrollbar-corner {
background: none;
}
::-webkit-scrollbar-track {

View File

@@ -1,20 +1,26 @@
#!/bin/bash
set -e
# Title
echo " _ _ _ _ _ _ "
echo " | | (_) (_) | | | | | "
echo " | | ___ _ __ _ _ __ _ _ __ ___| |_ __ _| | | ___ _ __ "
echo " _ | |/ _ \\\| '_ \| | '_ \\ | | '_ \\\/ __| __/ _\` | | |/ _ \ '__|"
echo " | |__| | (_) | |_) | | | | | | | | | \__ \ || (_| | | | __/ | "
echo " \____/ \___/| .__/|_|_| |_| |_|_| |_|___/\__\__,_|_|_|\___|_| "
echo " | | "
echo " |_| "
echo " _ _ _ "
echo " | | ___ _ __ | (_)_ __ "
echo " _ | |/ _ \| '_ \| | | '_ \ "
echo "| |_| | (_) | |_) | | | | | |"
echo " \___/ \___/| .__/|_|_|_| |_|"
echo " |_|"
echo ""
echo "Linux installer and Updater"
#-----------------------------------------------------
# Variables
#-----------------------------------------------------
COLOR_RED=`tput setaf 1`
COLOR_GREEN=`tput setaf 2`
COLOR_RESET=`tput sgr0`
# Check and warn if running as root.
if [[ $EUID = 0 ]] ; then
if [[ $* != *--allow-root* ]] ; then
echo "It is not recommended (nor necessary) to run this script as root. To do so anyway, please use '--allow-root'"
echo "${COLOR_RED}It is not recommended (nor necessary) to run this script as root. To do so anyway, please use '--allow-root'${COLOR_RESET}"
exit 1
fi
fi
@@ -29,6 +35,7 @@ version=$(curl --silent "https://api.github.com/repos/laurent22/joplin/releases/
# Check if it's in the latest version
if [[ $(< ~/.joplin/VERSION) != "$version" ]]; then
echo 'Download Joplin.'
# Delete previous version
rm -f ~/.joplin/*.AppImage ~/.local/share/applications/joplin.desktop ~/.joplin/VERSION
@@ -36,17 +43,21 @@ if [[ $(< ~/.joplin/VERSION) != "$version" ]]; then
mkdir -p ~/.joplin/
# Download the latest version
wget -O ~/.joplin/Joplin.AppImage https://github.com/laurent22/joplin/releases/download/v$version/Joplin-$version-x86_64.AppImage
wget -nv -O ~/.joplin/Joplin.AppImage https://github.com/laurent22/joplin/releases/download/v$version/Joplin-$version-x86_64.AppImage
# Gives execution privileges
chmod +x ~/.joplin/Joplin.AppImage
echo "${COLOR_GREEN}OK${COLOR_RESET}"
#-----------------------------------------------------
# Icon
#-----------------------------------------------------
# Download icon
wget -O ~/.joplin/Icon512.png https://joplin.cozic.net/images/Icon512.png
echo 'Download icon.'
wget -nv -O ~/.joplin/Icon512.png https://joplin.cozic.net/images/Icon512.png
echo "${COLOR_GREEN}OK${COLOR_RESET}"
# Detect desktop environment
if [ "$XDG_CURRENT_DESKTOP" = "" ]
@@ -58,20 +69,23 @@ if [[ $(< ~/.joplin/VERSION) != "$version" ]]; then
desktop=${desktop,,} # convert to lower case
# Create icon for Gnome
echo 'Create Desktop icon.'
if [[ $desktop =~ .*gnome.* ]] || [[ $desktop =~ .*kde.* ]]
then
echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nExec=/home/$USER/.joplin/Joplin.AppImage\nIcon=/home/$USER/.joplin/Icon512.png\nType=Application\nCategories=Application;" >> ~/.local/share/applications/joplin.desktop
fi
echo "${COLOR_GREEN}OK${COLOR_RESET}"
#-----------------------------------------------------
# Finish
#-----------------------------------------------------
# Informs the user that it has been installed and cleans variables
echo 'Joplin installed in the version' $version
echo "${COLOR_GREEN}Joplin installed in the version${COLOR_RESET}" $version
# Add version
echo $version > ~/.joplin/VERSION
else
echo 'You are now in the latest version.'
echo "${COLOR_GREEN}You are now in the latest version.${COLOR_RESET}"
fi
echo 'Bye!'
unset version

View File

@@ -20,9 +20,9 @@ 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.120/Joplin-Setup-1.0.120.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a> | or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.120/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.120/Joplin-1.0.120.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a> |
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.120/Joplin-1.0.120-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a> | An Arch Linux package<br>[is also available](#terminal-application).
Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.134/Joplin-Setup-1.0.134.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a> | or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.134/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.134/Joplin-1.0.134.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a> |
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.134/Joplin-1.0.134-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a> | An Arch Linux package<br>[is also available](#terminal-application).
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.
@@ -36,7 +36,7 @@ wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_insta
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://joplin.cozic.net/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.237/joplin-v1.0.237.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://joplin.cozic.net/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.239/joplin-v1.0.239.apk)
iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplin.cozic.net/images/BadgeIOS.png'/></a> | -
## Terminal application
@@ -340,30 +340,30 @@ Current translations:
<!-- LOCALE-TABLE-AUTO-GENERATED -->
&nbsp; | Language | Po File | Last translator | Percent done
---|---|---|---|---
![](https://joplin.cozic.net/images/flags/es/basque_country.png) | Basque | [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po) | juan.abasolo@ehu.eus | 57%
![](https://joplin.cozic.net/images/flags/es/catalonia.png) | Catalan | [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po) | jmontane, 2018 | 82%
![](https://joplin.cozic.net/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) | 46%
![](https://joplin.cozic.net/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) | 72%
![](https://joplin.cozic.net/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. | 74%
![](https://joplin.cozic.net/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) | 95%
![](https://joplin.cozic.net/images/flags/es/basque_country.png) | Basque | [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po) | juan.abasolo@ehu.eus | 56%
![](https://joplin.cozic.net/images/flags/es/catalonia.png) | Catalan | [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po) | jmontane, 2018 | 80%
![](https://joplin.cozic.net/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) | 45%
![](https://joplin.cozic.net/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) | 71%
![](https://joplin.cozic.net/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. | 72%
![](https://joplin.cozic.net/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://joplin.cozic.net/images/flags/country-4x3/gb.png) | English | [en_GB](https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_GB.po) | | 100%
![](https://joplin.cozic.net/images/flags/country-4x3/es.png) | Español | [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po) | Fernando Martín (f@mrtn.es) | 87%
![](https://joplin.cozic.net/images/flags/country-4x3/es.png) | Español | [es_ES](https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po) | Fernando Martín (f@mrtn.es) | 88%
![](https://joplin.cozic.net/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://joplin.cozic.net/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) | 73%
![](https://joplin.cozic.net/images/flags/country-4x3/it.png) | Italiano | [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po) | | 90%
![](https://joplin.cozic.net/images/flags/country-4x3/be.png) | Nederlands | [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po) | | 58%
![](https://joplin.cozic.net/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) | 87%
![](https://joplin.cozic.net/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) | 95%
![](https://joplin.cozic.net/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) | 94%
![](https://joplin.cozic.net/images/flags/country-4x3/ro.png) | Română | [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po) | | 57%
![](https://joplin.cozic.net/images/flags/country-4x3/si.png) | Slovenian | [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po) | | 72%
![](https://joplin.cozic.net/images/flags/country-4x3/se.png) | Svenska | [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po) | Jonatan Nyberg (jonatan@autistici.org) | 98%
![](https://joplin.cozic.net/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) | 83%
![](https://joplin.cozic.net/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) | 88%
![](https://joplin.cozic.net/images/flags/country-4x3/cn.png) | 中文 (简体) | [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po) | | 99%
![](https://joplin.cozic.net/images/flags/country-4x3/tw.png) | 中文 (繁體) | [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po) | penguinsam (samliu@gmail.com) | 87%
![](https://joplin.cozic.net/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) | 94%
![](https://joplin.cozic.net/images/flags/country-4x3/kr.png) | 한국 | [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po) | | 96%
![](https://joplin.cozic.net/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) | 71%
![](https://joplin.cozic.net/images/flags/country-4x3/it.png) | Italiano | [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po) | | 89%
![](https://joplin.cozic.net/images/flags/country-4x3/be.png) | Nederlands | [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po) | | 56%
![](https://joplin.cozic.net/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) | 86%
![](https://joplin.cozic.net/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) | 94%
![](https://joplin.cozic.net/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) | 93%
![](https://joplin.cozic.net/images/flags/country-4x3/ro.png) | Română | [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po) | | 56%
![](https://joplin.cozic.net/images/flags/country-4x3/si.png) | Slovenian | [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po) | | 70%
![](https://joplin.cozic.net/images/flags/country-4x3/se.png) | Svenska | [sv](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sv.po) | Jonatan Nyberg (jonatan@autistici.org) | 96%
![](https://joplin.cozic.net/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) | 93%
![](https://joplin.cozic.net/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) | 98%
![](https://joplin.cozic.net/images/flags/country-4x3/cn.png) | 中文 (简体) | [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po) | | 97%
![](https://joplin.cozic.net/images/flags/country-4x3/tw.png) | 中文 (繁體) | [zh_TW](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_TW.po) | penguinsam (samliu@gmail.com) | 86%
![](https://joplin.cozic.net/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) | 93%
![](https://joplin.cozic.net/images/flags/country-4x3/kr.png) | 한국 | [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po) | | 95%
<!-- LOCALE-TABLE-AUTO-GENERATED -->
# Known bugs

View File

@@ -90,8 +90,8 @@ android {
applicationId "net.cozic.joplin"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097473
versionName "1.0.237"
versionCode 2097475
versionName "1.0.239"
ndk {
abiFilters "armeabi-v7a", "x86"
}

View File

@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>10.0.29</string>
<string>10.0.30</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>29</string>
<string>30</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>

View File

@@ -299,10 +299,10 @@ class BaseApplication {
const result = next(action);
const newState = store.getState();
let refreshNotes = false;
let refreshTags = false;
// let refreshTags = false;
let refreshNotesUseSelectedNoteId = false;
reduxSharedMiddleware(store, next, action);
await reduxSharedMiddleware(store, next, action);
if (this.hasGui() && ["NOTE_UPDATE_ONE", "NOTE_DELETE", "FOLDER_UPDATE_ONE", "FOLDER_DELETE"].indexOf(action.type) >= 0) {
if (!await reg.syncTarget().syncStarted()) reg.scheduleSync(30 * 1000, { syncSteps: ["update_remote", "delete_remote"] });
@@ -337,20 +337,20 @@ class BaseApplication {
refreshNotes = true;
}
if (action.type == 'NOTE_DELETE') {
refreshTags = true;
}
// if (action.type == 'NOTE_DELETE') {
// refreshTags = true;
// }
if (refreshNotes) {
await this.refreshNotes(newState, refreshNotesUseSelectedNoteId);
}
if (refreshTags) {
this.dispatch({
type: 'TAG_UPDATE_ALL',
items: await Tag.allWithNotes(),
});
}
// if (refreshTags) {
// this.dispatch({
// type: 'TAG_UPDATE_ALL',
// items: await Tag.allWithNotes(),
// });
// }
if ((action.type == 'SETTING_UPDATE_ONE' && (action.key == 'dateFormat' || action.key == 'timeFormat')) || (action.type == 'SETTING_UPDATE_ALL')) {
time.setDateFormat(Setting.value('dateFormat'));

View File

@@ -148,7 +148,12 @@ class ClipperServer {
writeResponse(200, response ? response : '');
} catch (error) {
this.logger().error(error);
writeResponse(error.httpCode ? error.httpCode : 500, error.message);
const httpCode = error.httpCode ? error.httpCode : 500;
const msg = [];
if (httpCode >= 500) msg.push('Internal Server Error');
if (error.message) msg.push(error.message);
writeResponse(httpCode, { error: msg.join(': ') });
}
}

View File

@@ -7,6 +7,7 @@ const { shim } = require('lib/shim.js');
const { _ } = require('lib/locale');
const md5 = require('md5');
const MdToHtml_Katex = require('lib/MdToHtml_Katex');
const MdToHtml_Mermaid = require('lib/MdToHtml_Mermaid');
const StringUtils = require('lib/string-utils.js');
class MdToHtml {
@@ -17,6 +18,7 @@ class MdToHtml {
this.loadedResources_ = {};
this.cachedContent_ = null;
this.cachedContentKey_ = null;
this.extraCssBlocks_ = [];
// Must include last "/"
this.resourceBaseUrl_ = ('resourceBaseUrl' in options) ? options.resourceBaseUrl : null;
@@ -192,6 +194,7 @@ class MdToHtml {
if (!this.rendererPlugins_) {
this.rendererPlugins_ = {};
this.rendererPlugins_['katex'] = new MdToHtml_Katex();
this.rendererPlugins_['mermaid'] = new MdToHtml_Mermaid();
}
return language in this.rendererPlugins_ ? this.rendererPlugins_[language] : null;
@@ -356,31 +359,6 @@ class MdToHtml {
if (closeTag) {
if (closeTag === 'a') {
const currentAnchorAttrs = anchorAttrs.pop();
// NOTE: Disabled for now due to this:
// https://github.com/laurent22/joplin/issues/318#issuecomment-375854848
// const previousContent = output.length ? output[output.length - 1].trim() : '';
// const anchorHref = this.getAttr_(currentAnchorAttrs, 'href', '').trim();
// Optimisation: If the content of the anchor is the same as the URL, we replace the content
// by (Link). This is to shorten the text, which is important especially when the note comes
// from imported HTML, which can contain many such links and make the text unreadble. An example
// would be a movie review that has multiple links to allow a user to rate the film from 1 to 5 stars.
// In the original page, it might be rendered as stars, via CSS, but in the imported note it would look like this:
// http://example.com/rate/1 http://example.com/rate/2 http://example.com/rate/3
// http://example.com/rate/4 http://example.com/rate/5
// which would take a lot of screen space even though it doesn't matter since the user is unlikely
// to rate the film from the note. This is actually a nice example, still readable, but there is way
// worse that this in notes that come from web-clipped content.
// With this change, the links will still be preserved but displayed like
// (link) (link) (link) (link) (link)
// if (this.urldecode_(previousContent) === htmlentities(this.urldecode_(anchorHref))) {
// output.pop();
// output.push(_('(Link)'));
// }
output.push(this.renderCloseLink_(currentAnchorAttrs, options));
} else {
output.push('</' + closeTag + '>');
@@ -401,14 +379,16 @@ class MdToHtml {
// Insert the extra CSS at the top of the HTML
if (!ObjectUtils.isEmpty(extraCssBlocks)) {
const temp = ['<style>'];
const temp = [];//['<style>'];
for (let n in extraCssBlocks) {
if (!extraCssBlocks.hasOwnProperty(n)) continue;
temp.push(extraCssBlocks[n]);
}
temp.push('</style>');
// temp.push('</style>');
output = temp.concat(output);
if (temp.length) this.extraCssBlocks_.push(temp.join('\n'));
//output = temp.concat(output);
}
return output.join('');
@@ -490,6 +470,8 @@ class MdToHtml {
const env = {};
const tokens = md.parse(body, env);
this.extraCssBlocks_ = [];
let renderedBody = this.renderTokens_(md, tokens, options);
// console.info(body);
@@ -538,6 +520,10 @@ class MdToHtml {
}
::-webkit-scrollbar {
width: 7px;
height: 7px;
}
::-webkit-scrollbar-corner {
background: none;
}
::-webkit-scrollbar-track {
border: none;
@@ -552,6 +538,22 @@ class MdToHtml {
::-webkit-scrollbar-thumb:hover {
background: rgba(100, 100, 100, 0.7);
}
/* Remove top padding and margin from first child so that top of rendered text is aligned to top of text editor text */
#rendered-md h1:first-child,
#rendered-md h2:first-child,
#rendered-md h3:first-child,
#rendered-md h4:first-child,
#rendered-md ul:first-child,
#rendered-md ol:first-child,
#rendered-md table:first-child,
#rendered-md blockquote:first-child,
#rendered-md img:first-child,
#rendered-md p:first-child {
margin-top: 0;
padding-top: 0;
}
p, h1, h2, h3, h4, h5, h6, ul, table {
margin-top: .6em;
margin-bottom: .65em;
@@ -705,12 +707,13 @@ class MdToHtml {
}
`;
// To style the checkboxes in print when webkit-print-color-adjust is not enabled.
// Keep it there for now in case that CSS parameter needs to be removed.
let cssStrings = [normalizeCss, css];
if (this.extraCssBlocks_) cssStrings = cssStrings.concat(this.extraCssBlocks_);
if (options.userCss) cssStrings.push(options.userCss);
const styleHtml = '<style>' + normalizeCss + "\n" + css + '</style>';
const styleHtml = '<style>' + cssStrings.join('\n') + '</style>';
const output = styleHtml + renderedBody;
const output = styleHtml + '<div id="rendered-md">' + renderedBody + '</div>';
// console.info('<!DOCTYPE html><html><head><meta charset="UTF-8">' + output + '</body></html>');

View File

@@ -0,0 +1,23 @@
const { shim } = require('lib/shim');
const mermaid = require('mermaid');
class MdToHtml_Mermaid {
name() {
return 'mermaid';
}
processContent(renderedTokens, content, tagType) {
renderedTokens.push('<div class="mermaid">' + content + '</div>');
return renderedTokens;
}
extraCss() {
return '';
}
async loadAssets() {}
}
module.exports = MdToHtml_Mermaid;

View File

@@ -205,6 +205,7 @@ class WebDavApi {
requestToCurl_(url, options) {
let output = [];
output.push('curl');
output.push('-v');
if (options.method) output.push('-X ' + options.method);
if (options.headers) {
for (let n in options.headers) {

View File

@@ -12,88 +12,48 @@ const { pregQuote } = require('lib/string-utils');
class WelcomeUtils {
static async createWelcomeItems() {
const overwriteExisting = Setting.value('env') === 'dev';
const output = {
defaultFolderId: null,
};
const noteAssets = welcomeAssets.notes;
const folderAssets = welcomeAssets.folders;
const tempDir = Setting.value('resourceDir');
for (let i = 0; i < folderAssets.length; i++) {
const folderAsset = folderAssets[i];
const folderId = folderAsset.id;
if (!output.defaultFolderId) output.defaultFolderId = folderId;
let existingFolder = await Folder.load(folderId);
if (existingFolder && overwriteExisting) {
await Folder.delete(existingFolder.id);
existingFolder = null;
}
if (existingFolder) continue;
await Folder.save({
id: folderId,
title: folderAsset.title,
}, { isNew: true });
const folder = await Folder.save({ title: folderAsset.title + ' (' + Setting.appTypeToLabel(Setting.value('appType')) + ')'});
if (!output.defaultFolderId) output.defaultFolderId = folder.id;
}
const noteAssets = welcomeAssets.notes;
for (let i = noteAssets.length - 1; i >= 0; i--) {
const noteAsset = noteAssets[i];
const noteId = noteAsset.id;
let existingNote = await Note.load(noteId);
if (existingNote && overwriteExisting) {
await Note.delete(existingNote.id);
existingNote = null;
}
if (existingNote) continue;
let noteBody = noteAsset.body;
for (let resourceUrl in noteAsset.resources) {
if (!noteAsset.resources.hasOwnProperty(resourceUrl)) continue;
const resourceAsset = noteAsset.resources[resourceUrl];
const resourceId = resourceAsset.id;
let existingResource = await Resource.load(resourceId);
if (existingResource && overwriteExisting) {
await Resource.delete(resourceId);
existingResource = null;
}
if (!existingResource) {
const ext = fileExtension(resourceUrl);
const tempFilePath = tempDir + '/' + uuid.create() + '.tmp.' + ext;
await shim.fsDriver().writeFile(tempFilePath, resourceAsset.body, 'base64');
await shim.createResourceFromPath(tempFilePath, {
id: resourceId,
title: basename(resourceUrl),
});
await shim.fsDriver().remove(tempFilePath);
}
const ext = fileExtension(resourceUrl);
const tempFilePath = tempDir + '/' + uuid.create() + '.tmp.' + ext;
await shim.fsDriver().writeFile(tempFilePath, resourceAsset.body, 'base64');
const resource = await shim.createResourceFromPath(tempFilePath, {
title: basename(resourceUrl),
});
await shim.fsDriver().remove(tempFilePath);
const regex = new RegExp(pregQuote('(' + resourceUrl + ')'), 'g');
noteBody = noteBody.replace(regex, '(:/' + resourceId + ')');
noteBody = noteBody.replace(regex, '(:/' + resource.id + ')');
}
await Note.save({
id: noteId,
parent_id: noteAsset.parent_id,
const note = await Note.save({
parent_id: output.defaultFolderId,
title: noteAsset.title,
body: noteBody,
}, { isNew: true });
});
if (noteAsset.tags) await Tag.setNoteTagsByTitles(noteId, noteAsset.tags);
if (noteAsset.tags) await Tag.setNoteTagsByTitles(note.id, noteAsset.tags);
}
return output;

View File

@@ -108,7 +108,7 @@ class NoteBodyViewer extends Component {
</html>
`;
let webViewStyle = {}
let webViewStyle = {'backgroundColor': this.props.webViewStyle.backgroundColor}
// On iOS, the onLoadEnd() event is never fired so always
// display the webview (don't do the little trick
// to avoid the white flash).

View File

@@ -1,9 +1,12 @@
const Setting = require('lib/models/Setting');
const Tag = require('lib/models/Tag');
const { reg } = require('lib/registry.js');
const reduxSharedMiddleware = function(store, next, action) {
const reduxSharedMiddleware = async function(store, next, action) {
const newState = store.getState();
let refreshTags = false;
if (action.type == 'FOLDER_SET_COLLAPSED' || action.type == 'FOLDER_TOGGLE') {
Setting.setValue('collapsedFolderIds', newState.collapsedFolderIds);
}
@@ -11,7 +14,17 @@ const reduxSharedMiddleware = function(store, next, action) {
if (action.type === 'SETTING_UPDATE_ONE' && !!action.key.match(/^sync\.\d+\.path$/)) {
reg.resetSyncTarget();
}
if (action.type == 'NOTE_DELETE') {
refreshTags = true;
}
if (refreshTags) {
store.dispatch({
type: 'TAG_UPDATE_ALL',
items: await Tag.allWithNotes(),
});
}
}
module.exports = reduxSharedMiddleware;

View File

@@ -32,9 +32,7 @@ class SideMenuContentComponent extends Component {
let styles = {
menu: {
flex: 1,
backgroundColor: theme.backgroundColor,
borderTopWidth: 1,
borderTopColor: theme.dividerColor,
backgroundColor: theme.backgroundColor
},
button: {
flex: 1,

View File

@@ -104,6 +104,8 @@ class Setting extends BaseModel {
'style.zoom': {value: 100, type: Setting.TYPE_INT, public: true, appTypes: ['desktop'], section: 'appearance', label: () => _('Global zoom percentage'), minimum: 50, maximum: 500, step: 10},
'style.editor.fontSize': {value: 13, type: Setting.TYPE_INT, public: true, appTypes: ['desktop'], section: 'appearance', label: () => _('Editor font size'), minimum: 4, maximum: 50, step: 1},
'style.editor.fontFamily': {value: "", type: Setting.TYPE_STRING, public: true, appTypes: ['desktop'], section: 'appearance', label: () => _('Editor font family'), description: () => _('This must be *monospace* font or it will not work properly. If the font is incorrect or empty, it will default to a generic monospace font.')},
'style.sidebar.width': {value: 150, minimum: 80, maximum: 400, type: Setting.TYPE_INT, public: false, appTypes: ['desktop'] },
'style.noteList.width': {value: 150, minimum: 80, maximum: 400, type: Setting.TYPE_INT, public: false, appTypes: ['desktop'] },
'autoUpdateEnabled': { value: true, type: Setting.TYPE_BOOL, section:'application', public: true, appTypes: ['desktop'], label: () => _('Automatically update the application') },
'autoUpdate.includePreReleases': { value: false, type: Setting.TYPE_BOOL, section:'application', public: true, appTypes: ['desktop'], label: () => _('Get pre-releases when checking for updates'), description: () => _('See the pre-release page for more details: %s', 'https://joplin.cozic.net/prereleases') },
'clipperServer.autoStart': { value: false, type: Setting.TYPE_BOOL, public: false },
@@ -280,6 +282,9 @@ class Setting extends BaseModel {
// Don't log this to prevent sensitive info (passwords, auth tokens...) to end up in logs
// this.logger().info('Setting: ' + key + ' = ' + c.value + ' => ' + value);
if (('minimum' in md) && value < md.minimum) value = md.minimum;
if (('maximum' in md) && value > md.maximum) value = md.maximum;
c.value = value;
this.dispatch({
@@ -558,6 +563,12 @@ class Setting extends BaseModel {
return name;
}
static appTypeToLabel(name) {
// Not translated for now because only used on Welcome notes (which are not translated)
if (name === 'cli') return 'CLI';
return name[0].toUpperCase() + name.substr(1).toLowerCase();
}
}
Setting.TYPE_INT = 1;

View File

@@ -30,9 +30,9 @@ class Tag extends BaseItem {
let noteIds = await this.noteIds(tagId);
if (!noteIds.length) return [];
return Note.search(Object.assign({}, options, {
return Note.previews(null, Object.assign({}, options, {
conditions: ['id IN ("' + noteIds.join('","') + '")'],
}))
}));
}
// Untag all the notes and delete tag

View File

@@ -214,6 +214,10 @@ class SearchEngine {
rows.sort((a, b) => {
if (a.weight < b.weight) return +1;
if (a.weight > b.weight) return -1;
if (a.is_todo && a.todo_completed) return +1;
if (b.is_todo && b.todo_completed) return -1;
if (a.user_updated_time < b.user_updated_time) return +1;
if (a.user_updated_time > b.user_updated_time) return -1;
return 0;
});
}
@@ -364,7 +368,7 @@ class SearchEngine {
return this.basicSearch(query);
} else {
const parsedQuery = this.parseQuery(query);
const sql = 'SELECT id, title, offsets(notes_fts) AS offsets FROM notes_fts WHERE notes_fts MATCH ?'
const sql = 'SELECT notes_fts.id, notes_fts.title, offsets(notes_fts) AS offsets, notes.user_updated_time, notes.is_todo, notes.todo_completed FROM notes_fts LEFT JOIN notes ON notes_fts.id = notes.id WHERE notes_fts MATCH ?'
try {
const rows = await this.db().selectAll(sql, [query]);
this.orderResults_(rows, parsedQuery);

View File

@@ -3,16 +3,28 @@ const Note = require('lib/models/Note');
class SearchEngineUtils {
static async notesForQuery(query) {
static async notesForQuery(query, options = null) {
if (!options) options = {};
const results = await SearchEngine.instance().search(query);
const noteIds = results.map(n => n.id);
const previewOptions = {
order: [],
fields: Note.previewFields(),
conditions: ['id IN ("' + noteIds.join('","') + '")'],
// We need at least the note ID to be able to sort them below so if not
// present in field list, add it.L Also remember it was auto-added so that
// it can be removed afterwards.
let idWasAutoAdded = false;
const fields = options.fields ? options.fields : Note.previewFields().slice();
if (fields.indexOf('id') < 0) {
fields.push('id');
idWasAutoAdded = true;
}
const previewOptions = Object.assign({}, {
order: [],
fields: fields,
conditions: ['id IN ("' + noteIds.join('","') + '")'],
}, options);
const notes = await Note.previews(null, previewOptions);
// By default, the notes will be returned in reverse order
@@ -22,6 +34,7 @@ class SearchEngineUtils {
for (let i = 0; i < notes.length; i++) {
const idx = noteIds.indexOf(notes[i].id);
sortedNotes[idx] = notes[i];
if (idWasAutoAdded) delete sortedNotes[idx].id;
}
return sortedNotes;

View File

@@ -13,6 +13,7 @@ const { shim } = require('lib/shim');
const HtmlToMd = require('lib/HtmlToMd');
const { fileExtension, safeFileExtension, safeFilename, filename } = require('lib/path-utils');
const ApiResponse = require('lib/services/rest/ApiResponse');
const SearchEngineUtils = require('lib/services/SearchEngineUtils');
class ApiError extends Error {
@@ -207,6 +208,17 @@ class Api {
throw new ErrorMethodNotAllowed();
}
async action_search(request) {
this.checkToken_(request);
if (request.method !== 'GET') throw new ErrorMethodNotAllowed();
const query = request.query.query;
if (!query) throw new ErrorBadRequest('Missing "query" parameter');
return await SearchEngineUtils.notesForQuery(query, this.notePreviewsOptions_(request));
}
async action_folders(request, id = null, link = null) {
if (request.method === 'GET' && !id) {
return await Folder.allAsTree({ fields: this.fields_(request, ['id', 'parent_id', 'title']) });

View File

@@ -6,7 +6,7 @@ module.exports = {
"body": "# Welcome to Joplin! 🗒️\n\nJoplin is a free, open source note taking and to-do application, which helps you write and organise your notes, and synchronise them between your devices. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in [Markdown format](https://joplin.cozic.net/#markdown). Joplin is available as a **💻 desktop**, **📱 mobile** and **🔡 terminal** application.\n\nThe notes in this notebook give an overview of what Joplin can do and how to use it. In general, the three applications share roughly the same functionalities; any differences will be clearly indicated.\n\n![](./AllClients.png)\n\n## Joplin is divided into three parts\n\nJoplin has three main columns:\n\n- **Sidebar** contains the list of your notebooks and tags, as well as the synchronisation status.\n- **Note List** contains the current list of notes - either the notes in the currently selected notebook, the notes in the currently selected tag, or search results.\n- **Note Editor** is the place where you write your notes in Markdown, with a viewer showing what the note will look like. You may also use an [external editor](https://joplin.cozic.net/#external-text-editor) to edit notes. For example, if you like WYSIWYG editors, you can use something like Typora as an external editor and it will display the note as well as any embedded images.\n\n## Writing notes in Markdown\n\nMarkdown is a lightweight markup language with plain text formatting syntax. Joplin supports a [Github-flavoured Markdown syntax](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) with a few variations and additions.\n\nIn general, while Markdown is a markup language, it is meant to be human readable, even without being rendered. This is a simple example (you can see how it looks in the viewer panel):\n\n* * *\n\n# Heading\n\n## Sub-heading\n\nParagraphs are separated by a blank line. Text attributes _italic_, **bold** and `monospace` are supported. You can create bullet lists:\n\n* apples\n* oranges\n* pears\n\nOr numbered lists:\n\n1. wash\n2. rinse\n3. repeat\n\nThis is a [link](https://joplin.cozic.net) and, finally, below is a horizontal rule:\n\n* * *\n\nA lot more is possible including adding code samples, math formulae or checkbox lists - see the [Markdown documentation](https://joplin.cozic.net/#markdown) for more information.\n\n## Organising your notes\n\n### With notebooks 📔\n\nJoplin notes are organised into a tree of notebooks and sub-notebooks.\n\n- On **desktop**, you can create a notebook by clicking on New Notebook, then you can drag and drop them into other notebooks to organise them as you wish.\n- On **mobile**, press the \"+\" icon and select \"New notebook\".\n- On **terminal**, press `:mn`\n\n![](./SubNotebooks.png)\n\n### With tags 🏷️\n\nThe second way to organise your notes is using tags:\n\n- On **desktop**, right-click on any note in the Note List, and select \"Edit tags\". You can then add the tags, separating them by commas.\n- On **mobile**, open the note and press the \"⋮\" button and select \"Tags\".\n- On **terminal**, type `:help tag` for the available commands.\n\n* * *\n\n**Next:** [How to import notes from other applications](:/b863cbc514cb4cafbae8dd6a4fcad919).\n",
"tags": [
"markdown",
"organizing"
"organising"
],
"resources": {
"./AllClients.png": {
@@ -36,7 +36,7 @@ module.exports = {
"title": "3. Synchronising your notes 🔄",
"body": "# Synchronising your notes 🔄\n\nOne of the goals of Joplin was to avoid being tied to any particular company or service, whether it is Evernote, Google or Microsoft. As such the synchronisation is designed without any hard dependency to any particular service. You basically choose the service you prefer among those supported, setup the configuration, and the app will be able to sync between your computers or mobile devices.\n\nThe supported cloud services are the following:\n\n## Setting up Dropbox synchronisation\n\nSelect \"Dropbox\" as the synchronisation target in the config screen (it is selected by default). Then, to initiate the synchronisation process, click on the \"Synchronise\" button in the sidebar and follow the instructions.\n\n## Setting up Nextcloud synchronisation\n\nNextcloud is a self-hosted, private cloud solution. It can store documents, images and videos but also calendars, passwords and countless other things and can sync them to your laptop or phone. As you can host your own Nextcloud server, you own both the data on your device and infrastructure used for synchronisation. As such it is a good fit for Joplin.\n\nTo set it up, go to the config screen and select Nextcloud as the synchronisation target. Then input the WebDAV URL (to get it, go to your Nextcloud page, click on Settings in the bottom left corner of the page and copy the URL). Note that it has to be the **full URL**, so for example if you want the notes to be under `/Joplin`, the URL would be something like `https://example.com/remote.php/webdav/Joplin` (note that \"/Joplin\" part). And **make sure to create the \"/Joplin\" directory in Nextcloud**. Finally set the username and password. If it does not work, please [see this explanation](https://github.com/laurent22/joplin/issues/61#issuecomment-373282608) for more details.\n\n## Setting up OneDrive or WebDAV synchronisation\n\nOneDrive and WebDAV are also supported as synchronisation services. Please see [the export documentation](https://github.com/laurent22/joplin#exporting) for more information.\n\n## Using End-To-End Encryption\n\nJoplin supports end-to-end encryption (E2EE) on all the applications. E2EE is a system where only the owner of the data can read it. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data. Please see the [End-To-End Encryption Tutorial](https://joplin.cozic.net/e2ee/) for more information about this feature and how to enable it.\n\n* * *\n\n**Next:** [Some other tips on how to use Joplin](:/2ee48f80889447429a3cccb04a466072)",
"tags": [
"synchronizing"
"synchronising"
],
"resources": {},
"parent_id": "9bb5d498aba74cc6a047cfdc841e82a1"
@@ -63,5 +63,36 @@ module.exports = {
"id": "9bb5d498aba74cc6a047cfdc841e82a1",
"title": "Welcome!"
}
]
],
"tags": [
{
"id": "79cc5ef0f6c24f138033ce48928c2cba",
"title": "markdown"
},
{
"id": "c83be0495b5d4f1ab655c5c6dfed6804",
"title": "organising"
},
{
"id": "b5adb734bb0044f2a572a729266b610d",
"title": "importing"
},
{
"id": "bed34e2e3ab74b45af8ba473a05f56f9",
"title": "exporting"
},
{
"id": "c442fa3b2b2b4389b160c15eb73f35c9",
"title": "synchronising"
},
{
"id": "22c94167b6e94a92b560ffc31a7f4b1d",
"title": "attachment"
},
{
"id": "83eae47427df4805905103d4a91727b7",
"title": "search"
}
],
"timestamp": 1529668800000
}

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

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