From 22afa7da7befa83f23eb039418edb39b0f5c2856 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Sat, 15 Jun 2013 23:43:50 +0900
Subject: Improve labels in the app

* Clarify use of EIP
* Closes #2695
---
 src/leap/config/providerconfig.py | 5 ++++-
 src/leap/gui/mainwindow.py        | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/leap/config/providerconfig.py b/src/leap/config/providerconfig.py
index 68099ad4..6bbd7422 100644
--- a/src/leap/config/providerconfig.py
+++ b/src/leap/config/providerconfig.py
@@ -93,7 +93,10 @@ class ProviderConfig(BaseConfig):
         Returns a string with the services supported by the current
         provider, ready to be shown to the user.
         """
-        return ", ".join(self.get_services())
+        services_str = ", ".join(self.get_services())
+        services_str = services_str.replace(
+            "openvpn", "Encrypted Internet")
+        return services_str
 
     def get_ca_cert_path(self, about_to_download=False):
         """
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 51b96463..d5979395 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -474,8 +474,8 @@ class MainWindow(QtGui.QMainWindow):
         default_provider = self._settings.get_defaultprovider()
 
         if default_provider is None:
-            logger.info("Cannot autostart EIP because there's no default "
-                        "provider configured")
+            logger.info("Cannot autostart Encrypted Internet because there is "
+                        "no default provider configured")
             return
 
         self._action_eip_provider.setText(default_provider)
@@ -983,7 +983,7 @@ class MainWindow(QtGui.QMainWindow):
                 error=True)
         except OpenVPNNotFoundException:
             self._status_panel.set_eip_status(
-                self.tr("We couldn't find openvpn"),
+                self.tr("We couldn't find openvpn binary"),
                 error=True)
         except VPNLauncherException as e:
             self._status_panel.set_eip_status("%s" % (e,), error=True)
@@ -1087,7 +1087,7 @@ class MainWindow(QtGui.QMainWindow):
         else:
             if data[self._eip_bootstrapper.PASSED_KEY]:
                 self._status_panel.set_eip_status(
-                    self.tr("Could not load EIP Configuration"),
+                    self.tr("Could not load Encrypted Internet Configuration"),
                     error=True)
             else:
                 self._status_panel.set_eip_status(
-- 
cgit v1.2.3