Simple Scan

Merge lp://qastaging/~alefteris/simple-scan/stock-menuitems into lp://qastaging/~robert-ancell/simple-scan/trunk

  1. stock-menuitems
  2. Merge into trunk
Proposed by Thanos Lefteris
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp://qastaging/~alefteris/simple-scan/stock-menuitems
Merge into: lp://qastaging/~robert-ancell/simple-scan/trunk
Diff against target: 42 lines (+5/-9)
1 file modified
data/simple-scan.ui (+5/-9)
To merge this branch: bzr merge lp://qastaging/~alefteris/simple-scan/stock-menuitems
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+19776@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Thanos Lefteris (alefteris) wrote :

Use stock menuitems for preferences and delete to aid translators.

Thanks

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Thanks Thanos!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/simple-scan.ui'
--- data/simple-scan.ui 2010-02-17 22:08:31 +0000
+++ data/simple-scan.ui 2010-02-20 15:25:25 +0000
@@ -111,11 +111,10 @@
111 </child>111 </child>
112 <child>112 <child>
113 <object class="GtkImageMenuItem" id="preferences_menuitem">113 <object class="GtkImageMenuItem" id="preferences_menuitem">
114 <property name="label">Pre_ferences</property>114 <property name="label">gtk-preferences</property>
115 <property name="visible">True</property>115 <property name="visible">True</property>
116 <property name="use_underline">True</property>116 <property name="use_underline">True</property>
117 <property name="image">preferences_image</property>117 <property name="use_stock">True</property>
118 <property name="use_stock">False</property>
119 <signal name="activate" handler="preferences_button_clicked_cb"/>118 <signal name="activate" handler="preferences_button_clicked_cb"/>
120 </object>119 </object>
121 </child>120 </child>
@@ -272,10 +271,11 @@
272 </object>271 </object>
273 </child>272 </child>
274 <child>273 <child>
275 <object class="GtkMenuItem" id="page_delete_menuitem">274 <object class="GtkImageMenuItem" id="page_delete_menuitem">
276 <property name="visible">True</property>275 <property name="visible">True</property>
277 <property name="label" translatable="yes" comments="Label on page delete menuitem">_Delete</property>276 <property name="label">gtk-delete</property>
278 <property name="use_underline">True</property>277 <property name="use_underline">True</property>
278 <property name="use_stock">True</property>
279 <accelerator key="Delete" signal="activate"/>279 <accelerator key="Delete" signal="activate"/>
280 <signal name="activate" handler="page_delete_menuitem_activate_cb"/>280 <signal name="activate" handler="page_delete_menuitem_activate_cb"/>
281 </object>281 </object>
@@ -872,10 +872,6 @@
872 </object>872 </object>
873 </child>873 </child>
874 </object>874 </object>
875 <object class="GtkImage" id="preferences_image">
876 <property name="visible">True</property>
877 <property name="stock">gtk-preferences</property>
878 </object>
879 <object class="GtkAdjustment" id="preview_adjustment">875 <object class="GtkAdjustment" id="preview_adjustment">
880 <property name="upper">100</property>876 <property name="upper">100</property>
881 <property name="step_increment">1</property>877 <property name="step_increment">1</property>

Subscribers

People subscribed via source and target branches

to all changes: