← Back to branch summary

~tkluck/ubuntu/precise/gnome-shell/lp883443

« back to all changes in this revision

Viewing changes to js/ui/polkitAuthenticationAgent.js

  • Committer: Bazaar Package Importer
  • Author(s): Raphaël Hertzog, Frederic Peters, Raphaël Hertzog, Laurent Bigonville
  • Date: 2011-04-11 21:03:31 UTC
  • mfrom: (1.1.22 upstream)
  • mto: (18.1.1 sid)
  • mto: This revision was merged to the branch mainline in revision 25.
  • Revision ID: james.westby@ubuntu.com-20110411210331-345p7j40vf0wp6t1
Tags: 3.0.0.2-1
* Team upload.

[ Frederic Peters ]
* New upstream release (2.91.93).
* debian/control.in:
  + added dependency on gnome-icon-theme-symbolic.
  + bumped gnome-shell dependency.
  + bumped gir1.2-freedesktop build-dep to 0.10.6, for a fix to
    cairo-1.0.typelib

[ Raphaël Hertzog ]
* New upstream release (3.0.0.2).
* New patch 02_rpath-bluetooth-applet.patch by Rico Tzschichholz to
  add an RPATH so that the compilation doesn't fail when g-ir-scanner
  tries to analyze libgnome-shell.so linked against
  libgnome-bluetooth-applet.so.0 which is in a private directory.
* Add a lintian override for the RPATH that we can't avoid.
* Teach dpkg-shlibdeps how to find that private lib and add the
  corresponding dependency in debian/slibs.local.
* Update and add a bunch of build-depends to match the latest configure
  requirements.
* Add gir1.2-gnomebluetooth-1.0 and gir1.2-networkmanager-1.0 to Depends
  because they are needed to benefit from the improved UI associated to the
  respective status bar applet.

[ Laurent Bigonville ]
* debian/control.in: {Build-}Depends against gir1.2-mutter-3.0 instead of
  gir1.2-mutter-2.91

Show diffs side-by-side

added added

removed removed

Lines of Context:
js/ui/polkitAuthenticationAgent.js
71
71
                           { y_align: St.Align.START });
72
72
 
73
73
        this._subjectLabel = new St.Label({ style_class: 'polkit-dialog-headline',
74
 
                                            text: _('Authentication Required') });
 
74
                                            text: _("Authentication Required") });
75
75
 
76
76
        messageBox.add(this._subjectLabel,
77
77
                       { y_fill:  false,
105
105
        let userIsRoot = false;
106
106
        if (userName == 'root') {
107
107
            userIsRoot = true;
108
 
            userRealName = _('Administrator');
 
108
            userRealName = _("Administrator");
109
109
        }
110
110
 
111
111
        if (userIsRoot) {
139
139
        this._passwordLabel = new St.Label(({ style_class: 'polkit-dialog-password-label' }));
140
140
        this._passwordBox.add(this._passwordLabel);
141
141
        this._passwordEntry = new St.Entry({ style_class: 'polkit-dialog-password-entry',
142
 
                                             text: _(''),
 
142
                                             text: "",
143
143
                                             can_focus: true});
144
144
        this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivate));
145
145
        this._passwordBox.add(this._passwordEntry,
169
169
        messageBox.add(this._nullMessageLabel);
170
170
        this._nullMessageLabel.show();
171
171
 
172
 
        this.setButtons([{ label: _('Cancel'),
 
172
        this.setButtons([{ label: _("Cancel"),
173
173
                           action: Lang.bind(this, this.cancel),
174
174
                           key:    Clutter.Escape
175
175
                         },
176
 
                         { label:  _('Authenticate'),
 
176
                         { label:  _("Authenticate"),
177
177
                           action: Lang.bind(this, this._onAuthenticateButtonPressed)
178
178
                         }]);
179
179
 
257
257
             * show "Sorry, that didn't work. Please try again."
258
258
             */
259
259
            if (!this._errorMessageLabel.visible && !this._wasDismissed) {
260
 
                this._errorMessageLabel.set_text(_('Sorry, that didn\'t work. Please try again.'));
 
260
                /* Translators: "that didn't work" refers to the fact that the
 
261
                 * requested authentication was not gained; this can happen
 
262
                 * because of an authentication error (like invalid password),
 
263
                 * for instance. */
 
264
                this._errorMessageLabel.set_text(_("Sorry, that didn\'t work. Please try again."));
261
265
                this._errorMessageLabel.show();
262
266
                this._infoMessageLabel.hide();
263
267
                this._nullMessageLabel.hide();
269
273
    _onSessionRequest: function(session, request, echo_on) {
270
274
        // Cheap localization trick
271
275
        if (request == 'Password:')
272
 
            this._passwordLabel.set_text(_('Password:'));
 
276
            this._passwordLabel.set_text(_("Password:"));
273
277
        else
274
278
            this._passwordLabel.set_text(request);
275
279