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

Compare commits

...

19 Commits

Author SHA1 Message Date
Laurent Cozic
d2d659d5a9 Android release v1.0.237 2019-02-14 22:32:17 +00:00
Laurent Cozic
1595248b52 Electron release v1.0.127 2019-02-14 22:29:19 +00:00
Laurent Cozic
fc94c616b5 All: Updated translations 2019-02-14 22:28:04 +00:00
Laurent Cozic
f6f0bcf1c3 Desktop: Changed Folder icon to a Notebook 2019-02-14 22:27:53 +00:00
Laurent Cozic
6eeeda5dab All: Update welcome assets 2019-02-14 22:22:43 +00:00
Caleb John
58993d2ead Add styling to the scrollbars (#1204) 2019-02-14 22:21:21 +00:00
Caleb John
7c0b608769 Minor update to dark theme (#1181) 2019-02-14 22:18:42 +00:00
Zorbey Doğangüneş
259be84a3e Turkish Language Support (#1211)
* Add files via upload

* Delete tr_TR.po

* Updated translations
2019-02-14 22:17:36 +00:00
0ndrey
57c880cf85 Russian translate (#1179)
* Исправлен и обновлен перевод

* Update ru_RU.po

* Update ru_RU.po
2019-02-14 22:15:33 +00:00
Laurent Cozic
0469fe76d7 Desktop: Do not display tags that are not associated with any note 2019-02-13 23:33:07 +00:00
Laurent Cozic
a3e74320fa Desktop: Allow creating new note when multiple notes are selected 2019-02-13 22:57:43 +00:00
Laurent Cozic
4e0f4397b2 All: Fixed percent translated and added missing strings 2019-02-13 22:52:32 +00:00
Laurent Cozic
b26aab3863 Desktop: Print background images and colors, and improved checkoxes to avoid use of svg 2019-02-13 22:35:57 +00:00
Laurent Cozic
75ec97fe61 Updated Swedish translation 2019-02-13 17:34:26 +00:00
Laurent Cozic
9a356453fc Fix readme 2019-02-12 17:51:13 +00:00
Laurent Cozic
f0020b3393 Desktop: Highlight row backgroung in table 2019-02-10 17:16:11 +00:00
Laurent Cozic
ea9f1dc91d CLI v1.0.123 2019-02-10 16:47:42 +00:00
Laurent Cozic
2ef77dcf1f Revert "CLI: improve e2ee decrypt command"
This reverts commit 6e235605ed.
Fixed #1144: e2ee decrypt cannot be used inside cron. If we need
manually decrypting a file, we'll need to move this command
somewhere else.
2019-02-10 16:44:07 +00:00
Laurent Cozic
29e7ec4cc9 CLI: Fixes #1194: Fixed opening then saving note in text editor 2019-02-10 16:41:14 +00:00
97 changed files with 3086 additions and 1129 deletions

View File

@@ -47,63 +47,34 @@ class Command extends BaseCommand {
}
if (args.command === 'decrypt') {
while (true) {
try {
if (args.path) {
const plainText = await EncryptionService.instance().decryptString(args.path);
this.stdout(plainText);
return;
} else {
if (process.stdin.isTTY) {
this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
await DecryptionWorker.instance().start();
this.stdout(_('Completed decryption.'));
return;
} else {
// var repl = require("repl");
// var r = repl.start("node> ");
if (args.path) {
const plainText = await EncryptionService.instance().decryptString(args.path);
this.stdout(plainText);
} else {
this.stdout(_('Starting decryption... Please wait as it may take several minutes depending on how much there is to decrypt.'));
const text = await new Promise((accept, reject) => {
var buffer = '';
process.stdin.setEncoding('utf8');
process.stdin.on('data', function(chunk) {
buffer += chunk;
// process.stdout.write(chunk);
});
process.stdin.on('end', function() {
accept(buffer.trim());
});
});
if (text.length > 0) {
var cipherText = text;
try {
var item = await BaseItem.unserialize(text);
cipherText = item.encryption_cipher_text;
} catch (error) {
// we already got the pure cipher text
}
const plainText = await EncryptionService.instance().decryptString(cipherText);
this.stdout(plainText);
while (true) {
try {
await DecryptionWorker.instance().start();
break;
} catch (error) {
if (error.code === 'masterKeyNotLoaded') {
const masterKeyId = error.masterKeyId;
const password = await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
if (!password) {
this.stdout(_('Operation cancelled'));
return;
}
return;
Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
await EncryptionService.instance().loadMasterKeysFromSettings();
continue;
}
}
} catch (error) {
if (error.code === 'masterKeyNotLoaded') {
const masterKeyId = error.masterKeyId;
const password = await this.prompt(_('Enter master password:'), { type: 'string', secure: true });
if (!password) {
this.stdout(_('Operation cancelled'));
return;
}
Setting.setObjectKey('encryption.passwordCache', masterKeyId, password);
await EncryptionService.instance().loadMasterKeysFromSettings();
continue;
}
throw error;
throw error;
}
}
this.stdout(_('Completed decryption.'));
}
return;
@@ -215,4 +186,4 @@ class Command extends BaseCommand {
}
module.exports = Command;
module.exports = Command;

View File

@@ -1154,6 +1154,39 @@ 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 "Add or remove tags"
msgstr "Afegeix o suprimeix etiquetes"
#, fuzzy
msgid "Duplicate"
msgstr "Surt de l'aplicació"
#, fuzzy, javascript-format
msgid "%s - Copy"
msgstr "Copia"
msgid "Switch between note and to-do type"
msgstr "Alterna entre el tipus nota i tasques pendents"
#, fuzzy
msgid "Switch to note type"
msgstr "Alterna entre el tipus nota i tasques pendents"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Alterna entre el tipus nota i tasques pendents"
msgid "Copy Markdown link"
msgstr "Copia l'enllaç Markdown"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Voleu suprimir les notes?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Voleu suprimir aquestes notes?"
#, javascript-format
msgid "Usage: %s"
msgstr "Ús: %s"
@@ -1796,9 +1829,6 @@ msgstr "Converteix a nota"
msgid "Convert to todo"
msgstr "Converteix a llistat de tasques pendents"
msgid "Copy Markdown link"
msgstr "Copia l'enllaç Markdown"
msgid "Hide metadata"
msgstr "Amaga les metadades"
@@ -1834,27 +1864,6 @@ msgstr ""
msgid "Welcome"
msgstr "Benvingut"
#~ msgid "Add or remove tags"
#~ msgstr "Afegeix o suprimeix etiquetes"
#, fuzzy
#~ msgid "%s - Copy"
#~ msgstr "Copia"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Alterna entre el tipus nota i tasques pendents"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Alterna entre el tipus nota i tasques pendents"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Alterna entre el tipus nota i tasques pendents"
#~ msgid "Delete notes?"
#~ msgstr "Voleu suprimir les notes?"
#~ msgid "State: %s."
#~ msgstr "Estat: %s"

View File

@@ -1123,6 +1123,40 @@ 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 "Add or remove tags"
msgstr "Přidat či odebrat tagy"
#, fuzzy
msgid "Duplicate"
msgstr "Ukončí aplikaci."
#, fuzzy, javascript-format
msgid "%s - Copy"
msgstr "Kopírovat"
msgid "Switch between note and to-do type"
msgstr "Přepnout mezi poznámkou a to-do"
#, fuzzy
msgid "Switch to note type"
msgstr "Přepnout mezi poznámkou a to-do"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Přepnout mezi poznámkou a to-do"
#, fuzzy
msgid "Copy Markdown link"
msgstr "Markdown"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Smazat poznámky?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Smazat tyto poznámky?"
#, javascript-format
msgid "Usage: %s"
msgstr "Použití: %s"
@@ -1764,10 +1798,6 @@ msgstr "Konvertovat na poznámku"
msgid "Convert to todo"
msgstr "Konvertovat na todo"
#, fuzzy
msgid "Copy Markdown link"
msgstr "Markdown"
msgid "Hide metadata"
msgstr "Schovat metadata"
@@ -1802,27 +1832,6 @@ msgstr "Nemáte žádný zápisník. Vytvořte jeden kliknutím na tlačítko (+
msgid "Welcome"
msgstr "Vítejte"
#~ msgid "Add or remove tags"
#~ msgstr "Přidat či odebrat tagy"
#, fuzzy
#~ msgid "%s - Copy"
#~ msgstr "Kopírovat"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Přepnout mezi poznámkou a to-do"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Přepnout mezi poznámkou a to-do"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Přepnout mezi poznámkou a to-do"
#~ msgid "Delete notes?"
#~ msgstr "Smazat poznámky?"
#~ msgid "State: %s."
#~ msgstr "Stav: %s."

View File

@@ -1132,6 +1132,40 @@ msgstr "Ressourcer: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Vælg hvor sync status skal eksporteres til"
msgid "Add or remove tags"
msgstr "Tilføj eller slet mærker"
#, fuzzy
msgid "Duplicate"
msgstr "Forlad/luk program."
#, fuzzy, javascript-format
msgid "%s - Copy"
msgstr "Kopier"
msgid "Switch between note and to-do type"
msgstr "Skift mellem note- og opgave type"
#, fuzzy
msgid "Switch to note type"
msgstr "Skift mellem note- og opgave type"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Skift mellem note- og opgave type"
#, fuzzy
msgid "Copy Markdown link"
msgstr "Markdown"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Slet noter?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Slet disse noter?"
#, javascript-format
msgid "Usage: %s"
msgstr "Forbrug: %s"
@@ -1773,10 +1807,6 @@ msgstr "Konverter til note"
msgid "Convert to todo"
msgstr "Konverter til opgave"
#, fuzzy
msgid "Copy Markdown link"
msgstr "Markdown"
msgid "Hide metadata"
msgstr "Skjul metadata"
@@ -1811,27 +1841,6 @@ msgstr "Du har ingen notesbøger. Opret en ved at klikke på (+) knappen."
msgid "Welcome"
msgstr "Velkommen"
#~ msgid "Add or remove tags"
#~ msgstr "Tilføj eller slet mærker"
#, fuzzy
#~ msgid "%s - Copy"
#~ msgstr "Kopier"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Skift mellem note- og opgave type"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Skift mellem note- og opgave type"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Skift mellem note- og opgave type"
#~ msgid "Delete notes?"
#~ msgstr "Slet noter?"
#~ msgid "State: %s."
#~ msgstr "Tilstand: %s."

View File

@@ -1168,6 +1168,36 @@ msgid "Please select where the sync status should be exported to"
msgstr ""
"Bitte wähle aus, wohin der Synchronisations-Status exportiert werden soll"
msgid "Add or remove tags"
msgstr "Schlagwörter hinzufügen oder entfernen"
msgid "Duplicate"
msgstr "Duplizieren"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - Kopieren"
msgid "Switch between note and to-do type"
msgstr "Zwischen Notiz und To-Do Typ wechseln"
msgid "Switch to note type"
msgstr "Zu Notiz-Typ wechseln"
msgid "Switch to to-do type"
msgstr "Zu To-Do-Typ wechseln"
msgid "Copy Markdown link"
msgstr "Markdown-Link kopieren"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Notizbuch \"%s\" löschen?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Sollen diese Notizen gelöscht werden?"
#, javascript-format
msgid "Usage: %s"
msgstr "Nutzung: %s"
@@ -1826,9 +1856,6 @@ msgstr "In eine Notiz umwandeln"
msgid "Convert to todo"
msgstr "In ein To-Do umwandeln"
msgid "Copy Markdown link"
msgstr "Markdown-Link kopieren"
msgid "Hide metadata"
msgstr "Metadaten verstecken"
@@ -1866,24 +1893,6 @@ msgstr ""
msgid "Welcome"
msgstr "Willkommen"
#~ msgid "Add or remove tags"
#~ msgstr "Schlagwörter hinzufügen oder entfernen"
#~ msgid "Duplicate"
#~ msgstr "Duplizieren"
#~ msgid "%s - Copy"
#~ msgstr "%s - Kopieren"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Zwischen Notiz und To-Do Typ wechseln"
#~ msgid "Switch to note type"
#~ msgstr "Zu Notiz-Typ wechseln"
#~ msgid "Switch to to-do type"
#~ msgstr "Zu To-Do-Typ wechseln"
#~ msgid "Delete notes?"
#~ msgstr "Notizen löschen?"
@@ -1987,9 +1996,6 @@ msgstr "Willkommen"
#~ msgid "Delete notebook?"
#~ msgstr "Notizbuch löschen?"
#~ msgid "Delete notebook \"%s\"?"
#~ msgstr "Notizbuch \"%s\" löschen?"
#~ msgid "File system synchronisation target directory"
#~ msgstr "Dateisystem-Synchronisation Zielpfad"

View File

@@ -1038,6 +1038,36 @@ msgstr ""
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Add or remove tags"
msgstr ""
msgid "Duplicate"
msgstr ""
#, javascript-format
msgid "%s - Copy"
msgstr ""
msgid "Switch between note and to-do type"
msgstr ""
msgid "Switch to note type"
msgstr ""
msgid "Switch to to-do type"
msgstr ""
msgid "Copy Markdown link"
msgstr ""
#, javascript-format
msgid "Delete note \"%s\"?"
msgstr ""
#, javascript-format
msgid "Delete these %d notes?"
msgstr ""
#, javascript-format
msgid "Usage: %s"
msgstr ""
@@ -1637,9 +1667,6 @@ msgstr ""
msgid "Convert to todo"
msgstr ""
msgid "Copy Markdown link"
msgstr ""
msgid "Hide metadata"
msgstr ""

View File

@@ -1146,6 +1146,38 @@ msgstr "Recursos: %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 "Add or remove tags"
msgstr "Añadir o borrar etiquetas"
msgid "Duplicate"
msgstr "Duplicado"
#, javascript-format
msgid "%s - Copy"
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"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Cambiar entre nota y lista de tareas"
msgid "Copy Markdown link"
msgstr "Copiar el enlace de Markdown"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Elimina una libreta \"%s\"?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "¿Desea borrar estas notas?"
#, javascript-format
msgid "Usage: %s"
msgstr "Uso: %s"
@@ -1795,9 +1827,6 @@ msgstr "Convertir a nota"
msgid "Convert to todo"
msgstr "Convertir a lista de tareas"
msgid "Copy Markdown link"
msgstr "Copiar el enlace de Markdown"
msgid "Hide metadata"
msgstr "Ocultar metadatos"
@@ -1833,26 +1862,6 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenido"
#~ msgid "Add or remove tags"
#~ msgstr "Añadir o borrar etiquetas"
#~ msgid "Duplicate"
#~ msgstr "Duplicado"
#~ msgid "%s - Copy"
#~ 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"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Cambiar entre nota y lista de tareas"
#~ msgid "Delete notes?"
#~ msgstr "¿Desea eliminar notas?"
@@ -1965,9 +1974,6 @@ msgstr "Bienvenido"
#~ msgid "Delete notebook?"
#~ msgstr "Eliminar libreta?"
#~ msgid "Delete notebook \"%s\"?"
#~ msgstr "Elimina una libreta \"%s\"?"
#, fuzzy
#~ msgid "File system synchronisation target directory"
#~ msgstr "Sincronización de sistema de archivos en directorio objetivo"

View File

@@ -1146,6 +1146,39 @@ msgstr "Baliabideak: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Aukeratu nora esportatu sinkronizazioaren egoera, mesedez"
msgid "Add or remove tags"
msgstr "Gehitu edo ezabatu etiketak"
#, fuzzy
msgid "Duplicate"
msgstr "Irten aplikaziotik"
#, fuzzy, javascript-format
msgid "%s - Copy"
msgstr "Kopiatu"
msgid "Switch between note and to-do type"
msgstr "Aldatu oharra eta zeregin eren artean."
#, fuzzy
msgid "Switch to note type"
msgstr "Aldatu oharra eta zeregin eren artean."
#, fuzzy
msgid "Switch to to-do type"
msgstr "Aldatu oharra eta zeregin eren artean."
msgid "Copy Markdown link"
msgstr ""
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Oharrak ezabatu?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Oharrok ezabatu?"
#, javascript-format
msgid "Usage: %s"
msgstr "Erabili: %s"
@@ -1795,9 +1828,6 @@ msgstr "Oharra bihurtu"
msgid "Convert to todo"
msgstr "Zeregina bihurtu"
msgid "Copy Markdown link"
msgstr ""
msgid "Hide metadata"
msgstr "Ezkutatu metadatuak"
@@ -1832,27 +1862,6 @@ msgstr "Oraindik ez duzu koadernorik. Sortu bat (+) botoian sakatuta."
msgid "Welcome"
msgstr "Ongi etorri!"
#~ msgid "Add or remove tags"
#~ msgstr "Gehitu edo ezabatu etiketak"
#, fuzzy
#~ msgid "%s - Copy"
#~ msgstr "Kopiatu"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Aldatu oharra eta zeregin eren artean."
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Aldatu oharra eta zeregin eren artean."
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Aldatu oharra eta zeregin eren artean."
#~ msgid "Delete notes?"
#~ msgstr "Oharrak ezabatu?"
#, fuzzy
#~ msgid "State: %s."
#~ msgstr "Egoera: \"%s\"."

View File

@@ -1015,7 +1015,7 @@ msgid "Copy Link Address"
msgstr "Copier l'adresse du lien"
msgid "This attachment is not downloaded or not decrypted yet."
msgstr "Cette pièce jointe n'est pas téléchargée ou pas encore déchiffrée"
msgstr "Cette pièce jointe n'est pas téléchargée ou pas encore déchiffrée."
#, javascript-format
msgid "Unsupported link or message: %s"
@@ -1150,6 +1150,36 @@ 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 "Add or remove tags"
msgstr "Gérer les étiquettes"
msgid "Duplicate"
msgstr "Dupliquer"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - Copie"
msgid "Switch between note and to-do type"
msgstr "Alterner entre note et tâche"
msgid "Switch to note type"
msgstr "Convertir en note"
msgid "Switch to to-do type"
msgstr "Convertir en tâche"
msgid "Copy Markdown link"
msgstr "Copier lien Markdown"
#, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Supprimer note \"%s\" ?"
#, javascript-format
msgid "Delete these %d notes?"
msgstr "Supprimer ces %d notes ?"
#, javascript-format
msgid "Usage: %s"
msgstr "Utilisation : %s"
@@ -1599,7 +1629,7 @@ msgid "Permission to use camera"
msgstr "Permission d'utiliser l'appareil photo"
msgid "Your permission to use your camera is required."
msgstr "Votre permission est requise pour utiliser l'appareil photo"
msgstr "Votre permission est requise pour utiliser l'appareil photo."
msgid "There are currently no notes. Create one by clicking on the (+) button."
msgstr ""
@@ -1799,9 +1829,6 @@ msgstr "Convertir en note"
msgid "Convert to todo"
msgstr "Convertir en tâche"
msgid "Copy Markdown link"
msgstr "Copier lien Markdown"
msgid "Hide metadata"
msgstr "Cacher les métadonnées"
@@ -1838,24 +1865,6 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenue"
#~ msgid "Add or remove tags"
#~ msgstr "Gérer les étiquettes"
#~ msgid "Duplicate"
#~ msgstr "Dupliquer"
#~ msgid "%s - Copy"
#~ msgstr "%s - Copie"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Alterner entre note et tâche"
#~ msgid "Switch to note type"
#~ msgstr "Convertir en note"
#~ msgid "Switch to to-do type"
#~ msgstr "Convertir en tâche"
#~ msgid "Delete notes?"
#~ msgstr "Supprimer les notes ?"
@@ -1978,9 +1987,6 @@ msgstr "Bienvenue"
#~ msgid "Delete notebook?"
#~ msgstr "Supprimer le carnet ?"
#~ msgid "Delete notebook \"%s\"?"
#~ msgstr "Supprimer le carnet \"%s\" ?"
#~ msgid "File system synchronisation target directory"
#~ msgstr "Cible de la synchronisation sur le disque dur"

View File

@@ -1131,6 +1131,40 @@ msgstr "Recursos: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Seleccione onde exportar o estado da sincronización"
msgid "Add or remove tags"
msgstr "Engadir ou eliminar etiquetas"
#, fuzzy
msgid "Duplicate"
msgstr "Sae do aplicativo."
#, fuzzy, javascript-format
msgid "%s - Copy"
msgstr "Copiar"
msgid "Switch between note and to-do type"
msgstr "Cambiar entre notas e tarefas"
#, fuzzy
msgid "Switch to note type"
msgstr "Cambiar entre notas e tarefas"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Cambiar entre notas e tarefas"
#, fuzzy
msgid "Copy Markdown link"
msgstr "Markdown"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Desexa eliminar as notas?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Desexa eliminar estas notas?"
#, javascript-format
msgid "Usage: %s"
msgstr "Uso: %s"
@@ -1772,10 +1806,6 @@ msgstr "Converter para nota"
msgid "Convert to todo"
msgstr "Converter para tarefa"
#, fuzzy
msgid "Copy Markdown link"
msgstr "Markdown"
msgid "Hide metadata"
msgstr "Ocultar metadados"
@@ -1810,27 +1840,6 @@ msgstr "Non ten cadernos actualmente. Cree un premendo no botón (+)."
msgid "Welcome"
msgstr "Benvido/a"
#~ msgid "Add or remove tags"
#~ msgstr "Engadir ou eliminar etiquetas"
#, fuzzy
#~ msgid "%s - Copy"
#~ msgstr "Copiar"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Cambiar entre notas e tarefas"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Cambiar entre notas e tarefas"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Cambiar entre notas e tarefas"
#~ msgid "Delete notes?"
#~ msgstr "Desexa eliminar as notas?"
#~ msgid "State: %s."
#~ msgstr "Estado: %s."

View File

@@ -1132,6 +1132,39 @@ msgstr "Resursi: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Odaberi lokaciju za izvoz statusa sinkronizacije"
msgid "Add or remove tags"
msgstr "Dodaj ili makni oznake"
#, fuzzy
msgid "Duplicate"
msgstr "Izađi iz aplikacije."
#, fuzzy, javascript-format
msgid "%s - Copy"
msgstr "Kopiraj"
msgid "Switch between note and to-do type"
msgstr "Zamijeni bilješku i zadatak"
#, fuzzy
msgid "Switch to note type"
msgstr "Zamijeni bilješku i zadatak"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Zamijeni bilješku i zadatak"
msgid "Copy Markdown link"
msgstr ""
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Obriši bilješke?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Obriši ove bilješke?"
#, javascript-format
msgid "Usage: %s"
msgstr "Korištenje: %s"
@@ -1772,9 +1805,6 @@ msgstr "Pretvori u bilješku"
msgid "Convert to todo"
msgstr "Pretvori u zadatak"
msgid "Copy Markdown link"
msgstr ""
msgid "Hide metadata"
msgstr "Sakrij metapodatke"
@@ -1809,27 +1839,6 @@ msgstr "Trenutno nemaš nijednu bilježnicu. Stvori novu klikom na (+) gumb."
msgid "Welcome"
msgstr "Dobro došli"
#~ msgid "Add or remove tags"
#~ msgstr "Dodaj ili makni oznake"
#, fuzzy
#~ msgid "%s - Copy"
#~ msgstr "Kopiraj"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Zamijeni bilješku i zadatak"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Zamijeni bilješku i zadatak"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Zamijeni bilješku i zadatak"
#~ msgid "Delete notes?"
#~ msgstr "Obriši bilješke?"
#, fuzzy
#~ msgid "State: %s."
#~ msgstr "Stanje: \"%s\"."

View File

@@ -1152,6 +1152,36 @@ msgstr "Risorse: %d."
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Add or remove tags"
msgstr "Aggiungi o rimuovi etichetta"
msgid "Duplicate"
msgstr "Duplicare"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - Copia"
msgid "Switch between note and to-do type"
msgstr "Converti nota in \"Cose-da-fare\" e viceversa"
msgid "Switch to note type"
msgstr "Converti in nota"
msgid "Switch to to-do type"
msgstr "Converti in \"Cose-da-fare\""
msgid "Copy Markdown link"
msgstr "Copia il link Markdown"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Eliminare il taccuino \"%s\"?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Cancellare queste note?"
#, javascript-format
msgid "Usage: %s"
msgstr "Uso: %s"
@@ -1799,9 +1829,6 @@ msgstr "Converti in nota"
msgid "Convert to todo"
msgstr "Converti in Todo"
msgid "Copy Markdown link"
msgstr "Copia il link Markdown"
msgid "Hide metadata"
msgstr "Nascondi i Metadati"
@@ -1837,24 +1864,6 @@ msgstr ""
msgid "Welcome"
msgstr "Benvenuto"
#~ msgid "Add or remove tags"
#~ msgstr "Aggiungi o rimuovi etichetta"
#~ msgid "Duplicate"
#~ msgstr "Duplicare"
#~ msgid "%s - Copy"
#~ msgstr "%s - Copia"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Converti nota in \"Cose-da-fare\" e viceversa"
#~ msgid "Switch to note type"
#~ msgstr "Converti in nota"
#~ msgid "Switch to to-do type"
#~ msgstr "Converti in \"Cose-da-fare\""
#~ msgid "Delete notes?"
#~ msgstr "Eliminare le note?"
@@ -1970,8 +1979,5 @@ msgstr "Benvenuto"
#~ msgid "Delete notebook?"
#~ msgstr "Eliminare il taccuino?"
#~ msgid "Delete notebook \"%s\"?"
#~ msgstr "Eliminare il taccuino \"%s\"?"
#~ msgid "File system synchronisation target directory"
#~ msgstr "Directory di destinazione per la sincronizzazione nel file system"

View File

@@ -1129,6 +1129,36 @@ msgstr "取得中のリソース: %d"
msgid "Please select where the sync status should be exported to"
msgstr "同期状況の出力先を選択してください"
msgid "Add or remove tags"
msgstr "タグの追加と削除"
msgid "Duplicate"
msgstr "複製"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - コピー"
msgid "Switch between note and to-do type"
msgstr "ノートとToDoを切り替え"
msgid "Switch to note type"
msgstr "ノートに切り替え"
msgid "Switch to to-do type"
msgstr "ToDoに切り替え"
msgid "Copy Markdown link"
msgstr "Markdownのリンクをコピー"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "ノートを削除しますか?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "ノートを削除しますか?"
#, javascript-format
msgid "Usage: %s"
msgstr "使用方法: %s"
@@ -1776,9 +1806,6 @@ msgstr "ノートに変換"
msgid "Convert to todo"
msgstr "ToDoに変換"
msgid "Copy Markdown link"
msgstr "Markdownのリンクをコピー"
msgid "Hide metadata"
msgstr "メタデータを隠す"
@@ -1815,27 +1842,6 @@ msgstr ""
msgid "Welcome"
msgstr "ようこそ"
#~ msgid "Add or remove tags"
#~ msgstr "タグの追加と削除"
#~ msgid "Duplicate"
#~ msgstr "複製"
#~ msgid "%s - Copy"
#~ msgstr "%s - コピー"
#~ msgid "Switch between note and to-do type"
#~ msgstr "ノートとToDoを切り替え"
#~ msgid "Switch to note type"
#~ msgstr "ノートに切り替え"
#~ msgid "Switch to to-do type"
#~ msgstr "ToDoに切り替え"
#~ msgid "Delete notes?"
#~ msgstr "ノートを削除しますか?"
#~ msgid "State: %s."
#~ msgstr "状態: \"%s\"."

View File

@@ -1038,6 +1038,36 @@ msgstr ""
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Add or remove tags"
msgstr ""
msgid "Duplicate"
msgstr ""
#, javascript-format
msgid "%s - Copy"
msgstr ""
msgid "Switch between note and to-do type"
msgstr ""
msgid "Switch to note type"
msgstr ""
msgid "Switch to to-do type"
msgstr ""
msgid "Copy Markdown link"
msgstr ""
#, javascript-format
msgid "Delete note \"%s\"?"
msgstr ""
#, javascript-format
msgid "Delete these %d notes?"
msgstr ""
#, javascript-format
msgid "Usage: %s"
msgstr ""
@@ -1637,9 +1667,6 @@ msgstr ""
msgid "Convert to todo"
msgstr ""
msgid "Copy Markdown link"
msgstr ""
msgid "Hide metadata"
msgstr ""

View File

@@ -1123,6 +1123,36 @@ msgstr "리소스 가져오는 중: %d."
msgid "Please select where the sync status should be exported to"
msgstr "동기화 상태를 내보낼 대상을 선택하세요"
msgid "Add or remove tags"
msgstr "태그 추가 및 제거"
msgid "Duplicate"
msgstr "복제"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - 복사"
msgid "Switch between note and to-do type"
msgstr "'노트' 또는'할 일' 형식으로 전환합니다."
msgid "Switch to note type"
msgstr "'노트' 형식으로 전환합니다."
msgid "Switch to to-do type"
msgstr "'할 일' 형식으로 전환합니다."
msgid "Copy Markdown link"
msgstr "마크다운 링크 복사"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "노트를 삭제할까요?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "노트를 삭제할까요?"
#, javascript-format
msgid "Usage: %s"
msgstr "사용량: %s"
@@ -1767,9 +1797,6 @@ msgstr "노트로 변환"
msgid "Convert to todo"
msgstr "'할 일'로 변환"
msgid "Copy Markdown link"
msgstr "마크다운 링크 복사"
msgid "Hide metadata"
msgstr "메타데이터 숨김"
@@ -1804,27 +1831,6 @@ msgstr "노트북이 없습니다. (+) 버튼을 눌러 새로 만드세요."
msgid "Welcome"
msgstr "환영합니다"
#~ msgid "Add or remove tags"
#~ msgstr "태그 추가 및 제거"
#~ msgid "Duplicate"
#~ msgstr "복제"
#~ msgid "%s - Copy"
#~ msgstr "%s - 복사"
#~ msgid "Switch between note and to-do type"
#~ msgstr "'노트' 또는'할 일' 형식으로 전환합니다."
#~ msgid "Switch to note type"
#~ msgstr "'노트' 형식으로 전환합니다."
#~ msgid "Switch to to-do type"
#~ msgstr "'할 일' 형식으로 전환합니다."
#~ msgid "Delete notes?"
#~ msgstr "노트를 삭제할까요?"
#~ msgid "State: %s."
#~ msgstr "상태: %s."

View File

@@ -1138,6 +1138,36 @@ msgstr "Henter ressurser: %d"
msgid "Please select where the sync status should be exported to"
msgstr "Velg hvor synkroniseringsstatusen skal eksporteres til"
msgid "Add or remove tags"
msgstr "Legg til eller fjern merkelapper"
msgid "Duplicate"
msgstr "Dupliser"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - Kopier"
msgid "Switch between note and to-do type"
msgstr "Bytt mellom notat og gjøremål"
msgid "Switch to note type"
msgstr "Bytt til notatmodus"
msgid "Switch to to-do type"
msgstr "Bytt til gjøremålmodus"
msgid "Copy Markdown link"
msgstr "Kopier Markdown-link"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Slette notater?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Slett disse notatene?"
#, javascript-format
msgid "Usage: %s"
msgstr "Bruk: %s"
@@ -1786,9 +1816,6 @@ msgstr "Konverter til notat"
msgid "Convert to todo"
msgstr "Konverter til gjøremål"
msgid "Copy Markdown link"
msgstr "Kopier Markdown-link"
msgid "Hide metadata"
msgstr "Skjul metadata"
@@ -1822,24 +1849,3 @@ msgstr "Du har enda ingen notatbok. Lag en ved å klikke på (+)-knappen."
msgid "Welcome"
msgstr "Velkommen"
#~ msgid "Add or remove tags"
#~ msgstr "Legg til eller fjern merkelapper"
#~ msgid "Duplicate"
#~ msgstr "Dupliser"
#~ msgid "%s - Copy"
#~ msgstr "%s - Kopier"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Bytt mellom notat og gjøremål"
#~ msgid "Switch to note type"
#~ msgstr "Bytt til notatmodus"
#~ msgid "Switch to to-do type"
#~ msgstr "Bytt til gjøremålmodus"
#~ msgid "Delete notes?"
#~ msgstr "Slette notater?"

View File

@@ -1148,6 +1148,39 @@ 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 "Add or remove tags"
msgstr "Voeg tag toe of verwijder tag"
#, fuzzy
msgid "Duplicate"
msgstr "Sluit de applicatie."
#, fuzzy, javascript-format
msgid "%s - Copy"
msgstr "Kopieer"
msgid "Switch between note and to-do type"
msgstr "Wissel tussen notitie en to-do type"
#, fuzzy
msgid "Switch to note type"
msgstr "Wissel tussen notitie en to-do type"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Wissel tussen notitie en to-do type"
msgid "Copy Markdown link"
msgstr ""
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Notities verwijderen?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Deze notities verwijderen?"
#, javascript-format
msgid "Usage: %s"
msgstr "Gebruik: %s"
@@ -1797,9 +1830,6 @@ msgstr "Converteer naar notitie"
msgid "Convert to todo"
msgstr "Converteer naar to-do"
msgid "Copy Markdown link"
msgstr ""
msgid "Hide metadata"
msgstr "Verberg metadata"
@@ -1836,27 +1866,6 @@ msgstr ""
msgid "Welcome"
msgstr "Welkom"
#~ msgid "Add or remove tags"
#~ msgstr "Voeg tag toe of verwijder tag"
#, fuzzy
#~ msgid "%s - Copy"
#~ msgstr "Kopieer"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Wissel tussen notitie en to-do type"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Wissel tussen notitie en to-do type"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Wissel tussen notitie en to-do type"
#~ msgid "Delete notes?"
#~ msgstr "Notities verwijderen?"
#, fuzzy
#~ msgid "State: %s."
#~ msgstr "Status: \"%s\""

View File

@@ -1152,6 +1152,38 @@ 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 "Add or remove tags"
msgstr "Labels toevoegen of verwijderen"
msgid "Duplicate"
msgstr "Dupliceren"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - kopiëren"
msgid "Switch between note and to-do type"
msgstr "Schakelen tussen notitie en taak"
#, fuzzy
msgid "Switch to note type"
msgstr "Schakelen tussen notitie en taak"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Schakelen tussen notitie en taak"
msgid "Copy Markdown link"
msgstr "Markdownlink kopiëren"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Notities verwijderen?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Deze notities verwijderen?"
#, javascript-format
msgid "Usage: %s"
msgstr "Gebruik: %s"
@@ -1800,9 +1832,6 @@ msgstr "Omzetten naar notitie"
msgid "Convert to todo"
msgstr "Omzetten naar taak"
msgid "Copy Markdown link"
msgstr "Markdownlink kopiëren"
msgid "Hide metadata"
msgstr "Metagegevens verbergen"
@@ -1839,29 +1868,6 @@ msgstr ""
msgid "Welcome"
msgstr "Welkom"
#~ msgid "Add or remove tags"
#~ msgstr "Labels toevoegen of verwijderen"
#~ msgid "Duplicate"
#~ msgstr "Dupliceren"
#~ msgid "%s - Copy"
#~ msgstr "%s - kopiëren"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Schakelen tussen notitie en taak"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Schakelen tussen notitie en taak"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Schakelen tussen notitie en taak"
#~ msgid "Delete notes?"
#~ msgstr "Notities verwijderen?"
#~ msgid "State: %s."
#~ msgstr "Status: %s."

View File

@@ -1144,6 +1144,36 @@ msgstr ""
"Favor selecionar o local para onde o status de sincronia deveria ser "
"exportado"
msgid "Add or remove tags"
msgstr "Adicionar ou remover tags"
msgid "Duplicate"
msgstr "Duplicar"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - Copiar"
msgid "Switch between note and to-do type"
msgstr "Alternar entre os tipos Nota e Tarefa"
msgid "Switch to note type"
msgstr "Alternar para o tipo Nota"
msgid "Switch to to-do type"
msgstr "Alternar para o tipo Tarefa"
msgid "Copy Markdown link"
msgstr "Copiar link de Markdown"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Apagar o caderno \"%s\"?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Excluir estas notas?"
#, javascript-format
msgid "Usage: %s"
msgstr "Uso: %s"
@@ -1798,9 +1828,6 @@ msgstr "Converter para nota"
msgid "Convert to todo"
msgstr "Converter para tarefa"
msgid "Copy Markdown link"
msgstr "Copiar link de Markdown"
msgid "Hide metadata"
msgstr "Ocultar metadados"
@@ -1835,24 +1862,6 @@ msgstr "Você não possui cadernos. Crie um clicando no botão (+)."
msgid "Welcome"
msgstr "Bem-vindo"
#~ msgid "Add or remove tags"
#~ msgstr "Adicionar ou remover tags"
#~ msgid "Duplicate"
#~ msgstr "Duplicar"
#~ msgid "%s - Copy"
#~ msgstr "%s - Copiar"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Alternar entre os tipos Nota e Tarefa"
#~ msgid "Switch to note type"
#~ msgstr "Alternar para o tipo Nota"
#~ msgid "Switch to to-do type"
#~ msgstr "Alternar para o tipo Tarefa"
#~ msgid "Delete notes?"
#~ msgstr "Excluir notas?"
@@ -1952,8 +1961,5 @@ msgstr "Bem-vindo"
#~ msgid "Delete notebook?"
#~ msgstr "Excluir caderno?"
#~ msgid "Delete notebook \"%s\"?"
#~ msgstr "Apagar o caderno \"%s\"?"
#~ msgid "File system synchronisation target directory"
#~ msgstr "Diretório de destino de sincronização do sistema de arquivos"

View File

@@ -1057,6 +1057,39 @@ msgstr "Resurse: %d."
msgid "Please select where the sync status should be exported to"
msgstr ""
msgid "Add or remove tags"
msgstr "Adăugați ori eliminați etichete"
#, fuzzy
msgid "Duplicate"
msgstr "Duplicați"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - Copiați"
msgid "Switch between note and to-do type"
msgstr "Schimbați între notiță și sarcină"
#, fuzzy
msgid "Switch to note type"
msgstr "Schimbați între notiță și sarcină"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Schimbați între notiță și sarcină"
msgid "Copy Markdown link"
msgstr "Copiați link-ul Markdown"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Ștergeți notițele?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Ștergeți aceste notițe?"
#, javascript-format
msgid "Usage: %s"
msgstr "Utilizare: %s"
@@ -1664,9 +1697,6 @@ msgstr ""
msgid "Convert to todo"
msgstr ""
msgid "Copy Markdown link"
msgstr "Copiați link-ul Markdown"
msgid "Hide metadata"
msgstr "Ascundeți metadatele"
@@ -1702,26 +1732,6 @@ msgstr ""
msgid "Welcome"
msgstr "Bine ați venit"
#~ msgid "Add or remove tags"
#~ msgstr "Adăugați ori eliminați etichete"
#~ msgid "%s - Copy"
#~ msgstr "%s - Copiați"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Schimbați între notiță și sarcină"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Schimbați între notiță și sarcină"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Schimbați între notiță și sarcină"
#~ msgid "Delete notes?"
#~ msgstr "Ștergeți notițele?"
#~ msgid "State: %s."
#~ msgstr "Statut: %s."

File diff suppressed because it is too large Load Diff

View File

@@ -1145,6 +1145,40 @@ msgstr "Viri: %d."
msgid "Please select where the sync status should be exported to"
msgstr "Prosim izberite, kam želite izvoziti sinhronizacijski status"
msgid "Add or remove tags"
msgstr "Dodaj ali odstrani oznake"
#, fuzzy
msgid "Duplicate"
msgstr "Izhod iz aplikacije."
#, fuzzy, javascript-format
msgid "%s - Copy"
msgstr "Kopiraj"
msgid "Switch between note and to-do type"
msgstr "Menjaj med zabeležko in seznamom opravil"
#, fuzzy
msgid "Switch to note type"
msgstr "Menjaj med zabeležko in seznamom opravil"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Menjaj med zabeležko in seznamom opravil"
#, fuzzy
msgid "Copy Markdown link"
msgstr "Sistem označevanja"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Izbriši zabeležke?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Izbriši te zabeležke?"
#, javascript-format
msgid "Usage: %s"
msgstr "Uporaba: %s"
@@ -1786,10 +1820,6 @@ msgstr "Pretvori v zabeležko"
msgid "Convert to todo"
msgstr "Pretvori v za narediti"
#, fuzzy
msgid "Copy Markdown link"
msgstr "Sistem označevanja"
msgid "Hide metadata"
msgstr "Skrij meta podatke"
@@ -1824,27 +1854,6 @@ msgstr "Trenutno nimate nobene beležnice. Ustvarite jo s klikom na (+) gumb."
msgid "Welcome"
msgstr "Dobrodošli"
#~ msgid "Add or remove tags"
#~ msgstr "Dodaj ali odstrani oznake"
#, fuzzy
#~ msgid "%s - Copy"
#~ msgstr "Kopiraj"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Menjaj med zabeležko in seznamom opravil"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Menjaj med zabeležko in seznamom opravil"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Menjaj med zabeležko in seznamom opravil"
#~ msgid "Delete notes?"
#~ msgstr "Izbriši zabeležke?"
#~ msgid "State: %s."
#~ msgstr "Stanje: %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."
@@ -462,21 +462,20 @@ msgid "Starting synchronisation..."
msgstr "Startar synkronisering..."
msgid "Downloading resources..."
msgstr ""
msgstr "Laddar ned resurser..."
msgid "Cancelling... Please wait."
msgstr "Avbryter... vänta."
#, 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> kan vara \"add\", \"remove\" eller \"list\" för att tilldela "
"eller ta bort [tag] från [note], eller för att lista anteckningarna som är "
"associerade med [tag]. Kommandot `tag list` kan användas för att lista alla "
"taggar."
"<tag-command> kan vara \"lägg till\", \"ta bort\" eller \"lisat\" för att "
"tilldela eller ta bort [tag] från [note], eller för att lista anteckningarna "
"som är associerade med [tag]. Kommandot `tag list` kan användas för att "
"lista alla taggar."
#, javascript-format
msgid "Invalid command: \"%s\""
@@ -590,18 +589,16 @@ msgid "Exporting to \"%s\" as \"%s\" format. Please wait..."
msgstr "Exportera till \"%s\" som \"%s\" format. Vänta..."
msgid "Sidebar"
msgstr ""
msgstr "Sidofältet"
msgid "Note list"
msgstr ""
msgstr "Anteckningsboken"
#, fuzzy
msgid "Note title"
msgstr "Titel på anteckningsbok:"
msgstr "Rubriken"
#, fuzzy
msgid "Note body"
msgstr "Anteckningsböcker"
msgstr "Texten"
#, javascript-format
msgid "Importing from \"%s\" as \"%s\" format. Please wait..."
@@ -650,9 +647,8 @@ msgstr "Klipp ut"
msgid "Paste"
msgstr "Klistra in"
#, fuzzy
msgid "Select all"
msgstr "Välj datum"
msgstr "Välj alla"
msgid "Bold"
msgstr "Fet"
@@ -661,7 +657,7 @@ msgid "Italic"
msgstr "Kursiv"
msgid "Link"
msgstr ""
msgstr "Länk"
msgid "Insert Date Time"
msgstr "Infoga datumtid"
@@ -672,9 +668,8 @@ msgstr "Redigera i extern redigerare"
msgid "Search in all the notes"
msgstr "Sök i alla anteckningarna"
#, fuzzy
msgid "Search in current note"
msgstr "Sök i alla anteckningarna"
msgstr "Sök i aktuell anteckning"
msgid "View"
msgstr "Visa"
@@ -685,9 +680,8 @@ msgstr "Växla sidofältet"
msgid "Toggle editor layout"
msgstr "Växla redigeringslayout"
#, fuzzy
msgid "Focus"
msgstr "Fokus på huvuddel"
msgstr "Fokus"
msgid "Tools"
msgstr "Verktyg"
@@ -741,18 +735,18 @@ msgstr "Nuvarande version är uppdaterad."
#, javascript-format
msgid "%s (pre-release)"
msgstr ""
msgstr "%s (förhandsversion)"
msgid "An update is available, do you want to download it now?"
msgstr "En uppdatering är tillgänglig, vill du hämta den nu?"
#, javascript-format
msgid "Your version: v%s"
msgstr ""
msgstr "Din version: v%s"
#, javascript-format
msgid "New version: v%s"
msgstr ""
msgstr "Ny version: v%s"
msgid "Yes"
msgstr "Ja"
@@ -761,7 +755,7 @@ msgid "No"
msgstr "Nej"
msgid "Token has been copied to the clipboard!"
msgstr ""
msgstr "Token har kopierats till urklipp!"
msgid "The web clipper service is enabled and set to auto-start."
msgstr "Web clipper-tjänsten är aktiverad och inställd för automatisk start."
@@ -811,27 +805,28 @@ msgstr "Steg 2: Installera tillägget"
msgid "Download and install the relevant extension for your browser:"
msgstr "Hämta och installera det relevanta tillägget för din webbläsare:"
#, fuzzy
msgid "Advanced options"
msgstr "Visa avancerade inställningar"
msgstr "Avancerade alternativ"
msgid "Authorisation token:"
msgstr ""
msgstr "Auktoriserings token:"
msgid "Copy token"
msgstr ""
msgstr "Kopiera token"
msgid ""
"This authorisation token is only needed to allow third-party applications to "
"access Joplin."
msgstr ""
"Denna auktorisering behövs endast för att tillåta tredjepartsprogram att "
"integrera med Joplin."
#, javascript-format
msgid "Notes and settings are stored in: %s"
msgstr "Anteckningar och inställningar lagras i: %s"
msgid "Browse..."
msgstr ""
msgstr "Bläddra..."
msgid "Check synchronisation configuration"
msgstr "Kontrollera synkroniseringskonfigurationen"
@@ -930,9 +925,8 @@ msgstr "Tillstånd"
msgid "Encryption is:"
msgstr "Kryptering är:"
#, fuzzy
msgid "Usage"
msgstr "Användning: %s"
msgstr "Användning"
msgid "Back"
msgstr "Tillbaka"
@@ -996,13 +990,13 @@ msgstr ""
"\"Ny anteckningsbok\"."
msgid "Location"
msgstr ""
msgstr "Plats"
msgid "URL"
msgstr ""
msgstr "URL"
msgid "Note properties"
msgstr ""
msgstr "Anteckningens egenskaper"
msgid "Open..."
msgstr "Öppna..."
@@ -1021,7 +1015,7 @@ msgid "Copy Link Address"
msgstr "Kopiera länkadress"
msgid "This attachment is not downloaded or not decrypted yet."
msgstr ""
msgstr "Denna bilaga är inte nedladdad eller ännu inte dekrypterad."
#, javascript-format
msgid "Unsupported link or message: %s"
@@ -1037,6 +1031,7 @@ msgstr ""
msgid "Only one note can be printed or exported to PDF at a time."
msgstr ""
"Endast en anteckning i taget kan bli utskriven eller exporterad till PDF."
msgid "strong text"
msgstr "stark text"
@@ -1146,13 +1141,45 @@ msgstr "Anteckningsböcker"
msgid "Decrypting items: %d/%d"
msgstr "Dekrypterar objekt: %d/%d"
#, fuzzy, javascript-format
#, javascript-format
msgid "Fetching resources: %d"
msgstr "Resurser: %d."
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 "Add or remove tags"
msgstr "Lägg till eller ta bort taggar"
msgid "Duplicate"
msgstr "Duplikat"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - Kopiera"
msgid "Switch between note and to-do type"
msgstr "Växla mellan antecknings- och att-göra-typ"
#, fuzzy
msgid "Switch to note type"
msgstr "Växla mellan antecknings- och att-göra-typ"
#, fuzzy
msgid "Switch to to-do type"
msgstr "Växla mellan antecknings- och att-göra-typ"
msgid "Copy Markdown link"
msgstr "Kopiera Markdown-länk"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "Ta bort anteckningar?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "Ta bort dessa anteckningar?"
#, javascript-format
msgid "Usage: %s"
msgstr "Användning: %s"
@@ -1289,7 +1316,7 @@ msgid "updated date"
msgstr "uppdaterad datum"
msgid "created date"
msgstr "Skapad datum"
msgstr "skapad datum"
msgid "This note does not have geolocation information."
msgstr "Denna anteckning har inte geolokaliseringsinformation."
@@ -1358,16 +1385,18 @@ msgid ""
"this setting so that your notes are constantly being synchronised, thus "
"reducing the number of conflicts."
msgstr ""
"Detta tillåter Joplin att köra i bakgrunden. Det är rekommenderat att "
"tillåta detta så att anteckningarna synkroniseras löpande. På det sättet "
"minskas risken för konflikter."
msgid "Start application minimised in the tray icon"
msgstr ""
msgstr "Starta programmet minimerat"
msgid "Global zoom percentage"
msgstr "Global zoomprocent"
#, fuzzy
msgid "Editor font size"
msgstr "Redigerarens typsnittsfamilj"
msgstr "Redigerarens teckenstorlek"
msgid "Editor font family"
msgstr "Redigerarens typsnittsfamilj"
@@ -1384,11 +1413,11 @@ msgid "Automatically update the application"
msgstr "Uppdatera programmet automatiskt"
msgid "Get pre-releases when checking for updates"
msgstr ""
msgstr "Inkludera även förhandsversionen vid uppdateringar"
#, javascript-format
msgid "See the pre-release page for more details: %s"
msgstr ""
msgstr "Se sidan för förhandsversioner för mer information: %s"
msgid "Synchronisation interval"
msgstr "Synkroniseringsintervall"
@@ -1448,6 +1477,9 @@ msgid ""
"to it before syncing, otherwise all files will be removed! See the FAQ for "
"more details: %s"
msgstr ""
"OBS! Om du ändrar denna plats så se till att du har en kopia på allt "
"innehåll innan du synkroniserar. Annars kommer samtliga filer att raderas. "
"Läs FAQ för mer information: %s"
msgid "Nextcloud username"
msgstr "Nextcloud-användarnamn"
@@ -1490,24 +1522,21 @@ msgstr "Ogiltigt inställningsvärde: \"%s\". Möjliga värden är: %s."
msgid "General"
msgstr "Allmänna inställningar"
#, fuzzy
msgid "Synchronisation"
msgstr "Synkroniseringstillstånd"
msgstr "Synkronisering"
msgid "Appearance"
msgstr ""
msgstr "Utseende"
#, fuzzy
msgid "Note"
msgstr "Anteckningsböcker"
msgstr "Anteckning"
#, fuzzy
msgid "Application"
msgstr "Avslutar programmet."
msgstr "Avslutar programmet"
#, javascript-format
msgid "The tag \"%s\" already exists. Please choose a different name."
msgstr ""
msgstr "Taggen \"%s\" finns redan. Välj ett annat namn."
msgid "Joplin Export File"
msgstr "Joplin-exporteringsfil"
@@ -1521,9 +1550,8 @@ msgstr "Joplin-exporteringskatalog"
msgid "Evernote Export File"
msgstr "Evernote-exporteringsfil"
#, fuzzy
msgid "Json Export Directory"
msgstr "Joplin-exporteringskatalog"
msgstr "Joplin-exportkatalog"
msgid "Directory"
msgstr "Katalog"
@@ -1600,10 +1628,10 @@ msgid "On %s: %s"
msgstr "På %s: %s"
msgid "Permission to use camera"
msgstr ""
msgstr "Tillåtelse att använda kameran"
msgid "Your permission to use your camera is required."
msgstr ""
msgstr "Du måste ge tillåtelse att använda kameran."
msgid "There are currently no notes. Create one by clicking on the (+) button."
msgstr ""
@@ -1635,9 +1663,8 @@ msgstr "Flytta %d anteckningar till anteckningsboken \"%s\"?"
msgid "Press to set the decryption password."
msgstr "Tryck för att ställa in dekrypteringslösenordet."
#, fuzzy
msgid "Clear alarm"
msgstr "Sätt alarm"
msgstr "Ta bort alarm"
msgid "Save alarm"
msgstr "Spara alarm"
@@ -1651,22 +1678,21 @@ msgstr "Bekräfta"
msgid "Cancel synchronisation"
msgstr "Avbryt synkronisering"
#, fuzzy
msgid "Checking... Please wait."
msgstr "Avbryter... vänta."
msgstr "Kontrollerar... vänta."
#, fuzzy
msgid "Success! Synchronisation configuration appears to be correct."
msgstr "Kontrollera synkroniseringskonfigurationen"
msgstr "Lyckades! Synkroniseringsinställningarna verkar vara korrekta."
msgid ""
"Error. Please check that URL, username, password, etc. are correct and that "
"the sync target is accessible. The reported error was:"
msgstr ""
"Fel. Verifiera att URL, användarnamn, lösenord etc. är korrekta och att "
"destinationen är tillgänglig. Rapporterat fel var:"
#, fuzzy
msgid "The application has been authorised!"
msgstr "Programmet har godkänts."
msgstr "Programmet har blivit godkänt!"
#, javascript-format
msgid ""
@@ -1676,10 +1702,15 @@ msgid ""
"\n"
"Please try again."
msgstr ""
"Kunde inte auktorisera programmet:\n"
"\n"
"%s\n"
"\n"
"Försök igen."
#, fuzzy, javascript-format
#, javascript-format
msgid "Decrypted items: %s / %s"
msgstr "Dekrypterar objekt: %d/%d"
msgstr "Antal dekrypterade objekt: %s / %s"
msgid "New tags:"
msgstr "Nya taggar:"
@@ -1714,23 +1745,23 @@ msgstr ""
msgid "Joplin website"
msgstr "Joplin-webbplats"
#, fuzzy, javascript-format
#, javascript-format
msgid "Joplin v%s"
msgstr "Joplin-webbplats"
msgstr "Joplin v%s"
#, javascript-format
msgid "Database v%s"
msgstr ""
msgstr "Databas v%s"
#, fuzzy, javascript-format
#, javascript-format
msgid "FTS enabled: %d"
msgstr "För att ta bort: %d"
msgstr "FTS aktiverat: %d"
msgid "Login with Dropbox"
msgstr "Logga in med Dropbox"
msgid "Enter code here"
msgstr ""
msgstr "Ange kod här"
#, javascript-format
msgid "Master Key %s"
@@ -1784,9 +1815,8 @@ msgstr ""
msgid "Unsupported image type: %s"
msgstr "Bildstorlek som inte stöds: %s"
#, fuzzy
msgid "Take photo"
msgstr "Bifoga foto"
msgstr "Ta ett foto"
msgid "Attach photo"
msgstr "Bifoga foto"
@@ -1803,9 +1833,6 @@ msgstr "Konvertera till anteckning"
msgid "Convert to todo"
msgstr "Konvertera till att-göra"
msgid "Copy Markdown link"
msgstr "Kopiera Markdown-länk"
msgid "Hide metadata"
msgstr "Dölj metadata"
@@ -1816,7 +1843,7 @@ msgid "View on map"
msgstr "Visa på karta"
msgid "Go to source URL"
msgstr ""
msgstr "Gå till källans URL"
msgid "Delete notebook"
msgstr "Ta bort anteckningsbok"
@@ -1843,29 +1870,6 @@ msgstr ""
msgid "Welcome"
msgstr "Välkommen"
#~ msgid "Add or remove tags"
#~ msgstr "Lägg till eller ta bort taggar"
#~ msgid "Duplicate"
#~ msgstr "Duplikat"
#~ msgid "%s - Copy"
#~ msgstr "%s - Kopiera"
#~ msgid "Switch between note and to-do type"
#~ msgstr "Växla mellan antecknings- och att-göra-typ"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "Växla mellan antecknings- och att-göra-typ"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "Växla mellan antecknings- och att-göra-typ"
#~ msgid "Delete notes?"
#~ msgstr "Ta bort anteckningar?"
#~ msgid "State: %s."
#~ msgstr "Tillstånd: %s."

1792
CliClient/locales/tr_TR.po Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1088,6 +1088,36 @@ msgstr "获取资源:%d。"
msgid "Please select where the sync status should be exported to"
msgstr "请选择同步状态的导出位置"
msgid "Add or remove tags"
msgstr "添加或删除标签"
msgid "Duplicate"
msgstr "重复的"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - 副本"
msgid "Switch between note and to-do type"
msgstr "在笔记和待办事项类型之间切换"
msgid "Switch to note type"
msgstr "切换到笔记"
msgid "Switch to to-do type"
msgstr "切换到待办事项"
msgid "Copy Markdown link"
msgstr "复制 Markdown 链接"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "是否删除笔记?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "是否删除这些笔记?"
#, javascript-format
msgid "Usage: %s"
msgstr "使用:%s"
@@ -1715,9 +1745,6 @@ msgstr "转换到笔记"
msgid "Convert to todo"
msgstr "转换到待办事项"
msgid "Copy Markdown link"
msgstr "复制 Markdown 链接"
msgid "Hide metadata"
msgstr "隐藏元数据"
@@ -1750,27 +1777,6 @@ msgstr "您目前未有笔记本。点击 (+) 按钮创建。"
msgid "Welcome"
msgstr "欢迎"
#~ msgid "Add or remove tags"
#~ msgstr "添加或删除标签"
#~ msgid "Duplicate"
#~ msgstr "重复的"
#~ msgid "%s - Copy"
#~ msgstr "%s - 副本"
#~ msgid "Switch between note and to-do type"
#~ msgstr "在笔记和待办事项类型之间切换"
#~ msgid "Switch to note type"
#~ msgstr "切换到笔记"
#~ msgid "Switch to to-do type"
#~ msgstr "切换到待办事项"
#~ msgid "Delete notes?"
#~ msgstr "是否删除笔记?"
#~ msgid "State: %s."
#~ msgstr "状态:%s。"

View File

@@ -1096,6 +1096,38 @@ msgstr "資源: %d。"
msgid "Please select where the sync status should be exported to"
msgstr "請選擇將同步狀態導出到的位置"
msgid "Add or remove tags"
msgstr "新增或移除標籤"
msgid "Duplicate"
msgstr "新增複本"
#, javascript-format
msgid "%s - Copy"
msgstr "%s - 複本"
msgid "Switch between note and to-do type"
msgstr "切換到記事 / 待辦事項"
#, fuzzy
msgid "Switch to note type"
msgstr "切換到記事 / 待辦事項"
#, fuzzy
msgid "Switch to to-do type"
msgstr "切換到記事 / 待辦事項"
msgid "Copy Markdown link"
msgstr "複製 Markdown 連結"
#, fuzzy, javascript-format
msgid "Delete note \"%s\"?"
msgstr "刪除此記事?"
#, fuzzy, javascript-format
msgid "Delete these %d notes?"
msgstr "刪除這些記事?"
#, javascript-format
msgid "Usage: %s"
msgstr "使用資訊: %s"
@@ -1724,9 +1756,6 @@ msgstr "轉換為記事"
msgid "Convert to todo"
msgstr "轉換為待辦事項"
msgid "Copy Markdown link"
msgstr "複製 Markdown 連結"
msgid "Hide metadata"
msgstr "隱藏後設資料 (metadata)"
@@ -1759,29 +1788,6 @@ msgstr "您當前沒有任何筆記本。通過按一下 (+) 鍵去建立一本
msgid "Welcome"
msgstr "歡迎"
#~ msgid "Add or remove tags"
#~ msgstr "新增或移除標籤"
#~ msgid "Duplicate"
#~ msgstr "新增複本"
#~ msgid "%s - Copy"
#~ msgstr "%s - 複本"
#~ msgid "Switch between note and to-do type"
#~ msgstr "切換到記事 / 待辦事項"
#, fuzzy
#~ msgid "Switch to note type"
#~ msgstr "切換到記事 / 待辦事項"
#, fuzzy
#~ msgid "Switch to to-do type"
#~ msgstr "切換到記事 / 待辦事項"
#~ msgid "Delete notes?"
#~ msgstr "刪除此記事?"
#~ msgid "State: %s."
#~ msgstr "狀態: %s。"

View File

@@ -1,6 +1,6 @@
{
"name": "joplin",
"version": "1.0.122",
"version": "1.0.123",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -20,7 +20,7 @@
],
"owner": "Laurent Cozic"
},
"version": "1.0.122",
"version": "1.0.123",
"bin": {
"joplin": "./main.js"
},

View File

@@ -4,6 +4,7 @@ const { time } = require('lib/time-utils.js');
const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
const Folder = require('lib/models/Folder.js');
const Note = require('lib/models/Note.js');
const NoteTag = require('lib/models/NoteTag.js');
const Tag = require('lib/models/Tag.js');
const BaseModel = require('lib/BaseModel.js');
const { shim } = require('lib/shim');
@@ -42,4 +43,18 @@ describe('models_Tag', function() {
expect(hasThrown).toBe(true);
}));
it('should not return tags without notes', asyncTest(async () => {
let folder1 = await Folder.save({ title: "folder1" });
let note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
await Tag.setNoteTagsByTitles(note1.id, ['un']);
let tags = await Tag.allWithNotes();
expect(tags.length).toBe(1);
await Note.delete(note1.id);
tags = await Tag.allWithNotes();
expect(tags.length).toBe(0);
}));
});

View File

@@ -312,7 +312,7 @@ class NoteListComponent extends React.Component {
event.preventDefault();
}
if (noteIds.length && keyCode === 46) { // DELETE
if (noteIds.length && (keyCode === 46 || (keyCode === 8 && event.metaKey))) { // DELETE / CMD+Backspace
event.preventDefault();
await NoteListUtils.confirmDeleteNotes(noteIds);
}

View File

@@ -481,11 +481,13 @@ class NoteTextComponent extends React.Component {
if (this.props.newNote) {
const focusSettingName = !!note.is_todo ? 'newTodoFocus' : 'newNoteFocus';
if (Setting.value(focusSettingName) === 'title') {
if (this.titleField_) this.titleField_.focus();
} else {
if (this.editor_) this.editor_.editor.focus();
}
requestAnimationFrame(() => {
if (Setting.value(focusSettingName) === 'title') {
if (this.titleField_) this.titleField_.focus();
} else {
if (this.editor_) this.editor_.editor.focus();
}
});
}
if (this.editor_) {
@@ -791,7 +793,9 @@ class NoteTextComponent extends React.Component {
webviewReady: true,
});
// if (Setting.value('env') === 'dev') this.webview_.openDevTools();
if (Setting.value('env') === 'dev') {
// this.webviewRef_.current.wrappedInstance.openDevTools();
}
}
editor_ref(element) {
@@ -1081,7 +1085,7 @@ class NoteTextComponent extends React.Component {
setTimeout(() => {
if (target === 'pdf') {
this.webviewRef_.current.wrappedInstance.printToPDF({}, (error, data) => {
this.webviewRef_.current.wrappedInstance.printToPDF({ printBackground: true }, (error, data) => {
restoreSettings();
if (error) {
@@ -1091,7 +1095,7 @@ class NoteTextComponent extends React.Component {
}
});
} else if (target === 'printer') {
this.webviewRef_.current.wrappedInstance.print();
this.webviewRef_.current.wrappedInstance.print({ printBackground: true });
restoreSettings();
}
}, 100);

View File

@@ -64,6 +64,10 @@ class NoteTextViewerComponent extends React.Component {
this.destroyWebview();
}
// ----------------------------------------------------------------
// Wrap WebView functions
// ----------------------------------------------------------------
send(channel, arg0 = null, arg1 = null, arg2 = null, arg3 = null) {
return this.webviewRef_.current.send(channel, arg0, arg1, arg2, arg3);
}
@@ -76,6 +80,14 @@ class NoteTextViewerComponent extends React.Component {
return this.webviewRef_.current.print(options);
}
openDevTools() {
return this.webviewRef_.current.openDevTools();
}
// ----------------------------------------------------------------
// Wrap WebView functions (END)
// ----------------------------------------------------------------
render() {
return <webview
ref={this.webviewRef_}

View File

@@ -666,7 +666,7 @@ class SideBarComponent extends React.Component {
});
let items = [];
items.push(this.makeHeader("folderHeader", _("Notebooks"), "fa-folder-o", {
items.push(this.makeHeader("folderHeader", _("Notebooks"), "fa-book", {
onDrop: this.onFolderDrop_,
folderid: '',
toggleblock: 1

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -20,6 +20,7 @@ locales['ro'] = require('./ro.json');
locales['ru_RU'] = require('./ru_RU.json');
locales['sl_SI'] = require('./sl_SI.json');
locales['sv'] = require('./sv.json');
locales['tr_TR'] = require('./tr_TR.json');
locales['zh_CN'] = require('./zh_CN.json');
locales['zh_TW'] = require('./zh_TW.json');
module.exports = { locales: locales };

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "1.0.126",
"version": "1.0.127",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "1.0.126",
"version": "1.0.127",
"description": "Joplin for Desktop",
"main": "main.js",
"scripts": {

View File

@@ -22,6 +22,26 @@ table td, table th {
border: 1px solid #ccc;
}
::-webkit-scrollbar {
width: 7px;
}
::-webkit-scrollbar-track {
border: none;
}
::-webkit-scrollbar-thumb {
background: rgba(100, 100, 100, 0.3);
border-radius: 5px;
}
::-webkit-scrollbar-track:hover {
background: rgba(0, 0, 0, 0.1);
}
::-webkit-scrollbar-thumb:hover {
background: rgba(100, 100, 100, 0.7);
}
/* By default, the Ice Editor displays invalid characters, such as non-breaking spaces
as red boxes, but since those are actually valid characters and common in imported
Evernote data, we hide them here. */

View File

@@ -107,9 +107,9 @@ const darkStyle = {
selectedColor: '#333333',
urlColor: '#4E87EE',
backgroundColor2: "#162B3D",
backgroundColor2: "#181A1D",
color2: "#ffffff",
selectedColor2: "#0269C2",
selectedColor2: "#333333",
colorError2: "#ff6c6c",
raisedBackgroundColor: "#474747",

View 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.236/joplin-v1.0.236.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.237/joplin-v1.0.237.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,29 +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 | 25%
![](https://joplin.cozic.net/images/flags/es/catalonia.png) | Catalan | [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po) | jmontane, 2018 | 10%
![](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) | 33%
![](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) | 17%
![](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. | 15%
![](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) | 2%
![](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/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) | 6%
![](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 | 0%
![](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) | 17%
![](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) | | 5%
![](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) | | 26%
![](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) | 6%
![](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) | 1%
![](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) | 2%
![](https://joplin.cozic.net/images/flags/country-4x3/ro.png) | Română | [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po) | | 38%
![](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) | | 17%
![](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) | 7%
![](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) | 14%
![](https://joplin.cozic.net/images/flags/country-4x3/cn.png) | 中文 (简体) | [zh_CN](https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po) | | 0%
![](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) | 6%
![](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) | 2%
![](https://joplin.cozic.net/images/flags/country-4x3/kr.png) | 한국말 | [ko](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ko.po) | | 1%
![](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/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%
<!-- 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 2097472
versionName "1.0.236"
versionCode 2097473
versionName "1.0.237"
ndk {
abiFilters "armeabi-v7a", "x86"
}

View File

@@ -299,6 +299,7 @@ class BaseApplication {
const result = next(action);
const newState = store.getState();
let refreshNotes = false;
let refreshTags = false;
let refreshNotesUseSelectedNoteId = false;
reduxSharedMiddleware(store, next, action);
@@ -336,10 +337,21 @@ class BaseApplication {
refreshNotes = 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 ((action.type == 'SETTING_UPDATE_ONE' && (action.key == 'dateFormat' || action.key == 'timeFormat')) || (action.type == 'SETTING_UPDATE_ALL')) {
time.setDateFormat(Setting.value('dateFormat'));
time.setTimeFormat(Setting.value('timeFormat'));

View File

@@ -535,8 +535,22 @@ class MdToHtml {
background-color: ` + style.htmlBackgroundColor + `;
font-family: ` + fontFamily + `;
padding-bottom: ` + options.paddingBottom + `;
/* So that, for example, highlighted text or background images are printed too, otherwise browsers tend not to print these things */
-webkit-print-color-adjust: exact;
}
::-webkit-scrollbar {
width: 7px;
}
::-webkit-scrollbar-track {
border: none;
}
::-webkit-scrollbar-thumb {
background: rgba(100, 100, 100, 0.3);
border-radius: 5px;
}
::-webkit-scrollbar-track:hover {
background: rgba(0, 0, 0, 0.1);
}
::-webkit-scrollbar-thumb:hover {
background: rgba(100, 100, 100, 0.7);
}
p, h1, h2, h3, h4, h5, h6, ul, table {
margin-top: .6em;
@@ -554,7 +568,6 @@ class MdToHtml {
h2 {
font-size: 1.3em;
font-weight: bold;
/ *border-bottom: 1px solid ` + style.htmlDividerColor + `;
padding-bottom: .1em; */
}
h3 {
@@ -575,6 +588,7 @@ class MdToHtml {
margin-bottom: .4em;
}
li p {
margin-top: 0.2em;
margin-bottom: 0;
}
.resource-icon {
@@ -589,23 +603,6 @@ class MdToHtml {
/* Awesome Font file */
-webkit-mask: url("data:image/svg+xml;utf8,<svg viewBox='0 0 1536 1892' xmlns='http://www.w3.org/2000/svg'><path d='M288 128C129 128 0 257 0 416v960c0 159 129 288 288 288h960c159 0 288-129 288-288V416c0-159-129-288-288-288H288zm449.168 236.572l263.434.565 263.431.562.584 73.412.584 73.412-42.732 1.504c-23.708.835-47.002 2.774-52.322 4.36-14.497 4.318-23.722 12.902-29.563 27.51l-5.12 12.802-1.403 291.717c-1.425 295.661-1.626 302.586-9.936 343.043-15.2 74-69.604 150.014-142.197 198.685-58.287 39.08-121.487 60.47-208.155 70.45-22.999 2.648-122.228 2.636-141.976-.024l-.002.006c-69.785-9.377-108.469-20.202-154.848-43.332-85.682-42.73-151.778-116.991-177.537-199.469-10.247-32.81-11.407-40.853-11.375-78.754.026-31.257.76-39.15 5.024-54.043 8.94-31.228 20.912-51.733 43.56-74.62 27.312-27.6 55.812-40.022 95.524-41.633 37.997-1.542 63.274 5.024 87.23 22.66 15.263 11.235 30.828 33.238 39.537 55.884 5.52 14.355 5.949 18.31 7.549 69.569 1.675 53.648 3.05 63.99 11.674 87.785 11.777 32.499 31.771 55.017 61.46 69.22 26.835 12.838 47.272 16.785 80.56 15.56 21.646-.798 30.212-2.135 43.208-6.741 38.682-13.708 70.96-44.553 86.471-82.635 16.027-39.348 15.995-38.647 15.947-361.595-.042-283.26-.09-286.272-4.568-296.153-10.958-24.171-22.488-28.492-81.074-30.377l-42.969-1.38v-147.95z'/></svg>");
}
a.checkbox {
display: inline-block;
position: relative;
top: .5em;
text-decoration: none;
width: 1.65em; /* Need to cut a bit the right border otherwise the SVG will display a black line */
height: 1.7em;
margin-right: .3em;
background-color: ` + style.htmlColor + `;
/* Awesome Font square-o */
-webkit-mask: url("data:image/svg+xml;utf8,<svg viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'><path d='M1312 256h-832q-66 0-113 47t-47 113v832q0 66 47 113t113 47h832q66 0 113-47t47-113v-832q0-66-47-113t-113-47zm288 160v832q0 119-84.5 203.5t-203.5 84.5h-832q-119 0-203.5-84.5t-84.5-203.5v-832q0-119 84.5-203.5t203.5-84.5h832q119 0 203.5 84.5t84.5 203.5z'/></svg>");
}
a.checkbox.tick {
left: .1245em; /* square-o and check-square-o aren't exactly aligned so add this extra gap to align them */
/* Awesome Font check-square-o */
-webkit-mask: url("data:image/svg+xml;utf8,<svg viewBox='0 0 1792 1792' xmlns='http://www.w3.org/2000/svg'><path d='M1472 930v318q0 119-84.5 203.5t-203.5 84.5h-832q-119 0-203.5-84.5t-84.5-203.5v-832q0-119 84.5-203.5t203.5-84.5h832q63 0 117 25 15 7 18 23 3 17-9 29l-49 49q-10 10-23 10-3 0-9-2-23-6-45-6h-832q-66 0-113 47t-47 113v832q0 66 47 113t113 47h832q66 0 113-47t47-113v-254q0-13 9-22l64-64q10-10 23-10 6 0 12 3 20 8 20 29zm231-489l-814 814q-24 24-57 24t-57-24l-430-430q-24-24-24-57t24-57l110-110q24-24 57-24t57 24l263 263 647-647q24-24 57-24t57 24l110 110q24 24 24 57t-24 57z'/></svg>");
}
blockquote {
border-left: 4px solid ` + style.htmlCodeBorderColor + `;
padding-left: 1.2em;
@@ -635,6 +632,9 @@ class MdToHtml {
tr:nth-child(even) {
background-color: ` + style.htmlTableBackgroundColor + `;
}
tr:hover {
background-color: ` + style.raisedBackgroundColor + `;
}
hr {
border: none;
border-bottom: 2px solid ` + style.htmlDividerColor + `;
@@ -660,23 +660,41 @@ class MdToHtml {
/*
This is to fix https://github.com/laurent22/joplin/issues/764
Without this, the tag attached to an equation float at an absoluate position of the page,
Without this, the tag attached to an equation float at an absolute position of the page,
instead of a position relative to the container.
*/
.katex-display>.katex>.katex-html {
position: relative;
}
a.checkbox {
border: 1pt solid ` + style.htmlColor + `;
border-radius: 2pt;
width: 1.1em;
height: 1.1em;
background-color: rgba(0,0,0,0);
text-decoration: none;
display: inline-flex;
align-items: center;
justify-content: center;
position: relative;
top: -0.3em;
margin-right: 0.3em;
}
a.checkbox.tick:after {
content: "✓";
}
a.checkbox.tick {
color: ` + style.htmlColor + `;
}
@media print {
body {
height: auto !important;
}
a.checkbox.tick {
/* Checkbox ticks are displayed upside down when printed for some reason */
transform: scaleY(-1);
}
pre {
white-space: pre-wrap;
}
@@ -690,26 +708,6 @@ 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.
// a.checkbox {
// border: 1pt solid ` + style.htmlColor + `;
// border-radius: 2pt;
// width: 1em;
// height: 1em;
// line-height: 1em;
// text-align: center;
// top: .4em;
// }
// a.checkbox.tick:after {
// content: "X";
// }
// a.checkbox.tick {
// top: 0;
// left: -0.02em;
// color: ` + style.htmlColor + `;
// }
const styleHtml = '<style>' + normalizeCss + "\n" + css + '</style>';
const output = styleHtml + renderedBody;

View File

@@ -2,6 +2,7 @@ const BaseModel = require('lib/BaseModel.js');
const { sprintf } = require('sprintf-js');
const BaseItem = require('lib/models/BaseItem.js');
const ItemChange = require('lib/models/ItemChange.js');
const Resource = require('lib/models/Resource.js');
const Setting = require('lib/models/Setting.js');
const { shim } = require('lib/shim.js');
const { pregQuote } = require('lib/string-utils.js');

View File

@@ -91,7 +91,8 @@ class Tag extends BaseItem {
}
static async allWithNotes() {
return await Tag.modelSelectAll('SELECT * FROM tags WHERE id IN (SELECT DISTINCT tag_id FROM note_tags)');
const tagIdSql = 'select distinct tags.id from tags left join note_tags nt on nt.tag_id = tags.id left join notes on notes.id = nt.note_id where notes.id IS NOT NULL';
return await Tag.modelSelectAll('SELECT * FROM tags WHERE id IN (' + tagIdSql + ')');
}
static async tagsByNoteId(noteId) {

View File

@@ -639,6 +639,10 @@ const reducer = (state = defaultState, action) => {
newState = Object.assign({}, state);
newState.newNote = action.item;
if (newState.selectedNoteIds.length > 1) {
newState.selectedNoteIds = newState.selectedNoteIds.slice();
newState.selectedNoteIds = [newState.selectedNoteIds[0]];
}
break;
case 'CLIPPER_SERVER_SET':

View File

@@ -3,7 +3,7 @@ module.exports = {
{
"id": "8a1556e382704160808e9a7bef7135d3",
"title": "1. Welcome to Joplin! 🗒️",
"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 **💻 desktop**, **📱 mobile** and **🔡 terminal** applications.\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, and they are not the 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**: It contains the list of your notebooks and tags, as well as the synchronisation status.\n- **Note List**: It contains the current list of notes - either the notes in the currently selected notebook, or the notes in the currently selected tag.\n- **Note Editor**: The note editor contains of course an actual editor, where your write your note in Markdown, and a viewer, which shows the rendered note. To edit notes, you may also use an [external editor](https://joplin.cozic.net/#external-text-editor). 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 image.\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 an horizontal rule:\n\n* * *\n\nA lot more is possible including adding code samples, math formulaes 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 each one by a comma.\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).",
"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"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -20,6 +20,7 @@ locales['ro'] = require('./ro.json');
locales['ru_RU'] = require('./ru_RU.json');
locales['sl_SI'] = require('./sl_SI.json');
locales['sv'] = require('./sv.json');
locales['tr_TR'] = require('./tr_TR.json');
locales['zh_CN'] = require('./zh_CN.json');
locales['zh_TW'] = require('./zh_TW.json');
module.exports = { locales: locales };

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -137,9 +137,9 @@ async function translationStatus(isDefault, poFile) {
// "apt install translate-toolkit" to have pocount
const command = 'pocount "' + poFile + '"';
const result = await execCommand(command);
const matches = result.match(/translated:\s*?(\d+)\s*\((.+?)%\)/);
if (matches.length < 3) throw new Error('Cannot extract status: ' + command + ':\n' + result);
const matches = result.match(/Translated:\s*?(\d+)\s*\((.+?)%\)/);
if (!matches || matches.length < 3) throw new Error('Cannot extract status: ' + command + ':\n' + result);
const percentDone = Number(matches[2]);
if (isNaN(percentDone)) throw new Error('Cannot extract percent translated: ' + command + ':\n' + result);
@@ -213,6 +213,7 @@ async function main() {
cliDir + '/app/gui/*.js',
electronDir + '/*.js',
electronDir + '/gui/*.js',
electronDir + '/gui/utils/*.js',
rnDir + '/lib/*.js',
rnDir + '/lib/models/*.js',
rnDir + '/lib/services/*.js',

View File

@@ -415,6 +415,7 @@
<li><a href="https://owncloud.org/">OwnCloud</a></li>
<li><a href="https://www.seafile.com/">Seafile</a></li>
<li><a href="https://www.transip.nl/stack/">Stack</a></li>
<li><a href="https://www.schimera.com/products/webdav-nav-server/">WebDAV Nav</a>, a macOS server.</li>
<li><a href="https://www.zimbra.com/">Zimbra</a></li>
</ul>
<h2 id="onedrive-synchronisation">OneDrive synchronisation</h2>
@@ -478,7 +479,7 @@ $$
<p>It is generally recommended to enter the notes as Markdown as it makes the notes easier to edit. However for cases where certain features aren&#39;t supported (such as strikethrough or to highlight text), you can also use HTML code directly. For example this would be a valid note:</p>
<pre><code>This is &lt;s&gt;strikethrough text&lt;/s&gt; mixed with regular **Markdown**.
</code></pre><h2 id="custom-css">Custom CSS</h2>
<p>Rendered markdown can be customized by placing a userstyle file in the profile directory <code>~/.config/joplin-desktop/userstyle.css</code> (This path might be different on your device - check at the top of the Config screen for the exact path). This file supports standard CSS syntax.</p>
<p>Rendered markdown can be customized by placing a userstyle file in the profile directory <code>~/.config/joplin-desktop/userstyle.css</code> (This path might be different on your device - check at the top of the Config screen for the exact path). This file supports standard CSS syntax. Note that this file is used only when display the notes, <strong>not when printing or exporting to PDF</strong>. This is because printing has a lot more restrictions (for example, printing white text over a black background is usually not wanted), so special rules are applied to make it look good when printing, and a userstyle.css would interfer with that.</p>
<h1 id="searching">Searching</h1>
<p>Joplin implements the SQLite Full Text Search (FTS4) extension. It means the content of all the notes is indexed in real time and search queries return results very fast. Both <a href="https://www.sqlite.org/fts3.html#simple_fts_queries">Simple FTS Queries</a> and <a href="https://www.sqlite.org/fts3.html#full_text_index_queries">Full-Text Index Queries</a> are supported. See below for the list of supported queries:</p>
<table>
@@ -614,21 +615,21 @@ $$
<td>Français</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po">fr_FR</a></td>
<td>Laurent Cozic</td>
<td>97%</td>
<td>100%</td>
</tr>
<tr>
<td><img src="https://joplin.cozic.net/images/flags/es/galicia.png" alt=""></td>
<td>Galician</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po">gl_ES</a></td>
<td>Marcos Lans (marcoslansgarza@gmail.com)</td>
<td>74%</td>
<td>73%</td>
</tr>
<tr>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/it.png" alt=""></td>
<td>Italiano</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po">it_IT</a></td>
<td></td>
<td>91%</td>
<td>90%</td>
</tr>
<tr>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/be.png" alt=""></td>
@@ -691,7 +692,7 @@ $$
<td>中文 (简体)</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po">zh_CN</a></td>
<td></td>
<td>95%</td>
<td>99%</td>
</tr>
<tr>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/tw.png" alt=""></td>