diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-06-13 10:52:26 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-06-13 10:52:26 -0300 |
| commit | 35291c130f749850753e89d889a121ec098c0dc9 (patch) | |
| tree | 59305982261bdcca659b45bafdd4c97597ac17ee /src/leap/gui | |
| parent | f35506e9b93cf0182af37ccdcc36e343b44b882c (diff) | |
| parent | cd11784b8fdf0cb45783e8d6a8e9b5288f34820d (diff) | |
Merge remote-tracking branch 'kali/feature/osx-eip-scripts_rev1' into develop
Conflicts:
src/leap/gui/mainwindow.py
Diffstat (limited to 'src/leap/gui')
| -rw-r--r-- | src/leap/gui/mainwindow.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index 65f5fe3d..0e388e64 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -224,7 +224,8 @@ class MainWindow(QtGui.QMainWindow): self._systray = None self._action_eip_status = QtGui.QAction( - self.tr("Encrypted internet is OFF"), self) + self.tr("Encrypted internet is OFF"), + self) self._action_eip_status.setEnabled(False) self._action_eip_startstop = QtGui.QAction( self.tr("Turn encryption ON"), self) |