Software Properties

Merge lp:~kelemeng/software-properties/bug657835 into lp:software-properties

  1. bug657835
  2. Merge into main
Proposed by Gabor Kelemen on 2010-10-10
Status: Merged
Merged at revision: 638
Proposed branch: lp:~kelemeng/software-properties/bug657835
Merge into: lp:software-properties
Diff against target: 30 lines (+3/-3)
1 file modified
data/gtkbuilder/main.ui (+3/-3)
To merge this branch: bzr merge lp:~kelemeng/software-properties/bug657835
Reviewer Review Type Date Requested Status
Michael Vogt 2010-11-04 Pending
Ubuntu Core Development Team 2010-10-10 Pending
Review via email: mp+38088@code.launchpad.net
To post a comment you must log in.
Michael Vogt (mvo) wrote :

Many thanks! merged :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/gtkbuilder/main.ui'
2--- data/gtkbuilder/main.ui 2010-09-13 07:42:46 +0000
3+++ data/gtkbuilder/main.ui 2010-10-10 23:46:42 +0000
4@@ -20,7 +20,7 @@
5 </data>
6 </object>
7 <object class="GtkTextBuffer" id="textbuffer1">
8- <property name="text">To install from a CD-ROM or DVD, insert the medium into the drive.</property>
9+ <property name="text" translatable="yes">To install from a CD-ROM or DVD, insert the medium into the drive.</property>
10 </object>
11 <object class="GtkWindow" id="window_main">
12 <property name="border_width">6</property>
13@@ -703,7 +703,7 @@
14 <property name="can_focus">True</property>
15 <property name="receives_default">True</property>
16 <property name="has_tooltip">True</property>
17- <property name="tooltip_markup">Import the public key from a trusted software provider</property>
18+ <property name="tooltip_markup" translatable="yes">Import the public key from a trusted software provider</property>
19 <property name="tooltip_text" translatable="yes">Import the public key from a trusted software provider</property>
20 <property name="use_underline">True</property>
21 <signal name="clicked" handler="add_key_clicked"/>
22@@ -745,7 +745,7 @@
23 <property name="can_focus">True</property>
24 <property name="receives_default">True</property>
25 <property name="has_tooltip">True</property>
26- <property name="tooltip_markup">Restore the default keys of your distribution</property>
27+ <property name="tooltip_markup" translatable="yes">Restore the default keys of your distribution</property>
28 <property name="tooltip_text" translatable="yes">Restore the default keys of your distribution</property>
29 <property name="use_underline">True</property>
30 <signal name="clicked" handler="on_restore_clicked"/>

Subscribers

People subscribed via source and target branches

to status/vote changes: