Ground Control

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

  1. bugfix-lp-581093
  2. Merge into trunk
Proposed by Allison Karlitskaya
Status: Merged
Merge reported by: Martin Owens
Merged at revision: not available
Proposed branch: lp:~desrt/groundcontrol/bugfix-lp-581093
Merge into: lp:groundcontrol
Diff against target: 74 lines (+1/-9)
1 file modified
glade/configure.glade (+1/-9)
To merge this branch: bzr merge lp:~desrt/groundcontrol/bugfix-lp-581093
Reviewer Review Type Date Requested Status
Martin Owens Approve
Review via email: mp+25382@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Martin Owens (doctormo) wrote :

Simple word changes, thanks for the patch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'glade/configure.glade'
2--- glade/configure.glade 2010-04-24 22:07:28 +0000
3+++ glade/configure.glade 2010-05-15 21:39:24 +0000
4@@ -15,13 +15,11 @@
5 <child>
6 <object class="GtkVBox" id="mainspacing">
7 <property name="visible">True</property>
8- <property name="orientation">vertical</property>
9 <child>
10 <placeholder/>
11 </child>
12 <child>
13 <object class="GtkVBox" id="ready">
14- <property name="orientation">vertical</property>
15 <child>
16 <object class="GtkLabel" id="modetext">
17 <property name="visible">True</property>
18@@ -159,7 +157,6 @@
19 <child>
20 <object class="GtkVBox" id="vbox1">
21 <property name="visible">True</property>
22- <property name="orientation">vertical</property>
23 <child>
24 <object class="GtkImage" id="logoimage">
25 <property name="visible">True</property>
26@@ -182,7 +179,6 @@
27 <child>
28 <object class="GtkVBox" id="vbox2">
29 <property name="visible">True</property>
30- <property name="orientation">vertical</property>
31 <child>
32 <object class="GtkImage" id="oauthbutton1">
33 <property name="visible">True</property>
34@@ -228,7 +224,6 @@
35 <child>
36 <object class="GtkVBox" id="vbox4">
37 <property name="visible">True</property>
38- <property name="orientation">vertical</property>
39 <child>
40 <object class="GtkImage" id="oauthbutton2">
41 <property name="visible">True</property>
42@@ -284,7 +279,6 @@
43 </child>
44 <child>
45 <object class="GtkVBox" id="statussplash">
46- <property name="orientation">vertical</property>
47 <child>
48 <object class="GtkImage" id="statusimage">
49 <property name="visible">True</property>
50@@ -399,7 +393,6 @@
51 <child>
52 <object class="GtkVBox" id="addholderbox">
53 <property name="visible">True</property>
54- <property name="orientation">vertical</property>
55 <child>
56 <object class="GtkLabel" id="addinfolabel">
57 <property name="visible">True</property>
58@@ -467,7 +460,6 @@
59 <child>
60 <object class="GtkVBox" id="pwdholderbox">
61 <property name="visible">True</property>
62- <property name="orientation">vertical</property>
63 <child>
64 <object class="GtkHBox" id="hbox2">
65 <property name="visible">True</property>
66@@ -489,7 +481,7 @@
67 <property name="visible">True</property>
68 <property name="xpad">6</property>
69 <property name="ypad">4</property>
70- <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>
71+ <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>
72 <property name="use_markup">True</property>
73 <property name="wrap">True</property>
74 </object>

Subscribers

People subscribed via source and target branches