[network-manager-openvpn/th/nm-1-0-ui-fixes: 1/2] ui: merge the 'key direction usage' from label to tooltips.

[Thomas Haller <thaller src gnome org>]

commit 94aa913d809f417d792fa20e8fd788fc4f6c6d67
Author: Bin Li <binli opensuse org>
Date:   Mon Jul 2 17:36:20 2012 +0800

    ui: merge the 'key direction usage' from label to tooltips.
    
    The openvpn dialog is too high.
    
    [lkundrak v3 sk: Rebased]
    
    Signed-off-by: Bin Li <binli opensuse org>
    
    Conflicts:
        properties/nm-openvpn-dialog.ui
    
    https://bugzilla.gnome.org/show_bug.cgi?id=679247
    (cherry picked from commit 706bc60d2b1bd629a82ab3e219055e6eb1c40531)

 properties/nm-openvpn-dialog.ui |   52 +++------------------------------------
 1 files changed, 4 insertions(+), 48 deletions(-)
---
diff --git a/properties/nm-openvpn-dialog.ui b/properties/nm-openvpn-dialog.ui
index 44729ab..70b345f 100644
--- a/properties/nm-openvpn-dialog.ui
+++ b/properties/nm-openvpn-dialog.ui
@@ -895,6 +895,7 @@ config: static &lt;file&gt;</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="tooltip_text" translatable="yes">Direction for Static Key 
encryption mode (non-TLS).
+If key direction is used, it must be the opposite of that used on the VPN peer.  For example, if the peer 
uses '1', this connection must use '0'.  If you are unsure what value to use, contact your system 
administrator.
 config: static &lt;file&gt; [direction]</property>
                                 <property name="model">model1</property>
                                 <child>
@@ -914,30 +915,7 @@ config: static &lt;file&gt; [direction]</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkAlignment" id="alignment17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="xscale">0</property>
-                            <child>
-                              <object class="GtkLabel" id="sk_dir_help_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">start</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;i&gt;If key direction is used, 
it must be the opposite of that used on the VPN peer.  For example, if the peer uses '1', this connection 
must use '0'.  If you are unsure what value to use, contact your system administrator.&lt;/i&gt;</property>
-                                <property name="use_markup">True</property>
-                                <property name="wrap">True</property>
-                                <property name="width_chars">38</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
+                          <placeholder />
                         </child>
                         <child>
                           <placeholder/>
@@ -1930,30 +1908,7 @@ config: remote-cert-tls client|server</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkAlignment" id="alignment19">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">1</property>
-                                <property name="xscale">0</property>
-                                <child>
-                                  <object class="GtkLabel" id="tls_dir_help_label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">start</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">&lt;i&gt;If key direction is 
used, it must be the opposite of that used on the VPN peer.  For example, if the peer uses '1', this 
connection must use '0'.  If you are unsure what value to use, contact your system 
administrator.&lt;/i&gt;</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="wrap">True</property>
-                                    <property name="width_chars">45</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
+                              <placeholder />
                             </child>
                             <child>
                               <object class="GtkFileChooserButton" id="tls_auth_chooser">
@@ -1974,6 +1929,7 @@ config: tls-auth &lt;file&gt; [direction]</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="tooltip_text" translatable="yes">Direction parameter for 
static key mode.
+If key direction is used, it must be the opposite of that used on the VPN peer.  For example, if the peer 
uses '1', this connection must use '0'.  If you are unsure what value to use, contact your system 
administrator.
 config: tls-auth &lt;file&gt; [direction]</property>
                                 <property name="model">model5</property>
                                 <child>