self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

Merge branch 'dev' into release-1.2

Browse Source
This commit is contained in:
Laurent Cozic 2020-09-21 11:56:32 +01:00
commit a9b26246e6
5 changed files with 406 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

484
CliClient/locales/de_DE.po
View File

File diff suppressed because it is too large Load Diff

6
CliClient/locales/fr_FR.po
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.0.6\n"
"X-Generator: Poedit 2.4.1\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
@ -822,8 +822,8 @@ msgid ""
"Type a note title or part of its content to jump to it. Or type # followed "
"by a tag name, or @ followed by a notebook name."
msgstr ""
"Entrez le titre d’une note, ou entrez # suivit du nom d’une étiquette, ou @ "
"suivit du nom d’un carnet."
"Entrez le titre d’une note, ou entrez # suivi du nom d’une étiquette, ou @ "
"suivi du nom d’un carnet."
#: ElectronClient/plugins/GotoAnything.min.js:486
#: ElectronClient/gui/KeymapConfig/utils/getLabel.js:20

320
CliClient/locales/ko.po
View File

File diff suppressed because it is too large Load Diff

2
ElectronClient/package-lock.json generated
View File

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

2
ElectronClient/package.json
View File

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