[gthumb] photobucket/facebook: use the same text used in flickr/picasaweb

[Paolo Bacchilega <paobac src gnome org>]

commit 9275aedc2380ea752dc98028e57b52d51ed51589
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Tue Sep 4 20:38:47 2012 +0200

    photobucket/facebook: use the same text used in flickr/picasaweb
    
    use "Resize if larger than" instead of "Resize to"

 extensions/facebook/data/ui/export-to-facebook.ui  |   48 ++++---
 .../photobucket/data/ui/export-to-photobucket.ui   |  158 ++++++++++---------
 2 files changed, 112 insertions(+), 94 deletions(-)
---
diff --git a/extensions/facebook/data/ui/export-to-facebook.ui b/extensions/facebook/data/ui/export-to-facebook.ui
index 98ad12b..ca1ad1f 100644
--- a/extensions/facebook/data/ui/export-to-facebook.ui
+++ b/extensions/facebook/data/ui/export-to-facebook.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.24"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="account_liststore">
     <columns>
       <!-- column-name account -->
@@ -136,7 +136,7 @@
                   <object class="GtkTable" id="table2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="n_rows">3</property>
+                    <property name="n_rows">2</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">6</property>
                     <property name="row_spacing">5</property>
@@ -144,7 +144,6 @@
                       <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="top_padding">6</property>
                         <child>
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
@@ -159,7 +158,7 @@
                       </object>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
@@ -224,7 +223,7 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
@@ -239,7 +238,7 @@
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
                     <child>
@@ -287,23 +286,36 @@
                         <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"/>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_markup" translatable="yes">Resize the images if larger than this size</property>
                         <property name="tooltip_text" translatable="yes">Resize the images if larger than this size</property>
-                        <property name="label" translatable="yes">_Resize to:</property>
+                        <property name="label" translatable="yes">_Resize if larger than:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">resize_combobox</property>
                       </object>
                       <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -320,18 +332,16 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
diff --git a/extensions/photobucket/data/ui/export-to-photobucket.ui b/extensions/photobucket/data/ui/export-to-photobucket.ui
index 24e8003..794c44f 100644
--- a/extensions/photobucket/data/ui/export-to-photobucket.ui
+++ b/extensions/photobucket/data/ui/export-to-photobucket.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="account_liststore">
     <columns>
       <!-- column-name account -->
@@ -21,49 +21,6 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="resize_liststore">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name size -->
-      <column type="gint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Tiny ( 100 x 75 )</col>
-        <col id="1">100</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Small ( 160 x 120 )</col>
-        <col id="1">160</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Medium ( 320 x 240 )</col>
-        <col id="1">320</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Large ( 640 x 480 )</col>
-        <col id="1">640</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">15Ê screen ( 800 x 600 )</col>
-        <col id="1">800</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">17Ê screen ( 1024 x 768 )</col>
-        <col id="1">1024</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">1 megabyte file size</col>
-        <col id="1">0</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkImage" id="upload_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-goto-top</property>
-  </object>
   <object class="GtkDialog" id="export_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -179,7 +136,7 @@
                   <object class="GtkTable" id="table2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="n_rows">4</property>
+                    <property name="n_rows">2</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">6</property>
                     <property name="row_spacing">5</property>
@@ -376,19 +333,30 @@
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Resize to:</property>
+                        <property name="label" translatable="yes">_Resize if larger than:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">resize_combobox</property>
                       </object>
                       <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -405,37 +373,34 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="scramble_checkbutton">
-                        <property name="label" translatable="yes">_Scramble filenames</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="scramble_checkbutton">
+                    <property name="label" translatable="yes">_Scramble filenames</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
@@ -460,4 +425,47 @@
       <action-widget response="-11">button1</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkListStore" id="resize_liststore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name size -->
+      <column type="gint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Tiny ( 100 x 75 )</col>
+        <col id="1">100</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Small ( 160 x 120 )</col>
+        <col id="1">160</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Medium ( 320 x 240 )</col>
+        <col id="1">320</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Large ( 640 x 480 )</col>
+        <col id="1">640</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">15Ê screen ( 800 x 600 )</col>
+        <col id="1">800</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">17Ê screen ( 1024 x 768 )</col>
+        <col id="1">1024</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1 megabyte file size</col>
+        <col id="1">0</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkImage" id="upload_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-goto-top</property>
+  </object>
 </interface>