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

merge upstream changes

Browse Source
This commit is contained in:
Dan Mills 2008-07-31 00:21:53 -07:00
commit 6223ac490a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/sync/locales/en-US/preferences.dtd
View File

@ -22,6 +22,10 @@
<!ENTITY showPasswords.label "Show Passwords">
<!ENTITY changePasswordButton.label "Change">
<!ENTITY instanceName.description "Please choose a unique name for this computer so you will be able to distinguish it from your other computers.">
<!ENTITY instanceName.label "Computer name:">
<!ENTITY examples.label "Examples: &quot;Home&quot;, &quot;Work&quot;">
<!ENTITY backUpCheckbox.label "Back up and synchronize my data to a Weave server">
<!ENTITY encryptOnServerCheckbox.label "Encrypt my data on the server">
<!ENTITY syncNowButton.label "Sync Now...">

3
services/sync/services-sync.js
View File

@ -35,6 +35,5 @@ pref("extensions.weave.log.logger.service.engine", "Debug");
pref("extensions.weave.log.logger.service.main", "Trace");
pref("extensions.weave.xmpp.enabled", false);
pref("extensions.weave.xmpp.server.url",
"https://sm-labs01.mozilla.org:81/xmpp");
pref("extensions.weave.xmpp.server.url", "https://sm-labs01.mozilla.org:81/xmpp");
pref("extensions.weave.xmpp.server.realm", "sm-labs01.mozilla.org");