Merge lp:~mandel/ubuntuone-windows-installer/fix_655153 into lp:ubuntuone-windows-installer/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
=== modified file 'src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs'
--- src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs 2010-07-29 17:19:47 +0000
+++ src/Canonical.UbuntuOne.Common/Update/UpdateResources.Designer.cs 2010-10-12 12:34:40 +0000
@@ -1,7 +1,7 @@
1//------------------------------------------------------------------------------1//------------------------------------------------------------------------------
2// <auto-generated>2// <auto-generated>
3// This code was generated by a tool.3// This code was generated by a tool.
4// Runtime Version:2.0.50727.49274// Runtime Version:2.0.50727.4952
5//5//
6// Changes to this file may cause incorrect behavior and will be lost if6// Changes to this file may cause incorrect behavior and will be lost if
7// the code is regenerated.7// the code is regenerated.
@@ -106,7 +106,7 @@
106 }106 }
107 107
108 /// <summary>108 /// <summary>
109 /// Looks up a localized string similar to There are updates avialable. Do you want to download them?.109 /// Looks up a localized string similar to There are updates available. Do you want to download them?.
110 /// </summary>110 /// </summary>
111 internal static string DownloadUpdatesQuestion {111 internal static string DownloadUpdatesQuestion {
112 get {112 get {
113113
=== modified file 'src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx'
--- src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx 2010-07-29 17:19:47 +0000
+++ src/Canonical.UbuntuOne.Common/Update/UpdateResources.resx 2010-10-12 12:34:40 +0000
@@ -130,7 +130,7 @@
130 <value>The download could not me completed.</value>130 <value>The download could not me completed.</value>
131 </data>131 </data>
132 <data name="DownloadUpdatesQuestion" xml:space="preserve">132 <data name="DownloadUpdatesQuestion" xml:space="preserve">
133 <value>There are updates avialable. Do you want to download them?</value>133 <value>There are updates available. Do you want to download them?</value>
134 </data>134 </data>
135 <data name="NoRSSFeedPresent" xml:space="preserve">135 <data name="NoRSSFeedPresent" xml:space="preserve">
136 <value>Updater RSS feed is null or empty.</value>136 <value>Updater RSS feed is null or empty.</value>

Subscribers

People subscribed via source and target branches

to all changes: