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
=== modified file 'src/sync-account.cpp'
--- src/sync-account.cpp 2016-08-31 18:13:34 +0000
+++ src/sync-account.cpp 2016-12-12 20:06:03 +0000
@@ -736,7 +736,7 @@
736 switch(status.toInt())736 switch(status.toInt())
737 {737 {
738 case -1:738 case -1:
739 return _("Fail to configure account");739 return _("Failed to configure account");
740 case 0:740 case 0:
741 case 200:741 case 200:
742 case 204:742 case 204:
@@ -762,7 +762,7 @@
762 case 22001:762 case 22001:
763 return _("Fail to sync some items");763 return _("Fail to sync some items");
764 case 22002:764 case 22002:
765 return _("Process unexpected die.");765 return _("Process died unexpectedly");
766 case 20006:766 case 20006:
767 case 20007:767 case 20007:
768 return _("Server sent bad content");768 return _("Server sent bad content");
769769
=== modified file 'src/sync-daemon.cpp'
--- src/sync-daemon.cpp 2016-09-01 12:20:42 +0000
+++ src/sync-daemon.cpp 2016-12-12 20:06:03 +0000
@@ -617,7 +617,7 @@
617 notify->setProperty("SERVICE", QVariant::fromValue<QString>(serviceName));617 notify->setProperty("SERVICE", QVariant::fromValue<QString>(serviceName));
618 connect(notify, SIGNAL(questionAccepted()), SLOT(runAuthentication()));618 connect(notify, SIGNAL(questionAccepted()), SLOT(runAuthentication()));
619 notify->askYesOrNo(_("Synchronization"),619 notify->askYesOrNo(_("Synchronization"),
620 QString(_("Your access key is not valid anymore. Do you want to re-authenticate it?.")),620 QString(_("Your access key is not valid anymore. Do you want to re-authenticate it?")),
621 account->iconName(serviceName));621 account->iconName(serviceName));
622622
623}623}

Subscribers

People subscribed via source and target branches