Ubuntu One Windows Installer

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

  1. fix_655153
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 116
Merged at revision: 106
Proposed branch: lp:~mandel/ubuntuone-windows-installer/fix_655153
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/fix_655847
Diff against target: 34 lines (+3/-3)
2 files modified
src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs (+2/-2)
src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx (+1/-1)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/fix_655153
Reviewer Review Type Date Requested Status
Ubuntu One hackers Pending
Review via email: mp+38212@code.launchpad.net

Description of the change

Fix lp:655153 by updating the resoruce file.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs'
2--- src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs 2010-07-29 17:19:47 +0000
3+++ src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs 2010-10-12 12:34:40 +0000
4@@ -1,7 +1,7 @@
5 //------------------------------------------------------------------------------
6 // <auto-generated>
7 // This code was generated by a tool.
8-// Runtime Version:2.0.50727.4927
9+// Runtime Version:2.0.50727.4952
10 //
11 // Changes to this file may cause incorrect behavior and will be lost if
12 // the code is regenerated.
13@@ -106,7 +106,7 @@
14 }
15
16 /// <summary>
17- /// Looks up a localized string similar to There are updates avialable. Do you want to download them?.
18+ /// Looks up a localized string similar to There are updates available. Do you want to download them?.
19 /// </summary>
20 internal static string DownloadUpdatesQuestion {
21 get {
22
23=== modified file 'src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx'
24--- src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx 2010-07-29 17:19:47 +0000
25+++ src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx 2010-10-12 12:34:40 +0000
26@@ -130,7 +130,7 @@
27 <value>The download could not me completed.</value>
28 </data>
29 <data name="DownloadUpdatesQuestion" xml:space="preserve">
30- <value>There are updates avialable. Do you want to download them?</value>
31+ <value>There are updates available. Do you want to download them?</value>
32 </data>
33 <data name="NoRSSFeedPresent" xml:space="preserve">
34 <value>Updater RSS feed is null or empty.</value>

Subscribers

People subscribed via source and target branches

to all changes: