Merge lp:~fitojb/sync-monitor/typos into lp:sync-monitor

Proposed by Adolfo Jayme on 2014-10-20
Status: Needs review
Proposed branch: lp:~fitojb/sync-monitor/typos
Merge into: lp:sync-monitor
Diff against target: 67 lines (+11/-11)
1 file modified
src/sync-account.cpp (+11/-11)
To merge this branch: bzr merge lp:~fitojb/sync-monitor/typos
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2014-10-20 Pending
Review via email: mp+238843@code.launchpad.net

Commit message

Fix several typos found in translatable strings

Description of the change

Fix several typos found in translatable strings

Also, removed the un-necessary quotation marks in “two-way”, which is a valid English term.

To post a comment you must log in.

Unmerged revisions

38. By Adolfo Jayme on 2014-10-20

Fix several typos in translatable strings

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 2014-05-09 14:23:55 +0000
3+++ src/sync-account.cpp 2014-10-20 05:02:21 +0000
4@@ -225,7 +225,7 @@
5 switch(lastStatus.toInt())
6 {
7 case 22000:
8- // "Fail to run \"two-way\" sync";
9+ // "Failed to run two-way sync";
10 return "slow";
11 case 0:
12 case 200:
13@@ -246,11 +246,11 @@
14 case 420:
15 // "Disk full";
16 case 506:
17- // "Fail to sync due some remote problem";
18+ // "Failed to sync due to some remote problem";
19 case 22001:
20- // "Fail to sync some items";
21+ // "Failed to sync some items";
22 case 22002:
23- // "Last process unexpected die.";
24+ // "Last process died unexpectedly.";
25 case 20006:
26 case 20007:
27 // "Server sent bad content";
28@@ -263,7 +263,7 @@
29 case 20026:
30 case 20027:
31 case 20028:
32- // "Fail to connect with the server";
33+ // "Failed to connect with the server";
34 case 20046:
35 case 20047:
36 // "Server not found";
37@@ -528,13 +528,13 @@
38 case 420:
39 return _("Disk full");
40 case 506:
41- return _("Fail to sync due some remote problem");
42+ return _("Failed to sync due to some remote problem");
43 case 22000:
44- return _("Fail to run \"two-way\" sync");
45+ return _("Failed to run two-way sync");
46 case 22001:
47- return _("Fail to sync some items");
48+ return _("Failed to sync some items");
49 case 22002:
50- return _("Process unexpected die.");
51+ return _("Process died unexpectedly.");
52 case 20006:
53 case 20007:
54 return _("Server sent bad content");
55@@ -547,10 +547,10 @@
56 case 20026:
57 case 20027:
58 case 20028:
59- return _("Fail to connect with the server");
60+ return _("Failed to connect with the server");
61 case 20046:
62 case 20047:
63- return _( "Server not found");
64+ return _("Server not found");
65 default:
66 return _("Unknown status");
67 }

Subscribers

People subscribed via source and target branches