From cbcfb6b92ea6a435c9b601aafd8c66a5cb19b152 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 10 Jan 2017 21:26:39 -0500
Subject: [PATCH] Fix missing Options menu on Windows/Linux

---
 .../zotero-platform/mac/standalone/menuOverlay.xul   |  9 ++++-----
 .../zotero-platform/unix/standalone/menuOverlay.xul  | 12 ++++++------
 .../zotero-platform/win/standalone/menuOverlay.xul   | 12 ++++++------
 chrome/locale/af-ZA/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/ar/zotero/mozilla/browser.dtd          |  4 ++++
 chrome/locale/bg-BG/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/ca-AD/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/cs-CZ/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/da-DK/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/de/zotero/mozilla/browser.dtd          |  4 ++++
 chrome/locale/el-GR/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/en-US/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/es-ES/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/et-EE/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/eu-ES/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/fa/zotero/mozilla/browser.dtd          |  4 ++++
 chrome/locale/fi-FI/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/fr-FR/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/gl-ES/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/he-IL/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/hr-HR/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/hu-HU/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/id-ID/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/is-IS/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/it-IT/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/ja-JP/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/km/zotero/mozilla/browser.dtd          |  4 ++++
 chrome/locale/ko-KR/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/lt-LT/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/mn-MN/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/nb-NO/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/nl-NL/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/nn-NO/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/pl-PL/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/pt-BR/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/pt-PT/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/ro-RO/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/ru-RU/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/sk-SK/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/sl-SI/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/sr-RS/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/sv-SE/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/th-TH/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/tr-TR/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/uk-UA/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/vi-VN/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/zh-CN/zotero/mozilla/browser.dtd       |  4 ++++
 chrome/locale/zh-TW/zotero/mozilla/browser.dtd       |  4 ++++
 48 files changed, 196 insertions(+), 17 deletions(-)
 create mode 100644 chrome/locale/af-ZA/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/ar/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/bg-BG/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/ca-AD/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/cs-CZ/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/da-DK/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/de/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/el-GR/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/en-US/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/es-ES/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/et-EE/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/eu-ES/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/fa/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/fi-FI/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/fr-FR/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/gl-ES/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/he-IL/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/hr-HR/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/hu-HU/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/id-ID/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/is-IS/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/it-IT/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/ja-JP/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/km/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/ko-KR/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/lt-LT/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/mn-MN/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/nb-NO/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/nl-NL/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/nn-NO/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/pl-PL/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/pt-BR/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/pt-PT/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/ro-RO/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/ru-RU/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/sk-SK/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/sl-SI/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/sr-RS/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/sv-SE/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/th-TH/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/tr-TR/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/uk-UA/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/vi-VN/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/zh-CN/zotero/mozilla/browser.dtd
 create mode 100644 chrome/locale/zh-TW/zotero/mozilla/browser.dtd

diff --git a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
index fb58c842c9..82ee57980e 100644
--- a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
+++ b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
@@ -33,10 +33,9 @@
 
 
 <!DOCTYPE overlay [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" >
-%standaloneDTD;
+	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
+	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
+	<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
 ]>
 <overlay id="menuOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -84,7 +83,7 @@
         <menuitem id="menu_preferences"
 				label="&preferencesCmdMac.label;"
 				key="key_preferencesCmdMac"
-				oncommand="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').ZoteroPane.openPreferences();"/>
+				oncommand="Zotero.Utilities.Internal.openPreferences();"/>
         <menuitem id="menu_mac_services"
 				label="&servicesMenuMac.label;"/>
         <menuitem id="menu_mac_hide_app"
diff --git a/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul b/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
index a28575406d..0e4b1ed670 100644
--- a/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
+++ b/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
@@ -33,10 +33,9 @@
 
 
 <!DOCTYPE overlay [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" >
-%standaloneDTD;
+	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
+	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
+	<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
 ]>
 <overlay id="menuOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -51,7 +50,8 @@
     <menupopup id="menu_EditPopup">
 		<menuseparator/>
         <menuitem id="menu_preferences"
-				label="&preferencesCmd.label;"
-				oncommand="ZoteroPane.openPreferences();"/>
+				label="&preferencesCmdUnix.label;"
+				accesskey="&preferencesCmdUnix.accesskey;"
+				oncommand="Zotero.Utilities.Internal.openPreferences();"/>
     </menupopup>
 </overlay>
diff --git a/chrome/content/zotero-platform/win/standalone/menuOverlay.xul b/chrome/content/zotero-platform/win/standalone/menuOverlay.xul
index aeb83878f7..615f4ce5d6 100644
--- a/chrome/content/zotero-platform/win/standalone/menuOverlay.xul
+++ b/chrome/content/zotero-platform/win/standalone/menuOverlay.xul
@@ -33,10 +33,9 @@
 
 
 <!DOCTYPE overlay [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" >
-%standaloneDTD;
+	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
+	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
+	<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
 ]>
 <overlay id="menuOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -51,7 +50,8 @@
     <menupopup id="menu_ToolsPopup">
 		<menuseparator/>
         <menuitem id="menu_preferences"
-				label="&preferencesCmd.label;"
-				oncommand="ZoteroPane.openPreferences();"/>
+				label="&preferencesCmd2.label;"
+				accesskey="&preferencesCmd2.accesskey;"
+				oncommand="Zotero.Utilities.Internal.openPreferences();"/>
     </menupopup>
 </overlay>
diff --git a/chrome/locale/af-ZA/zotero/mozilla/browser.dtd b/chrome/locale/af-ZA/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..1e9824831f
--- /dev/null
+++ b/chrome/locale/af-ZA/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Opsies">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "Voorkeure">
+<!ENTITY preferencesCmdUnix.accesskey     "k"> 
diff --git a/chrome/locale/ar/zotero/mozilla/browser.dtd b/chrome/locale/ar/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..374dd8c1bf
--- /dev/null
+++ b/chrome/locale/ar/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "خيارات">
+<!ENTITY preferencesCmd2.accesskey     "خ">
+<!ENTITY preferencesCmdUnix.label       "التفضيلات">
+<!ENTITY preferencesCmdUnix.accesskey     "ف"> 
diff --git a/chrome/locale/bg-BG/zotero/mozilla/browser.dtd b/chrome/locale/bg-BG/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..aa86701cea
--- /dev/null
+++ b/chrome/locale/bg-BG/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Настройки">
+<!ENTITY preferencesCmd2.accesskey     "Н">
+<!ENTITY preferencesCmdUnix.label       "Настройки">
+<!ENTITY preferencesCmdUnix.accesskey     "Н"> 
diff --git a/chrome/locale/ca-AD/zotero/mozilla/browser.dtd b/chrome/locale/ca-AD/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..4fead9cb26
--- /dev/null
+++ b/chrome/locale/ca-AD/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Opcions">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "Preferències">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/cs-CZ/zotero/mozilla/browser.dtd b/chrome/locale/cs-CZ/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..9017e0e461
--- /dev/null
+++ b/chrome/locale/cs-CZ/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Možnosti">
+<!ENTITY preferencesCmd2.accesskey     "M">
+<!ENTITY preferencesCmdUnix.label       "Předvolby">
+<!ENTITY preferencesCmdUnix.accesskey     "v"> 
diff --git a/chrome/locale/da-DK/zotero/mozilla/browser.dtd b/chrome/locale/da-DK/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..045c6539f3
--- /dev/null
+++ b/chrome/locale/da-DK/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Indstillinger">
+<!ENTITY preferencesCmd2.accesskey     "I">
+<!ENTITY preferencesCmdUnix.label       "Indstillinger">
+<!ENTITY preferencesCmdUnix.accesskey     "I">
diff --git a/chrome/locale/de/zotero/mozilla/browser.dtd b/chrome/locale/de/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..4dcfa52ef1
--- /dev/null
+++ b/chrome/locale/de/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Einstellungen">
+<!ENTITY preferencesCmd2.accesskey     "E"> 
+<!ENTITY preferencesCmdUnix.label       "Einstellungen">
+<!ENTITY preferencesCmdUnix.accesskey     "E"> 
diff --git a/chrome/locale/el-GR/zotero/mozilla/browser.dtd b/chrome/locale/el-GR/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..5a5f62bc06
--- /dev/null
+++ b/chrome/locale/el-GR/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Επιλογές">
+<!ENTITY preferencesCmd2.accesskey     "Ε">
+<!ENTITY preferencesCmdUnix.label       "Προτιμήσεις">
+<!ENTITY preferencesCmdUnix.accesskey     "μ"> 
diff --git a/chrome/locale/en-US/zotero/mozilla/browser.dtd b/chrome/locale/en-US/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..2a9218ae2f
--- /dev/null
+++ b/chrome/locale/en-US/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Options">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "Preferences">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/es-ES/zotero/mozilla/browser.dtd b/chrome/locale/es-ES/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..a407967d0a
--- /dev/null
+++ b/chrome/locale/es-ES/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label "Opciones">
+<!ENTITY preferencesCmd2.accesskey "O">
+<!ENTITY preferencesCmdUnix.label "Preferencias">
+<!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/et-EE/zotero/mozilla/browser.dtd b/chrome/locale/et-EE/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..94edfcf39f
--- /dev/null
+++ b/chrome/locale/et-EE/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label                   "Sätted">
+<!ENTITY preferencesCmd2.accesskey               "S">
+<!ENTITY preferencesCmdUnix.label                "Eelistused">
+<!ENTITY preferencesCmdUnix.accesskey            "E">
diff --git a/chrome/locale/eu-ES/zotero/mozilla/browser.dtd b/chrome/locale/eu-ES/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..5fbb7615eb
--- /dev/null
+++ b/chrome/locale/eu-ES/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Aukerak">
+<!ENTITY preferencesCmd2.accesskey     "A">
+<!ENTITY preferencesCmdUnix.label       "Hobespenak">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/fa/zotero/mozilla/browser.dtd b/chrome/locale/fa/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..b9cbfeabe6
--- /dev/null
+++ b/chrome/locale/fa/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "گزینه‌ها">
+<!ENTITY preferencesCmd2.accesskey     "گ">
+<!ENTITY preferencesCmdUnix.label       "ترجیحات">
+<!ENTITY preferencesCmdUnix.accesskey     "ح"> 
diff --git a/chrome/locale/fi-FI/zotero/mozilla/browser.dtd b/chrome/locale/fi-FI/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..16f37c6d2b
--- /dev/null
+++ b/chrome/locale/fi-FI/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Asetukset">
+<!ENTITY preferencesCmd2.accesskey     "A">
+<!ENTITY preferencesCmdUnix.label       "Asetukset">
+<!ENTITY preferencesCmdUnix.accesskey     "A"> 
diff --git a/chrome/locale/fr-FR/zotero/mozilla/browser.dtd b/chrome/locale/fr-FR/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..da35f876b4
--- /dev/null
+++ b/chrome/locale/fr-FR/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Options">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "Préférences">
+<!ENTITY preferencesCmdUnix.accesskey     "f">
diff --git a/chrome/locale/gl-ES/zotero/mozilla/browser.dtd b/chrome/locale/gl-ES/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..2a9218ae2f
--- /dev/null
+++ b/chrome/locale/gl-ES/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Options">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "Preferences">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/he-IL/zotero/mozilla/browser.dtd b/chrome/locale/he-IL/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..b18717b64e
--- /dev/null
+++ b/chrome/locale/he-IL/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "אפשרויות">
+<!ENTITY preferencesCmd2.accesskey     "א">
+<!ENTITY preferencesCmdUnix.label       "העדפות">
+<!ENTITY preferencesCmdUnix.accesskey     "ד"> 
diff --git a/chrome/locale/hr-HR/zotero/mozilla/browser.dtd b/chrome/locale/hr-HR/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..6d7aa3a94b
--- /dev/null
+++ b/chrome/locale/hr-HR/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Mogućnosti">
+<!ENTITY preferencesCmd2.accesskey     "M">
+<!ENTITY preferencesCmdUnix.label       "Postavke">
+<!ENTITY preferencesCmdUnix.accesskey     "P"> 
diff --git a/chrome/locale/hu-HU/zotero/mozilla/browser.dtd b/chrome/locale/hu-HU/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..232a4d3367
--- /dev/null
+++ b/chrome/locale/hu-HU/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Beállítások">
+<!ENTITY preferencesCmd2.accesskey     "e">
+<!ENTITY preferencesCmdUnix.label       "Beállítások">
+<!ENTITY preferencesCmdUnix.accesskey     "e"> 
diff --git a/chrome/locale/id-ID/zotero/mozilla/browser.dtd b/chrome/locale/id-ID/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..d2604afff7
--- /dev/null
+++ b/chrome/locale/id-ID/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Pengaturan…">
+<!ENTITY preferencesCmd2.accesskey     "g">
+<!ENTITY preferencesCmdUnix.label       "Pengaturan">
+<!ENTITY preferencesCmdUnix.accesskey     "g"> 
diff --git a/chrome/locale/is-IS/zotero/mozilla/browser.dtd b/chrome/locale/is-IS/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..0775d38f3c
--- /dev/null
+++ b/chrome/locale/is-IS/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Valkostir">
+<!ENTITY preferencesCmd2.accesskey     "V">
+<!ENTITY preferencesCmdUnix.label       "Valkostir">
+<!ENTITY preferencesCmdUnix.accesskey     "V"> 
diff --git a/chrome/locale/it-IT/zotero/mozilla/browser.dtd b/chrome/locale/it-IT/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..c300334a9d
--- /dev/null
+++ b/chrome/locale/it-IT/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label "Opzioni">
+<!ENTITY preferencesCmd2.accesskey "O">
+<!ENTITY preferencesCmdUnix.label "Preferenze">
+<!ENTITY preferencesCmdUnix.accesskey "n">
diff --git a/chrome/locale/ja-JP/zotero/mozilla/browser.dtd b/chrome/locale/ja-JP/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..89b746793a
--- /dev/null
+++ b/chrome/locale/ja-JP/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label		"オプション">
+<!ENTITY preferencesCmd2.accesskey	"O">
+<!ENTITY preferencesCmdUnix.label	"設定">
+<!ENTITY preferencesCmdUnix.accesskey	"n">
diff --git a/chrome/locale/km/zotero/mozilla/browser.dtd b/chrome/locale/km/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..eb268396ce
--- /dev/null
+++ b/chrome/locale/km/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "ជម្រើស">
+<!ENTITY preferencesCmd2.accesskey     "ជ">
+<!ENTITY preferencesCmdUnix.label       "ចំណូលចិត្ត">
+<!ENTITY preferencesCmdUnix.accesskey     "ច"> 
diff --git a/chrome/locale/ko-KR/zotero/mozilla/browser.dtd b/chrome/locale/ko-KR/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..a7d85cac6f
--- /dev/null
+++ b/chrome/locale/ko-KR/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "설정…">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "환경 설정">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/lt-LT/zotero/mozilla/browser.dtd b/chrome/locale/lt-LT/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..990cd74dd7
--- /dev/null
+++ b/chrome/locale/lt-LT/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Nuostatos">
+<!ENTITY preferencesCmd2.accesskey     "N">
+<!ENTITY preferencesCmdUnix.label       "Nuostatos">
+<!ENTITY preferencesCmdUnix.accesskey     "N"> 
diff --git a/chrome/locale/mn-MN/zotero/mozilla/browser.dtd b/chrome/locale/mn-MN/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..2a9218ae2f
--- /dev/null
+++ b/chrome/locale/mn-MN/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Options">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "Preferences">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/nb-NO/zotero/mozilla/browser.dtd b/chrome/locale/nb-NO/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..a5f36dc47c
--- /dev/null
+++ b/chrome/locale/nb-NO/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Innstillinger">
+<!ENTITY preferencesCmd2.accesskey     "I">
+<!ENTITY preferencesCmdUnix.label       "Innstillinger">
+<!ENTITY preferencesCmdUnix.accesskey     "I"> 
diff --git a/chrome/locale/nl-NL/zotero/mozilla/browser.dtd b/chrome/locale/nl-NL/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..3af68eeba3
--- /dev/null
+++ b/chrome/locale/nl-NL/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Opties">
+<!ENTITY preferencesCmd2.accesskey     "O"> 
+<!ENTITY preferencesCmdUnix.label       "Voorkeuren">
+<!ENTITY preferencesCmdUnix.accesskey     "V">
diff --git a/chrome/locale/nn-NO/zotero/mozilla/browser.dtd b/chrome/locale/nn-NO/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..b20469d820
--- /dev/null
+++ b/chrome/locale/nn-NO/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Innstillingar">
+<!ENTITY preferencesCmd2.accesskey     "I">
+<!ENTITY preferencesCmdUnix.label       "Innstillingar">
+<!ENTITY preferencesCmdUnix.accesskey     "I"> 
diff --git a/chrome/locale/pl-PL/zotero/mozilla/browser.dtd b/chrome/locale/pl-PL/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..68ce3af998
--- /dev/null
+++ b/chrome/locale/pl-PL/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label "Opcje">
+<!ENTITY preferencesCmd2.accesskey "O">
+<!ENTITY preferencesCmdUnix.label       "Preferencje">
+<!ENTITY preferencesCmdUnix.accesskey   "r">
diff --git a/chrome/locale/pt-BR/zotero/mozilla/browser.dtd b/chrome/locale/pt-BR/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..e0c9885618
--- /dev/null
+++ b/chrome/locale/pt-BR/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Opções">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "Preferências">
+<!ENTITY preferencesCmdUnix.accesskey     "P"> 
diff --git a/chrome/locale/pt-PT/zotero/mozilla/browser.dtd b/chrome/locale/pt-PT/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..75a5ace1fc
--- /dev/null
+++ b/chrome/locale/pt-PT/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Opções">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "Preferências">
+<!ENTITY preferencesCmdUnix.accesskey     "f"> 
diff --git a/chrome/locale/ro-RO/zotero/mozilla/browser.dtd b/chrome/locale/ro-RO/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..2a9218ae2f
--- /dev/null
+++ b/chrome/locale/ro-RO/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Options">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "Preferences">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/ru-RU/zotero/mozilla/browser.dtd b/chrome/locale/ru-RU/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..68f704df72
--- /dev/null
+++ b/chrome/locale/ru-RU/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label "Настройки">
+<!ENTITY preferencesCmd2.accesskey "Н">
+<!ENTITY preferencesCmdUnix.label "Настройки">
+<!ENTITY preferencesCmdUnix.accesskey "Н">
diff --git a/chrome/locale/sk-SK/zotero/mozilla/browser.dtd b/chrome/locale/sk-SK/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..3d778a9fcc
--- /dev/null
+++ b/chrome/locale/sk-SK/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Možnosti">
+<!ENTITY preferencesCmd2.accesskey     "M">
+<!ENTITY preferencesCmdUnix.label       "Možnosti">
+<!ENTITY preferencesCmdUnix.accesskey     "M"> 
diff --git a/chrome/locale/sl-SI/zotero/mozilla/browser.dtd b/chrome/locale/sl-SI/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..ed20193a82
--- /dev/null
+++ b/chrome/locale/sl-SI/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Možnosti">
+<!ENTITY preferencesCmd2.accesskey     "o">
+<!ENTITY preferencesCmdUnix.label       "Nastavitve">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/sr-RS/zotero/mozilla/browser.dtd b/chrome/locale/sr-RS/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..e95c48343e
--- /dev/null
+++ b/chrome/locale/sr-RS/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Поставке">
+<!ENTITY preferencesCmd2.accesskey     "о">
+<!ENTITY preferencesCmdUnix.label       "Поставке">
+<!ENTITY preferencesCmdUnix.accesskey     "П"> 
diff --git a/chrome/locale/sv-SE/zotero/mozilla/browser.dtd b/chrome/locale/sv-SE/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..8db36f06d0
--- /dev/null
+++ b/chrome/locale/sv-SE/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Inställningar">
+<!ENTITY preferencesCmd2.accesskey     "I">
+<!ENTITY preferencesCmdUnix.label       "Inställningar">
+<!ENTITY preferencesCmdUnix.accesskey     "I"> 
diff --git a/chrome/locale/th-TH/zotero/mozilla/browser.dtd b/chrome/locale/th-TH/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..f8ab6e8d9c
--- /dev/null
+++ b/chrome/locale/th-TH/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "ตัวเลือก">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "การตั้งค่า">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/tr-TR/zotero/mozilla/browser.dtd b/chrome/locale/tr-TR/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..5a972624df
--- /dev/null
+++ b/chrome/locale/tr-TR/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Seçenekler">
+<!ENTITY preferencesCmd2.accesskey     "S">
+<!ENTITY preferencesCmdUnix.label       "Tercihler">
+<!ENTITY preferencesCmdUnix.accesskey     "T"> 
diff --git a/chrome/locale/uk-UA/zotero/mozilla/browser.dtd b/chrome/locale/uk-UA/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..d2fd70b91e
--- /dev/null
+++ b/chrome/locale/uk-UA/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Налаштування">
+<!ENTITY preferencesCmd2.accesskey     "Н">
+<!ENTITY preferencesCmdUnix.label       "Налаштування">
+<!ENTITY preferencesCmdUnix.accesskey     "Н"> 
diff --git a/chrome/locale/vi-VN/zotero/mozilla/browser.dtd b/chrome/locale/vi-VN/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..8c0e6b8b63
--- /dev/null
+++ b/chrome/locale/vi-VN/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "Tùy chỉnh">
+<!ENTITY preferencesCmd2.accesskey     "y">
+<!ENTITY preferencesCmdUnix.label       "Tùy chỉnh">
+<!ENTITY preferencesCmdUnix.accesskey     "y"> 
diff --git a/chrome/locale/zh-CN/zotero/mozilla/browser.dtd b/chrome/locale/zh-CN/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..79eb842408
--- /dev/null
+++ b/chrome/locale/zh-CN/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "选项">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "首选项">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 
diff --git a/chrome/locale/zh-TW/zotero/mozilla/browser.dtd b/chrome/locale/zh-TW/zotero/mozilla/browser.dtd
new file mode 100644
index 0000000000..3b37c19d05
--- /dev/null
+++ b/chrome/locale/zh-TW/zotero/mozilla/browser.dtd
@@ -0,0 +1,4 @@
+<!ENTITY preferencesCmd2.label       "選項">
+<!ENTITY preferencesCmd2.accesskey     "O">
+<!ENTITY preferencesCmdUnix.label       "偏好設定">
+<!ENTITY preferencesCmdUnix.accesskey     "n">