Ubuntu Software Center

Merge lp:~evfool/software-center/lp635101 into lp:software-center

  1. lp635101
  2. Merge into trunk
Proposed by Robert Roth
Status: Merged
Merged at revision: 3240
Proposed branch: lp:~evfool/software-center/lp635101
Merge into: lp:software-center
Diff against target: 28 lines (+4/-4)
1 file modified
data/ui/gtk3/dialogs.ui (+4/-4)
To merge this branch: bzr merge lp:~evfool/software-center/lp635101
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+135443@code.launchpad.net

Description of the change

Updated the broken cache dialog's primary text to match the spec, and removed the reference to Update manager from the secondary text (deleted the text, as it will get replaced by the details on what it will mean to repair the broken cache).

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ui/gtk3/dialogs.ui'
2--- data/ui/gtk3/dialogs.ui 2012-05-19 15:39:31 +0000
3+++ data/ui/gtk3/dialogs.ui 2012-11-21 15:26:18 +0000
4@@ -71,8 +71,8 @@
5 <property name="visible">True</property>
6 <property name="can_focus">False</property>
7 <property name="xalign">0</property>
8- <property name="label" translatable="yes">&lt;span weight="bold" font_size="large"&gt;Items cannot be installed or removed
9-until the package catalog is repaired. Do you want to repair it now?&lt;/span&gt;</property>
10+ <property name="label" translatable="yes">&lt;span weight="bold" font_size="large"&gt;New software can’t be installed,
11+because there is a problem with the software currently installed. Do you want to repair this problem now?&lt;/span&gt;</property>
12 <property name="use_markup">True</property>
13 <property name="wrap">True</property>
14 </object>
15@@ -98,11 +98,11 @@
16 </packing>
17 </child>
18 <child>
19- <object class="GtkLabel" id="label_broken_cache1">
20+ <object class="GtkLabel" id="label_broken_cache_details">
21 <property name="visible">True</property>
22 <property name="can_focus">False</property>
23 <property name="xalign">0</property>
24- <property name="label" translatable="yes">Once Update Manager has finished the repairs, you can close it and return to Software Center.</property>
25+ <property name="label" translatable="yes"></property>
26 <property name="use_markup">True</property>
27 <property name="wrap">True</property>
28 </object>