diff options
| -rw-r--r-- | data/ts/en_US.ts | 94 | ||||
| -rw-r--r-- | src/leap/gui/firstrun/last.py | 8 | ||||
| -rw-r--r-- | src/leap/gui/firstrun/login.py | 10 | ||||
| -rw-r--r-- | src/leap/gui/firstrun/providerselect.py | 7 | ||||
| -rw-r--r-- | src/leap/gui/firstrun/register.py | 8 | ||||
| -rw-r--r-- | src/leap/gui/firstrun/regvalidation.py | 4 | 
6 files changed, 107 insertions, 24 deletions
| diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index a802dd75..a7e13dec 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -57,6 +57,24 @@      </message>  </context>  <context> +    <name>LastPage</name> +    <message> +        <location filename="../src/leap/gui/firstrun/last.py" line="18"/> +        <source>Connecting to Encrypted Internet Proxy service...</source> +        <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> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <location filename="../src/leap/gui/firstrun/last.py" line="58"/> +        <source>Click '<i>%s</i>' to end the wizard and save your settings.</source> +        <translation type="unfinished"></translation> +    </message> +</context> +<context>      <name>LogInPage</name>      <message>          <location filename="../src/leap/gui/firstrun/login.py" line="96"/> @@ -78,6 +96,31 @@          <source>Credentials validated.</source>          <translation type="unfinished"></translation>      </message> +    <message> +        <location filename="../src/leap/gui/firstrun/login.py" line="24"/> +        <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> +    <message> +        <location filename="../src/leap/gui/firstrun/login.py" line="38"/> +        <source>User &name:</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <location filename="../src/leap/gui/firstrun/login.py" line="53"/> +        <source>&Password:</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <location filename="../src/leap/gui/firstrun/login.py" line="80"/> +        <source>Log in</source> +        <translation type="unfinished"></translation> +    </message>  </context>  <context>      <name>ProviderInfoPage</name> @@ -177,6 +220,26 @@          <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 &name:</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <location filename="../src/leap/gui/firstrun/register.py" line="60"/> +        <source>&Password:</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <location filename="../src/leap/gui/firstrun/register.py" line="66"/> +        <source>Password (again):</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <location filename="../src/leap/gui/firstrun/register.py" line="72"/> +        <source>&Remember username and password.</source> +        <translation type="unfinished"></translation> +    </message>  </context>  <context>      <name>RegisterUserValidationPage</name> @@ -195,6 +258,16 @@          <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> +        <translation type="unfinished"></translation> +    </message>  </context>  <context>      <name>SelectProviderPage</name> @@ -248,11 +321,20 @@          <source>fetching provider info</source>          <translation type="unfinished"></translation>      </message> -</context> -<context> -    <name>TestyClass</name> -</context> -<context> -    <name>this is a cat</name> +    <message> +        <location filename="../src/leap/gui/firstrun/providerselect.py" line="103"/> +        <source>&Trust this provider certificate.</source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <location filename="../src/leap/gui/firstrun/providerselect.py" line="346"/> +        <source>Do you want to <b>trust this provider certificate?</b></source> +        <translation type="unfinished"></translation> +    </message> +    <message> +        <location filename="../src/leap/gui/firstrun/providerselect.py" line="349"/> +        <source>SHA-256 fingerprint: <i>%s</i><br></source> +        <translation type="unfinished"></translation> +    </message>  </context>  </TS> diff --git a/src/leap/gui/firstrun/last.py b/src/leap/gui/firstrun/last.py index 1d8caca4..e097b2ae 100644 --- a/src/leap/gui/firstrun/last.py +++ b/src/leap/gui/firstrun/last.py @@ -15,7 +15,7 @@ class LastPage(QtGui.QWizardPage):      def __init__(self, parent=None):          super(LastPage, self).__init__(parent) -        self.setTitle("Connecting to Encrypted Internet Proxy service...") +        self.setTitle(self.tr("Connecting to Encrypted Internet Proxy service..."))          self.setPixmap(              QtGui.QWizard.LogoPixmap, @@ -51,13 +51,13 @@ class LastPage(QtGui.QWizardPage):              statusline.setText(status)      def set_finished_status(self): -        self.setTitle('You are now using an encrypted connection!') +        self.setTitle(self.tr('You are now using an encrypted connection!'))          finishText = self.wizard().buttonText(              QtGui.QWizard.FinishButton)          finishText = finishText.replace('&', '') -        self.label.setText( +        self.label.setText(self.tr(              "Click '<i>%s</i>' to end the wizard and " -            "save your settings." % finishText) +            "save your settings." % finishText))          # XXX init network checker          # trigger signal diff --git a/src/leap/gui/firstrun/login.py b/src/leap/gui/firstrun/login.py index 6bf0605d..e39eecc0 100644 --- a/src/leap/gui/firstrun/login.py +++ b/src/leap/gui/firstrun/login.py @@ -21,8 +21,8 @@ class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage          super(LogInPage, self).__init__(parent)          self.current_page = "login" -        self.setTitle("Log In") -        self.setSubTitle("Log in with your credentials.") +        self.setTitle(self.tr("Log In")) +        self.setSubTitle(self.tr("Log in with your credentials."))          self.current_page = "login"          self.setPixmap( @@ -35,7 +35,7 @@ class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage          self.do_confirm_next = False      def setupUI(self): -        userNameLabel = QtGui.QLabel("User &name:") +        userNameLabel = QtGui.QLabel(self.tr("User &name:"))          userNameLineEdit = QtGui.QLineEdit()          userNameLineEdit.cursorPositionChanged.connect(              self.reset_validation_status) @@ -50,7 +50,7 @@ class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage              #'username@provider.example.org')          self.userNameLineEdit = userNameLineEdit -        userPasswordLabel = QtGui.QLabel("&Password:") +        userPasswordLabel = QtGui.QLabel(self.tr("&Password:"))          self.userPasswordLineEdit = QtGui.QLineEdit()          self.userPasswordLineEdit.setEchoMode(              QtGui.QLineEdit.Password) @@ -77,7 +77,7 @@ class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage          layout.addWidget(self.valFrame, 4, 2, 4, 2)          self.valFrame.hide() -        self.nextText("Log in") +        self.nextText(self.tr("Log in"))          self.setLayout(layout)          #self.registerField('is_login_wizard') diff --git a/src/leap/gui/firstrun/providerselect.py b/src/leap/gui/firstrun/providerselect.py index 62742181..28fb829c 100644 --- a/src/leap/gui/firstrun/providerselect.py +++ b/src/leap/gui/firstrun/providerselect.py @@ -101,7 +101,7 @@ class SelectProviderPage(InlineValidationPage):          self.certInfo.setWordWrap(True)          self.certWarning = QtGui.QLabel("")          self.trustProviderCertCheckBox = QtGui.QCheckBox( -            "&Trust this provider certificate.") +            self.tr("&Trust this provider certificate."))          self.trustProviderCertCheckBox.stateChanged.connect(              self.onTrustCheckChanged) @@ -344,9 +344,10 @@ class SelectProviderPage(InlineValidationPage):      def add_cert_info(self, certinfo):  # pragma: no cover XXX          self.certWarning.setText( -            "Do you want to <b>trust this provider certificate?</b>") +            self.tr("Do you want to <b>trust this provider certificate?</b>")) +        # XXX Check if this needs to abstracted to remove certinfo          self.certInfo.setText( -            'SHA-256 fingerprint: <i>%s</i><br>' % certinfo) +            self.tr('SHA-256 fingerprint: <i>%s</i><br>' % certinfo))          self.certInfo.setWordWrap(True)          self.certinfoGroup.show() diff --git a/src/leap/gui/firstrun/register.py b/src/leap/gui/firstrun/register.py index 4c811093..b04638e0 100644 --- a/src/leap/gui/firstrun/register.py +++ b/src/leap/gui/firstrun/register.py @@ -45,7 +45,7 @@ class RegisterUserPage(InlineValidationPage, UserFormMixIn):          self.focused_field = False      def setupUI(self): -        userNameLabel = QtGui.QLabel("User &name:") +        userNameLabel = QtGui.QLabel(self.tr("User &name:"))          userNameLineEdit = QtGui.QLineEdit()          userNameLineEdit.cursorPositionChanged.connect(              self.reset_validation_status) @@ -57,20 +57,20 @@ class RegisterUserPage(InlineValidationPage, UserFormMixIn):              QtGui.QRegExpValidator(usernameRe, self))          self.userNameLineEdit = userNameLineEdit -        userPasswordLabel = QtGui.QLabel("&Password:") +        userPasswordLabel = QtGui.QLabel(self.tr("&Password:"))          self.userPasswordLineEdit = QtGui.QLineEdit()          self.userPasswordLineEdit.setEchoMode(              QtGui.QLineEdit.Password)          userPasswordLabel.setBuddy(self.userPasswordLineEdit) -        userPassword2Label = QtGui.QLabel("Password (again):") +        userPassword2Label = QtGui.QLabel(self.tr("Password (again):"))          self.userPassword2LineEdit = QtGui.QLineEdit()          self.userPassword2LineEdit.setEchoMode(              QtGui.QLineEdit.Password)          userPassword2Label.setBuddy(self.userPassword2LineEdit)          rememberPasswordCheckBox = QtGui.QCheckBox( -            "&Remember username and password.") +            self.tr("&Remember username and password."))          rememberPasswordCheckBox.setChecked(True)          self.registerField('userName*', self.userNameLineEdit) diff --git a/src/leap/gui/firstrun/regvalidation.py b/src/leap/gui/firstrun/regvalidation.py index b86583e0..6135a290 100644 --- a/src/leap/gui/firstrun/regvalidation.py +++ b/src/leap/gui/firstrun/regvalidation.py @@ -31,9 +31,9 @@ class RegisterUserValidationPage(ValidationPage):          super(RegisterUserValidationPage, self).__init__(parent)          self.current_page = "signupvalidation" -        title = "Connecting..." +        title = self.tr("Connecting...")          # XXX uh... really? -        subtitle = "Checking connection with provider." +        subtitle = self.tr("Checking connection with provider.")          self.setTitle(title)          self.setSubTitle(subtitle) | 
