1 files changed, 15 insertions, 18 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 258225e2..f8f11ff6 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -3056,16 +3056,15 @@ This release fixes downloads of files from directories.  The previous version ha
               <property name="tooltip" translatable="yes">Confirm the displayed meta-data and keywords and proceed with the upload.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
-              <property name="label">gtk-ok</property>
+              <property name="label">gtk-cancel</property>
               <property name="use_stock">True</property>
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">True</property>
-              <property name="response_id">-5</property>
+              <property name="response_id">-6</property>
               <accessibility>
                 <atkproperty name="AtkObject::accessible_name" translatable="yes">metaDataDialogCancelButton</atkproperty>
                 <atkproperty name="AtkObject::accessible_description" translatable="yes">Abort the upload operation.</atkproperty>
               </accessibility>
-              <accelerator key="Return" modifiers="0" signal="activate"/>
             </widget>
           </child>
 
@@ -3075,12 +3074,11 @@ This release fixes downloads of files from directories.  The previous version ha
               <property name="tooltip" translatable="yes">Cancel the upload.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
-              <property name="label">gtk-cancel</property>
+              <property name="label">gtk-ok</property>
               <property name="use_stock">True</property>
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">True</property>
-              <property name="response_id">-6</property>
-              <accelerator key="Escape" modifiers="GDK_MOD1_MASK" signal="activate"/>
+              <property name="response_id">-5</property>
             </widget>
           </child>
         </widget>
@@ -5472,12 +5470,12 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
               <property name="tooltip" translatable="yes">Confirm the displayed meta-data and keywords and proceed with the upload.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
-              <property name="label">gtk-ok</property>
+              <property name="label">gtk-cancel</property>
               <property name="use_stock">True</property>
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">True</property>
-              <property name="response_id">-5</property>
-              <accelerator key="Return" modifiers="0" signal="activate"/>
+              <property name="response_id">-6</property>
+              <accelerator key="Escape" modifiers="GDK_MOD1_MASK" signal="activate"/>
             </widget>
           </child>
 
@@ -5487,12 +5485,11 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
               <property name="tooltip" translatable="yes">Cancel the upload.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
-              <property name="label">gtk-cancel</property>
+              <property name="label">gtk-ok</property>
               <property name="use_stock">True</property>
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">True</property>
-              <property name="response_id">-6</property>
-              <accelerator key="Escape" modifiers="GDK_MOD1_MASK" signal="activate"/>
+              <property name="response_id">-5</property>
             </widget>
           </child>
         </widget>
@@ -6053,12 +6050,12 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
               <property name="tooltip" translatable="yes">Confirm the displayed meta-data and keywords and proceed with the upload.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
-              <property name="label">gtk-ok</property>
+              <property name="label">gtk-cancel</property>
               <property name="use_stock">True</property>
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">True</property>
-              <property name="response_id">-5</property>
-              <accelerator key="Return" modifiers="0" signal="activate"/>
+              <property name="response_id">-6</property>
+              <accelerator key="Escape" modifiers="0" signal="activate"/>
             </widget>
           </child>
 
@@ -6068,12 +6065,11 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
               <property name="tooltip" translatable="yes">Cancel the upload.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
-              <property name="label">gtk-cancel</property>
+              <property name="label">gtk-ok</property>
               <property name="use_stock">True</property>
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">True</property>
-              <property name="response_id">-6</property>
-              <accelerator key="Escape" modifiers="GDK_MOD1_MASK" signal="activate"/>
+              <property name="response_id">-5</property>
             </widget>
           </child>
         </widget>
@@ -6515,6 +6511,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">True</property>
               <property name="response_id">-6</property>
+              <accelerator key="Escape" modifiers="0" signal="activate"/>
             </widget>
           </child>