Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 02:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge services-central with mozilla-central

Browse Source
This commit is contained in:
Philipp von Weitershausen 2011-05-03 16:29:37 -07:00
commit 2a37b38b71
7 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/base/content/syncAddDevice.xul
View File

@ -77,11 +77,11 @@
value="&addDevice.showMeHow.label;"
href="https://services.mozilla.com/sync/help/add-device"/>
</description>
<spacer flex="1"/>
<separator class="groove-thin"/>
<description>
&addDevice.dialog.enterCode.label;
</description>
<spacer flex="1"/>
<separator class="groove-thin"/>
<vbox align="center">
<textbox id="pin1"
class="pin"
@ -99,7 +99,7 @@
onfocus="this.select();"
/>
</vbox>
<spacer flex="1"/>
<separator class="groove-thin"/>
<vbox id="add-device-throbber" align="center" hidden="true">
<image/>
</vbox>

2
browser/base/content/syncGenericChange.js
View File

@ -111,7 +111,7 @@ let Change = {
pp = Weave.Utils.hyphenatePassphrase(pp);
this._passphraseBox.value = pp;
this._passphraseBox.focus();
document.title = this._str("change.synckey.title");
document.title = this._str("change.synckey2.title");
introText.textContent = this._str("change.synckey.introText2");
warningText.textContent = this._str("change.synckey2.warningText");
this._dialog.getButton("finish").label

2
browser/base/content/syncGenericChange.xul
View File

@ -100,7 +100,7 @@
<spacer flex="1"/>
<label id="generatePassphraseButton"
hidden="true"
value="&syncKeyGenerate.label;"
value="&syncGenerateNewKey.label;"
class="text-link inline-link"
onclick="event.stopPropagation();
Change.doGeneratePassphrase();"/>

8
browser/base/content/syncSetup.js
View File

@ -56,6 +56,11 @@ const OPTIONS_PAGE = 6;
const OPTIONS_CONFIRM_PAGE = 7;
const SETUP_SUCCESS_PAGE = 8;
// Broader than we'd like, but after this changed from api-secure.recaptcha.net
// we had no choice. At least we only do this for the duration of setup.
// See discussion in Bugs 508112 and 653307.
const RECAPTCHA_DOMAIN = "https://www.google.com";
Cu.import("resource://services-sync/main.js");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
@ -69,7 +74,6 @@ var gSyncSetup = {
captchaBrowser: null,
wizard: null,
_disabledSites: [],
_remoteSites: [Weave.Service.serverURL, "https://api-secure.recaptcha.net"],
status: {
password: false,
@ -77,6 +81,8 @@ var gSyncSetup = {
server: false
},
get _remoteSites() [Weave.Service.serverURL, RECAPTCHA_DOMAIN],
get _usingMainServers() {
if (this._settingUpNew)
return document.getElementById("server").selectedIndex == 0;

3
browser/components/preferences/sync.js
View File

@ -110,7 +110,8 @@ let gSyncPane = {
startOver: function (showDialog) {
if (showDialog) {
let flags = Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING +
Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL;
Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL +
Services.prompt.BUTTON_POS_1_DEFAULT;
let buttonChoice =
Services.prompt.confirmEx(window,
this._stringBundle.GetStringFromName("stopUsingAccount.title"),

2
browser/locales/en-US/chrome/browser/syncGenericChange.properties
View File

@ -8,7 +8,7 @@ change.password.status.error = There was an error changing your password.
change.password2.introText = Your password must be at least 8 characters long. It cannot be the same as either your user name or your Sync Key.
change.password.warningText = Note: All of your other devices will be unable to connect to your account once you change this password.
change.synckey.title = Change your Sync Key
change.synckey2.title = My Sync Key
change.synckey.acceptButton = Change Sync Key
change.synckey.label = Changing Sync Key and uploading local data, please wait…
change.synckey2.error = There was an error while changing your Sync Key!

2
browser/locales/en-US/chrome/browser/syncSetup.dtd
View File

@ -43,7 +43,7 @@
<!ENTITY setup.newSyncKeyPage.description.label "To ensure your total privacy, all of your data is encrypted prior to being uploaded. The Sync Key which is necessary to decrypt your data is not uploaded.">
<!ENTITY syncKeyEntry.label "Your Sync Key">
<!ENTITY syncKeyEntry.accesskey "K">
<!ENTITY syncKeyGenerate.label "Generate">
<!ENTITY syncGenerateNewKey.label "Generate a new key">
<!ENTITY syncKeyBackup.description "Your Sync Key is required to access &syncBrand.fullName.label; on other machines. Please create a backup copy. We cannot help you recover your Sync Key.">
<!ENTITY button.syncKeyBackup.print.label "Print…">