summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-02-09 22:27:22 -0200
committerdrebs <drebs@leap.se>2013-02-09 22:27:22 -0200
commit46a3373295a683db9b66c233b07a7a948b8147bc (patch)
tree410a47871bfd8654ddabbb53f3c29a89c1550e71 /data
parente726f3df7c7efbe4069846468ffdbed6829ccfc4 (diff)
parentb376948ccd59aa02022123102eaae359a536e4e6 (diff)
Merge branch 'develop' into feature/soledad-api
Diffstat (limited to 'data')
-rw-r--r--data/images/conn_connected.pngbin3031 -> 426 bytes
-rw-r--r--data/images/conn_connecting.pngbin3213 -> 712 bytes
-rw-r--r--data/images/conn_error.pngbin3571 -> 1429 bytes
-rw-r--r--data/images/leap-color-small.pngbin11909 -> 10100 bytes
-rw-r--r--data/resources/locale.qrc3
-rw-r--r--data/resources/mainwindow.qrc1
-rw-r--r--data/translations/de.qmbin0 -> 6036 bytes
-rw-r--r--data/ts/en_US.ts195
8 files changed, 102 insertions, 97 deletions
diff --git a/data/images/conn_connected.png b/data/images/conn_connected.png
index 6a5bcba9..a5d20497 100644
--- a/data/images/conn_connected.png
+++ b/data/images/conn_connected.png
Binary files differ
diff --git a/data/images/conn_connecting.png b/data/images/conn_connecting.png
index 35cb0f6a..31b6e617 100644
--- a/data/images/conn_connecting.png
+++ b/data/images/conn_connecting.png
Binary files differ
diff --git a/data/images/conn_error.png b/data/images/conn_error.png
index ac1391df..85669af6 100644
--- a/data/images/conn_error.png
+++ b/data/images/conn_error.png
Binary files differ
diff --git a/data/images/leap-color-small.png b/data/images/leap-color-small.png
index afabe2c9..bc9d4e7f 100644
--- a/data/images/leap-color-small.png
+++ b/data/images/leap-color-small.png
Binary files differ
diff --git a/data/resources/locale.qrc b/data/resources/locale.qrc
index 53576b49..47fb5243 100644
--- a/data/resources/locale.qrc
+++ b/data/resources/locale.qrc
@@ -1,5 +1,6 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
-<file>../translations/leap_client_es.qm</file>
+<file>../translations/es.qm</file>
+<file>../translations/de.qm</file>
</qresource>
</RCC>
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc
index 59abdbcd..58f59c9d 100644
--- a/data/resources/mainwindow.qrc
+++ b/data/resources/mainwindow.qrc
@@ -3,7 +3,6 @@
<file>../images/conn_error.png</file>
<file>../images/conn_connecting.png</file>
<file>../images/conn_connected.png</file>
- <file>../images/leapfrog.jpg</file>
<file>../images/leap-color-small.png</file>
<file>../images/Dialog-accept.png</file>
<file>../images/Dialog-error.png</file>
diff --git a/data/translations/de.qm b/data/translations/de.qm
new file mode 100644
index 00000000..b2f04f22
--- /dev/null
+++ b/data/translations/de.qm
Binary files differ
diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts
index 3fdb38da..d2cba837 100644
--- a/data/ts/en_US.ts
+++ b/data/ts/en_US.ts
@@ -1,14 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="2.0">
<context>
+ <name>ConnectionPage</name>
+ <message>
+ <location filename="../src/leap/gui/firstrun/connect.py" line="26"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/gui/firstrun/connect.py" line="27"/>
+ <source>Setting up a encrypted connection with the provider</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/gui/firstrun/connect.py" line="85"/>
+ <source>Getting EIP configuration files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/gui/firstrun/connect.py" line="101"/>
+ <source>Authentication error: %s</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/gui/firstrun/connect.py" line="109"/>
+ <source>Getting EIP certificate</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EIPConductorAppMixin</name>
<message>
- <location filename="../src/leap/baseapp/eip.py" line="198"/>
+ <location filename="../src/leap/baseapp/eip.py" line="221"/>
<source>&amp;Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/baseapp/eip.py" line="212"/>
+ <location filename="../src/leap/baseapp/eip.py" line="235"/>
<source>&amp;Connect</source>
<translation type="unfinished"></translation>
</message>
@@ -41,11 +69,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/eip/exceptions.py" line="111"/>
- <source>Another OpenVPN Process has been detected.Please close it before starting leap-client</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/leap/eip/exceptions.py" line="119"/>
<source>Server does not allow secure connections</source>
<translation type="unfinished"></translation>
@@ -60,6 +83,11 @@
<source>We could not find your eip certs in the expected path</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/leap/eip/exceptions.py" line="111"/>
+ <source>Another OpenVPN Process has been detected. Please close it before starting leap-client</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Errors</name>
@@ -98,22 +126,22 @@
<name>IntroPage</name>
<message>
<location filename="../src/leap/gui/firstrun/intro.py" line="14"/>
- <source>First run wizard.</source>
+ <source>First run wizard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/intro.py" line="24"/>
- <source>Now we will guide you through some configuration that is needed before you can connect for the first time.&lt;br&gt;&lt;br&gt;If you ever need to modify these options again, you can find the wizard in the &apos;&lt;i&gt;Settings&lt;/i&gt;&apos; menu from the main window.&lt;br&gt;&lt;br&gt;Do you want to &lt;b&gt;sign up&lt;/b&gt; for a new account, or &lt;b&gt;log in&lt;/b&gt; with an already existing username?&lt;br&gt;</source>
+ <location filename="../src/leap/gui/firstrun/intro.py" line="37"/>
+ <source>Sign up for a new account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/intro.py" line="37"/>
- <source>Sign up for a new account.</source>
+ <location filename="../src/leap/gui/firstrun/intro.py" line="40"/>
+ <source>Log In with my credentials</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/intro.py" line="40"/>
- <source>Log In with my credentials.</source>
+ <location filename="../src/leap/gui/firstrun/intro.py" line="24"/>
+ <source>Now we will guide you through some configuration that is needed before you can connect for the first time.&lt;br&gt;&lt;br&gt;If you ever need to modify these options again, you can find the wizard in the &apos;&lt;i&gt;Settings&lt;/i&gt;&apos; menu from the main window.&lt;br&gt;&lt;br&gt;Do you want to &lt;b&gt;sign up&lt;/b&gt; for a new account, or &lt;b&gt;log in&lt;/b&gt; with an already existing username?&lt;br&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -125,13 +153,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/last.py" line="54"/>
- <source>You are now using an encrypted connection!</source>
+ <location filename="../src/leap/gui/firstrun/last.py" line="66"/>
+ <source>Click &apos;&lt;i&gt;%s&lt;/i&gt;&apos; to end the wizard and save your settings.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/last.py" line="58"/>
- <source>Click &apos;&lt;i&gt;%s&lt;/i&gt;&apos; to end the wizard and save your settings.</source>
+ <location filename="../src/leap/gui/firstrun/last.py" line="62"/>
+ <source>You are now using an encrypted connection!</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -163,11 +191,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/login.py" line="25"/>
- <source>Log in with your credentials.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/leap/gui/firstrun/login.py" line="38"/>
<source>User &amp;name:</source>
<translation type="unfinished"></translation>
@@ -182,16 +205,21 @@
<source>Log in</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/leap/gui/firstrun/login.py" line="25"/>
+ <source>Log in with your credentials</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>LogPaneMixin</name>
<message>
- <location filename="../src/leap/baseapp/log.py" line="24"/>
+ <location filename="../src/leap/baseapp/log.py" line="25"/>
<source>&amp;Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/baseapp/log.py" line="37"/>
+ <location filename="../src/leap/baseapp/log.py" line="38"/>
<source>Disconnected</source>
<translation type="unfinished"></translation>
</message>
@@ -200,42 +228,47 @@
<name>ProviderInfoPage</name>
<message>
<location filename="../src/leap/gui/firstrun/providerinfo.py" line="19"/>
- <source>Provider Info</source>
+ <source>Provider Information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/leap/gui/firstrun/providerinfo.py" line="20"/>
- <source>This is what provider says.</source>
+ <source>Services offered by this provider</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/gui/firstrun/providerinfo.py" line="95"/>
+ <source>enrollment policy</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProviderSetupValidationPage</name>
<message>
- <location filename="../src/leap/gui/firstrun/providersetup.py" line="26"/>
+ <location filename="../src/leap/gui/firstrun/providersetup.py" line="28"/>
<source>Provider setup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providersetup.py" line="27"/>
- <source>Doing autoconfig.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/gui/firstrun/providersetup.py" line="83"/>
+ <location filename="../src/leap/gui/firstrun/providersetup.py" line="85"/>
<source>Fetching CA certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providersetup.py" line="105"/>
+ <location filename="../src/leap/gui/firstrun/providersetup.py" line="107"/>
<source>Checking CA fingerprint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providersetup.py" line="134"/>
+ <location filename="../src/leap/gui/firstrun/providersetup.py" line="125"/>
<source>Validating api certificate</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/leap/gui/firstrun/providersetup.py" line="29"/>
+ <source>Gathering configuration options for this provider</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RegisterUserPage</name>
@@ -250,51 +283,46 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/register.py" line="238"/>
+ <location filename="../src/leap/gui/firstrun/register.py" line="244"/>
<source>Password does not match..</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/register.py" line="242"/>
+ <location filename="../src/leap/gui/firstrun/register.py" line="248"/>
<source>Password too short.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/register.py" line="247"/>
+ <location filename="../src/leap/gui/firstrun/register.py" line="253"/>
<source>Password too obvious.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/register.py" line="279"/>
+ <location filename="../src/leap/gui/firstrun/register.py" line="282"/>
<source>Error connecting to provider (timeout)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/register.py" line="284"/>
+ <location filename="../src/leap/gui/firstrun/register.py" line="287"/>
<source>Error Connecting to provider (connerr).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/register.py" line="292"/>
+ <location filename="../src/leap/gui/firstrun/register.py" line="295"/>
<source>Error during registration (%s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/register.py" line="302"/>
+ <location filename="../src/leap/gui/firstrun/register.py" line="305"/>
<source>Could not register (bad response)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/register.py" line="309"/>
+ <location filename="../src/leap/gui/firstrun/register.py" line="312"/>
<source>Username not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/register.py" line="375"/>
- <source>Register a new user with provider %s.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/leap/gui/firstrun/register.py" line="48"/>
<source>User &amp;name:</source>
<translation type="unfinished"></translation>
@@ -314,32 +342,9 @@
<source>&amp;Remember username and password.</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>RegisterUserValidationPage</name>
- <message>
- <location filename="../src/leap/gui/firstrun/regvalidation.py" line="95"/>
- <source>Fetching provider config...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/gui/firstrun/regvalidation.py" line="112"/>
- <source>Authentication error: %s</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/gui/firstrun/regvalidation.py" line="117"/>
- <source>Fetching eip certificate</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/gui/firstrun/regvalidation.py" line="34"/>
- <source>Connecting...</source>
- <translation type="unfinished"></translation>
- </message>
<message>
- <location filename="../src/leap/gui/firstrun/regvalidation.py" line="36"/>
- <source>Checking connection with provider.</source>
+ <location filename="../src/leap/gui/firstrun/register.py" line="378"/>
+ <source>Register a new user with provider &lt;em&gt;%s&lt;/em&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -351,11 +356,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providerselect.py" line="33"/>
- <source>Please enter the domain of the provider you want to use for your connection.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/leap/gui/firstrun/providerselect.py" line="87"/>
<source>chec&amp;k!</source>
<translation type="unfinished"></translation>
@@ -371,43 +371,48 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providerselect.py" line="222"/>
- <source>checking domain name</source>
+ <location filename="../src/leap/gui/firstrun/providerselect.py" line="290"/>
+ <source>Could not get info from provider.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providerselect.py" line="276"/>
- <source>checking https connection</source>
+ <location filename="../src/leap/gui/firstrun/providerselect.py" line="293"/>
+ <source>Could not download provider info (refused conn.).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providerselect.py" line="292"/>
- <source>Could not get info from provider.</source>
+ <location filename="../src/leap/gui/firstrun/providerselect.py" line="103"/>
+ <source>&amp;Trust this provider certificate.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providerselect.py" line="295"/>
- <source>Could not download provider info (refused conn.).</source>
+ <location filename="../src/leap/gui/firstrun/providerselect.py" line="344"/>
+ <source>Do you want to &lt;b&gt;trust this provider certificate?&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providerselect.py" line="305"/>
- <source>fetching provider info</source>
+ <location filename="../src/leap/gui/firstrun/providerselect.py" line="347"/>
+ <source>SHA-256 fingerprint: &lt;i&gt;%s&lt;/i&gt;&lt;br&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providerselect.py" line="103"/>
- <source>&amp;Trust this provider certificate.</source>
+ <location filename="../src/leap/gui/firstrun/providerselect.py" line="33"/>
+ <source>Please enter the domain of the provider you want to use for your connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providerselect.py" line="346"/>
- <source>Do you want to &lt;b&gt;trust this provider certificate?&lt;/b&gt;</source>
+ <location filename="../src/leap/gui/firstrun/providerselect.py" line="222"/>
+ <source>Checking if it is a valid provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/gui/firstrun/providerselect.py" line="349"/>
- <source>SHA-256 fingerprint: &lt;i&gt;%s&lt;/i&gt;&lt;br&gt;</source>
+ <location filename="../src/leap/gui/firstrun/providerselect.py" line="276"/>
+ <source>Checking for a secure connection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/gui/firstrun/providerselect.py" line="303"/>
+ <source>Getting info from the provider</source>
<translation type="unfinished"></translation>
</message>
</context>