[gnome-disk-utility/wip/iscsi] iscsi: Avoid techno-mumbo-jumbo like "CHAP" - just use "Password" instead
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/wip/iscsi] iscsi: Avoid techno-mumbo-jumbo like "CHAP" - just use "Password" instead
- Date: Thu, 1 Mar 2012 17:56:28 +0000 (UTC)
commit e1e2371458c9e6500e1cf291dd435f5371c6ca96
Author: David Zeuthen <davidz redhat com>
Date: Thu Mar 1 12:55:29 2012 -0500
iscsi: Avoid techno-mumbo-jumbo like "CHAP" - just use "Password" instead
Signed-off-by: David Zeuthen <davidz redhat com>
data/ui/iscsi-connection-dialog.ui | 4 ++--
data/ui/palimpsest.ui | 16 ++++++++--------
src/palimpsest/gduwindow.c | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/data/ui/iscsi-connection-dialog.ui b/data/ui/iscsi-connection-dialog.ui
index 2742411..15e28c4 100644
--- a/data/ui/iscsi-connection-dialog.ui
+++ b/data/ui/iscsi-connection-dialog.ui
@@ -133,8 +133,8 @@
<property name="can_focus">False</property>
<items>
<item translatable="yes">None</item>
- <item translatable="yes">CHAP</item>
- <item translatable="yes">Mutual CHAP</item>
+ <item translatable="yes">Password</item>
+ <item translatable="yes">Password (Mutual)</item>
</items>
</object>
<packing>
diff --git a/data/ui/palimpsest.ui b/data/ui/palimpsest.ui
index 95f28d2..36ee885 100644
--- a/data/ui/palimpsest.ui
+++ b/data/ui/palimpsest.ui
@@ -1391,16 +1391,18 @@
<property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="iscsitab-connection-auth-label">
+ <object class="GtkLabel" id="iscsitab-connection-startup-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Authentication</property>
+ <property name="label" translatable="yes">Connect at Startup</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">GTK_FILL</property>
@@ -1409,7 +1411,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="iscsitab-connection-auth-value-label">
+ <object class="GtkLabel" id="iscsitab-connection-startup-value-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -1429,18 +1431,16 @@
</child>
<child>
- <object class="GtkLabel" id="iscsitab-connection-startup-label">
+ <object class="GtkLabel" id="iscsitab-connection-auth-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Connect at Startup</property>
+ <property name="label" translatable="yes">Authentication</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
@@ -1449,7 +1449,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="iscsitab-connection-startup-value-label">
+ <object class="GtkLabel" id="iscsitab-connection-auth-value-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index ce21d97..36a576b 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -2508,9 +2508,9 @@ update_iscsi_connection_details (GduWindow *window)
else if (g_strcmp0 (auth_method, "CHAP") == 0)
{
if (username_in != NULL && strlen (username_in) > 0)
- auth = g_strdup (C_("iscsi-target", "Mutual CHAP"));
+ auth = g_strdup (C_("iscsi-target", "Password (Mutual)"));
else
- auth = g_strdup (C_("iscsi-target", "CHAP"));
+ auth = g_strdup (C_("iscsi-target", "Password"));
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]