wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 516350 - about:weave round 3 initial landing

Browse Source
This commit is contained in:
Dan Mills 2009-09-16 13:36:11 -07:00
parent e0cdb15290
commit 08c0f91578
16 changed files with 95 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
services/sync/locales/en-US/about.properties
View File

@ -1,81 +1,93 @@
# Top menus
user-menu-offline = Signed out
user-menu-signing-in = Signing in...
user-menu-online = Signed in as %S
sign-out-item = Sign out
my-account-item = My Account
advanced-menu-title = Advanced
server-settings-item = Server settings
activity-log-item = Activity Log
# Status messages (below the arrow in the center)
status-offline = signed out
status-offline-2 = (offline)
status-signing-in =
status-signing-in-2 = (signing in...)
status-idle = signed in as %S
status-idle-2 = (idle)
status-sync = signed in as %S
status-sync-2 = (syncing)
status-offline = (offline)
status-signing-in = (signing in...)
status-idle = (idle)
status-sync = (syncing)
# Bubbles
prev = prev
next = next
prev = prev
next = next
signedin-signout = sign out
signedin-change-password = change password
signedin-change-passphrase = change passphrase
welcome-title = Welcome To Sync
welcome-1 = Do you already have a Weave account?
welcome-yes = yes
welcome-no = no
signin-title = Sign Into Weave
signin-newacct = new user
signin-username = username
signin-password = password
signin-passphrase = passphrase
signin-next = sign in
my-account-change-password = change password
my-account-change-passphrase = change passphrase
newacct-title = New Weave Account
newacct-username = username
newacct-password = password
newacct-passphrase = passphrase
newacct-email = email address
newacct-tos-label = I agree to the %S
newacct-tos = Terms of Service
captcha-response = Type in the words above
user-taken-password = My username won't work
signin-title = Sign Into Weave
signin-newacct = new user
signin-username =
signin-password =
signin-passphrase =
signin-next = sign in
willsync-title = Account Created!
willsync-1 = Sync will begin in %S seconds...
willsync-config = choose what to sync
newacct-title = New Account
newacct-username =
newacct-password =
newacct-passphrase =
newacct-email =
newacct-tos-label = I agree to the %S
newacct-tos = Terms of Service
captcha-response =
user-taken-password = My username won't work
setup-title = Sync Settings
setup-1 = Check the things you'd like to sync:
setup-sync = sync now
willsync-title = Account Created!
willsync-1 = Sync will begin in %S seconds...
willsync-config = choose what to sync
setup-title = Sync Settings
setup-1 = Check the things you'd like to sync:
setup-sync = sync now
clientinfo-type-desktop = desktop
clientinfo-type-laptop = laptop
clientinfo-type-mobile = mobile
clientinfo-prefs = choose what to sync
clientinfo-prefs = choose what to sync
cloudinfo-title = What's In The Cloud?
cloudinfo-erase = erase
erase-title = Erase Server Data
erase-warning = This will delete all data on the Weave server.\n\nAre you sure you want to do this?
cloudinfo-title = What's In The Cloud?
cloudinfo-erase = erase
erase-title = Erase Server Data
erase-warning = This will delete all data on the Weave server.\n\nAre you sure you want to do this?
# Help items
help-forgot-password = I forgot my password
forgot-password-1 = Type in your username and we'll send you an email so you can reset it:
forgot-password-box = username
forgot-password-ok = send email
help-forgot-password = I forgot my password
forgot-password-1 = Type in your username and we'll send you an email so you can reset it:
forgot-password-box = username
forgot-password-ok = send email
help-forgot-passphrase = I forgot my passphrase
forgot-passphrase-1 = You can pick a new passphrase, but all your server data will need to be deleted (it cannot be recovered).
forgot-passphrase-2 = To go ahead, click the button below:
forgot-passphrase-ok = reset passphrase
help-forgot-passphrase = I forgot my passphrase
forgot-passphrase-1 = You can pick a new passphrase, but all your server data will need to be deleted (it cannot be recovered).
forgot-passphrase-2 = To go ahead, click the button below:
forgot-passphrase-ok = reset passphrase
help-helpme = I'm stuck! What do I do?
help-helpme-1 = If you're stuck, you might want to try the %S or the %S for help.
help-helpme-faq = FAQ
help-helpme-forum = Weave discussion forum
help-helpme = I'm stuck! What do I do?
help-helpme-1 = If you're stuck, you might want to try the %S or the %S for help.
help-helpme-faq = FAQ
help-helpme-forum = Weave discussion forum
help-user-taken = My username won't work
help-user-taken-1 = Your username might be taken, try adding numbers or additional words to it.
help-user-taken-2 = Additionally, you can't use special symbols or spaces inside usernames.
help-user-taken = My username won't work
help-user-taken-1 = Your username might be taken, try adding numbers or additional words to it.
help-user-taken-2 = Additionally, you can't use special symbols or spaces inside usernames.
help-newacct-pass = Weave won't accept my password or passphrase
help-newacct-pass-1 = The password and passphrase must be different from each other.
help-newacct-pass = Weave won't accept my password or passphrase
help-newacct-pass-1 = The password and passphrase must be different from each other.
help-no-captcha = I can't see the verification image
help-no-captcha-1 = Some add-ons can interfere with the verification image. Try disabling NoScript or similar add-ons.
help-no-captcha = I can't see the verification image
help-no-captcha-1 = Some add-ons can interfere with the verification image. Try disabling NoScript or similar add-ons.

10
services/sync/modules/constants.js
View File

@ -45,7 +45,7 @@ const EXPORTED_SYMBOLS = ["WEAVE_VERSION", "COMPATIBLE_VERSION",
'WEAVE_STATUS_PARTIAL', 'SERVER_LOW_QUOTA',
'SERVER_DOWNTIME', 'SERVER_UNREACHABLE',
'LOGIN_FAILED_NO_USERNAME', 'LOGIN_FAILED_NO_PASSWORD',
'LOGIN_FAILED_NETWORK_ERROR','LOGIN_FAILED_INVALID_PASSPHRASE',
'LOGIN_FAILED_NETWORK_ERROR','LOGIN_FAILED_INVALID_PASSPHRASE',
'LOGIN_FAILED_LOGIN_REJECTED', 'METARECORD_DOWNLOAD_FAIL',
'VERSION_OUT_OF_DATE', 'DESKTOP_VERSION_OUT_OF_DATE',
'KEYS_DOWNLOAD_FAIL', 'NO_KEYS_NO_KEYGEN', 'KEYS_UPLOAD_FAIL',
@ -53,7 +53,8 @@ const EXPORTED_SYMBOLS = ["WEAVE_VERSION", "COMPATIBLE_VERSION",
'kSyncWeaveDisabled', 'kSyncNotLoggedIn',
'kSyncNetworkOffline', 'kSyncInPrivateBrowsing',
'kSyncNotScheduled',
'FIREFOX_ID', 'THUNDERBIRD_ID', 'FENNEC_ID', 'SEAMONKEY_ID'];
'FIREFOX_ID', 'THUNDERBIRD_ID', 'FENNEC_ID', 'SEAMONKEY_ID',
'UI_DATA_TYPES_PER_ROW'];
const WEAVE_VERSION = "@weave_version@";
@ -128,3 +129,8 @@ const FIREFOX_ID = "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
const THUNDERBIRD_ID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
const FENNEC_ID = "{a23983c0-fd0e-11dc-95ff-0800200c9a66}";
const SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
//UI constants
// How many data types (bookmarks, history, etc) to display per row
const UI_DATA_TYPES_PER_ROW = 3;

1
services/sync/modules/engines.js
View File

@ -146,6 +146,7 @@ function Engine() { this._init(); }
Engine.prototype = {
name: "engine",
displayName: "Boring Engine",
description: "An engine example - it doesn't actually sync anything",
logName: "Engine",
// _storeObj, and _trackerObj should to be overridden in subclasses

1
services/sync/modules/engines/bookmarks.js
View File

@ -89,6 +89,7 @@ BookmarksEngine.prototype = {
__proto__: SyncEngine.prototype,
name: "bookmarks",
displayName: "Bookmarks",
description: "Keep your favorite links always at hand",
logName: "Bookmarks",
_recordObj: PlacesItem,
_storeObj: BookmarksStore,

1
services/sync/modules/engines/clients.js
View File

@ -59,6 +59,7 @@ ClientEngine.prototype = {
__proto__: SyncEngine.prototype,
name: "clients",
displayName: "Clients",
description: "Sync information about other clients connected to Weave Sync",
logName: "Clients",
_storeObj: ClientStore,
_trackerObj: ClientTracker,

1
services/sync/modules/engines/extensions.js
View File

@ -45,6 +45,7 @@ ExtensionEngine.prototype = {
__proto__: SyncEngine.prototype,
displayName: "Extensions",
description: "",
logName: "Extensions",
name: "extensions",
};

1
services/sync/modules/engines/forms.js
View File

@ -57,6 +57,7 @@ FormEngine.prototype = {
__proto__: SyncEngine.prototype,
name: "forms",
displayName: "Forms",
description: "Take advantage of form-fill convenience on all your devices",
logName: "Forms",
_storeObj: FormStore,
_trackerObj: FormTracker,

1
services/sync/modules/engines/history.js
View File

@ -77,6 +77,7 @@ HistoryEngine.prototype = {
__proto__: SyncEngine.prototype,
name: "history",
displayName: "History",
description: "All the sites you've been to. Take your awesomebar with you!",
logName: "History",
_recordObj: HistoryRec,
_storeObj: HistoryStore,

1
services/sync/modules/engines/microformats.js
View File

@ -45,6 +45,7 @@ MicroFormatEngine.prototype = {
__proto__: SyncEngine.prototype,
displayName: "MicroFormats",
description: "",
logName: "MicroFormats",
name: "microformats",
};

1
services/sync/modules/engines/passwords.js
View File

@ -56,6 +56,7 @@ PasswordEngine.prototype = {
__proto__: SyncEngine.prototype,
name: "passwords",
displayName: "Passwords",
description: "Forget all your passwords, Weave will remember them for you",
logName: "Passwords",
_storeObj: PasswordStore,
_trackerObj: PasswordTracker,

1
services/sync/modules/engines/plugins.js
View File

@ -45,6 +45,7 @@ PluginEngine.prototype = {
__proto__: SyncEngine.prototype,
displayName: "Plugins",
description: "",
logName: "Plugins",
name: "plugins",
};

1
services/sync/modules/engines/prefs.js
View File

@ -59,6 +59,7 @@ PrefsEngine.prototype = {
__proto__: SyncEngine.prototype,
name: "prefs",
displayName: "Preferences",
description: "Synchronize your home page, selected persona, and more",
logName: "Prefs",
_storeObj: PrefStore,
_trackerObj: PrefTracker,

1
services/sync/modules/engines/tabs.js
View File

@ -59,6 +59,7 @@ TabEngine.prototype = {
__proto__: SyncEngine.prototype,
name: "tabs",
displayName: "Tabs",
description: "Access tabs from other devices via the History menu",
logName: "Tabs",
_storeObj: TabStore,
_trackerObj: TabTracker,

1
services/sync/modules/engines/themes.js
View File

@ -45,6 +45,7 @@ ThemeEngine.prototype = {
__proto__: SyncEngine.prototype,
displayName: "Themes",
description: "",
logName: "Themes",
name: "themes",
};

4
services/sync/modules/identity.js
View File

@ -116,9 +116,9 @@ Identity.prototype = {
log.trace("Persisting " + this.realm + " for " + this.username);
let nsLoginInfo = new Components.Constructor(
"@mozilla.org/login-manager/loginInfo;1", Ci.nsILoginInfo, "init");
let login = new nsLoginInfo(PWDMGR_HOST, null, this.realm,
let newLogin = new nsLoginInfo(PWDMGR_HOST, null, this.realm,
this.username, this.password, "", "");
Svc.Login.addLogin(login);
Svc.Login.addLogin(newLogin);
},
get _logins _logins() Svc.Login.findLogins({}, PWDMGR_HOST, null, this.realm)

6
services/sync/modules/service.js
View File

@ -647,11 +647,11 @@ WeaveSvc.prototype = {
if (Svc.IO.offline)
throw "Application is offline, login should not be called";
if (username != null)
if (username)
this.username = username;
if (password != null)
if (password)
this.password = password;
if (passphrase != null)
if (passphrase)
this.passphrase = passphrase;
if (!this.username) {