diff options
| author | chiiph <chiiph@chiiphs-MacBook-Air.local> | 2013-06-19 13:21:46 -0300 |
|---|---|---|
| committer | chiiph <chiiph@chiiphs-MacBook-Air.local> | 2013-06-19 13:21:46 -0300 |
| commit | d88b91499e30d34afe4dfa3729890d3beb55fa31 (patch) | |
| tree | dec7067764faca24268f61de8db431b00772e82b | |
| parent | f3cefee6e6c08d88edd0927545dd37c2ce6bbf67 (diff) | |
| parent | 22afa7da7befa83f23eb039418edb39b0f5c2856 (diff) | |
Merge remote-tracking branch 'kali/feature/improve_texts' into develop
| -rw-r--r-- | changes/feature_2695-improve-texts | 1 | ||||
| -rw-r--r-- | src/leap/config/providerconfig.py | 5 | ||||
| -rw-r--r-- | src/leap/gui/mainwindow.py | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/changes/feature_2695-improve-texts b/changes/feature_2695-improve-texts new file mode 100644 index 00000000..d77a2b40 --- /dev/null +++ b/changes/feature_2695-improve-texts @@ -0,0 +1 @@ + o Clarify labels through the app (use of EIP) 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 5a303830..cf20c6eb 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -477,8 +477,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) @@ -986,7 +986,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) @@ -1090,7 +1090,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( |