@@ -584,10 +584,6 @@ Connection error message: </translation>
584584<translation type =" unfinished" >Icons</translation >
585585</message >
586586<message >
587- <source >You need to restart the application to let this setting take effect</source >
588- <translation type =" unfinished" >You need to restart the application to let this setting take effect</translation >
589- </message >
590- <message >
591587<source >Use internal icon theme instead of system icon theme</source >
592588<translation type =" unfinished" >Use internal icon theme instead of system icon theme</translation >
593589</message >
@@ -651,6 +647,14 @@ Connection error message: </translation>
651647<translation type =" unfinished" >Log file path:</translation >
652648</message >
653649<message >
650+ <source >Script hook execution time warning threshold (ms):</source >
651+ <translation type =" unfinished" >Script hook execution time warning threshold (ms):</translation >
652+ </message >
653+ <message >
654+ <source >Log a warning when a script hook takes longer than this many milliseconds. When debug logging is enabled, all hook times are logged unconditionally.</source >
655+ <translation type =" unfinished" >Log a warning when a script hook takes longer than this many milliseconds. When debug logging is enabled, all hook times are logged unconditionally.</translation >
656+ </message >
657+ <message >
654658<source >Log file cleared</source >
655659<translation type =" unfinished" >Log file cleared</translation >
656660</message >
@@ -1326,10 +1330,18 @@ Connection error message: </translation>
13261330<translation type =" unfinished" >Automatically remove trailing spaces in the note text</translation >
13271331</message >
13281332<message >
1333+ <source >Ensure an empty last line in the note text</source >
1334+ <translation type =" unfinished" >Ensure an empty last line in the note text</translation >
1335+ </message >
1336+ <message >
13291337<source >Show line numbers and bookmark markers (1-9)</source >
13301338<translation type =" unfinished" >Show line numbers and bookmark markers (1-9)</translation >
13311339</message >
13321340<message >
1341+ <source >Show character, word and line count in the status bar</source >
1342+ <translation type =" unfinished" >Show character, word and line count in the status bar</translation >
1343+ </message >
1344+ <message >
13331345<source >Show small Markdown preview images in the editor, if there is no text after the image</source >
13341346<translation type =" unfinished" >Show small Markdown preview images in the editor, if there is no text after the image</translation >
13351347</message >
@@ -2419,22 +2431,34 @@ Just test yourself if you get sync conflicts and set a higher value if so.</tran
24192431<translation type =" unfinished" >Remove selected note file extension</translation >
24202432</message >
24212433<message >
2422- <source >External editor </source >
2423- <translation type =" unfinished" >External editor </translation >
2434+ <source >External tools </source >
2435+ <translation type =" unfinished" >External tools </translation >
24242436</message >
24252437<message >
2426- <source >Path to external editor: </source >
2427- <translation type =" unfinished" >Path to external editor: </translation >
2438+ <source >Path to external editor, leave empty for default </source >
2439+ <translation type =" unfinished" >Path to external editor, leave empty for default </translation >
24282440</message >
24292441<message >
2430- <source >path to external editor, leave empty for default </source >
2431- <translation type =" unfinished" >path to external editor, leave empty for default </translation >
2442+ <source >Path to external editor: </source >
2443+ <translation type =" unfinished" >Path to external editor: </translation >
24322444</message >
24332445<message >
24342446<source >set external editor</source >
24352447<translation type =" unfinished" >set external editor</translation >
24362448</message >
24372449<message >
2450+ <source >Path to external diff tool:</source >
2451+ <translation type =" unfinished" >Path to external diff tool:</translation >
2452+ </message >
2453+ <message >
2454+ <source >Path to external diff tool, leave empty for default</source >
2455+ <translation type =" unfinished" >Path to external diff tool, leave empty for default</translation >
2456+ </message >
2457+ <message >
2458+ <source >set external diff tool</source >
2459+ <translation type =" unfinished" >set external diff tool</translation >
2460+ </message >
2461+ <message >
24382462<source >Clear application data and exit</source >
24392463<translation type =" unfinished" >Clear application data and exit</translation >
24402464</message >
@@ -2507,6 +2531,10 @@ Your notes will stay intact!</translation>
25072531<translation type =" unfinished" >Select editor application</translation >
25082532</message >
25092533<message >
2534+ <source >Select diff tool application</source >
2535+ <translation type =" unfinished" >Select diff tool application</translation >
2536+ </message >
2537+ <message >
25102538<source >File extension</source >
25112539<translation type =" unfinished" >File extension</translation >
25122540</message >
@@ -5521,6 +5549,34 @@ If the trash is enabled on your ownCloud server you should be able to restore th
55215549<translation type =" unfinished" >Click here to see what has changed and to be able to update to the latest version</translation >
55225550</message >
55235551<message >
5552+ <source >Web</source >
5553+ <translation type =" unfinished" >Web</translation >
5554+ </message >
5555+ <message >
5556+ <source >Web app is connected</source >
5557+ <translation type =" unfinished" >Web app is connected</translation >
5558+ </message >
5559+ <message >
5560+ <source >Web app is not connected</source >
5561+ <translation type =" unfinished" >Web app is not connected</translation >
5562+ </message >
5563+ <message >
5564+ <source >Web app connected</source >
5565+ <translation type =" unfinished" >Web app connected</translation >
5566+ </message >
5567+ <message >
5568+ <source >Web app disconnected</source >
5569+ <translation type =" unfinished" >Web app disconnected</translation >
5570+ </message >
5571+ <message >
5572+ <source >Connected systems</source >
5573+ <translation type =" unfinished" >Connected systems</translation >
5574+ </message >
5575+ <message >
5576+ <source >No connected systems</source >
5577+ <translation type =" unfinished" >No connected systems</translation >
5578+ </message >
5579+ <message >
55245580<source >You have to select your Nextcloud / ownCloud notes folder to make this software work!</source >
55255581<translation type =" unfinished" >You have to select your Nextcloud / ownCloud notes folder to make this software work!</translation >
55265582</message >
@@ -5948,6 +6004,15 @@ If the trash is enabled on your ownCloud server you should be able to restore th
59486004<numerusform >%n selected</numerusform >
59496005</translation >
59506006</message >
6007+ <message >
6008+ <source >Ch %1, W %2, L %3</source >
6009+ <comment >Characters / Words / Lines</comment >
6010+ <translation type =" unfinished" >Ch %1, W %2, L %3</translation >
6011+ </message >
6012+ <message >
6013+ <source >Characters %1, Words %2, Lines %3</source >
6014+ <translation type =" unfinished" >Characters %1, Words %2, Lines %3</translation >
6015+ </message >
59516016</context >
59526017<context >
59536018<name >NavigationWidget</name >
@@ -7096,6 +7161,18 @@ Do you want to delete those files as well?</numerusform>
70967161<context >
70977162<name >NoteTreeManager</name >
70987163<message >
7164+ <source >External diff tool</source >
7165+ <translation type =" unfinished" >External diff tool</translation >
7166+ </message >
7167+ <message >
7168+ <source >Please select at least two notes to diff.</source >
7169+ <translation type =" unfinished" >Please select at least two notes to diff.</translation >
7170+ </message >
7171+ <message >
7172+ <source >The external diff tool < strong> %1< /strong> could not be started.</source >
7173+ <translation type =" unfinished" >The external diff tool < strong> %1< /strong> could not be started.</translation >
7174+ </message >
7175+ <message >
70997176<source >New note</source >
71007177<translation type =" unfinished" >New note</translation >
71017178</message >
@@ -7152,6 +7229,10 @@ Do you want to delete those files as well?</numerusform>
71527229<translation type =" unfinished" >Open selected notes in tabs</translation >
71537230</message >
71547231<message >
7232+ <source >Diff selected notes</source >
7233+ <translation type =" unfinished" >Diff selected notes</translation >
7234+ </message >
7235+ <message >
71557236<source >Open note in external editor</source >
71567237<translation type =" unfinished" >Open note in external editor</translation >
71577238</message >
@@ -8049,8 +8130,8 @@ Updating the interface takes a short while.</translation>
80498130<translation type =" unfinished" >attachment</translation >
80508131</message >
80518132<message >
8052- <source >Light </source >
8053- <translation type =" unfinished" >Light </translation >
8133+ <source >System </source >
8134+ <translation type =" unfinished" >System </translation >
80548135</message >
80558136<message >
80568137<source >Dark</source >
@@ -10445,10 +10526,6 @@ This cannot be undone!</translation>
1044510526<translation type =" unfinished" >QOwnNotes is now disconnected from websocket to %1</translation >
1044610527</message >
1044710528<message >
10448- <source >Web app warning</source >
10449- <translation type =" unfinished" >Web app warning</translation >
10450- </message >
10451- <message >
1045210529<source >Image received</source >
1045310530<translation type =" unfinished" >Image received</translation >
1045410531</message >
@@ -10488,10 +10565,30 @@ This cannot be undone!</translation>
1048810565<translation type =" unfinished" >QOwnNotes web application</translation >
1048910566</message >
1049010567<message >
10568+ <source >Test the connection to the server</source >
10569+ <translation type =" unfinished" >Test the connection to the server</translation >
10570+ </message >
10571+ <message >
10572+ <source >Test connection</source >
10573+ <translation type =" unfinished" >Test connection</translation >
10574+ </message >
10575+ <message >
1049110576<source >A web socket connection to this server will be opened to act as bridge between the QOwnNotes web application and the QOwnNotes desktop application.</source >
1049210577<translation type =" unfinished" >A web socket connection to this server will be opened to act as bridge between the QOwnNotes web application and the QOwnNotes desktop application.</translation >
1049310578</message >
1049410579<message >
10580+ <source >Connection name:</source >
10581+ <translation type =" unfinished" >Connection name:</translation >
10582+ </message >
10583+ <message >
10584+ <source >The name used to identify this QOwnNotes instance to other connected devices</source >
10585+ <translation type =" unfinished" >The name used to identify this QOwnNotes instance to other connected devices</translation >
10586+ </message >
10587+ <message >
10588+ <source >Reset to default connection name</source >
10589+ <translation type =" unfinished" >Reset to default connection name</translation >
10590+ </message >
10591+ <message >
1049510592<source >Security token:</source >
1049610593<translation type =" unfinished" >Security token:</translation >
1049710594</message >
@@ -10504,6 +10601,14 @@ This cannot be undone!</translation>
1050410601<translation type =" unfinished" >Generate new security token</translation >
1050510602</message >
1050610603<message >
10604+ <source >Connected devices</source >
10605+ <translation type =" unfinished" >Connected devices</translation >
10606+ </message >
10607+ <message >
10608+ <source >Refresh</source >
10609+ <translation type =" unfinished" >Refresh</translation >
10610+ </message >
10611+ <message >
1050710612<source >Server URL:</source >
1050810613<translation type =" unfinished" >Server URL:</translation >
1050910614</message >
@@ -10523,6 +10628,18 @@ This cannot be undone!</translation>
1052310628<source >Show QR code</source >
1052410629<translation type =" unfinished" >Show QR code</translation >
1052510630</message >
10631+ <message >
10632+ <source >Connection test</source >
10633+ <translation type =" unfinished" >Connection test</translation >
10634+ </message >
10635+ <message >
10636+ <source >Successfully connected to the web application server.</source >
10637+ <translation type =" unfinished" >Successfully connected to the web application server.</translation >
10638+ </message >
10639+ <message >
10640+ <source >Not connected to the web application server. Please check the server URL and your network connection.</source >
10641+ <translation type =" unfinished" >Not connected to the web application server. Please check the server URL and your network connection.</translation >
10642+ </message >
1052610643</context >
1052710644<context >
1052810645<name >WebCompanionSettingsWidget</name >
@@ -10864,6 +10981,14 @@ This cannot be undone!</translation>
1086410981<translation type =" unfinished" >Generate shell completion code. Supports `fish`, `bash`.</translation >
1086510982</message >
1086610983<message >
10984+ <source >Prints the decrypted text of an encrypted note file.</source >
10985+ <translation type =" unfinished" >Prints the decrypted text of an encrypted note file.</translation >
10986+ </message >
10987+ <message >
10988+ <source >Password for --decrypt-note.</source >
10989+ <translation type =" unfinished" >Password for --decrypt-note.</translation >
10990+ </message >
10991+ <message >
1086710992<source >Single application mode is not supported on your system!</source >
1086810993<translation type =" unfinished" >Single application mode is not supported on your system!</translation >
1086910994</message >
0 commit comments