Merge lp:~torsten.franz/sync-monitor/sync-monitor into lp:sync-monitor

Proposed by Torsten Franz
Status: Needs review
Proposed branch: lp:~torsten.franz/sync-monitor/sync-monitor
Merge into: lp:sync-monitor
Diff against target: 34 lines (+3/-3)
2 files modified
src/sync-account.cpp (+2/-2)
src/sync-daemon.cpp (+1/-1)
To merge this branch: bzr merge lp:~torsten.franz/sync-monitor/sync-monitor
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+313066@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Torsten Franz (torsten.franz) wrote :

Can somebody make a review and merge this? Thanks!

Unmerged revisions

95. By Torsten Franz

Fix three typografics errors #1620270

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/sync-account.cpp'
2--- src/sync-account.cpp 2016-08-31 18:13:34 +0000
3+++ src/sync-account.cpp 2016-12-12 20:06:03 +0000
4@@ -736,7 +736,7 @@
5 switch(status.toInt())
6 {
7 case -1:
8- return _("Fail to configure account");
9+ return _("Failed to configure account");
10 case 0:
11 case 200:
12 case 204:
13@@ -762,7 +762,7 @@
14 case 22001:
15 return _("Fail to sync some items");
16 case 22002:
17- return _("Process unexpected die.");
18+ return _("Process died unexpectedly");
19 case 20006:
20 case 20007:
21 return _("Server sent bad content");
22
23=== modified file 'src/sync-daemon.cpp'
24--- src/sync-daemon.cpp 2016-09-01 12:20:42 +0000
25+++ src/sync-daemon.cpp 2016-12-12 20:06:03 +0000
26@@ -617,7 +617,7 @@
27 notify->setProperty("SERVICE", QVariant::fromValue<QString>(serviceName));
28 connect(notify, SIGNAL(questionAccepted()), SLOT(runAuthentication()));
29 notify->askYesOrNo(_("Synchronization"),
30- QString(_("Your access key is not valid anymore. Do you want to re-authenticate it?.")),
31+ QString(_("Your access key is not valid anymore. Do you want to re-authenticate it?")),
32 account->iconName(serviceName));
33
34 }

Subscribers

People subscribed via source and target branches