mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Tweaks to @gracile-fr's localization changes

Browse source 
Addresses #264
This commit is contained in:
Dan Stillman 2013-03-05 03:19:29 -05:00
parent 30f5679ec8
commit 0c60911fd1
5 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/bindings/merge.xml
View file

@ -478,7 +478,7 @@
<xul:box id="object-placeholder"/>
<xul:hbox id="delete-box" hidden="true" flex="1"
onclick="document.getBindingParent(this).chooseObj(this)">
<xul:label value="zotero.merge.deleted"/>
<xul:label value="&zotero.merge.deleted;"/>
</xul:hbox>
</xul:groupbox>
</content>

2
chrome/content/zotero/merge.xul
View file

@ -28,7 +28,7 @@
<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/merge.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://zotero/locale/merge.dtd">
<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
<wizard
id="zotero-merge-window"

25
chrome/content/zotero/xpcom/storage/webdav.js
View file

@ -25,13 +25,6 @@
Zotero.Sync.Storage.WebDAV = (function () {
// TEMP
//This doesn't work (Localized string not available for sync.storage...):
//var _defaultError = Zotero.getString('sync.storage.error.webdav.default');
//var _defaultErrorRestart = Zotero.getString('sync.storage.error.webdav.defaultRestart', Zotero.appName);
var _defaultError = "A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.";
var _defaultErrorRestart = "A WebDAV file sync error occurred. Please restart " + Zotero.appName + " and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.";
var _initialized = false;
var _parentURI;
var _rootURI;
@ -112,7 +105,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
Components.utils.reportError(msg);
return deleteStorageFiles([item.key + ".prop"])
.then(function (results) {
throw new Error(_defaultError);
throw new Error(Zotero.Sync.Storage.WebDAV.defaultError);
});
}
@ -642,13 +635,21 @@ Zotero.Sync.Storage.WebDAV = (function () {
var obj = new Zotero.Sync.Storage.Mode;
obj.name = "WebDAV";
Object.defineProperty(obj, "defaultError", {
get: function () Zotero.getString('sync.storage.error.webdav.default')
});
Object.defineProperty(obj, "defaultErrorRestart", {
get: function () Zotero.getString('sync.storage.error.webdav.defaultRestart', Zotero.appName)
});
Object.defineProperty(obj, "includeUserFiles", {
get: function () {
return Zotero.Prefs.get("sync.storage.enabled") && Zotero.Prefs.get("sync.storage.protocol") == 'webdav';
}
});
obj.includeGroupItems = false;
Object.defineProperty(obj, "_verified", {
get: function () Zotero.Prefs.get("sync.storage.verified")
});
@ -882,7 +883,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
+ " in Zotero.Sync.Storage.WebDAV.downloadFile()";
Zotero.debug(msg, 1);
Components.utils.reportError(msg);
deferred.reject(_defaultError);
deferred.reject(Zotero.Sync.Storage.WebDAV.defaultError);
return;
}
@ -1032,7 +1033,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
var msg = "Unexpected error code " + req.status + " uploading storage success file";
Zotero.debug(msg, 2);
Components.utils.reportError(msg);
throw _defaultError;
throw Zotero.Sync.Storage.WebDAV.defaultError;
});
};
@ -1056,7 +1057,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
+ "for OPTIONS request caching WebDAV credentials";
Zotero.debug(msg, 1);
Components.utils.reportError(msg);
throw new Error(_defaultErrorRestart);
throw new Error(Zotero.Sync.Storage.WebDAV.defaultErrorRestart);
}
throw e;
});

3
chrome/locale/en-US/zotero/merge.dtd
View file

@ -1,3 +0,0 @@
<!ENTITY zotero.merge.title "Conflict Resolution">
<!ENTITY zotero.merge.of "of">
<!ENTITY zotero.merge.deleted "Deleted">

4
chrome/locale/en-US/zotero/zotero.dtd
View file

@ -233,6 +233,10 @@
<!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "Unchecked tags will not be saved.">
<!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "The tag will be deleted from all items.">
<!ENTITY zotero.merge.title "Conflict Resolution">
<!ENTITY zotero.merge.of "of">
<!ENTITY zotero.merge.deleted "Deleted">
<!ENTITY zotero.proxy.recognized.title "Proxy Recognized">
<!ENTITY zotero.proxy.recognized.warning "Only add proxies linked from your library, school, or corporate website">
<!ENTITY zotero.proxy.recognized.warning.secondary "Adding other proxies allows malicious sites to masquerade as sites you trust.">