From 5b34dce40f25d9e8d2852e38633c7614f90d1dcc Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 22 Jan 2013 18:38:00 -0500
Subject: [PATCH 1/3] Remove "Try to override conflicting shortcuts" pref

I probably should have removed this years ago in 292c357e when I made
the shortcut keys only work within the Zotero pane.
---
 .../zotero/preferences/preferences.xul        |  3 --
 chrome/content/zotero/xpcom/zotero.js         | 37 +------------------
 chrome/locale/af-ZA/zotero/preferences.dtd    |  1 -
 chrome/locale/ar/zotero/preferences.dtd       |  1 -
 chrome/locale/bg-BG/zotero/preferences.dtd    |  1 -
 chrome/locale/ca-AD/zotero/preferences.dtd    |  1 -
 chrome/locale/cs-CZ/zotero/preferences.dtd    |  1 -
 chrome/locale/da-DK/zotero/preferences.dtd    |  1 -
 chrome/locale/de/zotero/preferences.dtd       |  1 -
 chrome/locale/el-GR/zotero/preferences.dtd    |  1 -
 chrome/locale/es-ES/zotero/preferences.dtd    |  1 -
 chrome/locale/et-EE/zotero/preferences.dtd    |  1 -
 chrome/locale/eu-ES/zotero/preferences.dtd    |  1 -
 chrome/locale/fa/zotero/preferences.dtd       |  1 -
 chrome/locale/fi-FI/zotero/preferences.dtd    |  1 -
 chrome/locale/fr-FR/zotero/preferences.dtd    |  1 -
 chrome/locale/gl-ES/zotero/preferences.dtd    |  1 -
 chrome/locale/he-IL/zotero/preferences.dtd    |  1 -
 chrome/locale/hr-HR/zotero/preferences.dtd    |  1 -
 chrome/locale/hu-HU/zotero/preferences.dtd    |  1 -
 chrome/locale/is-IS/zotero/preferences.dtd    |  1 -
 chrome/locale/it-IT/zotero/preferences.dtd    |  1 -
 chrome/locale/ja-JP/zotero/preferences.dtd    |  1 -
 chrome/locale/km/zotero/preferences.dtd       |  1 -
 chrome/locale/ko-KR/zotero/preferences.dtd    |  1 -
 chrome/locale/mn-MN/zotero/preferences.dtd    |  1 -
 chrome/locale/nb-NO/zotero/preferences.dtd    |  1 -
 chrome/locale/nl-NL/zotero/preferences.dtd    |  1 -
 chrome/locale/nn-NO/zotero/preferences.dtd    |  1 -
 chrome/locale/pl-PL/zotero/preferences.dtd    |  1 -
 chrome/locale/pt-BR/zotero/preferences.dtd    |  1 -
 chrome/locale/pt-PT/zotero/preferences.dtd    |  1 -
 chrome/locale/ro-RO/zotero/preferences.dtd    |  1 -
 chrome/locale/ru-RU/zotero/preferences.dtd    |  1 -
 chrome/locale/sk-SK/zotero/preferences.dtd    |  1 -
 chrome/locale/sl-SI/zotero/preferences.dtd    |  1 -
 chrome/locale/sr-RS/zotero/preferences.dtd    |  1 -
 chrome/locale/sv-SE/zotero/preferences.dtd    |  1 -
 chrome/locale/th-TH/zotero/preferences.dtd    |  1 -
 chrome/locale/tr-TR/zotero/preferences.dtd    |  1 -
 chrome/locale/vi-VN/zotero/preferences.dtd    |  1 -
 chrome/locale/zh-CN/zotero/preferences.dtd    |  1 -
 chrome/locale/zh-TW/zotero/preferences.dtd    |  1 -
 defaults/preferences/zotero.js                |  1 -
 44 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index f6980daed5..74ae4daa21 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -622,7 +622,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>
@@ -695,8 +694,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/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index a8064121f4..dc8448da68 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -2159,6 +2159,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;
@@ -2186,42 +2187,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
index ad3368de8e..6d8480f812 100644
--- 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
index 5a0a723646..fa436631e3 100644
--- 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
index 724d560281..48c591470d 100644
--- 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
index d55f02e236..9c7ad4e125 100644
--- 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
index aa092501d9..d619237d8c 100644
--- 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
index 6ea832e7c7..646e33b272 100644
--- 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
index 47643b288d..cfe4d5f3a4 100644
--- 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
index c34d885121..c63e656036 100644
--- 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
index 31caf35b45..f60d54f99b 100644
--- 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
index a5f1083b43..8b0631d4d7 100644
--- 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
index 3aa4248079..575c65252b 100644
--- 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
index 7c2557e34d..08f691a3b0 100644
--- 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
index e4a2e87f15..70434b3436 100644
--- 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
index 3c34411a59..d048ee6861 100644
--- 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
index fe4ea0fb08..53571d8176 100644
--- 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
index 6d5945c0ae..28385bc015 100644
--- 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
index c34d885121..c63e656036 100644
--- 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
index b74a4af093..b92eb19b31 100644
--- 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
index ec742450fb..912e01cdb2 100644
--- 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
index d249668010..3edcded4ed 100644
--- 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&apos;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
index fb9a0196ba..27e68a44b0 100644
--- 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
index 43759a92d4..637eab1b6b 100644
--- 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
index 3e2f49ffa7..ca7ef28fc8 100644
--- 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
index 9623cefbc6..e96c6e5c03 100644
--- 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
index e3e3816fe6..3a6cd4ab6f 100644
--- 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
index 36764a0562..5ad190ae73 100644
--- 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
index d9de7aa67d..7aa9f818b5 100644
--- 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
index 38e2b0d646..f4ae6f82b8 100644
--- 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
index c39d06d90d..907c41dbce 100644
--- 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
index 655dbd62a4..c43bb1e911 100644
--- 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
index 1c1b1c2aef..c09d90ff87 100644
--- 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
index 72073f30c4..3412d6db36 100644
--- 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
index f0c52d8a8b..c21ec60480 100644
--- 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
index bf0418f962..be7031f6fa 100644
--- 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
index 88733c15d4..1fe71fe30c 100644
--- 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
index ecadc29734..1d2f8d70b1 100644
--- 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
index c983d1930e..0b0fe8a40d 100644
--- 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
index cca39b83a3..eed0b0db21 100644
--- 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
index 4cf21981ab..b648b4a28b 100644
--- 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
index a5985ebc5b..059bb94c25 100644
--- 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
index fa7431d969..9af13dbcd0 100644
--- 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
index f207afe363..49db94f143 100644
--- 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');

From 0c38ce03ac31f683da5fdb4689d2a9efdb85ba76 Mon Sep 17 00:00:00 2001
From: aurimasv <aurimas.dev@gmail.com>
Date: Mon, 21 Jan 2013 05:31:53 -0600
Subject: [PATCH 2/3] Allow translators to define translator-specific hidden
 preferences.

---
 .../zotero/xpcom/connector/translator.js      |  9 +++++++-
 chrome/content/zotero/xpcom/schema.js         |  2 +-
 .../content/zotero/xpcom/server_connector.js  |  2 +-
 .../zotero/xpcom/translation/translate.js     | 22 +++++++++++++++++++
 .../zotero/xpcom/translation/translator.js    |  8 +++++++
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/connector/translator.js b/chrome/content/zotero/xpcom/connector/translator.js
index 62adbf4476..16615dad75 100644
--- a/chrome/content/zotero/xpcom/connector/translator.js
+++ b/chrome/content/zotero/xpcom/connector/translator.js
@@ -367,7 +367,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"]);
+		"hiddenPrefs", "browserSupport", "code", "runMode"]);
 var TRANSLATOR_SAVE_PROPERTIES = TRANSLATOR_REQUIRED_PROPERTIES.concat(["browserSupport"]);
 /**
  * @class Represents an individual translator
@@ -385,8 +385,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 (requires server translation when using a bookmarklet)
  * @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
@@ -421,6 +424,7 @@ Zotero.Translator.prototype.init = function(info) {
 	
 	this._configOptions = info["configOptions"] ? info["configOptions"] : {};
 	this._displayOptions = info["displayOptions"] ? info["displayOptions"] : {};
+	this._hiddenPrefs = info["hiddenPrefs"] ? info["hiddenPrefs"] : {};
 	
 	if(this.translatorType & TRANSLATOR_TYPES["import"]) {
 		// compile import regexp to match only file extension
@@ -468,6 +472,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/schema.js b/chrome/content/zotero/xpcom/schema.js
index 86fb3b6888..61588470fb 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -1677,7 +1677,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
index 1938129658..cc77d31b7e 100755
--- a/chrome/content/zotero/xpcom/server_connector.js
+++ b/chrome/content/zotero/xpcom/server_connector.js
@@ -66,7 +66,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", 
+					"minVersion", "maxVersion", "configOptions", "displayOptions", "hiddenPrefs", "priority", 
 					"browserSupport", "inRepository", "lastUpdated"]) {
 				serializableTranslator[key] = translator[key];
 			}
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index 4f96bb4859..f26e3a1eb1 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -170,6 +170,27 @@ Zotero.Translate.Sandbox = {
 			return translate._displayOptions[option];
 		},
 		
+		/**
+		 * 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._hiddenPrefs || {};	//_hiddenPrefs should already be {} if undefined
+
+			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
 		 * 
@@ -1331,6 +1352,7 @@ Zotero.Translate.Base.prototype = {
 		this._runningAsyncProcesses = 0;
 		this._returnValue = undefined;
 		this._aborted = false;
+		this._hiddenPrefs = translator.hiddenPrefs;
 		this.saveQueue = [];
 		
 		Zotero.debug("Translate: Parsing code for "+translator.label, 4);
diff --git a/chrome/content/zotero/xpcom/translation/translator.js b/chrome/content/zotero/xpcom/translation/translator.js
index 5a4b7b43b3..cd7dc8f329 100644
--- 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 (requires server translation when using a bookmarklet)
  * @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

From 5465c885e5c673e74b4f5e208b6afef0df3fc4ae Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Fri, 25 Jan 2013 22:29:21 -0500
Subject: [PATCH 3/3] Tweaks to getHiddenPref()

- Remove references to configOptions, displayOptions, and hiddenPrefs
  from connector/translator.js. We can't rely on them to be set in
  Zotero.Translator since https://repo.zotero.org/repo/metadata doesn't
  provide them, but we shouldn't need them until we get the translator
  code anyway.
- Don't serve configOptions, displayOptions, and hiddenPrefs from Zotero
  Standalone server. There's no point in serving anything that
  https://repo.zotero.org/repo/metadata doesn't.
- Alias the translator metadata loaded into the sandbox as
  Zotero.Translate._translatorInfo. Use this to get configOptions and
  hiddenPrefs.
- "v" browserSupport indicates that a translator can be run through
  translation-server, not that translation-server is required.

This obviates the need for zotero/zotero-connectors#4.
---
 .../zotero/xpcom/connector/translator.js      | 19 ++-----------------
 .../content/zotero/xpcom/server_connector.js  |  3 +--
 .../zotero/xpcom/translation/translate.js     |  8 ++++----
 .../zotero/xpcom/translation/translator.js    |  2 +-
 translators                                   |  2 +-
 5 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/chrome/content/zotero/xpcom/connector/translator.js b/chrome/content/zotero/xpcom/connector/translator.js
index 16615dad75..ec4548e65b 100644
--- a/chrome/content/zotero/xpcom/connector/translator.js
+++ b/chrome/content/zotero/xpcom/connector/translator.js
@@ -366,8 +366,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",
-		"hiddenPrefs", "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
@@ -386,7 +385,7 @@ var TRANSLATOR_SAVE_PROPERTIES = TRANSLATOR_REQUIRED_PROPERTIES.concat(["browser
  *     s = Safari (WebKit & Nitro/Squirrelfish Extreme)
  *     i = Internet Explorer
  *     b = Bookmarklet
- *     v = Server (requires server translation when using a 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
@@ -422,10 +421,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"] : {};
-	this._hiddenPrefs = info["hiddenPrefs"] ? info["hiddenPrefs"] : {};
-	
 	if(this.translatorType & TRANSLATOR_TYPES["import"]) {
 		// compile import regexp to match only file extension
 		this.importRegexp = this.target ? new RegExp("\\."+this.target+"$", "i") : null;
@@ -466,16 +461,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);
-});
-Zotero.Translator.prototype.__defineGetter__("hiddenPrefs", function() {
-	return Zotero.Utilities.deepCopy(this._hiddenPrefs);
-});
-
 /**
  * Log a translator-related error
  * @param {String} message The error message
diff --git a/chrome/content/zotero/xpcom/server_connector.js b/chrome/content/zotero/xpcom/server_connector.js
index cc77d31b7e..1754eafd78 100755
--- a/chrome/content/zotero/xpcom/server_connector.js
+++ b/chrome/content/zotero/xpcom/server_connector.js
@@ -66,8 +66,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", "hiddenPrefs", "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
index f26e3a1eb1..12c883c37f 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -181,7 +181,7 @@ Zotero.Translate.Sandbox = {
 				throw(new Error("getPref: preference must be a string"));
 			}
 
-			var hp = translate._hiddenPrefs || {};	//_hiddenPrefs should already be {} if undefined
+			var hp = translate._translatorInfo.hiddenPrefs || {};
 
 			var value;
 			try {
@@ -757,6 +757,7 @@ Zotero.Translate.Base.prototype = {
 	"init":function() {
 		this._handlers = [];
 		this._currentState = null;
+		this._translatorInfo = null;
 		this.document = null;
 		this.location = null;
 	},
@@ -786,7 +787,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) {
@@ -1352,7 +1352,6 @@ Zotero.Translate.Base.prototype = {
 		this._runningAsyncProcesses = 0;
 		this._returnValue = undefined;
 		this._aborted = false;
-		this._hiddenPrefs = translator.hiddenPrefs;
 		this.saveQueue = [];
 		
 		Zotero.debug("Translate: Parsing code for "+translator.label, 4);
@@ -1366,6 +1365,7 @@ Zotero.Translate.Base.prototype = {
 			this.complete(false, e);
 			return;
 		}
+		this._translatorInfo = this._sandboxManager.sandbox.ZOTERO_TRANSLATOR_INFO;
 		
 		if(callback) callback();
 	},
@@ -1848,7 +1848,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
index cd7dc8f329..ea34152000 100644
--- a/chrome/content/zotero/xpcom/translation/translator.js
+++ b/chrome/content/zotero/xpcom/translation/translator.js
@@ -426,7 +426,7 @@ Zotero.Translators = new function() {
  *     s = Safari (WebKit & Nitro/Squirrelfish Extreme)
  *     i = Internet Explorer
  *     b = Bookmarklet
- *     v = Server (requires server translation when using a 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
diff --git a/translators b/translators
index 2c33d5d461..a14697a41d 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit 2c33d5d461cab0749702529e26686738e7a0b411
+Subproject commit a14697a41dcb6d51dc93cdafcdafe8a1cd1a2213