[network-manager-applet/NMA_0_8] Remove markup from translatable strings in ui files
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/NMA_0_8] Remove markup from translatable strings in ui files
- Date: Sun, 5 Dec 2010 19:07:34 +0000 (UTC)
commit 98b8f44000738097d706d93a89ec7104bf12c42f
Author: Claude Paroz <claude 2xlibre net>
Date: Mon Nov 29 09:52:55 2010 +0100
Remove markup from translatable strings in ui files
src/applet.ui | 7 +++++--
src/connection-editor/ce-page-ip4.ui | 6 ++++--
src/connection-editor/ce-page-ip6.ui | 6 ++++--
src/connection-editor/ce-page-mobile.ui | 12 ++++++++----
src/connection-editor/ce-page-ppp.ui | 30 ++++++++++++++++++++----------
src/connection-editor/ce-vpn-wizard.ui | 25 +++++++++++++++++++------
6 files changed, 60 insertions(+), 26 deletions(-)
---
diff --git a/src/applet.ui b/src/applet.ui
index d06fb77..09d8241 100644
--- a/src/applet.ui
+++ b/src/applet.ui
@@ -444,8 +444,11 @@
<object class="GtkLabel" id="label68">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><span size="larger" weight="bold">Active Network Connections</span></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Active Network Connections</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ <attribute name="scale" value="1.2"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui
index c0b09de..376fb96 100644
--- a/src/connection-editor/ce-page-ip4.ui
+++ b/src/connection-editor/ce-page-ip4.ui
@@ -82,8 +82,10 @@
<object class="GtkLabel" id="ip4_addr_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Addresses</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Addresses</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/connection-editor/ce-page-ip6.ui b/src/connection-editor/ce-page-ip6.ui
index c9ca05a..e1e3ee3 100644
--- a/src/connection-editor/ce-page-ip6.ui
+++ b/src/connection-editor/ce-page-ip6.ui
@@ -82,8 +82,10 @@
<object class="GtkLabel" id="ip6_addr_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Addresses</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Addresses</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/connection-editor/ce-page-mobile.ui b/src/connection-editor/ce-page-mobile.ui
index 094c8a3..92d492b 100644
--- a/src/connection-editor/ce-page-mobile.ui
+++ b/src/connection-editor/ce-page-mobile.ui
@@ -42,8 +42,10 @@
<object class="GtkLabel" id="mobile_basic_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Basic</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Basic</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -168,8 +170,10 @@
<object class="GtkLabel" id="mobile_advanced_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Advanced</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Advanced</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/connection-editor/ce-page-ppp.ui b/src/connection-editor/ce-page-ppp.ui
index 210749e..b0849d7 100644
--- a/src/connection-editor/ce-page-ppp.ui
+++ b/src/connection-editor/ce-page-ppp.ui
@@ -17,8 +17,10 @@
<object class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Authentication</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Authentication</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -109,8 +111,10 @@
<object class="GtkLabel" id="label29">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Compression</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Compression</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -264,8 +268,10 @@
<object class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Echo</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Echo</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -321,8 +327,10 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Allowed Authentication Methods</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Allowed Authentication Methods</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -411,9 +419,11 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><i>In most cases, the provider's PPP servers will support all authentication methods. If connections fail, try disabling support for some methods.</i></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">In most cases, the provider's PPP servers will support all authentication methods. If connections fail, try disabling support for some methods.</property>
<property name="wrap">True</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
</object>
<packing>
<property name="position">5</property>
diff --git a/src/connection-editor/ce-vpn-wizard.ui b/src/connection-editor/ce-vpn-wizard.ui
index 59fc3b8..b9f7c9f 100644
--- a/src/connection-editor/ce-vpn-wizard.ui
+++ b/src/connection-editor/ce-vpn-wizard.ui
@@ -51,11 +51,11 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><span weight="bold" size="larger">Choose a VPN Connection Type</span>
-
-Select the type of VPN you wish to use for the new connection. If the type of VPN connection you wish to create does not appear in the list, you may not have the correct VPN plugin installed.</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
+ <property name="label" translatable="yes">Choose a VPN Connection Type</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ <attribute name="scale" value="1.2"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -64,6 +64,19 @@ Select the type of VPN you wish to use for the new connection. If the type of V
</packing>
</child>
<child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Select the type of VPN you wish to use for the new connection. If the type of VPN connection you wish to create does not appear in the list, you may not have the correct VPN plugin installed.</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkVBox" id="vpn_vbox">
<property name="visible">True</property>
<property name="spacing">6</property>
@@ -98,7 +111,7 @@ Select the type of VPN you wish to use for the new connection. If the type of V
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">6</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
