Merge lp:~mandel/ubuntuone-windows-installer/fix_655847 into lp:ubuntuone-windows-installer/beta

Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 115
Merged at revision: 105
Proposed branch: lp:~mandel/ubuntuone-windows-installer/fix_655847
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/fix_655853
Diff against target: 64 lines (+8/-8)
2 files modified
src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx (+4/-4)
src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs (+4/-4)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/fix_655847
Reviewer Review Type Date Requested Status
Rick McBride (community) Needs Information
Review via email: mp+38211@code.launchpad.net

Description of the change

Fix lp:655847 by updating the resource file.

To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

I'm getting the following at the end of running tests with this branch:

BUILD FAILED - 0 non-fatal error(s), 4 warning(s)

C:\canonical\ubuntuone-windows-installer\review\main.build(182,4)
External Program Failed! C:\canonical\ubuntuone-windows-installer\review\tools\NUnit\nunit-console.exe (return code was 2)

This has not happened with the past few branch reviews. I have repeated the problem twice (clean, tests, clean, tests)

review: Needs Information

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx'
2--- src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx 2010-08-28 19:55:55 +0000
3+++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx 2010-10-12 12:27:44 +0000
4@@ -130,16 +130,16 @@
5 <value>Get Help and Support...</value>
6 </data>
7 <data name="MoreSpace" xml:space="preserve">
8- <value>Get More Space</value>
9+ <value>Add More Storage Space</value>
10 </data>
11 <data name="OpenShares" xml:space="preserve">
12- <value>Open Share Folders</value>
13+ <value>Open Shared Folders</value>
14 </data>
15 <data name="OpenSync" xml:space="preserve">
16- <value>Open Sync Folders</value>
17+ <value>Open Synced Folders</value>
18 </data>
19 <data name="RecentlyModifyFiles" xml:space="preserve">
20- <value>Recently Modify Files</value>
21+ <value>Recently Modified Files</value>
22 </data>
23 <data name="UbuntuOneManualSync" xml:space="preserve">
24 <value>Synchronize Now</value>
25
26=== modified file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs'
27--- src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs 2010-08-28 19:55:55 +0000
28+++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs 2010-10-12 12:27:44 +0000
29@@ -97,7 +97,7 @@
30 }
31
32 /// <summary>
33- /// Looks up a localized string similar to Get More Space.
34+ /// Looks up a localized string similar to Add More Storage Space.
35 /// </summary>
36 public static string MoreSpace {
37 get {
38@@ -106,7 +106,7 @@
39 }
40
41 /// <summary>
42- /// Looks up a localized string similar to Open Share Folders.
43+ /// Looks up a localized string similar to Open Shared Folders.
44 /// </summary>
45 public static string OpenShares {
46 get {
47@@ -115,7 +115,7 @@
48 }
49
50 /// <summary>
51- /// Looks up a localized string similar to Open Sync Folders.
52+ /// Looks up a localized string similar to Open Synced Folders.
53 /// </summary>
54 public static string OpenSync {
55 get {
56@@ -124,7 +124,7 @@
57 }
58
59 /// <summary>
60- /// Looks up a localized string similar to Recently Modify Files.
61+ /// Looks up a localized string similar to Recently Modified Files.
62 /// </summary>
63 public static string RecentlyModifyFiles {
64 get {

Subscribers

People subscribed via source and target branches

to all changes: