1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00

Minor tweaks

This commit is contained in:
Laurent Cozic 2018-03-07 17:35:11 +00:00
parent 5014914dc9
commit 7753f3f842
3 changed files with 15 additions and 10 deletions

View File

@ -1,6 +1,6 @@
# Joplin
Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. 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://daringfireball.net/projects/markdown/basics).
Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. 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](#markdown).
Notes exported from Evernote via .enex files [can be imported](#importing) into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.
@ -20,7 +20,7 @@ Operating System | Download
-----------------|--------
Windows | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.70/Joplin-Setup-1.0.70.exe'><img alt='Get it on Windows' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeWindows.png'/></a>
macOS | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.70/Joplin-1.0.70.dmg'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeMacOS.png'/></a>
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.70/Joplin-1.0.70-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a>
Linux | <a href='https://github.com/laurent22/joplin/releases/download/v1.0.70/Joplin-1.0.70-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a>
## Mobile applications
@ -243,6 +243,8 @@ Current translations:
# License
MIT License
Copyright (c) 2016-2018 Laurent Cozic
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

View File

@ -63,7 +63,9 @@ shared.checkPasswords = async function(comp) {
shared.decryptedStatText = function(comp) {
const stats = comp.state.stats;
return _('Decrypted items: %s / %s', stats.encrypted !== null ? (stats.total - stats.encrypted) : '-', stats.total !== null ? stats.total : '-');
const doneCount = stats.encrypted !== null ? (stats.total - stats.encrypted) : '-';
const totalCount = stats.total !== null ? stats.total : '-';
return _('Decrypted items: %s / %s', doneCount, totalCount);
}
shared.onSavePasswordClick = function(comp, mk) {

View File

@ -203,7 +203,7 @@
</div>
<div class="content">
<p>Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. 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 <a href="https://daringfireball.net/projects/markdown/basics">Markdown format</a>.</p>
<p>Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. 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 <a href="#markdown">Markdown format</a>.</p>
<p>Notes exported from Evernote via .enex files <a href="#importing">can be imported</a> into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.</p>
<p>The notes can be <a href="#synchronisation">synchronised</a> with various targets including <a href="https://nextcloud.com/">Nextcloud</a>, the file system (for example with a network directory) or with Microsoft OneDrive. When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.</p>
<p>The UI of the terminal client is built on top of the great <a href="https://github.com/cronvel/terminal-kit">terminal-kit</a> library, the desktop client using <a href="https://electronjs.org/">Electron</a>, and the Android client front end is done using <a href="https://facebook.github.io/react-native/">React Native</a>.</p>
@ -230,7 +230,7 @@
</tr>
<tr>
<td>Linux</td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.70/Joplin-1.0.70-x86_64.AppImage'><img alt='Get it on macOS' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a></td>
<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.70/Joplin-1.0.70-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeLinux.png'/></a></td>
</tr>
</tbody>
</table>
@ -406,14 +406,14 @@ $$
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/hr.png" alt=""></td>
<td>Croatian</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po">hr_HR</a></td>
<td>Hrvoje Mandić <a href="&#x6d;&#97;&#x69;&#108;&#x74;&#111;&#x3a;&#x74;&#114;&#98;&#x75;&#x68;&#x6f;&#x6d;&#64;&#x6e;&#x65;&#x74;&#x2e;&#104;&#114;">&#x74;&#114;&#98;&#x75;&#x68;&#x6f;&#x6d;&#64;&#x6e;&#x65;&#x74;&#x2e;&#104;&#114;</a></td>
<td>Hrvoje Mandić <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#x74;&#x72;&#98;&#117;&#x68;&#x6f;&#x6d;&#x40;&#x6e;&#x65;&#116;&#x2e;&#104;&#x72;">&#x74;&#x72;&#98;&#117;&#x68;&#x6f;&#x6d;&#x40;&#x6e;&#x65;&#116;&#x2e;&#104;&#x72;</a></td>
<td>66%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/de.png" alt=""></td>
<td>Deutsch</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po">de_DE</a></td>
<td>Tobias Strobel <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#103;&#x69;&#x74;&#x40;&#x73;&#116;&#114;&#x6f;&#x62;&#x65;&#108;&#x74;&#111;&#98;&#105;&#x61;&#x73;&#x2e;&#x64;&#x65;">&#103;&#x69;&#x74;&#x40;&#x73;&#116;&#114;&#x6f;&#x62;&#x65;&#108;&#x74;&#111;&#98;&#105;&#x61;&#x73;&#x2e;&#x64;&#x65;</a></td>
<td>Tobias Strobel <a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#x67;&#105;&#116;&#64;&#115;&#x74;&#x72;&#x6f;&#98;&#x65;&#x6c;&#116;&#x6f;&#x62;&#x69;&#97;&#x73;&#46;&#x64;&#x65;">&#x67;&#105;&#116;&#64;&#115;&#x74;&#x72;&#x6f;&#98;&#x65;&#x6c;&#116;&#x6f;&#x62;&#x69;&#97;&#x73;&#46;&#x64;&#x65;</a></td>
<td>83%</td>
</tr>
<tr>
@ -427,7 +427,7 @@ $$
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/es.png" alt=""></td>
<td>Español</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po">es_ES</a></td>
<td>Fernando Martín <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#x3a;&#x66;&#x40;&#x6d;&#114;&#116;&#110;&#x2e;&#x65;&#x73;">&#x66;&#x40;&#x6d;&#114;&#116;&#110;&#x2e;&#x65;&#x73;</a></td>
<td>Fernando Martín <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#102;&#64;&#109;&#114;&#116;&#x6e;&#46;&#x65;&#115;">&#102;&#64;&#109;&#114;&#116;&#x6e;&#46;&#x65;&#115;</a></td>
<td>93%</td>
</tr>
<tr>
@ -462,14 +462,14 @@ $$
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/ru.png" alt=""></td>
<td>Русский</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po">ru_RU</a></td>
<td>Artyom Karlov <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#x3a;&#97;&#114;&#x74;&#121;&#111;&#109;&#46;&#x6b;&#x61;&#114;&#108;&#x6f;&#x76;&#64;&#x67;&#109;&#x61;&#105;&#108;&#46;&#x63;&#111;&#x6d;">&#97;&#114;&#x74;&#121;&#111;&#109;&#46;&#x6b;&#x61;&#114;&#108;&#x6f;&#x76;&#64;&#x67;&#109;&#x61;&#105;&#108;&#46;&#x63;&#111;&#x6d;</a></td>
<td>Artyom Karlov <a href="&#109;&#x61;&#105;&#108;&#x74;&#111;&#58;&#97;&#x72;&#x74;&#x79;&#111;&#109;&#46;&#x6b;&#97;&#x72;&#x6c;&#x6f;&#118;&#64;&#x67;&#x6d;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#109;">&#97;&#x72;&#x74;&#x79;&#111;&#109;&#46;&#x6b;&#97;&#x72;&#x6c;&#x6f;&#118;&#64;&#x67;&#x6d;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#109;</a></td>
<td>85%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cn.png" alt=""></td>
<td>中文 (简体)</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po">zh_CN</a></td>
<td>RCJacH <a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#82;&#67;&#x4a;&#x61;&#99;&#x48;&#x40;&#x6f;&#117;&#116;&#108;&#x6f;&#x6f;&#x6b;&#46;&#99;&#111;&#x6d;">&#82;&#67;&#x4a;&#x61;&#99;&#x48;&#x40;&#x6f;&#117;&#116;&#108;&#x6f;&#x6f;&#x6b;&#46;&#99;&#111;&#x6d;</a></td>
<td>RCJacH <a href="&#109;&#97;&#x69;&#108;&#x74;&#111;&#58;&#x52;&#x43;&#74;&#97;&#99;&#x48;&#x40;&#111;&#x75;&#116;&#108;&#111;&#111;&#107;&#46;&#99;&#111;&#109;">&#x52;&#x43;&#74;&#97;&#99;&#x48;&#x40;&#111;&#x75;&#116;&#108;&#111;&#111;&#107;&#46;&#99;&#111;&#109;</a></td>
<td>68%</td>
</tr>
<tr>
@ -488,6 +488,7 @@ $$
<li>While the mobile can sync and load tags, it is not currently possible to create new ones. The desktop and terminal apps can create, delete and edit tags.</li>
</ul>
<h1 id="license">License</h1>
<p>MIT License</p>
<p>Copyright (c) 2016-2018 Laurent Cozic</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>