commit 1c3890e837dbbb6b65c74b42182cdb0fb7775328 parent bd688f333c488a36d1449f6d8c300d71a48e1b05 Author: Simon Kornblith <simon@simonster.com> Date: Sat, 26 Jan 2013 00:29:08 -0500 Merge branch '3.0' Diffstat:
49 files changed, 39 insertions(+), 98 deletions(-)
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul @@ -641,7 +641,6 @@ To add a new preference: <preference id="pref-keys-copySelectedItemCitationsToClipboard" name="extensions.zotero.keys.copySelectedItemCitationsToClipboard" type="string"/> <preference id="pref-keys-copySelectedItemsToClipboard" name="extensions.zotero.keys.copySelectedItemsToClipboard" type="string"/> <preference id="pref-keys-importFromClipboard" name="extensions.zotero.keys.importFromClipboard" type="string"/> - <preference id="pref-keys-overrideGlobal" name="extensions.zotero.keys.overrideGlobal" type="bool"/> </preferences> <grid> @@ -714,8 +713,6 @@ To add a new preference: </rows> </grid> - <checkbox label="&zotero.preferences.keys.overrideGlobal;" preference="pref-keys-overrideGlobal"/> - <label class="statusLine" value="&zotero.preferences.keys.changesTakeEffect;"/> <separator/> diff --git a/chrome/content/zotero/xpcom/connector/translator.js b/chrome/content/zotero/xpcom/connector/translator.js @@ -373,8 +373,7 @@ Zotero.Translators.CodeGetter.prototype.getCodeFor = function(i) { const TRANSLATOR_REQUIRED_PROPERTIES = ["translatorID", "translatorType", "label", "creator", "target", "priority", "lastUpdated"]; -var TRANSLATOR_PASSING_PROPERTIES = TRANSLATOR_REQUIRED_PROPERTIES.concat(["displayOptions", "configOptions", - "browserSupport", "code", "runMode"]); +var TRANSLATOR_PASSING_PROPERTIES = TRANSLATOR_REQUIRED_PROPERTIES.concat(["browserSupport", "code", "runMode"]); var TRANSLATOR_SAVE_PROPERTIES = TRANSLATOR_REQUIRED_PROPERTIES.concat(["browserSupport"]); /** * @class Represents an individual translator @@ -392,8 +391,11 @@ var TRANSLATOR_SAVE_PROPERTIES = TRANSLATOR_REQUIRED_PROPERTIES.concat(["browser * c = Google Chrome (WebKit & V8) * s = Safari (WebKit & Nitro/Squirrelfish Extreme) * i = Internet Explorer + * b = Bookmarklet + * v = Server * @property {Object} configOptions Configuration options for import/export * @property {Object} displayOptions Display options for export + * @property {Object} hiddenPrefs Hidden preferences configurable through about:config * @property {Boolean} inRepository Whether the translator may be found in the repository * @property {String} lastUpdated SQL-style date and time of translator's last update * @property {String} code The executable JavaScript for the translator @@ -426,9 +428,6 @@ Zotero.Translator.prototype.init = function(info) { this.runMode = Zotero.Translator.RUN_MODE_ZOTERO_STANDALONE; } - this._configOptions = info["configOptions"] ? info["configOptions"] : {}; - this._displayOptions = info["displayOptions"] ? info["displayOptions"] : {}; - if(this.translatorType & TRANSLATOR_TYPES["import"]) { // compile import regexp to match only file extension this.importRegexp = this.target ? new RegExp("\\."+this.target+"$", "i") : null; @@ -469,13 +468,6 @@ Zotero.Translator.prototype.getCode = function(callback) { ); } -Zotero.Translator.prototype.__defineGetter__("displayOptions", function() { - return Zotero.Utilities.deepCopy(this._displayOptions); -}); -Zotero.Translator.prototype.__defineGetter__("configOptions", function() { - return Zotero.Utilities.deepCopy(this._configOptions); -}); - /** * Log a translator-related error * @param {String} message The error message diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js @@ -1664,7 +1664,7 @@ Zotero.Schema = new function(){ metadata.browserSupport = browserSupport; } - for each(var attr in ["configOptions", "displayOptions"]) { + for each(var attr in ["configOptions", "displayOptions", "hiddenPrefs"]) { try { var tags = xmlnode.getElementsByTagName(attr); if(tags.length && tags[0].firstChild) { diff --git a/chrome/content/zotero/xpcom/server_connector.js b/chrome/content/zotero/xpcom/server_connector.js @@ -96,8 +96,7 @@ Zotero.Server.Connector.GetTranslators.prototype = { for each(var translator in translators) { let serializableTranslator = {}; for each(var key in ["translatorID", "translatorType", "label", "creator", "target", - "minVersion", "maxVersion", "configOptions", "displayOptions", "priority", - "browserSupport", "inRepository", "lastUpdated"]) { + "minVersion", "maxVersion", "priority", "browserSupport", "inRepository", "lastUpdated"]) { serializableTranslator[key] = translator[key]; } responseData.push(serializableTranslator); diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js @@ -159,6 +159,27 @@ Zotero.Translate.Sandbox = { }, /** + * Gets a hidden preference that can be defined by hiddenPrefs in translator header + * + * @param {Zotero.Translate} translate + * @param {String} pref Prefernce to be retrieved + */ + "getHiddenPref":function(translate, pref) { + if(typeof(pref) != "string") { + throw(new Error("getPref: preference must be a string")); + } + + var hp = translate._translatorInfo.hiddenPrefs || {}; + + var value; + try { + value = Zotero.Prefs.get('translators.' + pref); + } catch(e) {} + + return (value !== undefined ? value : hp[pref]); + }, + + /** * For loading other translators and accessing their methods * * @param {Zotero.Translate} translate @@ -733,6 +754,7 @@ Zotero.Translate.Base.prototype = { "init":function() { this._handlers = []; this._currentState = null; + this._translatorInfo = null; this.document = null; this.location = null; }, @@ -762,7 +784,6 @@ Zotero.Translate.Base.prototype = { } this.translator = null; - this._setDisplayOptions = null; if(typeof(translator) == "object") { // passed an object and not an ID if(translator.translatorID) { @@ -1357,6 +1378,7 @@ Zotero.Translate.Base.prototype = { this.complete(false, e); return; } + this._translatorInfo = this._sandboxManager.sandbox.ZOTERO_TRANSLATOR_INFO; if(callback) callback(); }, @@ -1827,7 +1849,7 @@ Zotero.Translate.Import.prototype._loadTranslator = function(translator, callbac * Prepare translator IO */ Zotero.Translate.Import.prototype._loadTranslatorPrepareIO = function(translator, callback) { - var configOptions = this._sandboxManager.sandbox.ZOTERO_TRANSLATOR_INFO.configOptions; + var configOptions = this._translatorInfo.configOptions; var dataMode = configOptions ? configOptions["dataMode"] : ""; var me = this; diff --git a/chrome/content/zotero/xpcom/translation/translator.js b/chrome/content/zotero/xpcom/translation/translator.js @@ -425,8 +425,11 @@ Zotero.Translators = new function() { * c = Google Chrome (WebKit & V8) * s = Safari (WebKit & Nitro/Squirrelfish Extreme) * i = Internet Explorer + * b = Bookmarklet + * v = Server * @property {Object} configOptions Configuration options for import/export * @property {Object} displayOptions Display options for export + * @property {Object} hiddenPrefs Hidden preferences configurable through about:config * @property {Boolean} inRepository Whether the translator may be found in the repository * @property {String} lastUpdated SQL-style date and time of translator's last update * @property {String} code The executable JavaScript for the translator @@ -490,6 +493,8 @@ Zotero.Translator = function(file, json, code) { this._configOptions = info["configOptions"] ? info["configOptions"] : {}; this._displayOptions = info["displayOptions"] ? info["displayOptions"] : {}; + this._hiddenPrefs = info["hiddenPrefs"] ? info["hiddenPrefs"] : {}; + this.browserSupport = info["browserSupport"] ? info["browserSupport"] : "g"; this.runMode = Zotero.Translator.RUN_MODE_IN_BROWSER; @@ -543,6 +548,9 @@ Zotero.Translator.prototype.__defineGetter__("displayOptions", function() { Zotero.Translator.prototype.__defineGetter__("configOptions", function() { return Zotero.Utilities.deepCopy(this._configOptions); }); +Zotero.Translator.prototype.__defineGetter__("hiddenPrefs", function() { + return Zotero.Utilities.deepCopy(this._hiddenPrefs); +}); /** * Log a translator-related error diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js @@ -2239,6 +2239,7 @@ Zotero.Keys = new function() { for each(var action in actions) { var action = action.substr(5); // strips 'keys.' if (action == 'overrideGlobal') { + Zotero.Prefs.clear('keys.overrideGlobal'); continue; } _keys[Zotero.Prefs.get('keys.' + action)] = action; @@ -2266,42 +2267,6 @@ Zotero.Keys = new function() { } } } - - if (Zotero.Prefs.get('keys.overrideGlobal')) { - var keys = document.getElementsByTagName('key'); - for each(var key in keys) { - try { - var id = key.getAttribute('id'); - } - // A couple keys are always invalid - catch (e) { - continue; - } - - if (id == 'key_openZotero') { - continue; - } - - var mods = key.getAttribute('modifiers').split(/[\,\s]/); - var second = useShift ? 'shift' : 'alt'; - // Key doesn't match a Zotero shortcut - if (mods.length != 2 || !((mods[0] == 'accel' && mods[1] == second) || - (mods[0] == second && mods[1] == 'accel'))) { - continue; - } - - if (_keys[key.getAttribute('key')] || key.getAttribute('key') == zKey) { - // Don't override Redo on Fx3 Mac, since Redo and Zotero can coexist - if (zKey == 'Z' && key.getAttribute('key') == 'Z' - && id == 'key_redo' && Zotero.isFx3 && Zotero.isMac) { - continue; - } - - Zotero.debug('Removing key ' + id + ' with accesskey ' + key.getAttribute('key')); - key.parentNode.removeChild(key); - } - } - } } diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopieer geselekteerde items na knipbord"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Probeer konflikterende snelsleutels oorheers"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Veranderinge vind net in nuwe vensters plaas"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/ar/zotero/preferences.dtd b/chrome/locale/ar/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "نسخ استشهادات العنصر المختار للحافظة"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "انسخ العناصر المحددة للحافظة"> <!ENTITY zotero.preferences.keys.importFromClipboard "الاستيراد من الحافظة"> -<!ENTITY zotero.preferences.keys.overrideGlobal "حاول تجنب الإختصارات المتعارضة"> <!ENTITY zotero.preferences.keys.changesTakeEffect "يتم تفعيل التغييرات في النوافذ الجديدة فقط"> <!ENTITY zotero.preferences.prefpane.proxies "الوكيل"> diff --git a/chrome/locale/bg-BG/zotero/preferences.dtd b/chrome/locale/bg-BG/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Копирани на цитати за избраните записите в клипборда"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Копиране на избраните записи в клипборда"> <!ENTITY zotero.preferences.keys.importFromClipboard "Внос от Клипборда"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Приоритет в случай на конфликт в клавишните комбинации."> <!ENTITY zotero.preferences.keys.changesTakeEffect "Промените ще се отразят само в новите прозорци"> <!ENTITY zotero.preferences.prefpane.proxies "Проксита"> diff --git a/chrome/locale/ca-AD/zotero/preferences.dtd b/chrome/locale/ca-AD/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copia les cites dels elements seleccionats al porta-retalls"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copia els elements seleccionats al porta-retalls"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importa des del porta-retalls"> -<!ENTITY zotero.preferences.keys.overrideGlobal "intenta corregir els conflictes n les dreceres de teclat"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Els canvis tenen efecte només en noves finestres"> <!ENTITY zotero.preferences.prefpane.proxies "Servidors intermediaris"> diff --git a/chrome/locale/cs-CZ/zotero/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopírovat citaci vybrané položky do schránky"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopírovat vybrané položky do schránky"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importovat ze schránky"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Pokusit se přepsat zabrané (např. jinými doplňky) klávesové zkratky"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Změny se projeví jen v nových oknech"> <!ENTITY zotero.preferences.prefpane.proxies "Proxy servery"> diff --git a/chrome/locale/da-DK/zotero/preferences.dtd b/chrome/locale/da-DK/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopier valgte henvisninger til udklipsholder"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopier valgte Elementer til udklipsholder"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importer fra udklipsholder"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Forsøg at løse overlappende genveje"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Ændringer vil kun træde i kraft i nyåbnede vinduer"> <!ENTITY zotero.preferences.prefpane.proxies "Proxyer"> diff --git a/chrome/locale/de/zotero/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Ausgewählte Eintragszitationen in die Zwischenablage kopieren"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Ausgewählte Einträge in die Zwischenablage kopieren"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import aus der Zwischenablage"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Versuche, konfligierende Tastenkombinationen zu überschreiben"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Änderungen werden nur in neuen Fenstern wirksam"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/el-GR/zotero/preferences.dtd b/chrome/locale/el-GR/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/es-ES/zotero/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiar las citas para los ítems seleccionados al portapapeles"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiar los ítems seleccionados al portapapeles"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importar desde el portapapeles"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Intentar suprimir los atajos de otras aplicaciones que coincidan"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Los cambios tendrán efecto sólo en las ventanas nuevas"> <!ENTITY zotero.preferences.prefpane.proxies "Servidores Proxies"> diff --git a/chrome/locale/et-EE/zotero/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopeerida valitud kirje tsiteeringud lõikepuhvrisse"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopeerida valitud kirjed lõikepuhvrisse"> <!ENTITY zotero.preferences.keys.importFromClipboard "Lõikepuhvrist importimine"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Võistlevate kiirvaliku klahvide korraldamine"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Muutused saavad nähtavaks alles uues aknas"> <!ENTITY zotero.preferences.prefpane.proxies "Proksid"> diff --git a/chrome/locale/eu-ES/zotero/preferences.dtd b/chrome/locale/eu-ES/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Hautatutako item aipamenak arbelera kopiatu"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Hautatutako itemak arbelera kopiatu"> <!ENTITY zotero.preferences.keys.importFromClipboard "Arbeletik inportatu"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Aldaketak burutzeko, leiho berri bat ireki."> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/fa/zotero/preferences.dtd b/chrome/locale/fa/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "رونوشت یادکرد آیتمهای انتخاب شده به حافظه موقت"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "رونوشت آیتمهای انتخاب شده به حافظه موقت"> <!ENTITY zotero.preferences.keys.importFromClipboard "درونبرد از حافظه موقت"> -<!ENTITY zotero.preferences.keys.overrideGlobal "تلاش برای لغو کلیدهای میانبر ناسازگار"> <!ENTITY zotero.preferences.keys.changesTakeEffect "تغییرات فقط در پنجرههای جدید اعمال میشوند"> <!ENTITY zotero.preferences.prefpane.proxies "پیشکارها"> diff --git a/chrome/locale/fi-FI/zotero/preferences.dtd b/chrome/locale/fi-FI/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopioi valittujen nimikkeiden sitaatit leikepöydälle"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopioi valitut nimikkeet leikepöydälle"> <!ENTITY zotero.preferences.keys.importFromClipboard "Tuo leikepöydältä"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Yritä ohittaa keskenään ristiriitaiset pikanäppäimet"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Muutokset tulevat voimaan vasta uusissa ikkunoissa"> <!ENTITY zotero.preferences.prefpane.proxies "Välityspalvelimet"> diff --git a/chrome/locale/fr-FR/zotero/preferences.dtd b/chrome/locale/fr-FR/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copier les citations du document sélectionné dans le presse-papiers"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copier les documents sélectionnés dans le presse-papiers"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importer du presse-papiers"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Essayer de gérer les conflits de raccourcis"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Les modifications ne prennent effet que dans les nouvelles fenêtres."> <!ENTITY zotero.preferences.prefpane.proxies "Serveurs mandataires"> diff --git a/chrome/locale/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiar as Citas do Elemento Seleccionado ao Portapapeis"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiar os Elementos Seleccionados ao Portapapeis"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importar do portapapeis"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Trate de anular os accesos directos en conflito"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Os cambios só terán efecto en novas fiestras"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/he-IL/zotero/preferences.dtd b/chrome/locale/he-IL/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/hr-HR/zotero/preferences.dtd b/chrome/locale/hr-HR/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kiválasztott hivatkozás másolása a vágólapra"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kiválasztott elemek másolása a vágólapra"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importálás a vágólapról"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Ellentmondó billentyűparancsok felülírása"> <!ENTITY zotero.preferences.keys.changesTakeEffect "A változások csak az új ablakokban érvényesülnek"> <!ENTITY zotero.preferences.prefpane.proxies "Proxyk"> diff --git a/chrome/locale/is-IS/zotero/preferences.dtd b/chrome/locale/is-IS/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/it-IT/zotero/preferences.dtd b/chrome/locale/it-IT/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copia l'elemento selezionato negli Appunti"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copia gli elementi selezionati negli Appunti"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importa dagli appunti"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Sovrascrivi le scorciatoie in conflitto"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Le modifiche avranno effetto nelle nuove finestre"> <!ENTITY zotero.preferences.prefpane.proxies "Proxy"> diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "選択されたアイテムの出典表記をクリップボードにコピー"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "選択されたアイテムの参考文献目録をクリップボードにコピー"> <!ENTITY zotero.preferences.keys.importFromClipboard "クリップボードからインポート"> -<!ENTITY zotero.preferences.keys.overrideGlobal "矛盾するショートカットを上書きする"> <!ENTITY zotero.preferences.keys.changesTakeEffect "変更を有効にするためには、新規画面を開いてください"> <!ENTITY zotero.preferences.prefpane.proxies "プロキシ"> diff --git a/chrome/locale/km/zotero/preferences.dtd b/chrome/locale/km/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "ចម្លងអាគតដ្ឋានឯកសារដែលបានជ្រើសរើសទៅកាន់កន្លែងរក្សាទុកឯកសារបណ្តោះអាសន្ន"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "ចម្លងឯកសារដែលបានជ្រើសរើសកន្លែងរក្សាទុកឯកសារបណ្តោះអាសន្ន"> <!ENTITY zotero.preferences.keys.importFromClipboard "ទាញឯកសារចេញពីកន្លែងរក្សាទុកឯកសារបណ្តោះអាសន្ន"> -<!ENTITY zotero.preferences.keys.overrideGlobal "ព្យាយាមជំនះផ្លូវកាត់ដែលមានការទង្គិច"> <!ENTITY zotero.preferences.keys.changesTakeEffect "បំលាស់ប្តូរអាចមានសុពលភាពនៅលើវីនដូយ៍ថ្មីតែប៉ុណ្ណោះ"> <!ENTITY zotero.preferences.prefpane.proxies "សិទ្ធិប្រទាន"> diff --git a/chrome/locale/ko-KR/zotero/preferences.dtd b/chrome/locale/ko-KR/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "선택된 항목 인용을 클립보드에 복사"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "선택된 항목을 클립보드에 복사"> <!ENTITY zotero.preferences.keys.importFromClipboard "클립보드에서 불러오기"> -<!ENTITY zotero.preferences.keys.overrideGlobal "충돌하는 단축키는 무시합니다."> <!ENTITY zotero.preferences.keys.changesTakeEffect "새 창에서만 변경한 효과가 나타납니다"> <!ENTITY zotero.preferences.prefpane.proxies "프록시"> diff --git a/chrome/locale/mn-MN/zotero/preferences.dtd b/chrome/locale/mn-MN/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copy Selected Item Citations to Clipboard"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copy Selected Items to Clipboard"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Try to override conflicting shortcuts"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect in new windows only"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/nb-NO/zotero/preferences.dtd b/chrome/locale/nb-NO/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopier de valgte element-henvisningene til utklippstavla."> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopier de valgte elementene til utklippstavla."> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Forsøk å overstyre snarveier i konflikt"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Endringer gjelder kun for nye vinduer"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/nl-NL/zotero/preferences.dtd b/chrome/locale/nl-NL/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Verwijzingen van geselecteerde objecten naar klembord kopiëren"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Geselecteerde objecten naar klembord kopiëren"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importeren vanaf klembord"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Probeer voorrang te krijgen bij conflicterende sneltoetsen"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Aanpassingen worden pas zichtbaar in nieuwe vensters"> <!ENTITY zotero.preferences.prefpane.proxies "Proxy's"> diff --git a/chrome/locale/nn-NO/zotero/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopier dei valde siteringane til utklipptavla."> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopier dei valde elementa til utklipptavla."> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Forsøk å overstyra snøggtastar i konflikt"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Endringar gjeld berre for nye vindauge"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/pl-PL/zotero/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopiuje wybrane odnośniki bibliograficzne do schowka"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopiuj zaznaczony element do schowka"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importuj ze schowka"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Spróbuj pominąć powtarzające się skróty"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Zmiany zostaną zastosowane w nowym oknie"> <!ENTITY zotero.preferences.prefpane.proxies "Serwery proxy"> diff --git a/chrome/locale/pt-BR/zotero/preferences.dtd b/chrome/locale/pt-BR/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiar citações de item selecionado para a área de transferência"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiar itens selecionados para a área de transferência"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importar da área de transferência"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Tentar sobrescrefer conflitos de teclas de atalho"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Mudanças tem efeito apenas em novas janelas"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/pt-PT/zotero/preferences.dtd b/chrome/locale/pt-PT/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiar Citações de Itens Seleccionadas"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiar Itens Seleccionados"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importar dos Recortes"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Tentar sobrepor atalhos em conflito"> <!ENTITY zotero.preferences.keys.changesTakeEffect "As alterações têm efeito apenas em novas janelas"> <!ENTITY zotero.preferences.prefpane.proxies "Cópias locais"> diff --git a/chrome/locale/ro-RO/zotero/preferences.dtd b/chrome/locale/ro-RO/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Copiază citările înregistrărilor selectate în memoria Clipboard"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Copiază înregistrările selectate în memoria Clipboard"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importă din memoria Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Încearcă să suprascrii scurtăturile care sunt în conflict"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Schimbările vor putea fi vizualizate doar într-o fereastră nouă"> <!ENTITY zotero.preferences.prefpane.proxies "Servere proxy"> diff --git a/chrome/locale/ru-RU/zotero/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Скопировать цитаты из выбранного документа в буфер обмена"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Копировать выбранные документы в буфер обмена"> <!ENTITY zotero.preferences.keys.importFromClipboard "Импортировать из буфера обмена"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Попытаться переопределить конфликтующие комбинации клавиш"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Изменения вступят в силу только в новых окнах"> <!ENTITY zotero.preferences.prefpane.proxies "Прокси"> diff --git a/chrome/locale/sk-SK/zotero/preferences.dtd b/chrome/locale/sk-SK/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopírovať vybrané citácie do schránky"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopírovať vybrané položky do schránky"> <!ENTITY zotero.preferences.keys.importFromClipboard "Importovať zo schránky"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Pokúsiť sa získať kontrolu v prípade konfliktu skratiek s inými rozšíreniami."> <!ENTITY zotero.preferences.keys.changesTakeEffect "Zmeny sa prejavia iba v novo otvorených oknách."> <!ENTITY zotero.preferences.prefpane.proxies "Proxy"> diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopiraj citate izbranega na odložišče"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopiraj izbrano na odložišče"> <!ENTITY zotero.preferences.keys.importFromClipboard "Uvozi iz odložišča"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Poskusi preglasiti sporne tipke za bližnjice"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Spremembe veljajo le v novih oknih"> <!ENTITY zotero.preferences.prefpane.proxies "Posredovalni strežniki"> diff --git a/chrome/locale/sr-RS/zotero/preferences.dtd b/chrome/locale/sr-RS/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Умножи изабрани предмет цитата у списак исечака"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Умножи изабране ставке у списак исечака"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Покушај да премостиш сукобљене пречице"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Промене су постављене само у новом прозору"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/sv-SE/zotero/preferences.dtd b/chrome/locale/sv-SE/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopiera valda källanteckningar till urklipp"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopiera valda källor till urklipp"> <!ENTITY zotero.preferences.keys.importFromClipboard "Klistra in från urklipp"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Försök kringgå motsägelsefulla genvägsknappar"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Ändringar gäller bara i nya fönster"> <!ENTITY zotero.preferences.prefpane.proxies "Proxyservrar"> diff --git a/chrome/locale/th-TH/zotero/preferences.dtd b/chrome/locale/th-TH/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "ทำสำเนารายการอ้างอิงที่เลือกไว้ไปยังคลิปบอร์ด"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "ทำสำเนารายการไปยังคลิปบอร์ด"> <!ENTITY zotero.preferences.keys.importFromClipboard "นำเข้าจากคลิปบอร์ด"> -<!ENTITY zotero.preferences.keys.overrideGlobal "พยายามครอบงำทางลัดที่ขัดแย้งกัน"> <!ENTITY zotero.preferences.keys.changesTakeEffect "การเปลี่ยนแปลงจะมีผลกับหน้าต่างใหม่เท่านั้น"> <!ENTITY zotero.preferences.prefpane.proxies "พร็อกซี่"> diff --git a/chrome/locale/tr-TR/zotero/preferences.dtd b/chrome/locale/tr-TR/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Seçili Eserin Göndermelerini Pano'ya Kopyala"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Seçilen eserleri panoya kopyala"> <!ENTITY zotero.preferences.keys.importFromClipboard "Panodan içeri aktar"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Çelişen kısayolların üzerine yazdırmayı dene"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Değişiklikler yeni açılan pencerelerde etkili olacaktır."> <!ENTITY zotero.preferences.prefpane.proxies "Vekil Sunucular"> diff --git a/chrome/locale/vi-VN/zotero/preferences.dtd b/chrome/locale/vi-VN/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Sao chép các trích dẫn vừa chọn vào clipboard"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Sao chép các biểu ghi vừa chọn vào clipboard"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "Thử ghi đè các phím gõ tắt có xung đột"> <!ENTITY zotero.preferences.keys.changesTakeEffect "Các thay đổi chỉ có hiệu lực trong các cửa sổ mới"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "复制选定条目引文"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "复制选定条目"> <!ENTITY zotero.preferences.keys.importFromClipboard "Import from Clipboard"> -<!ENTITY zotero.preferences.keys.overrideGlobal "尝试覆盖有冲突的快捷键"> <!ENTITY zotero.preferences.keys.changesTakeEffect "更改仅在新开的窗口中生效"> <!ENTITY zotero.preferences.prefpane.proxies "Proxies"> diff --git a/chrome/locale/zh-TW/zotero/preferences.dtd b/chrome/locale/zh-TW/zotero/preferences.dtd @@ -128,7 +128,6 @@ <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "複製選取項目的引用文獻到剪貼簿"> <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "複製選取項目到剪貼簿"> <!ENTITY zotero.preferences.keys.importFromClipboard "從剪貼簿匯入"> -<!ENTITY zotero.preferences.keys.overrideGlobal "嘗試蓋過相衝突的快速鍵"> <!ENTITY zotero.preferences.keys.changesTakeEffect "改變只會在新開的視窗中生效"> <!ENTITY zotero.preferences.prefpane.proxies "代理伺服器"> diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js @@ -60,7 +60,6 @@ pref("extensions.zotero.lastLongTagDelimiter", ";"); pref("extensions.zotero.tagCloud", false); // Keyboard shortcuts -pref("extensions.zotero.keys.overrideGlobal", false); pref("extensions.zotero.keys.openZotero", 'Z'); pref("extensions.zotero.keys.toggleFullscreen", 'F'); pref("extensions.zotero.keys.library", 'L');