commit 903c3ed78e6c26c2c9538f6e98bcda6a2fe8c2f0 parent 97358aad7ac16878b0a14dcb65938ea8df310f55 Author: Simon Kornblith <simon@simonster.com> Date: Mon, 1 Apr 2013 01:11:52 -0400 Merge branch '4.0' Conflicts: chrome/content/zotero/xpcom/zotero.js Diffstat:
154 files changed, 895 insertions(+), 514 deletions(-)
diff --git 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/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); diff --git 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/addCitationDialog.js b/chrome/content/zotero/integration/addCitationDialog.js @@ -34,6 +34,7 @@ var Zotero_Citation_Dialog = new function () { "suppress-author":["checked", false] }; + var _accepted = false; var _itemData = new Object(); var _multipleSourcesOn = false; var _lastSelected = null; @@ -581,6 +582,8 @@ var Zotero_Citation_Dialog = new function () { * called when accept button is clicked */ function accept() { + if(_accepted) return true; + _getCitation(); var isCustom = _previewShown && io.citation.citationItems.length // if a citation is selected && _originalHTML @@ -600,6 +603,7 @@ var Zotero_Citation_Dialog = new function () { } io.accept(); + _accepted = true; return true; } @@ -607,8 +611,12 @@ var Zotero_Citation_Dialog = new function () { * called when cancel button is clicked */ function cancel() { + if(_accepted) return true; io.citation.citationItems = new Array(); + io.accept(); + _accepted = true; + return true; } /* diff --git a/chrome/content/zotero/integration/addCitationDialog.xul b/chrome/content/zotero/integration/addCitationDialog.xul @@ -41,7 +41,7 @@ onunload="doUnload();" ondialogaccept="return Zotero_Citation_Dialog.accept();" ondialogcancel="Zotero_Citation_Dialog.cancel();" - onclose="Zotero_Citation_Dialog.cancel(); event.preventDefault(); event.stopPropagation();" + onclose="Zotero_Citation_Dialog.cancel();" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" persist="screenX screenY width height" resizable="true" diff --git a/chrome/content/zotero/integration/editBibliographyDialog.js b/chrome/content/zotero/integration/editBibliographyDialog.js @@ -235,15 +235,18 @@ var Zotero_Bibliography_Dialog = new function () { * Called when OK button is pressed */ this.accept = function() { - _accepted = true; + if(_accepted) return; _updatePreview(true); + _accepted = true; } /** * Called when Cancel button is pressed */ this.close = function() { - if(!_accepted) bibEditInterface.cancel(); + if(_accepted) return; + bibEditInterface.cancel(); + _accepted = true; } /** diff --git a/chrome/content/zotero/integration/editBibliographyDialog.xul b/chrome/content/zotero/integration/editBibliographyDialog.xul @@ -38,7 +38,7 @@ onload="Zotero_Bibliography_Dialog.load();" ondialogaccept="Zotero_Bibliography_Dialog.accept();" ondialogcancel="Zotero_Bibliography_Dialog.close();" - onclose="Zotero_Bibliography_Dialog.close(); event.preventDefault(); event.stopPropagation();" + onclose="Zotero_Bibliography_Dialog.close();" onunload="doUnload();" buttons="extra1,extra2,accept,cancel" buttonpack="end" xmlns:html="http://www.w3.org/1999/xhtml" diff --git a/chrome/content/zotero/integration/integrationDocPrefs.xul b/chrome/content/zotero/integration/integrationDocPrefs.xul @@ -48,7 +48,7 @@ <listbox id="style-listbox" onselect="Zotero_File_Interface_Bibliography.styleChanged()"/> </groupbox> - <groupbox> + <groupbox id="displayAs-groupbox"> <caption label="&zotero.integration.prefs.displayAs.label;"/> <radiogroup id="displayAs" orient="horizontal"> <radio id="footnotes" label="&zotero.integration.prefs.footnotes.label;" selected="true"/> @@ -67,9 +67,14 @@ <description class="radioDescription" id="bookmarks-caption">&zotero.integration.prefs.bookmarks.caption;</description> <description class="radioDescription" id="bookmarks-file-format-notice"/> </radiogroup> - - <checkbox id="storeReferences" label="&zotero.integration.prefs.storeReferences.label;"/> - <description class="radioDescription">&zotero.integration.prefs.storeReferences.caption;</description> </groupbox> + + <vbox id="automaticJournalAbbreviations-vbox"> + <checkbox id="automaticJournalAbbreviations-checkbox" label="&zotero.integration.prefs.automaticJournalAbbeviations.label;"/> + <description class="radioDescription">&zotero.integration.prefs.automaticJournalAbbeviations.caption;</description> + </vbox> + + <checkbox id="storeReferences" label="&zotero.integration.prefs.storeReferences.label;"/> + <description class="radioDescription">&zotero.integration.prefs.storeReferences.caption;</description> </vbox> </dialog> \ No newline at end of file diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul @@ -112,7 +112,7 @@ <groupbox id="zotero-prefpane-advanced-miscellaneous"> <caption label="&zotero.preferences.miscellaneous;"/> - <hbox id="zotero-prefpane-advanced-openbuttons" align="center"> + <hbox id="zotero-prefpane-advanced-openbuttons" align="center" style="display: block"> <button id="openAboutConfig" label="&zotero.preferences.openAboutConfig;" oncommand="Zotero_Preferences.openInViewer('about:config')"/> @@ -186,7 +186,7 @@ <groupbox> <caption label="&zotero.preferences.dbMaintenance;"/> - <hbox> + <hbox style="display: block"> <button label="&zotero.preferences.dbMaintenance.integrityCheck;" oncommand="Zotero_Preferences.Advanced.runIntegrityCheck()"/> <button label="&zotero.preferences.dbMaintenance.resetTranslators;" @@ -200,6 +200,8 @@ </tabbox> <separator/> + <separator/> + <separator/> </prefpane> <script src="preferences_advanced.js" type="application/javascript;version=1.8"/> diff --git a/chrome/content/zotero/preferences/preferences_cite.xul b/chrome/content/zotero/preferences/preferences_cite.xul @@ -35,7 +35,6 @@ <preferences id="zotero-preferences-cite"> <preference id="pref-cite-useClassicAddCitationDialog" name="extensions.zotero.integration.useClassicAddCitationDialog" type="bool"/> <preference id="pref-cite-citePaperJournalArticleURL" name="extensions.zotero.export.citePaperJournalArticleURL" type="bool"/> - <preference id="pref-cite-automaticTitleAbbreviation" name="extensions.zotero.cite.automaticTitleAbbreviation" type="bool"/> </preferences> <tabbox> @@ -81,8 +80,6 @@ <label id="export-citePaperJournalArticleURL" width="45em"> &zotero.preferences.export.citePaperJournalArticleURL.description; </label> - - <checkbox label="&zotero.preferences.cite.styles.automaticTitleAbbreviation;" preference="pref-cite-automaticTitleAbbreviation"/> </groupbox> </tabpanel> </tabpanels> diff --git a/chrome/content/zotero/preferences/preferences_export.xul b/chrome/content/zotero/preferences/preferences_export.xul @@ -77,6 +77,7 @@ <separator/> <separator/> <separator/> + <separator/> <script src="preferences_export.js" type="application/javascript;version=1.8"/> </prefpane> diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul @@ -50,10 +50,13 @@ <vbox style="margin-left: 1em"> <checkbox id="zotero-proxies-autoRecognize" label="&zotero.preferences.proxies.autoRecognize;" command="zotero-proxies-update"/> - <hbox> - <checkbox id="zotero-proxies-disableByDomain-checkbox" label="&zotero.preferences.proxies.disableByDomain;" + <hbox style="display: block; line-height: 1.75em"> + <checkbox id="zotero-proxies-disableByDomain-checkbox" + label="&zotero.preferences.proxies.disableByDomain;" command="zotero-proxies-update"/> - <textbox id="zotero-proxies-disableByDomain-textbox" onchange="Zotero_Preferences.Proxies.updateProxyPrefs()"/> + <textbox id="zotero-proxies-disableByDomain-textbox" + onchange="Zotero_Preferences.Proxies.updateProxyPrefs()" + flex="1" style="max-width: 11.75em"/> </hbox> </vbox> @@ -77,6 +80,7 @@ </groupbox> <separator/> + <separator/> </prefpane> <script src="preferences_proxies.js" type="application/javascript;version=1.8"/> diff --git a/chrome/content/zotero/preferences/preferences_general.xul b/chrome/content/zotero/preferences/preferences_general.xul @@ -129,6 +129,9 @@ <checkbox label="&zotero.preferences.groups.tags;" preference="pref-groups-copyTags"/> </vbox> </groupbox> + + <separator/> + <separator/> </prefpane> <script src="preferences_general.js" type="application/javascript;version=1.8"/> diff --git a/chrome/content/zotero/preferences/preferences_search.xul b/chrome/content/zotero/preferences/preferences_search.xul @@ -114,6 +114,7 @@ </groupbox> <separator/> + <separator/> </prefpane> <script src="preferences_search.js" type="application/javascript;version=1.8"/> diff --git a/chrome/content/zotero/preferences/preferences_sync.xul b/chrome/content/zotero/preferences/preferences_sync.xul @@ -229,7 +229,7 @@ <separator class="thin"/> <vbox> - <hbox id="storage-terms" style="margin-top: .4em" align="center"> + <hbox id="storage-terms" style="margin-top: .4em; display: block" align="center"> <label>&zotero.preferences.sync.fileSyncing.tos1;</label> <label class="zotero-text-link" href="http://www.digitalscholar.org/z_terms" value="&zotero.preferences.sync.fileSyncing.tos2;"/> <label>&zotero.preferences.period;</label> @@ -313,6 +313,7 @@ </tabbox> <separator/> + <separator/> </prefpane> <script src="preferences_sync.js" type="application/javascript;version=1.8"/> diff --git 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/tinymce/integration.html b/chrome/content/zotero/tinymce/integration.html @@ -1,4 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <style> @@ -38,7 +39,13 @@ html, body { theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", - theme_advanced_resizing : true + theme_advanced_resizing : true, + + setup : function (ed) { + ed.onInit.add(function (ed) { + zoteroInit(ed); + }); + } }); tinyMCE.execCommand("mceAddControl", true, "tinymce"); </script> diff --git 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 = '<div>Error parsing '+ 'style: </div><div>'+e+'</div>'; diff --git 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 @@ -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 = { }; /** + * Get a CSL abbreviation in the format expected by citeproc-js + */ +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<jurisdictions.length && !abbreviation; i++) { + if((jur = abbreviations[jurisdictions[i]]) && (cat = jur[category])) { + abbreviation = cat[lcNormalizedKey]; + } + } + + if(!abbreviation) { + // Abbreviate words individually + var words = normalizedKey.split(/([ \-])/); + + if(words.length > 1) { + for(var j=0; j<words.length; j+=2) { + var word = words[j], + lcWord = lookupKey(word), + newWord = undefined; + + for(var i=0; i<jurisdictions.length && newWord === undefined; i++) { + if(!(jur = abbreviations[jurisdictions[i]])) continue; + if(!(cat = jur[category+"-word"])) continue; + + // Complete match + if(cat.hasOwnProperty(lcWord)) { + newWord = cat[lcWord]; + } else { + // Partial match + for(var k=1; k<=word.length && newWord === undefined; k++) { + newWord = cat[lcWord.substr(0, k)+"-"]; + if(newWord && word.length - newWord.length < 1) { + newWord = undefined; + } + } + } + } + + // Fall back to full word + if(newWord === undefined ) newWord = word; + + words[j] = newWord.substr(0, 1).toUpperCase() + newWord.substr(1); + } + } + abbreviation = words.join("").replace(/\s+/g, " ").trim(); + } + + if(!abbreviation || abbreviation === key) { + Zotero.debug("No abbreviation found for "+key); + return; + } + Zotero.debug("Abbreviated "+key+" as "+abbreviation); + + // Add to jurisdiction object + if(!obj[jurisdiction]) { + obj[jurisdiction] = new Zotero.CiteProc.CSL.AbbreviationSegments(); + } + obj[jurisdiction][category][key] = abbreviation; + } +}; + +/** * citeproc-js system object - * @namespace + * @class */ -Zotero.Cite.System = { +Zotero.Cite.System = function(automaticJournalAbbreviations) { + if(automaticJournalAbbreviations) { + this.getAbbreviation = Zotero.Cite.getAbbreviation; + } +} + +Zotero.Cite.System.prototype = { /** * citeproc-js system function for getting items * See http://gsl-nagoya-u.net/http/pub/citeproc-doc.html#retrieveitem @@ -471,156 +618,5 @@ Zotero.Cite.System = { converterStream.readString(channel.contentLength, str); converterStream.close(); return str.value; - }, - - /** - * citeproc-js system function for getting abbreviations - * See http://gsl-nagoya-u.net/http/pub/citeproc-doc.html#getabbreviations - * Not currently used because it doesn't scale well to large lists - */ - "getAbbreviations":function getAbbreviations() { - return {}; - } -}; - -/** - * Functions for creating and manipulating field abbreviations - * @namespace - */ -Zotero.Cite.Abbreviations = new function() { - var abbreviations, - abbreviationCategories; - - /** - * Initialize abbreviations database. - */ - function init() { - if(!abbreviations) Zotero.Cite.Abbreviations.loadAbbreviations(); - } - - this.loadAbbreviations = function() { - 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. - */ - Zotero.CiteProc.CSL.getAbbreviation = 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<jurisdictions.length && !abbreviation; i++) { - if((jur = abbreviations[jurisdictions[i]]) && (cat = jur[category])) { - abbreviation = cat[lcNormalizedKey]; - } - } - - if(!abbreviation) { - // Abbreviate words individually - var words = normalizedKey.split(/([ \-])/); - - if(words.length > 1) { - for(var j=0; j<words.length; j+=2) { - var word = words[j], - lcWord = lookupKey(word), - newWord = undefined; - - for(var i=0; i<jurisdictions.length && newWord === undefined; i++) { - if(!(jur = abbreviations[jurisdictions[i]])) continue; - if(!(cat = jur[category+"-word"])) continue; - - // Complete match - if(cat.hasOwnProperty(lcWord)) { - newWord = cat[lcWord]; - } else { - // Partial match - for(var k=1; k<=word.length && newWord === undefined; k++) { - newWord = cat[lcWord.substr(0, k)+"-"]; - if(newWord && word.length - newWord.length < 1) { - newWord = undefined; - } - } - } - } - - // Fall back to full word - if(newWord === undefined ) newWord = word; - - words[j] = newWord.substr(0, 1).toUpperCase() + newWord.substr(1); - } - } - abbreviation = words.join("").replace(/\s+/g, " ").trim(); - } - - if(!abbreviation || abbreviation === key) { - Zotero.debug("No abbreviation found for "+key); - return; - } - Zotero.debug("Abbreviated "+key+" as "+abbreviation); - - // Add to jurisdiction object - if(!obj[jurisdiction]) { - obj[jurisdiction] = new Zotero.CiteProc.CSL.AbbreviationSegments(); - } - obj[jurisdiction][category][key] = abbreviation; } }; \ No newline at end of file diff --git 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.443", 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<ilen;i+=1) { + for (var j=0,jlen=citations[i].citationItems.length;j<jlen;j+=1) { + var itemID = "" + citations[i].citationItems[j].id; + itemIDs.push(itemID); + if (uncitedItemIDs[itemID]) { + delete uncitedItemIDs[itemID]; + } + } + } + this.updateItems(itemIDs); + for (var key in uncitedItemIDs) { + myUncitedItemIDs.push(key); + } + this.updateUncitedItems(myUncitedItemIDs); + var pre = []; + var post = []; + var ret = []; + for (var i=0,ilen=citations.length;i<ilen;i+=1) { + var res = this.processCitationCluster(citations[i],pre,post,mode); + pre.push([citations[i].citationID,citations[i].properties.noteIndex]); + for (var j=0,jlen=res[1].length;j<jlen;j+=1) { + var index = res[1][j][0]; + ret[index] = [ + pre[index][0], + pre[index][1], + res[1][j][1] + ]; + } + } + return ret; +} CSL.Engine.prototype.restoreProcessorState = function (citations) { var i, ilen, j, jlen, item, Item, newitem, citationList, itemList, sortedItems; citationList = []; @@ -3473,11 +3533,11 @@ CSL.Engine.prototype.updateItems = function (idList, nosort, rerun_ambigs) { var debug = false; var oldArea = this.tmp.area; this.registry.init(idList); - if (rerun_ambigs) { - for (var ambig in this.registry.ambigcites) { - this.registry.ambigsTouched[ambig] = true; - } - } + if (rerun_ambigs) { + for (var ambig in this.registry.ambigcites) { + this.registry.ambigsTouched[ambig] = true; + } + } this.registry.dodeletes(this.registry.myhash); this.registry.doinserts(this.registry.mylist); this.registry.dorefreshes(); @@ -3510,6 +3570,9 @@ CSL.Engine.prototype.getCitationLabel = function (Item) { var params = this.getTrigraphParams(); var config = params[0]; var myname = this.getTerm("reference", "short", 0); + if ("undefined" === typeof myname) { + myname = "reference"; + } myname = myname.replace(".", ""); myname = myname.slice(0, 1).toUpperCase() + myname.slice(1); for (var i = 0, ilen = CSL.CREATORS.length; i < ilen; i += 1) { @@ -3572,7 +3635,7 @@ CSL.Engine.prototype.getTrigraphParams = function () { var str = ilst[i]; var config = {authors:[], year:0}; for (var j = 0, jlen = str.length; j < jlen; j += 1) { - switch (str[j]) { + switch (str.slice(j,j+1)) { case "A": config.authors.push(1); break; @@ -4561,8 +4624,8 @@ CSL.getCitationCluster = function (inputList, citationID) { && this.sys.wrapCitationEntry && !this.tmp.just_looking && this.tmp.area === "citation")) { - result = txt_esc(this.citation.opt.layout_prefix) + result + txt_esc(use_layout_suffix); - } + result = txt_esc(this.citation.opt.layout_prefix) + result + txt_esc(use_layout_suffix); + } if (!this.tmp.suppress_decorations) { len = this.citation.opt.layout_decorations.length; for (pos = 0; pos < len; pos += 1) { @@ -4767,9 +4830,6 @@ CSL.localeResolve = function (langstr) { ret.bare = langlst[0]; return ret; }; -CSL.localeParse = function (arg) { - return arg; -}; CSL.Engine.prototype.localeConfigure = function (langspec) { var localexml; localexml = this.sys.xml.makeXml(this.sys.retrieveLocale("en-US")); @@ -4788,6 +4848,11 @@ CSL.Engine.prototype.localeConfigure = function (langspec) { this.localeSet(this.cslXml, langspec.base, langspec.best); } this.localeSet(this.cslXml, langspec.best, langspec.best); + if (this.opt.development_extensions.normalize_lang_keys_to_lowercase) { + langspec.best = langspec.best.toLowerCase(); + langspec.bare = langspec.bare.toLowerCase(); + langspec.base = langspec.base.toLowerCase(); + } if ("undefined" === typeof this.locale[langspec.best].terms["page-range-delimiter"]) { if (["fr", "pt"].indexOf(langspec.best.slice(0, 2).toLowerCase()) > -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<ilen;i+=1) { + for (var j=0,jlen=this.opt[localeLists[i]].length;j<jlen;j+=1) { + this.opt[localeLists[i]][j] = this.opt[localeLists[i]][j].toLowerCase(); + } + } + this.opt.lang = this.opt.lang.toLowerCase(); + } }; CSL.Engine.prototype.localeSet = function (myxml, lang_in, lang_out) { var blob, locale, nodes, attributes, pos, ppos, term, form, termname, styleopts, attr, date, attrname, len, genderform, target, i, ilen; lang_in = lang_in.replace("_", "-"); lang_out = lang_out.replace("_", "-"); + if (this.opt.development_extensions.normalize_lang_keys_to_lowercase) { + lang_in = lang_in.toLowerCase(); + lang_out = lang_out.toLowerCase(); + } if (!this.locale[lang_out]) { this.locale[lang_out] = {}; this.locale[lang_out].terms = {}; @@ -6032,6 +6110,8 @@ CSL.NameOutput.prototype.init = function (names) { this.names = names; this.variables = names.variables; this.state.tmp.value = []; + this.state.tmp.rendered_name = []; + this.state.tmp.label_blob = false; for (var i = 0, ilen = this.variables.length; i < ilen; i += 1) { if (this.Item[this.variables[i]] && this.Item[this.variables[i]].length) { this.state.tmp.value = this.state.tmp.value.concat(this.Item[this.variables[i]]); @@ -6184,7 +6264,7 @@ CSL.NameOutput.prototype.outputNames = function () { this.state.tmp.done_vars.push("title"); this.state.output.append(this.state.transform.abbrevs["default"].classic[author_title], "empty", true); blob = this.state.output.pop(); - this.state.tmp.name_node.top.blobs.pop(); + this.state.tmp.name_node.top.blobs.pop(); this.state.tmp.name_node.top.blobs.push(blob); } } @@ -6228,6 +6308,8 @@ CSL.NameOutput.prototype._applyLabels = function (blob, v) { this.state.output.openLevel("empty"); this.state.output.append(blob, "literal", true); this.state.output.append(txt, this.label[v].after, true); + this.state.tmp.label_blob = this.state.output.pop(); + this.state.output.append(this.state.tmp.label_blob,"literal",true); this.state.output.closeLevel("empty"); blob = this.state.output.pop(); } @@ -6905,50 +6987,51 @@ CSL.NameOutput.prototype.renderInstitutionNames = function () { localesets = this.state.opt['cite-lang-prefs'].persons; } slot = {primary:'locale-orig',secondary:false,tertiary:false}; - if (localesets) { - var slotnames = ["primary", "secondary", "tertiary"]; - for (var k = 0, klen = slotnames.length; k < klen; k += 1) { - if (localesets.length - 1 < j) { - break; - } + if (localesets) { + var slotnames = ["primary", "secondary", "tertiary"]; + for (var k = 0, klen = slotnames.length; k < klen; k += 1) { + if (localesets.length - 1 < j) { + break; + } if (localesets[k]) { - slot[slotnames[k]] = 'locale-' + localesets[k]; - } - } - } else { - slot.primary = 'locale-translat'; - } - if (this.state.tmp.area !== "bibliography" - && !(this.state.tmp.area === "citation" - && this.state.opt.xclass === "note" - && this.item && !this.item.position)) { - slot.secondary = false; - slot.tertiary = false; - } + slot[slotnames[k]] = 'locale-' + localesets[k]; + } + } + } else { + slot.primary = 'locale-translat'; + } + if (this.state.tmp.area !== "bibliography" + && !(this.state.tmp.area === "citation" + && this.state.opt.xclass === "note" + && this.item && !this.item.position)) { + slot.secondary = false; + slot.tertiary = false; + } var res; + this.setRenderedName(name); res = this.getName(name, slot.primary, true); var primary = res.name; var usedOrig = res.usedOrig; if (primary) { primary = this.fixupInstitution(primary, v, j); } - secondary = false; - if (slot.secondary) { + secondary = false; + if (slot.secondary) { res = this.getName(name, slot.secondary, false, usedOrig); secondary = res.name; usedOrig = res.usedOrig; if (secondary) { - secondary = this.fixupInstitution(secondary, v, j); + secondary = this.fixupInstitution(secondary, v, j); } - } - tertiary = false; - if (slot.tertiary) { + } + tertiary = false; + if (slot.tertiary) { res = this.getName(name, slot.tertiary, false, usedOrig); tertiary = res.name; if (tertiary) { - tertiary = this.fixupInstitution(tertiary, v, j); + tertiary = this.fixupInstitution(tertiary, v, j); } - } + } switch (this.institution.strings["institution-parts"]) { case "short": if (primary["short"].length) { @@ -7066,40 +7149,41 @@ CSL.NameOutput.prototype._renderPersonalNames = function (values, pos) { localesets = this.state.opt['cite-lang-prefs'].persons; } slot = {primary:'locale-orig',secondary:false,tertiary:false}; - if (localesets) { - var slotnames = ["primary", "secondary", "tertiary"]; - for (var j = 0, jlen = slotnames.length; j < jlen; j += 1) { - if (localesets.length - 1 < j) { - break; - } - slot[slotnames[j]] = 'locale-' + localesets[j]; - } - } else { - slot.primary = 'locale-translat'; - } - if (this.state.tmp.sort_key_flag || (this.state.tmp.area !== "bibliography" - && !(this.state.tmp.area === "citation" - && this.state.opt.xclass === "note" - && this.item && !this.item.position))) { - slot.secondary = false; - slot.tertiary = false; - } + if (localesets) { + var slotnames = ["primary", "secondary", "tertiary"]; + for (var j = 0, jlen = slotnames.length; j < jlen; j += 1) { + if (localesets.length - 1 < j) { + break; + } + slot[slotnames[j]] = 'locale-' + localesets[j]; + } + } else { + slot.primary = 'locale-translat'; + } + if (this.state.tmp.sort_key_flag || (this.state.tmp.area !== "bibliography" + && !(this.state.tmp.area === "citation" + && this.state.opt.xclass === "note" + && this.item && !this.item.position))) { + slot.secondary = false; + slot.tertiary = false; + } + this.setRenderedName(name); var res = this.getName(name, slot.primary, true); var primary = this._renderOnePersonalName(res.name, pos, i); - secondary = false; - if (slot.secondary) { + secondary = false; + if (slot.secondary) { res = this.getName(name, slot.secondary, false, res.usedOrig); if (res.name) { - secondary = this._renderOnePersonalName(res.name, pos, i); + secondary = this._renderOnePersonalName(res.name, pos, i); } - } - tertiary = false; - if (slot.tertiary) { + } + tertiary = false; + if (slot.tertiary) { res = this.getName(name, slot.tertiary, false, res.usedOrig); if (res.name) { - tertiary = this._renderOnePersonalName(res.name, pos, i); + tertiary = this._renderOnePersonalName(res.name, pos, i); } - } + } var personblob; if (secondary || tertiary) { this.state.output.openLevel("empty"); @@ -7176,6 +7260,7 @@ CSL.NameOutput.prototype._renderOnePersonalName = function (value, pos, i) { suffix_sep = " "; } var romanesque = this._isRomanesque(name); + var has_hyphenated_non_dropping_particle = non_dropping_particle && non_dropping_particle.blobs.slice(-1) === "-"; var blob, merged, first, second; if (romanesque === 0) { blob = this._join([non_dropping_particle, family, given], ""); @@ -7195,7 +7280,7 @@ CSL.NameOutput.prototype._renderOnePersonalName = function (value, pos, i) { if (["Lord", "Lady"].indexOf(name.given) > -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<jlen;j+=1) { + if (name[CSL.NAME_PARTS[j]]) { + strname += name[CSL.NAME_PARTS[j]]; + } + } + this.state.tmp.rendered_name.push(strname); + } +} CSL.NameOutput.prototype.fixupInstitution = function (name, varname, listpos) { name = this._splitInstitution(name, varname, listpos); if (this.institution.strings["reverse-order"]) { @@ -8069,7 +8179,7 @@ CSL.Node.names = { state.build.names_variables.push(this.variables); func = function (state, Item, item) { state.tmp.can_substitute.push(true); - state.parallel.StartVariable("names"); + state.parallel.StartVariable("names",this.variables[0]); state.nameOutput.init(this); }; this.execs.push(func); @@ -8541,7 +8651,7 @@ CSL.Node.text = { } else { transfall = true; abbrfall = true; - } + } func = state.transform.getOutputFunction(this.variables, abbrevfam, abbrfall, altvar, transfall); } else { if (CSL.CITE_FIELDS.indexOf(this.variables_real[0]) > -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,24 +12569,26 @@ 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(); - if (uncited_flag && this.mylist && this.mylist.length) { - this.uncited = myitems; - for (i = 0, ilen = myitems.length; i < ilen; i += 1) { + 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) { + for (var i = myitems.length - 1; i > -1; i += -1) { myitems[i] = "" + myitems[i]; if (!this.myhash[myitems[i]] && this.mylist.indexOf(myitems[i]) === -1) { this.mylist.push(myitems[i]); + } else { + myitems = myitems.slice(0,i).concat(myitems.slice(i + 1)) } } + this.uncited = myitems; } else { this.mylist = myitems.concat(this.uncited); } @@ -12558,10 +12696,11 @@ CSL.Registry.prototype.doinserts = function (mylist) { }; CSL.Registry.prototype.douncited = function () { var pos, len; - for (pos = 0, len = this.mylist.length; pos < len; pos += 1) { + var cited_len = this.mylist.length - this.uncited.length; + for (pos = 0, len = cited_len; pos < len; pos += 1) { this.registry[this.mylist[pos]].uncited = false; } - for (pos = 0, len = this.uncited.length; pos < len; pos += 1) { + for (pos = cited_len, len = this.mylist.length; pos < len; pos += 1) { this.registry[this.mylist[pos]].uncited = true; } }; @@ -12595,7 +12734,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 +12750,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 +12776,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 +12791,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 +13228,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) { diff --git 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/integration.js b/chrome/content/zotero/xpcom/integration.js @@ -2016,16 +2016,19 @@ Zotero.Integration.Session.prototype.resetRequest = function(doc) { /** * Changes the Session style and data * @param data {Zotero.Integration.DocumentData} + * @param resetStyle {Boolean} Whether to force the style to be reset + * regardless of whether it has changed. This is desirable if the + * automaticJournalAbbreviations has changed. */ -Zotero.Integration.Session.prototype.setData = function(data) { +Zotero.Integration.Session.prototype.setData = function(data, resetStyle) { var oldStyle = (this.data && this.data.style ? this.data.style : false); this.data = data; - if(data.style.styleID && (!oldStyle || oldStyle.styleID != data.style.styleID)) { + if(data.style.styleID && (!oldStyle || oldStyle.styleID != data.style.styleID || resetStyle)) { this.styleID = data.style.styleID; try { var getStyle = Zotero.Styles.get(data.style.styleID); data.style.hasBibliography = getStyle.hasBibliography; - this.style = getStyle.csl; + this.style = getStyle.getCiteProc(data.prefs.automaticJournalAbbreviations); this.style.setOutputFormat("rtf"); this.styleClass = getStyle.class; this.dateModified = new Object(); @@ -2060,6 +2063,7 @@ Zotero.Integration.Session.prototype.setDocPrefs = function(doc, primaryFieldTyp io.primaryFieldType = primaryFieldType; io.secondaryFieldType = secondaryFieldType; io.storeReferences = this.data.prefs.storeReferences; + io.automaticJournalAbbreviations = this.data.prefs.automaticJournalAbbreviations; io.requireStoreReferences = !Zotero.Utilities.isEmpty(this.embeddedItems); } @@ -2078,13 +2082,19 @@ Zotero.Integration.Session.prototype.setDocPrefs = function(doc, primaryFieldTyp data.style.styleID = io.style; data.prefs.fieldType = io.fieldType; data.prefs.storeReferences = io.storeReferences; - me.setData(data); + data.prefs.automaticJournalAbbreviations = io.automaticJournalAbbreviations; + + me.setData(data, oldData && + oldData.prefs.automaticJournalAbbreviations != + data.prefs.automaticJournalAbbreviations); + // need to do this after setting the data so that we know if it's a note style me.data.prefs.noteType = me.style && me.styleClass == "note" ? io.useEndnotes+1 : 0; if(!oldData || oldData.style.styleID != data.style.styleID || oldData.prefs.noteType != data.prefs.noteType - || oldData.prefs.fieldType != data.prefs.fieldType) { + || oldData.prefs.fieldType != data.prefs.fieldType + || oldData.prefs.automaticJournalAbbreviations != data.prefs.automaticJournalAbbreviations) { // This will cause us to regenerate all citations me.oldCitationIDs = {}; } @@ -2170,7 +2180,7 @@ Zotero.Integration.Session.prototype.getCitationField = function(citation) { // add itemData only if requested if(this.data.prefs.storeReferences) { - serializeCitationItem.itemData = Zotero.Cite.System.retrieveItem(citationItem.id); + serializeCitationItem.itemData = this.style.sys.retrieveItem(citationItem.id); addSchema = true; } } @@ -3011,6 +3021,7 @@ Zotero.Integration.DocumentData.prototype.unserializeXML = function(xmlData) { this.prefs[name] = value; } if(this.prefs["storeReferences"] === undefined) this.prefs["storeReferences"] = false; + if(this.prefs["automaticJournalAbbreviations"] === undefined) this.prefs["automaticJournalAbbreviations"] = false; this.zoteroVersion = doc.documentElement.getAttribute("zotero-version"); if(!this.zoteroVersion) this.zoteroVersion = "2.0"; this.dataVersion = doc.documentElement.getAttribute("data-version"); diff --git a/chrome/content/zotero/xpcom/quickCopy.js b/chrome/content/zotero/xpcom/quickCopy.js @@ -330,7 +330,7 @@ Zotero.QuickCopy = new function() { // Copy citations if shift key pressed if (modified) { - var csl = Zotero.Styles.get(format).csl; + var csl = Zotero.Styles.get(format).getCiteProc(); csl.updateItems([item.id for each(item in items)]); var citation = {citationItems:[{id:item.id} for each(item in items)], properties:{}}; var html = csl.previewCitationCluster(citation, [], [], "html"); diff --git 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); } }); } @@ -430,6 +430,8 @@ Zotero.Style = function(arg) { '/csl:style/csl:info[1]/csl:category', Zotero.Styles.ns)) if(category.hasAttribute("term"))]; this._class = doc.documentElement.getAttribute("class"); + this._usesAbbreviation = !!Zotero.Utilities.xpath(doc, '//csl:text[@form="short"][@variable="container-title"][1]', + Zotero.Styles.ns).length; this._hasBibliography = !!doc.getElementsByTagName("bibliography").length; this._version = doc.documentElement.getAttribute("version"); if(!this._version) this._version = "0.8"; @@ -442,12 +444,11 @@ Zotero.Style = function(arg) { } } -Zotero.Style.prototype.__defineGetter__("csl", /** - * Retrieves the Zotero.CSL object for this style - * @type Zotero.CSL + * Get a citeproc-js CSL.Engine instance + * @param {Boolean} useAutomaticJournalAbbreviations Whether to automatically abbreviate titles */ -function() { +Zotero.Style.prototype.getCiteProc = function(automaticJournalAbbreviations) { var locale = Zotero.Prefs.get('export.bibliographyLocale'); if(!locale) { var locale = Zotero.locale; @@ -498,11 +499,16 @@ function() { } try { - return new Zotero.CiteProc.CSL.Engine(Zotero.Cite.System, xml, locale); + return new Zotero.CiteProc.CSL.Engine(new Zotero.Cite.System(automaticJournalAbbreviations), xml, locale); } catch(e) { Zotero.logError(e); throw e; } +}; + +Zotero.Style.prototype.__defineGetter__("csl", function() { + Zotero.logError("Zotero.Style.csl is deprecated. Use Zotero.Style.getCiteProc()"); + return this.getCiteProc(); }); Zotero.Style.prototype.__defineGetter__("class", @@ -534,6 +540,20 @@ function() { return this._hasBibliography; }); +Zotero.Style.prototype.__defineGetter__("usesAbbreviation", +/** + * Retrieves the style class, either from the metadata that's already loaded or by loading the file + * @type String + */ +function() { + if(this.source) { + var parentStyle = Zotero.Styles.get(this.source); + if(!parentStyle) return false; + return parentStyle.usesAbbreviation; + } + return this._usesAbbreviation; +}); + Zotero.Style.prototype.__defineGetter__("independentFile", /** * Retrieves the file corresponding to the independent CSL diff --git 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(); } @@ -1814,7 +1815,7 @@ Zotero.Translate.Web.prototype.complete = function(returnValue, error) { if(oldState == "translate" && errorString && !this._parentTranslator && this.translator.length && this.translator[0].inRepository && Zotero.Prefs.get("reportTranslationFailure")) { // Don't report failure if in private browsing mode - if(Zotero.isFx && !Zotero.isBookmarklet && !Zotero.isStandalone) { + if(Zotero.isFx && !Zotero.isBookmarklet && !Zotero.isStandalone && Components.classes["@mozilla.org/privatebrowsing;1"]) { var pbs = Components.classes["@mozilla.org/privatebrowsing;1"] .getService(Components.interfaces.nsIPrivateBrowsingService); if (pbs.privateBrowsingEnabled) { diff --git 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 + var isRequest = Zotero.isFx && !Zotero.isBookmarklet + && 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 + "' => <<Skipped>>\n"; + continue; + } + var value = arr[item]; } catch(e) { dumped_text += level_padding + "'" + item + "' => <<Access Denied>>\n"; diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles..."> <!ENTITY zotero.preferences.prefpane.keys "Snelsleutels"> diff --git a/chrome/locale/af-ZA/zotero/zotero.dtd b/chrome/locale/af-ZA/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Boekmerke"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks are preserved across Microsoft Word and OpenOffice, but may be accidentally modified."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Stoor verwysings in dokument"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Om die verwysings in die dokument te stoor vergroot die lêergrootte effens, maar laat u toe om die dokument met ander te deel sonder om 'n Zotero-groep te gebruik. Zotero 3.0 of later word benodig om dokumente wat met hierdie keuse geskep is, op te gradeer."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "اسم النمط"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "آخر تحديث"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "احصل على انماط اضافية..."> <!ENTITY zotero.preferences.prefpane.keys "اختصارات"> diff --git a/chrome/locale/ar/zotero/zotero.dtd b/chrome/locale/ar/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "الاشارات المرجعية"> <!ENTITY zotero.integration.prefs.bookmarks.caption "الاشارات المرجعية هي خاصية متاحة عبر مايكروسوفت وورد و اوبن اوفيس ولكنها قد تكون عرضة للتغيير الغير مقصود. ولأسباب تتعلق 
بالتوافق، فالاستشهادات المرجعية لا يمكن ادراجها في الحواشي السفلية او التعليقات الختامية عند تحديد هذا الخيار."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "تخزين المراجع في الوثيقة"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Инсталира на допълнителни стилове..."> <!ENTITY zotero.preferences.prefpane.keys "Клавишни Комбинации"> diff --git a/chrome/locale/bg-BG/zotero/zotero.dtd b/chrome/locale/bg-BG/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Отметки"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Отметките се запазват при прехвърляне между Microsoft Word и OpenOffice, но могат да бъдат променени по грешка."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Títol"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualitzat"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Aconsegueix estils addicionals..."> <!ENTITY zotero.preferences.prefpane.keys "Dreceres de teclat"> diff --git a/chrome/locale/ca-AD/zotero/zotero.dtd b/chrome/locale/ca-AD/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Adreces d'interès"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Les adreces d'interès es conserven entre el Microsoft Word i l'OpenOffice però es poden veure modificades accidentalment."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Emmagatzema les referències al document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "L'emmagatzematge de les referències en el document augmenta lleugerament la mida del fitxer, però us permet compartir el document amb altres persones sense necessitat de fer servir un grup del Zotero. Per actualitzar els documents creats amb aquesta opció cal tenir la versió Zotero 3.0 o versions posteriors."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Název"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aktualizováno"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Získat další styly..."> <!ENTITY zotero.preferences.prefpane.keys "Klávesové zkratky"> diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Záložky"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Záložky jsou zachovány u Microsoft Word i OpenOffice, ale mohou být náhodně modifikovány. Kvůli kompatibilitě nemohou být citace vkládány do poznámek pod čarou nebo koncových poznámek, pokud je tato možnost zvolena."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Uložit reference v dokumentu"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Uložení referencí do dokumentu mírně zvětší velikost souboru, ale umožní sdílet dokument s ostatními pomocí Zotero skupiny. K updatu dokumentů vytvořených s touto možností je potřeba Zotero 3.0 a vyšší."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titel"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Opdateret"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Hent yderligere formater"> <!ENTITY zotero.preferences.prefpane.keys "Genvejs-taster"> diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bogmærker"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bogmærker bevares i både Microsoft Word og OpenOffice/LibreOffive, men kan blive ændret ved en fejl. Når denne mulighed er valgt, kan referencer ikke indsættes i fodnoter eller slutnoter."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Gem referencer i dokument"> <!ENTITY zotero.integration.prefs.storeReferences.caption "At gemme referencer i dit dokument gør filen en anelse større, men det gør det også muligt at dele dokumentet med andre ved hjælp af en Zotero-gruppe. At opdatere dokumenter oprettet med denne funktion kræver Zotero 3.0 eller højere."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titel"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aktualisiert"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Weitere Stile hinzufügen..."> <!ENTITY zotero.preferences.prefpane.keys "Tastenkombinationen"> diff --git a/chrome/locale/de/zotero/zotero.dtd b/chrome/locale/de/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Lesezeichen"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Lesezeichen werden zwischen Microsoft Word und OpenOffice.org erhalten, können sich aber versehentlich verändern. Aus 
Kompatibilitätsgründen, werden Zitationen nicht in Fuß- oder Endnoten eingefügt, wenn diese Option ausgewählt ist."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Literaturangaben im Dokument speichen"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Das Speichern der Literaturangaben im Dokument erhöht die Dateigröße geringfügig, aber erlaubt es Ihnen, Ihr Dokument mit anderen zu teilen, ohne dass sie Zotero Groups verwenden müssen. Zotero 3.0 oder neuer ist notwendig, um Dokumente, die mit dieser Option erstellt wurden, zu aktualisieren."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles..."> <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys"> diff --git a/chrome/locale/el-GR/zotero/zotero.dtd b/chrome/locale/el-GR/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bookmarks"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks are preserved across Microsoft Word and OpenOffice, but may be accidentally modified."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles..."> <!ENTITY zotero.preferences.prefpane.keys "Shortcuts"> diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bookmarks"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks are preserved across Microsoft Word and LibreOffice, but may be accidentally modified. For 
compatibility reasons, citations cannot be inserted into footnotes or endnotes when this option is selected."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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? diff --git a/chrome/locale/es-ES/zotero/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Título"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualizado"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Obtener estilos adicionales..."> <!ENTITY zotero.preferences.prefpane.keys "Atajos de teclado"> diff --git a/chrome/locale/es-ES/zotero/zotero.dtd b/chrome/locale/es-ES/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Marcadores"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Los marcadores se mantienen en Microsoft Word y OpenOffice, pero puede que se modifiquen accidentalmente."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Guardar las referencias en el documento"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Guardar las referencias en el documento incrementa ligeramente el tamaño del archivo, pero te permitirá compartir tu documento con otros sin usar un grupo Zotero. Se necesita Zotero 3.0 o posterior para actualizar documentos creados con esta opción."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Pealkiri"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Uuendatud"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Veel stiile..."> <!ENTITY zotero.preferences.prefpane.keys "Kiirvaliku klahvid"> diff --git a/chrome/locale/et-EE/zotero/zotero.dtd b/chrome/locale/et-EE/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Järjehoidjaid"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Järjehoidjad toimivad nii MS Wordi kui ka OpenOffice puhul, kuid võib juhtuda, et neid kogemata muudetakse. Ühilduvuse huvides ei ole võimalik lisada viiteid allmärkustele ja lõppmärkustele, kui see võimalus on aktiveeritud."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Säilita viited dokumendiga koos"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Viidete salvestamine dokumendi sisse suurendab veidi failisuurust, kuid võimaldab teil seda dokumenti teiste Zotero kasutajatega jagada ilma Zotero gruppi kasutamata. Et sellist dokumenti redigeerida on vajalik Zotero 3.0 või hilisem verisoon."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Estilo gehialgo instalatu..."> <!ENTITY zotero.preferences.prefpane.keys "Teklatu-komandoak"> diff --git a/chrome/locale/eu-ES/zotero/zotero.dtd b/chrome/locale/eu-ES/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Lastermarkak"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Lastermarkak Microsoft Word zein OpenOffice-n erabil daitezke, baina baliteke nahigabe aldaketak jasatea. Konpatibilitatea dela eta, Lastermarkak aukeratuz gero erreferentziak ezin dira oin- eta amaiera-oharretan sartu."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "عنوان"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "روزآمد"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "دریافت شیوههای بیشتر..."> <!ENTITY zotero.preferences.prefpane.keys "کلیدهای میانبر"> diff --git a/chrome/locale/fa/zotero/zotero.dtd b/chrome/locale/fa/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "نشانک"> <!ENTITY zotero.integration.prefs.bookmarks.caption "نشانکها در بین Microsoft Word و OpenOffice مشترک هستند، ولی ممکن است به شکل تصادفی، تغییر داده شوند. 
در صورت انتخاب این گزینه، برای حفظ سازگاری، استفاده از یادکردها در پاورقی یا یادداشتهای انتهایی امکانپذیر نخواهد بود."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Nimi"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Päivitetty"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Hanki lisää tyylejä..."> <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys"> diff --git a/chrome/locale/fi-FI/zotero/zotero.dtd b/chrome/locale/fi-FI/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Kirjanmerkit"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks are preserved across Microsoft Word and OpenOffice, but may be accidentally modified."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Tallenna viitteet asiakirjassa"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Viitteiden tallentaminen asiakirjassa kasvattaa hiukan tiedoston kokoa, mutta tällöin tiedoston voi jakaa muiden kanssa käyttämättä Zotero-ryhmää. Tällä toiminnalle luotujen asiakirjojen muokkaamiseen tarvitaan Zotero 3.0 tai uudempi."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titre"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Mis à jour"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Abréger automatiquement les titres de revues"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Obtenir des styles supplémentaires…"> <!ENTITY zotero.preferences.prefpane.keys "Raccourcis clavier"> diff --git a/chrome/locale/fr-FR/zotero/zotero.dtd b/chrome/locale/fr-FR/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Signets"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Les signets sont conservés entre Microsoft Word et OpenOffice/LibreOffice, mais peuvent être modifiés accidentellement. Pour des raisons de compatibilité, les citations ne peuvent pas être insérées dans des notes de bas de page ou de fin lorsque cette option est sélectionnée."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Abréger automatiquement les titres de revues"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "Les abréviations MEDLINE des titres de revues seront automatiquement créés sur la base des titres de revues. Le champ Zotero "Abrév. de revue" sera ignoré."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Stocker les références dans le document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Stocker les références dans votre document augmentera la taille du fichier mais vous permettra de partager votre document avec d'autres sans utiliser un groupe Zotero. Zotero 3.0 ou suivant est nécessaire pour mettre à jour des documents créés avec cette option."> diff --git 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 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/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Título"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualizado"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Obter máis estilos..."> <!ENTITY zotero.preferences.prefpane.keys "Atallos de teclado"> diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Marcador"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Os marcadores consérvanse a través de e OpenOffice e Microsoft Word pero poden ser modificados accidentalmente. Por motivos de compatibilidade, as citas non se insiren nas notas a final de páxina ou nos rodapés cando se activa esa opción."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Almacenar as referencias no documento"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Almacenar as referencias no documento supón un aumento no peso do ficheiro máis permitelle compartir o documento sen ter que empregar o grupo de Zotero. Precísase ter un Zotero 3.0 ou as versións seguintes para actualizar os ficheiros que se crearon con esta opción."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "כותרת"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles..."> <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys"> diff --git a/chrome/locale/he-IL/zotero/zotero.dtd b/chrome/locale/he-IL/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "סימניות"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks are preserved across Microsoft Word and OpenOffice, but may be accidentally modified."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles..."> <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys"> diff --git a/chrome/locale/hr-HR/zotero/zotero.dtd b/chrome/locale/hr-HR/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bookmarks"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks are preserved across Microsoft Word and OpenOffice, but may be accidentally modified."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "További stílusok telepítése..."> <!ENTITY zotero.preferences.prefpane.keys "Billentyűparancsok"> diff --git a/chrome/locale/hu-HU/zotero/zotero.dtd b/chrome/locale/hu-HU/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Könyvjelzők"> <!ENTITY zotero.integration.prefs.bookmarks.caption "A könyvjelzők mind a Microsoft Word, mind az OpenOffice programokkal kompatibilisak, de könnyű véletlenül módosítani."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles..."> <!ENTITY zotero.preferences.prefpane.keys "Flýtihnappar"> diff --git a/chrome/locale/is-IS/zotero/zotero.dtd b/chrome/locale/is-IS/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bookmarks"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks are preserved across Microsoft Word and OpenOffice, but may be accidentally modified."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titolo"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aggiornato"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Scarica ulteriori stili..."> <!ENTITY zotero.preferences.prefpane.keys "Scorciatoie da tastiera"> diff --git a/chrome/locale/it-IT/zotero/zotero.dtd b/chrome/locale/it-IT/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Segnalibri"> <!ENTITY zotero.integration.prefs.bookmarks.caption "I segnalibri vengono solitamente mantenuti passando da Microsoft Word a OpenOffice, ma potrebbero subire modifiche non previste."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Salva i riferimenti nel documento"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Salvare i riferimenti nel documento ne aumenta leggermente la dimensione, ma ti permette di condividerlo con altre persone senza necessità di usare un gruppo Zotero. È necessario usare Zotero 3.0 o versioni successive per modificare documenti creati con questa modalità."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "スタイル名"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "更新日"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "自動的に雑誌名を略称表記する"> <!ENTITY zotero.preferences.export.getAdditionalStyles "他の引用スタイルを入手する..."> <!ENTITY zotero.preferences.prefpane.keys "ショートカットキー"> diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "ブックマーク"> <!ENTITY zotero.integration.prefs.bookmarks.caption "ブックマークは Microsoft Word、LibreOffice 双方で保存されますが、誤って変更されてしまう場合があります。 
 互換性上の理由により、この機能を選んだ場合、出典表記を脚注や巻末注に挿入することができません。"> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "雑誌名を自動的に簡略化する"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE の雑誌略誌名が雑誌名から自動的に生成されます。「雑誌略誌名」欄の内容は無視されます。"> + <!ENTITY zotero.integration.prefs.storeReferences.label "文献情報を文書中に保存"> <!ENTITY zotero.integration.prefs.storeReferences.caption "文献情報をあなたの文書中に保存するとわずかにファイルサイズが大きくなりますが、あなたは Zotero グループを使わなくても他人とその文書を共有することが可能になります。このオプションで作成された文書を更新するには Zotero 3.0 以降が必要です。"> diff --git 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 環境設定の「同期」タブに入力し直してください。 diff --git a/chrome/locale/km/zotero/preferences.dtd b/chrome/locale/km/zotero/preferences.dtd @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "ចំណងជើង"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "បានធ្វើទំនើបកម្ម"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "ស៊ីអេសអិល"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "បន្ថែមរចនាបថថ្មី..."> <!ENTITY zotero.preferences.prefpane.keys "ផ្លូវកាត់"> diff --git a/chrome/locale/km/zotero/zotero.dtd b/chrome/locale/km/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "កំណត់ចំណាំគេហទំព័រទុក"> <!ENTITY zotero.integration.prefs.bookmarks.caption "កំណត់ចំណាំគេហទំព័រអាចរក្សាទុកនៅក្នុងម៉ាយក្រូសូហ្វវើដ និង អូផិនអប់ហ្វីស ប៉ុន្តែអាចត្រូវបានកែប្រែដោយចៃដន្យ។ ដោយមូលហេតុសមិតភាព អាគតដ្ឋានមិនអាចដាក់ជាលេខយោងក្រោមអត្ថបទ ឬ លេខយោងចុងអត្ថបទនៅពេលត្រូវបានជ្រើសរើស។"> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "ដាក់កំណត់យោងក្នុងឯកសារ"> <!ENTITY zotero.integration.prefs.storeReferences.caption "ការដាក់កំណត់យោងក្នុងឯកសាររបស់អ្នកនឹងបង្កើនទំហំឯកសារ ប៉ុន្តែវានឹងអនុញ្ញាតឲអ្នកអាចចែករំលែកឯកសារជាមួយអ្នកដទៃដោយមិនចាំបាច់ប្រើហ្ស៊ូតេរ៉ូជាក្រុម។ ហ្ស៊ូតេរ៉ូកំណែថ្មីចាប់ពី ៣.០ ឡើងទៅ តម្រូវឲធ្វើទំនើបកម្មឯកសារដែលបានបង្កើតសម្រាប់ជម្រើសនេះ។"> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "제목"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "업데이트됨"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "추가 스타일 받기..."> <!ENTITY zotero.preferences.prefpane.keys "단축키"> diff --git a/chrome/locale/ko-KR/zotero/zotero.dtd b/chrome/locale/ko-KR/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "북마크"> <!ENTITY zotero.integration.prefs.bookmarks.caption "책갈피는 Microsoft Word와 OpenOffice에서 보존되지만, 경우에 따라 변경될 수도 있습니다. 이 옵션이 선택되면, 호환성 때문에 인용이 각주나 미주에 삽입되지 않게 됩니다."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "문서 안에 레퍼런스 저장"> <!ENTITY zotero.integration.prefs.storeReferences.caption "문서 안에 레퍼런스를 저장하면 파일 크기가 다소 증가할 수 있습니다. 하지만 문서를 Zotero 그룹을 통하지 않고도 공유할 수 있습니다. Zotero 3.0이상 버전이 필요한 기능입니다."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles..."> <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys"> diff --git a/chrome/locale/mn-MN/zotero/zotero.dtd b/chrome/locale/mn-MN/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bookmarks"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks are preserved across Microsoft Word and OpenOffice, but may be accidentally modified."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Hent flere stiler..."> <!ENTITY zotero.preferences.prefpane.keys "Hurtigtaster"> diff --git a/chrome/locale/nb-NO/zotero/zotero.dtd b/chrome/locale/nb-NO/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bokmerker"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bokmerker kan utveksles mellom Microsoft Word og OpenOffice, men er utsatt for utilsiktede endringer."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titel"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Bijgewerkt"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Meer stijlen installeren…"> <!ENTITY zotero.preferences.prefpane.keys "Sneltoetsen"> diff --git a/chrome/locale/nl-NL/zotero/zotero.dtd b/chrome/locale/nl-NL/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bookmarks"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks worden behouden tussen Microsoft Word en OpenOffice, maar kunnen per ongeluk worden gewijzigd. Het is met bookmarks niet mogelijk verwijzingen op te nemen in voet- of eindnoten."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Referenties in document bewaren"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Het bewaren van referenties in uw document maakt het bestand iets groter, maar maakt het mogelijk om uw document te delen met andere zonder gebruik te maken van een Zotero-groep. Zotero 3.0 of nieuwer is nodig om dit type documenten bij te werken."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Tittel"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Oppdatert"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Hent fleire stilar …"> <!ENTITY zotero.preferences.prefpane.keys "Snøggtastar"> diff --git a/chrome/locale/nn-NO/zotero/zotero.dtd b/chrome/locale/nn-NO/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bokmerke"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bokmerke kan utvekslast mellom Microsoft Word og OpenOffice, men er utsette for utilsikta endringar."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Lagra referansar i dokument"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Å lagra referansane i dokumentet gjer fila litt større, men gjer det mogleg å dela dokumentet med andre utan å laga ei Zotero-gruppe. Du treng Zotero 3.0 eller nyare for å oppdatera dokument laga med dette valet."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Nazwa"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aktualizacja"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatyczne skracanie tytułów czasopism"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Pobierz dodatkowe style..."> <!ENTITY zotero.preferences.prefpane.keys "Skróty klawiaturowe"> diff --git a/chrome/locale/pl-PL/zotero/zotero.dtd b/chrome/locale/pl-PL/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Zakładki"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Zakładki są zabezpieczone zarówno przez program Microsoft Word jaki i OpenOffice, ale w wyjątkowych przypadkach mogą być modyfikowane."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Zapisz cytowania w dokumencie"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Título"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Atualizado"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Obter estilos aditionais..."> <!ENTITY zotero.preferences.prefpane.keys "Teclas de atalho"> diff --git a/chrome/locale/pt-BR/zotero/zotero.dtd b/chrome/locale/pt-BR/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Marcadores"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bookmarks are preserved across Microsoft Word and OpenOffice, but may be accidentally modified."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Guardar referências no documento"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Guardar suas referências em seu documento aumenta sensivelmente o tamanho do arquivo, mas permitirá que você compartilhe seu documento com outros sem utilizar um grupo do Zotero. É necessário ter o Zotero 3.0, ou uma versão superior, para atualizar documentos criados com essa opção."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Título"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualizado"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Obter estilos adicionais..."> <!ENTITY zotero.preferences.prefpane.keys "Teclas de Atalho"> diff --git a/chrome/locale/pt-PT/zotero/zotero.dtd b/chrome/locale/pt-PT/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Marcadores"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Os marcadores são preservados entre o Microsoft Word e o OpenOffice, mas podem ser acidentalmente modificados. Por razões de compatibilidade, as citações não podem ser inseridas em notas de pé-de-página ou em notas finais quando esta opção é escolhida."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Armazenar referências no documento"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Armazenar referências no seu documento aumenta ligeiramente o tamanho do ficheiro, mas permitir-lhe-á partilhar o documento com outros sem usar um grupo Zotero. É necessário usar o Zotero 3.0 ou uma versão posterior para actualizar documentos criados com esta opção."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titlu"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Actualizat"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Abreviere automată a titlurilor de reviste"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Obține stiluri suplimentare..."> <!ENTITY zotero.preferences.prefpane.keys "Scurtături de la tastatură"> diff --git a/chrome/locale/ro-RO/zotero/zotero.dtd b/chrome/locale/ro-RO/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Semne de carte"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Semnele de carte sunt protejate în Microsoft Word și OpenOffice, dar pot fi accidental modificate."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Stochează referințele în document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Stocarea referințelor în documentul va crește dimensiunea fișierului, dar îți va permite să-l partajezi cu alții fără a folosi un grup Zotero. Este nevoie de Zotero 3.0 sau mai recent pentru a actualiza documentele create cu această opțiune."> diff --git a/chrome/locale/ru-RU/zotero/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Название"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Обновлён"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Загрузить дополнительные стили…"> <!ENTITY zotero.preferences.prefpane.keys "Горячие клавиши"> diff --git a/chrome/locale/ru-RU/zotero/zotero.dtd b/chrome/locale/ru-RU/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Закладки"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Закладки сохраняются при переходе между Microsoft Word и OpenOffice, но могут быть случайно изменены. Из соображений совместимости, когда эта опция выбрана, цитаты не могут быть вставлены в (концевые) сноски."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Сохранить ссылки в документе"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Хранение ссылок в вашем документе немного увеличивает размер файла, но позволяет обмениваться им с другими без использования группы Zotero. Для обновления таких документов требуется Zotero не ниже версии 3.0."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Názov"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Aktualizované"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automaticky skracovať názvy časopisov"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Získať ďalšie štýly..."> <!ENTITY zotero.preferences.prefpane.keys "Klávesové skratky"> diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "záložiek"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Záložky sa môžu uchovať aj vo Worde a OpenOffice, ale môžu sa náhodne pozmeniť. Z dôvodu kompatibility sa citácie nemôžu vkladať do poznámok pod čiarou alebo do koncových poznámok pri výbere tejto možnosti."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automaticky skracovať názvy časopisov"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "Skratky časopisov MEDLINE budú automaticky generované s použitím názvov časopisov. Pole "Journal Abbr" sa bude ignorovať."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Ukladať odkazy do dokumentu"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Ukladanie odkazov do vášho dokumentu nepatrne zväčší veľkosť súboru, ale vám umožní zdieľať váš dokument s ostatnými bez použitia skupín Zotera. Pre aktualizáciu dokumentov vytvorených s touto možnosťou sa vyžaduje Zotero 3.0 alebo novšie. "> diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Naslov"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Posodobljeno"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Samodejno okrajšaj naslove revij"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Dobi dodatne sloge ..."> <!ENTITY zotero.preferences.prefpane.keys "Tipke za bližnjice"> diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Zaznamki"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Zaznamki se ohranijo v Microsoft Word in LibreOffice, se pa lahko ponesreči spremenijo. Iz razlogov združljivosti citatov ni mogoče vstavljati v sprotne ali končne opombe, če je izbrana ta možnost."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Sklice shrani v dokumentu"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Shranjevanje sklicev v dokumentu malce poveča velikost datoteke, vendar omogoča skupno rabo dokumenta z drugimi, četudi ne uporabljajo skupine Zotero. Zotero 3.0 ali kasnejši je potreben za posodabljanje dokumentov, ki jih ustvarite s to možnostjo."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Добави додатне стилове..."> <!ENTITY zotero.preferences.prefpane.keys "Пречице на тастатури"> diff --git a/chrome/locale/sr-RS/zotero/zotero.dtd b/chrome/locale/sr-RS/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Пречице"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Пречице су сачуване кроз Microsoft Word и OpenOffice, али могу бити нехотично промењене."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Titel"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Uppdaterad"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Lägg till ytterligare stilar..."> <!ENTITY zotero.preferences.prefpane.keys "Snabbkommandon"> diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bokmärken"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Bokmärken sparas i Microsoft Word och OpenOffice, men kan ändras av misstag."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Lagra referenserna i dokumentet"> <!ENTITY zotero.integration.prefs.storeReferences.caption "När du lagerar referenserna i dokument ökar filstorleken något, men det ger dig möjligheten att dela dokumentet till andra utan att använda en Zotero-grupp. Zotero 3.0 eller senare krävs för att redigera dokument som skapats med detta tillval."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "ชื่อเรื่อง"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "ปรับเป็นรุ่นปัจจุบันแล้ว"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "เลือกใช้รูปแบบเพิ่มเติม..."> <!ENTITY zotero.preferences.prefpane.keys "คีย์ลัด"> diff --git a/chrome/locale/th-TH/zotero/zotero.dtd b/chrome/locale/th-TH/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "คั่นหน้า"> <!ENTITY zotero.integration.prefs.bookmarks.caption "คั่นหน้าถูกคงไว้ผ่านไมโครซอฟท์เวิร์ดและโอเพ่นออฟฟิศ แต่อาจมีการเปลี่ยนแปลงได้โดยบังเอิญ สำหรับ 
เหตุผลการเข้ากันได้ การอ้างอิงไม่สามารถแทรกในเชิงอรรถหรืออ้างอิงท้ายเรื่องเมื่อตัวเลือกนี้ถูกเลือก"> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "จัดเก็บเอกสารอ้างอิงในแฟ้มเอกสาร"> <!ENTITY zotero.integration.prefs.storeReferences.caption "เก็บเอกสารอ้างอิงในแฟ้มเอกสารของคุณจะทำให้ขนาดแฟ้มใหญ่ขึ้นเล็กน้อย แต่ช่วยให้คุณใช้แฟ้มเอกสารของคุณร่วมกับผู้อื่นได้โดยไม่ต้องใช้กลุ่มของ Zotero ต้องใช้ Zotero รุ่น 3.0 ขึ้นไปเพื่อการปรับแฟ้มเอกสารที่สร้างด้วยตัวเลือกนี้"> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Başlık"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Güncelleştirilme"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Dergi başlıklarını otomatik kısalt"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Ek stiller indir..."> <!ENTITY zotero.preferences.prefpane.keys "Kısayol Tuşları"> diff --git a/chrome/locale/tr-TR/zotero/zotero.dtd b/chrome/locale/tr-TR/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Yer imleri"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Yer imleri Microsoft Word ve OpenOffice arasında korunmuştur, ancak yanlışlıkla değiştirilebilirler. 
Uyumluluk için, bu seçenek seçildiğinde, göndermeler dipnot ve sonnotlara eklenemez."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Kaynakları belgede göster"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Kaynakları belgenizde kaydetmeniz dosya boyutunuzu büyütebilir, ancak belgenizi başkalarıyla bir Zotero grubu kullanmadan paylaşabilmenizi sağlayacaktır. Bu seçenekle yaratılmış belgelerin güncellenebilmesi, Zotero 3.0 veya sonraki sürümleri gerektirir."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "Title"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles..."> <!ENTITY zotero.preferences.prefpane.keys "Phím gõ tắt"> diff --git a/chrome/locale/vi-VN/zotero/zotero.dtd b/chrome/locale/vi-VN/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "Bookmarks"> <!ENTITY zotero.integration.prefs.bookmarks.caption "Các bookmarks được giữ nguyên giữa các tài liệu Microsoft Word và OpenOffice, nhưng đôi khi chúng có thể bị thay đổi một cách tình cờ."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document"> <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "标题"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "更新于"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "自动缩写标题"> <!ENTITY zotero.preferences.export.getAdditionalStyles "获取更多样式..."> <!ENTITY zotero.preferences.prefpane.keys "快捷键"> diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "书签"> <!ENTITY zotero.integration.prefs.bookmarks.caption "书签会在Microsoft Word和OpenOffice中保留, 但偶尔也会变动.由于 
 兼容性问题, 如果选中此项，引文将不能插入到脚注或尾注中."> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "在文档中储存参考文献"> <!ENTITY zotero.integration.prefs.storeReferences.caption "在文档中储存参考文献会稍微增加文档的大小, 但这样可以和没有使用 Zotero v群组的其它用户共享您的文档. 要使用该功能, Zotero 必须升级到3.0或更高版本."> diff --git 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 @@ -121,7 +121,6 @@ <!ENTITY zotero.preferences.cite.styles.styleManager.title "標題"> <!ENTITY zotero.preferences.cite.styles.styleManager.updated "已更新"> <!ENTITY zotero.preferences.cite.styles.styleManager.csl "文獻樣式語言CSL"> -<!ENTITY zotero.preferences.cite.styles.automaticTitleAbbreviation "Automatically abbreviate journal titles"> <!ENTITY zotero.preferences.export.getAdditionalStyles "獲取額外的樣式…"> <!ENTITY zotero.preferences.prefpane.keys "快速鍵"> diff --git a/chrome/locale/zh-TW/zotero/zotero.dtd b/chrome/locale/zh-TW/zotero/zotero.dtd @@ -211,6 +211,10 @@ <!ENTITY zotero.integration.prefs.bookmarks.label "書籤"> <!ENTITY zotero.integration.prefs.bookmarks.caption "書簽在Microsoft Word及OpenOffice之間應會被保留，但也可能意外的受到改變。為了相容性，在選用這個選項時文獻引用不能被插入到腳注或尾注中。"> + +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "Automatically abbreviate journal titles"> +<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "MEDLINE journal abbreviations will be automatically generated using journal titles. The “Journal Abbr” field will be ignored."> + <!ENTITY zotero.integration.prefs.storeReferences.label "將參考文獻存在文件中"> <!ENTITY zotero.integration.prefs.storeReferences.caption "將參考文獻存在文件中會讓檔案大一點，但可以讓你在不使用Zotero群組下和別人分享文件。更新用這個選項建立的文件需要Zotero 3.0以上的版本。"> diff --git 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=你確定要刪除所選的樣式嗎？ diff --git a/chrome/skin/default/zotero/preferences.css b/chrome/skin/default/zotero/preferences.css @@ -7,6 +7,10 @@ prefwindow { min-width: 600px; } +description, label, checkbox { + max-width: 630px; +} + radio[pane] { min-width: 5.5em; @@ -208,6 +212,10 @@ grid row hbox:first-child height: 1em; } +#quickCopy-instructions, #quickCopy-citationInstructions { + font-size: 12px; +} + #quickCopy-siteSettings-rows::-moz-tree-cell(quickCopy-copyAsHTML) { /* DEBUG: possible to center checkmark here instead of with spaces? diff --git 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", ""); @@ -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); diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt @@ -1 +1 @@ -2013-03-26 00:00:00 +2013-03-28 09:10:00