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 | |
| 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
28 files changed, 308 insertions, 249 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c47e531a..0a5b6229 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,37 @@ History 2014 ==== +0.7.0rc3 October 28 -- the "One window to rule them all, and in the darkness bind them." release: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +- Select current provider on EIP preferences. Closes #5815. +- Handle logout correctly when we stop_services to launch the + wizard. Related to #5815. +- Properly remove /tmp/bitmask.lock. Closes #5866. +- Hide EIP Start button and display correct warning on missing helpers + files. Closes #5945. +- Save default provider if changed on the combo box. Closes #5995. +- Update the EIP status on provider change. Closes #5996. +- Update and get ready to start a provider on change. Closes #5997. +- Use python2 to run bitmask-root to work fine on systems with python3 + as default. Closes #6048. +- Use python2.7 in bitmask-root shebang since is the common name for + python 2 in Ubuntu, Debian, Arch. Related to #6048. +- Remove dict comprenension in util, for 2.6 compat. +- Login shall not wait for eip to finish if eip is not able to + start. Closes #5994 +- Properly send the token for querying the EIP certificate. Fixes + #6060. +- Code cleanup and logging improvements. +- Add email firewall blocking other users to access bitmask imap & + smtp. Closes #6040 +- Remove the Advanced Key Management since we don't support stable + mail yet. Closes #6087. +- Single combined preferences window. Closes #4704, #4119, #5885. +- Fix soledad imports (#5989). +- Make pkg/tuf/release.py handle removals in the repo + + 0.6.1 August 15 -- the "knock knock knocking on beta's door" release: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/changes/bug-5815_eip-preferences-issues b/changes/bug-5815_eip-preferences-issues deleted file mode 100644 index 013fe03d..00000000 --- a/changes/bug-5815_eip-preferences-issues +++ /dev/null @@ -1,2 +0,0 @@ -- Select current provider on EIP preferences. Closes #5815. -- Handle logout correctly when we stop_services to launch the wizard. Related to #5815. diff --git a/changes/bug-5866_bitmask-lock-not-removed b/changes/bug-5866_bitmask-lock-not-removed deleted file mode 100644 index d68c1122..00000000 --- a/changes/bug-5866_bitmask-lock-not-removed +++ /dev/null @@ -1 +0,0 @@ -- /tmp/bitmask.lock not removed. Closes #5866. diff --git a/changes/bug-5945_not-adding-helper-files b/changes/bug-5945_not-adding-helper-files deleted file mode 100644 index 94e41c25..00000000 --- a/changes/bug-5945_not-adding-helper-files +++ /dev/null @@ -1 +0,0 @@ -- Hide button and display correct warning on missing helpers files. Closes #5945. diff --git a/changes/bug-5995_save-provider-on-change b/changes/bug-5995_save-provider-on-change deleted file mode 100644 index e0f86d75..00000000 --- a/changes/bug-5995_save-provider-on-change +++ /dev/null @@ -1 +0,0 @@ -- Save default provider if changed on the combo box. Closes #5995. diff --git a/changes/bug-5996_update-eip-status-on-change b/changes/bug-5996_update-eip-status-on-change deleted file mode 100644 index 665092f0..00000000 --- a/changes/bug-5996_update-eip-status-on-change +++ /dev/null @@ -1 +0,0 @@ -- Update the EIP status on provider change. Closes #5996. diff --git a/changes/bug-5997_get-ready-provider-on-change b/changes/bug-5997_get-ready-provider-on-change deleted file mode 100644 index e6b3f7f1..00000000 --- a/changes/bug-5997_get-ready-provider-on-change +++ /dev/null @@ -1 +0,0 @@ -- Update and get ready to start a provider on change. Closes #5997. diff --git a/changes/bug-6048_python2-bitmask-root b/changes/bug-6048_python2-bitmask-root deleted file mode 100644 index 038196b0..00000000 --- a/changes/bug-6048_python2-bitmask-root +++ /dev/null @@ -1 +0,0 @@ -- Use python2 to run bitmask-root to work fine on systems with python3 as default. Closes #6048. diff --git a/changes/bug-remove-dict-comprenhension b/changes/bug-remove-dict-comprenhension deleted file mode 100644 index 4e9468d8..00000000 --- a/changes/bug-remove-dict-comprenhension +++ /dev/null @@ -1 +0,0 @@ -- Remove dict comprenension in util, for 2.6 compat. diff --git a/changes/bug_5989_fix-soledad-imports b/changes/bug_5989_fix-soledad-imports deleted file mode 100644 index 3b425287..00000000 --- a/changes/bug_5989_fix-soledad-imports +++ /dev/null @@ -1 +0,0 @@ -- Fix soledad imports (#5989). diff --git a/changes/bug_5994_do-not-wait-for-eip-if-cannot-start b/changes/bug_5994_do-not-wait-for-eip-if-cannot-start deleted file mode 100644 index 7ada612a..00000000 --- a/changes/bug_5994_do-not-wait-for-eip-if-cannot-start +++ /dev/null @@ -1 +0,0 @@ -- Login shall not wait for eip to finish if eip is not able to start. Closes: #5994 diff --git a/changes/bug_python2-compat b/changes/bug_python2-compat deleted file mode 100644 index 35331a36..00000000 --- a/changes/bug_python2-compat +++ /dev/null @@ -1 +0,0 @@ -- Use python2.7 since is the common name for python 2 in Ubuntu, Debian, Arch. Related to #6048. diff --git a/changes/bug_use_token_for_eip b/changes/bug_use_token_for_eip deleted file mode 100644 index b10368ad..00000000 --- a/changes/bug_use_token_for_eip +++ /dev/null @@ -1 +0,0 @@ -- Properly send the token for querying the EIP certificate. Fixes #6060.
\ No newline at end of file diff --git a/changes/code-and-logging-cleanup b/changes/code-and-logging-cleanup deleted file mode 100644 index 3a381e68..00000000 --- a/changes/code-and-logging-cleanup +++ /dev/null @@ -1 +0,0 @@ -- Code cleanup and logging improvements. diff --git a/changes/feature-6040-email-firewall b/changes/feature-6040-email-firewall deleted file mode 100644 index 5ef70d28..00000000 --- a/changes/feature-6040-email-firewall +++ /dev/null @@ -1 +0,0 @@ -- Add email firewall blocking other users to access bitmask imap & smtp. Closes #6040 diff --git a/changes/feature-6087_remove-AKM-menu b/changes/feature-6087_remove-AKM-menu deleted file mode 100644 index 9326ca47..00000000 --- a/changes/feature-6087_remove-AKM-menu +++ /dev/null @@ -1,2 +0,0 @@ -- Remove the Advanced Key Management since we don't support stable mail yet. - Closes #6087. diff --git a/changes/feature-combined-preferences-window b/changes/feature-combined-preferences-window deleted file mode 100644 index 146ac923..00000000 --- a/changes/feature-combined-preferences-window +++ /dev/null @@ -1 +0,0 @@ -- single combined preferences window (closes #4704, #4119, #5885)
\ No newline at end of file diff --git a/data/make_project_file.py b/data/make_project_file.py index d1567837..5519e128 100755 --- a/data/make_project_file.py +++ b/data/make_project_file.py @@ -52,7 +52,8 @@ if __name__ == '__main__': # Source files includes = ["*.py"] - excludes = ['__init__.py', '_version.py', 'ui_*.py', '*_rc.py'] + excludes = ['__init__.py', '_version.py', 'ui_*.py', '*_rc.py', + 'pinned*.py', 'tests'] sources = list_files(includes, excludes, SOURCE_ROOT) sources = " \\\n".join(["../{0}".format(f) for f in sources]) diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 041cdc44..8b457988 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -117,11 +117,6 @@ Import canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="125"/> - <source>Are you sure that you want to replace the current key pair whith the imported?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="144"/> <source>Import Successful</source> <translation type="unfinished"></translation> @@ -168,55 +163,30 @@ Export canceled.</source> <source><span style='color:#0000FF;'>NOTE</span>: </source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>ComplainDialog</name> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="414"/> - <source>Ok, thanks</source> + <location filename="../src/leap/bitmask/gui/advanced_key_management.py" line="125"/> + <source>Are you sure that you want to replace the current key pair with the imported?</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>EIPPreferences</name> - <message> - <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="27"/> - <source>Select gateway for provider</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="47"/> - <source><Select provider></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="62"/> - <source>< Providers Gateway Status ></source> - <translation type="unfinished"></translation> - </message> + <name>App</name> <message> - <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="83"/> - <source>Automatic</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="14"/> - <source>Encrypted Internet Preferences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="36"/> - <source>Select &provider:</source> + <location filename="../src/leap/bitmask/gui/app.py" line="63"/> + <source>Application error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="55"/> - <source>&Save this provider settings</source> + <location filename="../src/leap/bitmask/gui/app.py" line="65"/> + <source>There is a problem contacting the backend, please restart Bitmask.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>ComplainDialog</name> <message> - <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="72"/> - <source>Select &gateway:</source> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="417"/> + <source>Ok, thanks</source> <translation type="unfinished"></translation> </message> </context> @@ -409,11 +379,6 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/eip_status.py" line="746"/> - <source>We could not find any authentication agent in your system.<br/>Make sure you have<b>polkit-gnome-authentication-agent-1</b> running andtry again.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/leap/bitmask/gui/eip_status.py" line="754"/> <source>We could not find <b>pkexec</b> in your system.</source> <translation type="unfinished"></translation> @@ -443,6 +408,11 @@ Export canceled.</source> <source>Encrypted Internet failed to start</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/leap/bitmask/gui/eip_status.py" line="746"/> + <source>We could not find any authentication agent in your system.<br/>Make sure you have <b>polkit-gnome-authentication-agent-1</b> running and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Form</name> @@ -751,11 +721,6 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mail_status.py" line="232"/> - <source>Starting…</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/leap/bitmask/gui/mail_status.py" line="308"/> <source>Initial sync in progress, please wait...</source> <translation type="unfinished"></translation> @@ -774,53 +739,53 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="932"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="889"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="351"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="345"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="361"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="355"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="366"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="360"/> <source>&Wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="787"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="744"/> <source> The following components will be updated: %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="790"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="747"/> <source>Updates available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="244"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="236"/> <source>Show Main Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1718"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1650"/> <source>Starting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1742"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1674"/> <source>Not supported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1746"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1678"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> @@ -830,47 +795,47 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="356"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="350"/> <source>About &Bitmask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="238"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="230"/> <source>Mail is OFF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="778"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="735"/> <source>The Bitmask app is ready to update, please restart the application.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1050"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1007"/> <source>About Bitmask - %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1206"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1163"/> <source>Unable to login: Problem with provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1385"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1342"/> <source>Log in cancelled by the user.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1764"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1696"/> <source>There was a problem with the provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1819"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1751"/> <source>Something went wrong with the logout.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1786"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1718"/> <source>Unable to connect: Problem with provider</source> <translation type="unfinished"></translation> </message> @@ -880,319 +845,394 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="371"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="365"/> <source>Show &Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="376"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="370"/> <source>Create a new account...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="228"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="223"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="341"/> - <source>Account Preferences...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="346"/> - <source>Internet Preferences...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="384"/> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="378"/> <source>Advanced Key Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="940"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="897"/> <source>OFF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1064"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1021"/> <source>Version: <b>%s</b> (%s)<br><br>%sBitmask is the Desktop client application for the LEAP platform, supporting encrypted internet proxy, secure email, and secure chat (coming soon).<br><br>LEAP is a non-profit dedicated to giving all internet users access to secure communication. Our focus is on adapting encryption technology to make it easy to use and widely available. <br><br><a href='https://leap.se'>More about LEAP</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1111"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1068"/> <source>Bitmask Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1123"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1080"/> <source>The current client version is not supported by this provider.<br>Please update to latest version.<br><br>You can get the latest version from <a href='{0}'>{1}</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1124"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1081"/> <source>Update Needed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1134"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1091"/> <source>This provider is not compatible with the client.<br><br>Error: API version incompatible.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1134"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1091"/> <source>Incompatible Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="359"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="307"/> <source>Application error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="323"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="309"/> <source>You are trying to do an operation that requires logging in first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="398"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="367"/> <source>Unknown error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="402"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="371"/> <source>There was a server problem with authentication.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="406"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="375"/> <source>Could not establish a connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="410"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="379"/> <source>Invalid username or password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="959"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="916"/> <source>Hello!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="960"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="917"/> <source>Bitmask has started in the tray.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1419"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1376"/> <source>Succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1672"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1604"/> <source>The server at {0} can't be found, because the DNS lookup failed. DNS is the network service that translates a website's name to its Internet address. Either your computer is having trouble connecting to the network, or you are missing some helper files that are needed to securely use DNS while {1} is active. To install these helper files, quit this application and start it again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1674"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1606"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1932"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1863"/> <source>Quitting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1933"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1864"/> <source>Bitmask is quitting, please wait.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="361"/> - <source>There is a problem contacting the backend, please restart Bitmask.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1078"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1035"/> <source>bitmask.net/help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1086"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1043"/> <source>Email quick reference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1090"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1047"/> <source>For Thunderbird, you can use the Bitmask extension. Search for "Bitmask" in the add-on manager or download it from <a href='{0}'>addons.mozilla.org</a>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1094"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1051"/> <source>Alternately, you can manually configure your mail client to use Bitmask Email with these options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1094"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1051"/> <source>IMAP: localhost, port {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1095"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1052"/> <source>SMTP: localhost, port {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1097"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1054"/> <source>Username: your full email address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1099"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1056"/> <source>Password: any non-empty text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1108"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1065"/> <source><p><strong>{0}</strong></p><p>{1}</p><p>{2}<ul><li>&nbsp;{3}</li><li>&nbsp;{4}</li><li>&nbsp;{5}</li><li>&nbsp;{6}</li></ul></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1273"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1230"/> <source>Stop services</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1273"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1230"/> <source>Do you want to stop all services?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1277"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1234"/> <source>In order to change the provider, the running services needs to be stopped.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1741"/> + <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1673"/> <source>Disabled: missing helper files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="340"/> + <source>Pr&eferences...</source> + <translation type="unfinished"></translation> + </message> </context> <context> - <name>Preferences</name> + <name>PasswordChange</name> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="14"/> - <source>Preferences</source> + <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="20"/> + <source>Change Password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="28"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="35"/> + <source>New password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="52"/> + <source>Re-enter new password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="62"/> + <source>Current password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="40"/> - <source>Password Change</source> + <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="112"/> + <source><flash_label></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="49"/> - <source>&Current password:</source> + <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="150"/> + <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="66"/> - <source>&New password:</source> + <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="160"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PasswordWindow</name> + <message> + <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="72"/> + <source>Please log in to change your password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="83"/> - <source>&Re-enter new password:</source> + <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="78"/> + <source>Please wait for data storage to be ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="100"/> - <source>Change</source> + <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="107"/> + <source>Changing password...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="107"/> - <source><Password change status></source> + <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="122"/> + <source>Password changed successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="120"/> - <source>Enabled services</source> + <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="167"/> + <source>Password is empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="126"/> - <source>Save this provider settings</source> + <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="222"/> + <source>There was a problem changing the password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="133"/> + <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="235"/> + <source>You did not enter a correct current password.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Preferences</name> + <message> + <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="14"/> + <source>Preferences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="33"/> + <source>user@example.org</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="106"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PreferencesAccountPage</name> + <message> + <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="14"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="20"/> <source>Services</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="149"/> - <source><Select provider></source> + <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="32"/> + <source><provider_services_label></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="61"/> + <source>Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="157"/> - <source>Select provider:</source> + <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="73"/> + <source>Change Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="164"/> - <source>< Providers Services Status ></source> + <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="80"/> + <source><change_password_label></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/preferences_account_page.py" line="62"/> + <source>You must be logged in to change your password.</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>PreferencesWindow</name> + <name>PreferencesEmailPage</name> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="60"/> - <source>Automatic</source> + <location filename="../src/leap/bitmask/gui/ui/preferences_email_page.ui" line="14"/> + <source>Form</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>PreferencesVpnPage</name> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="170"/> - <source>Changing password...</source> + <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="14"/> + <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="252"/> - <source>Password changed successfully.</source> + <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="20"/> + <source><flash_label></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="436"/> - <source>There was a problem changing the password.</source> + <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="30"/> + <source>Default VPN Gateway:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="440"/> - <source>You did not enter a correct current password.</source> + <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="50"/> + <source>You must reconnect for changes to take effect.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="420"/> - <source>Services settings for provider '{0}' saved.</source> + <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="47"/> + <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="116"/> - <source>You need to enable {0} in order to change the password.</source> + <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="129"/> + <source>Error loading configuration file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="124"/> - <source>You need to wait until {0} is ready in order to change the password.</source> + <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="142"/> + <source>This is an uninitialized provider, please log in first.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PreferencesWindow</name> + <message> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="88"/> + <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="103"/> - <source>In order to change your password you need to be logged in.</source> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="99"/> + <source>VPN</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="109"/> + <source>Email</source> <translation type="unfinished"></translation> </message> </context> @@ -1335,47 +1375,47 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="136"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="132"/> <source>&Next ></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="138"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="134"/> <source>Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="328"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="325"/> <source>Starting registration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="373"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="370"/> <source>User %s successfully registered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="543"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="539"/> <source><font color='red'><b>Non-existent provider</b></font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="562"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="558"/> <source><font color='red'><b>%s</b></font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="590"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="586"/> <source>Unable to load provider configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="596"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="592"/> <source><font color='red'><b>Not a valid provider</b></font></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="701"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="698"/> <source>Something went wrong while trying to load service %s</source> <translation type="unfinished"></translation> </message> @@ -1405,22 +1445,22 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="400"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="397"/> <source>Something has gone wrong. Please try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="414"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="411"/> <source>The requested username is taken, choose another.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="682"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="677"/> <source>Services by {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/gui/wizard.py" line="743"/> + <location filename="../src/leap/bitmask/gui/wizard.py" line="739"/> <source>Register a new user with {0}</source> <translation type="unfinished"></translation> </message> @@ -1473,37 +1513,37 @@ Export canceled.</source> <context> <name>msg</name> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="219"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="222"/> <source>TAP Driver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="226"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="229"/> <source>Encrypted Internet uses VPN, which needs a TAP device installed and none has been found. This will ask for administrative privileges.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="344"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="347"/> <source>TUN Driver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="352"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="355"/> <source>Encrypted Internet uses VPN, which needs a kernel extension for a TUN device installed, and none has been found. This will ask for administrative privileges.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="153"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="156"/> <source>Problem installing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="154"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="157"/> <source>Some of the files could not be copied.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="347"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="350"/> <source>Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed?</source> <translation type="unfinished"></translation> </message> @@ -1513,7 +1553,7 @@ Export canceled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="427"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="430"/> <source>Missing Bitmask helpers</source> <translation type="unfinished"></translation> </message> @@ -1521,12 +1561,12 @@ Export canceled.</source> <context> <name>msgstr</name> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="396"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="399"/> <source>Some essential helper files are missing in your system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/platform_init/initializers.py" line="399"/> + <location filename="../src/leap/bitmask/platform_init/initializers.py" line="402"/> <source>Reinstall your debian packages, or make sure you place them by hand.</source> <translation type="unfinished"></translation> </message> @@ -1534,17 +1574,17 @@ Export canceled.</source> <context> <name>self._eip_status</name> <message> - <location filename="../src/leap/bitmask/services/eip/conductor.py" line="196"/> + <location filename="../src/leap/bitmask/services/eip/conductor.py" line="202"/> <source>{0} is restarting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/services/eip/conductor.py" line="307"/> + <location filename="../src/leap/bitmask/services/eip/conductor.py" line="313"/> <source>{0} could not be launched because you did not authenticate properly.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/leap/bitmask/services/eip/conductor.py" line="321"/> + <location filename="../src/leap/bitmask/services/eip/conductor.py" line="327"/> <source>{0} finished in an unexpected manner!</source> <translation type="unfinished"></translation> </message> diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 3338fe4f..bab134f5 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -27,7 +27,7 @@ zope.proxy pyzmq leap.common>=0.3.7 -leap.soledad.client>=0.5.0 +leap.soledad.client>=0.6.0 leap.keymanager>=0.3.8 leap.mail>=0.3.9 diff --git a/pkg/tuf/release.py b/pkg/tuf/release.py index c4abcd0d..0e1c989c 100755 --- a/pkg/tuf/release.py +++ b/pkg/tuf/release.py @@ -29,7 +29,6 @@ import sys from tuf.repository_tool import load_repository from tuf.repository_tool import import_rsa_privatekey_from_file -from tuf.repository_tool import import_rsa_publickey_from_file """ Days until the expiration of targets.json and snapshot.json. After this ammount @@ -102,6 +101,8 @@ class Targets(object): recursive_walk=True, followlinks=True) + self._remove_obsolete_targets(target_list) + for target in target_list: octal_file_permissions = oct(os.stat(target).st_mode)[3:] custom_file_permissions = { @@ -109,6 +110,26 @@ class Targets(object): } self._repo.targets.add_target(target, custom_file_permissions) + def _remove_obsolete_targets(self, target_list): + """ + Remove obsolete targets from TUF targets + + :param target_list: list of targets on full path comming from TUF + get_filepaths_in_directory + :type target_list: list(str) + """ + targets_path = os.path.join(self._repo_path, 'targets') + relative_path_list = map(lambda t: t.split("/targets")[1], target_list) + removed_targets = (set(self._repo.targets.target_files.keys()) + - set(relative_path_list)) + + for target in removed_targets: + target_rel_path = target + if target[0] == '/': + target_rel_path = target[1:] + target_path = os.path.join(targets_path, target_rel_path) + self._repo.targets.remove_target(target_path) + if __name__ == "__main__": main() diff --git a/relnotes.txt b/relnotes.txt index f2d28413..eab0f64a 100644 --- a/relnotes.txt +++ b/relnotes.txt @@ -1,8 +1,8 @@ -ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.6.1 +ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.7.0rc3 The LEAP team is pleased to announce the immediate availability of -version 0.6.1 of Bitmask, the Internet Encryption Toolkit, codename -"knock knock knocking on beta's door". +version 0.7.0rc3 of Bitmask, the Internet Encryption Toolkit, codename +"One window to rule them all, and in the darkness bind them." https://downloads.leap.se/client/ @@ -34,16 +34,14 @@ NOT trust your life to it. WHAT CAN THIS VERSION OF BITMASK DO FOR ME? -Bitmask 0.6.1 is the new stable version of the client after the big -refactor, with a little face lift of the UI while we were at -it. Encrypted Email is still not stable though, so don't use it for -high security. Encrypted Internet is the first service we are calling -stable, although its security level is just a bit higher than plain -OpenVPN, so use accordingly. You can refer to the CHANGELOG for the -meat. +Bitmask 0.7.0 brings with tremendous joy automatic and secure updates +through The Update Framework. Right beside TUF there are some bug +fixes and a new settings panel. -Encrypted Internet on Linux now avoids leaking traffic outside of -the secure connection it establishes. This will be added to other +You can read more about TUF in http://theupdateframework.com/ + +Encrypted Internet on Linux avoids leaking traffic outside of the +secure connection it establishes. This will be added to other platforms in the future. The Encrypted Mail services will run local SMTP and IMAP proxies that, @@ -90,7 +88,7 @@ You can send the bugs our way by pointing your telnet session to port our intensive bug-reeducation program. -LINUX ONLY: If you ever run into the situation where you cannot +LINUX ONLY: If you ever run into the situation where you cannot access internet, open the terminal and run the following command: $ pkexec /usr/local/sbin/bitmask-root firewall stop @@ -109,6 +107,6 @@ beyond any border. The LEAP team, -August 15, 2014 +October 28, 2014 Somewhere in the middle of the intertubes. EOF 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, diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index a5cd03d3..14ff5972 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -741,8 +741,8 @@ class EIPStatusWidget(QtGui.QWidget): # XXX this should change to polkit-kde where # applicable. self.tr("We could not find any authentication agent in your " - "system.<br/>Make sure you have" - "<b>polkit-gnome-authentication-agent-1</b> running and" + "system.<br/>Make sure you have " + "<b>polkit-gnome-authentication-agent-1</b> running and " "try again."), error=True) self.set_eipstatus_off() diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py index 360dd5f0..463d2412 100644 --- a/src/leap/bitmask/gui/loggerwindow.py +++ b/src/leap/bitmask/gui/loggerwindow.py @@ -225,7 +225,7 @@ class LoggerWindow(QtGui.QDialog): msg = self.tr("Sending logs to Pastebin failed!") if isinstance(failure, pastebin.PostLimitError): - msg = self.tr('Maximum posts per day reached') + msg = self.tr('Maximum amount of submissions reached for today.') # We save the dialog in an instance member to avoid dialog being # deleted right after we exit this method diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py index d523f449..92e1e4c4 100644 --- a/src/leap/bitmask/gui/mail_status.py +++ b/src/leap/bitmask/gui/mail_status.py @@ -228,7 +228,7 @@ class MailStatusWidget(QtGui.QWidget): self._service_name)) elif ready == 1: icon = self.CONNECTING_ICON - self._mx_status = self.tr('Starting…') + self._mx_status = self.tr('Starting...') tray_status = self.tr('Mail is starting') elif ready >= 2: icon = self.CONNECTED_ICON diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui index 41b3c28d..7cc5bb3c 100644 --- a/src/leap/bitmask/gui/ui/preferences_email_page.ui +++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui @@ -13,19 +13,6 @@ <property name="windowTitle"> <string>Form</string> </property> - <widget class="QPushButton" name="pushButton"> - <property name="geometry"> - <rect> - <x>250</x> - <y>210</y> - <width>98</width> - <height>27</height> - </rect> - </property> - <property name="text"> - <string>PushButton</string> - </property> - </widget> </widget> <resources/> <connections/> diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 02ad9403..c4e43bfe 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -45,8 +45,7 @@ from leap.common.files import which from leap.keymanager import KeyManager, openpgp from leap.keymanager.errors import KeyNotFound from leap.soledad.common.errors import InvalidAuthTokenError -from leap.soledad.client import Soledad -from leap.soledad.client import BootstrapSequenceError +from leap.soledad.client import Soledad, BootstrapSequenceError logger = logging.getLogger(__name__) |