Skip to content

Commit

Permalink
Fix missing Options menu on Windows/Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
@dstillman
dstillman committed Jan 11, 2017
1 parent c631bc4 commit cbcfb6b
Show file tree
Hide file tree
Showing 48 changed files with 196 additions and 17 deletions.
9 changes: 4 additions & 5 deletions chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
View file
Expand Up @@ -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#"
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
View file
Expand Up @@ -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#"
Expand All @@ -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>
12 changes: 6 additions & 6 deletions chrome/content/zotero-platform/win/standalone/menuOverlay.xul
View file
Expand Up @@ -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#"
Expand All @@ -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>
4 changes: 4 additions & 0 deletions chrome/locale/af-ZA/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Opsies">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Voorkeure">
<!ENTITY preferencesCmdUnix.accesskey "k">
4 changes: 4 additions & 0 deletions chrome/locale/ar/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "خيارات">
<!ENTITY preferencesCmd2.accesskey "خ">
<!ENTITY preferencesCmdUnix.label "التفضيلات">
<!ENTITY preferencesCmdUnix.accesskey "ف">
4 changes: 4 additions & 0 deletions chrome/locale/bg-BG/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Настройки">
<!ENTITY preferencesCmd2.accesskey "Н">
<!ENTITY preferencesCmdUnix.label "Настройки">
<!ENTITY preferencesCmdUnix.accesskey "Н">
4 changes: 4 additions & 0 deletions chrome/locale/ca-AD/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Opcions">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferències">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/cs-CZ/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Možnosti">
<!ENTITY preferencesCmd2.accesskey "M">
<!ENTITY preferencesCmdUnix.label "Předvolby">
<!ENTITY preferencesCmdUnix.accesskey "v">
4 changes: 4 additions & 0 deletions chrome/locale/da-DK/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Indstillinger">
<!ENTITY preferencesCmd2.accesskey "I">
<!ENTITY preferencesCmdUnix.label "Indstillinger">
<!ENTITY preferencesCmdUnix.accesskey "I">
4 changes: 4 additions & 0 deletions chrome/locale/de/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Einstellungen">
<!ENTITY preferencesCmd2.accesskey "E">
<!ENTITY preferencesCmdUnix.label "Einstellungen">
<!ENTITY preferencesCmdUnix.accesskey "E">
4 changes: 4 additions & 0 deletions chrome/locale/el-GR/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Επιλογές">
<!ENTITY preferencesCmd2.accesskey "Ε">
<!ENTITY preferencesCmdUnix.label "Προτιμήσεις">
<!ENTITY preferencesCmdUnix.accesskey "μ">
4 changes: 4 additions & 0 deletions chrome/locale/en-US/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Options">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferences">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/es-ES/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Opciones">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferencias">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/et-EE/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Sätted">
<!ENTITY preferencesCmd2.accesskey "S">
<!ENTITY preferencesCmdUnix.label "Eelistused">
<!ENTITY preferencesCmdUnix.accesskey "E">
4 changes: 4 additions & 0 deletions chrome/locale/eu-ES/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Aukerak">
<!ENTITY preferencesCmd2.accesskey "A">
<!ENTITY preferencesCmdUnix.label "Hobespenak">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/fa/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "گزینه‌ها">
<!ENTITY preferencesCmd2.accesskey "گ">
<!ENTITY preferencesCmdUnix.label "ترجیحات">
<!ENTITY preferencesCmdUnix.accesskey "ح">
4 changes: 4 additions & 0 deletions chrome/locale/fi-FI/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Asetukset">
<!ENTITY preferencesCmd2.accesskey "A">
<!ENTITY preferencesCmdUnix.label "Asetukset">
<!ENTITY preferencesCmdUnix.accesskey "A">
4 changes: 4 additions & 0 deletions chrome/locale/fr-FR/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Options">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Préférences">
<!ENTITY preferencesCmdUnix.accesskey "f">
4 changes: 4 additions & 0 deletions chrome/locale/gl-ES/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Options">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferences">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/he-IL/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "אפשרויות">
<!ENTITY preferencesCmd2.accesskey "א">
<!ENTITY preferencesCmdUnix.label "העדפות">
<!ENTITY preferencesCmdUnix.accesskey "ד">
4 changes: 4 additions & 0 deletions chrome/locale/hr-HR/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Mogućnosti">
<!ENTITY preferencesCmd2.accesskey "M">
<!ENTITY preferencesCmdUnix.label "Postavke">
<!ENTITY preferencesCmdUnix.accesskey "P">
4 changes: 4 additions & 0 deletions chrome/locale/hu-HU/zotero/mozilla/browser.dtd
View file
@@ -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">
4 changes: 4 additions & 0 deletions chrome/locale/id-ID/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Pengaturan…">
<!ENTITY preferencesCmd2.accesskey "g">
<!ENTITY preferencesCmdUnix.label "Pengaturan">
<!ENTITY preferencesCmdUnix.accesskey "g">
4 changes: 4 additions & 0 deletions chrome/locale/is-IS/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Valkostir">
<!ENTITY preferencesCmd2.accesskey "V">
<!ENTITY preferencesCmdUnix.label "Valkostir">
<!ENTITY preferencesCmdUnix.accesskey "V">
4 changes: 4 additions & 0 deletions chrome/locale/it-IT/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Opzioni">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferenze">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/ja-JP/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "オプション">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "設定">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/km/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "ជម្រើស">
<!ENTITY preferencesCmd2.accesskey "ជ">
<!ENTITY preferencesCmdUnix.label "ចំណូលចិត្ត">
<!ENTITY preferencesCmdUnix.accesskey "ច">
4 changes: 4 additions & 0 deletions chrome/locale/ko-KR/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "설정…">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "환경 설정">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/lt-LT/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Nuostatos">
<!ENTITY preferencesCmd2.accesskey "N">
<!ENTITY preferencesCmdUnix.label "Nuostatos">
<!ENTITY preferencesCmdUnix.accesskey "N">
4 changes: 4 additions & 0 deletions chrome/locale/mn-MN/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Options">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferences">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/nb-NO/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Innstillinger">
<!ENTITY preferencesCmd2.accesskey "I">
<!ENTITY preferencesCmdUnix.label "Innstillinger">
<!ENTITY preferencesCmdUnix.accesskey "I">
4 changes: 4 additions & 0 deletions chrome/locale/nl-NL/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Opties">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Voorkeuren">
<!ENTITY preferencesCmdUnix.accesskey "V">
4 changes: 4 additions & 0 deletions chrome/locale/nn-NO/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Innstillingar">
<!ENTITY preferencesCmd2.accesskey "I">
<!ENTITY preferencesCmdUnix.label "Innstillingar">
<!ENTITY preferencesCmdUnix.accesskey "I">
4 changes: 4 additions & 0 deletions chrome/locale/pl-PL/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Opcje">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferencje">
<!ENTITY preferencesCmdUnix.accesskey "r">
4 changes: 4 additions & 0 deletions chrome/locale/pt-BR/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Opções">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferências">
<!ENTITY preferencesCmdUnix.accesskey "P">
4 changes: 4 additions & 0 deletions chrome/locale/pt-PT/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Opções">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferências">
<!ENTITY preferencesCmdUnix.accesskey "f">
4 changes: 4 additions & 0 deletions chrome/locale/ro-RO/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Options">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferences">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/ru-RU/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Настройки">
<!ENTITY preferencesCmd2.accesskey "Н">
<!ENTITY preferencesCmdUnix.label "Настройки">
<!ENTITY preferencesCmdUnix.accesskey "Н">
4 changes: 4 additions & 0 deletions chrome/locale/sk-SK/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Možnosti">
<!ENTITY preferencesCmd2.accesskey "M">
<!ENTITY preferencesCmdUnix.label "Možnosti">
<!ENTITY preferencesCmdUnix.accesskey "M">
4 changes: 4 additions & 0 deletions chrome/locale/sl-SI/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Možnosti">
<!ENTITY preferencesCmd2.accesskey "o">
<!ENTITY preferencesCmdUnix.label "Nastavitve">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/sr-RS/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Поставке">
<!ENTITY preferencesCmd2.accesskey "о">
<!ENTITY preferencesCmdUnix.label "Поставке">
<!ENTITY preferencesCmdUnix.accesskey "П">
4 changes: 4 additions & 0 deletions chrome/locale/sv-SE/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Inställningar">
<!ENTITY preferencesCmd2.accesskey "I">
<!ENTITY preferencesCmdUnix.label "Inställningar">
<!ENTITY preferencesCmdUnix.accesskey "I">
4 changes: 4 additions & 0 deletions chrome/locale/th-TH/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "ตัวเลือก">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "การตั้งค่า">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/tr-TR/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Seçenekler">
<!ENTITY preferencesCmd2.accesskey "S">
<!ENTITY preferencesCmdUnix.label "Tercihler">
<!ENTITY preferencesCmdUnix.accesskey "T">
4 changes: 4 additions & 0 deletions chrome/locale/uk-UA/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "Налаштування">
<!ENTITY preferencesCmd2.accesskey "Н">
<!ENTITY preferencesCmdUnix.label "Налаштування">
<!ENTITY preferencesCmdUnix.accesskey "Н">
4 changes: 4 additions & 0 deletions chrome/locale/vi-VN/zotero/mozilla/browser.dtd
View file
@@ -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">
4 changes: 4 additions & 0 deletions chrome/locale/zh-CN/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "选项">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "首选项">
<!ENTITY preferencesCmdUnix.accesskey "n">
4 changes: 4 additions & 0 deletions chrome/locale/zh-TW/zotero/mozilla/browser.dtd
View file
@@ -0,0 +1,4 @@
<!ENTITY preferencesCmd2.label "選項">
<!ENTITY preferencesCmd2.accesskey "O">
<!ENTITY preferencesCmdUnix.label "偏好設定">
<!ENTITY preferencesCmdUnix.accesskey "n">

0 comments on commit cbcfb6b

Please sign in to comment.