Merge lp:~desrt/groundcontrol/bugfix-lp-581093 into lp:groundcontrol

[Allison Karlitskaya]

hai! yr sittin' on the couch doin synchronous IO in my nautilus main thread!

[Martin Owens (doctormo)]

Simple word changes, thanks for the patch.

review: Approve

=== modified file 'glade/configure.glade'
--- glade/configure.glade	2010-04-24 22:07:28 +0000
+++ glade/configure.glade	2010-05-15 21:39:24 +0000
@@ -15,13 +15,11 @@
         <child>
           <object class="GtkVBox" id="mainspacing">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
               <placeholder/>
             </child>
             <child>
               <object class="GtkVBox" id="ready">
-                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkLabel" id="modetext">
                     <property name="visible">True</property>
@@ -159,7 +157,6 @@
                 <child>
                   <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkImage" id="logoimage">
                         <property name="visible">True</property>
@@ -182,7 +179,6 @@
                             <child>
                               <object class="GtkVBox" id="vbox2">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkImage" id="oauthbutton1">
                                     <property name="visible">True</property>
@@ -228,7 +224,6 @@
                             <child>
                               <object class="GtkVBox" id="vbox4">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkImage" id="oauthbutton2">
                                     <property name="visible">True</property>
@@ -284,7 +279,6 @@
             </child>
             <child>
               <object class="GtkVBox" id="statussplash">
-                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkImage" id="statusimage">
                     <property name="visible">True</property>
@@ -399,7 +393,6 @@
     <child>
       <object class="GtkVBox" id="addholderbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="addinfolabel">
             <property name="visible">True</property>
@@ -467,7 +460,6 @@
     <child>
       <object class="GtkVBox" id="pwdholderbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkHBox" id="hbox2">
             <property name="visible">True</property>
@@ -489,7 +481,7 @@
                 <property name="visible">True</property>
                 <property name="xpad">6</property>
                 <property name="ypad">4</property>
-                <property name="label" translatable="yes">We need to make a &lt;b&gt;Special Key&lt;/b&gt; which will be used to access project code. This key requires a &lt;b&gt;new&lt;/b&gt; password that is unrelated to your existing Launchpad account.</property>
+                <property name="label" translatable="yes">We need to make an &lt;b&gt;SSH Key&lt;/b&gt; which will be used to access project code. This key requires a &lt;b&gt;new&lt;/b&gt; password that is unrelated to your existing Launchpad account.</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
               </object>