summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg/next-version2
-rw-r--r--pkg/pyinst/pyinst-build.mk2
-rw-r--r--src/leap/bitmask/gui/ui/mainwindow.ui2
-rw-r--r--src/leap/bitmask/gui/ui/preferences_email_page.ui2
4 files changed, 4 insertions, 4 deletions
diff --git a/pkg/next-version b/pkg/next-version
index 3d4f0a85..29a0f215 100644
--- a/pkg/next-version
+++ b/pkg/next-version
@@ -1 +1 @@
-0.9.2.rc1
+0.9.2.rc2
diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk
index 92a1cbb3..664f13ec 100644
--- a/pkg/pyinst/pyinst-build.mk
+++ b/pkg/pyinst/pyinst-build.mk
@@ -22,7 +22,7 @@ reset-ver:
pyinst-hacks-linux:
# XXX this should be taken care of by pyinstaller data collector
- cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)
+ cp ../leap_common/src/leap/common/cacert.pem $(DIST)
mkdir -p $(DIST)pysqlcipher
mkdir -p $(DIST)pixelated
mkdir -p $(DIST)twisted/web
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 976c0c0a..0dd0b891 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -373,7 +373,7 @@
</action>
<action name="action_pixelated_mail">
<property name="text">
- <string>Bitmask Webmail</string>
+ <string>Bitmask Mail</string>
</property>
</action>
<action name="action_advanced_key_management">
diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui
index 08feb7b0..e4a72951 100644
--- a/src/leap/bitmask/gui/ui/preferences_email_page.ui
+++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui
@@ -39,7 +39,7 @@
<item>
<widget class="QGroupBox" name="webmail_box">
<property name="title">
- <string>Bitmask Mail Configuration</string>
+ <string>Bitmask Mail</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>