From 0b82266882af331c692f174c77ab9c6906512b29 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 26 Mar 2013 16:00:55 -0400 Subject: [PATCH 01/23] Don't show nsIChannel passwords in debug output --- chrome/content/zotero/xpcom/http.js | 13 +++++++++++++ chrome/content/zotero/xpcom/utilities.js | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js index 34aa3b822d..d21292d0ad 100644 --- a/chrome/content/zotero/xpcom/http.js +++ b/chrome/content/zotero/xpcom/http.js @@ -13,6 +13,19 @@ Zotero.HTTP = new function() { this.xmlhttp = xmlhttp; this.status = xmlhttp.status; this.message = msg; + + // Hide password from debug output + // + // Password also shows up in channel.name (nsIRequest.name), but that's + // read-only and has to be handled in Zotero.varDump() + try { + if (xmlhttp.channel.URI.password) { + xmlhttp.channel.URI.password = "********"; + } + } + catch (e) { + Zotero.debug(e, 1); + } }; this.UnexpectedStatusException.prototype.toString = function() { diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js index 44a7b3f01a..052b1dab2c 100644 --- a/chrome/content/zotero/xpcom/utilities.js +++ b/chrome/content/zotero/xpcom/utilities.js @@ -1136,6 +1136,9 @@ Zotero.Utilities = { } if (typeof(arr) == 'object') { // Array/Hashes/Objects + let isRequest = ((Zotero.isFx && !Zotero.isBookmarklet) || Zotero.isStandalone) + && arr instanceof Components.interfaces.nsIRequest; + //array for checking recursion //initialise at first itteration if(!parentObjects) { @@ -1145,6 +1148,12 @@ Zotero.Utilities = { for (var item in arr) { try { + // Don't display nsIRequest.name, which can contain password + if (isRequest && item == 'name') { + dumped_text += level_padding + "'" + item + "' => <>\n"; + continue; + } + var value = arr[item]; } catch(e) { dumped_text += level_padding + "'" + item + "' => <>\n"; From 014aee1485c9a069de80e27f7f61d7846d122e8b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 26 Mar 2013 16:15:31 -0400 Subject: [PATCH 02/23] Fix nsIRequest test for non-client environments --- chrome/content/zotero/xpcom/utilities.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js index 052b1dab2c..ad32759871 100644 --- a/chrome/content/zotero/xpcom/utilities.js +++ b/chrome/content/zotero/xpcom/utilities.js @@ -1136,7 +1136,7 @@ Zotero.Utilities = { } if (typeof(arr) == 'object') { // Array/Hashes/Objects - let isRequest = ((Zotero.isFx && !Zotero.isBookmarklet) || Zotero.isStandalone) + var isRequest = Zotero.isFx && !Zotero.isBookmarklet && arr instanceof Components.interfaces.nsIRequest; //array for checking recursion From ae87fb9848b8165f0be28687e0a7f910a887b6b3 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 26 Mar 2013 16:32:23 -0400 Subject: [PATCH 03/23] Version update --- chrome/content/zotero/xpcom/zotero.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 75e012d8cd..f611942c20 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -36,7 +36,7 @@ const ZOTERO_CONFIG = { API_VERSION: 2, PREF_BRANCH: 'extensions.zotero.', BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/', - VERSION: "4.0b1.SOURCE" + VERSION: "4.0b2.SOURCE" }; // Commonly used imports accessible anywhere From 6d518c0ceca0a3d9a4cc8181ec991287e76398d6 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Wed, 27 Mar 2013 11:29:53 -0400 Subject: [PATCH 04/23] Clarify failed validation error message See http://forums.zotero.org/discussion/28540?page=1#Item_4 --- chrome/locale/en-US/zotero/zotero.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 8f38566e2c..ee310bf91b 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle = Install style "%1$S" from %2$S? styles.updateStyle = Update existing style "%1$S" with "%2$S" from %3$S? styles.installed = The style "%S" was installed successfully. styles.installError = "%S" is not a valid style file. -styles.validationWarning = "%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning = "%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError = %1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle = Are you sure you want to delete the style "%1$S"? styles.deleteStyles = Are you sure you want to delete the selected styles? From a6fae941adebb6af862696dc8c6ed950c8d92f34 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Wed, 27 Mar 2013 23:47:34 -0400 Subject: [PATCH 05/23] Disable one window warning for annotations --- chrome/content/zotero/browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/browser.js b/chrome/content/zotero/browser.js index 05b065446e..baf7d7c5f8 100644 --- a/chrome/content/zotero/browser.js +++ b/chrome/content/zotero/browser.js @@ -285,7 +285,7 @@ var Zotero_Browser = new function() { var annotationID = Zotero.Annotate.getAnnotationIDFromURL(browser.currentURI.spec); if(annotationID) { if(Zotero.Annotate.isAnnotated(annotationID)) { - window.alert(Zotero.getString("annotations.oneWindowWarning")); + //window.alert(Zotero.getString("annotations.oneWindowWarning")); } else if(!tab.page.annotations) { // enable annotation tab.page.annotations = new Zotero.Annotations(Zotero_Browser, browser, annotationID); From 6efe6c5bd6aea0661d1841d5fba5bd1498eb69ba Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Wed, 27 Mar 2013 23:53:38 -0400 Subject: [PATCH 06/23] Move "Automatically abbreviate journal titles" setting to document preferences The setting is disabled by default for existing documents, but enabled by default for new documents. --- chrome/content/zotero/bibliography.js | 56 +++- chrome/content/zotero/fileInterface.js | 2 +- .../integration/integrationDocPrefs.xul | 13 +- .../zotero/preferences/preferences_cite.xul | 3 - chrome/content/zotero/rtfScan.js | 2 +- chrome/content/zotero/tools/csledit.xul | 2 +- chrome/content/zotero/tools/cslpreview.xul | 2 +- chrome/content/zotero/xpcom/cite.js | 306 +++++++++--------- chrome/content/zotero/xpcom/integration.js | 23 +- chrome/content/zotero/xpcom/quickCopy.js | 2 +- chrome/content/zotero/xpcom/style.js | 30 +- chrome/locale/en-US/zotero/preferences.dtd | 1 - chrome/locale/en-US/zotero/zotero.dtd | 4 + defaults/preferences/zotero.js | 2 +- 14 files changed, 253 insertions(+), 195 deletions(-) diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js index 76c08d09df..f68dfe2d82 100644 --- a/chrome/content/zotero/bibliography.js +++ b/chrome/content/zotero/bibliography.js @@ -124,10 +124,22 @@ var Zotero_File_Interface_Bibliography = new function() { if(document.getElementById("formatUsing")) { if(_io.fieldType == "Bookmark") document.getElementById("formatUsing").selectedIndex = 1; var formatOption = (_io.primaryFieldType == "ReferenceMark" ? "referenceMarks" : "fields"); - document.getElementById("fields").label = Zotero.getString("integration."+formatOption+".label"); - document.getElementById("fields-caption").textContent = Zotero.getString("integration."+formatOption+".caption"); - document.getElementById("fields-file-format-notice").textContent = Zotero.getString("integration."+formatOption+".fileFormatNotice"); - document.getElementById("bookmarks-file-format-notice").textContent = Zotero.getString("integration.fields.fileFormatNotice"); + document.getElementById("fields").label = + Zotero.getString("integration."+formatOption+".label"); + document.getElementById("fields-caption").textContent = + Zotero.getString("integration."+formatOption+".caption"); + document.getElementById("fields-file-format-notice").textContent = + Zotero.getString("integration."+formatOption+".fileFormatNotice"); + document.getElementById("bookmarks-file-format-notice").textContent = + Zotero.getString("integration.fields.fileFormatNotice"); + } + if(document.getElementById("automaticJournalAbbreviations-checkbox")) { + if(_io.automaticJournalAbbreviations === undefined) { + _io.automaticJournalAbbreviations = Zotero.Prefs.get("cite.automaticJournalAbbreviations"); + } + if(_io.automaticJournalAbbreviations) { + document.getElementById("automaticJournalAbbreviations-checkbox").checked = true; + } } if(document.getElementById("storeReferences")) { if(_io.storeReferences || _io.storeReferences === undefined) { @@ -152,23 +164,30 @@ var Zotero_File_Interface_Bibliography = new function() { var selectedItem = document.getElementById("style-listbox").selectedItem; } - var selectedStyle = selectedItem.getAttribute('value'); + var selectedStyle = selectedItem.getAttribute('value'), + selectedStyleObj = Zotero.Styles.get(selectedStyle); // // For integrationDocPrefs.xul // // update status of displayAs box based on style class - if(document.getElementById("displayAs")) { - var isNote = Zotero.Styles.get(selectedStyle).class == "note"; - document.getElementById("displayAs").disabled = !isNote; + if(document.getElementById("displayAs-groupbox")) { + var isNote = selectedStyleObj.class == "note"; + document.getElementById("displayAs-groupbox").hidden = !isNote; + + // update status of formatUsing box based on style class + if(document.getElementById("formatUsing")) { + if(isNote) document.getElementById("formatUsing").selectedIndex = 0; + document.getElementById("bookmarks").disabled = isNote; + document.getElementById("bookmarks-caption").disabled = isNote; + } } - - // update status of formatUsing box based on style class - if(document.getElementById("formatUsing")) { - if(isNote) document.getElementById("formatUsing").selectedIndex = 0; - document.getElementById("bookmarks").disabled = isNote; - document.getElementById("bookmarks-caption").disabled = isNote; + + // update status of displayAs box based on style class + if(document.getElementById("automaticJournalAbbreviations-vbox")) { + document.getElementById("automaticJournalAbbreviations-vbox").hidden = + !selectedStyleObj.usesAbbreviation; } // @@ -184,6 +203,8 @@ var Zotero_File_Interface_Bibliography = new function() { } document.getElementById("citations").label = label; } + + window.sizeToContent(); } function acceptSelection() { @@ -198,8 +219,13 @@ var Zotero_File_Interface_Bibliography = new function() { JSON.stringify({ mode: _io.mode, method: _io.method })); } - // ONLY FOR integrationDocPrefs.xul: collect displayAs + // ONLY FOR integrationDocPrefs.xul: if(document.getElementById("displayAs")) { + var automaticJournalAbbreviationsEl = document.getElementById("automaticJournalAbbreviations-checkbox"); + _io.automaticJournalAbbreviations = automaticJournalAbbreviationsEl.checked; + if(!automaticJournalAbbreviationsEl.hidden && _saveStyle) { + Zotero.Prefs.set("cite.automaticJournalAbbreviations", _io.automaticJournalAbbreviations); + } _io.useEndnotes = document.getElementById("displayAs").selectedIndex; _io.fieldType = (document.getElementById("formatUsing").selectedIndex == 0 ? _io.primaryFieldType : _io.secondaryFieldType); _io.storeReferences = document.getElementById("storeReferences").checked; diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js index 107e805113..4367a36351 100644 --- a/chrome/content/zotero/fileInterface.js +++ b/chrome/content/zotero/fileInterface.js @@ -473,7 +473,7 @@ var Zotero_File_Interface = new function() { var clipboardService = Components.classes["@mozilla.org/widget/clipboard;1"]. getService(Components.interfaces.nsIClipboard); - var style = Zotero.Styles.get(style).csl; + var style = Zotero.Styles.get(style).getCiteProc(); var citation = {"citationItems":[{id:item.id} for each(item in items)], properties:{}}; // add HTML diff --git a/chrome/content/zotero/integration/integrationDocPrefs.xul b/chrome/content/zotero/integration/integrationDocPrefs.xul index 0a04dbc3ea..8ac6bdbc38 100644 --- a/chrome/content/zotero/integration/integrationDocPrefs.xul +++ b/chrome/content/zotero/integration/integrationDocPrefs.xul @@ -48,7 +48,7 @@ - + @@ -67,9 +67,14 @@ &zotero.integration.prefs.bookmarks.caption; - - - &zotero.integration.prefs.storeReferences.caption; + + + + &zotero.integration.prefs.automaticJournalAbbeviations.caption; + + + + &zotero.integration.prefs.storeReferences.caption; \ No newline at end of file diff --git a/chrome/content/zotero/preferences/preferences_cite.xul b/chrome/content/zotero/preferences/preferences_cite.xul index e60211f61d..07d3307687 100644 --- a/chrome/content/zotero/preferences/preferences_cite.xul +++ b/chrome/content/zotero/preferences/preferences_cite.xul @@ -35,7 +35,6 @@ - @@ -81,8 +80,6 @@ - - diff --git a/chrome/content/zotero/rtfScan.js b/chrome/content/zotero/rtfScan.js index 349a12b3ff..e00f037c9f 100644 --- a/chrome/content/zotero/rtfScan.js +++ b/chrome/content/zotero/rtfScan.js @@ -496,7 +496,7 @@ var Zotero_RTFScan = new function() { function _formatRTF() { // load style and create ItemSet with all items var zStyle = Zotero.Styles.get(document.getElementById("style-listbox").selectedItem.value) - var style = zStyle.csl; + var style = zStyle.getCiteProc(); style.setOutputFormat("rtf"); var isNote = style.class == "note"; diff --git a/chrome/content/zotero/tools/csledit.xul b/chrome/content/zotero/tools/csledit.xul index 966c91d7a2..abc04f5466 100644 --- a/chrome/content/zotero/tools/csledit.xul +++ b/chrome/content/zotero/tools/csledit.xul @@ -112,7 +112,7 @@ else { try { styleObject = new Zotero.Style(str); - styleEngine = styleObject.csl; + styleEngine = styleObject.getCiteProc(); } catch(e) { iframe.contentDocument.documentElement.innerHTML = '
Error parsing '+ 'style:
'+e+'
'; diff --git a/chrome/content/zotero/tools/cslpreview.xul b/chrome/content/zotero/tools/cslpreview.xul index 958d361eee..22a64069e0 100644 --- a/chrome/content/zotero/tools/cslpreview.xul +++ b/chrome/content/zotero/tools/cslpreview.xul @@ -117,7 +117,7 @@ Zotero.debug("CSL IGNORE this AD"); return ''; } - var styleEngine = style.csl; + var styleEngine = style.getCiteProc(); // Generate multiple citations var citations = styleEngine.previewCitationCluster( diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js index 39eb307da6..69fd7f3bcf 100644 --- a/chrome/content/zotero/xpcom/cite.js +++ b/chrome/content/zotero/xpcom/cite.js @@ -72,7 +72,7 @@ Zotero.Cite = { * @return {String} Bibliography or item list in specified format */ "makeFormattedBibliographyOrCitationList":function(style, items, format, asCitationList) { - var cslEngine = style.csl; + var cslEngine = style.getCiteProc(); cslEngine.setOutputFormat(format); cslEngine.updateItems([item.id for each(item in items)]); @@ -312,10 +312,157 @@ Zotero.Cite = { }; /** - * citeproc-js system object - * @namespace + * Get a CSL abbreviation in the format expected by citeproc-js */ -Zotero.Cite.System = { +Zotero.Cite.getAbbreviation = new function() { + var abbreviations, + abbreviationCategories; + + /** + * Initialize abbreviations database. + */ + function init() { + if(!abbreviations) loadAbbreviations(); + } + + function loadAbbreviations() { + var file = Zotero.getZoteroDirectory(); + file.append("abbreviations.json"); + + var json, origin; + if(file.exists()) { + json = Zotero.File.getContents(file); + origin = file.path; + } else { + json = Zotero.File.getContentsFromURL("resource://zotero/schema/abbreviations.json"); + origin = "resource://zotero/schema/abbreviations.json"; + } + + try { + abbreviations = JSON.parse(json); + } catch(e) { + throw new Zotero.Exception.Alert("styles.abbreviations.parseError", origin, + "styles.abbreviations.title", e); + } + + if(!abbreviations.info || !abbreviations.info.name || !abbreviations.info.URI) { + throw new Zotero.Exception.Alert("styles.abbreviations.missingInfo", origin, + "styles.abbreviations.title"); + } + + abbreviationCategories = {}; + for(var jurisdiction in abbreviations) { + for(var category in abbreviations[jurisdiction]) { + abbreviationCategories[category] = true; + } + } + } + + /** + * Normalizes a key + */ + function normalizeKey(key) { + // Strip periods, normalize spacing, and convert to lowercase + return key.toString().toLowerCase(). + replace(/(?:\b|^)(?:and|et|y|und|l[ae]|the|[ld]')(?:\b|$)|[\x21-\x2C.\/\x3A-\x40\x5B-\x60\\\x7B-\x7E]/g, ""). + replace(/\s+/g, " ").trim(); + } + + function lookupKey(key) { + return key.toLowerCase().replace(/\s*\./g, "." ); + } + + /** + * Replace getAbbreviation on citeproc-js with our own handler. + */ + return function getAbbreviation(listname, obj, jurisdiction, category, key) { + if(!Zotero.Prefs.get("cite.automaticTitleAbbreviation")) return; + + init(); + + // Short circuit if we know we don't handle this kind of abbreviation + if(!abbreviationCategories[category] && !abbreviationCategories[category+"-word"]) return; + + var normalizedKey = normalizeKey(key), + lcNormalizedKey = lookupKey(normalizedKey), + abbreviation; + if(!normalizedKey) return; + + var jurisdictions = ["default"]; + if(jurisdiction !== "default" && abbreviations[jurisdiction]) { + jurisdictions.unshift(jurisdiction); + } + + // Look for full abbreviation + var jur, cat; + for(var i=0; i 1) { + for(var j=0; j 1) { - for(var j=0; j - diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd index 9a7b74c61a..4df40674d8 100644 --- a/chrome/locale/en-US/zotero/zotero.dtd +++ b/chrome/locale/en-US/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js index 71b2990496..af82adf9e3 100644 --- a/defaults/preferences/zotero.js +++ b/defaults/preferences/zotero.js @@ -95,7 +95,7 @@ pref("extensions.zotero.export.bibliographySettings", 'save-as-rtf'); pref("extensions.zotero.export.bibliographyLocale", ''); pref("extensions.zotero.export.displayCharsetOption", false); pref("extensions.zotero.export.citePaperJournalArticleURL", false); -pref("extensions.zotero.cite.automaticTitleAbbreviation", false); +pref("extensions.zotero.cite.automaticJournalAbbreviations", true); pref("extensions.zotero.import.charset", "auto"); pref("extensions.zotero.import.createNewCollection.fromFileOpenHandler", true); pref("extensions.zotero.rtfScan.lastInputFile", ""); From 4c7d09654518f18466df34c0e90a643031499729 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Thu, 28 Mar 2013 00:24:38 -0400 Subject: [PATCH 07/23] Use typographic quotes --- chrome/locale/en-US/zotero/zotero.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd index 4df40674d8..d6e2227fbf 100644 --- a/chrome/locale/en-US/zotero/zotero.dtd +++ b/chrome/locale/en-US/zotero/zotero.dtd @@ -213,7 +213,7 @@ - + From 51476823d7553161c8d1c06651dc2ec5156056eb Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 28 Mar 2013 00:34:28 -0400 Subject: [PATCH 08/23] Merge locales from Transifex --- chrome/locale/af-ZA/zotero/preferences.dtd | 1 - chrome/locale/af-ZA/zotero/zotero.dtd | 4 ++++ chrome/locale/af-ZA/zotero/zotero.properties | 2 +- chrome/locale/ar/zotero/preferences.dtd | 1 - chrome/locale/ar/zotero/zotero.dtd | 4 ++++ chrome/locale/ar/zotero/zotero.properties | 2 +- chrome/locale/bg-BG/zotero/preferences.dtd | 1 - chrome/locale/bg-BG/zotero/zotero.dtd | 4 ++++ chrome/locale/bg-BG/zotero/zotero.properties | 2 +- chrome/locale/ca-AD/zotero/preferences.dtd | 1 - chrome/locale/ca-AD/zotero/zotero.dtd | 4 ++++ chrome/locale/ca-AD/zotero/zotero.properties | 2 +- chrome/locale/cs-CZ/zotero/preferences.dtd | 1 - chrome/locale/cs-CZ/zotero/zotero.dtd | 4 ++++ chrome/locale/cs-CZ/zotero/zotero.properties | 2 +- chrome/locale/da-DK/zotero/preferences.dtd | 1 - chrome/locale/da-DK/zotero/zotero.dtd | 4 ++++ chrome/locale/da-DK/zotero/zotero.properties | 2 +- chrome/locale/de/zotero/preferences.dtd | 1 - chrome/locale/de/zotero/zotero.dtd | 4 ++++ chrome/locale/de/zotero/zotero.properties | 2 +- chrome/locale/el-GR/zotero/preferences.dtd | 1 - chrome/locale/el-GR/zotero/zotero.dtd | 4 ++++ chrome/locale/el-GR/zotero/zotero.properties | 2 +- chrome/locale/es-ES/zotero/preferences.dtd | 1 - chrome/locale/es-ES/zotero/zotero.dtd | 4 ++++ chrome/locale/es-ES/zotero/zotero.properties | 2 +- chrome/locale/et-EE/zotero/preferences.dtd | 1 - chrome/locale/et-EE/zotero/zotero.dtd | 4 ++++ chrome/locale/et-EE/zotero/zotero.properties | 2 +- chrome/locale/eu-ES/zotero/preferences.dtd | 1 - chrome/locale/eu-ES/zotero/zotero.dtd | 4 ++++ chrome/locale/eu-ES/zotero/zotero.properties | 2 +- chrome/locale/fa/zotero/preferences.dtd | 1 - chrome/locale/fa/zotero/zotero.dtd | 4 ++++ chrome/locale/fa/zotero/zotero.properties | 2 +- chrome/locale/fi-FI/zotero/preferences.dtd | 1 - chrome/locale/fi-FI/zotero/zotero.dtd | 4 ++++ chrome/locale/fi-FI/zotero/zotero.properties | 2 +- chrome/locale/fr-FR/zotero/preferences.dtd | 1 - chrome/locale/fr-FR/zotero/zotero.dtd | 4 ++++ chrome/locale/gl-ES/zotero/preferences.dtd | 1 - chrome/locale/gl-ES/zotero/zotero.dtd | 4 ++++ chrome/locale/gl-ES/zotero/zotero.properties | 2 +- chrome/locale/he-IL/zotero/preferences.dtd | 1 - chrome/locale/he-IL/zotero/zotero.dtd | 4 ++++ chrome/locale/he-IL/zotero/zotero.properties | 2 +- chrome/locale/hr-HR/zotero/preferences.dtd | 1 - chrome/locale/hr-HR/zotero/zotero.dtd | 4 ++++ chrome/locale/hr-HR/zotero/zotero.properties | 2 +- chrome/locale/hu-HU/zotero/preferences.dtd | 1 - chrome/locale/hu-HU/zotero/zotero.dtd | 4 ++++ chrome/locale/hu-HU/zotero/zotero.properties | 2 +- chrome/locale/is-IS/zotero/preferences.dtd | 1 - chrome/locale/is-IS/zotero/zotero.dtd | 4 ++++ chrome/locale/is-IS/zotero/zotero.properties | 2 +- chrome/locale/it-IT/zotero/preferences.dtd | 1 - chrome/locale/it-IT/zotero/zotero.dtd | 4 ++++ chrome/locale/it-IT/zotero/zotero.properties | 2 +- chrome/locale/ja-JP/zotero/preferences.dtd | 1 - chrome/locale/ja-JP/zotero/zotero.dtd | 4 ++++ chrome/locale/km/zotero/preferences.dtd | 1 - chrome/locale/km/zotero/zotero.dtd | 4 ++++ chrome/locale/km/zotero/zotero.properties | 2 +- chrome/locale/ko-KR/zotero/preferences.dtd | 1 - chrome/locale/ko-KR/zotero/zotero.dtd | 4 ++++ chrome/locale/ko-KR/zotero/zotero.properties | 2 +- chrome/locale/mn-MN/zotero/preferences.dtd | 1 - chrome/locale/mn-MN/zotero/zotero.dtd | 4 ++++ chrome/locale/mn-MN/zotero/zotero.properties | 2 +- chrome/locale/nb-NO/zotero/preferences.dtd | 1 - chrome/locale/nb-NO/zotero/zotero.dtd | 4 ++++ chrome/locale/nb-NO/zotero/zotero.properties | 2 +- chrome/locale/nl-NL/zotero/preferences.dtd | 1 - chrome/locale/nl-NL/zotero/zotero.dtd | 4 ++++ chrome/locale/nl-NL/zotero/zotero.properties | 2 +- chrome/locale/nn-NO/zotero/preferences.dtd | 1 - chrome/locale/nn-NO/zotero/zotero.dtd | 4 ++++ chrome/locale/nn-NO/zotero/zotero.properties | 2 +- chrome/locale/pl-PL/zotero/preferences.dtd | 1 - chrome/locale/pl-PL/zotero/zotero.dtd | 4 ++++ chrome/locale/pl-PL/zotero/zotero.properties | 2 +- chrome/locale/pt-BR/zotero/preferences.dtd | 1 - chrome/locale/pt-BR/zotero/zotero.dtd | 4 ++++ chrome/locale/pt-BR/zotero/zotero.properties | 2 +- chrome/locale/pt-PT/zotero/preferences.dtd | 1 - chrome/locale/pt-PT/zotero/zotero.dtd | 4 ++++ chrome/locale/pt-PT/zotero/zotero.properties | 2 +- chrome/locale/ro-RO/zotero/preferences.dtd | 1 - chrome/locale/ro-RO/zotero/zotero.dtd | 4 ++++ chrome/locale/ru-RU/zotero/preferences.dtd | 1 - chrome/locale/ru-RU/zotero/zotero.dtd | 4 ++++ chrome/locale/ru-RU/zotero/zotero.properties | 2 +- chrome/locale/sk-SK/zotero/preferences.dtd | 1 - chrome/locale/sk-SK/zotero/zotero.dtd | 4 ++++ chrome/locale/sl-SI/zotero/preferences.dtd | 1 - chrome/locale/sl-SI/zotero/zotero.dtd | 4 ++++ chrome/locale/sl-SI/zotero/zotero.properties | 2 +- chrome/locale/sr-RS/zotero/preferences.dtd | 1 - chrome/locale/sr-RS/zotero/zotero.dtd | 4 ++++ chrome/locale/sr-RS/zotero/zotero.properties | 2 +- chrome/locale/sv-SE/zotero/preferences.dtd | 1 - chrome/locale/sv-SE/zotero/zotero.dtd | 4 ++++ chrome/locale/sv-SE/zotero/zotero.properties | 2 +- chrome/locale/th-TH/zotero/preferences.dtd | 1 - chrome/locale/th-TH/zotero/zotero.dtd | 4 ++++ chrome/locale/th-TH/zotero/zotero.properties | 2 +- chrome/locale/tr-TR/zotero/preferences.dtd | 1 - chrome/locale/tr-TR/zotero/zotero.dtd | 4 ++++ chrome/locale/tr-TR/zotero/zotero.properties | 2 +- chrome/locale/vi-VN/zotero/preferences.dtd | 1 - chrome/locale/vi-VN/zotero/zotero.dtd | 4 ++++ chrome/locale/vi-VN/zotero/zotero.properties | 2 +- chrome/locale/zh-CN/zotero/preferences.dtd | 1 - chrome/locale/zh-CN/zotero/zotero.dtd | 4 ++++ chrome/locale/zh-CN/zotero/zotero.properties | 2 +- chrome/locale/zh-TW/zotero/preferences.dtd | 1 - chrome/locale/zh-TW/zotero/zotero.dtd | 4 ++++ chrome/locale/zh-TW/zotero/zotero.properties | 2 +- 119 files changed, 201 insertions(+), 78 deletions(-) diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd index 098cf25849..75d0d38f47 100644 --- a/chrome/locale/af-ZA/zotero/preferences.dtd +++ b/chrome/locale/af-ZA/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/af-ZA/zotero/zotero.dtd b/chrome/locale/af-ZA/zotero/zotero.dtd index 82f8567bea..77fd789a15 100644 --- a/chrome/locale/af-ZA/zotero/zotero.dtd +++ b/chrome/locale/af-ZA/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties index 775ac0d75c..d9cd444066 100644 --- a/chrome/locale/af-ZA/zotero/zotero.properties +++ b/chrome/locale/af-ZA/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Install style "%1$S" from %2$S? styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S? styles.installed=The style "%S" was installed successfully. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/ar/zotero/preferences.dtd b/chrome/locale/ar/zotero/preferences.dtd index ae4403d074..4b2a58611d 100644 --- a/chrome/locale/ar/zotero/preferences.dtd +++ b/chrome/locale/ar/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/ar/zotero/zotero.dtd b/chrome/locale/ar/zotero/zotero.dtd index dae3c877a3..dcec7c27a2 100644 --- a/chrome/locale/ar/zotero/zotero.dtd +++ b/chrome/locale/ar/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties index 8dd62f7b94..802338b37f 100644 --- a/chrome/locale/ar/zotero/zotero.properties +++ b/chrome/locale/ar/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=هل تريد تنصيب النمط "%1$S" من %2$S؟ styles.updateStyle=هل تريد تحديث النمط الموجود"%1$S" مع "%2$S" من %3$S؟ styles.installed=تم تنصيب نمط "%S" بنجاح.. styles.installError=%S لا يبدو أنه ملف نمط صحيح. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S المراجع غير صالحة او ان ملف CSL غير موجود في %2$S كمصدر له. styles.deleteStyle=هل ترغب في حذف النمط "%1$S"؟ styles.deleteStyles=هل ترغب في حذف النمط المحدد؟ diff --git a/chrome/locale/bg-BG/zotero/preferences.dtd b/chrome/locale/bg-BG/zotero/preferences.dtd index 7a77644e34..03b371e5d3 100644 --- a/chrome/locale/bg-BG/zotero/preferences.dtd +++ b/chrome/locale/bg-BG/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/bg-BG/zotero/zotero.dtd b/chrome/locale/bg-BG/zotero/zotero.dtd index 10099259c4..a4d867ef52 100644 --- a/chrome/locale/bg-BG/zotero/zotero.dtd +++ b/chrome/locale/bg-BG/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties index 97f8aeacac..a9d630d5d8 100644 --- a/chrome/locale/bg-BG/zotero/zotero.properties +++ b/chrome/locale/bg-BG/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Да бъде ли инсталиран стила "%1$S" о styles.updateStyle=Да бъде ли осъвременен съществуващия стил "%1$S" с "%2$S" от %3$S? styles.installed=Стилът "%S" беше успешно инсталиран. styles.installError=%S не е валиден стилов (CSL) файл. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S препраща към невалиден или несъщесвуваш CSL файл в %2$S, като негов източник. styles.deleteStyle=Сигурни ли сте че искате да изтриете стила "%1$S"? styles.deleteStyles=Сигурни ли сте че искате да изтриете избраните стилове? diff --git a/chrome/locale/ca-AD/zotero/preferences.dtd b/chrome/locale/ca-AD/zotero/preferences.dtd index 4af0e4d9c3..a1c41210c5 100644 --- a/chrome/locale/ca-AD/zotero/preferences.dtd +++ b/chrome/locale/ca-AD/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/ca-AD/zotero/zotero.dtd b/chrome/locale/ca-AD/zotero/zotero.dtd index 5d689162e9..22d947d224 100644 --- a/chrome/locale/ca-AD/zotero/zotero.dtd +++ b/chrome/locale/ca-AD/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties index fb38214a4e..5563ee63bc 100644 --- a/chrome/locale/ca-AD/zotero/zotero.properties +++ b/chrome/locale/ca-AD/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Instal·la estil "%1$S" des de %2$S? styles.updateStyle=Actualitza l'estil existent "%1$S" amb "%2$S" des de %3$S? styles.installed=L'estil "%S" s'ha instal·lat correctament styles.installError=%S no sembla un fitxer d'estil vàlid. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S fa referència a un fitxer inexistent o no vàlid a %2$S com la seva font. styles.deleteStyle=Segur que voleu suprimir l'estil "%1$S"? styles.deleteStyles=Segur que voleu suprimir els estils seleccionats? diff --git a/chrome/locale/cs-CZ/zotero/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd index 75a5d046b3..91a5e8c4d4 100644 --- a/chrome/locale/cs-CZ/zotero/preferences.dtd +++ b/chrome/locale/cs-CZ/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd index b2a32b9585..a83bc49851 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.dtd +++ b/chrome/locale/cs-CZ/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties index 417b8e42b9..567ca78007 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.properties +++ b/chrome/locale/cs-CZ/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Instalovat styl "%1$S" z %2$S? styles.updateStyle=Aktualizovat existující styl "%1$S" stylem "%2$S" z %3$S? styles.installed=Styl "%S" byl úspěšně nainstalován. styles.installError=%S zřejmě není platný soubor stylu. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S odkazuje na neplatný nebo neexistující CSL soubor %2$S. styles.deleteStyle=Jste si jisti, že chcete smazat styl "%1$S"? styles.deleteStyles=Jste si jisti, že chcete smazat vybrané styly? diff --git a/chrome/locale/da-DK/zotero/preferences.dtd b/chrome/locale/da-DK/zotero/preferences.dtd index ad473bbc7e..5b5a050458 100644 --- a/chrome/locale/da-DK/zotero/preferences.dtd +++ b/chrome/locale/da-DK/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd index bf3f912fe5..353311428b 100644 --- a/chrome/locale/da-DK/zotero/zotero.dtd +++ b/chrome/locale/da-DK/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties index 7ef0cc7715..ac3acc7f20 100644 --- a/chrome/locale/da-DK/zotero/zotero.properties +++ b/chrome/locale/da-DK/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Install style "%1$S" from %2$S? styles.updateStyle=Vil du opdatere det nuværende format "%1$S" med "%2$S" fra %3$S? styles.installed=The style "%S" was installed successfully. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/de/zotero/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd index 2c6d733426..7ee21255cf 100644 --- a/chrome/locale/de/zotero/preferences.dtd +++ b/chrome/locale/de/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/de/zotero/zotero.dtd b/chrome/locale/de/zotero/zotero.dtd index 8f0df53653..cb929f949a 100644 --- a/chrome/locale/de/zotero/zotero.dtd +++ b/chrome/locale/de/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties index 44417ee746..1d8d35c874 100644 --- a/chrome/locale/de/zotero/zotero.properties +++ b/chrome/locale/de/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Stil "%1$S" von %2$S installieren? styles.updateStyle=Bestehenden Stil "%1$S" mit "%2$S" von %3$S aktualisieren? styles.installed=Der Stil "%S" wurde erfolgreich installiert. styles.installError=%S scheint keine gültige Zitierstils-Datei zu sein. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S ruft eine ungültige oder nicht existierenden CSL-Datei unter %2$S als Quelle auf. styles.deleteStyle=Sind Sie sicher, dass Sie den Stil "%1$S" löschen wollen? styles.deleteStyles=Sind Sie sicher, dass Sie die ausgewählten Stile löschen wollen? diff --git a/chrome/locale/el-GR/zotero/preferences.dtd b/chrome/locale/el-GR/zotero/preferences.dtd index 6eded0b8e9..97fb4661eb 100644 --- a/chrome/locale/el-GR/zotero/preferences.dtd +++ b/chrome/locale/el-GR/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/el-GR/zotero/zotero.dtd b/chrome/locale/el-GR/zotero/zotero.dtd index ceebe0620f..cff8fd7fe0 100644 --- a/chrome/locale/el-GR/zotero/zotero.dtd +++ b/chrome/locale/el-GR/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties index 775ac0d75c..d9cd444066 100644 --- a/chrome/locale/el-GR/zotero/zotero.properties +++ b/chrome/locale/el-GR/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Install style "%1$S" from %2$S? styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S? styles.installed=The style "%S" was installed successfully. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/es-ES/zotero/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd index 6682ed20ee..c284db42ee 100644 --- a/chrome/locale/es-ES/zotero/preferences.dtd +++ b/chrome/locale/es-ES/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/es-ES/zotero/zotero.dtd b/chrome/locale/es-ES/zotero/zotero.dtd index 2d99945de9..a7c88fd014 100644 --- a/chrome/locale/es-ES/zotero/zotero.dtd +++ b/chrome/locale/es-ES/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties index 18dfa0d611..e1b6612dad 100644 --- a/chrome/locale/es-ES/zotero/zotero.properties +++ b/chrome/locale/es-ES/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=¿Instalar el estilo "%1$S" desde %2$S? styles.updateStyle=¿Actualizar el estilo existente "%1$S" con "%2$S" desde %3$S? styles.installed=El estilo "%S" se ha instalado correctamente. styles.installError=%S no parece ser un archivo válido de estilo. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S referencia un archivo CSL inválido o inexistente en %2$S como su origen. styles.deleteStyle=¿Seguro que quieres borrar el estilo "%1$S"? styles.deleteStyles=¿Seguro que quieres borrar los estilos seleccionados? diff --git a/chrome/locale/et-EE/zotero/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd index c29a25760d..94ba93682b 100644 --- a/chrome/locale/et-EE/zotero/preferences.dtd +++ b/chrome/locale/et-EE/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/et-EE/zotero/zotero.dtd b/chrome/locale/et-EE/zotero/zotero.dtd index 5b435b2ae5..8fa9892b53 100644 --- a/chrome/locale/et-EE/zotero/zotero.dtd +++ b/chrome/locale/et-EE/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties index cdbcd790b6..71b374c742 100644 --- a/chrome/locale/et-EE/zotero/zotero.properties +++ b/chrome/locale/et-EE/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Paigaldada stiil "%1$S" asukohast %2$S? styles.updateStyle=uuendada olemasolevat stiili "%1$S" stiiliks "%2$S" asukohast %3$S? styles.installed=Stiili "%S" paigaldamine õnnestus. styles.installError=%S näib olevat vigane. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S viitab vigasele või puuduvale CSL failile %2$S. styles.deleteStyle=Olete kindel, et soovite stiili "%1$S" kustutada? styles.deleteStyles=Olete kindel, et soovite neid stiile kustutada? diff --git a/chrome/locale/eu-ES/zotero/preferences.dtd b/chrome/locale/eu-ES/zotero/preferences.dtd index 1a0565daa7..e655eea0b6 100644 --- a/chrome/locale/eu-ES/zotero/preferences.dtd +++ b/chrome/locale/eu-ES/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/eu-ES/zotero/zotero.dtd b/chrome/locale/eu-ES/zotero/zotero.dtd index bc9c867884..2335eac157 100644 --- a/chrome/locale/eu-ES/zotero/zotero.dtd +++ b/chrome/locale/eu-ES/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties index 803514b75b..9310083f4f 100644 --- a/chrome/locale/eu-ES/zotero/zotero.properties +++ b/chrome/locale/eu-ES/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Instalatu "%1$S" estilo %2$S-tik? styles.updateStyle=Eguneratu dagoen "%1$S" estilo "%2$S" %3$S-tik erabiliz? styles.installed="%S" estiloaren instalaziñoa ongi burutu da. styles.installError=%S-ek ez du estilo fitxategi baliorik. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/fa/zotero/preferences.dtd b/chrome/locale/fa/zotero/preferences.dtd index 3f2a9abe6e..8acf686e2a 100644 --- a/chrome/locale/fa/zotero/preferences.dtd +++ b/chrome/locale/fa/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/fa/zotero/zotero.dtd b/chrome/locale/fa/zotero/zotero.dtd index 3f8f8f0c6d..7d7a469003 100644 --- a/chrome/locale/fa/zotero/zotero.dtd +++ b/chrome/locale/fa/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties index 105a04afb4..b9c9fd2b03 100644 --- a/chrome/locale/fa/zotero/zotero.properties +++ b/chrome/locale/fa/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=شیوه‌نامه "%1$S" از %2$S نصب شود؟ styles.updateStyle=شیوه‌نامه "%1$S" با "%2$S" از %3$S روزآمد شود؟ styles.installed=شیوه‌نامه "%S" با موفقیت نصب شد. styles.installError=%S پرونده شیوه‌نامه معتبری نیست. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S به پرونده سی‌اس‌الی در %2$S به عنوان منبع ارجاع میدهد که وجود ندارد یا معتبر نیست‌. styles.deleteStyle=آیا واقعا می‌خواهید شیوه‌نامه "%1$S" را حذف کنید؟ styles.deleteStyles=آقای واقعا می‌خواهید شیوه‌نامه‌های انتخاب شده را حذف کنید؟ diff --git a/chrome/locale/fi-FI/zotero/preferences.dtd b/chrome/locale/fi-FI/zotero/preferences.dtd index 93dd67f470..f176c5daaf 100644 --- a/chrome/locale/fi-FI/zotero/preferences.dtd +++ b/chrome/locale/fi-FI/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/fi-FI/zotero/zotero.dtd b/chrome/locale/fi-FI/zotero/zotero.dtd index 5bbd56f770..e2708efa34 100644 --- a/chrome/locale/fi-FI/zotero/zotero.dtd +++ b/chrome/locale/fi-FI/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties index 1bbdce477b..ad7ff3813e 100644 --- a/chrome/locale/fi-FI/zotero/zotero.properties +++ b/chrome/locale/fi-FI/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Asennetaanko tyyli "%1$S" lähteestä %2$S? styles.updateStyle=Päivitetäänkö aiempi tyyli "%1$S" tyylillä "%2$S" lähteestä %3$S? styles.installed=Tyyli "%S" asennettiin onnistuneesti. styles.installError=%S ei vaikuta olevan kelvollinen tyylitiedosto. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S viittaa epäkelpoon tai olemattoon CSL-tiedostoon %2$S. styles.deleteStyle=Haluatko varmasti poistaa tyylin "%1$S"? styles.deleteStyles=Haluatko varmasti poistaa valitut tyylit? diff --git a/chrome/locale/fr-FR/zotero/preferences.dtd b/chrome/locale/fr-FR/zotero/preferences.dtd index a086a99cf4..2cb3193fce 100644 --- a/chrome/locale/fr-FR/zotero/preferences.dtd +++ b/chrome/locale/fr-FR/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/fr-FR/zotero/zotero.dtd b/chrome/locale/fr-FR/zotero/zotero.dtd index 5bab419857..0f727620ee 100644 --- a/chrome/locale/fr-FR/zotero/zotero.dtd +++ b/chrome/locale/fr-FR/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd index 9d84953e73..b2701e37a0 100644 --- a/chrome/locale/gl-ES/zotero/preferences.dtd +++ b/chrome/locale/gl-ES/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd index f8cee99746..b8613ab0f5 100644 --- a/chrome/locale/gl-ES/zotero/zotero.dtd +++ b/chrome/locale/gl-ES/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties index bd14e2bdce..1f5a5fdad3 100644 --- a/chrome/locale/gl-ES/zotero/zotero.properties +++ b/chrome/locale/gl-ES/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Instalar o estilo «%1$S» desde %2$S? styles.updateStyle=Actualizar o estilo «%1$S» con «%2$S» desde %3$S? styles.installed=Instalouse correctamente o estilo «%S». styles.installError=%S non parece ser un ficheiro de estilo válido. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S fai referencia a un ficheiro CSL que non é válido ou non existe e que ten como orixe %2$S. styles.deleteStyle=Seguro que desexa borrar o estilo «%1$S»? styles.deleteStyles=Seguro que desexa eliminar os estilos seleccionados? diff --git a/chrome/locale/he-IL/zotero/preferences.dtd b/chrome/locale/he-IL/zotero/preferences.dtd index 36e55aee38..99a6cee07c 100644 --- a/chrome/locale/he-IL/zotero/preferences.dtd +++ b/chrome/locale/he-IL/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/he-IL/zotero/zotero.dtd b/chrome/locale/he-IL/zotero/zotero.dtd index e79ebc6a06..25f3c57729 100644 --- a/chrome/locale/he-IL/zotero/zotero.dtd +++ b/chrome/locale/he-IL/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties index e7b187b4eb..f4ef9f3e61 100644 --- a/chrome/locale/he-IL/zotero/zotero.properties +++ b/chrome/locale/he-IL/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Install style "%1$S" from %2$S? styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S? styles.installed=The style "%S" was installed successfully. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/hr-HR/zotero/preferences.dtd b/chrome/locale/hr-HR/zotero/preferences.dtd index 6eded0b8e9..97fb4661eb 100644 --- a/chrome/locale/hr-HR/zotero/preferences.dtd +++ b/chrome/locale/hr-HR/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/hr-HR/zotero/zotero.dtd b/chrome/locale/hr-HR/zotero/zotero.dtd index ceebe0620f..cff8fd7fe0 100644 --- a/chrome/locale/hr-HR/zotero/zotero.dtd +++ b/chrome/locale/hr-HR/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties index 775ac0d75c..d9cd444066 100644 --- a/chrome/locale/hr-HR/zotero/zotero.properties +++ b/chrome/locale/hr-HR/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Install style "%1$S" from %2$S? styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S? styles.installed=The style "%S" was installed successfully. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd index 2ad5fc116c..7560dbc56f 100644 --- a/chrome/locale/hu-HU/zotero/preferences.dtd +++ b/chrome/locale/hu-HU/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/hu-HU/zotero/zotero.dtd b/chrome/locale/hu-HU/zotero/zotero.dtd index 4350fb2314..3007193113 100644 --- a/chrome/locale/hu-HU/zotero/zotero.dtd +++ b/chrome/locale/hu-HU/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties index 4f0e61c3af..f12f10e116 100644 --- a/chrome/locale/hu-HU/zotero/zotero.properties +++ b/chrome/locale/hu-HU/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=A "%1$S" stílus importálása a %2$S-ból? styles.updateStyle=A "%1$S" stílus lecserélése %2$S-re a %3$S-ból? styles.installed=A "%1$S" stílus importálása sikerült. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/is-IS/zotero/preferences.dtd b/chrome/locale/is-IS/zotero/preferences.dtd index fcfb6b0298..5dd1e62028 100644 --- a/chrome/locale/is-IS/zotero/preferences.dtd +++ b/chrome/locale/is-IS/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/is-IS/zotero/zotero.dtd b/chrome/locale/is-IS/zotero/zotero.dtd index 26939c09ec..83b8d011e9 100644 --- a/chrome/locale/is-IS/zotero/zotero.dtd +++ b/chrome/locale/is-IS/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties index c1b2cc74ab..686f3dd2f9 100644 --- a/chrome/locale/is-IS/zotero/zotero.properties +++ b/chrome/locale/is-IS/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Install style "%1$S" from %2$S? styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S? styles.installed=The style "%S" was installed successfully. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/it-IT/zotero/preferences.dtd b/chrome/locale/it-IT/zotero/preferences.dtd index fa3a7d4192..d45202646b 100644 --- a/chrome/locale/it-IT/zotero/preferences.dtd +++ b/chrome/locale/it-IT/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/it-IT/zotero/zotero.dtd b/chrome/locale/it-IT/zotero/zotero.dtd index 0d2f11eeda..d95c602496 100644 --- a/chrome/locale/it-IT/zotero/zotero.dtd +++ b/chrome/locale/it-IT/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties index 95e3534c31..012f9a4898 100644 --- a/chrome/locale/it-IT/zotero/zotero.properties +++ b/chrome/locale/it-IT/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Installare stile "%1$S" da %2$S? styles.updateStyle=Aggiornare lo stile esistente "%1$S" con "%2$S" da %3$S? styles.installed=Lo stile "%S" è stato installato correttamente. styles.installError=%S non sembra essere un file di stile valido. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S si riferisce nel punto %2$S del suo sorgente ad un file CSL non valido o non esistente. styles.deleteStyle=Si è certi di voler eliminare lo stile "%1$S"? styles.deleteStyles=Si è certi di voler eliminare lo stile selezionato? diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd index 5770ac887d..f3f2dcd40c 100644 --- a/chrome/locale/ja-JP/zotero/preferences.dtd +++ b/chrome/locale/ja-JP/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd index cfa449c6c3..8f9a017c83 100644 --- a/chrome/locale/ja-JP/zotero/zotero.dtd +++ b/chrome/locale/ja-JP/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/km/zotero/preferences.dtd b/chrome/locale/km/zotero/preferences.dtd index 26d0e32d76..fb0492b1c2 100644 --- a/chrome/locale/km/zotero/preferences.dtd +++ b/chrome/locale/km/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/km/zotero/zotero.dtd b/chrome/locale/km/zotero/zotero.dtd index 93e0188389..a957d99e5e 100644 --- a/chrome/locale/km/zotero/zotero.dtd +++ b/chrome/locale/km/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/km/zotero/zotero.properties b/chrome/locale/km/zotero/zotero.properties index a4f8698e97..caa3ad88d4 100644 --- a/chrome/locale/km/zotero/zotero.properties +++ b/chrome/locale/km/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=ដំឡើងរចនាបថ "%1$S" ពី %2$S? styles.updateStyle=ធ្វើទំនើបកម្មរចនាបថដែលមានស្រាប់ "%1$S"ជាមួយ "%2$S" ពី %3$S? styles.installed=រចនាបថ "%S" ត្រូវបានដំឡើងដោយជោគជ័យ។ styles.installError=%S មិនមែនជារចនាបថមានសុពលភាពទេ។ -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=យោង %1$S ជាសំណុំឯកសារស៊ីអេសអិល ដែលគ្មានសុពលបានមកពី %2$S ។ styles.deleteStyle=តើអ្នកចង់លុបរចនាបថ "%1$S"? styles.deleteStyles=តើអ្នកចង់លុបរចនាបថជ្រើសរើស? diff --git a/chrome/locale/ko-KR/zotero/preferences.dtd b/chrome/locale/ko-KR/zotero/preferences.dtd index baab74db50..6c0d7f2577 100644 --- a/chrome/locale/ko-KR/zotero/preferences.dtd +++ b/chrome/locale/ko-KR/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/ko-KR/zotero/zotero.dtd b/chrome/locale/ko-KR/zotero/zotero.dtd index 818a63a9ff..29bc56d744 100644 --- a/chrome/locale/ko-KR/zotero/zotero.dtd +++ b/chrome/locale/ko-KR/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties index 76a96b1291..0e263b57ee 100644 --- a/chrome/locale/ko-KR/zotero/zotero.properties +++ b/chrome/locale/ko-KR/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=%2$S로 부터 %1$S(을)를 내보내시겠습니까? styles.updateStyle=%3$S(으)로 부터 기존 스타일 "%1$S"(을)를 "%2$S"(으)로 갱신합니다. styles.installed=스타일 "%S"(을)를 성공적으로 설치했습니다. styles.installError=%S(은)는 올바른 스타일 파일로 보이지 않습니다. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=정말로 "%1$S" 스타일을 삭제하길 원하십니까? styles.deleteStyles=정말로 선택된 스타일을 삭제하길 원하십니까? diff --git a/chrome/locale/mn-MN/zotero/preferences.dtd b/chrome/locale/mn-MN/zotero/preferences.dtd index e53055546c..c16205c461 100644 --- a/chrome/locale/mn-MN/zotero/preferences.dtd +++ b/chrome/locale/mn-MN/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/mn-MN/zotero/zotero.dtd b/chrome/locale/mn-MN/zotero/zotero.dtd index 6179674b4b..61a520d0bb 100644 --- a/chrome/locale/mn-MN/zotero/zotero.dtd +++ b/chrome/locale/mn-MN/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties index f0a29b2f43..9a28cebd7b 100644 --- a/chrome/locale/mn-MN/zotero/zotero.properties +++ b/chrome/locale/mn-MN/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Install style "%1$S" from %2$S? styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S? styles.installed=The style "%S" was installed successfully. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/nb-NO/zotero/preferences.dtd b/chrome/locale/nb-NO/zotero/preferences.dtd index a621bfdcd3..5ed6f67b77 100644 --- a/chrome/locale/nb-NO/zotero/preferences.dtd +++ b/chrome/locale/nb-NO/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/nb-NO/zotero/zotero.dtd b/chrome/locale/nb-NO/zotero/zotero.dtd index 80c71a1b10..2d1aef1937 100644 --- a/chrome/locale/nb-NO/zotero/zotero.dtd +++ b/chrome/locale/nb-NO/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties index 52720f1f1b..14d19ee140 100644 --- a/chrome/locale/nb-NO/zotero/zotero.properties +++ b/chrome/locale/nb-NO/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Installere stilen "%1$S" fra %2$S? styles.updateStyle=Oppdatere den eksisterende stilen "%1$S" til "%2$S" fra %3$S? styles.installed=Installasjon av stilen "%S" var vellykket. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/nl-NL/zotero/preferences.dtd b/chrome/locale/nl-NL/zotero/preferences.dtd index 0facc3e4cc..b3bd366bef 100644 --- a/chrome/locale/nl-NL/zotero/preferences.dtd +++ b/chrome/locale/nl-NL/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/nl-NL/zotero/zotero.dtd b/chrome/locale/nl-NL/zotero/zotero.dtd index b04424dd83..40798f9e4c 100644 --- a/chrome/locale/nl-NL/zotero/zotero.dtd +++ b/chrome/locale/nl-NL/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties index f17cbbc9ef..edd0f4899d 100644 --- a/chrome/locale/nl-NL/zotero/zotero.properties +++ b/chrome/locale/nl-NL/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Stijl "%1$S" vanuit %2$S installeren? styles.updateStyle=Bestaande stijl "%1$S" bijwerken met "%2$S" vanuit %3$S? styles.installed=Stijl "%S" is met succes geïnstalleerd. styles.installError=%S lijkt geen correct stijl-bestand te zijn. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S verwijst naar een incorrect of niet bestaand CSL-bestand op %2$S. styles.deleteStyle=Wilt u de stijl "%1$S" verwijderen? styles.deleteStyles=Wilt u de geselecteerde stijlen verwijderen? diff --git a/chrome/locale/nn-NO/zotero/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd index 96369bd469..594bfafa85 100644 --- a/chrome/locale/nn-NO/zotero/preferences.dtd +++ b/chrome/locale/nn-NO/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/nn-NO/zotero/zotero.dtd b/chrome/locale/nn-NO/zotero/zotero.dtd index 5a3961987c..1f86e37a08 100644 --- a/chrome/locale/nn-NO/zotero/zotero.dtd +++ b/chrome/locale/nn-NO/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties index 6fa5775f78..e7e40052e3 100644 --- a/chrome/locale/nn-NO/zotero/zotero.properties +++ b/chrome/locale/nn-NO/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Vil du installera stilen «%1$S» frå %2$S? styles.updateStyle=Vil du oppdatera stilen «%1$S» til «%2$S» frå %3$S? styles.installed=Installasjon av stilen "%S" var vellukka. styles.installError=%S ser ikkje ut til å vere ei gyldig stilfil. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL fila at %2$S as its source. styles.deleteStyle=Er du sikker på at du vil slette stilen «%1$S»? styles.deleteStyles=Are you sure you want to delete the selected style? diff --git a/chrome/locale/pl-PL/zotero/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd index 1232ccaf91..5a1c62c289 100644 --- a/chrome/locale/pl-PL/zotero/preferences.dtd +++ b/chrome/locale/pl-PL/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/pl-PL/zotero/zotero.dtd b/chrome/locale/pl-PL/zotero/zotero.dtd index b5f4f47594..b3043ee8bb 100644 --- a/chrome/locale/pl-PL/zotero/zotero.dtd +++ b/chrome/locale/pl-PL/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties index 2e2ee198ec..d2480c8a93 100644 --- a/chrome/locale/pl-PL/zotero/zotero.properties +++ b/chrome/locale/pl-PL/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Zainstalować styl "%1$S" z %2$S? styles.updateStyle=Czy zastąpić istniejący styl "%1$S" stylem "%2$S" pobranym z %3$S? styles.installed=Styl "%S" został zainstalowany. styles.installError=%S nie jest poprawnym stylem. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S w %2$S odsyła do nieprawidłowego lub nieistniejącego pliku CSL jako swojego źródła. styles.deleteStyle=Czy na pewno usunąć styl "%1$S"? styles.deleteStyles=Czy na pewno usunąć wybrane style? diff --git a/chrome/locale/pt-BR/zotero/preferences.dtd b/chrome/locale/pt-BR/zotero/preferences.dtd index 011a8ab679..ffa599c17d 100644 --- a/chrome/locale/pt-BR/zotero/preferences.dtd +++ b/chrome/locale/pt-BR/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/pt-BR/zotero/zotero.dtd b/chrome/locale/pt-BR/zotero/zotero.dtd index 86e4ace55f..a56362f244 100644 --- a/chrome/locale/pt-BR/zotero/zotero.dtd +++ b/chrome/locale/pt-BR/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties index b96a7a5892..1ac4a0a8a3 100644 --- a/chrome/locale/pt-BR/zotero/zotero.properties +++ b/chrome/locale/pt-BR/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Instalar estilo "%1$S" de %2$S? styles.updateStyle=Atualizar o estilo existente "%1$S" com "%2$S" de %3$S? styles.installed=O estilo "%S" foi instalado com sucesso. styles.installError=%S não parece ser um arquivo de estilo válido. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S faz referância a um arquivo inválido ou inexistente em %2$S como sua fonte. styles.deleteStyle=Tem certeza de que deseja excluir o estilo "%1$S"? styles.deleteStyles=Tem certeza de que deseja excluir os estilos selecionados? diff --git a/chrome/locale/pt-PT/zotero/preferences.dtd b/chrome/locale/pt-PT/zotero/preferences.dtd index f76e6aed58..3e874d912c 100644 --- a/chrome/locale/pt-PT/zotero/preferences.dtd +++ b/chrome/locale/pt-PT/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/pt-PT/zotero/zotero.dtd b/chrome/locale/pt-PT/zotero/zotero.dtd index 998b0bbcc3..c631ad2e65 100644 --- a/chrome/locale/pt-PT/zotero/zotero.dtd +++ b/chrome/locale/pt-PT/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties index e3d00c6f3c..348ae58add 100644 --- a/chrome/locale/pt-PT/zotero/zotero.properties +++ b/chrome/locale/pt-PT/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Instalar o estilo "%1$S" de %2$S? styles.updateStyle=Actualizar o estilo "%1$S" existente com "%2$S" de %3$S? styles.installed=O estilo "%S" foi instalado com sucesso. styles.installError=%S não aparenta ser um arquivo de estilo válido. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S referencia um arquivo CSL inválido ou inexistente em %2$S como sua fonte. styles.deleteStyle=Quer mesmo remover o estilo "%1$S"? styles.deleteStyles=Quer mesmo remover os estilos seleccionados? diff --git a/chrome/locale/ro-RO/zotero/preferences.dtd b/chrome/locale/ro-RO/zotero/preferences.dtd index add6d1f764..5a7bbba96f 100644 --- a/chrome/locale/ro-RO/zotero/preferences.dtd +++ b/chrome/locale/ro-RO/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/ro-RO/zotero/zotero.dtd b/chrome/locale/ro-RO/zotero/zotero.dtd index 2d968e4dc9..cf10976cbb 100644 --- a/chrome/locale/ro-RO/zotero/zotero.dtd +++ b/chrome/locale/ro-RO/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/ru-RU/zotero/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd index e26ea65abe..9a31583123 100644 --- a/chrome/locale/ru-RU/zotero/preferences.dtd +++ b/chrome/locale/ru-RU/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/ru-RU/zotero/zotero.dtd b/chrome/locale/ru-RU/zotero/zotero.dtd index 92bf3aecd6..7bb8308e96 100644 --- a/chrome/locale/ru-RU/zotero/zotero.dtd +++ b/chrome/locale/ru-RU/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties index 545267a97b..76573eb665 100644 --- a/chrome/locale/ru-RU/zotero/zotero.properties +++ b/chrome/locale/ru-RU/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Установить стиль "%1$S" из %2$S? styles.updateStyle=Обновить существующий стиль "%1$S" стилем "%2$S" из %3$S? styles.installed=Стиль "%S" был успешно установлен. styles.installError=%S не является допустимым файлом стиля. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S ссылается на недопустимый или несуществующий файл CSL из %2$S в качестве своей основы. styles.deleteStyle=Вы уверены, что хотите удалить стиль "%1$S"? styles.deleteStyles=Вы уверены, что хотите удалить выбранные стили? diff --git a/chrome/locale/sk-SK/zotero/preferences.dtd b/chrome/locale/sk-SK/zotero/preferences.dtd index a8bd795dfd..df7466369a 100644 --- a/chrome/locale/sk-SK/zotero/preferences.dtd +++ b/chrome/locale/sk-SK/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd index 3f80c491c3..f679046b9b 100644 --- a/chrome/locale/sk-SK/zotero/zotero.dtd +++ b/chrome/locale/sk-SK/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd index dfb7da3f21..4c57c3aaa9 100644 --- a/chrome/locale/sl-SI/zotero/preferences.dtd +++ b/chrome/locale/sl-SI/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd index e72fb1c009..4d9f56f7d4 100644 --- a/chrome/locale/sl-SI/zotero/zotero.dtd +++ b/chrome/locale/sl-SI/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties index b504e9f93c..a9de1a994d 100644 --- a/chrome/locale/sl-SI/zotero/zotero.properties +++ b/chrome/locale/sl-SI/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Želite namestiti slog »%1$S« iz %2$S? styles.updateStyle=Želite posodobiti obstoječi slog »%1$S« z »%2$S« iz %3$S? styles.installed=Slog »%S« je bil uspešno nameščen. styles.installError=%S ni videti veljavna slogovna datoteka. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=$1$S se sklicuje na neveljavno ali neobstoječo datoteko CSL v %2$S kot njenem viru. styles.deleteStyle=Ste prepričani, da želite izbrisati slog »%1$S«? styles.deleteStyles=Ste prepričani, da želite izbrisati izbrane sloge? diff --git a/chrome/locale/sr-RS/zotero/preferences.dtd b/chrome/locale/sr-RS/zotero/preferences.dtd index ef1460fefe..4e8fc58419 100644 --- a/chrome/locale/sr-RS/zotero/preferences.dtd +++ b/chrome/locale/sr-RS/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/sr-RS/zotero/zotero.dtd b/chrome/locale/sr-RS/zotero/zotero.dtd index d6ea6c12e3..f6a94b7c95 100644 --- a/chrome/locale/sr-RS/zotero/zotero.dtd +++ b/chrome/locale/sr-RS/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties index 506f18d9f4..522883965c 100644 --- a/chrome/locale/sr-RS/zotero/zotero.properties +++ b/chrome/locale/sr-RS/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Инсталирати стил „%1$S“ из %2$S? styles.updateStyle=Ажурирати постојећи стил „%1$S“ са „%2$S“ из %3$S? styles.installed=Стил „%S“ је успешно инсталиран. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/sv-SE/zotero/preferences.dtd b/chrome/locale/sv-SE/zotero/preferences.dtd index 8ed4903d6b..fb840a9033 100644 --- a/chrome/locale/sv-SE/zotero/preferences.dtd +++ b/chrome/locale/sv-SE/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd index 4b216a56a2..7d4a8e4cd4 100644 --- a/chrome/locale/sv-SE/zotero/zotero.dtd +++ b/chrome/locale/sv-SE/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties index 7afc1e0eb1..8aff00efe2 100644 --- a/chrome/locale/sv-SE/zotero/zotero.properties +++ b/chrome/locale/sv-SE/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Installera referensstil "%1$S" från %2$S? styles.updateStyle=Uppdatera existerande referensstil "%1$S" med "%2$S" från %3$S? styles.installed=Referensstilen "%S" importerades med lyckat resultat. styles.installError=%S verkar inte vara en giltig mallfil. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S refererar till en ogiltig eller saknad CSL-file med %2$S som källa. styles.deleteStyle=Är du säker på att du vill ta bort referensstilen "%1$S"? styles.deleteStyles=Är du säker på att du vill ta bort de valda referensstilarna? diff --git a/chrome/locale/th-TH/zotero/preferences.dtd b/chrome/locale/th-TH/zotero/preferences.dtd index 3221f2ff5b..c352f92bed 100644 --- a/chrome/locale/th-TH/zotero/preferences.dtd +++ b/chrome/locale/th-TH/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/th-TH/zotero/zotero.dtd b/chrome/locale/th-TH/zotero/zotero.dtd index 858489836f..15aff31cb8 100644 --- a/chrome/locale/th-TH/zotero/zotero.dtd +++ b/chrome/locale/th-TH/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties index 033a493492..a819363a81 100644 --- a/chrome/locale/th-TH/zotero/zotero.properties +++ b/chrome/locale/th-TH/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=ติดตั้งรูปแบบการอ้าง styles.updateStyle=ปรับรูปแบบการอ้างอิง "%1$S" ให้เป็นปัจจุบันด้วย "%2$S" จาก %3$S? styles.installed=ติดตั้งรูปแบบการอ้างอิง "%S" เรียบร้อยแล้ว styles.installError=แฟ้มรูปแบบการอ้างอิง %S หาไม่พบ -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S อ้างอิงผิดหรือไม่มีแฟ้ม CSL ที่ %2$S อย่างแหล่งที่มา styles.deleteStyle=คุณแน่ใจหรือที่จะลบรูปแบบการอ้างอิง "%1$S"? styles.deleteStyles=คุณต้องการลบรูปแบบการอ้างอิงที่เลือกใช่หรือไม่ diff --git a/chrome/locale/tr-TR/zotero/preferences.dtd b/chrome/locale/tr-TR/zotero/preferences.dtd index 1d0d2543a6..e98598c7e1 100644 --- a/chrome/locale/tr-TR/zotero/preferences.dtd +++ b/chrome/locale/tr-TR/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/tr-TR/zotero/zotero.dtd b/chrome/locale/tr-TR/zotero/zotero.dtd index f3d4a79a4e..791e07f556 100644 --- a/chrome/locale/tr-TR/zotero/zotero.dtd +++ b/chrome/locale/tr-TR/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties index f25327bf24..80d84196e7 100644 --- a/chrome/locale/tr-TR/zotero/zotero.properties +++ b/chrome/locale/tr-TR/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Sitil "%1$S" %2$S'den kurulsunmu? styles.updateStyle=Geçerli sitili "%1$S" %3$S den "%2$S" e güncellensinmi? styles.installed=sitil "%S" başarılı olarak kuruldu. styles.installError=%S dosyası geçerli bir biçim dosyası olarak görülmüyor. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S, %2$S'de geçersiz olan ya da varolmayan bir CSL dosyasına kaynağı olarak atfediyor. styles.deleteStyle=Bu biçimi silmek istediğinize emin misiniz? "%1$S"? styles.deleteStyles=Seçili biçimleri silmek istediğinize emin misiniz? diff --git a/chrome/locale/vi-VN/zotero/preferences.dtd b/chrome/locale/vi-VN/zotero/preferences.dtd index 9d5d6cee48..719f6f1f87 100644 --- a/chrome/locale/vi-VN/zotero/preferences.dtd +++ b/chrome/locale/vi-VN/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/vi-VN/zotero/zotero.dtd b/chrome/locale/vi-VN/zotero/zotero.dtd index ed61ead3c8..7aa930f797 100644 --- a/chrome/locale/vi-VN/zotero/zotero.dtd +++ b/chrome/locale/vi-VN/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties index ba0af8ea6f..38b16b9aaa 100644 --- a/chrome/locale/vi-VN/zotero/zotero.properties +++ b/chrome/locale/vi-VN/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Cài đặt style "%1$S" từ %2$S? styles.updateStyle=Cập nhật style "%1$S" với "%2$S" từ %3$S? styles.installed=Style "%S" đã được cài đặt thành công. styles.installError="%S" is not a valid style file. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source. styles.deleteStyle=Are you sure you want to delete the style "%1$S"? styles.deleteStyles=Are you sure you want to delete the selected styles? diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd index 9686253aa8..098d04a998 100644 --- a/chrome/locale/zh-CN/zotero/preferences.dtd +++ b/chrome/locale/zh-CN/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd index 8cfbbf0026..490769b8ed 100644 --- a/chrome/locale/zh-CN/zotero/zotero.dtd +++ b/chrome/locale/zh-CN/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties index 0e6755d302..27f9c50085 100644 --- a/chrome/locale/zh-CN/zotero/zotero.properties +++ b/chrome/locale/zh-CN/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=要从%2$S安装样式"%1$S"吗? styles.updateStyle=要从 %3$S用"%2$S"更新现有的样式 "%1$S"吗? styles.installed=样式"%S"已成功安装. styles.installError=%S 不是有效的样式文件. -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S 在%2$S中引用了无效的或不存在的CSL文件作为它的代码. styles.deleteStyle=您确定要删除样式"%1$S"吗? styles.deleteStyles=您确定要删除选中的样式吗? diff --git a/chrome/locale/zh-TW/zotero/preferences.dtd b/chrome/locale/zh-TW/zotero/preferences.dtd index 9bcfcf2978..a7c5dba622 100644 --- a/chrome/locale/zh-TW/zotero/preferences.dtd +++ b/chrome/locale/zh-TW/zotero/preferences.dtd @@ -121,7 +121,6 @@ - diff --git a/chrome/locale/zh-TW/zotero/zotero.dtd b/chrome/locale/zh-TW/zotero/zotero.dtd index 98ca6877d6..ede9cac2cb 100644 --- a/chrome/locale/zh-TW/zotero/zotero.dtd +++ b/chrome/locale/zh-TW/zotero/zotero.dtd @@ -211,6 +211,10 @@ + + + + diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties index a4534631b4..c9c50ac1a9 100644 --- a/chrome/locale/zh-TW/zotero/zotero.properties +++ b/chrome/locale/zh-TW/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=從 %2$S 安裝樣式 "%1$S"？ styles.updateStyle=從 %3$S 用 "%2$S" 更新現有的樣式 "%1$S"？ styles.installed=已成功安裝樣式 "%S"。 styles.installError=%S 不像是個正確的樣式檔。 -styles.validationWarning="%S" is not valid CSL 1.0, and may not work properly with Zotero.\n\nAre you sure you want to continue? +styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue? styles.installSourceError=%1$S 指引到一個無效或不存在 %2$S 的 CSL 檔為它的來源。 styles.deleteStyle=你確定要刪除樣式『%1$S』？ styles.deleteStyles=你確定要刪除所選的樣式嗎？ From c4f8ea007df0310413197b42dc6978b2d28f26c7 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 28 Mar 2013 00:35:56 -0400 Subject: [PATCH 09/23] Update styles --- styles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles b/styles index 1c2a762773..6c292459cc 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit 1c2a7627734100d4dbb80fe09f481f650ec63c2e +Subproject commit 6c292459cca80edd2c7af20288696044f99beda0 From bfc4f3eb783488d1a40689cc6161976f961faa34 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Thu, 28 Mar 2013 00:37:39 -0400 Subject: [PATCH 10/23] Update citeproc-js to 1.0.442 --- chrome/content/zotero/xpcom/citeproc.js | 518 +++++++++++++++--------- 1 file changed, 327 insertions(+), 191 deletions(-) diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js index 6f128f6b88..5ed11cfaaf 100644 --- a/chrome/content/zotero/xpcom/citeproc.js +++ b/chrome/content/zotero/xpcom/citeproc.js @@ -57,13 +57,14 @@ if (!Array.indexOf) { }; } var CSL = { - PROCESSOR_VERSION: "1.0.425", + PROCESSOR_VERSION: "1.0.442", PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/, LOCATOR_LABELS_REGEXP: new RegExp("^((art|ch|Ch|subch|col|fig|l|n|no|op|p|pp|para|subpara|pt|r|sec|subsec|Sec|sv|sch|tit|vrs|vol)\\.)\\s+(.*)"), STATUTE_SUBDIV_GROUPED_REGEX: /((?:^| )(?:art|ch|Ch|subch|p|pp|para|subpara|pt|r|sec|subsec|Sec|sch|tit)\.)/g, STATUTE_SUBDIV_PLAIN_REGEX: /(?:(?:^| )(?:art|ch|Ch|subch|p|pp|para|subpara|pt|r|sec|subsec|Sec|sch|tit)\.)/, STATUTE_SUBDIV_STRINGS: { "art.": "article", + "bk.": "book", "ch.": "chapter", "Ch.": "Chapter", "subch.": "subchapter", @@ -80,9 +81,10 @@ var CSL = { "tit.": "title", "col.": "column", "fig.": "figure", + "fol.": "folio", "l.": "line", "n.": "note", - "no.": "number", + "no.": "issue", "op.": "opus", "sv.": "sub-verbo", "vrs.": "verse", @@ -90,6 +92,7 @@ var CSL = { }, STATUTE_SUBDIV_STRINGS_REVERSE: { "article": "art.", + "book": "bk.", "chapter": "ch.", "Chapter": "Ch.", "subchapter": "subch.", @@ -105,21 +108,25 @@ var CSL = { "title": "tit.", "column": "col.", "figure": "fig.", + "folio": "fol.", "line": "l.", "note": "n.", - "number": "no.", + "issue": "no.", "opus": "op.", "sub-verbo": "sv.", + "sub verbo": "sv.", "verse": "vrs.", "volume": "vol." }, LOCATOR_LABELS_MAP: { "art": "article", + "bk": "book", "ch": "chapter", "Ch": "Chapter", "subch": "subchapter", "col": "column", "fig": "figure", + "fol": "folio", "l": "line", "n": "note", "no": "issue", @@ -130,10 +137,10 @@ var CSL = { "subpara": "subparagraph", "pt": "part", "r": "rule", - "sec": "section", - "subsec": "subsection", + "sec": "section", + "subsec": "subsection", "Sec": "Section", - "sv": "sub-verbo", + "sv": "sub-verbo", "sch": "schedule", "tit": "title", "vrs": "verse", @@ -544,8 +551,8 @@ CSL.error = function (str) { Zotero.debug("CSL error: " + str); }; function DOMParser() { - return Components.classes["@mozilla.org/xmlextras/domparser;1"] - .createInstance(Components.interfaces.nsIDOMParser); + return Components.classes["@mozilla.org/xmlextras/domparser;1"] + .createInstance(Components.interfaces.nsIDOMParser); }; if ("undefined" === typeof CSL_IS_IE) { var CSL_IS_IE; @@ -1362,9 +1369,13 @@ CSL.Output.Queue.prototype.renderBlobs = function (blobs, delim, has_more) { ret_last_char = []; use_delim = ""; len = blobs.length; + var start = true; for (pos = 0; pos < len; pos += 1) { if (blobs[pos].checkNext) { - blobs[pos].checkNext(blobs[(pos + 1)]); + blobs[pos].checkNext(blobs[(pos + 1)],start); + start = false; + } else { + start = true; } } var doit = true; @@ -1461,8 +1472,9 @@ CSL.Output.Queue.purgeNearsidePrefixChars = function(myblob, chr) { return; } if ("object" === typeof myblob) { - if ((CSL.TERMINAL_PUNCTUATION.indexOf(chr) > -1 && - CSL.TERMINAL_PUNCTUATION.slice(0, -1).indexOf(myblob.strings.prefix.slice(0, 1)) > -1)) { + if ((CSL.TERMINAL_PUNCTUATION.indexOf(chr) > -1 + && CSL.TERMINAL_PUNCTUATION.slice(0, -1).indexOf(myblob.strings.prefix.slice(0, 1)) > -1) + && !(myblob.strings.prefix.slice(0,1) === ";" && chr === ".")) { myblob.strings.prefix = myblob.strings.prefix.slice(1); } else if ("object" === typeof myblob.blobs) { CSL.Output.Queue.purgeNearsidePrefixChars(myblob.blobs[0], chr); @@ -1618,15 +1630,16 @@ CSL.Output.Queue.adjustPunctuation = function (state, myblobs, stk) { } } } - if (stk[slast].lastNode && state.getOpt("punctuation-in-quote")) { + if (state.getOpt('punctuation-in-quote')) { var decorations = doblob.decorations; for (j = 0, jlen = decorations.length; j < jlen; j += 1) { if (decorations[j][0] === '@quotes' && decorations[j][1] === 'true') { doblob.punctuation_in_quote = true; + stk[slast].lastNode = true; } } } - if (doblob.punctuation_in_quote) { + if (doblob.punctuation_in_quote && stk[slast].lastNode) { var swapchar = doblob.strings.suffix.slice(0, 1); var swapblob = false; if (SWAPS.indexOf(swapchar) > -1) { @@ -1860,8 +1873,8 @@ CSL.expandMacro = function (macro_key_token) { navi = new this.getNavi(this, macro_nodes); CSL.buildStyle.call(this, navi); end_of_macro = new CSL.Token("group", CSL.END); - if (macro_key_token.decorations) { - end_of_macro.decorations = macro_key_token.decorations.slice(); + if (macro_key_token.decorations) { + end_of_macro.decorations = macro_key_token.decorations.slice(); } if (hasDate) { func = function (state, Item) { @@ -2061,6 +2074,9 @@ CSL.DateParser = function () { }; this.parse = function (txt) { var slash, dash, lst, l, m, number, note, thedate, slashcount, range_delim, date_delim, ret, delim_pos, delims, isrange, suff, date, breakme, item, delim, element, mm, slst, mmpos, i, ilen, j, jlen, k, klen; + if (txt) { + txt = "" + txt; + txt = txt.replace(/\s*[0-9]{2}:[0-9]{2}(?::[0-9]+)/,""); m = txt.match(jmd); if (m) { txt = txt.replace(/\s+/, "", "g"); @@ -2100,6 +2116,7 @@ CSL.DateParser = function () { slash = txt.indexOf("/"); dash = txt.indexOf("-"); } + } txt = txt.replace(/([A-Za-z])\./g, "$1"); number = ""; note = ""; @@ -2295,7 +2312,7 @@ CSL.Engine = function (sys, style, lang, forceLang) { this.csl_version = "1.0"; this.sys = sys; this.sys.xml = new CSL.System.Xml.Parsing(); - if ("string" !== typeof style) { + if ("undefined" === typeof CSL_JSON && "string" !== typeof style) { style = ""; } if (CSL.getAbbreviation) { @@ -2466,7 +2483,9 @@ CSL.Engine.prototype.getNavi.prototype.getkids = function () { currnode = this.nodeList[this.depth][1][this.nodeList[this.depth][0]]; sneakpeek = this.sys.xml.children(currnode); if (this.sys.xml.numberofnodes(sneakpeek) === 0) { - CSL.XmlToToken.call(currnode, this.state, CSL.SINGLETON); + if (this.depth) { + CSL.XmlToToken.call(currnode, this.state, CSL.SINGLETON); + } return false; } else { for (pos in sneakpeek) { @@ -2737,20 +2756,20 @@ CSL.Engine.prototype.retrieveItem = function (id) { var legislation_id = []; for (i = 0, ilen = elements.length; i < ilen; i += 1) { varname = elements[i]; - if (Item[varname]) { - legislation_id.push(Item[varname]); - } - } + if (Item[varname]) { + legislation_id.push(Item[varname]); + } + } elements = ["original-date", "issued"]; - for (i = 0, elements.length; i < ilen; i += 1) { + for (i = 0, elements.length; i < ilen; i += 1) { varname = elements[i]; - if (Item[varname] && Item[varname].year) { - var value = Item[varname].year; - legislation_id.push(value); - break; - } - } - Item.legislation_id = legislation_id.join("::"); + if (Item[varname] && Item[varname].year) { + var value = Item[varname].year; + legislation_id.push(value); + break; + } + } + Item.legislation_id = legislation_id.join("::"); } } if (this.opt.development_extensions.main_title_from_short_title) { @@ -2826,7 +2845,7 @@ CSL.Engine.prototype.remapSectionVariable = function (inputList) { } var loci = ["section","","",""]; var split; - if (Item.section) { + if (this.opt.development_extensions.static_statute_locator && Item.section) { splt = Item.section.replace(/^\s+/,"").replace(/\s+$/, "").split(/\s+/); if (CSL.STATUTE_SUBDIV_STRINGS[splt[0]]) { loci[0] = " " + splt[0] + " "; @@ -3253,6 +3272,7 @@ CSL.Engine.Opt = function () { this.development_extensions.apply_citation_wrapper = false; this.development_extensions.main_title_from_short_title = false; this.development_extensions.normalize_lang_keys_to_lowercase = false; + this.development_extensions.strict_text_case_locales = false; this.nodenames = []; this.gender = {}; this['cite-lang-prefs'] = { @@ -3405,6 +3425,46 @@ CSL.Engine.prototype.setCitationId = function (citation, force) { this.registry.citationreg.citationById[citation.citationID] = citation; return ret; }; +CSL.Engine.prototype.rebuildProcessorState = function (citations, mode, uncitedItemIDs) { + if (!citations) { + citations = []; + } + if (!uncitedItemIDs) { + uncitedItemIDs = {}; + } + var itemIDs = []; + var myUncitedItemIDs = []; + for (var i=0,ilen=citations.length;i -1) { this.locale[langspec.best].terms["page-range-delimiter"] = "-"; @@ -4801,11 +4866,24 @@ CSL.Engine.prototype.localeConfigure = function (langspec) { if ("undefined" === typeof this.locale[langspec.best].terms["citation-range-delimiter"]) { this.locale[langspec.best].terms["citation-range-delimiter"] = "\u2013"; } + if (this.opt.development_extensions.normalize_lang_keys_to_lowercase) { + var localeLists = ["default-locale","locale-sort","locale-translit","locale-translat"]; + for (var i=0,ilen=localeLists.length;i -1) { sort_sep = ", "; } - if (["always", "display-and-sort"].indexOf(this.state.opt["demote-non-dropping-particle"]) > -1) { + if (["always", "display-and-sort"].indexOf(this.state.opt["demote-non-dropping-particle"]) > -1 && !has_hyphenated_non_dropping_particle) { second = this._join([given, dropping_particle], (name["comma-dropping-particle"] + " ")); second = this._join([second, non_dropping_particle], " "); if (second && this.given) { @@ -7209,10 +7294,16 @@ CSL.NameOutput.prototype._renderOnePersonalName = function (value, pos, i) { merged = this._join([family, second], sort_sep); blob = this._join([merged, suffix], sort_sep); } else { - if (!this.state.tmp.term_predecessor && non_dropping_particle) { - non_dropping_particle.blobs = CSL.Output.Formatters["capitalize-first"](this.state, non_dropping_particle.blobs) + if (this.state.tmp.area === "bibliography" && !this.state.tmp.term_predecessor && non_dropping_particle) { + if (!has_hyphenated_non_dropping_particle) { + non_dropping_particle.blobs = CSL.Output.Formatters["capitalize-first"](this.state, non_dropping_particle.blobs) + } + } + if (has_hyphenated_non_dropping_particle) { + first = this._join([non_dropping_particle, family], ""); + } else { + first = this._join([non_dropping_particle, family], " "); } - first = this._join([non_dropping_particle, family], " "); if (first && this.family) { first.strings.prefix = this.family.strings.prefix; first.strings.suffix = this.family.strings.suffix; @@ -7233,15 +7324,22 @@ CSL.NameOutput.prototype._renderOnePersonalName = function (value, pos, i) { } } if (!this.state.tmp.term_predecessor) { - if (!given) { + if (!given && this.state.tmp.area === "bibliography") { if (!dropping_particle && non_dropping_particle) { - non_dropping_particle.blobs = CSL.Output.Formatters["capitalize-first"](this.state, non_dropping_particle.blobs) + if (!has_hyphenated_non_dropping_particle) { + non_dropping_particle.blobs = CSL.Output.Formatters["capitalize-first"](this.state, non_dropping_particle.blobs) + } } else if (dropping_particle) { dropping_particle.blobs = CSL.Output.Formatters["capitalize-first"](this.state, dropping_particle.blobs) } } } - second = this._join([dropping_particle, non_dropping_particle, family], " "); + if (has_hyphenated_non_dropping_particle) { + second = this._join([non_dropping_particle, family], ""); + second = this._join([dropping_particle, second], " "); + } else { + second = this._join([dropping_particle, non_dropping_particle, family], " "); + } second = this._join([second, suffix], suffix_sep); if (second && this.family) { second.strings.prefix = this.family.strings.prefix; @@ -7258,6 +7356,7 @@ CSL.NameOutput.prototype._renderOnePersonalName = function (value, pos, i) { } this.state.tmp.group_context.value()[2] = true; this.state.tmp.can_substitute.replace(false, CSL.LITERAL); + this.state.tmp.term_predecessor = true; this.state.tmp.name_node.children.push(blob); return blob; }; @@ -7408,7 +7507,7 @@ CSL.NameOutput.prototype._parseName = function (name) { noparse = false; } if (!name["non-dropping-particle"] && name.family && !noparse) { - m = name.family.match(/^((?:[a-z][ \'\u2019a-z]*[\s+|\'\u2019]|[DVL][^ ]\s+[a-z]*\s*|[DVL][^ ][^ ]\s+[a-z]*\s*))/); + m = name.family.match(/^((?:[a-z][ \'\u2019a-z]*[-|\s+|\'\u2019]|[ABDVL][^ ][-|\s+][a-z]*\s*|[ABDVL][^ ][^ ][-|\s+][a-z]*\s*))/); if (m) { name.family = name.family.slice(m[1].length); name["non-dropping-particle"] = m[1].replace(/\s+$/, ""); @@ -7522,6 +7621,17 @@ CSL.NameOutput.prototype.getName = function (name, slotLocaleset, fallback, stop } return {name:name,usedOrig:usedOrig}; } +CSL.NameOutput.prototype.setRenderedName = function (name) { + if (this.state.tmp.area === "bibliography") { + var strname = ""; + for (var j=0,jlen=CSL.NAME_PARTS.length;j -1) { @@ -8776,12 +8886,12 @@ CSL.Attributes["@part-separator"] = function (state, arg) { }; CSL.Attributes["@context"] = function (state, arg) { var func = function (state, Item) { - var area = state.tmp.area.slice(0, arg.length); - var result = false; - if (area === arg) { - result = true; - } - return result; + var area = state.tmp.area.slice(0, arg.length); + var result = false; + if (area === arg) { + result = true; + } + return result; }; this.tests.push(func); }; @@ -8948,6 +9058,11 @@ CSL.Attributes["@variable"] = function (state, arg) { } flag[2] = true; state.tmp.group_context.replace(flag); + if (state.tmp.can_substitute.value() + && state.tmp.area === "bibliography" + && "string" === typeof Item[variable]) { + state.tmp.rendered_name.push(Item[variable]); + } state.tmp.can_substitute.replace(false, CSL.LITERAL); } else { flag[1] = true; @@ -9004,7 +9119,7 @@ CSL.Attributes["@locale"] = function (state, arg) { lst = arg.split(/\s+/); this.locale_bares = []; for (i = 0, ilen = lst.length; i < ilen; i += 1) { - lang = CSL.localeParse(lst[i]); + lang = lst[i]; langspec = CSL.localeResolve(lang); if (lst[i].length === 2) { this.locale_bares.push(langspec.bare); @@ -9021,7 +9136,7 @@ CSL.Attributes["@locale"] = function (state, arg) { res = false; var langspec = false; if (Item.language) { - lang = CSL.localeParse(Item.language); + lang = Item.language; langspec = CSL.localeResolve(lang); if (langspec.best === state.opt["default-locale"][0]) { langspec = false; @@ -9146,7 +9261,7 @@ CSL.Attributes["@is-numeric"] = function (state, arg) { if (!state.tmp.shadow_numbers[variables[i]]) { state.processNumber(false, myitem, variables[i], Item.type); } - if (state.tmp.shadow_numbers[variables[i]].numeric) { + if (myitem[variables[i]] && state.tmp.shadow_numbers[variables[i]].numeric) { ret.push(true); } else { ret.push(false); @@ -9158,6 +9273,8 @@ CSL.Attributes["@is-numeric"] = function (state, arg) { } else { ret.push(false); } + } else { + ret.push(false); } } } @@ -9517,11 +9634,6 @@ CSL.Attributes["@year-range-format"] = function (state, arg) { }; CSL.Attributes["@default-locale"] = function (state, arg) { var lst, len, pos, m, ret; - if (state.opt.development_extensions.normalize_lang_keys_to_lowercase) { - if (arg) { - arg = arg.toLowerCase(); - } - } m = arg.match(/-x-(sort|translit|translat)-/g); if (m) { for (pos = 0, len = m.length; pos < len; pos += 1) { @@ -9589,6 +9701,8 @@ if ("undefined" !== typeof CSL_IS_NODEJS) { XML_PARSING = CSL_NODEJS; } else if ("undefined" !== typeof CSL_E4X) { XML_PARSING = CSL_E4X; +} else if ("undefined" !== typeof CSL_JSON) { + XML_PARSING = CSL_JSON; } else { XML_PARSING = CSL_CHROME; } @@ -9767,8 +9881,14 @@ CSL.Transform = function (state) { } function getFieldLocale(Item,field) { var ret = state.opt["default-locale"][0].slice(0, 2) + var localeRex; + if (state.opt.development_extensions.strict_text_case_locales) { + localeRex = new RegExp("^([a-zA-Z]{2})(?:$|-.*| .*)"); + } else { + localeRex = new RegExp("^([a-zA-Z]{2})(?:$|-.*|.*)"); + } if (Item.language) { - m = ("" + Item.language).match(/^([a-zA-Z]{2})(?:$|-.*| .*)/); + m = ("" + Item.language).match(localeRex); if (m) { ret = m[1]; } else { @@ -9778,7 +9898,8 @@ CSL.Transform = function (state) { if (Item.multi && Item.multi && Item.multi.main && Item.multi.main[field]) { ret = Item.multi.main[field]; } - if (state.opt.development_extensions.normalize_lang_keys_to_lowercase) { + if (!state.opt.development_extensions.strict_text_case_locales + || state.opt.development_extensions.normalize_lang_keys_to_lowercase) { ret = ret.toLowerCase(); } return ret; @@ -10171,7 +10292,7 @@ CSL.Parallel.prototype.StartCite = function (Item, item, prevItemID) { } } }; -CSL.Parallel.prototype.StartVariable = function (variable) { +CSL.Parallel.prototype.StartVariable = function (variable, real_variable) { if (this.use_parallels && (this.try_cite || this.force_collapse)) { if (variable === "names") { this.variable = variable + ":" + this.target; @@ -10188,7 +10309,10 @@ CSL.Parallel.prototype.StartVariable = function (variable) { this.data.value = ""; this.data.blobs = []; var is_mid = this.isMid(variable); - if (this.target === "front" && is_mid) { + if (real_variable === "authority" && this.variable === "names:front") { + this.try_cite = true; + this.in_series = false; + } else if (this.target === "front" && is_mid) { this.target = "mid"; } else if (this.target === "mid" && !is_mid && this.cite.Item.title && variable !== "names") { this.target = "back"; @@ -10628,9 +10752,16 @@ CSL.Output.DefaultFormatter = function () {}; CSL.Output.DefaultFormatter.prototype.format = function (num) { return num.toString(); }; -CSL.NumericBlob.prototype.checkNext = function (next) { - if (next && this.id == next.id) { +CSL.NumericBlob.prototype.checkNext = function (next,start) { + if (start) { this.status = CSL.START; + if ("object" === typeof next) { + if (next.num === (this.num + 1)) { + next.status = CSL.SUCCESSOR; + } else { + next.status = CSL.SEEN; + } + } } else if (! next || !next.num || this.type !== next.type || next.num !== (this.num + 1)) { if (this.status === CSL.SUCCESSOR_OF_SUCCESSOR) { this.status = CSL.END; @@ -11168,12 +11299,12 @@ CSL.Util.substituteEnd = function (state, target) { var i, ilen; var printing = !state.tmp.suppress_decorations; if (printing && state.tmp.area === "bibliography") { - if (!state.tmp.rendered_name) { + if (state.tmp.rendered_name) { if ("partial-each" === subrule || "partial-first" === subrule) { - state.tmp.rendered_name = []; var dosub = true; + var rendered_name = []; for (i = 0, ilen = state.tmp.name_node.children.length; i < ilen; i += 1) { - var name = state.output.string(state, state.tmp.name_node.children[i].blobs, false); + var name = state.tmp.rendered_name[i]; if (dosub && state.tmp.last_rendered_name && state.tmp.last_rendered_name.length > i - 1 && state.tmp.last_rendered_name[i] === name) { @@ -11185,28 +11316,32 @@ CSL.Util.substituteEnd = function (state, target) { } else { dosub = false; } - state.tmp.rendered_name.push(name); + rendered_name.push(name); } - state.tmp.last_rendered_name = state.tmp.rendered_name; + state.tmp.last_rendered_name = rendered_name; } else if ("complete-each" === subrule) { - state.tmp.rendered_name = state.output.string(state, state.tmp.name_node.top.blobs, false); - if (state.tmp.rendered_name) { - if (state.tmp.rendered_name === state.tmp.last_rendered_name) { + var rendered_name = state.tmp.rendered_name.join(","); + if (rendered_name) { + if (rendered_name === state.tmp.last_rendered_name) { for (i = 0, ilen = state.tmp.name_node.children.length; i < ilen; i += 1) { str = new CSL.Blob(state[state.tmp.area].opt["subsequent-author-substitute"]); state.tmp.name_node.children[i].blobs = [str]; } } - state.tmp.last_rendered_name = state.tmp.rendered_name; + state.tmp.last_rendered_name = rendered_name; } } else { - state.tmp.rendered_name = state.output.string(state, state.tmp.name_node.top.blobs, false); - if (state.tmp.rendered_name) { - if (state.tmp.rendered_name === state.tmp.last_rendered_name) { + var rendered_name = state.tmp.rendered_name.join(","); + if (rendered_name) { + if (rendered_name === state.tmp.last_rendered_name) { str = new CSL.Blob(state[state.tmp.area].opt["subsequent-author-substitute"]); - state.tmp.name_node.top.blobs = [str]; + if (state.tmp.label_blob) { + state.tmp.name_node.top.blobs = [str,state.tmp.label_blob]; + } else { + state.tmp.name_node.top.blobs = [str]; + } } - state.tmp.last_rendered_name = state.tmp.rendered_name; + state.tmp.last_rendered_name = rendered_name; } } } @@ -11618,13 +11753,13 @@ CSL.Util.PageRangeMangler.getFunction = function (state, rangeType) { }; var sniff = function (str, func, minchars, isyear) { var ret; - str = "" + str; + str = "" + str; var lst; - if (!str.match(/[^\-\u20130-9 ,&]/)) { - lst = expand(str, "-"); + if (!str.match(/[^\-\u20130-9 ,&]/)) { + lst = expand(str, "-"); ret = func(lst, minchars, isyear); } else { - lst = expand(str, "\\s+\\-\\s+"); + lst = expand(str, "\\s+\\-\\s+"); ret = func(lst, minchars, isyear); } return ret; @@ -11762,6 +11897,7 @@ CSL.Util.FlipFlopper.prototype.init = function (str, blob) { }; CSL.Util.FlipFlopper.prototype._normalizeString = function (str) { var i, ilen; + str = str.replace(/\s+'\s+/," ’ ","g"); if (str.indexOf(this.quotechars[0]) > -1) { for (i = 0, ilen = 2; i < ilen; i += 1) { if (this.quotechars[i + 2]) { @@ -12050,11 +12186,11 @@ CSL.Output.Formatters["capitalize-all"] = function (state, string) { var strings = str.string.split(" "); for (var i = 0, ilen = strings.length; i < ilen; i += 1) { if (strings[i].length > 1) { - if (state.opt.development_extensions.allow_force_lowercase) { - strings[i] = strings[i].slice(0, 1).toUpperCase() + strings[i].substr(1).toLowerCase(); - } else { - strings[i] = strings[i].slice(0, 1).toUpperCase() + strings[i].substr(1); - } + if (state.opt.development_extensions.allow_force_lowercase) { + strings[i] = strings[i].slice(0, 1).toUpperCase() + strings[i].substr(1).toLowerCase(); + } else { + strings[i] = strings[i].slice(0, 1).toUpperCase() + strings[i].substr(1); + } } else if (strings[i].length === 1) { strings[i] = strings[i].toUpperCase(); } @@ -12112,15 +12248,15 @@ CSL.Output.Formatters.title = function (state, string) { } if (!totallyskip) { if (skip && notfirst && notlast && !aftercolon) { - if (state.opt.development_extensions.allow_force_lowercase) { - words[pos] = lowerCaseVariant; - } + if (state.opt.development_extensions.allow_force_lowercase) { + words[pos] = lowerCaseVariant; + } } else { - if (state.opt.development_extensions.allow_force_lowercase) { - words[pos] = upperCaseVariant.slice(0, 1) + lowerCaseVariant.substr(1); - } else { - words[pos] = upperCaseVariant.slice(0, 1) + words[pos].substr(1); - } + if (state.opt.development_extensions.allow_force_lowercase) { + words[pos] = upperCaseVariant.slice(0, 1) + lowerCaseVariant.substr(1); + } else { + words[pos] = upperCaseVariant.slice(0, 1) + words[pos].substr(1); + } } } } @@ -12229,7 +12365,7 @@ CSL.Output.Formats.prototype.html = { "@quotes/false": false, "@cite/entry": function (state, str) { return state.sys.wrapCitationEntry(str, this.item_id, this.locator_txt, this.suffix_txt); - }, + }, "@bibliography/entry": function (state, str) { var insert = ""; if (state.sys.embedBibliographyEntry) { @@ -12298,8 +12434,8 @@ CSL.Output.Formats.prototype.text = { }, "@quotes/false": false, "@cite/entry": function (state, str) { - return state.sys.wrapCitationEntry(str, this.item_id, this.locator_txt, this.suffix_txt); - }, + return state.sys.wrapCitationEntry(str, this.item_id, this.locator_txt, this.suffix_txt); + }, "@bibliography/entry": function (state, str) { return str+"\n"; }, @@ -12371,10 +12507,10 @@ CSL.Output.Formats.prototype.rtf = { "@display/block": "\\line{}%%STRING%%\\line\r\n", "@cite/entry": function (state, str) { return str; - }, + }, "@cite/entry": function (state, str) { - return state.sys.wrapCitationEntry(str, this.item_id, this.locator_txt, this.suffix_txt); - }, + return state.sys.wrapCitationEntry(str, this.item_id, this.locator_txt, this.suffix_txt); + }, "@bibliography/entry": function(state,str){ return str; }, @@ -12433,16 +12569,16 @@ CSL.Registry = function (state) { CSL.Registry.prototype.init = function (myitems, uncited_flag) { var i, ilen; this.oldseq = {}; - var tmphash = {}; - myitems.reverse(); - for (i = myitems.length - 1; i > -1; i += -1) { - if (tmphash[myitems[i]]) { - myitems = myitems.slice(0, i).concat(myitems.slice(i + 1)); - } else { - tmphash[myitems[i]] = true; - } - } - myitems.reverse(); + var tmphash = {}; + myitems.reverse(); + for (i = myitems.length - 1; i > -1; i += -1) { + if (tmphash[myitems[i]]) { + myitems = myitems.slice(0, i).concat(myitems.slice(i + 1)); + } else { + tmphash[myitems[i]] = true; + } + } + myitems.reverse(); if (uncited_flag && this.mylist && this.mylist.length) { this.uncited = myitems; for (i = 0, ilen = myitems.length; i < ilen; i += 1) { @@ -12595,7 +12731,7 @@ CSL.Registry.prototype.dorefreshes = function () { if ("undefined" === typeof akey) { akey = CSL.getAmbiguousCite.call(this.state, Item); } - this.state.tmp.taintedItemIDs[key] = true; + this.state.tmp.taintedItemIDs[key] = true; abase = CSL.getAmbigConfig.call(this.state); this.registerAmbigToken(akey, key, abase); this.ambigsTouched[akey] = true; @@ -12611,7 +12747,7 @@ CSL.Registry.prototype.setdisambigs = function () { for (akey in this.ambigsTouched) { this.state.disambiguate.run(akey); } - this.ambigsTouched = {}; + this.ambigsTouched = {}; this.akeys = {}; }; CSL.Registry.prototype.renumber = function () { @@ -12637,12 +12773,12 @@ CSL.Registry.prototype.renumber = function () { }; CSL.Registry.prototype.setsortkeys = function () { var key; - for (var i = 0, ilen = this.mylist.length; i < ilen; i += 1) { - var key = this.mylist[i]; - if (this.touched[key] || this.state.tmp.taintedItemIDs[key]) { - this.registry[key].sortkeys = CSL.getSortKeys.call(this.state, this.state.retrieveItem(key), "bibliography_sort"); - } - } + for (var i = 0, ilen = this.mylist.length; i < ilen; i += 1) { + var key = this.mylist[i]; + if (this.touched[key] || this.state.tmp.taintedItemIDs[key]) { + this.registry[key].sortkeys = CSL.getSortKeys.call(this.state, this.state.retrieveItem(key), "bibliography_sort"); + } + } }; CSL.Registry.prototype.sorttokens = function () { this.reflist.sort(this.sorter.compareKeys); @@ -12652,7 +12788,7 @@ CSL.Registry.Comparifier = function (state, keyset) { var sortCompare = CSL.getSortCompare(); sort_directions = state[keyset].opt.sort_directions; this.compareKeys = function (a, b) { - len = a.sortkeys.length; + len = a.sortkeys ? a.sortkeys.length : 0; for (pos = 0; pos < len; pos += 1) { var cmp = 0; if (a.sortkeys[pos] === b.sortkeys[pos]) { @@ -13089,16 +13225,16 @@ CSL.Disambiguation.prototype.disYears = function () { tokens = []; var base = this.lists[this.listpos][0]; if (this.clashes[1]) { - for (var i = 0, ilen = this.state.registry.mylist.length; i < ilen; i += 1) { - var origid = this.state.registry.mylist[i]; - for (var j = 0, jlen = this.lists[this.listpos][1].length; j < jlen; j += 1) { - var token = this.lists[this.listpos][1][j]; - if (token.id == origid) { - tokens.push(this.registry[token.id]); - break; - } - } - } + for (var i = 0, ilen = this.state.registry.mylist.length; i < ilen; i += 1) { + var origid = this.state.registry.mylist[i]; + for (var j = 0, jlen = this.lists[this.listpos][1].length; j < jlen; j += 1) { + var token = this.lists[this.listpos][1][j]; + if (token.id == origid) { + tokens.push(this.registry[token.id]); + break; + } + } + } } tokens.sort(this.state.registry.sorter.compareKeys); for (pos = 0, len = tokens.length; pos < len; pos += 1) { From 414d55346c0d6bc2bd9561a6b975544b28456f2d Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 28 Mar 2013 00:44:23 -0400 Subject: [PATCH 11/23] Default on-demand download to off for now --- defaults/preferences/zotero.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js index af82adf9e3..3576896391 100644 --- a/defaults/preferences/zotero.js +++ b/defaults/preferences/zotero.js @@ -138,8 +138,8 @@ pref("extensions.zotero.sync.storage.maxDownloads", 4); pref("extensions.zotero.sync.storage.maxUploads", 2); pref("extensions.zotero.sync.storage.deleteDelayDays", 30); pref("extensions.zotero.sync.storage.groups.enabled", true); -pref("extensions.zotero.sync.storage.downloadMode.personal", "on-demand"); -pref("extensions.zotero.sync.storage.downloadMode.groups", "on-demand"); +pref("extensions.zotero.sync.storage.downloadMode.personal", "on-sync"); +pref("extensions.zotero.sync.storage.downloadMode.groups", "on-sync"); // Proxy pref("extensions.zotero.proxies.autoRecognize", true); From 6a0351c9405354c3722cb4f317653ab3bf07b045 Mon Sep 17 00:00:00 2001 From: aurimasv Date: Thu, 28 Mar 2013 00:55:05 -0500 Subject: [PATCH 12/23] Don't break when stringifying item fields. Broken by 2f8f18c9571010b5f9d9035f62b590e63ffc1e4f --- chrome/content/zotero/xpcom/translation/translate.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js index dba25677dc..dc07a9269b 100644 --- a/chrome/content/zotero/xpcom/translation/translate.js +++ b/chrome/content/zotero/xpcom/translation/translate.js @@ -98,8 +98,9 @@ Zotero.Translate.Sandbox = { delete item[i]; continue; } - - var isObject = typeof val === "object" || typeof val === "xml" || typeof val === "function", + + var type = typeof val; + var isObject = type === "object" || type === "xml" || type === "function", shouldBeObject = allowedObjects.indexOf(i) !== -1; if(isObject && !shouldBeObject) { // Convert things that shouldn't be objects to objects @@ -108,7 +109,7 @@ Zotero.Translate.Sandbox = { } else if(shouldBeObject && !isObject) { translate._debug("Translate: WARNING: typeof "+i+" is "+type+"; converting to array"); item[i] = [val]; - } else if(typeof val === "string") { + } else if(type === "string") { // trim strings item[i] = val.trim(); } From 7ce93e66d9421b6231f5e8a7a03014ea34cde280 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Thu, 28 Mar 2013 16:55:14 -0400 Subject: [PATCH 13/23] Fix installing styles from the preferences --- chrome/content/zotero/xpcom/style.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/chrome/content/zotero/xpcom/style.js b/chrome/content/zotero/xpcom/style.js index ffee783c0e..b924e7966f 100644 --- a/chrome/content/zotero/xpcom/style.js +++ b/chrome/content/zotero/xpcom/style.js @@ -184,11 +184,11 @@ Zotero.Styles = new function() { * displayed in dialogs referencing the style */ this.install = function(style, origin) { - var styleFile = null, styleInstalled; + var styleInstalled; if(style instanceof Components.interfaces.nsIFile) { // handle nsIFiles origin = style.leafName; - styleInstalled = Zotero.File.getContentsAsync(styleFile).when(function(style) { + styleInstalled = Zotero.File.getContentsAsync(style).when(function(style) { return _install(style, origin); }); } else { @@ -197,8 +197,8 @@ Zotero.Styles = new function() { styleInstalled.fail(function(error) { // Unless user cancelled, show an alert with the error - if(error instanceof Zotero.Exception.UserCancelled) return; - if(error instanceof Zotero.Exception.Alert) { + if(typeof error === "object" && error instanceof Zotero.Exception.UserCancelled) return; + if(typeof error === "object" && error instanceof Zotero.Exception.Alert) { error.present(); error.log(); } else { @@ -220,14 +220,14 @@ Zotero.Styles = new function() { function _install(style, origin, hidden) { if(!_initialized || !_cacheTranslatorData) Zotero.Styles.init(); - var existingFile, destFile, source; + var existingFile, destFile, source, styleID return Q.fcall(function() { // First, parse style and make sure it's valid XML var parser = Components.classes["@mozilla.org/xmlextras/domparser;1"] .createInstance(Components.interfaces.nsIDOMParser), doc = parser.parseFromString(style, "application/xml"); - var styleID = Zotero.Utilities.xpathText(doc, '/csl:style/csl:info[1]/csl:id[1]', + styleID = Zotero.Utilities.xpathText(doc, '/csl:style/csl:info[1]/csl:id[1]', Zotero.Styles.ns), // Get file name from URL m = /[^\/]+$/.exec(styleID), @@ -346,7 +346,7 @@ Zotero.Styles = new function() { return Zotero.HTTP.promise("GET", source).then(function(xmlhttp) { return _install(xmlhttp.responseText, origin, true); }).fail(function(error) { - if(error instanceof Zotero.Exception) { + if(typeof error === "object" && error instanceof Zotero.Exception) { throw new Zotero.Exception.Alert("styles.installSourceError", [origin, source], "styles.install.title", error); } else { @@ -376,7 +376,7 @@ Zotero.Styles = new function() { var enumerator = wm.getEnumerator("zotero:pref"); while(enumerator.hasMoreElements()) { var win = enumerator.getNext(); - win.refreshStylesList(styleID); + win.Zotero_Preferences.Cite.refreshStylesList(styleID); } }); } From 6ea5afe8e3ec78e75dcbc2f522f0ba2128248a8b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 29 Mar 2013 03:33:05 -0400 Subject: [PATCH 14/23] Update locales from Transifex --- chrome/locale/fr-FR/zotero/zotero.dtd | 4 ++-- chrome/locale/fr-FR/zotero/zotero.properties | 2 +- chrome/locale/ja-JP/zotero/zotero.dtd | 4 ++-- chrome/locale/sk-SK/zotero/zotero.dtd | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chrome/locale/fr-FR/zotero/zotero.dtd b/chrome/locale/fr-FR/zotero/zotero.dtd index 0f727620ee..75ab303d67 100644 --- a/chrome/locale/fr-FR/zotero/zotero.dtd +++ b/chrome/locale/fr-FR/zotero/zotero.dtd @@ -212,8 +212,8 @@ - - + + diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties index f2f3915be2..500fee273d 100644 --- a/chrome/locale/fr-FR/zotero/zotero.properties +++ b/chrome/locale/fr-FR/zotero/zotero.properties @@ -727,7 +727,7 @@ styles.installStyle=Installer le style "%1$S" à partir de %2$S ? styles.updateStyle=Actualiser le style "%1$S" existant avec "%2$S" à partir de %3$S ? styles.installed=Le style "%S" a été installé avec succès. styles.installError=%S n'est pas un fichier de style valide. -styles.validationWarning="%S" n'est pas un style CSL 1.0 valide, et peut ne pas fonctionner correctement avec Zotero.⏎ ⏎ Voulez-vous vraiment continuer ? +styles.validationWarning="%S" n'est pas un style CSL 1.0.1 valide, et peut ne pas fonctionner correctement avec Zotero.⏎ ⏎ Voulez-vous vraiment continuer ? styles.installSourceError=%1$S fait référence à un fichier CSL non valide ou inexistant ayant %2$S comme source. styles.deleteStyle=Voulez-vous vraiment supprimer le style "%1$S" ? styles.deleteStyles=Voulez-vous vraiment supprimer les styles sélectionnés ? diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd index 8f9a017c83..16ea7d1477 100644 --- a/chrome/locale/ja-JP/zotero/zotero.dtd +++ b/chrome/locale/ja-JP/zotero/zotero.dtd @@ -212,8 +212,8 @@ - - + + diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd index f679046b9b..11aa301d19 100644 --- a/chrome/locale/sk-SK/zotero/zotero.dtd +++ b/chrome/locale/sk-SK/zotero/zotero.dtd @@ -212,8 +212,8 @@ - - + + From ded84f766683c4f7ae1a9c30f6709172aea7285f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 29 Mar 2013 03:34:41 -0400 Subject: [PATCH 15/23] Fix bizarre newline symbols in fr-FR and ja-JP --- chrome/locale/fr-FR/zotero/zotero.properties | 32 ++++++++++---------- chrome/locale/ja-JP/zotero/zotero.properties | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties index 500fee273d..e703534a46 100644 --- a/chrome/locale/fr-FR/zotero/zotero.properties +++ b/chrome/locale/fr-FR/zotero/zotero.properties @@ -107,7 +107,7 @@ dataDir.selectedDirEmpty.text=Le répertoire que vous avez sélectionné est vid dataDir.selectedDirEmpty.useNewDir=Utiliser le nouveau répertoire ? dataDir.moveFilesToNewLocation=Assurez-vous d'avoir déplacé les fichiers de votre répertoire de données Zotero existant vers le nouvel emplacement avant de rouvrir %1$S. dataDir.incompatibleDbVersion.title=Version de la base de données incompatible -dataDir.incompatibleDbVersion.text=Le répertoire de données actuellement sélectionné n'est pas compatible avec Zotero Standalone, qui ne peut partager une base de données qu'avec Zotero pour Firefox 2.1b3 et suivants.⏎ ⏎ Mettez à jour votre version de Zotero pour Firefox d'abord ou choisissez un répertoire de données différent à utiliser avec Zotero Standalone. +dataDir.incompatibleDbVersion.text=Le répertoire de données actuellement sélectionné n'est pas compatible avec Zotero Standalone, qui ne peut partager une base de données qu'avec Zotero pour Firefox 2.1b3 et suivants.\n\nMettez à jour votre version de Zotero pour Firefox d'abord ou choisissez un répertoire de données différent à utiliser avec Zotero Standalone. dataDir.standaloneMigration.title=Bibliothèque Zotero existante détectée dataDir.standaloneMigration.description=Il semble que cela soit votre première utilisation de %1$S. Souhaitez-vous que %1$S importe les paramètres de %2$S et utilise votre répertoire de données déjà existant ? dataDir.standaloneMigration.multipleProfiles=%1$S partagera son répertoire de données avec le dernier profil utilisé. @@ -512,16 +512,16 @@ zotero.preferences.openurl.resolversFound.singular=%S résolveur de liens trouv zotero.preferences.openurl.resolversFound.plural=%S résolveurs de liens trouvé zotero.preferences.sync.purgeStorage.title=Purger les fichiers attachés sur le serveur Zotero ? -zotero.preferences.sync.purgeStorage.desc=Si vous prévoyez d'utiliser WebDAV pour la synchronisation des fichiers et que vous avez précédemment synchronisé les pièces jointes de Ma bibliothèque vers les serveurs Zotero, vous pouvez purger ces fichiers des serveurs Zotero afin de vous donner plus d'espace de stockage pour les groupes.⏎ ⏎ Vous pouvez purger les fichiers à n'importe quel moment depuis les paramètres de votre compte -account settings- sur zotero.org +zotero.preferences.sync.purgeStorage.desc=Si vous prévoyez d'utiliser WebDAV pour la synchronisation des fichiers et que vous avez précédemment synchronisé les pièces jointes de Ma bibliothèque vers les serveurs Zotero, vous pouvez purger ces fichiers des serveurs Zotero afin de vous donner plus d'espace de stockage pour les groupes.\n\nVous pouvez purger les fichiers à n'importe quel moment depuis les paramètres de votre compte -account settings- sur zotero.org zotero.preferences.sync.purgeStorage.confirmButton=Purger les fichiers maintenant zotero.preferences.sync.purgeStorage.cancelButton=Ne pas purger zotero.preferences.sync.reset.userInfoMissing=Vous devez saisir un nom d'utilisateur et un mot de passe dans l'onglet %S avant d'utiliser les options de réinitialisation. zotero.preferences.sync.reset.restoreFromServer=Toutes les données de cette copie de Zotero seront écrasées et remplacées par les données appartenant à l'utilisateur '%S' présentes sur le serveur Zotero. zotero.preferences.sync.reset.replaceLocalData=Remplacer les données locales zotero.preferences.sync.reset.restartToComplete=Firefox doit être redémarré pour terminer le processus de restauration -zotero.preferences.sync.reset.restoreToServer=Toutes les données appartenant à l'utilisateur '%S' figurant sur le serveur Zotero seront écrasées et remplacées par les données de cette copie de Zotero.⏎ ⏎ En fonction de la taille de votre bibliothèque, il peut y avoir un délai avant que vos données ne soient disponibles sur le serveur. +zotero.preferences.sync.reset.restoreToServer=Toutes les données appartenant à l'utilisateur '%S' figurant sur le serveur Zotero seront écrasées et remplacées par les données de cette copie de Zotero.\n\nEn fonction de la taille de votre bibliothèque, il peut y avoir un délai avant que vos données ne soient disponibles sur le serveur. zotero.preferences.sync.reset.replaceServerData=Remplacer les données du serveur -zotero.preferences.sync.reset.fileSyncHistory=Tout l'historique de synchronisation des fichiers sera effacé.⏎ ⏎ Les fichiers joints locaux qui n'existe pas sur le serveur de stockage seront envoyés au serveur lors de la prochaine synchronisation. +zotero.preferences.sync.reset.fileSyncHistory=Tout l'historique de synchronisation des fichiers sera effacé.\n\nLes fichiers joints locaux qui n'existe pas sur le serveur de stockage seront envoyés au serveur lors de la prochaine synchronisation. zotero.preferences.search.rebuildIndex=Reconstruire l'index zotero.preferences.search.rebuildWarning=Voulez-vous reconstruire l'index entier ? Cela peut prendre un moment.\n\nPour n'indexer que les documents non indexés, utilisez %S. @@ -560,7 +560,7 @@ zotero.preferences.advanced.resetStyles=Réinitialiser les styles zotero.preferences.advanced.resetStyles.changesLost=Tous les styles nouveaux ou modifiés seront perdus. zotero.preferences.advanced.debug.title=Sortie de débogage soumise -zotero.preferences.advanced.debug.sent=La sortie de débogage a été envoyée au serveur Zotero.⏎ ⏎ Le Debug ID à poster sur le forum est D%S. +zotero.preferences.advanced.debug.sent=La sortie de débogage a été envoyée au serveur Zotero.\n\nLe Debug ID à poster sur le forum est D%S. zotero.preferences.advanced.debug.error=Une erreur s'est produite lors de l'envoi de la sortie de débogage. dragAndDrop.existingFiles=Les fichiers suivants existent déjà dans le répertoire de destination et n'ont pas été copiés : @@ -727,7 +727,7 @@ styles.installStyle=Installer le style "%1$S" à partir de %2$S ? styles.updateStyle=Actualiser le style "%1$S" existant avec "%2$S" à partir de %3$S ? styles.installed=Le style "%S" a été installé avec succès. styles.installError=%S n'est pas un fichier de style valide. -styles.validationWarning="%S" n'est pas un style CSL 1.0.1 valide, et peut ne pas fonctionner correctement avec Zotero.⏎ ⏎ Voulez-vous vraiment continuer ? +styles.validationWarning="%S" n'est pas un style CSL 1.0.1 valide, et peut ne pas fonctionner correctement avec Zotero.\n\nVoulez-vous vraiment continuer ? styles.installSourceError=%1$S fait référence à un fichier CSL non valide ou inexistant ayant %2$S comme source. styles.deleteStyle=Voulez-vous vraiment supprimer le style "%1$S" ? styles.deleteStyles=Voulez-vous vraiment supprimer les styles sélectionnés ? @@ -749,7 +749,7 @@ sync.error.usernameNotSet=Identifiant non défini sync.error.usernameNotSet.text=Vous devez saisir vos nom d'utilisateur et mot de passe, propres à zotero.org, dans les Préférences de Zotero pour synchroniser avec le serveur Zotero. sync.error.passwordNotSet=Mot de passe non défini sync.error.invalidLogin=Identifiant ou mot de passe invalide -sync.error.invalidLogin.text=Le serveur de synchronisation Zotero n'a pas accepté vos nom d'utilisateur et mot de passe.⏎ ⏎ Veuillez vérifier que vous avez saisi vos identifiants zotero.org correctement dans le panneau Synchronisation des Préférences de Zotero. +sync.error.invalidLogin.text=Le serveur de synchronisation Zotero n'a pas accepté vos nom d'utilisateur et mot de passe.\n\nVeuillez vérifier que vous avez saisi vos identifiants zotero.org correctement dans le panneau Synchronisation des Préférences de Zotero. sync.error.enterPassword=Veuillez saisir votre mot de passe. sync.error.loginManagerCorrupted1=Zotero ne peut pas accéder à vos informations de connexion, probablement en raison de la corruption de la base de données du gestionnaire de connexions de %S. sync.error.loginManagerCorrupted2=Fermez %1$S, sauvegardez signons.* puis supprimez-le de votre profil %2$S, et finalement saisissez à nouveau vos informations de connexion dans le panneau Synchronisation des Préférences de Zotero. @@ -764,13 +764,13 @@ sync.error.invalidClock=L'horloge système est réglée à une heure non valide. sync.error.sslConnectionError=Erreur de connexion SSL sync.error.checkConnection=Erreur lors de la connexion au serveur. Vérifiez votre connexion Internet. sync.error.emptyResponseServer=Réponse vide du serveur. -sync.error.invalidCharsFilename=Le nom de fichier '%S' contient des caractères invalides.⏎ ⏎ Renommez le fichier et essayez à nouveau. Si vous renommez le fichier hors de Zotero, via votre système d'exploitation, il faudra le joindre à nouveau dans Zotero. +sync.error.invalidCharsFilename=Le nom de fichier '%S' contient des caractères invalides.\n\nRenommez le fichier et essayez à nouveau. Si vous renommez le fichier hors de Zotero, via votre système d'exploitation, il faudra le joindre à nouveau dans Zotero. sync.lastSyncWithDifferentAccount=Cette base de données Zotero a été synchronisée la dernière fois avec un compte zotero.org différent ('%1$S') de celui utilisé actuellement ('%2$S'). sync.localDataWillBeCombined=Si vous continuez, les données Zotero locales seront combinées avec les données du compte '%S' stockées sur le serveur. sync.localGroupsWillBeRemoved1=Les groupes locaux, y compris ceux comprenant des documents modifiés, seront aussi retirés. sync.avoidCombiningData=Pour éviter de combiner ou de perdre des données, rétablissez le compte '%S' ou utilisez les options de Réinitialisation dans le panneau Synchronisation des Préférences de Zotero. -sync.localGroupsWillBeRemoved2=Si vous continuez, les groupes locaux, y compris ceux comprenant des documents modifiés, seront retirés et remplacés par les groupes liés au compte '%1$S'.⏎ ⏎ Pour éviter de perdre les modifications locales des groupes, assurez-vous d'avoir synchronisé avec le compte '%2$S' avant de synchroniser avec le compte '%1$S'. +sync.localGroupsWillBeRemoved2=Si vous continuez, les groupes locaux, y compris ceux comprenant des documents modifiés, seront retirés et remplacés par les groupes liés au compte '%1$S'.\n\nPour éviter de perdre les modifications locales des groupes, assurez-vous d'avoir synchronisé avec le compte '%2$S' avant de synchroniser avec le compte '%1$S'. sync.conflict.autoChange.alert=Un(e) ou plusieurs %S Zotero supprimé(es) localement ont été modifié(es) à distance depuis la dernière synchronisation. sync.conflict.autoChange.log=Un(e) %S Zotero a été modifié(e) tant localement qu'à distance depuis la dernière synchronisation : @@ -818,14 +818,14 @@ sync.storage.serverConfigurationVerified=Configuration du serveur vérifiée sync.storage.fileSyncSetUp=La synchronisation de fichier a été configurée avec succès. sync.storage.openAccountSettings=Ouvrir les paramètres du compte -sync.storage.error.default=Une erreur de synchronisation de fichier s'est produite. Veuillez essayer de synchroniser à nouveau.⏎ ⏎ Si vous recevez ce message de manière répétée, redémarrez %S et/ou votre ordinateur et essayez à nouveau. Si vous recevez encore ce message, soumettez un rapport d'erreur et postez son Report ID -numéro de rapport- dans un nouveau fil de discussion du forum Zotero. -sync.storage.error.defaultRestart=Une erreur de synchronisation de fichier s'est produite. Veuillez redémarrer %S et/ou votre ordinateur et essayez de synchroniser à nouveau.⏎ ⏎ Si vous recevez ce message de manière répétée, soumettez un rapport d'erreur et postez son Report ID -numéro de rapport- dans un nouveau fil de discussion du forum Zotero. +sync.storage.error.default=Une erreur de synchronisation de fichier s'est produite. Veuillez essayer de synchroniser à nouveau.\n\nSi vous recevez ce message de manière répétée, redémarrez %S et/ou votre ordinateur et essayez à nouveau. Si vous recevez encore ce message, soumettez un rapport d'erreur et postez son Report ID -numéro de rapport- dans un nouveau fil de discussion du forum Zotero. +sync.storage.error.defaultRestart=Une erreur de synchronisation de fichier s'est produite. Veuillez redémarrer %S et/ou votre ordinateur et essayez de synchroniser à nouveau.\n\nSi vous recevez ce message de manière répétée, soumettez un rapport d'erreur et postez son Report ID -numéro de rapport- dans un nouveau fil de discussion du forum Zotero. sync.storage.error.serverCouldNotBeReached=Le serveur %S n'a pu être atteint. sync.storage.error.permissionDeniedAtAddress=Vous n'avez pas le droit de créer un répertoire Zotero à l'adresse suivante : sync.storage.error.checkFileSyncSettings=Veuillez vérifier vos paramètres de synchronisation de fichier ou contacter l'administrateur de votre serveur WebDAV. sync.storage.error.verificationFailed=La vérification %S a échoué. Vérifiez vos paramètres de synchronisation de fichiers dans le panneau Synchronisation des Préférences de Zotero. sync.storage.error.fileNotCreated=Le fichier '%S' n'a pas pu être créé dans le répertoire 'storage' de Zotero. -sync.storage.error.encryptedFilenames=Erreur lors de la création du fichier '%S'. ⏎ ⏎ Consultez http://www.zotero.org/support/kb/encrypted_filenames pour plus d'informations. +sync.storage.error.encryptedFilenames=Erreur lors de la création du fichier '%S'.\n\nConsultez http://www.zotero.org/support/kb/encrypted_filenames pour plus d'informations. sync.storage.error.fileEditingAccessLost=Vous n'avez plus d'accès en modification de fichier pour le groupe Zotero '%S', et les fichiers que vous avez ajoutés ou modifiés ne peuvent pas être synchronisés vers le serveur. sync.storage.error.copyChangedItems=Pour avoir une chance de copier les documents et fichiers modifiés ailleurs, annulez la synchronisation maintenant. sync.storage.error.fileUploadFailed=La mise en ligne du fichier a échoué. @@ -833,8 +833,8 @@ sync.storage.error.directoryNotFound=Le répertoire est introuvable. sync.storage.error.doesNotExist=%S n'existe pas. sync.storage.error.createNow=Voulez-vous le créer maintenant? -sync.storage.error.webdav.default=Une erreur WebDAV de synchronisation de fichier s'est produite. Veuillez essayer de synchroniser à nouveau.⏎ ⏎ Si vous recevez ce message de manière répétée, vérifiez vos paramètres serveur WebDAV dans le panneau Synchronisation des Préférences de Zotero. -sync.storage.error.webdav.defaultRestart=Une erreur WebDAV de synchronisation de fichier s'est produite. Veuillez redémarrer %S et essayez de synchroniser à nouveau. ⏎ ⏎ Si vous recevez ce message de manière répétée, vérifiez vos paramètres serveur WebDAV dans le panneau Synchronisation des Préférences de Zotero. +sync.storage.error.webdav.default=Une erreur WebDAV de synchronisation de fichier s'est produite. Veuillez essayer de synchroniser à nouveau.\n\nSi vous recevez ce message de manière répétée, vérifiez vos paramètres serveur WebDAV dans le panneau Synchronisation des Préférences de Zotero. +sync.storage.error.webdav.defaultRestart=Une erreur WebDAV de synchronisation de fichier s'est produite. Veuillez redémarrer %S et essayez de synchroniser à nouveau.\n\nSi vous recevez ce message de manière répétée, vérifiez vos paramètres serveur WebDAV dans le panneau Synchronisation des Préférences de Zotero. sync.storage.error.webdav.enterURL=Veuillez saisir une URL WebDAV. sync.storage.error.webdav.invalidURL=%S n'est pas une URL WebDAV valide. sync.storage.error.webdav.invalidLogin=Le serveur WebDAV n'a pas accepté l'identifiant et le mot de passe que vous avez saisis. @@ -845,11 +845,11 @@ sync.storage.error.webdav.sslConnectionError=Une erreur de connexion SSL s'est p sync.storage.error.webdav.loadURLForMoreInfo=Entrez votre URL WebDAV dans votre navigateur pour plus d'information. sync.storage.error.webdav.seeCertOverrideDocumentation=Consultez la documentation relative aux exceptions de certificats auto-signés (certificate override) pour plus d'information. sync.storage.error.webdav.loadURL=Charger l'URL WebDAV -sync.storage.error.webdav.fileMissingAfterUpload=Un problème potentiel a été trouvé avec votre serveur WebDAV. ⏎ ⏎ Un fichier téléversé sur le serveur n'était pas immédiatement accessible au téléchargement. Il peut y avoir un court délai entre le moment où vous envoyez des fichiers et celui où ils sont disponibles, particulièrement si vous utilisez un service de stockage dans le nuage. ⏎ ⏎ Si la synchronisation des fichiers Zotero fonctionne normalement, vous pouvez ignorer ce message. Si vous rencontrez des problèmes, veuillez poster un message sur le forum zotero.org . +sync.storage.error.webdav.fileMissingAfterUpload=Un problème potentiel a été trouvé avec votre serveur WebDAV.\n\nUn fichier téléversé sur le serveur n'était pas immédiatement accessible au téléchargement. Il peut y avoir un court délai entre le moment où vous envoyez des fichiers et celui où ils sont disponibles, particulièrement si vous utilisez un service de stockage dans le nuage.\n\nSi la synchronisation des fichiers Zotero fonctionne normalement, vous pouvez ignorer ce message. Si vous rencontrez des problèmes, veuillez poster un message sur le forum zotero.org . sync.storage.error.webdav.serverConfig.title=Erreur de configuration du serveur WebDAV sync.storage.error.webdav.serverConfig=Votre serveur WebDAV a retourné une erreur interne. -sync.storage.error.zfs.restart=Une erreur de synchronisation de fichier s'est produite. Veuillez redémarrer %S et/ou votre ordinateur et essayez de synchroniser à nouveau.⏎ ⏎ Si l'erreur persiste, il peut y avoir un problème soit avec votre ordinateur soit avec le réseau : logiciels de sécurité – antivirus, pare-feu – VPN, etc. Essayez de désactiver les logiciels de sécurité que vous utilisez ou, si c'est un portable, essayez depuis un autre réseau. +sync.storage.error.zfs.restart=Une erreur de synchronisation de fichier s'est produite. Veuillez redémarrer %S et/ou votre ordinateur et essayez de synchroniser à nouveau.\n\nSi l'erreur persiste, il peut y avoir un problème soit avec votre ordinateur soit avec le réseau : logiciels de sécurité – antivirus, pare-feu – VPN, etc. Essayez de désactiver les logiciels de sécurité que vous utilisez ou, si c'est un portable, essayez depuis un autre réseau. sync.storage.error.zfs.tooManyQueuedUploads=Vous avez trop de fichiers à envoyer dans la file d'attente. Veuillez réessayer dans %S minutes. sync.storage.error.zfs.personalQuotaReached1=Vous avez atteint votre quota de stockage de fichiers Zotero. Certains fichiers n'ont pas été mis en ligne. D'autres données Zotero continueront d'être synchronisées avec le serveur. sync.storage.error.zfs.personalQuotaReached2=Consultez les paramètres de votre compte zotero.org pour plus d'options de stockage. diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties index 2adb3bba9b..269eb13006 100644 --- a/chrome/locale/ja-JP/zotero/zotero.properties +++ b/chrome/locale/ja-JP/zotero/zotero.properties @@ -560,7 +560,7 @@ zotero.preferences.advanced.resetStyles=スタイルをリセットする zotero.preferences.advanced.resetStyles.changesLost=新しく追加・変更されたスタイルは失われます。 zotero.preferences.advanced.debug.title=デバッグ出力が提出されました。 -zotero.preferences.advanced.debug.sent=デバッグ出力が Zotero サーバーに送信されました。⏎ ⏎デバッグ ID は D%S です。 +zotero.preferences.advanced.debug.sent=デバッグ出力が Zotero サーバーに送信されました。\n\nデバッグ ID は D%S です。 zotero.preferences.advanced.debug.error=デバッグ出力を送信中にエラーが生じました。 dragAndDrop.existingFiles=次のファイルは宛先フォルダにすでに存在しており、コピーされませんでした。: @@ -749,7 +749,7 @@ sync.error.usernameNotSet=ユーザーネームが指定されていません sync.error.usernameNotSet.text=Zotero サーバーと同期するためには、Zotero 環境設定において、zotero.org のユーザー名とパスワードを入力する必要があります。 sync.error.passwordNotSet=パスワードが指定されていません sync.error.invalidLogin=ユーザーネームまたはパスワードが不正です -sync.error.invalidLogin.text=Zotero 同期サーバーはあなたのユーザー名とパスワードを受け付けませんでした。⏎ ⏎ Zotero 環境設定の同期設定において zotero.org へのログイン情報を正確に入力したかご確認下さい。 +sync.error.invalidLogin.text=Zotero 同期サーバーはあなたのユーザー名とパスワードを受け付けませんでした。\n\nZotero 環境設定の同期設定において zotero.org へのログイン情報を正確に入力したかご確認下さい。 sync.error.enterPassword=パスワードを入力してください sync.error.loginManagerCorrupted1=Zotero はあなたのログイン情報にアクセスすることができません。%S ログイン管理データベースが破損した恐れがあります。 sync.error.loginManagerCorrupted2=%S を閉じて、あなたの %S プロファイルから、signons.* のバックアップを取り、このファイルを削除してください。それからあなたの Zotero ログイン情報をもう一度 Zotero 環境設定の「同期」タブに入力し直してください。 From fa8b11c46c8c82cc5b60b85476ed2aa8606ab317 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 29 Mar 2013 03:39:28 -0400 Subject: [PATCH 16/23] Update submodules and repotime --- resource/schema/repotime.txt | 2 +- styles | 2 +- translators | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt index b4abf8c578..3a6a13368e 100644 --- a/resource/schema/repotime.txt +++ b/resource/schema/repotime.txt @@ -1 +1 @@ -2013-03-26 00:00:00 +2013-03-28 09:10:00 diff --git a/styles b/styles index 6c292459cc..8ff7f1b49c 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit 6c292459cca80edd2c7af20288696044f99beda0 +Subproject commit 8ff7f1b49c1c5f42f176da97aa1f36ff8b6f3a62 diff --git a/translators b/translators index dfb7a2685f..1b147d0e41 160000 --- a/translators +++ b/translators @@ -1 +1 @@ -Subproject commit dfb7a2685febf30b77954bf3cb28b89ee4dc1cd4 +Subproject commit 1b147d0e4129d6594be8be1873f6d731e9d04d0c From 239247aa814bc96c724b31918ba8fb841bcac52d Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 29 Mar 2013 04:19:49 -0400 Subject: [PATCH 17/23] Make the prefwindow somewhat less of a disaster on fr-FR And probably other locales. (Also, there must be a better way to deal with bottom elements getting cut off than these extra elements that result in extra space when they're not needed.) --- chrome/content/zotero/preferences/preferences_advanced.xul | 6 ++++-- chrome/content/zotero/preferences/preferences_export.xul | 1 + chrome/content/zotero/preferences/preferences_firefox.xul | 3 ++- chrome/content/zotero/preferences/preferences_general.xul | 3 +++ chrome/content/zotero/preferences/preferences_search.xul | 1 + chrome/content/zotero/preferences/preferences_sync.xul | 3 ++- chrome/skin/default/zotero/preferences.css | 4 ++++ 7 files changed, 17 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul index e95bc6aa8b..d0b0cf547d 100644 --- a/chrome/content/zotero/preferences/preferences_advanced.xul +++ b/chrome/content/zotero/preferences/preferences_advanced.xul @@ -112,7 +112,7 @@ - +