From 9fbdc77cac8cf82ed0de435b90ff9625a2d336b4 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 7 Jan 2017 05:32:47 -0500
Subject: [PATCH] Update Edit menu strings in non-English locales

Remove localizations in standalone.dtd and replace with editMenuOverlay.dtd
files from the Mozilla language packs

Also remove some other unused strings
---
 .../af-ZA/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/af-ZA/zotero/preferences.dtd    |  4 --
 chrome/locale/af-ZA/zotero/standalone.dtd     | 31 +------------
 chrome/locale/af-ZA/zotero/zotero.dtd         |  1 -
 .../ar/zotero/mozilla/editMenuOverlay.dtd     | 35 +++++++++++++++
 chrome/locale/ar/zotero/preferences.dtd       |  4 --
 chrome/locale/ar/zotero/standalone.dtd        | 31 +------------
 chrome/locale/ar/zotero/zotero.dtd            |  1 -
 .../bg-BG/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/bg-BG/zotero/preferences.dtd    |  4 --
 chrome/locale/bg-BG/zotero/standalone.dtd     | 31 +------------
 chrome/locale/bg-BG/zotero/zotero.dtd         |  1 -
 .../ca-AD/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/ca-AD/zotero/preferences.dtd    |  4 --
 chrome/locale/ca-AD/zotero/standalone.dtd     | 31 +------------
 chrome/locale/ca-AD/zotero/zotero.dtd         |  1 -
 .../cs-CZ/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/cs-CZ/zotero/preferences.dtd    |  4 --
 chrome/locale/cs-CZ/zotero/standalone.dtd     | 31 +------------
 chrome/locale/cs-CZ/zotero/zotero.dtd         |  1 -
 .../da-DK/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/da-DK/zotero/preferences.dtd    |  4 --
 chrome/locale/da-DK/zotero/standalone.dtd     | 31 +------------
 chrome/locale/da-DK/zotero/zotero.dtd         |  1 -
 .../de/zotero/mozilla/editMenuOverlay.dtd     | 31 +++++++++++++
 chrome/locale/de/zotero/preferences.dtd       |  4 --
 chrome/locale/de/zotero/standalone.dtd        | 31 +------------
 chrome/locale/de/zotero/zotero.dtd            |  1 -
 .../el-GR/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/el-GR/zotero/preferences.dtd    |  4 --
 chrome/locale/el-GR/zotero/standalone.dtd     | 31 +------------
 chrome/locale/el-GR/zotero/zotero.dtd         |  1 -
 .../es-ES/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/es-ES/zotero/preferences.dtd    |  4 --
 chrome/locale/es-ES/zotero/standalone.dtd     | 31 +------------
 chrome/locale/es-ES/zotero/zotero.dtd         |  1 -
 .../et-EE/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/et-EE/zotero/preferences.dtd    |  4 --
 chrome/locale/et-EE/zotero/standalone.dtd     | 31 +------------
 chrome/locale/et-EE/zotero/zotero.dtd         |  1 -
 .../eu-ES/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/eu-ES/zotero/preferences.dtd    |  4 --
 chrome/locale/eu-ES/zotero/standalone.dtd     | 31 +------------
 chrome/locale/eu-ES/zotero/zotero.dtd         |  1 -
 .../fa/zotero/mozilla/editMenuOverlay.dtd     | 35 +++++++++++++++
 chrome/locale/fa/zotero/preferences.dtd       |  4 --
 chrome/locale/fa/zotero/standalone.dtd        | 31 +------------
 chrome/locale/fa/zotero/zotero.dtd            |  1 -
 .../fi-FI/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/fi-FI/zotero/preferences.dtd    |  4 --
 chrome/locale/fi-FI/zotero/standalone.dtd     | 31 +------------
 chrome/locale/fi-FI/zotero/zotero.dtd         |  1 -
 .../fr-FR/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/fr-FR/zotero/standalone.dtd     | 31 +------------
 .../gl-ES/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/gl-ES/zotero/preferences.dtd    |  4 --
 chrome/locale/gl-ES/zotero/standalone.dtd     | 31 +------------
 chrome/locale/gl-ES/zotero/zotero.dtd         |  1 -
 .../he-IL/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/he-IL/zotero/preferences.dtd    |  4 --
 chrome/locale/he-IL/zotero/standalone.dtd     | 31 +------------
 chrome/locale/he-IL/zotero/zotero.dtd         |  1 -
 .../hr-HR/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/hr-HR/zotero/preferences.dtd    |  4 --
 chrome/locale/hr-HR/zotero/standalone.dtd     | 31 +------------
 chrome/locale/hr-HR/zotero/zotero.dtd         |  1 -
 .../hu-HU/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/hu-HU/zotero/preferences.dtd    |  4 --
 chrome/locale/hu-HU/zotero/standalone.dtd     | 31 +------------
 chrome/locale/hu-HU/zotero/zotero.dtd         |  1 -
 .../id-ID/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/id-ID/zotero/preferences.dtd    |  4 --
 chrome/locale/id-ID/zotero/standalone.dtd     | 31 +------------
 chrome/locale/id-ID/zotero/zotero.dtd         |  1 -
 .../is-IS/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/is-IS/zotero/preferences.dtd    |  4 --
 chrome/locale/is-IS/zotero/standalone.dtd     | 31 +------------
 chrome/locale/is-IS/zotero/zotero.dtd         |  1 -
 .../it-IT/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/it-IT/zotero/preferences.dtd    |  4 --
 chrome/locale/it-IT/zotero/standalone.dtd     | 31 +------------
 chrome/locale/it-IT/zotero/zotero.dtd         |  1 -
 .../ja-JP/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/ja-JP/zotero/preferences.dtd    |  4 --
 chrome/locale/ja-JP/zotero/standalone.dtd     | 31 +------------
 chrome/locale/ja-JP/zotero/zotero.dtd         |  1 -
 .../km/zotero/mozilla/editMenuOverlay.dtd     | 35 +++++++++++++++
 chrome/locale/km/zotero/preferences.dtd       |  4 --
 chrome/locale/km/zotero/standalone.dtd        | 31 +------------
 chrome/locale/km/zotero/zotero.dtd            |  1 -
 .../ko-KR/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/ko-KR/zotero/preferences.dtd    |  4 --
 chrome/locale/ko-KR/zotero/standalone.dtd     | 31 +------------
 chrome/locale/ko-KR/zotero/zotero.dtd         |  1 -
 .../lt-LT/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/lt-LT/zotero/preferences.dtd    |  4 --
 chrome/locale/lt-LT/zotero/standalone.dtd     | 31 +------------
 chrome/locale/lt-LT/zotero/zotero.dtd         |  1 -
 .../mn-MN/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/mn-MN/zotero/preferences.dtd    |  4 --
 chrome/locale/mn-MN/zotero/standalone.dtd     | 31 +------------
 chrome/locale/mn-MN/zotero/zotero.dtd         |  1 -
 .../nb-NO/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/nb-NO/zotero/preferences.dtd    |  4 --
 chrome/locale/nb-NO/zotero/standalone.dtd     | 31 +------------
 chrome/locale/nb-NO/zotero/zotero.dtd         |  1 -
 .../nl-NL/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/nl-NL/zotero/preferences.dtd    |  4 --
 chrome/locale/nl-NL/zotero/standalone.dtd     | 31 +------------
 chrome/locale/nl-NL/zotero/zotero.dtd         |  1 -
 .../nn-NO/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/nn-NO/zotero/preferences.dtd    |  4 --
 chrome/locale/nn-NO/zotero/standalone.dtd     | 31 +------------
 chrome/locale/nn-NO/zotero/zotero.dtd         |  1 -
 .../pl-PL/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/pl-PL/zotero/preferences.dtd    |  4 --
 chrome/locale/pl-PL/zotero/standalone.dtd     | 31 +------------
 chrome/locale/pl-PL/zotero/zotero.dtd         |  1 -
 .../pt-BR/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/pt-BR/zotero/preferences.dtd    |  4 --
 chrome/locale/pt-BR/zotero/standalone.dtd     | 31 +------------
 chrome/locale/pt-BR/zotero/zotero.dtd         |  1 -
 .../pt-PT/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/pt-PT/zotero/preferences.dtd    |  4 --
 chrome/locale/pt-PT/zotero/standalone.dtd     | 31 +------------
 chrome/locale/pt-PT/zotero/zotero.dtd         |  1 -
 .../ro-RO/zotero/mozilla/editMenuOverlay.dtd  | 45 +++++++++++++++++++
 chrome/locale/ro-RO/zotero/preferences.dtd    |  4 --
 chrome/locale/ro-RO/zotero/standalone.dtd     | 31 +------------
 chrome/locale/ro-RO/zotero/zotero.dtd         |  1 -
 .../ru-RU/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/ru-RU/zotero/preferences.dtd    |  4 --
 chrome/locale/ru-RU/zotero/standalone.dtd     | 31 +------------
 chrome/locale/ru-RU/zotero/zotero.dtd         |  1 -
 .../sk-SK/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/sk-SK/zotero/preferences.dtd    |  4 --
 chrome/locale/sk-SK/zotero/standalone.dtd     | 31 +------------
 chrome/locale/sk-SK/zotero/zotero.dtd         |  1 -
 .../sl-SI/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/sl-SI/zotero/preferences.dtd    |  4 --
 chrome/locale/sl-SI/zotero/standalone.dtd     | 31 +------------
 chrome/locale/sl-SI/zotero/zotero.dtd         |  1 -
 .../sr-RS/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/sr-RS/zotero/preferences.dtd    |  4 --
 chrome/locale/sr-RS/zotero/standalone.dtd     | 31 +------------
 chrome/locale/sr-RS/zotero/zotero.dtd         |  1 -
 .../sv-SE/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/sv-SE/zotero/preferences.dtd    |  4 --
 chrome/locale/sv-SE/zotero/standalone.dtd     | 31 +------------
 chrome/locale/sv-SE/zotero/zotero.dtd         |  1 -
 .../th-TH/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/th-TH/zotero/preferences.dtd    |  4 --
 chrome/locale/th-TH/zotero/standalone.dtd     | 31 +------------
 chrome/locale/th-TH/zotero/zotero.dtd         |  1 -
 .../tr-TR/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/tr-TR/zotero/standalone.dtd     | 31 +------------
 .../uk-UA/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/uk-UA/zotero/preferences.dtd    |  4 --
 chrome/locale/uk-UA/zotero/standalone.dtd     | 31 +------------
 chrome/locale/uk-UA/zotero/zotero.dtd         |  1 -
 .../vi-VN/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/vi-VN/zotero/preferences.dtd    |  4 --
 chrome/locale/vi-VN/zotero/standalone.dtd     | 31 +------------
 chrome/locale/vi-VN/zotero/zotero.dtd         |  1 -
 .../zh-CN/zotero/mozilla/editMenuOverlay.dtd  | 35 +++++++++++++++
 chrome/locale/zh-CN/zotero/preferences.dtd    |  4 --
 chrome/locale/zh-CN/zotero/standalone.dtd     | 31 +------------
 chrome/locale/zh-CN/zotero/zotero.dtd         |  1 -
 .../zh-TW/zotero/mozilla/editMenuOverlay.dtd  | 36 +++++++++++++++
 chrome/locale/zh-TW/zotero/preferences.dtd    |  4 --
 chrome/locale/zh-TW/zotero/standalone.dtd     | 31 +------------
 chrome/locale/zh-TW/zotero/zotero.dtd         |  1 -
 172 files changed, 1591 insertions(+), 1530 deletions(-)
 create mode 100644 chrome/locale/af-ZA/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/ar/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/bg-BG/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/ca-AD/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/cs-CZ/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/da-DK/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/de/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/el-GR/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/es-ES/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/et-EE/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/eu-ES/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/fa/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/fi-FI/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/fr-FR/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/gl-ES/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/he-IL/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/hr-HR/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/hu-HU/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/id-ID/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/is-IS/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/it-IT/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/ja-JP/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/km/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/ko-KR/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/lt-LT/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/mn-MN/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/nb-NO/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/nl-NL/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/nn-NO/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/pl-PL/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/pt-BR/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/pt-PT/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/ro-RO/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/ru-RU/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/sk-SK/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/sl-SI/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/sr-RS/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/sv-SE/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/th-TH/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/tr-TR/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/uk-UA/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/vi-VN/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/zh-CN/zotero/mozilla/editMenuOverlay.dtd
 create mode 100644 chrome/locale/zh-TW/zotero/mozilla/editMenuOverlay.dtd

diff --git a/chrome/locale/af-ZA/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/af-ZA/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..9890ecb3f
--- /dev/null
+++ b/chrome/locale/af-ZA/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Redigeer">
+<!ENTITY editMenu.accesskey        "e">
+<!ENTITY undoCmd.label             "Ontdoen">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "O">
+<!ENTITY redoCmd.label             "Herdoen">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "H">
+<!ENTITY cutCmd.label              "Knip">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "p">
+<!ENTITY copyCmd.label             "Kopieer">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "K">
+<!ENTITY pasteCmd.label            "Plak">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "P">
+<!ENTITY deleteCmd.label           "Skrap">
+<!ENTITY deleteCmd.accesskey       "S">
+<!ENTITY selectAllCmd.label        "Merk alles">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "Vind">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "V">
+<!ENTITY findAgainCmd.label        "Vind weer">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "e">
+<!ENTITY findPreviousCmd.label     "Vind vorige">
+<!ENTITY findPreviousCmd.accesskey "n">
diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd
index 78ea5c59a..5495efe81 100644
--- a/chrome/locale/af-ZA/zotero/preferences.dtd
+++ b/chrome/locale/af-ZA/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Algemeen">
 
 <!ENTITY zotero.preferences.userInterface "Gebruikerkoppelvlak">
-<!ENTITY zotero.preferences.showIn "Load Zotero in:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser pane">
-<!ENTITY zotero.preferences.showIn.separateTab "Separate tab">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/af-ZA/zotero/standalone.dtd b/chrome/locale/af-ZA/zotero/standalone.dtd
index f65b337ff..72108906a 100644
--- a/chrome/locale/af-ZA/zotero/standalone.dtd
+++ b/chrome/locale/af-ZA/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copy Citation">
 <!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Delete">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
diff --git a/chrome/locale/af-ZA/zotero/zotero.dtd b/chrome/locale/af-ZA/zotero/zotero.dtd
index 0437a4ede..f34c38366 100644
--- a/chrome/locale/af-ZA/zotero/zotero.dtd
+++ b/chrome/locale/af-ZA/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation">
 <!ENTITY zotero.toolbar.about.label "About Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Advanced Search">
-<!ENTITY zotero.toolbar.tab.tooltip "Toggle Tab Mode">
 <!ENTITY zotero.toolbar.openURL.label "Locate">
 <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library">
 
diff --git a/chrome/locale/ar/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/ar/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..5c2ec8bdf
--- /dev/null
+++ b/chrome/locale/ar/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "تحرير">
+<!ENTITY editMenu.accesskey        "ح">
+<!ENTITY undoCmd.label             "تراجع">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "ر">
+<!ENTITY redoCmd.label             "أعِد">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "ع">
+<!ENTITY cutCmd.label              "قصّ">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "ق">
+<!ENTITY copyCmd.label             "انسخ">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "ن">
+<!ENTITY pasteCmd.label            "ألصق">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "ل">
+<!ENTITY deleteCmd.label           "احذف">
+<!ENTITY deleteCmd.accesskey       "ذ">
+<!ENTITY selectAllCmd.label        "اختر الكل">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "ك">
+<!ENTITY findCmd.label             "ابحث">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "ب">
+<!ENTITY findAgainCmd.label        "ابحث مجددًا">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "ب">
+<!ENTITY findPreviousCmd.label     "ابحث عن السابق">
+<!ENTITY findPreviousCmd.accesskey "س">
diff --git a/chrome/locale/ar/zotero/preferences.dtd b/chrome/locale/ar/zotero/preferences.dtd
index b76989fc3..b0c22729d 100644
--- a/chrome/locale/ar/zotero/preferences.dtd
+++ b/chrome/locale/ar/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "عام">
 
 <!ENTITY zotero.preferences.userInterface "واجهة المستخدم">
-<!ENTITY zotero.preferences.showIn "عرض زوتيرو في:">
-<!ENTITY zotero.preferences.showIn.browserPane "جزء التصفح">
-<!ENTITY zotero.preferences.showIn.separateTab "تبويب منفصل">
-<!ENTITY zotero.preferences.showIn.appTab "تبويب التطبيقات">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/ar/zotero/standalone.dtd b/chrome/locale/ar/zotero/standalone.dtd
index 4a879f2d8..c9fa88480 100644
--- a/chrome/locale/ar/zotero/standalone.dtd
+++ b/chrome/locale/ar/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "ن">
 
 
-<!ENTITY editMenu.label "تحرير">
-<!ENTITY editMenu.accesskey "ح">
-<!ENTITY undoCmd.label "تراجع">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "ر">
-<!ENTITY redoCmd.label "إعادة">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "ع">
-<!ENTITY cutCmd.label "قص">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "ص">
-<!ENTITY copyCmd.label "نسخ">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "س">
 <!ENTITY copyCitationCmd.label "نسخ الاقتباس">
 <!ENTITY copyBibliographyCmd.label "نسخ قائمة المراجع">
-<!ENTITY pasteCmd.label "لصق">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "ل">
-<!ENTITY deleteCmd.label "حذف">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "ذ">
-<!ENTITY selectAllCmd.label "تحديد الكل">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "ح">
-<!ENTITY preferencesCmd.label "تفضيلات">
-<!ENTITY preferencesCmd.accesskey "ي">
-<!ENTITY preferencesCmdUnix.label "تفضيلات">
-<!ENTITY preferencesCmdUnix.accesskey "ف">
-<!ENTITY findCmd.label "اعثر">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "تغيير اتجاه الصفحة">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "ه">
 <!ENTITY bidiSwitchTextDirectionItem.label "تغيير اتجاه النص">
diff --git a/chrome/locale/ar/zotero/zotero.dtd b/chrome/locale/ar/zotero/zotero.dtd
index 13a9420a8..0a4db13c0 100644
--- a/chrome/locale/ar/zotero/zotero.dtd
+++ b/chrome/locale/ar/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "الدعم و الوثائق">
 <!ENTITY zotero.toolbar.about.label "حول زوتيرو">
 <!ENTITY zotero.toolbar.advancedSearch "البحث المتقدم">
-<!ENTITY zotero.toolbar.tab.tooltip "تبديل وضع التبويب">
 <!ENTITY zotero.toolbar.openURL.label "تحديد موقع العنصر">
 <!ENTITY zotero.toolbar.openURL.tooltip "البحث في مكتبتك المحلية">
 
diff --git a/chrome/locale/bg-BG/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/bg-BG/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..16cd36bdc
--- /dev/null
+++ b/chrome/locale/bg-BG/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Редактиране">
+<!ENTITY editMenu.accesskey        "Р">
+<!ENTITY undoCmd.label             "Отмяна">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "О">
+<!ENTITY redoCmd.label             "Повторение">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "в">
+<!ENTITY cutCmd.label              "Изрязване">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "И">
+<!ENTITY copyCmd.label             "Копиране">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "К">
+<!ENTITY pasteCmd.label            "Поставяне">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "П">
+<!ENTITY deleteCmd.label           "Изтриване">
+<!ENTITY deleteCmd.accesskey       "н">
+<!ENTITY selectAllCmd.label        "Избиране на всичко">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "в">
+<!ENTITY findCmd.label             "Търсене">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "Т">
+<!ENTITY findAgainCmd.label        "Търсене отново">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "ъ">
+<!ENTITY findPreviousCmd.label     "Търсене предишен">
+<!ENTITY findPreviousCmd.accesskey "д">
diff --git a/chrome/locale/bg-BG/zotero/preferences.dtd b/chrome/locale/bg-BG/zotero/preferences.dtd
index a1cf125c9..ca7ed86b8 100644
--- a/chrome/locale/bg-BG/zotero/preferences.dtd
+++ b/chrome/locale/bg-BG/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Общи">
 
 <!ENTITY zotero.preferences.userInterface "Потребителски интерфейс">
-<!ENTITY zotero.preferences.showIn "Load Zotero in:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser pane">
-<!ENTITY zotero.preferences.showIn.separateTab "Separate tab">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/bg-BG/zotero/standalone.dtd b/chrome/locale/bg-BG/zotero/standalone.dtd
index f65b337ff..72108906a 100644
--- a/chrome/locale/bg-BG/zotero/standalone.dtd
+++ b/chrome/locale/bg-BG/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copy Citation">
 <!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Delete">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
diff --git a/chrome/locale/bg-BG/zotero/zotero.dtd b/chrome/locale/bg-BG/zotero/zotero.dtd
index 30c008ba6..b49743f5a 100644
--- a/chrome/locale/bg-BG/zotero/zotero.dtd
+++ b/chrome/locale/bg-BG/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Подръжка и документация">
 <!ENTITY zotero.toolbar.about.label "За Зотеро">
 <!ENTITY zotero.toolbar.advancedSearch "Търсене за напреднали">
-<!ENTITY zotero.toolbar.tab.tooltip "Toggle Tab Mode">
 <!ENTITY zotero.toolbar.openURL.label "Открива">
 <!ENTITY zotero.toolbar.openURL.tooltip "Открива чрез вашата локална библиотека">
 
diff --git a/chrome/locale/ca-AD/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/ca-AD/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..6892031ba
--- /dev/null
+++ b/chrome/locale/ca-AD/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Edita">
+<!ENTITY editMenu.accesskey        "E">
+<!ENTITY undoCmd.label             "Desfés">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "D">
+<!ENTITY redoCmd.label             "Refés">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "R">
+<!ENTITY cutCmd.label              "Retalla">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "Copia">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "C">
+<!ENTITY pasteCmd.label            "Enganxa">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "x">
+<!ENTITY deleteCmd.label           "Suprimeix">
+<!ENTITY deleteCmd.accesskey       "u">
+<!ENTITY selectAllCmd.label        "Selecciona-ho tot">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "Cerca">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "r">
+<!ENTITY findAgainCmd.label        "Torna a cercar">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "o">
+<!ENTITY findPreviousCmd.label     "Cerca l'anterior">
+<!ENTITY findPreviousCmd.accesskey "r">
diff --git a/chrome/locale/ca-AD/zotero/preferences.dtd b/chrome/locale/ca-AD/zotero/preferences.dtd
index 8992f1559..194698891 100644
--- a/chrome/locale/ca-AD/zotero/preferences.dtd
+++ b/chrome/locale/ca-AD/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "General">
 
 <!ENTITY zotero.preferences.userInterface "Interfície de l'usuari">
-<!ENTITY zotero.preferences.showIn "Carrega el Zotero en:">
-<!ENTITY zotero.preferences.showIn.browserPane "Subfinestra del navegador">
-<!ENTITY zotero.preferences.showIn.separateTab "Pestanya separada">
-<!ENTITY zotero.preferences.showIn.appTab "Pestanya d'aplicacions">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/ca-AD/zotero/standalone.dtd b/chrome/locale/ca-AD/zotero/standalone.dtd
index 1feee9251..4f8355605 100644
--- a/chrome/locale/ca-AD/zotero/standalone.dtd
+++ b/chrome/locale/ca-AD/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edita">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Desfés">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Refés">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Retalla">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copia">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copia la cita">
 <!ENTITY copyBibliographyCmd.label "Copia la bibliografia">
-<!ENTITY pasteCmd.label "Enganxa">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Elimina">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Selecciona-ho tot">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferències">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferències...">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Cerca">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Canvia la direcció de la pàgina">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Canvia la direcció del text">
diff --git a/chrome/locale/ca-AD/zotero/zotero.dtd b/chrome/locale/ca-AD/zotero/zotero.dtd
index 1fd3355f1..10cb4fcc0 100644
--- a/chrome/locale/ca-AD/zotero/zotero.dtd
+++ b/chrome/locale/ca-AD/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Assistència i documentació">
 <!ENTITY zotero.toolbar.about.label "Quant al Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Cerca avançada">
-<!ENTITY zotero.toolbar.tab.tooltip "Commuta el mode tabulació">
 <!ENTITY zotero.toolbar.openURL.label "Localitza">
 <!ENTITY zotero.toolbar.openURL.tooltip "Cerqueu-lo a la biblioteca local">
 
diff --git a/chrome/locale/cs-CZ/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/cs-CZ/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..0ffac0fd9
--- /dev/null
+++ b/chrome/locale/cs-CZ/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label "Úpravy">
+<!ENTITY editMenu.accesskey "a">
+<!ENTITY undoCmd.label "Zpět">
+<!ENTITY undoCmd.key "Z">
+<!ENTITY undoCmd.accesskey "Z">
+<!ENTITY redoCmd.label "Znovu">
+<!ENTITY redoCmd.key "Y">
+<!ENTITY redoCmd.accesskey "o">
+<!ENTITY cutCmd.label "Vyjmout">
+<!ENTITY cutCmd.key "X">
+<!ENTITY cutCmd.accesskey "y">
+<!ENTITY copyCmd.label "Kopírovat">
+<!ENTITY copyCmd.key "C">
+<!ENTITY copyCmd.accesskey "K">
+<!ENTITY pasteCmd.label "Vložit">
+<!ENTITY pasteCmd.key "V">
+<!ENTITY pasteCmd.accesskey "l">
+<!ENTITY deleteCmd.label "Smazat">
+<!ENTITY deleteCmd.accesskey "m">
+<!ENTITY selectAllCmd.label "Vybrat vše">
+<!ENTITY selectAllCmd.key "A">
+<!ENTITY selectAllCmd.accesskey "a">
+<!ENTITY findCmd.label "Najít">
+<!ENTITY findCmd.key "F">
+<!ENTITY findCmd.accesskey "j">
+<!ENTITY findAgainCmd.label "Najít další">
+<!ENTITY findAgainCmd.key "G">
+<!ENTITY findAgainCmd.key2 "VK_F3">
+<!ENTITY findAgainCmd.accesskey "t">
+<!ENTITY findPreviousCmd.label "Najít předchozí">
+<!ENTITY findPreviousCmd.accesskey "c">
diff --git a/chrome/locale/cs-CZ/zotero/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd
index 22024ab6e..b2cb13cfb 100644
--- a/chrome/locale/cs-CZ/zotero/preferences.dtd
+++ b/chrome/locale/cs-CZ/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Obecné">
 
 <!ENTITY zotero.preferences.userInterface "Uživatelské rozhraní">
-<!ENTITY zotero.preferences.showIn "Nahrát Zotero v:">
-<!ENTITY zotero.preferences.showIn.browserPane "Panel prohlížeče">
-<!ENTITY zotero.preferences.showIn.separateTab "Samostatný panel">
-<!ENTITY zotero.preferences.showIn.appTab "Panel aplikace">
 <!ENTITY zotero.preferences.layout "Rozvržení:">
 <!ENTITY zotero.preferences.layout.standard "Standardní">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/cs-CZ/zotero/standalone.dtd b/chrome/locale/cs-CZ/zotero/standalone.dtd
index 056f7c2bc..aab06a3d1 100644
--- a/chrome/locale/cs-CZ/zotero/standalone.dtd
+++ b/chrome/locale/cs-CZ/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Upravit">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Zpět">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Znovu">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Vyjmout">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopírovat">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Kopírovat citaci">
 <!ENTITY copyBibliographyCmd.label "Kopírovat bibliografii">
-<!ENTITY pasteCmd.label "Vložit">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Smazat">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Vybrat vše">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Nastavení">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Nastavení">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Najít">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Přepnout směr stránky">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Přepnout směr textu">
diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd
index c2a8f09a7..07391d66a 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.dtd
+++ b/chrome/locale/cs-CZ/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Podpora a dokumentace">
 <!ENTITY zotero.toolbar.about.label "O Zoteru">
 <!ENTITY zotero.toolbar.advancedSearch "Pokročilé vyhledávání">
-<!ENTITY zotero.toolbar.tab.tooltip "Přepnout tabulkové zobrazení">
 <!ENTITY zotero.toolbar.openURL.label "Najít">
 <!ENTITY zotero.toolbar.openURL.tooltip "Najít prostřednictvím vaší místní knihovny">
 
diff --git a/chrome/locale/da-DK/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/da-DK/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..54fecd12a
--- /dev/null
+++ b/chrome/locale/da-DK/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Rediger">
+<!ENTITY editMenu.accesskey        "R">
+<!ENTITY undoCmd.label             "Fortryd">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "F">
+<!ENTITY redoCmd.label             "Gentag">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "G">
+<!ENTITY cutCmd.label              "Klip">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "K">
+<!ENTITY copyCmd.label             "Kopier">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "o">
+<!ENTITY pasteCmd.label            "Indsæt">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "æ">
+<!ENTITY deleteCmd.label           "Slet">
+<!ENTITY deleteCmd.accesskey       "S">
+<!ENTITY selectAllCmd.label        "Marker alt">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "M">
+<!ENTITY findCmd.label             "Find">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "n">
+<!ENTITY findAgainCmd.label        "Find næste">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "d">
+<!ENTITY findPreviousCmd.label     "Find forrige">
+<!ENTITY findPreviousCmd.accesskey "o">
diff --git a/chrome/locale/da-DK/zotero/preferences.dtd b/chrome/locale/da-DK/zotero/preferences.dtd
index f19dedcbf..322426f3a 100644
--- a/chrome/locale/da-DK/zotero/preferences.dtd
+++ b/chrome/locale/da-DK/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Generelt">
 
 <!ENTITY zotero.preferences.userInterface "Brugerflade">
-<!ENTITY zotero.preferences.showIn "Indlæs Zotero i:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser-vindue">
-<!ENTITY zotero.preferences.showIn.separateTab "Separat faneblad">
-<!ENTITY zotero.preferences.showIn.appTab "Applikationsfaneblad">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stablet">
diff --git a/chrome/locale/da-DK/zotero/standalone.dtd b/chrome/locale/da-DK/zotero/standalone.dtd
index 96b981534..2af41d29a 100644
--- a/chrome/locale/da-DK/zotero/standalone.dtd
+++ b/chrome/locale/da-DK/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Rediger">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Fortryd">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Gendan">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Klip">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopier">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Kopier reference">
 <!ENTITY copyBibliographyCmd.label "Kopier referenceliste">
-<!ENTITY pasteCmd.label "Indsæt">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Slet">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Vælg alle">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Indstillinger">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Indstillinger">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Byt sideorientering">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Byt tekst-orientering">
diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd
index cf1416b26..7f9c21243 100644
--- a/chrome/locale/da-DK/zotero/zotero.dtd
+++ b/chrome/locale/da-DK/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support og dokumentation">
 <!ENTITY zotero.toolbar.about.label "Om Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Avanceret søgning">
-<!ENTITY zotero.toolbar.tab.tooltip "Slå faneblade til eller fra">
 <!ENTITY zotero.toolbar.openURL.label "Find">
 <!ENTITY zotero.toolbar.openURL.tooltip "Find gennem dit lokale bibliotek">
 
diff --git a/chrome/locale/de/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/de/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..0038257bd
--- /dev/null
+++ b/chrome/locale/de/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,31 @@
+<!ENTITY editMenu.label            "Bearbeiten">
+<!ENTITY editMenu.accesskey        "B">
+<!ENTITY undoCmd.label             "Rückgängig">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "R">
+<!ENTITY redoCmd.label             "Wiederherstellen">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "W">
+<!ENTITY cutCmd.label              "Ausschneiden">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "A">
+<!ENTITY copyCmd.label             "Kopieren">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "K">
+<!ENTITY pasteCmd.label            "Einfügen">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "E">
+<!ENTITY deleteCmd.label           "Löschen">
+<!ENTITY deleteCmd.accesskey       "L">
+<!ENTITY selectAllCmd.label        "Alles markieren">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "m">
+<!ENTITY findCmd.label             "Suchen">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "S">
+<!ENTITY findAgainCmd.label        "Weitersuchen">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "w">
+<!ENTITY findPreviousCmd.label     "Aufwärts suchen">
+<!ENTITY findPreviousCmd.accesskey "f">
diff --git a/chrome/locale/de/zotero/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd
index ea4b0fba1..494d1e10c 100644
--- a/chrome/locale/de/zotero/preferences.dtd
+++ b/chrome/locale/de/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Allgemein">
 
 <!ENTITY zotero.preferences.userInterface "Benutzer-Interface">
-<!ENTITY zotero.preferences.showIn "Zotero öffnen im:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser Ausschnitt">
-<!ENTITY zotero.preferences.showIn.separateTab "Eigenem Tab">
-<!ENTITY zotero.preferences.showIn.appTab "App Tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Gestapelt">
diff --git a/chrome/locale/de/zotero/standalone.dtd b/chrome/locale/de/zotero/standalone.dtd
index 53e11cdf7..937a88eb7 100644
--- a/chrome/locale/de/zotero/standalone.dtd
+++ b/chrome/locale/de/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Bearbeiten">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Rückgängig">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Wiederholen">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Ausschneiden">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "A">
-<!ENTITY copyCmd.label "Kopieren">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Zitation kopieren">
 <!ENTITY copyBibliographyCmd.label "Literaturverzeichnis kopieren">
-<!ENTITY pasteCmd.label "Einfügen">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Löschen">
-<!ENTITY deleteCmd.key "L">
-<!ENTITY deleteCmd.accesskey "L">
-<!ENTITY selectAllCmd.label "Alle auswählen">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "u">
-<!ENTITY preferencesCmd.label "Einstellungen">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Einstellungen">
-<!ENTITY preferencesCmdUnix.accesskey "E">
-<!ENTITY findCmd.label "Suchen">
-<!ENTITY findCmd.accesskey "S">
-<!ENTITY findCmd.commandkey "S">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Seitenrichtung ändern">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Schreibrichtung ändern">
diff --git a/chrome/locale/de/zotero/zotero.dtd b/chrome/locale/de/zotero/zotero.dtd
index 9688acede..ea5e6e084 100644
--- a/chrome/locale/de/zotero/zotero.dtd
+++ b/chrome/locale/de/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Hilfe und Dokumentation">
 <!ENTITY zotero.toolbar.about.label "Über Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Erweiterte Suche">
-<!ENTITY zotero.toolbar.tab.tooltip "Tab-Modus ein-/ausschalten">
 <!ENTITY zotero.toolbar.openURL.label "Finden">
 <!ENTITY zotero.toolbar.openURL.tooltip "In lokaler Bibliothek finden">
 
diff --git a/chrome/locale/el-GR/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/el-GR/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..26088a8c0
--- /dev/null
+++ b/chrome/locale/el-GR/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Επεξεργασία">
+<!ENTITY editMenu.accesskey        "ε">
+<!ENTITY undoCmd.label             "Αναίρεση">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "α">
+<!ENTITY redoCmd.label             "Επανάληψη">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "π">
+<!ENTITY cutCmd.label              "Αποκοπή">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "κ">
+<!ENTITY copyCmd.label             "Αντιγραφή">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "τ">
+<!ENTITY pasteCmd.label            "Επικόλληση">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "λ">
+<!ENTITY deleteCmd.label           "Διαγραφή">
+<!ENTITY deleteCmd.accesskey       "Δ">
+<!ENTITY selectAllCmd.label        "Επιλογή όλων">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "ο">
+<!ENTITY findCmd.label             "Εύρεση">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "ρ">
+<!ENTITY findAgainCmd.label        "Εύρεση ξανά">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "ξ">
+<!ENTITY findPreviousCmd.label     "Εύρεση Προηγουμένου">
+<!ENTITY findPreviousCmd.accesskey "γ">
diff --git a/chrome/locale/el-GR/zotero/preferences.dtd b/chrome/locale/el-GR/zotero/preferences.dtd
index 299bea674..aba61442e 100644
--- a/chrome/locale/el-GR/zotero/preferences.dtd
+++ b/chrome/locale/el-GR/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Γενικές">
 
 <!ENTITY zotero.preferences.userInterface "Περιβάλλον χρήστη">
-<!ENTITY zotero.preferences.showIn "Φόρτωση του Zotero σε:">
-<!ENTITY zotero.preferences.showIn.browserPane "Πλαίσιο περιηγητή">
-<!ENTITY zotero.preferences.showIn.separateTab "Διαχωρισμός καρτέλας">
-<!ENTITY zotero.preferences.showIn.appTab "Καρτέλα εφαρμογών">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/el-GR/zotero/standalone.dtd b/chrome/locale/el-GR/zotero/standalone.dtd
index cd7bfb26b..f64fb99c9 100644
--- a/chrome/locale/el-GR/zotero/standalone.dtd
+++ b/chrome/locale/el-GR/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Επεξεργασία">
-<!ENTITY editMenu.accesskey "Ε">
-<!ENTITY undoCmd.label "Επαναφορά">
-<!ENTITY undoCmd.key "Ζ">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Επανάληψη">
-<!ENTITY redoCmd.key "Υ">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Αποκοπή">
-<!ENTITY cutCmd.key "Χ">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Αντιγραφή">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Αντιγραφή παραπομπής/παράθεσης">
 <!ENTITY copyBibliographyCmd.label "Αντιγραφή βιβλιογραφίας">
-<!ENTITY pasteCmd.label "Επικόλληση">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Διαγραφή">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Επιλογή όλων">
-<!ENTITY selectAllCmd.key "Α">
-<!ENTITY selectAllCmd.accesskey "Α">
-<!ENTITY preferencesCmd.label "Προτιμήσεις">
-<!ENTITY preferencesCmd.accesskey "Ο">
-<!ENTITY preferencesCmdUnix.label "Προτιμήσεις">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Εύρεση">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Αλλαγή κατεύθυνσης σελίδας">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Αλλαγή κατεύθυνσης κειμένου">
diff --git a/chrome/locale/el-GR/zotero/zotero.dtd b/chrome/locale/el-GR/zotero/zotero.dtd
index 955fe5669..68d13d3d0 100644
--- a/chrome/locale/el-GR/zotero/zotero.dtd
+++ b/chrome/locale/el-GR/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Υποστήριξη και Τεκμηρίωση">
 <!ENTITY zotero.toolbar.about.label "Σχετικά με το Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Προχωρημένη αναζήτηση">
-<!ENTITY zotero.toolbar.tab.tooltip "Εναλλαγή της λειτουργίας καρτέλας">
 <!ENTITY zotero.toolbar.openURL.label "Εντοπισμός">
 <!ENTITY zotero.toolbar.openURL.tooltip "Αναζήτηση μέσα από την τοπική βιβλιοθήκη σας">
 
diff --git a/chrome/locale/es-ES/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/es-ES/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..59ca9fdb5
--- /dev/null
+++ b/chrome/locale/es-ES/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label "Editar">
+<!ENTITY editMenu.accesskey "e">
+<!ENTITY undoCmd.label "Deshacer">
+<!ENTITY undoCmd.key "Z">
+<!ENTITY undoCmd.accesskey "D">
+<!ENTITY redoCmd.label "Rehacer">
+<!ENTITY redoCmd.key "Y">
+<!ENTITY redoCmd.accesskey "r">
+<!ENTITY cutCmd.label "Cortar">
+<!ENTITY cutCmd.key "X">
+<!ENTITY cutCmd.accesskey "t">
+<!ENTITY copyCmd.label "Copiar">
+<!ENTITY copyCmd.key "C">
+<!ENTITY copyCmd.accesskey "c">
+<!ENTITY pasteCmd.label "Pegar">
+<!ENTITY pasteCmd.key "V">
+<!ENTITY pasteCmd.accesskey "p">
+<!ENTITY deleteCmd.label "Eliminar">
+<!ENTITY deleteCmd.accesskey "E">
+<!ENTITY selectAllCmd.label "Seleccionar todo">
+<!ENTITY selectAllCmd.key "A">
+<!ENTITY selectAllCmd.accesskey "a">
+<!ENTITY findCmd.label "Buscar">
+<!ENTITY findCmd.key "F">
+<!ENTITY findCmd.accesskey "B">
+<!ENTITY findAgainCmd.label "Repetir la búsqueda">
+<!ENTITY findAgainCmd.key "G">
+<!ENTITY findAgainCmd.key2 "VK_F3">
+<!ENTITY findAgainCmd.accesskey "R">
+<!ENTITY findPreviousCmd.label "Buscar anterior">
+<!ENTITY findPreviousCmd.accesskey "B">
diff --git a/chrome/locale/es-ES/zotero/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd
index a98c0b6b3..e5ffce93b 100644
--- a/chrome/locale/es-ES/zotero/preferences.dtd
+++ b/chrome/locale/es-ES/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "General">
 
 <!ENTITY zotero.preferences.userInterface "Interfaz de usuario">
-<!ENTITY zotero.preferences.showIn "Cargar Zotero en:">
-<!ENTITY zotero.preferences.showIn.browserPane "Panel de navegador">
-<!ENTITY zotero.preferences.showIn.separateTab "Pestaña de separación">
-<!ENTITY zotero.preferences.showIn.appTab "Pestaña de aplicación">
 <!ENTITY zotero.preferences.layout "Diseño:">
 <!ENTITY zotero.preferences.layout.standard "Estándar">
 <!ENTITY zotero.preferences.layout.stacked "Acumulados">
diff --git a/chrome/locale/es-ES/zotero/standalone.dtd b/chrome/locale/es-ES/zotero/standalone.dtd
index e21d2cc9f..e908f46c1 100644
--- a/chrome/locale/es-ES/zotero/standalone.dtd
+++ b/chrome/locale/es-ES/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Editar">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Deshacer">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Rehacer">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cortar">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copiar">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copiar cita">
 <!ENTITY copyBibliographyCmd.label "Copiar bibliografía">
-<!ENTITY pasteCmd.label "Pegar">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Borrar">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Seleccionar todo">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferencias">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferencias">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Encontrar">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "F">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Cambiar dirección de la página">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Cambiar dirección del texto">
diff --git a/chrome/locale/es-ES/zotero/zotero.dtd b/chrome/locale/es-ES/zotero/zotero.dtd
index d4268b0fd..2684556f9 100644
--- a/chrome/locale/es-ES/zotero/zotero.dtd
+++ b/chrome/locale/es-ES/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Soporte y documentación">
 <!ENTITY zotero.toolbar.about.label "Acerca de Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Búsqueda avanzada">
-<!ENTITY zotero.toolbar.tab.tooltip "Intercambiar Modo Lengüeta">
 <!ENTITY zotero.toolbar.openURL.label "Localizar">
 <!ENTITY zotero.toolbar.openURL.tooltip "Encontrar mediante tu biblioteca local">
 
diff --git a/chrome/locale/et-EE/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/et-EE/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..65f1fb002
--- /dev/null
+++ b/chrome/locale/et-EE/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label "Redigeerimine">
+<!ENTITY editMenu.accesskey "R">
+<!ENTITY undoCmd.label "Võta tagasi">
+<!ENTITY undoCmd.key "Z">
+<!ENTITY undoCmd.accesskey "V">
+<!ENTITY redoCmd.label "Tee uuesti">
+<!ENTITY redoCmd.key "Y">
+<!ENTITY redoCmd.accesskey "T">
+<!ENTITY cutCmd.label "Lõika">
+<!ENTITY cutCmd.key "X">
+<!ENTITY cutCmd.accesskey "l">
+<!ENTITY copyCmd.label "Kopeeri">
+<!ENTITY copyCmd.key "C">
+<!ENTITY copyCmd.accesskey "K">
+<!ENTITY pasteCmd.label "Aseta">
+<!ENTITY pasteCmd.key "V">
+<!ENTITY pasteCmd.accesskey "A">
+<!ENTITY deleteCmd.label "Kustuta">
+<!ENTITY deleteCmd.accesskey "U">
+<!ENTITY selectAllCmd.label "Vali kõik">
+<!ENTITY selectAllCmd.key "A">
+<!ENTITY selectAllCmd.accesskey "I">
+<!ENTITY findCmd.label "Otsi">
+<!ENTITY findCmd.key "F">
+<!ENTITY findCmd.accesskey "O">
+<!ENTITY findAgainCmd.label "Otsi uuesti">
+<!ENTITY findAgainCmd.key "G">
+<!ENTITY findAgainCmd.key2 "VK_F3">
+<!ENTITY findAgainCmd.accesskey "e">
+<!ENTITY findPreviousCmd.label "Eelmine otsingutulemus">
+<!ENTITY findPreviousCmd.accesskey "m">
diff --git a/chrome/locale/et-EE/zotero/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd
index f1c9b3428..e9a5793dd 100644
--- a/chrome/locale/et-EE/zotero/preferences.dtd
+++ b/chrome/locale/et-EE/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Üldine">
 
 <!ENTITY zotero.preferences.userInterface "Kasutajaliides">
-<!ENTITY zotero.preferences.showIn "Laadida Zotero:">
-<!ENTITY zotero.preferences.showIn.browserPane "Brauseri paanil">
-<!ENTITY zotero.preferences.showIn.separateTab "Eraldi">
-<!ENTITY zotero.preferences.showIn.appTab "Rakenduse tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/et-EE/zotero/standalone.dtd b/chrome/locale/et-EE/zotero/standalone.dtd
index 33d86d86b..3f693d500 100644
--- a/chrome/locale/et-EE/zotero/standalone.dtd
+++ b/chrome/locale/et-EE/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Toimeta">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Taastada">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Teha uuesti">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Lõigata">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopeerida">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Viite kopeerimine">
 <!ENTITY copyBibliographyCmd.label "Bibliograafia kopeerimine">
-<!ENTITY pasteCmd.label "Asetada">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Kustutada">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Valida kõik">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Eelistused">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Eelistused">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Otsida">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Lehekülje orientatsiooni muutmine">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Teksti orientatsiooni muutmine">
diff --git a/chrome/locale/et-EE/zotero/zotero.dtd b/chrome/locale/et-EE/zotero/zotero.dtd
index 444b2c922..5fdeb39ba 100644
--- a/chrome/locale/et-EE/zotero/zotero.dtd
+++ b/chrome/locale/et-EE/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Abi ja dokumentatsioon">
 <!ENTITY zotero.toolbar.about.label "Zotero kohta">
 <!ENTITY zotero.toolbar.advancedSearch "Täpsem otsing">
-<!ENTITY zotero.toolbar.tab.tooltip "Zotero brauseri kaardil">
 <!ENTITY zotero.toolbar.openURL.label "Otsida">
 <!ENTITY zotero.toolbar.openURL.tooltip "Otsida kohalikus raamatukogus">
 
diff --git a/chrome/locale/eu-ES/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/eu-ES/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..2ad1811ff
--- /dev/null
+++ b/chrome/locale/eu-ES/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Editatu">
+<!ENTITY editMenu.accesskey        "E">
+<!ENTITY undoCmd.label             "Desegin">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "D">
+<!ENTITY redoCmd.label             "Berregin">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "r">
+<!ENTITY cutCmd.label              "Ebaki">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "E">
+<!ENTITY copyCmd.label             "Kopiatu">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "K">
+<!ENTITY pasteCmd.label            "Itsatsi">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "I">
+<!ENTITY deleteCmd.label           "Ezabatu">
+<!ENTITY deleteCmd.accesskey       "E">
+<!ENTITY selectAllCmd.label        "Hautatu dena">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "Bilatu">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "B">
+<!ENTITY findAgainCmd.label        "Bilatu berriro">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "r">
+<!ENTITY findPreviousCmd.label     "Bilatu aurrekoa">
+<!ENTITY findPreviousCmd.accesskey "a">
diff --git a/chrome/locale/eu-ES/zotero/preferences.dtd b/chrome/locale/eu-ES/zotero/preferences.dtd
index 4fab34386..bbb066ec4 100644
--- a/chrome/locale/eu-ES/zotero/preferences.dtd
+++ b/chrome/locale/eu-ES/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Orokorra">
 
 <!ENTITY zotero.preferences.userInterface "Interazea">
-<!ENTITY zotero.preferences.showIn "Load Zotero in:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser pane">
-<!ENTITY zotero.preferences.showIn.separateTab "Separate tab">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/eu-ES/zotero/standalone.dtd b/chrome/locale/eu-ES/zotero/standalone.dtd
index f65b337ff..72108906a 100644
--- a/chrome/locale/eu-ES/zotero/standalone.dtd
+++ b/chrome/locale/eu-ES/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copy Citation">
 <!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Delete">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
diff --git a/chrome/locale/eu-ES/zotero/zotero.dtd b/chrome/locale/eu-ES/zotero/zotero.dtd
index c6118706b..6be206da3 100644
--- a/chrome/locale/eu-ES/zotero/zotero.dtd
+++ b/chrome/locale/eu-ES/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Laguntza eta dokumentazioa">
 <!ENTITY zotero.toolbar.about.label "Zotero-ri buruz">
 <!ENTITY zotero.toolbar.advancedSearch "Bilaketa aurreratua">
-<!ENTITY zotero.toolbar.tab.tooltip "Toggle Tab Mode">
 <!ENTITY zotero.toolbar.openURL.label "Aurkitu">
 <!ENTITY zotero.toolbar.openURL.tooltip "Liburutegi publikoan bilatu">
 
diff --git a/chrome/locale/fa/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/fa/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..ad1586ae3
--- /dev/null
+++ b/chrome/locale/fa/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "ویرایش">
+<!ENTITY editMenu.accesskey        "و">
+<!ENTITY undoCmd.label             "واگرد">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "و">
+<!ENTITY redoCmd.label             "از نو">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "ز">
+<!ENTITY cutCmd.label              "بریدن">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "ر">
+<!ENTITY copyCmd.label             "رونوشت برداشتن">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "ن">
+<!ENTITY pasteCmd.label            "جایگذاری">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "ج">
+<!ENTITY deleteCmd.label           "حذف">
+<!ENTITY deleteCmd.accesskey       "ح">
+<!ENTITY selectAllCmd.label        "انتخاب همه">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "ه">
+<!ENTITY findCmd.label             "پیدا کردن">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "پ">
+<!ENTITY findAgainCmd.label        "پیدا کردن مجدد">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "ج">
+<!ENTITY findPreviousCmd.label     "پیدا کردن قبلی">
+<!ENTITY findPreviousCmd.accesskey "ق">
diff --git a/chrome/locale/fa/zotero/preferences.dtd b/chrome/locale/fa/zotero/preferences.dtd
index 588758b92..061144189 100644
--- a/chrome/locale/fa/zotero/preferences.dtd
+++ b/chrome/locale/fa/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "عمومی">
 
 <!ENTITY zotero.preferences.userInterface "رابط کاربری">
-<!ENTITY zotero.preferences.showIn "نمایش زوترو در:">
-<!ENTITY zotero.preferences.showIn.browserPane "قاب مرورگر">
-<!ENTITY zotero.preferences.showIn.separateTab "برگه جداگانه">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/fa/zotero/standalone.dtd b/chrome/locale/fa/zotero/standalone.dtd
index 676d289ca..9e0a6f747 100644
--- a/chrome/locale/fa/zotero/standalone.dtd
+++ b/chrome/locale/fa/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "ویرایش">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "کپی">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copy Citation">
 <!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "حذف">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "انتخاب همه">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "تنظیمات">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "تنظیمات">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "یافتن">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
diff --git a/chrome/locale/fa/zotero/zotero.dtd b/chrome/locale/fa/zotero/zotero.dtd
index 9aa73943d..2a3d041f2 100644
--- a/chrome/locale/fa/zotero/zotero.dtd
+++ b/chrome/locale/fa/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "پشتیبانی و راهنما">
 <!ENTITY zotero.toolbar.about.label "درباره زوترو">
 <!ENTITY zotero.toolbar.advancedSearch "جستجوی پیشرفته">
-<!ENTITY zotero.toolbar.tab.tooltip "تغییر حالت برگه‌ای">
 <!ENTITY zotero.toolbar.openURL.label "مکان‌یابی">
 <!ENTITY zotero.toolbar.openURL.tooltip "یافتن از طریق کتابخانه محلی">
 
diff --git a/chrome/locale/fi-FI/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/fi-FI/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..559c53202
--- /dev/null
+++ b/chrome/locale/fi-FI/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label             "Muokkaa">
+<!ENTITY editMenu.accesskey         "M">
+<!ENTITY undoCmd.label              "Kumoa">
+<!ENTITY undoCmd.key                "Z">
+<!ENTITY undoCmd.accesskey          "m">
+<!ENTITY redoCmd.label              "Tee uudelleen">
+<!ENTITY redoCmd.key                "Y">
+<!ENTITY redoCmd.accesskey          "T">
+<!ENTITY cutCmd.label               "Leikkaa">
+<!ENTITY cutCmd.key                 "X">
+<!ENTITY cutCmd.accesskey           "L">
+<!ENTITY copyCmd.label              "Kopioi">
+<!ENTITY copyCmd.key                "C">
+<!ENTITY copyCmd.accesskey          "K">
+<!ENTITY pasteCmd.label             "Liitä">
+<!ENTITY pasteCmd.key               "V">
+<!ENTITY pasteCmd.accesskey         "i">
+<!ENTITY deleteCmd.label            "Poista">
+<!ENTITY deleteCmd.accesskey        "o">
+<!ENTITY selectAllCmd.label         "Valitse kaikki">
+<!ENTITY selectAllCmd.key           "A">
+<!ENTITY selectAllCmd.accesskey     "V">
+<!ENTITY findCmd.label              "Etsi">
+<!ENTITY findCmd.key                "F">
+<!ENTITY findCmd.accesskey          "E">
+<!ENTITY findAgainCmd.label         "Etsi seuraava">
+<!ENTITY findAgainCmd.key           "G">
+<!ENTITY findAgainCmd.key2          "VK_F3">
+<!ENTITY findAgainCmd.accesskey     "s">
+<!ENTITY findPreviousCmd.label      "Etsi edellinen">
+<!ENTITY findPreviousCmd.accesskey  "d">
diff --git a/chrome/locale/fi-FI/zotero/preferences.dtd b/chrome/locale/fi-FI/zotero/preferences.dtd
index a17f6f15d..423b7b95d 100644
--- a/chrome/locale/fi-FI/zotero/preferences.dtd
+++ b/chrome/locale/fi-FI/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Yleistä">
 
 <!ENTITY zotero.preferences.userInterface "Käyttöliittymä">
-<!ENTITY zotero.preferences.showIn "Zoteron paikka">
-<!ENTITY zotero.preferences.showIn.browserPane "Selainikkuna">
-<!ENTITY zotero.preferences.showIn.separateTab "Erillinen välilehti">
-<!ENTITY zotero.preferences.showIn.appTab "Sovellusvälilehti">
 <!ENTITY zotero.preferences.layout "Asettelu">
 <!ENTITY zotero.preferences.layout.standard "Vakio">
 <!ENTITY zotero.preferences.layout.stacked "Pinottu">
diff --git a/chrome/locale/fi-FI/zotero/standalone.dtd b/chrome/locale/fi-FI/zotero/standalone.dtd
index ffaae2872..5226bfa56 100644
--- a/chrome/locale/fi-FI/zotero/standalone.dtd
+++ b/chrome/locale/fi-FI/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Muokkaa">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Peru">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Tee uudelleen">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Leikkaa">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopioi">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Kopioi sitaatti">
 <!ENTITY copyBibliographyCmd.label "Kopioi kirjallisuusluettelo">
-<!ENTITY pasteCmd.label "Liitä">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Poista">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Valitse kaikki">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Asetukset">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Asetukset">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Etsi">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Vaihda sivun suuntaa">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Vaihda tekstin suuntaa">
diff --git a/chrome/locale/fi-FI/zotero/zotero.dtd b/chrome/locale/fi-FI/zotero/zotero.dtd
index 3680778ac..e2d2cdab7 100644
--- a/chrome/locale/fi-FI/zotero/zotero.dtd
+++ b/chrome/locale/fi-FI/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Ohjeet ja tuki">
 <!ENTITY zotero.toolbar.about.label "Tietoja Zoterosta">
 <!ENTITY zotero.toolbar.advancedSearch "Tarkennettu haku">
-<!ENTITY zotero.toolbar.tab.tooltip "Välilehtitila päälle/pois">
 <!ENTITY zotero.toolbar.openURL.label "Paikanna">
 <!ENTITY zotero.toolbar.openURL.tooltip "Etsi paikallisen kirjaston kautta">
 
diff --git a/chrome/locale/fr-FR/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/fr-FR/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..3d714462a
--- /dev/null
+++ b/chrome/locale/fr-FR/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Édition">
+<!ENTITY editMenu.accesskey        "n">
+<!ENTITY undoCmd.label             "Annuler">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "u">
+<!ENTITY redoCmd.label             "Rétablir">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "R">
+<!ENTITY cutCmd.label              "Couper">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "C">
+<!ENTITY copyCmd.label             "Copier">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "p">
+<!ENTITY pasteCmd.label            "Coller">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "o">
+<!ENTITY deleteCmd.label           "Supprimer">
+<!ENTITY deleteCmd.accesskey       "e">
+<!ENTITY selectAllCmd.label        "Tout sélectionner">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "T">
+<!ENTITY findCmd.label             "Rechercher">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "h">
+<!ENTITY findAgainCmd.label        "Rechercher le suivant">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "v">
+<!ENTITY findPreviousCmd.label     "Rechercher le précédent">
+<!ENTITY findPreviousCmd.accesskey "e">
diff --git a/chrome/locale/fr-FR/zotero/standalone.dtd b/chrome/locale/fr-FR/zotero/standalone.dtd
index 66873e0bc..5da4548f2 100644
--- a/chrome/locale/fr-FR/zotero/standalone.dtd
+++ b/chrome/locale/fr-FR/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Édition">
-<!ENTITY editMenu.accesskey "n">
-<!ENTITY undoCmd.label "Annuler">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "u">
-<!ENTITY redoCmd.label "Rétablir">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Couper">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "C">
-<!ENTITY copyCmd.label "Copier">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "p">
 <!ENTITY copyCitationCmd.label "Copier la citation">
 <!ENTITY copyBibliographyCmd.label "Copier la bibliographie">
-<!ENTITY pasteCmd.label "Coller">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "o">
-<!ENTITY deleteCmd.label "Supprimer">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "S">
-<!ENTITY selectAllCmd.label "Tout sélectionner">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "T">
-<!ENTITY preferencesCmd.label "Préférences">
-<!ENTITY preferencesCmd.accesskey "i">
-<!ENTITY preferencesCmdUnix.label "Préférences">
-<!ENTITY preferencesCmdUnix.accesskey "f">
-<!ENTITY findCmd.label "Rechercher">
-<!ENTITY findCmd.accesskey "h">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Inverser le sens de la page">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Inverser le sens du texte">
diff --git a/chrome/locale/gl-ES/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/gl-ES/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..44185616b
--- /dev/null
+++ b/chrome/locale/gl-ES/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Edit">
+<!ENTITY editMenu.accesskey        "e">
+<!ENTITY undoCmd.label             "Undo">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "u">
+<!ENTITY redoCmd.label             "Redo">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "r">
+<!ENTITY cutCmd.label              "Cut">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "Copy">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "c">
+<!ENTITY pasteCmd.label            "Paste">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "p">
+<!ENTITY deleteCmd.label           "Delete">
+<!ENTITY deleteCmd.accesskey       "d">
+<!ENTITY selectAllCmd.label        "Select All">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "Find">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "F">
+<!ENTITY findAgainCmd.label        "Find Again">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "g">
+<!ENTITY findPreviousCmd.label     "Find Previous">
+<!ENTITY findPreviousCmd.accesskey "v">
diff --git a/chrome/locale/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd
index 606c5e34a..1df75a64f 100644
--- a/chrome/locale/gl-ES/zotero/preferences.dtd
+++ b/chrome/locale/gl-ES/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Xeral">
 
 <!ENTITY zotero.preferences.userInterface "Interface de usuario">
-<!ENTITY zotero.preferences.showIn "Cargar Zotero en:">
-<!ENTITY zotero.preferences.showIn.browserPane "Panel do navegador">
-<!ENTITY zotero.preferences.showIn.separateTab "Lapela propia">
-<!ENTITY zotero.preferences.showIn.appTab "Lapela de aplicativos">
 <!ENTITY zotero.preferences.layout "Interface:">
 <!ENTITY zotero.preferences.layout.standard "Estándar">
 <!ENTITY zotero.preferences.layout.stacked "Acumulada">
diff --git a/chrome/locale/gl-ES/zotero/standalone.dtd b/chrome/locale/gl-ES/zotero/standalone.dtd
index 6b8a7b643..70ffd5902 100644
--- a/chrome/locale/gl-ES/zotero/standalone.dtd
+++ b/chrome/locale/gl-ES/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Editar">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Desfacer">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Refacer">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cortar">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copiar">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copiar a cita">
 <!ENTITY copyBibliographyCmd.label "Copiar a bibliografía">
-<!ENTITY pasteCmd.label "Pegar">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "p">
-<!ENTITY deleteCmd.label "Eliminar">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Escoller todo">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferencias">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferencias">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Buscar">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "F">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Cambiar a dirección de páxina">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Cambiar a dirección do texto">
diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd
index 2c1889d84..c59feb965 100644
--- a/chrome/locale/gl-ES/zotero/zotero.dtd
+++ b/chrome/locale/gl-ES/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Axuda e documentación">
 <!ENTITY zotero.toolbar.about.label "Acerca de Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Busca avanzada">
-<!ENTITY zotero.toolbar.tab.tooltip "Cambiar o modo de lingüetas">
 <!ENTITY zotero.toolbar.openURL.label "Localizar">
 <!ENTITY zotero.toolbar.openURL.tooltip "Atopar na súa biblioteca local">
 
diff --git a/chrome/locale/he-IL/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/he-IL/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..044484e03
--- /dev/null
+++ b/chrome/locale/he-IL/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "עריכה">
+<!ENTITY editMenu.accesskey        "ע">
+<!ENTITY undoCmd.label             "בטל">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "ל">
+<!ENTITY redoCmd.label             "בצע שוב">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "צ">
+<!ENTITY cutCmd.label              "גזור">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "ג">
+<!ENTITY copyCmd.label             "העתק">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "ת">
+<!ENTITY pasteCmd.label            "הדבק">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "ה">
+<!ENTITY deleteCmd.label           "מחק">
+<!ENTITY deleteCmd.accesskey       "מ">
+<!ENTITY selectAllCmd.label        "בחר הכול">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "ב">
+<!ENTITY findCmd.label             "חפש">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "פ">
+<!ENTITY findAgainCmd.label        "מצא שוב">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "ש">
+<!ENTITY findPreviousCmd.label     "מצא את הקודם">
+<!ENTITY findPreviousCmd.accesskey "v">
diff --git a/chrome/locale/he-IL/zotero/preferences.dtd b/chrome/locale/he-IL/zotero/preferences.dtd
index 31d555377..922f140b8 100644
--- a/chrome/locale/he-IL/zotero/preferences.dtd
+++ b/chrome/locale/he-IL/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "כללי">
 
 <!ENTITY zotero.preferences.userInterface "ממשק משתמש">
-<!ENTITY zotero.preferences.showIn "Load Zotero in:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser pane">
-<!ENTITY zotero.preferences.showIn.separateTab "לשונית נפרדת">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/he-IL/zotero/standalone.dtd b/chrome/locale/he-IL/zotero/standalone.dtd
index eab2bffcf..7af3e952d 100644
--- a/chrome/locale/he-IL/zotero/standalone.dtd
+++ b/chrome/locale/he-IL/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "עריכה">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "חתוך">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "העתק">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "העתק ציטוט">
 <!ENTITY copyBibliographyCmd.label "העתק ביבליוגרפיה">
-<!ENTITY pasteCmd.label "הדבק">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "מחק">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "בחר הכל">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "העדפות">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "החלף כיוון עמוד">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "החלף כיוון טקסט">
diff --git a/chrome/locale/he-IL/zotero/zotero.dtd b/chrome/locale/he-IL/zotero/zotero.dtd
index ec8b3597c..61b0d1878 100644
--- a/chrome/locale/he-IL/zotero/zotero.dtd
+++ b/chrome/locale/he-IL/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation">
 <!ENTITY zotero.toolbar.about.label "About Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "חיפוש מתקדם">
-<!ENTITY zotero.toolbar.tab.tooltip "Toggle Tab Mode">
 <!ENTITY zotero.toolbar.openURL.label "Locate">
 <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library">
 
diff --git a/chrome/locale/hr-HR/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/hr-HR/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..474b306fb
--- /dev/null
+++ b/chrome/locale/hr-HR/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Uredi">
+<!ENTITY editMenu.accesskey        "U">
+<!ENTITY undoCmd.label             "Vrati">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "V">
+<!ENTITY redoCmd.label             "Ponovi">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "P">
+<!ENTITY cutCmd.label              "Izreži">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "I">
+<!ENTITY copyCmd.label             "Kopiraj">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "K">
+<!ENTITY pasteCmd.label            "Zalijepi">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "p">
+<!ENTITY deleteCmd.label           "Obriši">
+<!ENTITY deleteCmd.accesskey       "O">
+<!ENTITY selectAllCmd.label        "Označi sve">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "Traži">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "T">
+<!ENTITY findAgainCmd.label        "Ponovno pronađi">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "P">
+<!ENTITY findPreviousCmd.label     "Pronađi prethodno">
+<!ENTITY findPreviousCmd.accesskey "P">
diff --git a/chrome/locale/hr-HR/zotero/preferences.dtd b/chrome/locale/hr-HR/zotero/preferences.dtd
index 0a9edd782..1200095d2 100644
--- a/chrome/locale/hr-HR/zotero/preferences.dtd
+++ b/chrome/locale/hr-HR/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "General">
 
 <!ENTITY zotero.preferences.userInterface "User Interface">
-<!ENTITY zotero.preferences.showIn "Load Zotero in:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser pane">
-<!ENTITY zotero.preferences.showIn.separateTab "Separate tab">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/hr-HR/zotero/standalone.dtd b/chrome/locale/hr-HR/zotero/standalone.dtd
index f65b337ff..72108906a 100644
--- a/chrome/locale/hr-HR/zotero/standalone.dtd
+++ b/chrome/locale/hr-HR/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copy Citation">
 <!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Delete">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
diff --git a/chrome/locale/hr-HR/zotero/zotero.dtd b/chrome/locale/hr-HR/zotero/zotero.dtd
index e5dca48b7..f99d3dc4a 100644
--- a/chrome/locale/hr-HR/zotero/zotero.dtd
+++ b/chrome/locale/hr-HR/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation">
 <!ENTITY zotero.toolbar.about.label "About Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Advanced Search">
-<!ENTITY zotero.toolbar.tab.tooltip "Toggle Tab Mode">
 <!ENTITY zotero.toolbar.openURL.label "Locate">
 <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library">
 
diff --git a/chrome/locale/hu-HU/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/hu-HU/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..d6e560cd8
--- /dev/null
+++ b/chrome/locale/hu-HU/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Szerkesztés">
+<!ENTITY editMenu.accesskey        "z">
+<!ENTITY undoCmd.label             "Visszavonás">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "V">
+<!ENTITY redoCmd.label             "Újra">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "r">
+<!ENTITY cutCmd.label              "Kivágás">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "K">
+<!ENTITY copyCmd.label             "Másolás">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "M">
+<!ENTITY pasteCmd.label            "Beillesztés">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "B">
+<!ENTITY deleteCmd.label           "Törlés">
+<!ENTITY deleteCmd.accesskey       "T">
+<!ENTITY selectAllCmd.label        "Minden kijelölése">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "d">
+<!ENTITY findCmd.label             "Keresés">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "e">
+<!ENTITY findAgainCmd.label        "Következő keresése">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "z">
+<!ENTITY findPreviousCmd.label     "Előző keresése">
+<!ENTITY findPreviousCmd.accesskey "E">
diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd
index ea46f1035..56cafa002 100644
--- a/chrome/locale/hu-HU/zotero/preferences.dtd
+++ b/chrome/locale/hu-HU/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Általános">
 
 <!ENTITY zotero.preferences.userInterface "Felhasználói felület">
-<!ENTITY zotero.preferences.showIn "Zotero futtatása:">
-<!ENTITY zotero.preferences.showIn.browserPane "Böngésző ablak">
-<!ENTITY zotero.preferences.showIn.separateTab "Új lap">
-<!ENTITY zotero.preferences.showIn.appTab "Lap rögzítése">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/hu-HU/zotero/standalone.dtd b/chrome/locale/hu-HU/zotero/standalone.dtd
index d44db64da..3b35b78d8 100644
--- a/chrome/locale/hu-HU/zotero/standalone.dtd
+++ b/chrome/locale/hu-HU/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Szerkesztés">
-<!ENTITY editMenu.accesskey "S">
-<!ENTITY undoCmd.label "Visszavonás">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "F">
-<!ENTITY redoCmd.label "Mégis">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Kivágás">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Másolás">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Hivatkozás másolása">
 <!ENTITY copyBibliographyCmd.label "Bibliográfia másolása">
-<!ENTITY pasteCmd.label "Beillesztés">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Törlés">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Mindet kijelöli">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Beállítások">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Beállítások">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Keresés">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Oldal irányának megfordítása">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Szöveg irányának megfordítása">
diff --git a/chrome/locale/hu-HU/zotero/zotero.dtd b/chrome/locale/hu-HU/zotero/zotero.dtd
index bf531ab90..8342a44f1 100644
--- a/chrome/locale/hu-HU/zotero/zotero.dtd
+++ b/chrome/locale/hu-HU/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Támogatás és dokumentáció">
 <!ENTITY zotero.toolbar.about.label "Névjegy">
 <!ENTITY zotero.toolbar.advancedSearch "Haladó keresés">
-<!ENTITY zotero.toolbar.tab.tooltip "Toggle Tab Mode">
 <!ENTITY zotero.toolbar.openURL.label "Keresés">
 <!ENTITY zotero.toolbar.openURL.tooltip "Hol találom a helyi könyvtárban?">
 
diff --git a/chrome/locale/id-ID/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/id-ID/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..af6786fd6
--- /dev/null
+++ b/chrome/locale/id-ID/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Ubah">
+<!ENTITY editMenu.accesskey        "U">
+<!ENTITY undoCmd.label             "Urungkan">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "g">
+<!ENTITY redoCmd.label             "Ulangi">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "U">
+<!ENTITY cutCmd.label              "Potong">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "P">
+<!ENTITY copyCmd.label             "Salin">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "S">
+<!ENTITY pasteCmd.label            "Tempel">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "p">
+<!ENTITY deleteCmd.label           "Hapus">
+<!ENTITY deleteCmd.accesskey       "H">
+<!ENTITY selectAllCmd.label        "Pilih Semua">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "Cari">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "C">
+<!ENTITY findAgainCmd.label        "Cari Lagi">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "i">
+<!ENTITY findPreviousCmd.label     "Cari Sebelumnya">
+<!ENTITY findPreviousCmd.accesskey "S">
diff --git a/chrome/locale/id-ID/zotero/preferences.dtd b/chrome/locale/id-ID/zotero/preferences.dtd
index 2e1896b25..1e602772c 100644
--- a/chrome/locale/id-ID/zotero/preferences.dtd
+++ b/chrome/locale/id-ID/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "General">
 
 <!ENTITY zotero.preferences.userInterface "Antarmuka pengguna">
-<!ENTITY zotero.preferences.showIn "Muat Zotero di dalam:">
-<!ENTITY zotero.preferences.showIn.browserPane "Jendela peramban">
-<!ENTITY zotero.preferences.showIn.separateTab "Tab terpisah">
-<!ENTITY zotero.preferences.showIn.appTab "Tab App">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/id-ID/zotero/standalone.dtd b/chrome/locale/id-ID/zotero/standalone.dtd
index 4fe02a3bd..10a66248a 100644
--- a/chrome/locale/id-ID/zotero/standalone.dtd
+++ b/chrome/locale/id-ID/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Potong">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopi">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Kopi Sitasi">
 <!ENTITY copyBibliographyCmd.label "Kopi Bibliografi">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Hapus">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Pilih Semua">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferensi">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Temukan">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Ubah Arah Halaman">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Ubah Arah Teks">
diff --git a/chrome/locale/id-ID/zotero/zotero.dtd b/chrome/locale/id-ID/zotero/zotero.dtd
index 6f7709d7f..948540d3b 100644
--- a/chrome/locale/id-ID/zotero/zotero.dtd
+++ b/chrome/locale/id-ID/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Dukungan dan Dokuementasi">
 <!ENTITY zotero.toolbar.about.label "Tentang Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Pencarian Lanjutan">
-<!ENTITY zotero.toolbar.tab.tooltip "Hidup/Matikan Mode Tab">
 <!ENTITY zotero.toolbar.openURL.label "Temukan">
 <!ENTITY zotero.toolbar.openURL.tooltip "Temukan melalui perpustakaan lokal Anda">
 
diff --git a/chrome/locale/is-IS/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/is-IS/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..410f5bdd2
--- /dev/null
+++ b/chrome/locale/is-IS/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Breyta">
+<!ENTITY editMenu.accesskey        "e">
+<!ENTITY undoCmd.label             "Afturkalla">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "u">
+<!ENTITY redoCmd.label             "Endurtaka">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "n">
+<!ENTITY cutCmd.label              "Klippa">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "K">
+<!ENTITY copyCmd.label             "Afrita">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "A">
+<!ENTITY pasteCmd.label            "Líma">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "L">
+<!ENTITY deleteCmd.label           "Eyða">
+<!ENTITY deleteCmd.accesskey       "E">
+<!ENTITY selectAllCmd.label        "Velja allt">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "j">
+<!ENTITY findCmd.label             "Leita">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "i">
+<!ENTITY findAgainCmd.label        "Leita aftur">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "t">
+<!ENTITY findPreviousCmd.label     "Leita til baka">
+<!ENTITY findPreviousCmd.accesskey "b">
diff --git a/chrome/locale/is-IS/zotero/preferences.dtd b/chrome/locale/is-IS/zotero/preferences.dtd
index 226790e39..b344c3b23 100644
--- a/chrome/locale/is-IS/zotero/preferences.dtd
+++ b/chrome/locale/is-IS/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Almennt">
 
 <!ENTITY zotero.preferences.userInterface "Notendaviðmót">
-<!ENTITY zotero.preferences.showIn "Hlaða Zotero í:">
-<!ENTITY zotero.preferences.showIn.browserPane "Nýjum vafraglugga">
-<!ENTITY zotero.preferences.showIn.separateTab "Nýjum flipa">
-<!ENTITY zotero.preferences.showIn.appTab "Flipa í smáforriti">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/is-IS/zotero/standalone.dtd b/chrome/locale/is-IS/zotero/standalone.dtd
index 15a541933..6ecd3ba6e 100644
--- a/chrome/locale/is-IS/zotero/standalone.dtd
+++ b/chrome/locale/is-IS/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Breyta">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Afturkalla">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Endurgera">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Klippa">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Afrita">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Afrita tilvísun">
 <!ENTITY copyBibliographyCmd.label "Afrita heimildaskrá">
-<!ENTITY pasteCmd.label "Líma">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Eyða">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Velja allt">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Stillingar">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Kjörstillingar">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Finna">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Snúa við síðustefnu">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Snúa við textastefnu">
diff --git a/chrome/locale/is-IS/zotero/zotero.dtd b/chrome/locale/is-IS/zotero/zotero.dtd
index 99bb2e0a6..a7c23eabe 100644
--- a/chrome/locale/is-IS/zotero/zotero.dtd
+++ b/chrome/locale/is-IS/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Stuðningur og leiðbeiningar">
 <!ENTITY zotero.toolbar.about.label "Um Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Ítarleg leit">
-<!ENTITY zotero.toolbar.tab.tooltip "Víxla Tab ham">
 <!ENTITY zotero.toolbar.openURL.label "Staðsetja">
 <!ENTITY zotero.toolbar.openURL.tooltip "Finna í næsta bókasafni">
 
diff --git a/chrome/locale/it-IT/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/it-IT/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..535a2a87e
--- /dev/null
+++ b/chrome/locale/it-IT/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label "Modifica">
+<!ENTITY editMenu.accesskey "M">
+<!ENTITY undoCmd.label "Annulla">
+<!ENTITY undoCmd.key "Z">
+<!ENTITY undoCmd.accesskey "A">
+<!ENTITY redoCmd.label "Ripeti">
+<!ENTITY redoCmd.key "Y">
+<!ENTITY redoCmd.accesskey "R">
+<!ENTITY cutCmd.label "Taglia">
+<!ENTITY cutCmd.key "X">
+<!ENTITY cutCmd.accesskey "T">
+<!ENTITY copyCmd.label "Copia">
+<!ENTITY copyCmd.key "C">
+<!ENTITY copyCmd.accesskey "C">
+<!ENTITY pasteCmd.label "Incolla">
+<!ENTITY pasteCmd.key "V">
+<!ENTITY pasteCmd.accesskey "I">
+<!ENTITY deleteCmd.label "Elimina">
+<!ENTITY deleteCmd.accesskey "E">
+<!ENTITY selectAllCmd.label "Seleziona tutto">
+<!ENTITY selectAllCmd.key "A">
+<!ENTITY selectAllCmd.accesskey "S">
+<!ENTITY findCmd.label "Trova">
+<!ENTITY findCmd.key "F">
+<!ENTITY findCmd.accesskey "v">
+<!ENTITY findAgainCmd.label "Trova successivo">
+<!ENTITY findAgainCmd.key "G">
+<!ENTITY findAgainCmd.key2 "VK_F3">
+<!ENTITY findAgainCmd.accesskey "u">
+<!ENTITY findPreviousCmd.label "Trova precedente">
+<!ENTITY findPreviousCmd.accesskey "p">
diff --git a/chrome/locale/it-IT/zotero/preferences.dtd b/chrome/locale/it-IT/zotero/preferences.dtd
index 5516734fd..757c7956e 100644
--- a/chrome/locale/it-IT/zotero/preferences.dtd
+++ b/chrome/locale/it-IT/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Generale">
 
 <!ENTITY zotero.preferences.userInterface "Interfaccia utente">
-<!ENTITY zotero.preferences.showIn "Carica Zotero come:">
-<!ENTITY zotero.preferences.showIn.browserPane "finestra nella parte inferiore del browser">
-<!ENTITY zotero.preferences.showIn.separateTab "tab separato">
-<!ENTITY zotero.preferences.showIn.appTab "tab applicazione">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/it-IT/zotero/standalone.dtd b/chrome/locale/it-IT/zotero/standalone.dtd
index bb22a31a2..c5e0ffad6 100644
--- a/chrome/locale/it-IT/zotero/standalone.dtd
+++ b/chrome/locale/it-IT/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Modifica">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Annulla">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Ripeti">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Taglia">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copia">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copia la citazione">
 <!ENTITY copyBibliographyCmd.label "Copia la bibliografia">
-<!ENTITY pasteCmd.label "Incolla">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Cancella">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Seleziona tutto">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Opzioni">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferenze">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Trova">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Inverti l'orientamento di pagina">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Inverti la direzione del testo">
diff --git a/chrome/locale/it-IT/zotero/zotero.dtd b/chrome/locale/it-IT/zotero/zotero.dtd
index 5e94fd25f..fffe671f2 100644
--- a/chrome/locale/it-IT/zotero/zotero.dtd
+++ b/chrome/locale/it-IT/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Aiuto e documentazione">
 <!ENTITY zotero.toolbar.about.label "Informazioni su Zotero...">
 <!ENTITY zotero.toolbar.advancedSearch "Ricerca avanzata">
-<!ENTITY zotero.toolbar.tab.tooltip "Attiva la modalità tab">
 <!ENTITY zotero.toolbar.openURL.label "Trova">
 <!ENTITY zotero.toolbar.openURL.tooltip "Cerca nelle librerie personali">
 
diff --git a/chrome/locale/ja-JP/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/ja-JP/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..6eb2360ca
--- /dev/null
+++ b/chrome/locale/ja-JP/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label			"編集">
+<!ENTITY editMenu.accesskey		"e">
+<!ENTITY undoCmd.label			"元に戻す">
+<!ENTITY undoCmd.key			"Z">
+<!ENTITY undoCmd.accesskey		"u">
+<!ENTITY redoCmd.label			"やり直し">
+<!ENTITY redoCmd.key			"Y">
+<!ENTITY redoCmd.accesskey		"r">
+<!ENTITY cutCmd.label			"切り取り">
+<!ENTITY cutCmd.key			"X">
+<!ENTITY cutCmd.accesskey		"t">
+<!ENTITY copyCmd.label			"コピー">
+<!ENTITY copyCmd.key			"C">
+<!ENTITY copyCmd.accesskey		"c">
+<!ENTITY pasteCmd.label			"貼り付け">
+<!ENTITY pasteCmd.key			"V">
+<!ENTITY pasteCmd.accesskey		"p">
+<!ENTITY deleteCmd.label		"削除">
+<!ENTITY deleteCmd.accesskey		"d">
+<!ENTITY selectAllCmd.label		"すべて選択">
+<!ENTITY selectAllCmd.key		"A">
+<!ENTITY selectAllCmd.accesskey		"a">
+<!ENTITY findCmd.label			"検索">
+<!ENTITY findCmd.key			"F">
+<!ENTITY findCmd.accesskey		"F">
+<!ENTITY findAgainCmd.label		"次を検索">
+<!ENTITY findAgainCmd.key		"G">
+<!ENTITY findAgainCmd.key2		"VK_F3">
+<!ENTITY findAgainCmd.accesskey		"g">
+<!ENTITY findPreviousCmd.label		"前を検索">
+<!ENTITY findPreviousCmd.accesskey	"v">
diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd
index 3f9af1c4d..bba7730e1 100644
--- a/chrome/locale/ja-JP/zotero/preferences.dtd
+++ b/chrome/locale/ja-JP/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "一般">
 
 <!ENTITY zotero.preferences.userInterface "ユーザーインターフェース">
-<!ENTITY zotero.preferences.showIn "Zoteroを表示するのは:">
-<!ENTITY zotero.preferences.showIn.browserPane "ブラウザ画面下">
-<!ENTITY zotero.preferences.showIn.separateTab "新しいタブ">
-<!ENTITY zotero.preferences.showIn.appTab "アプリタブ">
 <!ENTITY zotero.preferences.layout "レイアウト:">
 <!ENTITY zotero.preferences.layout.standard "標準">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/ja-JP/zotero/standalone.dtd b/chrome/locale/ja-JP/zotero/standalone.dtd
index 953a8f099..773262787 100644
--- a/chrome/locale/ja-JP/zotero/standalone.dtd
+++ b/chrome/locale/ja-JP/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "編集">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "取り消す">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "やり直す">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "カット">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "コピー">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "出典表記をコピー">
 <!ENTITY copyBibliographyCmd.label "参考文献目録をコピー">
-<!ENTITY pasteCmd.label "ペースト">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "削除">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "すべてを選択">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "環境設定">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "環境設定...">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "検索">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "ページの方向を切り替える">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "文字列の方向を切り替える">
diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd
index c8f576a20..8f7a41b5b 100644
--- a/chrome/locale/ja-JP/zotero/zotero.dtd
+++ b/chrome/locale/ja-JP/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "サポートとヘルプ">
 <!ENTITY zotero.toolbar.about.label "Zotero について">
 <!ENTITY zotero.toolbar.advancedSearch "高度な検索">
-<!ENTITY zotero.toolbar.tab.tooltip "タブのモードを切り替える">
 <!ENTITY zotero.toolbar.openURL.label "所在確認">
 <!ENTITY zotero.toolbar.openURL.tooltip "あなたの所属機関の図書館を通じて所在確認">
 
diff --git a/chrome/locale/km/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/km/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..cf3120b91
--- /dev/null
+++ b/chrome/locale/km/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "កែសម្រួល">
+<!ENTITY editMenu.accesskey        "ក">
+<!ENTITY undoCmd.label             "មិនធ្វើវិញ">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "ន">
+<!ENTITY redoCmd.label             "ធ្វើ​វិញ">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "ញ">
+<!ENTITY cutCmd.label              "កាត់">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "ក">
+<!ENTITY copyCmd.label             "ចម្លង">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "ច">
+<!ENTITY pasteCmd.label            "បិទភ្ជាប់">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "ប">
+<!ENTITY deleteCmd.label           "លុប">
+<!ENTITY deleteCmd.accesskey       "ល">
+<!ENTITY selectAllCmd.label        "ជ្រើស​ទាំងអស់">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "អ">
+<!ENTITY findCmd.label             "រក">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "ក">
+<!ENTITY findAgainCmd.label        "រក​ម្តង​ទៀត">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "ត">
+<!ENTITY findPreviousCmd.label     "រក​ពី​ដើម">
+<!ENTITY findPreviousCmd.accesskey "រ">
diff --git a/chrome/locale/km/zotero/preferences.dtd b/chrome/locale/km/zotero/preferences.dtd
index 438ea0e8b..e0a390a12 100644
--- a/chrome/locale/km/zotero/preferences.dtd
+++ b/chrome/locale/km/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "ទូទៅ">
 
 <!ENTITY zotero.preferences.userInterface "ចំណុចប្រទាក់ក្រឡាអ្នកប្រើប្រាស់">
-<!ENTITY zotero.preferences.showIn "ហ្ស៊ូតេរ៉ូផ្ទុកនៅក្នុងៈ">
-<!ENTITY zotero.preferences.showIn.browserPane "ផ្ទាំងកម្មវិធីរុករក">
-<!ENTITY zotero.preferences.showIn.separateTab "ផ្ទាំងកម្មវិធីដោយឡែក">
-<!ENTITY zotero.preferences.showIn.appTab "ផ្ទាំងបន្ទាត់ថេប">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/km/zotero/standalone.dtd b/chrome/locale/km/zotero/standalone.dtd
index 0517a7a19..19f8b1f3b 100644
--- a/chrome/locale/km/zotero/standalone.dtd
+++ b/chrome/locale/km/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "កែតម្រូវ">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "បកមកក្រោយ">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "បកទៅមុខ">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "កាត់">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "ថតចម្លង">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "ថតចម្លងអាគតដ្ឋាន">
 <!ENTITY copyBibliographyCmd.label "ថតចម្លងគន្ថនិទេ្ទស">
-<!ENTITY pasteCmd.label "បិទភ្ជាប់">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "លុបចោល">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "ជ្រើសរើសទាំងអស់">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "ជម្រើសអាទិភាព">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "ស្វែងរក">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "ប្តូរទិសទំព័រ">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "ប្តូរទិសអត្ថបទ">
diff --git a/chrome/locale/km/zotero/zotero.dtd b/chrome/locale/km/zotero/zotero.dtd
index d793a4e0e..df8c7bf39 100644
--- a/chrome/locale/km/zotero/zotero.dtd
+++ b/chrome/locale/km/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "គាំទ្រ និង ឯកសារ">
 <!ENTITY zotero.toolbar.about.label "អំពីហ្ស៊ូតេរ៉ូ">
 <!ENTITY zotero.toolbar.advancedSearch "ស្វែងរកលឿន">
-<!ENTITY zotero.toolbar.tab.tooltip "បើកពេញអេក្រង់">
 <!ENTITY zotero.toolbar.openURL.label "ទីតាំងឯកសារ">
 <!ENTITY zotero.toolbar.openURL.tooltip "រកនៅតាមបណ្ណាល័យរបស់អ្នក">
 
diff --git a/chrome/locale/ko-KR/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/ko-KR/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..56a672a2d
--- /dev/null
+++ b/chrome/locale/ko-KR/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "편집">
+<!ENTITY editMenu.accesskey        "e">
+<!ENTITY undoCmd.label             "실행 취소">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "u">
+<!ENTITY redoCmd.label             "재실행">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "r">
+<!ENTITY cutCmd.label              "잘라내기">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "복사">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "c">
+<!ENTITY pasteCmd.label            "붙여넣기">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "p">
+<!ENTITY deleteCmd.label           "삭제">
+<!ENTITY deleteCmd.accesskey       "d">
+<!ENTITY selectAllCmd.label        "모두 선택">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "찾기">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "F">
+<!ENTITY findAgainCmd.label        "다시 찾기">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "g">
+<!ENTITY findPreviousCmd.label     "이전 찾기">
+<!ENTITY findPreviousCmd.accesskey "v">
diff --git a/chrome/locale/ko-KR/zotero/preferences.dtd b/chrome/locale/ko-KR/zotero/preferences.dtd
index e0cede83d..4d795658c 100644
--- a/chrome/locale/ko-KR/zotero/preferences.dtd
+++ b/chrome/locale/ko-KR/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "일반">
 
 <!ENTITY zotero.preferences.userInterface "사용자 인터페이스">
-<!ENTITY zotero.preferences.showIn "Zotero 창을 열 곳:">
-<!ENTITY zotero.preferences.showIn.browserPane "브라우저 창">
-<!ENTITY zotero.preferences.showIn.separateTab "분리 탭">
-<!ENTITY zotero.preferences.showIn.appTab "어플리케이션 탭">
 <!ENTITY zotero.preferences.layout "레이아웃:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/ko-KR/zotero/standalone.dtd b/chrome/locale/ko-KR/zotero/standalone.dtd
index 2c9b98fd0..e63aca7ad 100644
--- a/chrome/locale/ko-KR/zotero/standalone.dtd
+++ b/chrome/locale/ko-KR/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "편집">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "되돌리기">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "다시 실행">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "자르기">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "복사하기">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "인용 복사">
 <!ENTITY copyBibliographyCmd.label "서지 복사">
-<!ENTITY pasteCmd.label "붙이기">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "지우기">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "모두 선택">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "설정">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "설정">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "검색">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "페이지 방향 바꾸기">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "텍스트 방향 바꾸기">
diff --git a/chrome/locale/ko-KR/zotero/zotero.dtd b/chrome/locale/ko-KR/zotero/zotero.dtd
index 083cc7f8e..8003bfe9a 100644
--- a/chrome/locale/ko-KR/zotero/zotero.dtd
+++ b/chrome/locale/ko-KR/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "지원 및 도움말">
 <!ENTITY zotero.toolbar.about.label "Zotero 정보">
 <!ENTITY zotero.toolbar.advancedSearch "고급 검색">
-<!ENTITY zotero.toolbar.tab.tooltip "토글 탭 모드">
 <!ENTITY zotero.toolbar.openURL.label "위치">
 <!ENTITY zotero.toolbar.openURL.tooltip "로컬 라이브러리에서 검색">
 
diff --git a/chrome/locale/lt-LT/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/lt-LT/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..516058bb8
--- /dev/null
+++ b/chrome/locale/lt-LT/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Taisa">
+<!ENTITY editMenu.accesskey        "T">
+<!ENTITY undoCmd.label             "Atšaukti">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "A">
+<!ENTITY redoCmd.label             "Atstatyti">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "t">
+<!ENTITY cutCmd.label              "Iškirpti">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "r">
+<!ENTITY copyCmd.label             "Kopijuoti">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "K">
+<!ENTITY pasteCmd.label            "Įdėti">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "d">
+<!ENTITY deleteCmd.label           "Pašalinti">
+<!ENTITY deleteCmd.accesskey       "š">
+<!ENTITY selectAllCmd.label        "Pažymėti viską">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "v">
+<!ENTITY findCmd.label             "Ieškoti">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "I">
+<!ENTITY findAgainCmd.label        "Ieškoti toliau">
+<!ENTITY findAgainCmd.key          "o">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "o">
+<!ENTITY findPreviousCmd.label     "Ieškoti ankstesnio">
+<!ENTITY findPreviousCmd.accesskey "n">
diff --git a/chrome/locale/lt-LT/zotero/preferences.dtd b/chrome/locale/lt-LT/zotero/preferences.dtd
index 0f4c4dfed..f03b7ded9 100644
--- a/chrome/locale/lt-LT/zotero/preferences.dtd
+++ b/chrome/locale/lt-LT/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Bendrosios">
 
 <!ENTITY zotero.preferences.userInterface "Naudotojo sąsaja">
-<!ENTITY zotero.preferences.showIn "Zotero paleisdimas:">
-<!ENTITY zotero.preferences.showIn.browserPane "Naršyklės skydelyje">
-<!ENTITY zotero.preferences.showIn.separateTab "Atskiroje kortelėje">
-<!ENTITY zotero.preferences.showIn.appTab "Programos kortelėje">
 <!ENTITY zotero.preferences.layout "Išdėstymas">
 <!ENTITY zotero.preferences.layout.standard "Įprastas">
 <!ENTITY zotero.preferences.layout.stacked "Glaustas">
diff --git a/chrome/locale/lt-LT/zotero/standalone.dtd b/chrome/locale/lt-LT/zotero/standalone.dtd
index b9a06d8ed..6f475aab3 100644
--- a/chrome/locale/lt-LT/zotero/standalone.dtd
+++ b/chrome/locale/lt-LT/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "B">
 
 
-<!ENTITY editMenu.label "Taisa">
-<!ENTITY editMenu.accesskey "T">
-<!ENTITY undoCmd.label "Atšaukti">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "A">
-<!ENTITY redoCmd.label "Atstatyti">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "t">
-<!ENTITY cutCmd.label "Iškirpti">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "r">
-<!ENTITY copyCmd.label "Kopijuoti">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "K">
 <!ENTITY copyCitationCmd.label "Kopijuoti citatą">
 <!ENTITY copyBibliographyCmd.label "Kopijuoti bibliografiją">
-<!ENTITY pasteCmd.label "Įdėti">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "d">
-<!ENTITY deleteCmd.label "Pašalinti">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "š">
-<!ENTITY selectAllCmd.label "Pažymėti viską">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "v">
-<!ENTITY preferencesCmd.label "Nuostatos">
-<!ENTITY preferencesCmd.accesskey "N">
-<!ENTITY preferencesCmdUnix.label "Nuostatos">
-<!ENTITY preferencesCmdUnix.accesskey "N">
-<!ENTITY findCmd.label "Ieškoti">
-<!ENTITY findCmd.accesskey "I">
-<!ENTITY findCmd.commandkey "I">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Keisti puslapio kryptį">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "p">
 <!ENTITY bidiSwitchTextDirectionItem.label "Keisti teksto kryptį">
diff --git a/chrome/locale/lt-LT/zotero/zotero.dtd b/chrome/locale/lt-LT/zotero/zotero.dtd
index 41ad7b748..acc43687c 100644
--- a/chrome/locale/lt-LT/zotero/zotero.dtd
+++ b/chrome/locale/lt-LT/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Palaikymas ir dokumentacija">
 <!ENTITY zotero.toolbar.about.label "Apie Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Išplėstinė paieška">
-<!ENTITY zotero.toolbar.tab.tooltip "Keisti kortelių veikseną">
 <!ENTITY zotero.toolbar.openURL.label "Rasti vietą">
 <!ENTITY zotero.toolbar.openURL.tooltip "Ieškoti vietinėje bibliotekoje">
 
diff --git a/chrome/locale/mn-MN/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/mn-MN/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..44185616b
--- /dev/null
+++ b/chrome/locale/mn-MN/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Edit">
+<!ENTITY editMenu.accesskey        "e">
+<!ENTITY undoCmd.label             "Undo">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "u">
+<!ENTITY redoCmd.label             "Redo">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "r">
+<!ENTITY cutCmd.label              "Cut">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "Copy">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "c">
+<!ENTITY pasteCmd.label            "Paste">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "p">
+<!ENTITY deleteCmd.label           "Delete">
+<!ENTITY deleteCmd.accesskey       "d">
+<!ENTITY selectAllCmd.label        "Select All">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "Find">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "F">
+<!ENTITY findAgainCmd.label        "Find Again">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "g">
+<!ENTITY findPreviousCmd.label     "Find Previous">
+<!ENTITY findPreviousCmd.accesskey "v">
diff --git a/chrome/locale/mn-MN/zotero/preferences.dtd b/chrome/locale/mn-MN/zotero/preferences.dtd
index 0bfda5127..3f1062158 100644
--- a/chrome/locale/mn-MN/zotero/preferences.dtd
+++ b/chrome/locale/mn-MN/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Ерөнхий">
 
 <!ENTITY zotero.preferences.userInterface "Хэрэглэгчийн">
-<!ENTITY zotero.preferences.showIn "Load Zotero in:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser pane">
-<!ENTITY zotero.preferences.showIn.separateTab "Separate tab">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/mn-MN/zotero/standalone.dtd b/chrome/locale/mn-MN/zotero/standalone.dtd
index f65b337ff..72108906a 100644
--- a/chrome/locale/mn-MN/zotero/standalone.dtd
+++ b/chrome/locale/mn-MN/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copy Citation">
 <!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Delete">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
diff --git a/chrome/locale/mn-MN/zotero/zotero.dtd b/chrome/locale/mn-MN/zotero/zotero.dtd
index c85c4d0ef..8d5682834 100644
--- a/chrome/locale/mn-MN/zotero/zotero.dtd
+++ b/chrome/locale/mn-MN/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation">
 <!ENTITY zotero.toolbar.about.label "Зотерогийн тухай">
 <!ENTITY zotero.toolbar.advancedSearch "Advanced Search">
-<!ENTITY zotero.toolbar.tab.tooltip "Toggle Tab Mode">
 <!ENTITY zotero.toolbar.openURL.label "Locate">
 <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library">
 
diff --git a/chrome/locale/nb-NO/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/nb-NO/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..7b1007239
--- /dev/null
+++ b/chrome/locale/nb-NO/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Rediger">
+<!ENTITY editMenu.accesskey        "R">
+<!ENTITY undoCmd.label             "Angre">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "A">
+<!ENTITY redoCmd.label             "Gjenta">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "G">
+<!ENTITY cutCmd.label              "Klipp ut">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "u">
+<!ENTITY copyCmd.label             "Kopier">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "K">
+<!ENTITY pasteCmd.label            "Lim inn">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "L">
+<!ENTITY deleteCmd.label           "Slett">
+<!ENTITY deleteCmd.accesskey       "t">
+<!ENTITY selectAllCmd.label        "Merk alt">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "M">
+<!ENTITY findCmd.label             "Søk">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "S">
+<!ENTITY findAgainCmd.label        "Søk igjen">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "i">
+<!ENTITY findPreviousCmd.label     "Søk etter forrige">
+<!ENTITY findPreviousCmd.accesskey "f">
diff --git a/chrome/locale/nb-NO/zotero/preferences.dtd b/chrome/locale/nb-NO/zotero/preferences.dtd
index 11691516b..48576bbf5 100644
--- a/chrome/locale/nb-NO/zotero/preferences.dtd
+++ b/chrome/locale/nb-NO/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Generelt">
 
 <!ENTITY zotero.preferences.userInterface "Brukergrensesnitt">
-<!ENTITY zotero.preferences.showIn "Load Zotero in:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser pane">
-<!ENTITY zotero.preferences.showIn.separateTab "Separate tab">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/nb-NO/zotero/standalone.dtd b/chrome/locale/nb-NO/zotero/standalone.dtd
index f65b337ff..72108906a 100644
--- a/chrome/locale/nb-NO/zotero/standalone.dtd
+++ b/chrome/locale/nb-NO/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copy Citation">
 <!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Delete">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
diff --git a/chrome/locale/nb-NO/zotero/zotero.dtd b/chrome/locale/nb-NO/zotero/zotero.dtd
index f43699683..9b274a5f1 100644
--- a/chrome/locale/nb-NO/zotero/zotero.dtd
+++ b/chrome/locale/nb-NO/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation">
 <!ENTITY zotero.toolbar.about.label "Om Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Avansert søk">
-<!ENTITY zotero.toolbar.tab.tooltip "Toggle Tab Mode">
 <!ENTITY zotero.toolbar.openURL.label "Lokaliser">
 <!ENTITY zotero.toolbar.openURL.tooltip "Finn gjennom ditt lokale bibliotek">
 
diff --git a/chrome/locale/nl-NL/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/nl-NL/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..0b09810b1
--- /dev/null
+++ b/chrome/locale/nl-NL/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Bewerken">
+<!ENTITY editMenu.accesskey        "w">
+<!ENTITY undoCmd.label             "Ongedaan maken">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "O">
+<!ENTITY redoCmd.label             "Opnieuw uitvoeren">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "u">
+<!ENTITY cutCmd.label              "Knippen">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "n">
+<!ENTITY copyCmd.label             "Kopiëren">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "K">
+<!ENTITY pasteCmd.label            "Plakken">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "P">
+<!ENTITY deleteCmd.label           "Verwijderen">
+<!ENTITY deleteCmd.accesskey       "w">
+<!ENTITY selectAllCmd.label        "Alles selecteren">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "A">
+<!ENTITY findCmd.label             "Zoeken">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "Z">
+<!ENTITY findAgainCmd.label        "Opnieuw zoeken">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "e">
+<!ENTITY findPreviousCmd.label     "Vorige zoeken">
+<!ENTITY findPreviousCmd.accesskey "V">
diff --git a/chrome/locale/nl-NL/zotero/preferences.dtd b/chrome/locale/nl-NL/zotero/preferences.dtd
index 6d63b9bd3..6b8564241 100644
--- a/chrome/locale/nl-NL/zotero/preferences.dtd
+++ b/chrome/locale/nl-NL/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Algemeen">
 
 <!ENTITY zotero.preferences.userInterface "Gebruikersinterface">
-<!ENTITY zotero.preferences.showIn "Zotero laden in:">
-<!ENTITY zotero.preferences.showIn.browserPane "Zotero-venster">
-<!ENTITY zotero.preferences.showIn.separateTab "Eigen tabblad">
-<!ENTITY zotero.preferences.showIn.appTab "App-tabblad">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/nl-NL/zotero/standalone.dtd b/chrome/locale/nl-NL/zotero/standalone.dtd
index 5ea4756b1..61af94150 100644
--- a/chrome/locale/nl-NL/zotero/standalone.dtd
+++ b/chrome/locale/nl-NL/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "A">
 
 
-<!ENTITY editMenu.label "Bewerken">
-<!ENTITY editMenu.accesskey "e">
-<!ENTITY undoCmd.label "Ongedaan maken">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "O">
-<!ENTITY redoCmd.label "Opnieuw uitvoeren">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "u">
-<!ENTITY cutCmd.label "Knippen">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "n">
-<!ENTITY copyCmd.label "Kopiëren">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "K">
 <!ENTITY copyCitationCmd.label "Verwijzing kopiëren">
 <!ENTITY copyBibliographyCmd.label "Bibliografie kopiëren">
-<!ENTITY pasteCmd.label "Plakken">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Wissen">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "W">
-<!ENTITY selectAllCmd.label "Alles selecteren">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Voorkeuren">
-<!ENTITY preferencesCmd.accesskey "V">
-<!ENTITY preferencesCmdUnix.label "Voorkeuren">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Zoeken">
-<!ENTITY findCmd.accesskey "Z">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Paginarichting wijzigen">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Tekstrichting wijzigen">
diff --git a/chrome/locale/nl-NL/zotero/zotero.dtd b/chrome/locale/nl-NL/zotero/zotero.dtd
index b0fe3fcf1..787f3815c 100644
--- a/chrome/locale/nl-NL/zotero/zotero.dtd
+++ b/chrome/locale/nl-NL/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Ondersteuning en documentatie">
 <!ENTITY zotero.toolbar.about.label "Over Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Uitgebreid zoeken">
-<!ENTITY zotero.toolbar.tab.tooltip "Tabbladmodus veranderen">
 <!ENTITY zotero.toolbar.openURL.label "Opzoeken">
 <!ENTITY zotero.toolbar.openURL.tooltip "Via uw lokale bibliotheek opzoeken">
 
diff --git a/chrome/locale/nn-NO/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/nn-NO/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..31c56fc13
--- /dev/null
+++ b/chrome/locale/nn-NO/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Rediger">
+<!ENTITY editMenu.accesskey        "R">
+<!ENTITY undoCmd.label             "Angra">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "A">
+<!ENTITY redoCmd.label             "Gjer om">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "G">
+<!ENTITY cutCmd.label              "Klipp ut">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "u">
+<!ENTITY copyCmd.label             "Kopier">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "K">
+<!ENTITY pasteCmd.label            "Lim inn">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "L">
+<!ENTITY deleteCmd.label           "Slett">
+<!ENTITY deleteCmd.accesskey       "S">
+<!ENTITY selectAllCmd.label        "Merk alt">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "M">
+<!ENTITY findCmd.label             "Søk">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "S">
+<!ENTITY findAgainCmd.label        "Søk igjen">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "i">
+<!ENTITY findPreviousCmd.label     "Søk etter førre">
+<!ENTITY findPreviousCmd.accesskey "f">
diff --git a/chrome/locale/nn-NO/zotero/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd
index 2f5f050e7..ff6acf65e 100644
--- a/chrome/locale/nn-NO/zotero/preferences.dtd
+++ b/chrome/locale/nn-NO/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Generelt">
 
 <!ENTITY zotero.preferences.userInterface "Brukargrensesnitt">
-<!ENTITY zotero.preferences.showIn "Opna Zotero i:">
-<!ENTITY zotero.preferences.showIn.browserPane "Ramme i nettlesaren">
-<!ENTITY zotero.preferences.showIn.separateTab "Eiga fane">
-<!ENTITY zotero.preferences.showIn.appTab "App-fane">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/nn-NO/zotero/standalone.dtd b/chrome/locale/nn-NO/zotero/standalone.dtd
index 1f9b2b9b1..9cb71e9f5 100644
--- a/chrome/locale/nn-NO/zotero/standalone.dtd
+++ b/chrome/locale/nn-NO/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "A">
 
 
-<!ENTITY editMenu.label "Rediger">
-<!ENTITY editMenu.accesskey "R">
-<!ENTITY undoCmd.label "Angra">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "A">
-<!ENTITY redoCmd.label "Gjer om">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "G">
-<!ENTITY cutCmd.label "Klipp ut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopier">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "K">
 <!ENTITY copyCitationCmd.label "Kopier sitering">
 <!ENTITY copyBibliographyCmd.label "Kopier bibliografi">
-<!ENTITY pasteCmd.label "Lim inn">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "L">
-<!ENTITY deleteCmd.label "Slett">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "S">
-<!ENTITY selectAllCmd.label "Merk alt">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "I">
-<!ENTITY preferencesCmdUnix.label "Innstillingar">
-<!ENTITY preferencesCmdUnix.accesskey "I">
-<!ENTITY findCmd.label "Finn">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Byt sideretning">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Byt tekstretning">
diff --git a/chrome/locale/nn-NO/zotero/zotero.dtd b/chrome/locale/nn-NO/zotero/zotero.dtd
index 12b7e0c72..f8b7db895 100644
--- a/chrome/locale/nn-NO/zotero/zotero.dtd
+++ b/chrome/locale/nn-NO/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Støtte og dokumentasjon">
 <!ENTITY zotero.toolbar.about.label "Om Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Avansert søk">
-<!ENTITY zotero.toolbar.tab.tooltip "Veksla fanemodus">
 <!ENTITY zotero.toolbar.openURL.label "Lokaliser">
 <!ENTITY zotero.toolbar.openURL.tooltip "Finn gjennom det lokale biblioteket ditt">
 
diff --git a/chrome/locale/pl-PL/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/pl-PL/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..939ecab20
--- /dev/null
+++ b/chrome/locale/pl-PL/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label "Edycja" >
+<!ENTITY editMenu.accesskey "e" >
+<!ENTITY undoCmd.label "Cofnij" >
+<!ENTITY undoCmd.key "Z" >
+<!ENTITY undoCmd.accesskey "c" >
+<!ENTITY redoCmd.label "Przywróć" >
+<!ENTITY redoCmd.key "Y" >
+<!ENTITY redoCmd.accesskey "r" >
+<!ENTITY cutCmd.label "Wytnij" >
+<!ENTITY cutCmd.key "X" >
+<!ENTITY cutCmd.accesskey "t" >
+<!ENTITY copyCmd.label "Kopiuj" >
+<!ENTITY copyCmd.key "C" >
+<!ENTITY copyCmd.accesskey "K" >
+<!ENTITY pasteCmd.label "Wklej" >
+<!ENTITY pasteCmd.key "V" >
+<!ENTITY pasteCmd.accesskey "e" >
+<!ENTITY deleteCmd.label "Usuń" >
+<!ENTITY deleteCmd.accesskey "U" >
+<!ENTITY selectAllCmd.label "Zaznacz wszystko" >
+<!ENTITY selectAllCmd.key "A" >
+<!ENTITY selectAllCmd.accesskey "a" >
+<!ENTITY findCmd.label "Znajdź" >
+<!ENTITY findCmd.key "F" >
+<!ENTITY findCmd.accesskey "Z" >
+<!ENTITY findAgainCmd.label "Znajdź następne" >
+<!ENTITY findAgainCmd.key "G" >
+<!ENTITY findAgainCmd.key2 "VK_F3" >
+<!ENTITY findAgainCmd.accesskey "n" >
+<!ENTITY findPreviousCmd.label "Znajdź poprzednie" >
+<!ENTITY findPreviousCmd.accesskey "o" >
diff --git a/chrome/locale/pl-PL/zotero/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd
index 3c13c34d4..415a36be8 100644
--- a/chrome/locale/pl-PL/zotero/preferences.dtd
+++ b/chrome/locale/pl-PL/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Ogólne">
 
 <!ENTITY zotero.preferences.userInterface "Interfejs użytkownika">
-<!ENTITY zotero.preferences.showIn "Ładuj Zotero w:">
-<!ENTITY zotero.preferences.showIn.browserPane "Panelu przeglądarki">
-<!ENTITY zotero.preferences.showIn.separateTab "Oddzielnej zakładce">
-<!ENTITY zotero.preferences.showIn.appTab "Zakładce aplikacji">
 <!ENTITY zotero.preferences.layout "Wygląd:">
 <!ENTITY zotero.preferences.layout.standard "Standardowy">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/pl-PL/zotero/standalone.dtd b/chrome/locale/pl-PL/zotero/standalone.dtd
index 012c7c375..2a803017e 100644
--- a/chrome/locale/pl-PL/zotero/standalone.dtd
+++ b/chrome/locale/pl-PL/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edycja">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Cofnij">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Powtórz">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Wytnij">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopiuj">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Kopiuj cytowanie">
 <!ENTITY copyBibliographyCmd.label "Kopiuj bibliografię">
-<!ENTITY pasteCmd.label "Wklej">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Usuń">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Zaznacz wszystko">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Ustawienia">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Ustawienia">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Znajdź">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Przełącz kierunek strony">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Przełącz kierunek tekstu">
diff --git a/chrome/locale/pl-PL/zotero/zotero.dtd b/chrome/locale/pl-PL/zotero/zotero.dtd
index 1573ffa7e..23747f096 100644
--- a/chrome/locale/pl-PL/zotero/zotero.dtd
+++ b/chrome/locale/pl-PL/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Wsparcie i dokumentacja">
 <!ENTITY zotero.toolbar.about.label "Zotero - informacje">
 <!ENTITY zotero.toolbar.advancedSearch "Wyszukiwanie zaawansowane">
-<!ENTITY zotero.toolbar.tab.tooltip "Przełącz tryb zakładki">
 <!ENTITY zotero.toolbar.openURL.label "Wyszukaj lokalnie">
 <!ENTITY zotero.toolbar.openURL.tooltip "Wyszukuje w katalogu lokalnej biblioteki">
 
diff --git a/chrome/locale/pt-BR/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/pt-BR/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..92034f602
--- /dev/null
+++ b/chrome/locale/pt-BR/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Editar">
+<!ENTITY editMenu.accesskey        "E">
+<!ENTITY undoCmd.label             "Desfazer">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "D">
+<!ENTITY redoCmd.label             "Refazer">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "R">
+<!ENTITY cutCmd.label              "Cortar">
+<!ENTITY cutCmd.key                "x">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "Copiar">
+<!ENTITY copyCmd.key               "c">
+<!ENTITY copyCmd.accesskey         "C">
+<!ENTITY pasteCmd.label            "Colar">
+<!ENTITY pasteCmd.key              "v">
+<!ENTITY pasteCmd.accesskey        "o">
+<!ENTITY deleteCmd.label           "Excluir">
+<!ENTITY deleteCmd.accesskey       "x">
+<!ENTITY selectAllCmd.label        "Selecionar tudo">
+<!ENTITY selectAllCmd.key          "a">
+<!ENTITY selectAllCmd.accesskey    "S">
+<!ENTITY findCmd.label             "Localizar">
+<!ENTITY findCmd.key               "f">
+<!ENTITY findCmd.accesskey         "z">
+<!ENTITY findAgainCmd.label        "Localizar próxima">
+<!ENTITY findAgainCmd.key          "g">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "L">
+<!ENTITY findPreviousCmd.label     "Localizar anterior">
+<!ENTITY findPreviousCmd.accesskey "a">
diff --git a/chrome/locale/pt-BR/zotero/preferences.dtd b/chrome/locale/pt-BR/zotero/preferences.dtd
index 12064d912..303d14fe7 100644
--- a/chrome/locale/pt-BR/zotero/preferences.dtd
+++ b/chrome/locale/pt-BR/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Geral">
 
 <!ENTITY zotero.preferences.userInterface "Interface de usuário">
-<!ENTITY zotero.preferences.showIn "Abrir o Zotero em:">
-<!ENTITY zotero.preferences.showIn.browserPane "Painel do navegador">
-<!ENTITY zotero.preferences.showIn.separateTab "Aba separada">
-<!ENTITY zotero.preferences.showIn.appTab "Aba de aplicativo">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Padrão">
 <!ENTITY zotero.preferences.layout.stacked "Empilhado">
diff --git a/chrome/locale/pt-BR/zotero/standalone.dtd b/chrome/locale/pt-BR/zotero/standalone.dtd
index 1f2f33070..cc9718f22 100644
--- a/chrome/locale/pt-BR/zotero/standalone.dtd
+++ b/chrome/locale/pt-BR/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Editar">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Desfazer">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Refazer">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Recortar">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copiar">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copiar citação">
 <!ENTITY copyBibliographyCmd.label "Copiar bibliografia">
-<!ENTITY pasteCmd.label "Colar">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Remover">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Selecionar tudo">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferências">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferências">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Localizar">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Inverter direção da página">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Inverter direção do texto">
diff --git a/chrome/locale/pt-BR/zotero/zotero.dtd b/chrome/locale/pt-BR/zotero/zotero.dtd
index 3b627edcf..959fa8eb7 100644
--- a/chrome/locale/pt-BR/zotero/zotero.dtd
+++ b/chrome/locale/pt-BR/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Suporte e documentação">
 <!ENTITY zotero.toolbar.about.label "Sobre o Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Pesquisa avançada">
-<!ENTITY zotero.toolbar.tab.tooltip "Alternar o modo de aba">
 <!ENTITY zotero.toolbar.openURL.label "Localizar">
 <!ENTITY zotero.toolbar.openURL.tooltip "Pesquisar na sua biblioteca local">
 
diff --git a/chrome/locale/pt-PT/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/pt-PT/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..736a155fc
--- /dev/null
+++ b/chrome/locale/pt-PT/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Editar">
+<!ENTITY editMenu.accesskey        "E">
+<!ENTITY undoCmd.label             "Desfazer">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "D">
+<!ENTITY redoCmd.label             "Refazer">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "r">
+<!ENTITY cutCmd.label              "Cortar">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "Copiar">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "C">
+<!ENTITY pasteCmd.label            "Colar">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "o">
+<!ENTITY deleteCmd.label           "Apagar">
+<!ENTITY deleteCmd.accesskey       "A">
+<!ENTITY selectAllCmd.label        "Selecionar tudo">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "Localizar">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "L">
+<!ENTITY findAgainCmd.label        "Localizar novamente">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "m">
+<!ENTITY findPreviousCmd.label     "Localizar anterior">
+<!ENTITY findPreviousCmd.accesskey "z">
diff --git a/chrome/locale/pt-PT/zotero/preferences.dtd b/chrome/locale/pt-PT/zotero/preferences.dtd
index 206feca5d..314bdeaec 100644
--- a/chrome/locale/pt-PT/zotero/preferences.dtd
+++ b/chrome/locale/pt-PT/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Gerais">
 
 <!ENTITY zotero.preferences.userInterface "Interface com Utilizador">
-<!ENTITY zotero.preferences.showIn "Carregar o Zotero em:">
-<!ENTITY zotero.preferences.showIn.browserPane "Painel do navegador">
-<!ENTITY zotero.preferences.showIn.separateTab "Separador próprio">
-<!ENTITY zotero.preferences.showIn.appTab "Separador de aplicação">
 <!ENTITY zotero.preferences.layout "Disposição:">
 <!ENTITY zotero.preferences.layout.standard "Norma">
 <!ENTITY zotero.preferences.layout.stacked "Empilhado">
diff --git a/chrome/locale/pt-PT/zotero/standalone.dtd b/chrome/locale/pt-PT/zotero/standalone.dtd
index 13be31c49..664618736 100644
--- a/chrome/locale/pt-PT/zotero/standalone.dtd
+++ b/chrome/locale/pt-PT/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "x">
 
 
-<!ENTITY editMenu.label "Editar">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Desfazer">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Refazer">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cortar">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copiar">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copiar Citação">
 <!ENTITY copyBibliographyCmd.label "Copiar Bibliografia">
-<!ENTITY pasteCmd.label "Colar">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Remover">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Seleccionar Tudo">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferências">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferências">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Localizar">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Alternar Direcção da Página">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Alternar Direcção do Texto">
diff --git a/chrome/locale/pt-PT/zotero/zotero.dtd b/chrome/locale/pt-PT/zotero/zotero.dtd
index 5bd0f5297..fca5ae32d 100644
--- a/chrome/locale/pt-PT/zotero/zotero.dtd
+++ b/chrome/locale/pt-PT/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Suporte e Documentação">
 <!ENTITY zotero.toolbar.about.label "Acerca do Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Procura Avançada">
-<!ENTITY zotero.toolbar.tab.tooltip "Alternar Modo de Separadores">
 <!ENTITY zotero.toolbar.openURL.label "Localizar">
 <!ENTITY zotero.toolbar.openURL.tooltip "Encontrar através da sua biblioteca local">
 
diff --git a/chrome/locale/ro-RO/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/ro-RO/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..20907c05a
--- /dev/null
+++ b/chrome/locale/ro-RO/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,45 @@
+<!--
+# Translator(s):
+#
+# nicubunu <nicubunu@gmail.com>
+#
+-->
+<!--
+# Reviewer(s):
+#
+# alexxed <alexxed@gmail.com>
+#
+-->
+<!ENTITY editMenu.label            "Editare">
+<!ENTITY editMenu.accesskey        "E">
+<!ENTITY undoCmd.label             "Anulează">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "u">
+<!ENTITY redoCmd.label             "Refă">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "R">
+<!ENTITY cutCmd.label              "Taie">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "T">
+<!ENTITY copyCmd.label             "Copiază">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "C">
+<!ENTITY pasteCmd.label            "Lipește">
+<!ENTITY pasteCmd.key              "v">
+<!ENTITY pasteCmd.accesskey        "p">
+<!ENTITY deleteCmd.label           "Șterge">
+<!ENTITY deleteCmd.accesskey       "g">
+<!ENTITY selectAllCmd.label        "Selectează tot">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "a">
+<!ENTITY findCmd.label             "Caută">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "C">
+<!ENTITY findAgainCmd.label        "Caută din nou">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "d">
+<!ENTITY findPreviousCmd.label     "Caută înapoi">
+<!ENTITY findPreviousCmd.accesskey "p">
+
+
diff --git a/chrome/locale/ro-RO/zotero/preferences.dtd b/chrome/locale/ro-RO/zotero/preferences.dtd
index 83b1c2a34..d54b17a37 100644
--- a/chrome/locale/ro-RO/zotero/preferences.dtd
+++ b/chrome/locale/ro-RO/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Generale">
 
 <!ENTITY zotero.preferences.userInterface "Interfață utilizator">
-<!ENTITY zotero.preferences.showIn "Încarcă Zotero în:">
-<!ENTITY zotero.preferences.showIn.browserPane "Panou browser">
-<!ENTITY zotero.preferences.showIn.separateTab "Filă separată">
-<!ENTITY zotero.preferences.showIn.appTab "Filă aplicație">
 <!ENTITY zotero.preferences.layout "Machetă:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stivuite">
diff --git a/chrome/locale/ro-RO/zotero/standalone.dtd b/chrome/locale/ro-RO/zotero/standalone.dtd
index 02f8b36c2..6a90de834 100644
--- a/chrome/locale/ro-RO/zotero/standalone.dtd
+++ b/chrome/locale/ro-RO/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Editare">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Anulare">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Refacere">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Decupare">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copiere">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copiază citare">
 <!ENTITY copyBibliographyCmd.label "Copiază bibliografie">
-<!ENTITY pasteCmd.label "Lipire">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Ștergere">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Selectează tot">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferințe">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferințe">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Găsește">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Schimbă direcția paginii">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Schimbă direcția textului">
diff --git a/chrome/locale/ro-RO/zotero/zotero.dtd b/chrome/locale/ro-RO/zotero/zotero.dtd
index 41fefba5a..719b98b38 100644
--- a/chrome/locale/ro-RO/zotero/zotero.dtd
+++ b/chrome/locale/ro-RO/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Suport și documentație">
 <!ENTITY zotero.toolbar.about.label "Despre Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Căutare avansată">
-<!ENTITY zotero.toolbar.tab.tooltip "Comută în modul filă">
 <!ENTITY zotero.toolbar.openURL.label "Localizare">
 <!ENTITY zotero.toolbar.openURL.tooltip "Găsește în biblioteca ta locală">
 
diff --git a/chrome/locale/ru-RU/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/ru-RU/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..79924dd7b
--- /dev/null
+++ b/chrome/locale/ru-RU/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label "Правка">
+<!ENTITY editMenu.accesskey "П">
+<!ENTITY undoCmd.label "Отменить">
+<!ENTITY undoCmd.key "Z">
+<!ENTITY undoCmd.accesskey "О">
+<!ENTITY redoCmd.label "Повторить">
+<!ENTITY redoCmd.key "Y">
+<!ENTITY redoCmd.accesskey "р">
+<!ENTITY cutCmd.label "Вырезать">
+<!ENTITY cutCmd.key "X">
+<!ENTITY cutCmd.accesskey "В">
+<!ENTITY copyCmd.label "Копировать">
+<!ENTITY copyCmd.key "C">
+<!ENTITY copyCmd.accesskey "К">
+<!ENTITY pasteCmd.label "Вставить">
+<!ENTITY pasteCmd.key "V">
+<!ENTITY pasteCmd.accesskey "с">
+<!ENTITY deleteCmd.label "Удалить">
+<!ENTITY deleteCmd.accesskey "У">
+<!ENTITY selectAllCmd.label "Выделить всё">
+<!ENTITY selectAllCmd.key "A">
+<!ENTITY selectAllCmd.accesskey "д">
+<!ENTITY findCmd.label "Найти">
+<!ENTITY findCmd.key "F">
+<!ENTITY findCmd.accesskey "а">
+<!ENTITY findAgainCmd.label "Найти ещё раз">
+<!ENTITY findAgainCmd.key "G">
+<!ENTITY findAgainCmd.key2 "VK_F3">
+<!ENTITY findAgainCmd.accesskey "й">
+<!ENTITY findPreviousCmd.label "Найти предыдущее совпадение">
+<!ENTITY findPreviousCmd.accesskey "щ">
diff --git a/chrome/locale/ru-RU/zotero/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd
index 7ef6dd644..aecebbe01 100644
--- a/chrome/locale/ru-RU/zotero/preferences.dtd
+++ b/chrome/locale/ru-RU/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Общие">
 
 <!ENTITY zotero.preferences.userInterface "Интерфейс">
-<!ENTITY zotero.preferences.showIn "Открывать Zotero в:">
-<!ENTITY zotero.preferences.showIn.browserPane "Текущей панели">
-<!ENTITY zotero.preferences.showIn.separateTab "Отдельной вкладке">
-<!ENTITY zotero.preferences.showIn.appTab "Вкладке приложения">
 <!ENTITY zotero.preferences.layout "Вид окна">
 <!ENTITY zotero.preferences.layout.standard "Стандартный">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/ru-RU/zotero/standalone.dtd b/chrome/locale/ru-RU/zotero/standalone.dtd
index 1876bcda4..2e427b9a8 100644
--- a/chrome/locale/ru-RU/zotero/standalone.dtd
+++ b/chrome/locale/ru-RU/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Правка">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Отменить">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Повторить">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Вырезать">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Копировать">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Копировать цитату">
 <!ENTITY copyBibliographyCmd.label "Копировать библиографию">
-<!ENTITY pasteCmd.label "Вставить">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Удалить">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Выбрать все">
-<!ENTITY selectAllCmd.key "А">
-<!ENTITY selectAllCmd.accesskey "А">
-<!ENTITY preferencesCmd.label "Настройки">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Настройки">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Найти">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Сменить направление страницы">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Сменить направление текста">
diff --git a/chrome/locale/ru-RU/zotero/zotero.dtd b/chrome/locale/ru-RU/zotero/zotero.dtd
index 7a00d6bc3..89c0f6ccc 100644
--- a/chrome/locale/ru-RU/zotero/zotero.dtd
+++ b/chrome/locale/ru-RU/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Поддержка и документация">
 <!ENTITY zotero.toolbar.about.label "О Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Расширенный поиск">
-<!ENTITY zotero.toolbar.tab.tooltip "Переключить режим вкладки">
 <!ENTITY zotero.toolbar.openURL.label "Найти">
 <!ENTITY zotero.toolbar.openURL.tooltip "Найти через местную библиотеку">
 
diff --git a/chrome/locale/sk-SK/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/sk-SK/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..9b4be7cfb
--- /dev/null
+++ b/chrome/locale/sk-SK/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label "Upraviť">
+<!ENTITY editMenu.accesskey "U">
+<!ENTITY undoCmd.label "Späť">
+<!ENTITY undoCmd.key "Z">
+<!ENTITY undoCmd.accesskey "S">
+<!ENTITY redoCmd.label "Znova">
+<!ENTITY redoCmd.key "Y">
+<!ENTITY redoCmd.accesskey "Z">
+<!ENTITY cutCmd.label "Vystrihnúť">
+<!ENTITY cutCmd.key "X">
+<!ENTITY cutCmd.accesskey "V">
+<!ENTITY copyCmd.label "Kopírovať">
+<!ENTITY copyCmd.key "C">
+<!ENTITY copyCmd.accesskey "K">
+<!ENTITY pasteCmd.label "Prilepiť">
+<!ENTITY pasteCmd.key "V">
+<!ENTITY pasteCmd.accesskey "P">
+<!ENTITY deleteCmd.label "Odstrániť">
+<!ENTITY deleteCmd.accesskey "O">
+<!ENTITY selectAllCmd.label "Vybrať všetko">
+<!ENTITY selectAllCmd.key "A">
+<!ENTITY selectAllCmd.accesskey "a">
+<!ENTITY findCmd.label "Hľadať">
+<!ENTITY findCmd.key "F">
+<!ENTITY findCmd.accesskey "H">
+<!ENTITY findAgainCmd.label "Hľadať znova">
+<!ENTITY findAgainCmd.key "G">
+<!ENTITY findAgainCmd.key2 "VK_F3">
+<!ENTITY findAgainCmd.accesskey "n">
+<!ENTITY findPreviousCmd.label "Hľadať predchádzajúci">
+<!ENTITY findPreviousCmd.accesskey "r">
diff --git a/chrome/locale/sk-SK/zotero/preferences.dtd b/chrome/locale/sk-SK/zotero/preferences.dtd
index 17f5d66ff..97162449c 100644
--- a/chrome/locale/sk-SK/zotero/preferences.dtd
+++ b/chrome/locale/sk-SK/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Všeobecné">
 
 <!ENTITY zotero.preferences.userInterface "Používateľské rozhranie">
-<!ENTITY zotero.preferences.showIn "Nahrať Zotero do:">
-<!ENTITY zotero.preferences.showIn.browserPane "Panel prehliadača">
-<!ENTITY zotero.preferences.showIn.separateTab "Osobitná záložka">
-<!ENTITY zotero.preferences.showIn.appTab "Záložka aplikácií">
 <!ENTITY zotero.preferences.layout "Rozloženie:">
 <!ENTITY zotero.preferences.layout.standard "Štandard">
 <!ENTITY zotero.preferences.layout.stacked "V zásobníku">
diff --git a/chrome/locale/sk-SK/zotero/standalone.dtd b/chrome/locale/sk-SK/zotero/standalone.dtd
index 8d0a31c56..72e689416 100644
--- a/chrome/locale/sk-SK/zotero/standalone.dtd
+++ b/chrome/locale/sk-SK/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Upraviť">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Krok späť">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Krok vpred">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Vystrihnúť">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopírovať">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Kopírovať citáciu">
 <!ENTITY copyBibliographyCmd.label "Kopírovať bibliografiu">
-<!ENTITY pasteCmd.label "Vložiť">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Zmazať">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Vybrať všetko">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Predvoľby">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Nastavenia">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Hľadať">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Prepnúť smer stránky">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Prepnúť smer textu">
diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd
index a646fa3b8..bcbe8f35a 100644
--- a/chrome/locale/sk-SK/zotero/zotero.dtd
+++ b/chrome/locale/sk-SK/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Podpora a dokumentácia">
 <!ENTITY zotero.toolbar.about.label "O Zotere">
 <!ENTITY zotero.toolbar.advancedSearch "Pokročilé vyhľadávanie">
-<!ENTITY zotero.toolbar.tab.tooltip "Režim prepínania záložiek">
 <!ENTITY zotero.toolbar.openURL.label "Nájsť">
 <!ENTITY zotero.toolbar.openURL.tooltip "Nájdi v miestnej knižnici">
 
diff --git a/chrome/locale/sl-SI/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/sl-SI/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..ea8de611d
--- /dev/null
+++ b/chrome/locale/sl-SI/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Urejanje">
+<!ENTITY editMenu.accesskey        "e">
+<!ENTITY undoCmd.label             "Razveljavi">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "z">
+<!ENTITY redoCmd.label             "Ponovi">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "o">
+<!ENTITY cutCmd.label              "Izreži">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "z">
+<!ENTITY copyCmd.label             "Kopiraj">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "k">
+<!ENTITY pasteCmd.label            "Prilepi">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "p">
+<!ENTITY deleteCmd.label           "Izbriši">
+<!ENTITY deleteCmd.accesskey       "b">
+<!ENTITY selectAllCmd.label        "Izberi vse">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "v">
+<!ENTITY findCmd.label             "Najdi">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "N">
+<!ENTITY findAgainCmd.label        "Ponovno najdi">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "v">
+<!ENTITY findPreviousCmd.label     "Najdi prejšnje">
+<!ENTITY findPreviousCmd.accesskey "p">
diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd
index a00ad7083..85c5b568d 100644
--- a/chrome/locale/sl-SI/zotero/preferences.dtd
+++ b/chrome/locale/sl-SI/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Splošno">
 
 <!ENTITY zotero.preferences.userInterface "Uporabniški vmesnik">
-<!ENTITY zotero.preferences.showIn "Naloži Zotero v:">
-<!ENTITY zotero.preferences.showIn.browserPane "podoknu brskalnika">
-<!ENTITY zotero.preferences.showIn.separateTab "ločenem zavihku">
-<!ENTITY zotero.preferences.showIn.appTab "zavihku programa">
 <!ENTITY zotero.preferences.layout "Postavitev:">
 <!ENTITY zotero.preferences.layout.standard "Standardno">
 <!ENTITY zotero.preferences.layout.stacked "Naloženo">
diff --git a/chrome/locale/sl-SI/zotero/standalone.dtd b/chrome/locale/sl-SI/zotero/standalone.dtd
index 53bd3e95f..47a8c49c4 100644
--- a/chrome/locale/sl-SI/zotero/standalone.dtd
+++ b/chrome/locale/sl-SI/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "z">
 
 
-<!ENTITY editMenu.label "Uredi">
-<!ENTITY editMenu.accesskey "R">
-<!ENTITY undoCmd.label "Razveljavi">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "R">
-<!ENTITY redoCmd.label "Ponovi">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "P">
-<!ENTITY cutCmd.label "Izreži">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "z">
-<!ENTITY copyCmd.label "Kopiraj">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "K">
 <!ENTITY copyCitationCmd.label "Kopiraj citat">
 <!ENTITY copyBibliographyCmd.label "Kopiraj bibliografijo">
-<!ENTITY pasteCmd.label "Prilepi">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Izbriši">
-<!ENTITY deleteCmd.key "b">
-<!ENTITY deleteCmd.accesskey "b">
-<!ENTITY selectAllCmd.label "Izberi vse">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "z">
-<!ENTITY preferencesCmd.label "Nastavitve">
-<!ENTITY preferencesCmd.accesskey "M">
-<!ENTITY preferencesCmdUnix.label "Nastavitve">
-<!ENTITY preferencesCmdUnix.accesskey "N">
-<!ENTITY findCmd.label "Najdi">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "N">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Preklopi smer strani">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "t">
 <!ENTITY bidiSwitchTextDirectionItem.label "Preklopi smer besedila">
diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd
index a148ba141..7053a0612 100644
--- a/chrome/locale/sl-SI/zotero/zotero.dtd
+++ b/chrome/locale/sl-SI/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Podpora in dokumentacija">
 <!ENTITY zotero.toolbar.about.label "O Zoteru">
 <!ENTITY zotero.toolbar.advancedSearch "Napredno izkanje">
-<!ENTITY zotero.toolbar.tab.tooltip "Preklopi med načini zavihkov">
 <!ENTITY zotero.toolbar.openURL.label "Najdi">
 <!ENTITY zotero.toolbar.openURL.tooltip "Poišči v krajevni knjižnici">
 
diff --git a/chrome/locale/sr-RS/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/sr-RS/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..eb13ae550
--- /dev/null
+++ b/chrome/locale/sr-RS/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Уређивање">
+<!ENTITY editMenu.accesskey        "У">
+<!ENTITY undoCmd.label             "Опозови">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "О">
+<!ENTITY redoCmd.label             "Понови">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "П">
+<!ENTITY cutCmd.label              "Исеци">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "И">
+<!ENTITY copyCmd.label             "Копирај">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "К">
+<!ENTITY pasteCmd.label            "Налепи">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "л">
+<!ENTITY deleteCmd.label           "Уклони ставку">
+<!ENTITY deleteCmd.accesskey       "в">
+<!ENTITY selectAllCmd.label        "Изабери све">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "е">
+<!ENTITY findCmd.label             "Тражење">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "Т">
+<!ENTITY findAgainCmd.label        "Нађи поново">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "Н">
+<!ENTITY findPreviousCmd.label     "Нађи претходно">
+<!ENTITY findPreviousCmd.accesskey "п">
diff --git a/chrome/locale/sr-RS/zotero/preferences.dtd b/chrome/locale/sr-RS/zotero/preferences.dtd
index d9c4540f0..9997cb38e 100644
--- a/chrome/locale/sr-RS/zotero/preferences.dtd
+++ b/chrome/locale/sr-RS/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Опште">
 
 <!ENTITY zotero.preferences.userInterface "Корисничко сучеље">
-<!ENTITY zotero.preferences.showIn "Учитај Зотеро у:">
-<!ENTITY zotero.preferences.showIn.browserPane "Површ за разгледање">
-<!ENTITY zotero.preferences.showIn.separateTab "Засебна површ">
-<!ENTITY zotero.preferences.showIn.appTab "Површ програма">
 <!ENTITY zotero.preferences.layout "Распоред:">
 <!ENTITY zotero.preferences.layout.standard "Уобичајени">
 <!ENTITY zotero.preferences.layout.stacked "На гомили">
diff --git a/chrome/locale/sr-RS/zotero/standalone.dtd b/chrome/locale/sr-RS/zotero/standalone.dtd
index 8b1bb4c69..adef6d732 100644
--- a/chrome/locale/sr-RS/zotero/standalone.dtd
+++ b/chrome/locale/sr-RS/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Уређивање">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Врати">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Понови">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Исеци">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Копирај">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Копирај цитат">
 <!ENTITY copyBibliographyCmd.label "Копирај библиографију">
-<!ENTITY pasteCmd.label "Убаци">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Обриши">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Изабери све">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Поставке">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Поставке">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Нађи">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Промени смер странице">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Промени смер текста">
diff --git a/chrome/locale/sr-RS/zotero/zotero.dtd b/chrome/locale/sr-RS/zotero/zotero.dtd
index 414c108e1..f91c6623b 100644
--- a/chrome/locale/sr-RS/zotero/zotero.dtd
+++ b/chrome/locale/sr-RS/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Подршка и документација">
 <!ENTITY zotero.toolbar.about.label "О програму Зотеро">
 <!ENTITY zotero.toolbar.advancedSearch "Напредна претрага">
-<!ENTITY zotero.toolbar.tab.tooltip "Пређи у режим језичка">
 <!ENTITY zotero.toolbar.openURL.label "Пронађи">
 <!ENTITY zotero.toolbar.openURL.tooltip "Налази ставу у вашој локалној библиотеци">
 
diff --git a/chrome/locale/sv-SE/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/sv-SE/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..173462850
--- /dev/null
+++ b/chrome/locale/sv-SE/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Redigera">
+<!ENTITY editMenu.accesskey        "R">
+<!ENTITY undoCmd.label             "Ångra">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "Å">
+<!ENTITY redoCmd.label             "Gör om">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "G">
+<!ENTITY cutCmd.label              "Klipp ut">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "K">
+<!ENTITY copyCmd.label             "Kopiera">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "o">
+<!ENTITY pasteCmd.label            "Klistra in">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "l">
+<!ENTITY deleteCmd.label           "Ta bort">
+<!ENTITY deleteCmd.accesskey       "T">
+<!ENTITY selectAllCmd.label        "Markera allt">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "M">
+<!ENTITY findCmd.label             "Sök">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "S">
+<!ENTITY findAgainCmd.label        "Sök igen">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "ö">
+<!ENTITY findPreviousCmd.label     "Sök tidigare">
+<!ENTITY findPreviousCmd.accesskey "i">
diff --git a/chrome/locale/sv-SE/zotero/preferences.dtd b/chrome/locale/sv-SE/zotero/preferences.dtd
index b167f6c31..02540b906 100644
--- a/chrome/locale/sv-SE/zotero/preferences.dtd
+++ b/chrome/locale/sv-SE/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Allmänt">
 
 <!ENTITY zotero.preferences.userInterface "Användargränssnitt">
-<!ENTITY zotero.preferences.showIn "Ladda Zotero i:">
-<!ENTITY zotero.preferences.showIn.browserPane "webbläsarfönstret">
-<!ENTITY zotero.preferences.showIn.separateTab "ny flik">
-<!ENTITY zotero.preferences.showIn.appTab "programflik">
 <!ENTITY zotero.preferences.layout "Utseende:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Staplad">
diff --git a/chrome/locale/sv-SE/zotero/standalone.dtd b/chrome/locale/sv-SE/zotero/standalone.dtd
index 5a94943f9..997e924a9 100644
--- a/chrome/locale/sv-SE/zotero/standalone.dtd
+++ b/chrome/locale/sv-SE/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Redigera">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Ångra">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Gör om">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Klipp ut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopiera">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Kopiera referens">
 <!ENTITY copyBibliographyCmd.label "Kopiera källförteckning">
-<!ENTITY pasteCmd.label "Klistra in">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Radera">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Markera allt">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Inställningar">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Inställningar">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Sök">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Växla sidans läge">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Växla textflöde">
diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd
index 36622a093..ee9a681a4 100644
--- a/chrome/locale/sv-SE/zotero/zotero.dtd
+++ b/chrome/locale/sv-SE/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Hjälp och dokumentation">
 <!ENTITY zotero.toolbar.about.label "Om Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Avancerad sökning">
-<!ENTITY zotero.toolbar.tab.tooltip "Växla flikläge">
 <!ENTITY zotero.toolbar.openURL.label "Hitta">
 <!ENTITY zotero.toolbar.openURL.tooltip "Hitta på ditt lokala bibliotek">
 
diff --git a/chrome/locale/th-TH/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/th-TH/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..b49c490d4
--- /dev/null
+++ b/chrome/locale/th-TH/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "แก้ไข">
+<!ENTITY editMenu.accesskey        "ก">
+<!ENTITY undoCmd.label             "เลิกทำ">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "เ">
+<!ENTITY redoCmd.label             "ทำซ้ำ">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "ท">
+<!ENTITY cutCmd.label              "ตัด">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "ต">
+<!ENTITY copyCmd.label             "คัดลอก">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "ค">
+<!ENTITY pasteCmd.label            "วาง">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "ว">
+<!ENTITY deleteCmd.label           "ลบ">
+<!ENTITY deleteCmd.accesskey       "ล">
+<!ENTITY selectAllCmd.label        "เลือกทั้งหมด">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "ท">
+<!ENTITY findCmd.label             "ค้นหา">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "ค">
+<!ENTITY findAgainCmd.label        "ค้นหาอีกครั้ง">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "ก">
+<!ENTITY findPreviousCmd.label     "ค้นหาก่อนหน้า">
+<!ENTITY findPreviousCmd.accesskey "ห">
diff --git a/chrome/locale/th-TH/zotero/preferences.dtd b/chrome/locale/th-TH/zotero/preferences.dtd
index ddea9ab36..abbb77b3b 100644
--- a/chrome/locale/th-TH/zotero/preferences.dtd
+++ b/chrome/locale/th-TH/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "ทั่วไป">
 
 <!ENTITY zotero.preferences.userInterface "ส่วนต่อประสานกับผู้ใช้">
-<!ENTITY zotero.preferences.showIn "โหลด Zotero ใน:">
-<!ENTITY zotero.preferences.showIn.browserPane "ช่องเบราเซอร์">
-<!ENTITY zotero.preferences.showIn.separateTab "แยกแท็บ">
-<!ENTITY zotero.preferences.showIn.appTab "แท็บโปรแกรม">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/th-TH/zotero/standalone.dtd b/chrome/locale/th-TH/zotero/standalone.dtd
index 8e17fb477..bc907263e 100644
--- a/chrome/locale/th-TH/zotero/standalone.dtd
+++ b/chrome/locale/th-TH/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "แก้ไข">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "เลิกทำ">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "ทำซ้ำ">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "ตัด">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "สำเนา">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "สำเนาการอ้างอิง">
 <!ENTITY copyBibliographyCmd.label "สำเนาบรรณานุกรม">
-<!ENTITY pasteCmd.label "วาง">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "ลบ">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "เลือกทั้งหมด">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "ตั้งค่าพึงใจ">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "ค้นหา">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "สลับทิศทางของหน้า">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "สลับทิศทางของอักษร">
diff --git a/chrome/locale/th-TH/zotero/zotero.dtd b/chrome/locale/th-TH/zotero/zotero.dtd
index 1d8adbc6a..b982d6b00 100644
--- a/chrome/locale/th-TH/zotero/zotero.dtd
+++ b/chrome/locale/th-TH/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "การสนับสนุนและเอกสาร">
 <!ENTITY zotero.toolbar.about.label "เกี่ยวกับ Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "ค้นหาแบบขั้นสูง">
-<!ENTITY zotero.toolbar.tab.tooltip "ปรับสู่แบบแท็บ">
 <!ENTITY zotero.toolbar.openURL.label "หาที่ตั้ง">
 <!ENTITY zotero.toolbar.openURL.tooltip "ค้นหาผ่านไลบรารี่ในเครื่องของคุณ">
 
diff --git a/chrome/locale/tr-TR/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/tr-TR/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..062d2e3b4
--- /dev/null
+++ b/chrome/locale/tr-TR/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Düzenle">
+<!ENTITY editMenu.accesskey        "e">
+<!ENTITY undoCmd.label             "Geri al">
+<!ENTITY undoCmd.key               "z">
+<!ENTITY undoCmd.accesskey         "G">
+<!ENTITY redoCmd.label             "Yinele">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "Y">
+<!ENTITY cutCmd.label              "Kes">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "K">
+<!ENTITY copyCmd.label             "Kopyala">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "o">
+<!ENTITY pasteCmd.label            "Yapıştır">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "a">
+<!ENTITY deleteCmd.label           "Sil">
+<!ENTITY deleteCmd.accesskey       "S">
+<!ENTITY selectAllCmd.label        "Tümünü seç">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "T">
+<!ENTITY findCmd.label             "Bul">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "B">
+<!ENTITY findAgainCmd.label        "Sonrakini bul">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "n">
+<!ENTITY findPreviousCmd.label     "Öncekini bul">
+<!ENTITY findPreviousCmd.accesskey "n">
diff --git a/chrome/locale/tr-TR/zotero/standalone.dtd b/chrome/locale/tr-TR/zotero/standalone.dtd
index 7851ac46e..a55a539b4 100644
--- a/chrome/locale/tr-TR/zotero/standalone.dtd
+++ b/chrome/locale/tr-TR/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Düzen">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Geri Al">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Yinele">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Kes">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Kopyala">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Gönderme Kopyala">
 <!ENTITY copyBibliographyCmd.label "Bibliyografya Kopyala">
-<!ENTITY pasteCmd.label "Yapıştır">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Sil">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Tümünü Seç">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Tercihler">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Tercihler">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Bul">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Sayfa Yönünü Değiştir">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Yazım Yönünü Değiştir">
diff --git a/chrome/locale/uk-UA/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/uk-UA/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..64ed7765f
--- /dev/null
+++ b/chrome/locale/uk-UA/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Правка">
+<!ENTITY editMenu.accesskey        "П">
+<!ENTITY undoCmd.label             "Повернути">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "е">
+<!ENTITY redoCmd.label             "Повторити">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "т">
+<!ENTITY cutCmd.label              "Вирізати">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "р">
+<!ENTITY copyCmd.label             "Копіювати">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "п">
+<!ENTITY pasteCmd.label            "Вставити">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "а">
+<!ENTITY deleteCmd.label           "Стерти">
+<!ENTITY deleteCmd.accesskey       "С">
+<!ENTITY selectAllCmd.label        "Виділити все">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "л">
+<!ENTITY findCmd.label             "Знайти">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "З">
+<!ENTITY findAgainCmd.label        "Шукати далі">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "д">
+<!ENTITY findPreviousCmd.label     "Шукати попереднє">
+<!ENTITY findPreviousCmd.accesskey "п">
diff --git a/chrome/locale/uk-UA/zotero/preferences.dtd b/chrome/locale/uk-UA/zotero/preferences.dtd
index ee5436e0f..6b595f86d 100644
--- a/chrome/locale/uk-UA/zotero/preferences.dtd
+++ b/chrome/locale/uk-UA/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Загальні">
 
 <!ENTITY zotero.preferences.userInterface "Інтерфейс">
-<!ENTITY zotero.preferences.showIn "Відкривати в Zotero:">
-<!ENTITY zotero.preferences.showIn.browserPane "Поточній панелі">
-<!ENTITY zotero.preferences.showIn.separateTab "Окремій вкладці">
-<!ENTITY zotero.preferences.showIn.appTab "Вкладці додатку">
 <!ENTITY zotero.preferences.layout "Компонування">
 <!ENTITY zotero.preferences.layout.standard "Стандарт">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/uk-UA/zotero/standalone.dtd b/chrome/locale/uk-UA/zotero/standalone.dtd
index 4004bea74..625ad5436 100644
--- a/chrome/locale/uk-UA/zotero/standalone.dtd
+++ b/chrome/locale/uk-UA/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Редагувати">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Скасувати ввід">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Повторити ввод">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Вирізати">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Копіювати">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Копіювати цитату">
 <!ENTITY copyBibliographyCmd.label "Копіювати список літератури">
-<!ENTITY pasteCmd.label "Вставити">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Видалити">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Вибрати все">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Налаштування">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Налаштування">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Знайти">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Переключити напрямок сторінки">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Переключити напрямок тексту">
diff --git a/chrome/locale/uk-UA/zotero/zotero.dtd b/chrome/locale/uk-UA/zotero/zotero.dtd
index d67ab2927..7c861ea20 100644
--- a/chrome/locale/uk-UA/zotero/zotero.dtd
+++ b/chrome/locale/uk-UA/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Підтримка і документація">
 <!ENTITY zotero.toolbar.about.label "Про Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Розширений пошук">
-<!ENTITY zotero.toolbar.tab.tooltip "Переключити режим вкладки">
 <!ENTITY zotero.toolbar.openURL.label "Знайти">
 <!ENTITY zotero.toolbar.openURL.tooltip "Знайти через місцеву бібліотеку">
 
diff --git a/chrome/locale/vi-VN/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/vi-VN/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..67e4845f5
--- /dev/null
+++ b/chrome/locale/vi-VN/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "Chỉnh sửa">
+<!ENTITY editMenu.accesskey        "s">
+<!ENTITY undoCmd.label             "Hoàn tác">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "H">
+<!ENTITY redoCmd.label             "Làm lại">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "L">
+<!ENTITY cutCmd.label              "Cắt">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "Chép">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "C">
+<!ENTITY pasteCmd.label            "Dán">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "D">
+<!ENTITY deleteCmd.label           "Xóa">
+<!ENTITY deleteCmd.accesskey       "X">
+<!ENTITY selectAllCmd.label        "Chọn toàn bộ">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "b">
+<!ENTITY findCmd.label             "Tìm">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "m">
+<!ENTITY findAgainCmd.label        "Tìm tiếp">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "p">
+<!ENTITY findPreviousCmd.label     "Tìm phía trước">
+<!ENTITY findPreviousCmd.accesskey "r">
diff --git a/chrome/locale/vi-VN/zotero/preferences.dtd b/chrome/locale/vi-VN/zotero/preferences.dtd
index f03504b7f..a2149ab78 100644
--- a/chrome/locale/vi-VN/zotero/preferences.dtd
+++ b/chrome/locale/vi-VN/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "Các tùy chọn chung">
 
 <!ENTITY zotero.preferences.userInterface "Giao diện người dùng">
-<!ENTITY zotero.preferences.showIn "Nạp Zotero vào:">
-<!ENTITY zotero.preferences.showIn.browserPane "Khung trình duyệt">
-<!ENTITY zotero.preferences.showIn.separateTab "Phân cách">
-<!ENTITY zotero.preferences.showIn.appTab "Ứng dụng">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/vi-VN/zotero/standalone.dtd b/chrome/locale/vi-VN/zotero/standalone.dtd
index d9415aa9d..c7a23f255 100644
--- a/chrome/locale/vi-VN/zotero/standalone.dtd
+++ b/chrome/locale/vi-VN/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Chỉnh sửa">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "Copy Citation">
 <!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Xóa">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Chạn tất cả">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
diff --git a/chrome/locale/vi-VN/zotero/zotero.dtd b/chrome/locale/vi-VN/zotero/zotero.dtd
index 2055612f3..a64c12442 100644
--- a/chrome/locale/vi-VN/zotero/zotero.dtd
+++ b/chrome/locale/vi-VN/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "Hộ trợ và Tài liệu">
 <!ENTITY zotero.toolbar.about.label "Giới thiệu về Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "Tìm kiếm Nâng cao">
-<!ENTITY zotero.toolbar.tab.tooltip "Chế độ tab lật">
 <!ENTITY zotero.toolbar.openURL.label "Định vị">
 <!ENTITY zotero.toolbar.openURL.tooltip "Tìm trong thư viện cục bộ của bạn">
 
diff --git a/chrome/locale/zh-CN/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/zh-CN/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..0688227ea
--- /dev/null
+++ b/chrome/locale/zh-CN/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,35 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "编辑">
+<!ENTITY editMenu.accesskey        "E">
+<!ENTITY undoCmd.label             "撤销">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "U">
+<!ENTITY redoCmd.label             "重做">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "R">
+<!ENTITY cutCmd.label              "剪切">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "复制">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "C">
+<!ENTITY pasteCmd.label            "粘贴">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "P">
+<!ENTITY deleteCmd.label           "删除">
+<!ENTITY deleteCmd.accesskey       "D">
+<!ENTITY selectAllCmd.label        "全选">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "A">
+<!ENTITY findCmd.label             "查找">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "F">
+<!ENTITY findAgainCmd.label        "查找下一个">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "g">
+<!ENTITY findPreviousCmd.label     "查找上一个">
+<!ENTITY findPreviousCmd.accesskey "v">
diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd
index 9d9b8f1e1..4fb39e36a 100644
--- a/chrome/locale/zh-CN/zotero/preferences.dtd
+++ b/chrome/locale/zh-CN/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "常规">
 
 <!ENTITY zotero.preferences.userInterface "用户界面">
-<!ENTITY zotero.preferences.showIn "载入Zotero于:">
-<!ENTITY zotero.preferences.showIn.browserPane "浏览器边栏">
-<!ENTITY zotero.preferences.showIn.separateTab "独立标签页">
-<!ENTITY zotero.preferences.showIn.appTab "App 标签页">
 <!ENTITY zotero.preferences.layout "布局:">
 <!ENTITY zotero.preferences.layout.standard "标准">
 <!ENTITY zotero.preferences.layout.stacked "堆叠">
diff --git a/chrome/locale/zh-CN/zotero/standalone.dtd b/chrome/locale/zh-CN/zotero/standalone.dtd
index 14b9b28ce..0d6a89a9f 100644
--- a/chrome/locale/zh-CN/zotero/standalone.dtd
+++ b/chrome/locale/zh-CN/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "编辑">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "撤销">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "恢复">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "剪切">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "复制">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "复制引文">
 <!ENTITY copyBibliographyCmd.label "复制引文目录">
-<!ENTITY pasteCmd.label "粘贴">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "删除">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "全选">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "首选项">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "首选项">
-<!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "查找">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "切换页面方向">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
 <!ENTITY bidiSwitchTextDirectionItem.label "切换文字方向">
diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd
index 4ee8e3ba5..a021949b0 100644
--- a/chrome/locale/zh-CN/zotero/zotero.dtd
+++ b/chrome/locale/zh-CN/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "支持与文档">
 <!ENTITY zotero.toolbar.about.label "关于 Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "高级搜索">
-<!ENTITY zotero.toolbar.tab.tooltip "切换标签模式">
 <!ENTITY zotero.toolbar.openURL.label "定位">
 <!ENTITY zotero.toolbar.openURL.tooltip "在本地文献库里查找">
 
diff --git a/chrome/locale/zh-TW/zotero/mozilla/editMenuOverlay.dtd b/chrome/locale/zh-TW/zotero/mozilla/editMenuOverlay.dtd
new file mode 100644
index 000000000..d31f97841
--- /dev/null
+++ b/chrome/locale/zh-TW/zotero/mozilla/editMenuOverlay.dtd
@@ -0,0 +1,36 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY editMenu.label            "編輯">
+<!ENTITY editMenu.accesskey        "E">
+<!ENTITY undoCmd.label             "復原">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "U">
+<!ENTITY redoCmd.label             "取消「復原」">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "R">
+<!ENTITY cutCmd.label              "剪下">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "複製">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "C">
+<!ENTITY pasteCmd.label            "貼上">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "P">
+<!ENTITY deleteCmd.label           "刪除">
+<!ENTITY deleteCmd.accesskey       "D">
+<!ENTITY selectAllCmd.label        "全選">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "A">
+<!ENTITY findCmd.label             "尋找">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "F">
+<!ENTITY findAgainCmd.label        "找下一個">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "g">
+<!ENTITY findPreviousCmd.label     "找前一個">
+<!ENTITY findPreviousCmd.accesskey "v">
+
diff --git a/chrome/locale/zh-TW/zotero/preferences.dtd b/chrome/locale/zh-TW/zotero/preferences.dtd
index fc11dbf61..b7adf42ee 100644
--- a/chrome/locale/zh-TW/zotero/preferences.dtd
+++ b/chrome/locale/zh-TW/zotero/preferences.dtd
@@ -8,10 +8,6 @@
 <!ENTITY zotero.preferences.prefpane.general "一般">
 
 <!ENTITY zotero.preferences.userInterface "使用者介面">
-<!ENTITY zotero.preferences.showIn "於…載入 Zotero：">
-<!ENTITY zotero.preferences.showIn.browserPane "瀏覽器窗格">
-<!ENTITY zotero.preferences.showIn.separateTab "不同的頁籤">
-<!ENTITY zotero.preferences.showIn.appTab "App 頁籤">
 <!ENTITY zotero.preferences.layout "Layout:">
 <!ENTITY zotero.preferences.layout.standard "Standard">
 <!ENTITY zotero.preferences.layout.stacked "Stacked">
diff --git a/chrome/locale/zh-TW/zotero/standalone.dtd b/chrome/locale/zh-TW/zotero/standalone.dtd
index 2d62cb3a1..ccdf2ac76 100644
--- a/chrome/locale/zh-TW/zotero/standalone.dtd
+++ b/chrome/locale/zh-TW/zotero/standalone.dtd
@@ -29,38 +29,9 @@
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "編輯">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "撤消 (U)">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "復原撤消 (R)">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "剪下 (T)">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "T">
-<!ENTITY copyCmd.label "複製 (C)">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
 <!ENTITY copyCitationCmd.label "複製成引用文獻條">
 <!ENTITY copyBibliographyCmd.label "複製成參考文獻條">
-<!ENTITY pasteCmd.label "貼上 (P)">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "刪除">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "全選">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "偏好設定 (N)">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "偏好設定 (N)">
-<!ENTITY preferencesCmdUnix.accesskey "N">
-<!ENTITY findCmd.label "搜尋 (F)">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.commandkey "f">
+
 <!ENTITY bidiSwitchPageDirectionItem.label "切換頁面方向 (G)">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "G">
 <!ENTITY bidiSwitchTextDirectionItem.label "切換文字方向 (W)">
diff --git a/chrome/locale/zh-TW/zotero/zotero.dtd b/chrome/locale/zh-TW/zotero/zotero.dtd
index 183f5fd0a..a07153cd0 100644
--- a/chrome/locale/zh-TW/zotero/zotero.dtd
+++ b/chrome/locale/zh-TW/zotero/zotero.dtd
@@ -123,7 +123,6 @@
 <!ENTITY zotero.toolbar.supportAndDocumentation "支援及說明文件">
 <!ENTITY zotero.toolbar.about.label "關於 Zotero">
 <!ENTITY zotero.toolbar.advancedSearch "進階搜尋">
-<!ENTITY zotero.toolbar.tab.tooltip "切換頁籤模式">
 <!ENTITY zotero.toolbar.openURL.label "查詢">
 <!ENTITY zotero.toolbar.openURL.tooltip "於本機文獻庫尋找">