← Back to branch summary

~ci-train-bot/ubuntu-settings-components/ubuntu-settings-components-ubuntu-yakkety-landing-001

« back to all changes in this revision

Viewing changes to plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml

  • Committer: CI Train Bot
  • Author(s): jonas-drange
  • Date: 2016-04-27 12:32:13 UTC
  • mfrom: (122.1.7 lp1567389)
  • Revision ID: ci-train-bot@canonical.com-20160427123213-tc58m4bes3wryrb0
* Make Cancel/Ok buttons visible always
* Add support for TLS, Password, Password+TLS and Static auth types. Fixes: #1558531, #1567389

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Ubuntu/Settings/Vpn/Pptp/Editor.qml
113
113
    Label {
114
114
        text: i18n.dtr("ubuntu-settings-components", "Server:")
115
115
        font.bold: true
116
 
        color: Theme.palette.normal.baseText
 
116
        color: theme.palette.normal.baseText
117
117
        elide: Text.ElideRight
118
118
    }
119
119
 
145
145
 
146
146
    Label {
147
147
        font.bold: true
148
 
        color: Theme.palette.normal.baseText
 
148
        color: theme.palette.normal.baseText
149
149
        elide: Text.ElideRight
150
150
        text: i18n.dtr("ubuntu-settings-components", "User:")
151
151
    }
160
160
 
161
161
    Label {
162
162
        font.bold: true
163
 
        color: Theme.palette.normal.baseText
 
163
        color: theme.palette.normal.baseText
164
164
        elide: Text.ElideRight
165
165
        text: i18n.dtr("ubuntu-settings-components", "Password:")
166
166
    }
175
175
 
176
176
    Label {
177
177
        font.bold: true
178
 
        color: Theme.palette.normal.baseText
 
178
        color: theme.palette.normal.baseText
179
179
        elide: Text.ElideRight
180
180
        text: i18n.dtr("ubuntu-settings-components", "NT Domain:")
181
181
    }
191
191
    Label {
192
192
        text: i18n.dtr("ubuntu-settings-components", "Authentication methods:")
193
193
        font.bold: true
194
 
        color: Theme.palette.normal.baseText
 
194
        color: theme.palette.normal.baseText
195
195
        elide: Text.ElideRight
196
196
    }
197
197