diff options
| author | Kali Kaneko <kali@leap.se> | 2014-11-03 12:13:46 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-11-03 12:13:46 +0100 |
| commit | 0fc71d08381c7e750dabc2fc6cf5ef957d51bb5a (patch) | |
| tree | 907c872b37be164b7095fbf97a2d466b59b31b7e /src/leap/bitmask/gui/advanced_key_management.py | |
| parent | fa5fe88d47dd3e90d8336dbd56e9bf6b38acd811 (diff) | |
| parent | 7b0dda2fde310fff5ea6ee57a5f18a554b8e665f (diff) | |
Merge tag '0.7.0rc3' into deb-0.7.1-rc3
Tag leap.bitmask version 0.7.0rc3
Conflicts:
src/leap/bitmask/services/soledad/soledadbootstrapper.py
Diffstat (limited to 'src/leap/bitmask/gui/advanced_key_management.py')
| -rw-r--r-- | src/leap/bitmask/gui/advanced_key_management.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/advanced_key_management.py b/src/leap/bitmask/gui/advanced_key_management.py index b3a4ed8e..48a1db93 100644 --- a/src/leap/bitmask/gui/advanced_key_management.py +++ b/src/leap/bitmask/gui/advanced_key_management.py @@ -121,7 +121,7 @@ class AdvancedKeyManagement(QtGui.QDialog): if file_name: question = self.tr("Are you sure that you want to replace " - "the current key pair whith the imported?") + "the current key pair with the imported?") res = QtGui.QMessageBox.question( None, "Change key pair", question, QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, |