Merge lp:~and471/synaptic/fix-resize-grip into lp:synaptic

[Andrew]

Fixes https://bugs.launchpad.net/ubuntu/+source/synaptic/+bug/704414

[Robert Roth (evfool)]

Why did you remove the translatable attributes?

[Andrew (and471)]

Hmm, that was the work of glade, and I assumed it was due to a slight syntax change (i.e. that if translatable="yes" is not there, it is assumed) however after more research I see this is not the case.

I have fixed this and updated the branch.

[lp:~and471/synaptic/fix-resize-grip]

1819. By Andrew <email address hidden> on 2011-02-18

undo the removing of translatable="yes"

1820. By Andrew <email address hidden> on 2011-02-18

okay really undo that all...

=== modified file 'gtk/gtkbuilder/window_main.ui'
--- gtk/gtkbuilder/window_main.ui	2010-12-11 10:26:00 +0000
+++ gtk/gtkbuilder/window_main.ui	2011-02-18 07:45:26 +0000
@@ -63,7 +63,7 @@
                     <child>
                       <object class="GtkMenuItem" id="menu_add_downloadedfiles">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">Add packages downloaded with the &quot;Generate package download script&quot; feature to the system</property>
+                        <property name="tooltip_text" translatable="yes">Add packages downloaded with the "Generate package download script" feature to the system</property>
                         <property name="label" translatable="yes">Add downloaded packages</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_add_downloadedfiles_activate"/>
@@ -1427,14 +1427,13 @@
                         <property name="visible">True</property>
                         <property name="border_width">12</property>
                         <property name="spacing">6</property>
-                        <property name="homogeneous">False</property>
                         <child>
                           <object class="GtkComboBox" id="combobox_depends">
                             <property name="visible">True</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">0</property>
-                            <property name="expand">False</property>
                           </packing>
                         </child>
                         <child>
@@ -1791,48 +1790,53 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox_status">
+          <object class="GtkAlignment" id="alignment2">
             <property name="visible">True</property>
-            <property name="spacing">2</property>
+            <property name="right_padding">18</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow22">
+              <object class="GtkHBox" id="hbox_status">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="vscrollbar_policy">never</property>
+                <property name="spacing">2</property>
                 <child>
-                  <object class="GtkViewport" id="viewport4">
+                  <object class="GtkScrolledWindow" id="scrolledwindow22">
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="vscrollbar_policy">never</property>
                     <child>
-                      <object class="GtkLabel" id="label_status">
-                        <property name="width_request">100</property>
+                      <object class="GtkViewport" id="viewport4">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
+                        <property name="resize_mode">queue</property>
+                        <child>
+                          <object class="GtkLabel" id="label_status">
+                            <property name="width_request">100</property>
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkProgressBar" id="progressbar_main">
-                <property name="visible">True</property>
-                <property name="pulse_step">0.10000000149</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkProgressBar" id="progressbar_main">
+                    <property name="visible">True</property>
+                    <property name="pulse_step">0.10000000149</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">3</property>
           </packing>
         </child>