Commit 653981a1 authored by Michael Terry's avatar Michael Terry

use consistent 'connect-to' wording in password dialogs

parent 6a848bba
......@@ -136,11 +136,12 @@ public class BackendRackspace : Backend
void ask_password() {
mount_op.set("label_help", _("You can sign up for a Rackspace Cloud Files account <a href=\"%s\">online</a>.").printf("https://signup.rackspacecloud.com/signup"));
mount_op.set("label_title", _("Connect to Rackspace Cloud Files"));
mount_op.set("label_password", _("_API access key"));
mount_op.set("label_show_password", _("S_how API access key"));
mount_op.set("label_remember_password", _("_Remember API access key"));
mount_op.reply.connect(got_password_reply);
mount_op.ask_password(_("Enter Rackspace Cloud Files API key"), id, "",
mount_op.ask_password("", id, "",
AskPasswordFlags.NEED_PASSWORD |
AskPasswordFlags.NEED_USERNAME |
AskPasswordFlags.SAVING_SUPPORTED);
......
......@@ -191,12 +191,13 @@ public class BackendS3 : Backend
void ask_password() {
mount_op.set("label_help", _("You can sign up for an Amazon S3 account <a href=\"%s\">online</a>.").printf("http://aws.amazon.com/s3/"));
mount_op.set("label_title", _("Connect to Amazon S3"));
mount_op.set("label_username", _("_Access key ID"));
mount_op.set("label_password", _("_Secret access key"));
mount_op.set("label_show_password", _("S_how secret access key"));
mount_op.set("label_remember_password", _("_Remember secret access key"));
mount_op.reply.connect(got_password_reply);
mount_op.ask_password(_("Enter Amazon S3 access key"), id, "",
mount_op.ask_password("", id, "",
AskPasswordFlags.NEED_PASSWORD |
AskPasswordFlags.NEED_USERNAME |
AskPasswordFlags.SAVING_SUPPORTED);
......
......@@ -217,9 +217,10 @@ public class BackendU1 : Backend
}
void ask_password() {
mount_op.set("label_title", _("Connect to Ubuntu One"));
mount_op.set("label_button", _("Sign into Ubuntu One…"));
mount_op.connect("signal::button-clicked", sign_in, null);
mount_op.ask_password(_("Connect to Ubuntu One"), "", "", 0);
mount_op.ask_password("", "", "", 0);
}
async void sign_in()
......
......@@ -33,6 +33,7 @@ public class MountOperationAssistant : MountOperation
{
public string label_button {get; set;}
public string label_help {get; set;}
public string label_title {get; set; default = _("Connect to Server");}
public string label_username {get; set; default = _("_Username");}
public string label_password {get; set; default = _("_Password");}
public string label_show_password {get; set; default = _("S_how password");}
......@@ -135,7 +136,7 @@ public class MountOperationAssistant : MountOperation
Gtk.Label label;
// Display user message
assist.set_page_title(password_page, _("Connect to Server"));
assist.set_page_title(password_page, label_title);
label = new Gtk.Label(message);
label.xalign = 0.0f;
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: mike@mterry.name\n"
"POT-Creation-Date: 2011-08-18 15:05-0400\n"
"POT-Creation-Date: 2011-08-18 15:35-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -395,19 +395,19 @@ msgid ""
msgstr ""
#: ../common/BackendRackspace.vala:139
msgid "_API access key"
msgid "Connect to Rackspace Cloud Files"
msgstr ""
#: ../common/BackendRackspace.vala:140
msgid "S_how API access key"
msgid "_API access key"
msgstr ""
#: ../common/BackendRackspace.vala:141
msgid "_Remember API access key"
msgid "S_how API access key"
msgstr ""
#: ../common/BackendRackspace.vala:143
msgid "Enter Rackspace Cloud Files API key"
#: ../common/BackendRackspace.vala:142
msgid "_Remember API access key"
msgstr ""
#: ../common/BackendS3.vala:122 ../widgets/ConfigLocation.vala:175
......@@ -426,23 +426,23 @@ msgid "You can sign up for an Amazon S3 account <a href=\"%s\">online</a>."
msgstr ""
#: ../common/BackendS3.vala:194
msgid "_Access key ID"
msgid "Connect to Amazon S3"
msgstr ""
#: ../common/BackendS3.vala:195
msgid "_Secret access key"
msgid "_Access key ID"
msgstr ""
#: ../common/BackendS3.vala:196
msgid "S_how secret access key"
msgid "_Secret access key"
msgstr ""
#: ../common/BackendS3.vala:197
msgid "_Remember secret access key"
msgid "S_how secret access key"
msgstr ""
#: ../common/BackendS3.vala:199
msgid "Enter Amazon S3 access key"
#: ../common/BackendS3.vala:198
msgid "_Remember secret access key"
msgstr ""
#: ../common/BackendU1.vala:162 ../widgets/ConfigLocation.vala:183
......@@ -456,11 +456,11 @@ msgid "%s on Ubuntu One"
msgstr ""
#: ../common/BackendU1.vala:220
msgid "Sign into Ubuntu One…"
msgid "Connect to Ubuntu One"
msgstr ""
#: ../common/BackendU1.vala:222
msgid "Connect to Ubuntu One"
#: ../common/BackendU1.vala:221
msgid "Sign into Ubuntu One…"
msgstr ""
#. Translators: %s is the user's username
......@@ -727,7 +727,7 @@ msgid "_Show password"
msgstr ""
#: ../deja-dup/AssistantOperation.vala:376
#: ../deja-dup/MountOperationAssistant.vala:39
#: ../deja-dup/MountOperationAssistant.vala:40
msgid "_Remember password"
msgstr ""
......@@ -954,38 +954,37 @@ msgid "You must specify a mode"
msgstr ""
#: ../deja-dup/MountOperationAssistant.vala:36
msgid "Connect to Server"
msgstr ""
#: ../deja-dup/MountOperationAssistant.vala:37
#: ../widgets/ConfigLocationDAV.vala:49 ../widgets/ConfigLocationFTP.vala:45
#: ../widgets/ConfigLocationRackspace.vala:31
#: ../widgets/ConfigLocationSMB.vala:37 ../widgets/ConfigLocationSSH.vala:40
msgid "_Username"
msgstr ""
#: ../deja-dup/MountOperationAssistant.vala:37
#: ../deja-dup/MountOperationAssistant.vala:38
msgid "_Password"
msgstr ""
#: ../deja-dup/MountOperationAssistant.vala:38
#: ../deja-dup/MountOperationAssistant.vala:39
msgid "S_how password"
msgstr ""
#: ../deja-dup/MountOperationAssistant.vala:81
#: ../deja-dup/MountOperationAssistant.vala:82
msgid "Location not available"
msgstr ""
#. Display user message
#: ../deja-dup/MountOperationAssistant.vala:138
msgid "Connect to Server"
msgstr ""
#: ../deja-dup/MountOperationAssistant.vala:165
#: ../deja-dup/MountOperationAssistant.vala:166
msgid "Connect _anonymously"
msgstr ""
#: ../deja-dup/MountOperationAssistant.vala:169
#: ../deja-dup/MountOperationAssistant.vala:170
msgid "Connect as u_ser"
msgstr ""
#: ../deja-dup/MountOperationAssistant.vala:211
#: ../deja-dup/MountOperationAssistant.vala:212
msgid "_Domain"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment