au#1069: Changing strings, as per Sridhar's comments.

Signed-off-by: Ajay Garg <ajay@activitycentral.com>

1 files changed, 21 insertions, 6 deletions

diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index 4deae89..c3aa5d1 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -36,6 +36,8 @@ ICON = 'module-network'
 TITLE = _('Network')
 
 _APPLY_TIMEOUT = 3000
+EXPLICIT_REBOOT_MESSAGE = _('Please restart your computer for changes to take effect.')
+
 
 class WrappedLabel(gtk.Label):
     """Variant of gtk.Label that automatically line-wraps the text as needed.
@@ -587,6 +589,7 @@ class Network(SectionView):
         self._radio_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
         self._jabber_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
         self._hidden_network_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
+        self._nm_connection_editor_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
 
         workspace = gtk.VBox()
         workspace.show()
@@ -730,8 +733,7 @@ class Network(SectionView):
             info.show()
 
             self._hidden_network_alert = InlineAlert()
-            self.hidden_network_msg = 'XO-reboot is required for the' \
-                                      ' changes to take effect.'
+            self.hidden_network_msg = EXPLICIT_REBOOT_MESSAGE
             self._hidden_network_alert.props.msg =_(self.hidden_network_msg)
             self._hidden_network_alert_box.pack_start(self._hidden_network_alert,
                                                         expand=False)
@@ -752,8 +754,7 @@ class Network(SectionView):
         workspace.pack_start(separator_nm_connection_editor, False)
         separator_nm_connection_editor.show()
 
-        label_nm_connection_editor = gtk.Label(_('NetworkManager'
-                                                 ' Connection Editor'))
+        label_nm_connection_editor = gtk.Label(_('Advanced Network Settings'))
         label_nm_connection_editor.set_alignment(0, 0)
         workspace.pack_start(label_nm_connection_editor, expand=False)
         label_nm_connection_editor.show()
@@ -762,11 +763,20 @@ class Network(SectionView):
         box_nm_connection_editor.set_border_width(style.DEFAULT_SPACING * 2)
         box_nm_connection_editor.set_spacing(style.DEFAULT_SPACING)
 
-        info = WrappedLabel(_("Press the 'Launch' button, to launch the"
-                           " Connection Editor."))
+        info = WrappedLabel(_("For more specific network settings, use "
+                              "the NetworkManager Connection Editor."))
         info.set_alignment(0, 0)
         box_nm_connection_editor.pack_start(info, expand=False)
 
+        self._nm_connection_editor_alert = InlineAlert()
+        self._nm_connection_editor_alert.props.msg = EXPLICIT_REBOOT_MESSAGE
+        self._nm_connection_editor_alert_box.pack_start(self._nm_connection_editor_alert,
+                expand=False)
+        box_nm_connection_editor.pack_end(self._nm_connection_editor_alert_box,
+                expand=False)
+        self._nm_connection_editor_alert_box.show()
+        self._nm_connection_editor_alert.show()
+
         launch_button = gtk.Button()
         launch_button.set_alignment(0, 0)
         launch_button.set_label(_('Launch'))
@@ -800,6 +810,11 @@ class Network(SectionView):
         proxy_box.set_spacing(style.DEFAULT_SPACING)
         proxy_box.show()
 
+        proxy_info = WrappedLabel(_("Configure proxies to access the Internet."))
+        proxy_info.set_alignment(0, 0)
+        proxy_box.pack_start(proxy_info, expand=False)
+        proxy_info.show()
+
         workspace.pack_start(proxy_box)
 
         size_group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)