Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Electron release v1.0.74

pull/306/head v1.0.74
Laurent Cozic 2018-03-16 09:11:25 +00:00
parent 61881b528a
commit 554a3eb10d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElectronClient/app/package-lock.json generated
View File

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

2
ElectronClient/app/package.json
View File

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

2
ReactNativeClient/lib/synchronizer.js
View File

@ -72,7 +72,7 @@ class Synchronizer {
if (report.deleteLocal) lines.push(_("Deleted local items: %d.", report.deleteLocal));
if (report.deleteRemote) lines.push(_("Deleted remote items: %d.", report.deleteRemote));
if (report.fetchingTotal && report.fetchingProcessed) lines.push(_("Fetched items: %d/%d.", report.fetchingProcessed, report.fetchingTotal));
if (!report.completedTime && report.state) lines.push(_('State: "%s".', Synchronizer.stateToLabel(report.state)));
if (!report.completedTime && report.state) lines.push(_('State: %s.', Synchronizer.stateToLabel(report.state)));
if (report.cancelling && !report.completedTime) lines.push(_("Cancelling..."));
if (report.completedTime) lines.push(_("Completed: %s", time.unixMsToLocalDateTime(report.completedTime)));
if (report.errors && report.errors.length) lines.push(_("Last error: %s", report.errors[report.errors.length - 1].toString().substr(0, 500)));