[network-manager-openvpn/jk/ovpn-ui-fixes-1-0: 1/3] ui: merge the 'key direction usage' from label to tooltips.
- From: Jiří Klimeš <jklimes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn/jk/ovpn-ui-fixes-1-0: 1/3] ui: merge the 'key direction usage' from label to tooltips.
- Date: Wed, 1 Apr 2015 10:54:42 +0000 (UTC)
commit e3fa8149aad6d6c05b806a090c6541280ef9e3e6
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 daad737..ddc2384 100644
--- a/properties/nm-openvpn-dialog.ui
+++ b/properties/nm-openvpn-dialog.ui
@@ -933,6 +933,7 @@ config: static <file></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 <file> [direction]</property>
<property name="model">model1</property>
<child>
@@ -952,30 +953,7 @@ config: static <file> [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"><i>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.</i></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/>
@@ -1968,30 +1946,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"><i>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.</i></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">
@@ -2012,6 +1967,7 @@ config: tls-auth <file> [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 <file> [direction]</property>
<property name="model">model5</property>
<child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]