From 2409be1033ec4d5b2b2ac4eb0dd04469d175a16e Mon Sep 17 00:00:00 2001
From: Takashi Tamura <tamuratak@users.noreply.github.com>
Date: Sat, 2 Sep 2023 10:05:04 +0900
Subject: [PATCH] Update PDF.js to v3.10.111

---
 dev/viewer/viewer.html.diff           |  22 +-
 dev/viewer/viewer.js.diff             |  18 +-
 package-lock.json                     |  14 +-
 package.json                          |   2 +-
 viewer/locale/ach/viewer.properties   |  28 +-
 viewer/locale/be/viewer.properties    |  11 +
 viewer/locale/cs/viewer.properties    |  11 +
 viewer/locale/cy/viewer.properties    |  11 +
 viewer/locale/da/viewer.properties    |  19 +-
 viewer/locale/de/viewer.properties    |  11 +
 viewer/locale/dsb/viewer.properties   |  11 +
 viewer/locale/el/viewer.properties    |   5 +
 viewer/locale/en-GB/viewer.properties |  11 +
 viewer/locale/en-US/viewer.properties |   6 +-
 viewer/locale/eo/viewer.properties    |  16 +-
 viewer/locale/es-AR/viewer.properties |  11 +
 viewer/locale/es-CL/viewer.properties |  11 +
 viewer/locale/es-ES/viewer.properties |   8 +-
 viewer/locale/eu/viewer.properties    |  10 +-
 viewer/locale/fi/viewer.properties    |  11 +-
 viewer/locale/fr/viewer.properties    |  11 +
 viewer/locale/fur/viewer.properties   |   5 +
 viewer/locale/fy-NL/viewer.properties |  11 +
 viewer/locale/gn/viewer.properties    |  11 +
 viewer/locale/he/viewer.properties    |  11 +
 viewer/locale/hi-IN/viewer.properties |  15 +-
 viewer/locale/hsb/viewer.properties   |  11 +
 viewer/locale/hu/viewer.properties    |  19 +-
 viewer/locale/ia/viewer.properties    |  19 +-
 viewer/locale/is/viewer.properties    |  11 +
 viewer/locale/it/viewer.properties    |   9 +
 viewer/locale/ja/viewer.properties    |  36 +--
 viewer/locale/ka/viewer.properties    |  19 +-
 viewer/locale/kk/viewer.properties    |  11 +
 viewer/locale/ko/viewer.properties    |  11 +
 viewer/locale/mk/viewer.properties    |  95 ++++++-
 viewer/locale/nl/viewer.properties    |  11 +
 viewer/locale/nn-NO/viewer.properties |  13 +-
 viewer/locale/oc/viewer.properties    |  13 +-
 viewer/locale/pl/viewer.properties    |  17 +-
 viewer/locale/pt-BR/viewer.properties |  13 +-
 viewer/locale/pt-PT/viewer.properties |  11 +
 viewer/locale/rm/viewer.properties    |  13 +-
 viewer/locale/ru/viewer.properties    |  11 +
 viewer/locale/sat/viewer.properties   |   9 +-
 viewer/locale/sc/viewer.properties    |  22 +-
 viewer/locale/si/viewer.properties    |  13 +
 viewer/locale/sk/viewer.properties    |  19 +-
 viewer/locale/skr/viewer.properties   |  12 +-
 viewer/locale/sl/viewer.properties    |  11 +
 viewer/locale/sv-SE/viewer.properties |  11 +
 viewer/locale/tg/viewer.properties    |   9 +
 viewer/locale/th/viewer.properties    |  11 +-
 viewer/locale/tr/viewer.properties    |   5 +
 viewer/locale/uk/viewer.properties    |  19 +-
 viewer/locale/vi/viewer.properties    |  19 +-
 viewer/locale/zh-CN/viewer.properties |  11 +
 viewer/locale/zh-TW/viewer.properties |  11 +
 viewer/viewer.css                     | 355 +++++++++++++++++---------
 viewer/viewer.html                    |  18 +-
 viewer/viewer.js                      |  85 +++---
 61 files changed, 1027 insertions(+), 267 deletions(-)

diff --git a/dev/viewer/viewer.html.diff b/dev/viewer/viewer.html.diff
index a7271a5ee..db94ace7f 100644
--- a/dev/viewer/viewer.html.diff
+++ b/dev/viewer/viewer.html.diff
@@ -1,5 +1,5 @@
---- ../tmp/pdfjs-3.9/web/viewer.html	2023-07-30 12:52:46.000000000 +0900
-+++ viewer/viewer.html	2023-08-01 08:15:36.000000000 +0900
+--- ../tmp/pdfjs-3.10/web/viewer.html	2023-08-27 17:53:36.000000000 +0900
++++ viewer/viewer.html	2023-09-02 10:03:30.000000000 +0900
 @@ -25,18 +25,25 @@
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -12,19 +12,19 @@
 -<script src="../build/pdf.js"></script>
 -
 +    <!--
-+      Because latexworkshop.css is loaded after viewer.css,
-+      we can override viewer.css by editing latexworkshop.css.
-+      DONT EDIT viewer.css. EDIT latexworkshop.css instead.
++      Because latextoybox.css is loaded after viewer.css,
++      we can override viewer.css by editing latextoybox.css.
++      DONT EDIT viewer.css. EDIT latextoybox.css instead.
 +    -->
      <link rel="stylesheet" href="viewer.css">
  
 -  <script src="viewer.js"></script>
-+    <link rel="stylesheet" href="latexworkshop.css">
++    <link rel="stylesheet" href="latextoybox.css">
 +
 +
 +<!-- This snippet is used in production (included from viewer.html) -->
 +<link rel="resource" type="application/l10n" href="locale/locale.properties">
-+<script src="/out/viewer/latexworkshop.js" type="module"></script>
++<script src="/out/viewer/latextoybox.js" type="module"></script>
    </head>
  
 -  <body tabindex="1">
@@ -41,7 +41,7 @@
        </div>  <!-- sidebarContainer -->
  
        <div id="mainContainer">
-@@ -229,6 +236,14 @@
+@@ -237,6 +244,14 @@
                </button>
              </div>
  
@@ -56,7 +56,7 @@
              <div class="horizontalToolbarSeparator"></div>
  
              <button id="documentProperties" class="secondaryToolbarButton" title="Document Properties…" tabindex="69" data-l10n-id="document_properties" aria-controls="documentPropertiesDialog">
-@@ -237,13 +252,20 @@
+@@ -245,13 +260,20 @@
            </div>
          </div>  <!-- secondaryToolbar -->
  
@@ -78,7 +78,7 @@
                  <div class="toolbarButtonSpacer"></div>
                  <button id="viewFind" class="toolbarButton" title="Find in Document" tabindex="12" data-l10n-id="findbar" aria-expanded="false" aria-controls="findbar">
                    <span data-l10n-id="findbar_label">Find</span>
-@@ -318,6 +340,15 @@
+@@ -326,6 +348,15 @@
                      <option title="" value="2" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 200 }'>200%</option>
                      <option title="" value="3" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 300 }'>300%</option>
                      <option title="" value="4" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 400 }'>400%</option>
@@ -94,7 +94,7 @@
                    </select>
                  </span>
                </div>
-@@ -333,6 +364,7 @@
+@@ -341,6 +372,7 @@
  
          <div id="viewerContainer" tabindex="0">
            <div id="viewer" class="pdfViewer"></div>
diff --git a/dev/viewer/viewer.js.diff b/dev/viewer/viewer.js.diff
index 9914decd9..be5dd30f6 100644
--- a/dev/viewer/viewer.js.diff
+++ b/dev/viewer/viewer.js.diff
@@ -1,5 +1,5 @@
---- ../tmp/pdfjs-3.9/web/viewer.js	2023-07-30 12:53:02.000000000 +0900
-+++ viewer/viewer.js	2023-08-01 08:15:36.000000000 +0900
+--- ../tmp/pdfjs-3.10/web/viewer.js	2023-08-27 17:53:52.000000000 +0900
++++ viewer/viewer.js	2023-09-02 10:04:39.000000000 +0900
 @@ -43,10 +43,10 @@
  exports.GenericCom = GenericCom;
  class GenericPreferences extends _preferences.BasePreferences {
@@ -22,7 +22,7 @@
    },
    setTitle(title = this._title) {
      this._title = title;
-@@ -4888,7 +4888,7 @@
+@@ -4889,7 +4889,7 @@
  };
  exports.FindState = FindState;
  const FIND_TIMEOUT = 250;
@@ -31,7 +31,7 @@
  const MATCH_SCROLL_OFFSET_LEFT = -400;
  const CHARACTERS_TO_NORMALIZE = {
    "\u2010": "-",
-@@ -7469,7 +7469,7 @@
+@@ -7489,7 +7489,7 @@
        this.#dispatchEvent();
        return;
      }
@@ -40,7 +40,7 @@
      if (!this.isInitialEventDispatched) {
        this.#dispatchEvent();
      }
-@@ -8367,7 +8367,7 @@
+@@ -8387,7 +8387,7 @@
      this.#annotationEditorMode = options.annotationEditorMode ?? _pdfjsLib.AnnotationEditorType.NONE;
      this.imageResourcesPath = options.imageResourcesPath || "";
      this.enablePrintAutoRotate = options.enablePrintAutoRotate || false;
@@ -49,7 +49,7 @@
      if (options.useOnlyCssZoom) {
        console.error("useOnlyCssZoom was removed, please use `maxCanvasPixels = 0` instead.");
        options.maxCanvasPixels = 0;
-@@ -12211,10 +12211,10 @@
+@@ -12232,10 +12232,10 @@
    }
    async _writeToStorage() {
      const databaseStr = JSON.stringify(this.database);
@@ -62,7 +62,7 @@
    }
    async set(name, val) {
      await this._initializedPromise;
-@@ -13060,7 +13060,7 @@
+@@ -13081,7 +13081,7 @@
    function getL10nData(key, args, fallback) {
      var data = gL10nData[key];
      if (!data) {
@@ -71,7 +71,7 @@
        if (!fallback) {
          return null;
        }
-@@ -13496,6 +13496,9 @@
+@@ -13517,6 +13517,9 @@
  }
  window.addEventListener("keydown", function (event) {
    if (event.keyCode === 80 && (event.ctrlKey || event.metaKey) && !event.altKey && (!event.shiftKey || window.chrome || window.opera)) {
@@ -81,7 +81,7 @@
      window.print();
      event.preventDefault();
      event.stopImmediatePropagation();
-@@ -13766,7 +13769,7 @@
+@@ -13789,7 +13792,7 @@
    try {
      parent.document.dispatchEvent(event);
    } catch (ex) {
diff --git a/package-lock.json b/package-lock.json
index 122cc4645..e0685851f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "latex-utensils": "6.1.0",
         "mathjax-full": "3.2.2",
         "micromatch": "4.0.5",
-        "pdfjs-dist": "3.9.179",
+        "pdfjs-dist": "3.10.111",
         "workerpool": "6.4.2",
         "ws": "8.13.0"
       },
@@ -3117,9 +3117,9 @@
       }
     },
     "node_modules/pdfjs-dist": {
-      "version": "3.9.179",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.9.179.tgz",
-      "integrity": "sha512-AZBEIAORYDaOAlM0/A4Zg465+XF3ugYDdgrVmioVvNW5tH3xs3RpGFBYOG5PM9/vLM3M/wNncsMLTgyIKdqMKg==",
+      "version": "3.10.111",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.10.111.tgz",
+      "integrity": "sha512-+SXXGN/3YTNQSK5Ae7EyqQuR+4IAsNunJq/Us5ByOkRJ45qBXXOwkiWi3RIDU+CyF+ak5eSWXl2FQW2PKBrsRA==",
       "engines": {
         "node": ">=18"
       },
@@ -6420,9 +6420,9 @@
       "optional": true
     },
     "pdfjs-dist": {
-      "version": "3.9.179",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.9.179.tgz",
-      "integrity": "sha512-AZBEIAORYDaOAlM0/A4Zg465+XF3ugYDdgrVmioVvNW5tH3xs3RpGFBYOG5PM9/vLM3M/wNncsMLTgyIKdqMKg==",
+      "version": "3.10.111",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.10.111.tgz",
+      "integrity": "sha512-+SXXGN/3YTNQSK5Ae7EyqQuR+4IAsNunJq/Us5ByOkRJ45qBXXOwkiWi3RIDU+CyF+ak5eSWXl2FQW2PKBrsRA==",
       "requires": {
         "canvas": "^2.11.2",
         "path2d-polyfill": "^2.0.1"
diff --git a/package.json b/package.json
index 791c0583c..2b16a3eaf 100644
--- a/package.json
+++ b/package.json
@@ -1716,7 +1716,7 @@
     "latex-utensils": "6.1.0",
     "mathjax-full": "3.2.2",
     "micromatch": "4.0.5",
-    "pdfjs-dist": "3.9.179",
+    "pdfjs-dist": "3.10.111",
     "workerpool": "6.4.2",
     "ws": "8.13.0"
   },
diff --git a/viewer/locale/ach/viewer.properties b/viewer/locale/ach/viewer.properties
index ecb614fcc..110e317fc 100644
--- a/viewer/locale/ach/viewer.properties
+++ b/viewer/locale/ach/viewer.properties
@@ -39,6 +39,11 @@ open_file.title=Yab Pwail
 open_file_label=Yab
 print.title=Go
 print_label=Go
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 
 # Secondary toolbar and context menu
 tools.title=Gintic
@@ -126,6 +131,7 @@ thumbs_label=Cal
 findbar.title=Nong iye gin acoya
 findbar_label=Nong
 
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -141,10 +147,18 @@ find_previous.title=Nong timme pa lok mukato
 find_previous_label=Mukato
 find_next.title=Nong timme pa lok malubo
 find_next_label=Malubo
-find_highlight=Wer weng
+find_highlight=Ket Lanyut I Weng
 find_match_case_label=Lok marwate
 find_reached_top=Oo iwi gin acoya, omede ki i tere
 find_reached_bottom=Oo i agiki me gin acoya, omede ki iwiye
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
 find_not_found=Lok pe ononge
 
 # Predefined zoom values
@@ -156,13 +170,16 @@ page_scale_actual=Dite kikome
 # numerical scale value.
 page_scale_percent={{scale}}%
 
+# Loading indicator messages
 loading_error=Bal otime kun cano PDF.
 invalid_file_error=Pwail me PDF ma pe atir onyo obale woko.
 missing_file_error=Pwail me PDF tye ka rem.
 unexpected_response_error=Lagam mape kigeno pa lapok tic.
-
 rendering_error=Bal otime i kare me nyuto pot buk.
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
@@ -177,3 +194,10 @@ printing_not_supported=Ciko: Layeny ma pe teno goyo liweng.
 printing_not_ready=Ciko: PDF pe ocane weng me agoya.
 web_fonts_disabled=Kijuko dit pa coc me kakube woko: pe romo tic ki dit pa coc me PDF ma kiketo i kine.
 
+# Editor
+
+
+
+# Editor Parameters
+
+# Editor aria
diff --git a/viewer/locale/be/viewer.properties b/viewer/locale/be/viewer.properties
index bf00ca134..7981034b5 100644
--- a/viewer/locale/be/viewer.properties
+++ b/viewer/locale/be/viewer.properties
@@ -41,6 +41,11 @@ print.title=Друкаваць
 print_label=Друкаваць
 save.title=Захаваць
 save_label=Захаваць
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Сцягнуць
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Сцягнуць
 bookmark1.title=Дзейная старонка (паглядзець URL-адрас з дзейнай старонкі)
 bookmark1_label=Цяперашняя старонка
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Маляваць
 editor_stamp.title=Дадаць выяву
 editor_stamp_label=Дадаць выяву
 
+editor_stamp1.title=Дадаць або змяніць выявы
+editor_stamp1_label=Дадаць або змяніць выявы
+
 free_text2_default_content=Пачніце набор тэксту…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Колер
 editor_ink_thickness=Таўшчыня
 editor_ink_opacity=Непразрыстасць
 
+editor_stamp_add_image_label=Дадаць выяву
+editor_stamp_add_image.title=Дадаць выяву
+
 # Editor aria
 editor_free_text2_aria_label=Тэкставы рэдактар
 editor_ink2_aria_label=Графічны рэдактар
diff --git a/viewer/locale/cs/viewer.properties b/viewer/locale/cs/viewer.properties
index 7e38db465..b7521dd29 100644
--- a/viewer/locale/cs/viewer.properties
+++ b/viewer/locale/cs/viewer.properties
@@ -41,6 +41,11 @@ print.title=Vytiskne dokument
 print_label=Vytisknout
 save.title=Uložit
 save_label=Uložit
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Stáhnout
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Stáhnout
 bookmark1.title=Aktuální stránka (zobrazit URL od aktuální stránky)
 bookmark1_label=Aktuální stránka
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Kreslení
 editor_stamp.title=Přidat obrázek
 editor_stamp_label=Přidat obrázek
 
+editor_stamp1.title=Přidání či úprava obrázků
+editor_stamp1_label=Přidání či úprava obrázků
+
 free_text2_default_content=Začněte psát…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Barva
 editor_ink_thickness=Tloušťka
 editor_ink_opacity=Průhlednost
 
+editor_stamp_add_image_label=Přidat obrázek
+editor_stamp_add_image.title=Přidat obrázek
+
 # Editor aria
 editor_free_text2_aria_label=Textový editor
 editor_ink2_aria_label=Editor kreslení
diff --git a/viewer/locale/cy/viewer.properties b/viewer/locale/cy/viewer.properties
index 3e4ced6c7..005f742de 100644
--- a/viewer/locale/cy/viewer.properties
+++ b/viewer/locale/cy/viewer.properties
@@ -41,6 +41,11 @@ print.title=Argraffu
 print_label=Argraffu
 save.title=Cadw
 save_label=Cadw
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Llwytho i Lawr
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Llwytho i Lawr
 bookmark1.title=Tudalen Gyfredol (Gweld URL o'r Dudalen Gyfredol)
 bookmark1_label=Tudalen Gyfredol
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Lluniadu
 editor_stamp.title=Ychwanegu delwedd
 editor_stamp_label=Ychwanegu delwedd
 
+editor_stamp1.title=Ychwanegu neu olygu delweddau
+editor_stamp1_label=Ychwanegu neu olygu delweddau
+
 free_text2_default_content=Cychwyn teipio…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Lliw
 editor_ink_thickness=Trwch
 editor_ink_opacity=Didreiddedd
 
+editor_stamp_add_image_label=Ychwanegu delwedd
+editor_stamp_add_image.title=Ychwanegu delwedd
+
 # Editor aria
 editor_free_text2_aria_label=Golygydd Testun
 editor_ink2_aria_label=Golygydd Lluniadu
diff --git a/viewer/locale/da/viewer.properties b/viewer/locale/da/viewer.properties
index 74a0e9b46..305238be3 100644
--- a/viewer/locale/da/viewer.properties
+++ b/viewer/locale/da/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=Åbn fil
 open_file_label=Åbn
 print.title=Udskriv
 print_label=Udskriv
-
 save.title=Gem
 save_label=Gem
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Hent
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Hent
 bookmark1.title=Aktuel side (vis URL fra den aktuelle side)
 bookmark1_label=Aktuel side
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Åbn i app
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Åbn i app
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=Der opstod en fejl ved indlæsning af PDF-filen.
 invalid_file_error=PDF-filen er ugyldig eller ødelagt.
 missing_file_error=Manglende PDF-fil.
 unexpected_response_error=Uventet svar fra serveren.
-
 rendering_error=Der opstod en fejl ved generering af siden.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,12 @@ editor_free_text2_label=Tekst
 editor_ink2.title=Tegn
 editor_ink2_label=Tegn
 
+editor_stamp.title=Tilføj et billede
+editor_stamp_label=Tilføj et billede
+
+editor_stamp1.title=Tilføj eller rediger billeder
+editor_stamp1_label=Tilføj eller rediger billeder
+
 free_text2_default_content=Begynd at skrive…
 
 # Editor Parameters
@@ -251,6 +261,9 @@ editor_ink_color=Farve
 editor_ink_thickness=Tykkelse
 editor_ink_opacity=Uigennemsigtighed
 
+editor_stamp_add_image_label=Tilføj billede
+editor_stamp_add_image.title=Tilføj billede
+
 # Editor aria
 editor_free_text2_aria_label=Teksteditor
 editor_ink2_aria_label=Tegnings-editor
diff --git a/viewer/locale/de/viewer.properties b/viewer/locale/de/viewer.properties
index cf864506e..a370ba4ec 100644
--- a/viewer/locale/de/viewer.properties
+++ b/viewer/locale/de/viewer.properties
@@ -41,6 +41,11 @@ print.title=Drucken
 print_label=Drucken
 save.title=Speichern
 save_label=Speichern
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Herunterladen
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Herunterladen
 bookmark1.title=Aktuelle Seite (URL von aktueller Seite anzeigen)
 bookmark1_label=Aktuelle Seite
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Zeichnen
 editor_stamp.title=Ein Bild hinzufügen
 editor_stamp_label=Ein Bild hinzufügen
 
+editor_stamp1.title=Grafiken hinzufügen oder bearbeiten
+editor_stamp1_label=Grafiken hinzufügen oder bearbeiten
+
 free_text2_default_content=Schreiben beginnen…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Farbe
 editor_ink_thickness=Dicke
 editor_ink_opacity=Deckkraft
 
+editor_stamp_add_image_label=Grafik hinzufügen
+editor_stamp_add_image.title=Grafik hinzufügen
+
 # Editor aria
 editor_free_text2_aria_label=Texteditor
 editor_ink2_aria_label=Zeichnungseditor
diff --git a/viewer/locale/dsb/viewer.properties b/viewer/locale/dsb/viewer.properties
index 94e3e2a54..e4e51d1eb 100644
--- a/viewer/locale/dsb/viewer.properties
+++ b/viewer/locale/dsb/viewer.properties
@@ -41,6 +41,11 @@ print.title=Śišćaś
 print_label=Śišćaś
 save.title=Składowaś
 save_label=Składowaś
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Ześěgnuś
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Ześěgnuś
 bookmark1.title=Aktualny bok (URL z aktualnego boka pokazaś)
 bookmark1_label=Aktualny bok
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Kresliś
 editor_stamp.title=Wobraz pśidaś
 editor_stamp_label=Wobraz pśidaś
 
+editor_stamp1.title=Wobraze pśidaś abo wobźěłaś
+editor_stamp1_label=Wobraze pśidaś abo wobźěłaś
+
 free_text2_default_content=Zachopśo pisaś…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Barwa
 editor_ink_thickness=Tłustosć
 editor_ink_opacity=Opacita
 
+editor_stamp_add_image_label=Wobraz pśidaś
+editor_stamp_add_image.title=Wobraz pśidaś
+
 # Editor aria
 editor_free_text2_aria_label=Tekstowy editor
 editor_ink2_aria_label=Kresleński editor
diff --git a/viewer/locale/el/viewer.properties b/viewer/locale/el/viewer.properties
index 3c670661c..47b1f8e29 100644
--- a/viewer/locale/el/viewer.properties
+++ b/viewer/locale/el/viewer.properties
@@ -41,6 +41,11 @@ print.title=Εκτύπωση
 print_label=Εκτύπωση
 save.title=Αποθήκευση
 save_label=Αποθήκευση
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Λήψη
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Λήψη
 bookmark1.title=Τρέχουσα σελίδα (Προβολή URL από τρέχουσα σελίδα)
 bookmark1_label=Τρέχουσα σελίδα
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
diff --git a/viewer/locale/en-GB/viewer.properties b/viewer/locale/en-GB/viewer.properties
index 350b686c6..63fcec7ae 100644
--- a/viewer/locale/en-GB/viewer.properties
+++ b/viewer/locale/en-GB/viewer.properties
@@ -41,6 +41,11 @@ print.title=Print
 print_label=Print
 save.title=Save
 save_label=Save
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Download
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Download
 bookmark1.title=Current Page (View URL from Current Page)
 bookmark1_label=Current Page
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Draw
 editor_stamp.title=Add an image
 editor_stamp_label=Add an image
 
+editor_stamp1.title=Add or edit images
+editor_stamp1_label=Add or edit images
+
 free_text2_default_content=Start typing…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Colour
 editor_ink_thickness=Thickness
 editor_ink_opacity=Opacity
 
+editor_stamp_add_image_label=Add image
+editor_stamp_add_image.title=Add image
+
 # Editor aria
 editor_free_text2_aria_label=Text Editor
 editor_ink2_aria_label=Draw Editor
diff --git a/viewer/locale/en-US/viewer.properties b/viewer/locale/en-US/viewer.properties
index c820d8068..db404c896 100644
--- a/viewer/locale/en-US/viewer.properties
+++ b/viewer/locale/en-US/viewer.properties
@@ -245,8 +245,8 @@ editor_free_text2.title=Text
 editor_free_text2_label=Text
 editor_ink2.title=Draw
 editor_ink2_label=Draw
-editor_stamp.title=Add an image
-editor_stamp_label=Add an image
+editor_stamp1.title=Add or edit images
+editor_stamp1_label=Add or edit images
 
 free_text2_default_content=Start typing…
 
@@ -256,6 +256,8 @@ editor_free_text_size=Size
 editor_ink_color=Color
 editor_ink_thickness=Thickness
 editor_ink_opacity=Opacity
+editor_stamp_add_image_label=Add image
+editor_stamp_add_image.title=Add image
 
 # Editor aria
 editor_free_text2_aria_label=Text Editor
diff --git a/viewer/locale/eo/viewer.properties b/viewer/locale/eo/viewer.properties
index e4787d02f..2018f9e70 100644
--- a/viewer/locale/eo/viewer.properties
+++ b/viewer/locale/eo/viewer.properties
@@ -39,9 +39,13 @@ open_file.title=Malfermi dosieron
 open_file_label=Malfermi
 print.title=Presi
 print_label=Presi
-
 save.title=Konservi
 save_label=Konservi
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Elŝuti
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Elŝuti
 bookmark1.title=Nuna paĝo (Montri adreson de la nuna paĝo)
 bookmark1_label=Nuna paĝo
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -216,7 +220,6 @@ loading_error=Okazis eraro dum la ŝargado de la PDF dosiero.
 invalid_file_error=Nevalida aŭ difektita PDF dosiero.
 missing_file_error=Mankas dosiero PDF.
 unexpected_response_error=Neatendita respondo de servilo.
-
 rendering_error=Okazis eraro dum la montro de la paĝo.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -243,6 +246,12 @@ editor_free_text2_label=Teksto
 editor_ink2.title=Desegni
 editor_ink2_label=Desegni
 
+editor_stamp.title=Aldoni bildon
+editor_stamp_label=Aldoni bildon
+
+editor_stamp1.title=Aldoni aŭ modifi bildojn
+editor_stamp1_label=Aldoni aŭ modifi bildojn
+
 free_text2_default_content=Ektajpi…
 
 # Editor Parameters
@@ -252,6 +261,9 @@ editor_ink_color=Koloro
 editor_ink_thickness=Dikeco
 editor_ink_opacity=Maldiafaneco
 
+editor_stamp_add_image_label=Aldoni bildon
+editor_stamp_add_image.title=Aldoni bildon
+
 # Editor aria
 editor_free_text2_aria_label=Tekstan redaktilon
 editor_ink2_aria_label=Desegnan redaktilon
diff --git a/viewer/locale/es-AR/viewer.properties b/viewer/locale/es-AR/viewer.properties
index cec91a3a1..9014658d4 100644
--- a/viewer/locale/es-AR/viewer.properties
+++ b/viewer/locale/es-AR/viewer.properties
@@ -41,6 +41,11 @@ print.title=Imprimir
 print_label=Imprimir
 save.title=Guardar
 save_label=Guardar
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Descargar
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Descargar
 bookmark1.title=Página actual (Ver URL de la página actual)
 bookmark1_label=Página actual
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Dibujar
 editor_stamp.title=Agregar una imagen
 editor_stamp_label=Agregar una imagen
 
+editor_stamp1.title=Agregar o editar imágenes
+editor_stamp1_label=Agregar o editar imágenes
+
 free_text2_default_content=Empezar a tipear…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Color
 editor_ink_thickness=Espesor
 editor_ink_opacity=Opacidad
 
+editor_stamp_add_image_label=Agregar una imagen
+editor_stamp_add_image.title=Agregar una imagen
+
 # Editor aria
 editor_free_text2_aria_label=Editor de texto
 editor_ink2_aria_label=Editor de dibujos
diff --git a/viewer/locale/es-CL/viewer.properties b/viewer/locale/es-CL/viewer.properties
index e8e4b9b58..c8d20e04f 100644
--- a/viewer/locale/es-CL/viewer.properties
+++ b/viewer/locale/es-CL/viewer.properties
@@ -41,6 +41,11 @@ print.title=Imprimir
 print_label=Imprimir
 save.title=Guardar
 save_label=Guardar
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Descargar
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Descargar
 bookmark1.title=Página actual (Ver URL de la página actual)
 bookmark1_label=Página actual
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Dibujar
 editor_stamp.title=Añadir una imagen
 editor_stamp_label=Añadir una imagen
 
+editor_stamp1.title=Añadir o editar imágenes
+editor_stamp1_label=Añadir o editar imágenes
+
 free_text2_default_content=Empieza a escribir…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Color
 editor_ink_thickness=Grosor
 editor_ink_opacity=Opacidad
 
+editor_stamp_add_image_label=Añadir imagen
+editor_stamp_add_image.title=Añadir imagen
+
 # Editor aria
 editor_free_text2_aria_label=Editor de texto
 editor_ink2_aria_label=Editor de dibujos
diff --git a/viewer/locale/es-ES/viewer.properties b/viewer/locale/es-ES/viewer.properties
index 79aa0024f..119cdbc4e 100644
--- a/viewer/locale/es-ES/viewer.properties
+++ b/viewer/locale/es-ES/viewer.properties
@@ -39,13 +39,13 @@ open_file.title=Abrir archivo
 open_file_label=Abrir
 print.title=Imprimir
 print_label=Imprimir
-
 save.title=Guardar
 save_label=Guardar
 bookmark1.title=Página actual (Ver URL de la página actual)
 bookmark1_label=Página actual
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Abrir en aplicación
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Abrir en aplicación
 
 # Secondary toolbar and context menu
@@ -215,7 +215,6 @@ loading_error=Ocurrió un error al cargar el PDF.
 invalid_file_error=Fichero PDF no válido o corrupto.
 missing_file_error=No hay fichero PDF.
 unexpected_response_error=Respuesta inesperada del servidor.
-
 rendering_error=Ocurrió un error al renderizar la página.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +241,9 @@ editor_free_text2_label=Texto
 editor_ink2.title=Dibujar
 editor_ink2_label=Dibujar
 
+editor_stamp.title=Añadir una imagen
+editor_stamp_label=Añadir una imagen
+
 free_text2_default_content=Empezar a escribir…
 
 # Editor Parameters
diff --git a/viewer/locale/eu/viewer.properties b/viewer/locale/eu/viewer.properties
index 8a0f8ee71..5e2cbe390 100644
--- a/viewer/locale/eu/viewer.properties
+++ b/viewer/locale/eu/viewer.properties
@@ -39,9 +39,13 @@ open_file.title=Ireki fitxategia
 open_file_label=Ireki
 print.title=Inprimatu
 print_label=Inprimatu
-
 save.title=Gorde
 save_label=Gorde
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Deskargatu
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Deskargatu
 bookmark1.title=Uneko orria (ikusi uneko orriaren URLa)
 bookmark1_label=Uneko orria
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -216,7 +220,6 @@ loading_error=Errorea gertatu da PDFa kargatzean.
 invalid_file_error=PDF fitxategi baliogabe edo hondatua.
 missing_file_error=PDF fitxategia falta da.
 unexpected_response_error=Espero gabeko zerbitzariaren erantzuna.
-
 rendering_error=Errorea gertatu da orria errendatzean.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -243,6 +246,9 @@ editor_free_text2_label=Testua
 editor_ink2.title=Marrazkia
 editor_ink2_label=Marrazkia
 
+editor_stamp.title=Gehitu irudia
+editor_stamp_label=Gehitu irudia
+
 free_text2_default_content=Hasi idazten…
 
 # Editor Parameters
diff --git a/viewer/locale/fi/viewer.properties b/viewer/locale/fi/viewer.properties
index d16fe18d1..84813f36c 100644
--- a/viewer/locale/fi/viewer.properties
+++ b/viewer/locale/fi/viewer.properties
@@ -39,12 +39,15 @@ open_file.title=Avaa tiedosto
 open_file_label=Avaa
 print.title=Tulosta
 print_label=Tulosta
-
 save.title=Tallenna
 save_label=Tallenna
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Lataa
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Lataa
 bookmark1.title=Nykyinen sivu (Näytä URL-osoite nykyiseltä sivulta)
 bookmark1_label=Nykyinen sivu
-
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Avaa sovelluksessa
 # LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
@@ -217,7 +220,6 @@ loading_error=Tapahtui virhe ladattaessa PDF-tiedostoa.
 invalid_file_error=Virheellinen tai vioittunut PDF-tiedosto.
 missing_file_error=Puuttuva PDF-tiedosto.
 unexpected_response_error=Odottamaton vastaus palvelimelta.
-
 rendering_error=Tapahtui virhe piirrettäessä sivua.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -244,6 +246,9 @@ editor_free_text2_label=Teksti
 editor_ink2.title=Piirros
 editor_ink2_label=Piirros
 
+editor_stamp.title=Lisää kuva
+editor_stamp_label=Lisää kuva
+
 free_text2_default_content=Aloita kirjoittaminen…
 
 # Editor Parameters
diff --git a/viewer/locale/fr/viewer.properties b/viewer/locale/fr/viewer.properties
index fea58596e..70146b92c 100644
--- a/viewer/locale/fr/viewer.properties
+++ b/viewer/locale/fr/viewer.properties
@@ -41,6 +41,11 @@ print.title=Imprimer
 print_label=Imprimer
 save.title=Enregistrer
 save_label=Enregistrer
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Télécharger
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Télécharger
 bookmark1.title=Page courante (montrer l’adresse de la page courante)
 bookmark1_label=Page courante
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Dessiner
 editor_stamp.title=Ajouter une image
 editor_stamp_label=Ajouter une image
 
+editor_stamp1.title=Ajouter ou modifier des images
+editor_stamp1_label=Ajouter ou modifier des images
+
 free_text2_default_content=Commencer à écrire…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Couleur
 editor_ink_thickness=Épaisseur
 editor_ink_opacity=Opacité
 
+editor_stamp_add_image_label=Ajouter une image
+editor_stamp_add_image.title=Ajouter une image
+
 # Editor aria
 editor_free_text2_aria_label=Éditeur de texte
 editor_ink2_aria_label=Éditeur de dessin
diff --git a/viewer/locale/fur/viewer.properties b/viewer/locale/fur/viewer.properties
index db6331c30..4e0f3125e 100644
--- a/viewer/locale/fur/viewer.properties
+++ b/viewer/locale/fur/viewer.properties
@@ -41,6 +41,11 @@ print.title=Stampe
 print_label=Stampe
 save.title=Salve
 save_label=Salve
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Discjame
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Discjame
 bookmark1.title=Pagjine corinte (mostre URL de pagjine atuâl)
 bookmark1_label=Pagjine corinte
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
diff --git a/viewer/locale/fy-NL/viewer.properties b/viewer/locale/fy-NL/viewer.properties
index 3aed14b44..003102ba6 100644
--- a/viewer/locale/fy-NL/viewer.properties
+++ b/viewer/locale/fy-NL/viewer.properties
@@ -41,6 +41,11 @@ print.title=Ofdrukke
 print_label=Ofdrukke
 save.title=Bewarje
 save_label=Bewarje
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Downloade
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Downloade
 bookmark1.title=Aktuele side (URL fan aktuele side besjen)
 bookmark1_label=Aktuele side
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Tekenje
 editor_stamp.title=Ofbylding tafoegje
 editor_stamp_label=Ofbylding tafoegje
 
+editor_stamp1.title=Ofbyldingen tafoegje of bewurkje
+editor_stamp1_label=Ofbyldingen tafoegje of bewurkje
+
 free_text2_default_content=Begjin mei typen…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Kleur
 editor_ink_thickness=Tsjokte
 editor_ink_opacity=Transparânsje
 
+editor_stamp_add_image_label=Ofbylding tafoegje
+editor_stamp_add_image.title=Ofbylding tafoegje
+
 # Editor aria
 editor_free_text2_aria_label=Tekstbewurker
 editor_ink2_aria_label=Tekeningbewurker
diff --git a/viewer/locale/gn/viewer.properties b/viewer/locale/gn/viewer.properties
index 0d383b3aa..e21b6b390 100644
--- a/viewer/locale/gn/viewer.properties
+++ b/viewer/locale/gn/viewer.properties
@@ -41,6 +41,11 @@ print.title=Monguatia
 print_label=Monguatia
 save.title=Ñongatu
 save_label=Ñongatu
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Mboguejy
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Mboguejy
 bookmark1.title=Kuatiarogue ag̃agua (Ehecha URL kuatiarogue ag̃agua)
 bookmark1_label=Kuatiarogue Ag̃agua
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Moha’ãnga
 editor_stamp.title=Embojuaju ta’ãnga
 editor_stamp_label=Embojuaju ta’ãnga
 
+editor_stamp1.title=Embojuaju térã embosako’i ta’ãnga
+editor_stamp1_label=Embojuaju térã embosako’i ta’ãnga
+
 free_text2_default_content=Ehai ñepyrũ…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Sa’y
 editor_ink_thickness=Anambusu
 editor_ink_opacity=Pytũngy
 
+editor_stamp_add_image_label=Embojuaju ta’ãnga
+editor_stamp_add_image.title=Embojuaju ta’ãnga
+
 # Editor aria
 editor_free_text2_aria_label=Moñe’ẽrã moheñoiha
 editor_ink2_aria_label=Ta’ãnga moheñoiha
diff --git a/viewer/locale/he/viewer.properties b/viewer/locale/he/viewer.properties
index 539091669..01ddd9cd5 100644
--- a/viewer/locale/he/viewer.properties
+++ b/viewer/locale/he/viewer.properties
@@ -41,6 +41,11 @@ print.title=הדפסה
 print_label=הדפסה
 save.title=שמירה
 save_label=שמירה
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=הורדה
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=הורדה
 bookmark1_label=עמוד נוכחי
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=פתיחה ביישום
@@ -243,6 +248,9 @@ editor_ink2_label=ציור
 editor_stamp.title=הוספת תמונה
 editor_stamp_label=הוספת תמונה
 
+editor_stamp1.title=הוספה או עריכת תמונות
+editor_stamp1_label=הוספה או עריכת תמונות
+
 free_text2_default_content=להתחיל להקליד…
 
 # Editor Parameters
@@ -252,6 +260,9 @@ editor_ink_color=צבע
 editor_ink_thickness=עובי
 editor_ink_opacity=אטימות
 
+editor_stamp_add_image_label=הוספת תמונה
+editor_stamp_add_image.title=הוספת תמונה
+
 # Editor aria
 editor_free_text2_aria_label=עורך טקסט
 editor_ink2_aria_label=עורך ציור
diff --git a/viewer/locale/hi-IN/viewer.properties b/viewer/locale/hi-IN/viewer.properties
index 7484050ee..97f1da170 100644
--- a/viewer/locale/hi-IN/viewer.properties
+++ b/viewer/locale/hi-IN/viewer.properties
@@ -39,6 +39,10 @@ open_file.title=फ़ाइल खोलें
 open_file_label=\u0020खोलें
 print.title=छापें
 print_label=\u0020छापें
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
+open_in_app.title=ऐप में खोलें
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
+open_in_app_label=ऐप में खोलें
 
 # Secondary toolbar and context menu
 tools.title=औज़ार
@@ -135,6 +139,7 @@ thumbs_label=लघु छवि
 findbar.title=\u0020दस्तावेज़ में ढूँढ़ें
 findbar_label=ढूँढें
 
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -187,11 +192,11 @@ page_scale_actual=वास्तविक आकार
 # numerical scale value.
 page_scale_percent={{scale}}%
 
+# Loading indicator messages
 loading_error=PDF लोड करते समय एक त्रुटि हुई.
 invalid_file_error=अमान्य या भ्रष्ट PDF फ़ाइल.
 missing_file_error=\u0020अनुपस्थित PDF फ़ाइल.
 unexpected_response_error=अप्रत्याशित सर्वर प्रतिक्रिया.
-
 rendering_error=पृष्ठ रेंडरिंग के दौरान त्रुटि आई.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -212,3 +217,11 @@ printing_not_supported=चेतावनी: इस ब्राउज़र 
 printing_not_ready=चेतावनी: PDF छपाई के लिए पूरी तरह से लोड नहीं है.
 web_fonts_disabled=वेब फॉन्ट्स निष्क्रिय हैं: अंतःस्थापित PDF फॉन्टस के उपयोग में असमर्थ.
 
+# Editor
+
+
+
+# Editor Parameters
+editor_free_text_color=रंग
+
+# Editor aria
diff --git a/viewer/locale/hsb/viewer.properties b/viewer/locale/hsb/viewer.properties
index 41f648b3d..98cbc7c7d 100644
--- a/viewer/locale/hsb/viewer.properties
+++ b/viewer/locale/hsb/viewer.properties
@@ -41,6 +41,11 @@ print.title=Ćišćeć
 print_label=Ćišćeć
 save.title=Składować
 save_label=Składować
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Sćahnyć
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Sćahnyć
 bookmark1.title=Aktualna strona (URL z aktualneje strony pokazać)
 bookmark1_label=Aktualna strona
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Rysować
 editor_stamp.title=Wobraz přidać
 editor_stamp_label=Wobraz přidać
 
+editor_stamp1.title=Wobrazy přidać abo wobdźěłać
+editor_stamp1_label=Wobrazy přidać abo wobdźěłać
+
 free_text2_default_content=Započńće pisać…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Barba
 editor_ink_thickness=Tołstosć
 editor_ink_opacity=Opacita
 
+editor_stamp_add_image_label=Wobraz přidać
+editor_stamp_add_image.title=Wobraz přidać
+
 # Editor aria
 editor_free_text2_aria_label=Tekstowy editor
 editor_ink2_aria_label=Rysowanski editor
diff --git a/viewer/locale/hu/viewer.properties b/viewer/locale/hu/viewer.properties
index fe8b57f9b..c3bceda6a 100644
--- a/viewer/locale/hu/viewer.properties
+++ b/viewer/locale/hu/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=Fájl megnyitása
 open_file_label=Megnyitás
 print.title=Nyomtatás
 print_label=Nyomtatás
-
 save.title=Mentés
 save_label=Mentés
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Letöltés
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Letöltés
 bookmark1.title=Jelenlegi oldal (webcím megtekintése a jelenlegi oldalról)
 bookmark1_label=Jelenlegi oldal
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Megnyitás alkalmazásban
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Megnyitás alkalmazásban
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=Hiba történt a PDF betöltésekor.
 invalid_file_error=Érvénytelen vagy sérült PDF fájl.
 missing_file_error=Hiányzó PDF fájl.
 unexpected_response_error=Váratlan kiszolgálóválasz.
-
 rendering_error=Hiba történt az oldal feldolgozása közben.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,12 @@ editor_free_text2_label=Szöveg
 editor_ink2.title=Rajzolás
 editor_ink2_label=Rajzolás
 
+editor_stamp.title=Kép hozzáadása
+editor_stamp_label=Kép hozzáadása
+
+editor_stamp1.title=Képek hozzáadása vagy szerkesztése
+editor_stamp1_label=Képek hozzáadása vagy szerkesztése
+
 free_text2_default_content=Kezdjen el gépelni…
 
 # Editor Parameters
@@ -251,6 +261,9 @@ editor_ink_color=Szín
 editor_ink_thickness=Vastagság
 editor_ink_opacity=Átlátszatlanság
 
+editor_stamp_add_image_label=Kép hozzáadása
+editor_stamp_add_image.title=Kép hozzáadása
+
 # Editor aria
 editor_free_text2_aria_label=Szövegszerkesztő
 editor_ink2_aria_label=Rajzszerkesztő
diff --git a/viewer/locale/ia/viewer.properties b/viewer/locale/ia/viewer.properties
index 9daa7493a..1c6878ec0 100644
--- a/viewer/locale/ia/viewer.properties
+++ b/viewer/locale/ia/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=Aperir le file
 open_file_label=Aperir
 print.title=Imprimer
 print_label=Imprimer
-
 save.title=Salvar
 save_label=Salvar
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Discargar
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Discargar
 bookmark1.title=Pagina actual (vide le URL del pagina actual)
 bookmark1_label=Pagina actual
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Aperir in app
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Aperir in app
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=Un error occurreva durante que on cargava le file PDF.
 invalid_file_error=File PDF corrumpite o non valide.
 missing_file_error=File PDF mancante.
 unexpected_response_error=Responsa del servitor inexpectate.
-
 rendering_error=Un error occurreva durante que on processava le pagina.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,12 @@ editor_free_text2_label=Texto
 editor_ink2.title=Designar
 editor_ink2_label=Designar
 
+editor_stamp.title=Adder un imagine
+editor_stamp_label=Adder un imagine
+
+editor_stamp1.title=Adder o rediger imagines
+editor_stamp1_label=Adder o rediger imagines
+
 free_text2_default_content=Comenciar a scriber…
 
 # Editor Parameters
@@ -251,6 +261,9 @@ editor_ink_color=Color
 editor_ink_thickness=Spissor
 editor_ink_opacity=Opacitate
 
+editor_stamp_add_image_label=Adder imagine
+editor_stamp_add_image.title=Adder imagine
+
 # Editor aria
 editor_free_text2_aria_label=Editor de texto
 editor_ink2_aria_label=Editor de designos
diff --git a/viewer/locale/is/viewer.properties b/viewer/locale/is/viewer.properties
index b63457508..f5b492426 100644
--- a/viewer/locale/is/viewer.properties
+++ b/viewer/locale/is/viewer.properties
@@ -41,6 +41,11 @@ print.title=Prenta
 print_label=Prenta
 save.title=Vista
 save_label=Vista
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Sækja
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Sækja
 bookmark1.title=Núverandi síða (Skoða vefslóð frá núverandi síðu)
 bookmark1_label=Núverandi síða
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Teikna
 editor_stamp.title=Bæta við mynd
 editor_stamp_label=Bæta við mynd
 
+editor_stamp1.title=Bæta við eða breyta myndum
+editor_stamp1_label=Bæta við eða breyta myndum
+
 free_text2_default_content=Byrjaðu að skrifa…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Litur
 editor_ink_thickness=Þykkt
 editor_ink_opacity=Ógegnsæi
 
+editor_stamp_add_image_label=Bæta við mynd
+editor_stamp_add_image.title=Bæta við mynd
+
 # Editor aria
 editor_free_text2_aria_label=Textaritill
 editor_ink2_aria_label=Teikniritill
diff --git a/viewer/locale/it/viewer.properties b/viewer/locale/it/viewer.properties
index a60ca8684..d8aa13510 100644
--- a/viewer/locale/it/viewer.properties
+++ b/viewer/locale/it/viewer.properties
@@ -39,6 +39,9 @@ print_label = Stampa
 
 save.title = Salva
 save_label = Salva
+download_button.title = Scarica
+download_button_label = Scarica
+
 bookmark1.title = Pagina corrente (mostra URL della pagina corrente)
 bookmark1_label = Pagina corrente
 open_in_app.title = Apri in app
@@ -193,6 +196,8 @@ editor_ink2.title = Disegno
 editor_ink2_label = Disegno
 editor_stamp.title = Aggiungi un’immagine
 editor_stamp_label = Aggiungi un’immagine
+editor_stamp1.title = Aggiungi o rimuovi immagine
+editor_stamp1_label = Aggiungi o rimuovi immagine
 
 free_text2_default_content = Inizia a digitare…
 
@@ -202,9 +207,13 @@ editor_free_text_size = Dimensione
 editor_ink_color = Colore
 editor_ink_thickness = Spessore
 editor_ink_opacity = Opacità
+editor_stamp_add_image_label = Aggiungi immagine
+editor_stamp_add_image.title = Aggiungi immagine
 
 # Editor aria
 editor_free_text2_aria_label = Editor di testo
 editor_ink2_aria_label = Editor disegni
 editor_ink_canvas_aria_label = Immagine creata dall’utente
 
+
+
diff --git a/viewer/locale/ja/viewer.properties b/viewer/locale/ja/viewer.properties
index 0d68559d8..b8a20101b 100644
--- a/viewer/locale/ja/viewer.properties
+++ b/viewer/locale/ja/viewer.properties
@@ -39,16 +39,15 @@ open_file.title=ファイルを開きます
 open_file_label=開く
 print.title=印刷します
 print_label=印刷
-download.title=ダウンロードします
-download_label=ダウンロード
-bookmark.title=現在のビューの URL です (コピーまたは新しいウィンドウに開く)
-bookmark_label=現在のビュー
-
 save.title=保存します
 save_label=保存
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=ダウンロードします
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=ダウンロード
 bookmark1.title=現在のページの URL です (現在のページを表示する URL)
 bookmark1_label=現在のページ
-
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=アプリで開く
 # LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
@@ -207,24 +206,6 @@ find_match_count_limit[many]={{limit}} 件以上一致
 find_match_count_limit[other]={{limit}} 件以上一致
 find_not_found=見つかりませんでした
 
-# Error panel labels
-error_more_info=詳細情報
-error_less_info=詳細情報を隠す
-error_close=閉じる
-# LOCALIZATION NOTE (error_version_info): "{{version}}" and "{{build}}" will be
-# replaced by the PDF.JS version and build ID.
-error_version_info=PDF.js v{{version}} (ビルド: {{build}})
-# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
-# english string describing the error.
-error_message=メッセージ: {{message}}
-# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
-# trace.
-error_stack=スタック: {{stack}}
-# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
-error_file=ファイル: {{file}}
-# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
-error_line=行: {{line}}
-
 # Predefined zoom values
 page_scale_width=幅に合わせる
 page_scale_fit=ページのサイズに合わせる
@@ -234,15 +215,11 @@ page_scale_actual=実際のサイズ
 # numerical scale value.
 page_scale_percent={{scale}}%
 
-# Loading indicator messages
-loading=読み込み中...
-
 # Loading indicator messages
 loading_error=PDF の読み込み中にエラーが発生しました。
 invalid_file_error=無効または破損した PDF ファイル。
 missing_file_error=PDF ファイルが見つかりません。
 unexpected_response_error=サーバーから予期せぬ応答がありました。
-
 rendering_error=ページのレンダリング中にエラーが発生しました。
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -269,6 +246,9 @@ editor_free_text2_label=フリーテキスト注釈
 editor_ink2.title=インク注釈
 editor_ink2_label=インク注釈
 
+editor_stamp.title=画像を追加します
+editor_stamp_label=画像を追加
+
 free_text2_default_content=テキストを入力してください...
 
 # Editor Parameters
diff --git a/viewer/locale/ka/viewer.properties b/viewer/locale/ka/viewer.properties
index cb642050c..1130a9539 100644
--- a/viewer/locale/ka/viewer.properties
+++ b/viewer/locale/ka/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=ფაილის გახსნა
 open_file_label=გახსნა
 print.title=ამობეჭდვა
 print_label=ამობეჭდვა
-
 save.title=შენახვა
 save_label=შენახვა
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=ჩამოტვირთვა
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=ჩამოტვირთვა
 bookmark1.title=მიმდინარე გვერდი (ბმული ამ გვერდისთვის)
 bookmark1_label=მიმდინარე გვერდი
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=გახსნა პროგრამით
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=გახსნა პროგრამით
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=შეცდომა, PDF-ფაილის ჩატვირ
 invalid_file_error=არამართებული ან დაზიანებული PDF-ფაილი.
 missing_file_error=ნაკლული PDF-ფაილი.
 unexpected_response_error=სერვერის მოულოდნელი პასუხი.
-
 rendering_error=შეცდომა, გვერდის ჩვენებისას.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,12 @@ editor_free_text2_label=ტექსტი
 editor_ink2.title=დახატვა
 editor_ink2_label=დახატვა
 
+editor_stamp.title=სურათის დამატება
+editor_stamp_label=სურათის დამატება
+
+editor_stamp1.title=სურათების დამატება ან ჩასწორება
+editor_stamp1_label=სურათების დამატება ან ჩასწორება
+
 free_text2_default_content=აკრიფეთ…
 
 # Editor Parameters
@@ -251,6 +261,9 @@ editor_ink_color=ფერი
 editor_ink_thickness=სისქე
 editor_ink_opacity=გაუმჭვირვალობა
 
+editor_stamp_add_image_label=სურათის დამატება
+editor_stamp_add_image.title=სურათის დამატება
+
 # Editor aria
 editor_free_text2_aria_label=ნაწერის ჩასწორება
 editor_ink2_aria_label=ნახატის ჩასწორება
diff --git a/viewer/locale/kk/viewer.properties b/viewer/locale/kk/viewer.properties
index 9f8ad1043..778e36d5f 100644
--- a/viewer/locale/kk/viewer.properties
+++ b/viewer/locale/kk/viewer.properties
@@ -41,6 +41,11 @@ print.title=Баспаға шығару
 print_label=Баспаға шығару
 save.title=Сақтау
 save_label=Сақтау
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Жүктеп алу
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Жүктеп алу
 bookmark1.title=Ағымдағы бет (Ағымдағы беттен URL адресін көру)
 bookmark1_label=Ағымдағы бет
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Сурет салу
 editor_stamp.title=Суретті қосу
 editor_stamp_label=Суретті қосу
 
+editor_stamp1.title=Суреттерді қосу немесе түзету
+editor_stamp1_label=Суреттерді қосу немесе түзету
+
 free_text2_default_content=Теруді бастау…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Түс
 editor_ink_thickness=Қалыңдығы
 editor_ink_opacity=Мөлдірсіздігі
 
+editor_stamp_add_image_label=Суретті қосу
+editor_stamp_add_image.title=Суретті қосу
+
 # Editor aria
 editor_free_text2_aria_label=Мәтін түзеткіші
 editor_ink2_aria_label=Сурет түзеткіші
diff --git a/viewer/locale/ko/viewer.properties b/viewer/locale/ko/viewer.properties
index add4201ef..03ee0d7e0 100644
--- a/viewer/locale/ko/viewer.properties
+++ b/viewer/locale/ko/viewer.properties
@@ -41,6 +41,11 @@ print.title=인쇄
 print_label=인쇄
 save.title=저장
 save_label=저장
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=다운로드
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=다운로드
 bookmark1.title=현재 페이지 (현재 페이지에서 URL 보기)
 bookmark1_label=현재 페이지
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=그리기
 editor_stamp.title=이미지 추가
 editor_stamp_label=이미지 추가
 
+editor_stamp1.title=이미지 추가 또는 편집
+editor_stamp1_label=이미지 추가 또는 편집
+
 free_text2_default_content=입력하세요…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=색상
 editor_ink_thickness=두께
 editor_ink_opacity=불투명도
 
+editor_stamp_add_image_label=이미지 추가
+editor_stamp_add_image.title=이미지 추가
+
 # Editor aria
 editor_free_text2_aria_label=텍스트 편집기
 editor_ink2_aria_label=그리기 편집기
diff --git a/viewer/locale/mk/viewer.properties b/viewer/locale/mk/viewer.properties
index 842999ba9..13cc47bd1 100644
--- a/viewer/locale/mk/viewer.properties
+++ b/viewer/locale/mk/viewer.properties
@@ -19,11 +19,14 @@ next.title=Следна страница
 next_label=Следна
 
 # LOCALIZATION NOTE (page.title): The tooltip for the pageNumber input.
+page.title=Страница
 # LOCALIZATION NOTE (of_pages): "{{pagesCount}}" will be replaced by a number
 # representing the total number of pages in the document.
+of_pages=од {{pagesCount}}
 # LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
 # will be replaced by a number representing the currently visible page,
 # respectively a number representing the total number of pages in the document.
+page_of_pages=({{pageNumber}} од {{pagesCount}})
 
 zoom_out.title=Намалување
 zoom_out_label=Намали
@@ -36,31 +39,78 @@ open_file.title=Отворање датотека
 open_file_label=Отвори
 print.title=Печатење
 print_label=Печати
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 
 # Secondary toolbar and context menu
 tools.title=Алатки
+tools_label=Алатки
+first_page.title=Оди до првата страница
+first_page_label=Оди до првата страница
+last_page.title=Оди до последната страница
+last_page_label=Оди до последната страница
+page_rotate_cw.title=Ротирај по стрелките на часовникот
+page_rotate_cw_label=Ротирај по стрелките на часовникот
+page_rotate_ccw.title=Ротирај спротивно од стрелките на часовникот
+page_rotate_ccw_label=Ротирај спротивно од стрелките на часовникот
 
+cursor_text_select_tool.title=Овозможи алатка за избор на текст
+cursor_text_select_tool_label=Алатка за избор на текст
 
 
 
 # Document properties dialog box
+document_properties.title=Својства на документот…
+document_properties_label=Својства на документот…
+document_properties_file_name=Име на датотека:
+document_properties_file_size=Големина на датотеката:
 # LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in kilobytes, respectively in bytes.
+document_properties_kb={{size_kb}} КБ ({{size_b}} бајти)
 # LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
 # will be replaced by the PDF file size in megabytes, respectively in bytes.
+document_properties_mb={{size_mb}} МБ ({{size_b}} бајти)
+document_properties_title=Наслов:
+document_properties_author=Автор:
+document_properties_subject=Тема:
+document_properties_keywords=Клучни зборови:
+document_properties_creation_date=Датум на создавање:
+document_properties_modification_date=Датум на промена:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
 # will be replaced by the creation/modification date, and time, of the PDF file.
+document_properties_date_string={{date}}, {{time}}
+document_properties_creator=Креатор:
+document_properties_version=Верзија на PDF:
+document_properties_page_count=Број на страници:
+document_properties_page_size=Големина на страница:
+document_properties_page_size_unit_inches=инч
+document_properties_page_size_unit_millimeters=мм
+document_properties_page_size_orientation_portrait=портрет
+document_properties_page_size_orientation_landscape=пејзаж
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=Писмо
 # LOCALIZATION NOTE (document_properties_page_size_dimension_string):
 # "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
 # the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
 # LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
 # "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
 # the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized_yes=Да
+document_properties_linearized_no=Не
+document_properties_close=Затвори
 
+print_progress_message=Документ се подготвува за печатење…
 # LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
 # a numerical per cent value.
+print_progress_percent={{progress}}%
 print_progress_close=Откажи
 
 # Tooltips and alt text for side panel toolbar buttons
@@ -68,11 +118,14 @@ print_progress_close=Откажи
 # tooltips)
 toggle_sidebar.title=Вклучи странична лента
 toggle_sidebar_label=Вклучи странична лента
+document_outline_label=Содржина на документот
+attachments.title=Прикажи додатоци
 thumbs.title=Прикажување на икони
 thumbs_label=Икони
 findbar.title=Најди во документот
 findbar_label=Најди
 
+# LOCALIZATION NOTE (page_landmark): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -82,14 +135,38 @@ thumb_page_title=Страница {{page}}
 thumb_page_canvas=Икона од страница {{page}}
 
 # Find panel button title and messages
+find_input.title=Пронајди
+find_input.placeholder=Пронајди во документот…
 find_previous.title=Најди ја предходната појава на фразата
 find_previous_label=Претходно
 find_next.title=Најди ја следната појава на фразата
 find_next_label=Следно
 find_highlight=Означи сѐ
 find_match_case_label=Токму така
+find_entire_word_label=Цели зборови
 find_reached_top=Барањето стигна до почетокот на документот и почнува од крајот
 find_reached_bottom=Барањето стигна до крајот на документот и почнува од почеток
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} од {{total}} совпаѓања
+find_match_count[two]={{current}} од {{total}} совпаѓања
+find_match_count[few]={{current}} од {{total}} совпаѓања
+find_match_count[many]={{current}} од {{total}} совпаѓања
+find_match_count[other]={{current}} од {{total}} совпаѓања
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Повеќе од {{limit}} совпаѓања
+find_match_count_limit[one]=Повеќе од {{limit}} совпаѓање
+find_match_count_limit[two]=Повеќе од {{limit}} совпаѓања
+find_match_count_limit[few]=Повеќе од {{limit}} совпаѓања
+find_match_count_limit[many]=Повеќе од {{limit}} совпаѓања
+find_match_count_limit[other]=Повеќе од {{limit}} совпаѓања
 find_not_found=Фразата не е пронајдена
 
 # Predefined zoom values
@@ -99,20 +176,36 @@ page_scale_auto=Автоматска големина
 page_scale_actual=Вистинска големина
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
+page_scale_percent={{scale}}%
 
+# Loading indicator messages
 loading_error=Настана грешка при вчитувањето на PDF-от.
 invalid_file_error=Невалидна или корумпирана PDF датотека.
 missing_file_error=Недостасува PDF документ.
-
+unexpected_response_error=Неочекуван одговор од серверот.
 rendering_error=Настана грешка при прикажувањето на страницата.
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
+
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
+password_label=Внесете ја лозинката за да ја отворите оваа датотека.
+password_invalid=Невалидна лозинка. Обидете се повторно.
+password_ok=Во ред
 password_cancel=Откажи
 
 printing_not_supported=Предупредување: Печатењето не е целосно поддржано во овој прелистувач.
 printing_not_ready=Предупредување: PDF документот не е целосно вчитан за печатење.
 web_fonts_disabled=Интернет фонтовите се оневозможени: не може да се користат вградените PDF фонтови.
 
+# Editor
+
+
+
+# Editor Parameters
+
+# Editor aria
diff --git a/viewer/locale/nl/viewer.properties b/viewer/locale/nl/viewer.properties
index f14a1f610..a1796af57 100644
--- a/viewer/locale/nl/viewer.properties
+++ b/viewer/locale/nl/viewer.properties
@@ -41,6 +41,11 @@ print.title=Afdrukken
 print_label=Afdrukken
 save.title=Opslaan
 save_label=Opslaan
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Downloaden
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Downloaden
 bookmark1.title=Huidige pagina (URL van huidige pagina bekijken)
 bookmark1_label=Huidige pagina
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Tekenen
 editor_stamp.title=Afbeelding toevoegen
 editor_stamp_label=Afbeelding toevoegen
 
+editor_stamp1.title=Afbeeldingen toevoegen of bewerken
+editor_stamp1_label=Afbeeldingen toevoegen of bewerken
+
 free_text2_default_content=Begin met typen…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Kleur
 editor_ink_thickness=Dikte
 editor_ink_opacity=Opaciteit
 
+editor_stamp_add_image_label=Afbeelding toevoegen
+editor_stamp_add_image.title=Afbeelding toevoegen
+
 # Editor aria
 editor_free_text2_aria_label=Tekstbewerker
 editor_ink2_aria_label=Tekeningbewerker
diff --git a/viewer/locale/nn-NO/viewer.properties b/viewer/locale/nn-NO/viewer.properties
index 4f3746204..da26ce750 100644
--- a/viewer/locale/nn-NO/viewer.properties
+++ b/viewer/locale/nn-NO/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=Opne fil
 open_file_label=Opne
 print.title=Skriv ut
 print_label=Skriv ut
-
 save.title=Lagre
 save_label=Lagre
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Last ned
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Last ned
 bookmark1.title=Gjeldande side (sjå URL frå gjeldande side)
 bookmark1_label=Gjeldande side
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Opne i app
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Opne i app
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=Ein feil oppstod ved lasting av PDF.
 invalid_file_error=Ugyldig eller korrupt PDF-fil.
 missing_file_error=Manglande PDF-fil.
 unexpected_response_error=Uventa tenarrespons.
-
 rendering_error=Ein feil oppstod under vising av sida.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,9 @@ editor_free_text2_label=Tekst
 editor_ink2.title=Teikne
 editor_ink2_label=Teikne
 
+editor_stamp.title=Legg til eit bilde
+editor_stamp_label=Legg til eit bilde
+
 free_text2_default_content=Byrje å skrive…
 
 # Editor Parameters
diff --git a/viewer/locale/oc/viewer.properties b/viewer/locale/oc/viewer.properties
index f64200bba..4745bdd13 100644
--- a/viewer/locale/oc/viewer.properties
+++ b/viewer/locale/oc/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=Dobrir lo fichièr
 open_file_label=Dobrir
 print.title=Imprimir
 print_label=Imprimir
-
 save.title=Enregistrar
 save_label=Enregistrar
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Telecargar
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Telecargar
 bookmark1.title=Pagina actuala (mostrar l’adreça de la pagina actuala)
 bookmark1_label=Pagina actuala
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Dobrir amb l’aplicacion
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Dobrir amb l’aplicacion
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=Una error s'es producha pendent lo cargament del fichièr PDF.
 invalid_file_error=Fichièr PDF invalid o corromput.
 missing_file_error=Fichièr PDF mancant.
 unexpected_response_error=Responsa de servidor imprevista.
-
 rendering_error=Una error s'es producha pendent l'afichatge de la pagina.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,9 @@ editor_free_text2_label=Tèxte
 editor_ink2.title=Dessenhar
 editor_ink2_label=Dessenhar
 
+editor_stamp.title=Ajustar un imatge
+editor_stamp_label=Ajustar un imatge
+
 free_text2_default_content=Començatz d’escriure…
 
 # Editor Parameters
diff --git a/viewer/locale/pl/viewer.properties b/viewer/locale/pl/viewer.properties
index 1fb125d52..40699fac2 100644
--- a/viewer/locale/pl/viewer.properties
+++ b/viewer/locale/pl/viewer.properties
@@ -39,12 +39,15 @@ open_file.title=Otwórz plik
 open_file_label=Otwórz
 print.title=Drukuj
 print_label=Drukuj
-
 save.title=Zapisz
 save_label=Zapisz
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Pobierz
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Pobierz
 bookmark1.title=Bieżąca strona (adres do otwarcia na bieżącej stronie)
 bookmark1_label=Bieżąca strona
-
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Otwórz w aplikacji
 # LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
@@ -217,7 +220,6 @@ loading_error=Podczas wczytywania dokumentu PDF wystąpił błąd.
 invalid_file_error=Nieprawidłowy lub uszkodzony plik PDF.
 missing_file_error=Brak pliku PDF.
 unexpected_response_error=Nieoczekiwana odpowiedź serwera.
-
 rendering_error=Podczas renderowania strony wystąpił błąd.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -244,6 +246,12 @@ editor_free_text2_label=Tekst
 editor_ink2.title=Rysunek
 editor_ink2_label=Rysunek
 
+editor_stamp.title=Dodaj obraz
+editor_stamp_label=Dodaj obraz
+
+editor_stamp1.title=Dodaj lub edytuj obrazy
+editor_stamp1_label=Dodaj lub edytuj obrazy
+
 free_text2_default_content=Zacznij pisać…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Kolor
 editor_ink_thickness=Grubość
 editor_ink_opacity=Nieprzezroczystość
 
+editor_stamp_add_image_label=Dodaj obraz
+editor_stamp_add_image.title=Dodaj obraz
+
 # Editor aria
 editor_free_text2_aria_label=Edytor tekstu
 editor_ink2_aria_label=Edytor rysunku
diff --git a/viewer/locale/pt-BR/viewer.properties b/viewer/locale/pt-BR/viewer.properties
index a0451c459..077b40379 100644
--- a/viewer/locale/pt-BR/viewer.properties
+++ b/viewer/locale/pt-BR/viewer.properties
@@ -41,6 +41,11 @@ print.title=Imprimir
 print_label=Imprimir
 save.title=Salvar
 save_label=Salvar
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Baixar
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Baixar
 bookmark1.title=Página atual (ver URL da página atual)
 bookmark1_label=Pagina atual
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -199,7 +204,7 @@ find_match_count_limit[two]=Mais de {{limit}} ocorrências
 find_match_count_limit[few]=Mais de {{limit}} ocorrências
 find_match_count_limit[many]=Mais de {{limit}} ocorrências
 find_match_count_limit[other]=Mais de {{limit}} ocorrências
-find_not_found=Frase não encontrada
+find_not_found=Não encontrado
 
 # Predefined zoom values
 page_scale_width=Largura da página
@@ -244,6 +249,9 @@ editor_ink2_label=Desenho
 editor_stamp.title=Adicionar uma imagem
 editor_stamp_label=Adicionar uma imagem
 
+editor_stamp1.title=Adicionar ou editar imagens
+editor_stamp1_label=Adicionar ou editar imagens
+
 free_text2_default_content=Comece digitando…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Cor
 editor_ink_thickness=Espessura
 editor_ink_opacity=Opacidade
 
+editor_stamp_add_image_label=Adicionar imagem
+editor_stamp_add_image.title=Adicionar imagem
+
 # Editor aria
 editor_free_text2_aria_label=Editor de texto
 editor_ink2_aria_label=Editor de desenho
diff --git a/viewer/locale/pt-PT/viewer.properties b/viewer/locale/pt-PT/viewer.properties
index 7a717ce3b..22437aa3c 100644
--- a/viewer/locale/pt-PT/viewer.properties
+++ b/viewer/locale/pt-PT/viewer.properties
@@ -41,6 +41,11 @@ print.title=Imprimir
 print_label=Imprimir
 save.title=Guardar
 save_label=Guardar
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Transferir
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Transferir
 bookmark1.title=Página atual (ver URL da página atual)
 bookmark1_label=Pagina atual
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Desenhar
 editor_stamp.title=Adicionar uma imagem
 editor_stamp_label=Adicionar uma imagem
 
+editor_stamp1.title=Adicionar ou editar imagens
+editor_stamp1_label=Adicionar ou editar imagens
+
 free_text2_default_content=Começar a digitar…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Cor
 editor_ink_thickness=Espessura
 editor_ink_opacity=Opacidade
 
+editor_stamp_add_image_label=Adicionar imagem
+editor_stamp_add_image.title=Adicionar imagem
+
 # Editor aria
 editor_free_text2_aria_label=Editor de texto
 editor_ink2_aria_label=Editor de desenho
diff --git a/viewer/locale/rm/viewer.properties b/viewer/locale/rm/viewer.properties
index 780f99f9b..39cfb23e3 100644
--- a/viewer/locale/rm/viewer.properties
+++ b/viewer/locale/rm/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=Avrir datoteca
 open_file_label=Avrir
 print.title=Stampar
 print_label=Stampar
-
 save.title=Memorisar
 save_label=Memorisar
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Telechargiar
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Telechargiar
 bookmark1.title=Pagina actuala (mussar l'URL da la pagina actuala)
 bookmark1_label=Pagina actuala
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Avrir en ina app
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Avrir en ina app
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=Ina errur è cumparida cun chargiar il PDF.
 invalid_file_error=Datoteca PDF nunvalida u donnegiada.
 missing_file_error=Datoteca PDF manconta.
 unexpected_response_error=Resposta nunspetgada dal server.
-
 rendering_error=Ina errur è cumparida cun visualisar questa pagina.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,9 @@ editor_free_text2_label=Text
 editor_ink2.title=Dissegnar
 editor_ink2_label=Dissegnar
 
+editor_stamp.title=Agiuntar in maletg
+editor_stamp_label=Agiuntar in maletg
+
 free_text2_default_content=Cumenzar a tippar…
 
 # Editor Parameters
diff --git a/viewer/locale/ru/viewer.properties b/viewer/locale/ru/viewer.properties
index 3acf683ff..22bcda44b 100644
--- a/viewer/locale/ru/viewer.properties
+++ b/viewer/locale/ru/viewer.properties
@@ -41,6 +41,11 @@ print.title=Печать
 print_label=Печать
 save.title=Сохранить
 save_label=Сохранить
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Загрузить
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Загрузить
 bookmark1.title=Текущая страница (просмотр URL-адреса с текущей страницы)
 bookmark1_label=Текущая страница
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Рисовать
 editor_stamp.title=Добавить изображение
 editor_stamp_label=Добавить изображение
 
+editor_stamp1.title=Добавить или изменить изображения
+editor_stamp1_label=Добавить или изменить изображения
+
 free_text2_default_content=Начните вводить…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Цвет
 editor_ink_thickness=Толщина
 editor_ink_opacity=Прозрачность
 
+editor_stamp_add_image_label=Добавить изображение
+editor_stamp_add_image.title=Добавить изображение
+
 # Editor aria
 editor_free_text2_aria_label=Текстовый редактор
 editor_ink2_aria_label=Редактор рисования
diff --git a/viewer/locale/sat/viewer.properties b/viewer/locale/sat/viewer.properties
index b3dc2c0a6..180c2682f 100644
--- a/viewer/locale/sat/viewer.properties
+++ b/viewer/locale/sat/viewer.properties
@@ -41,6 +41,11 @@ print.title=ᱪᱷᱟᱯᱟ
 print_label=ᱪᱷᱟᱯᱟ
 save.title=ᱥᱟᱺᱪᱟᱣ ᱢᱮ
 save_label=ᱥᱟᱺᱪᱟᱣ ᱢᱮ
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=ᱰᱟᱣᱩᱱᱞᱚᱰ
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=ᱰᱟᱣᱩᱱᱞᱚᱰ
 bookmark1.title=ᱱᱤᱛᱚᱜᱟᱜ ᱥᱟᱦᱴᱟ (ᱱᱤᱛᱚᱜᱟᱜ ᱥᱟᱦᱴᱟ ᱠᱷᱚᱱ URL ᱫᱮᱠᱷᱟᱣ ᱢᱮ)
 bookmark1_label=ᱱᱤᱛᱚᱜᱟᱜ ᱥᱟᱦᱴᱟ
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -241,8 +246,8 @@ editor_free_text2_label=ᱚᱞ
 editor_ink2.title=ᱛᱮᱭᱟᱨ
 editor_ink2_label=ᱛᱮᱭᱟᱨ
 
-editor_stamp.title=ᱢᱤᱫᱴᱟᱹᱝ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
-editor_stamp_label=ᱢᱤᱫᱴᱟᱹᱝ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
+editor_stamp.title=ᱢᱤᱫᱴᱟᱝ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
+editor_stamp_label=ᱢᱤᱫᱴᱟᱝ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ
 
 free_text2_default_content=ᱚᱞ ᱮᱛᱦᱚᱵ ᱢᱮ …
 
diff --git a/viewer/locale/sc/viewer.properties b/viewer/locale/sc/viewer.properties
index a4d1f2a95..4da24c127 100644
--- a/viewer/locale/sc/viewer.properties
+++ b/viewer/locale/sc/viewer.properties
@@ -39,10 +39,19 @@ open_file.title=Aberi s'archìviu
 open_file_label=Abertu
 print.title=Imprenta
 print_label=Imprenta
-
 save.title=Sarva
 save_label=Sarva
-
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Iscàrriga
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Iscàrriga
+bookmark1.title=Pàgina atuale (ammustra s’URL de sa pàgina atuale)
+bookmark1_label=Pàgina atuale
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
+open_in_app.title=Aberi in un’aplicatzione
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
+open_in_app_label=Aberi in un’aplicatzione
 
 # Secondary toolbar and context menu
 tools.title=Istrumentos
@@ -202,7 +211,6 @@ loading_error=Faddina in sa càrriga de su PDF.
 invalid_file_error=Archìviu PDF non vàlidu o corrùmpidu.
 missing_file_error=Ammancat s'archìviu PDF.
 unexpected_response_error=Risposta imprevista de su serbidore.
-
 rendering_error=Faddina in sa visualizatzione de sa pàgina.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -228,6 +236,11 @@ editor_free_text2_label=Testu
 editor_ink2.title=Disinnu
 editor_ink2_label=Disinnu
 
+editor_stamp_label=Agiunghe un’immàgine
+
+editor_stamp1.title=Agiunghe o modìfica immàgines
+editor_stamp1_label=Agiunghe o modìfica immàgines
+
 free_text2_default_content=Cumintza a iscrìere…
 
 # Editor Parameters
@@ -236,6 +249,9 @@ editor_free_text_size=Mannària
 editor_ink_color=Colore
 editor_ink_thickness=Grussària
 
+editor_stamp_add_image_label=Agiunghe un’immàgine
+editor_stamp_add_image.title=Agiunghe un’immàgine
+
 # Editor aria
 editor_free_text2_aria_label=Editore de testu
 editor_ink2_aria_label=Editore de disinnos
diff --git a/viewer/locale/si/viewer.properties b/viewer/locale/si/viewer.properties
index a865cf906..05dde248e 100644
--- a/viewer/locale/si/viewer.properties
+++ b/viewer/locale/si/viewer.properties
@@ -25,6 +25,7 @@ page.title=පිටුව
 # LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
 # will be replaced by a number representing the currently visible page,
 # respectively a number representing the total number of pages in the document.
+page_of_pages=({{pageNumber}} / {{pagesCount}})
 
 zoom_out.title=කුඩාලනය
 zoom_out_label=කුඩාලනය
@@ -39,6 +40,11 @@ print.title=මුද්‍රණය
 print_label=මුද්‍රණය
 save.title=සුරකින්න
 save_label=සුරකින්න
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=බාගන්න
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=බාගන්න
 bookmark1_label=පවතින පිටුව
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=යෙදුමෙහි අරින්න
@@ -158,9 +164,11 @@ find_reached_bottom=ලේඛනයේ අවසානයට ළඟා විය
 # "{{current}}" and "{{total}}" will be replaced by a number representing the
 # index of the currently active find result, respectively a number representing
 # the total number of matches in the document.
+find_match_count={[ plural(total) ]}
 # LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
 # [zero|one|two|few|many|other], with [other] as the default value.
 # "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
 find_match_count_limit[zero]=ගැළපීම් {{limit}} කට වඩා
 find_match_count_limit[two]=ගැළපුම් {{limit}} කට වඩා
 find_match_count_limit[few]=ගැළපුම් {{limit}} කට වඩා
@@ -202,8 +210,13 @@ web_fonts_disabled=වියමන අකුරු අබලයි: පීඩී
 # Editor
 editor_free_text2.title=පෙළ
 editor_free_text2_label=පෙළ
+editor_ink2.title=අඳින්න
+editor_ink2_label=අඳින්න
 
+editor_stamp.title=රූපයක් එක් කරන්න
+editor_stamp_label=රූපයක් එක් කරන්න
 
+free_text2_default_content=ලිවීීම අරඹන්න…
 
 # Editor Parameters
 editor_free_text_color=වර්ණය
diff --git a/viewer/locale/sk/viewer.properties b/viewer/locale/sk/viewer.properties
index 9a17fff79..22ce0590c 100644
--- a/viewer/locale/sk/viewer.properties
+++ b/viewer/locale/sk/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=Otvoriť súbor
 open_file_label=Otvoriť
 print.title=Tlačiť
 print_label=Tlačiť
-
 save.title=Uložiť
 save_label=Uložiť
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Stiahnuť
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Stiahnuť
 bookmark1.title=Aktuálna stránka (zobraziť adresu URL z aktuálnej stránky)
 bookmark1_label=Aktuálna stránka
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Otvoriť v aplikácii
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Otvoriť v aplikácii
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=Počas načítavania dokumentu PDF sa vyskytla chyba.
 invalid_file_error=Neplatný alebo poškodený súbor PDF.
 missing_file_error=Chýbajúci súbor PDF.
 unexpected_response_error=Neočakávaná odpoveď zo servera.
-
 rendering_error=Pri vykresľovaní stránky sa vyskytla chyba.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,12 @@ editor_free_text2_label=Text
 editor_ink2.title=Kreslenie
 editor_ink2_label=Kresliť
 
+editor_stamp.title=Pridať obrázok
+editor_stamp_label=Pridať obrázok
+
+editor_stamp1.title=Pridať alebo upraviť obrázky
+editor_stamp1_label=Pridať alebo upraviť obrázky
+
 free_text2_default_content=Začnite písať…
 
 # Editor Parameters
@@ -251,6 +261,9 @@ editor_ink_color=Farba
 editor_ink_thickness=Hrúbka
 editor_ink_opacity=Priehľadnosť
 
+editor_stamp_add_image_label=Pridať obrázok
+editor_stamp_add_image.title=Pridať obrázok
+
 # Editor aria
 editor_free_text2_aria_label=Textový editor
 editor_ink2_aria_label=Editor kreslenia
diff --git a/viewer/locale/skr/viewer.properties b/viewer/locale/skr/viewer.properties
index c771e2713..a66a271cd 100644
--- a/viewer/locale/skr/viewer.properties
+++ b/viewer/locale/skr/viewer.properties
@@ -41,10 +41,16 @@ print.title=چھاپو
 print_label=چھاپو 
 save.title=ہتھیکڑا کرو
 save_label=ہتھیکڑا کرو
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=ڈاؤن لوڈ
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=ڈاؤن لوڈ
 bookmark1.title=موجودہ ورقہ (موجودہ ورقے کنوں یوآرایل ݙیکھو)
 bookmark1_label=موجودہ ورقہ
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=ایپ وچ کھولو
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=ایپ وچ کھولو
 
 # Secondary toolbar and context menu
@@ -214,7 +220,6 @@ loading_error=PDF لوڈ کریندے ویلھے نقص آ ڳیا۔
 invalid_file_error=غلط یا خراب شدہ PDF فائل۔
 missing_file_error=PDF فائل غائب ہے۔
 unexpected_response_error=سرور دا غیر متوقع جواب۔
-
 rendering_error=ورقہ رینڈر کریندے ویلھے ہک خرابی پیش آڳئی۔
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -241,6 +246,9 @@ editor_free_text2_label=متن
 editor_ink2.title=چھکو
 editor_ink2_label=چھکو
 
+editor_stamp.title=ہک تصویر شامل کرو
+editor_stamp_label=ہک تصویر شامل کرو
+
 free_text2_default_content=ٹائپنگ شروع کرو …
 
 # Editor Parameters
diff --git a/viewer/locale/sl/viewer.properties b/viewer/locale/sl/viewer.properties
index 082b5fb02..70dfc39bf 100644
--- a/viewer/locale/sl/viewer.properties
+++ b/viewer/locale/sl/viewer.properties
@@ -41,6 +41,11 @@ print.title=Natisni
 print_label=Natisni
 save.title=Shrani
 save_label=Shrani
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Prenesi
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Prenesi
 bookmark1.title=Trenutna stran (prikaži URL, ki vodi do trenutne strani)
 bookmark1_label=Na trenutno stran
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Riši
 editor_stamp.title=Dodaj sliko
 editor_stamp_label=Dodaj sliko
 
+editor_stamp1.title=Dodajanje ali urejanje slik
+editor_stamp1_label=Dodajanje ali urejanje slik
+
 free_text2_default_content=Začnite tipkati …
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Barva
 editor_ink_thickness=Debelina
 editor_ink_opacity=Neprosojnost
 
+editor_stamp_add_image_label=Dodaj sliko
+editor_stamp_add_image.title=Dodaj sliko
+
 # Editor aria
 editor_free_text2_aria_label=Urejevalnik besedila
 editor_ink2_aria_label=Urejevalnik risanja
diff --git a/viewer/locale/sv-SE/viewer.properties b/viewer/locale/sv-SE/viewer.properties
index dc1b12420..56f24bd73 100644
--- a/viewer/locale/sv-SE/viewer.properties
+++ b/viewer/locale/sv-SE/viewer.properties
@@ -41,6 +41,11 @@ print.title=Skriv ut
 print_label=Skriv ut
 save.title=Spara
 save_label=Spara
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Hämta
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Hämta
 bookmark1.title=Aktuell sida (Visa URL från aktuell sida)
 bookmark1_label=Aktuell sida
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=Rita
 editor_stamp.title=Lägg till en bild
 editor_stamp_label=Lägg till en bild
 
+editor_stamp1.title=Lägg till eller redigera bilder
+editor_stamp1_label=Lägg till eller redigera bilder
+
 free_text2_default_content=Börja skriva…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=Färg
 editor_ink_thickness=Tjocklek
 editor_ink_opacity=Opacitet
 
+editor_stamp_add_image_label=Lägg till bild
+editor_stamp_add_image.title=Lägg till bild
+
 # Editor aria
 editor_free_text2_aria_label=Textredigerare
 editor_ink2_aria_label=Ritredigerare
diff --git a/viewer/locale/tg/viewer.properties b/viewer/locale/tg/viewer.properties
index e4f75960e..05fd2197c 100644
--- a/viewer/locale/tg/viewer.properties
+++ b/viewer/locale/tg/viewer.properties
@@ -41,6 +41,11 @@ print.title=Чоп кардан
 print_label=Чоп кардан
 save.title=Нигоҳ доштан
 save_label=Нигоҳ доштан
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Боргирӣ кардан
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Боргирӣ кардан
 bookmark1.title=Саҳифаи ҷорӣ (Дидани нишонии URL аз саҳифаи ҷорӣ)
 bookmark1_label=Саҳифаи ҷорӣ
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,7 @@ editor_ink2_label=Расмкашӣ
 editor_stamp.title=Илова кардани тасвир
 editor_stamp_label=Илова кардани тасвир
 
+
 free_text2_default_content=Нависед…
 
 # Editor Parameters
@@ -253,6 +259,9 @@ editor_ink_color=Ранг
 editor_ink_thickness=Ғафсӣ
 editor_ink_opacity=Шаффофӣ
 
+editor_stamp_add_image_label=Илова кардани тасвир
+editor_stamp_add_image.title=Илова кардани тасвир
+
 # Editor aria
 editor_free_text2_aria_label=Муҳаррири матн
 editor_ink2_aria_label=Муҳаррири расмкашӣ
diff --git a/viewer/locale/th/viewer.properties b/viewer/locale/th/viewer.properties
index af56a9545..84f74dac6 100644
--- a/viewer/locale/th/viewer.properties
+++ b/viewer/locale/th/viewer.properties
@@ -39,12 +39,15 @@ open_file.title=เปิดไฟล์
 open_file_label=เปิด
 print.title=พิมพ์
 print_label=พิมพ์
-
 save.title=บันทึก
 save_label=บันทึก
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=ดาวน์โหลด
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=ดาวน์โหลด
 bookmark1.title=หน้าปัจจุบัน (ดู URL จากหน้าปัจจุบัน)
 bookmark1_label=หน้าปัจจุบัน
-
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=เปิดในแอป
 # LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
@@ -217,7 +220,6 @@ loading_error=เกิดข้อผิดพลาดขณะโหลด PD
 invalid_file_error=ไฟล์ PDF ไม่ถูกต้องหรือเสียหาย
 missing_file_error=ไฟล์ PDF หายไป
 unexpected_response_error=การตอบสนองของเซิร์ฟเวอร์ที่ไม่คาดคิด
-
 rendering_error=เกิดข้อผิดพลาดขณะเรนเดอร์หน้า
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -244,6 +246,9 @@ editor_free_text2_label=ข้อความ
 editor_ink2.title=รูปวาด
 editor_ink2_label=รูปวาด
 
+editor_stamp.title=เพิ่มรูปภาพ
+editor_stamp_label=เพิ่มรูปภาพ
+
 free_text2_default_content=เริ่มพิมพ์…
 
 # Editor Parameters
diff --git a/viewer/locale/tr/viewer.properties b/viewer/locale/tr/viewer.properties
index 97f6ec544..982d11adb 100644
--- a/viewer/locale/tr/viewer.properties
+++ b/viewer/locale/tr/viewer.properties
@@ -41,6 +41,11 @@ print.title=Yazdır
 print_label=Yazdır
 save.title=Kaydet
 save_label=Kaydet
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=İndir
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=İndir
 bookmark1.title=Geçerli sayfa (geçerli sayfanın adresini görüntüle)
 bookmark1_label=Geçerli sayfa
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
diff --git a/viewer/locale/uk/viewer.properties b/viewer/locale/uk/viewer.properties
index 11e82d109..d6ca7b27e 100644
--- a/viewer/locale/uk/viewer.properties
+++ b/viewer/locale/uk/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=Відкрити файл
 open_file_label=Відкрити
 print.title=Друк
 print_label=Друк
-
 save.title=Зберегти
 save_label=Зберегти
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Завантажити
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Завантажити
 bookmark1.title=Поточна сторінка (перегляд URL-адреси з поточної сторінки)
 bookmark1_label=Поточна сторінка
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Відкрити у програмі
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Відкрити у програмі
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=Під час завантаження PDF сталася поми
 invalid_file_error=Недійсний або пошкоджений PDF-файл.
 missing_file_error=Відсутній PDF-файл.
 unexpected_response_error=Неочікувана відповідь сервера.
-
 rendering_error=Під час виведення сторінки сталася помилка.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,12 @@ editor_free_text2_label=Текст
 editor_ink2.title=Малювати
 editor_ink2_label=Малювати
 
+editor_stamp.title=Додати зображення
+editor_stamp_label=Додати зображення
+
+editor_stamp1.title=Додати чи редагувати зображення
+editor_stamp1_label=Додати чи редагувати зображення
+
 free_text2_default_content=Почніть вводити…
 
 # Editor Parameters
@@ -251,6 +261,9 @@ editor_ink_color=Колір
 editor_ink_thickness=Товщина
 editor_ink_opacity=Прозорість
 
+editor_stamp_add_image_label=Додати зображення
+editor_stamp_add_image.title=Додати зображення
+
 # Editor aria
 editor_free_text2_aria_label=Текстовий редактор
 editor_ink2_aria_label=Графічний редактор
diff --git a/viewer/locale/vi/viewer.properties b/viewer/locale/vi/viewer.properties
index 43360a3da..3b87eef3a 100644
--- a/viewer/locale/vi/viewer.properties
+++ b/viewer/locale/vi/viewer.properties
@@ -39,13 +39,18 @@ open_file.title=Mở tập tin
 open_file_label=Mở tập tin
 print.title=In
 print_label=In
-
 save.title=Lưu
 save_label=Lưu
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=Tải xuống
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=Tải xuống
 bookmark1.title=Trang hiện tại (xem URL từ trang hiện tại)
 bookmark1_label=Trang hiện tại
-
+# LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
 open_in_app.title=Mở trong ứng dụng
+# LOCALIZATION NOTE (open_in_app_label): This string is used in Firefox for Android. Length of the translation matters since we are in a mobile context, with limited screen estate.
 open_in_app_label=Mở trong ứng dụng
 
 # Secondary toolbar and context menu
@@ -215,7 +220,6 @@ loading_error=Lỗi khi tải tài liệu PDF.
 invalid_file_error=Tập tin PDF hỏng hoặc không hợp lệ.
 missing_file_error=Thiếu tập tin PDF.
 unexpected_response_error=Máy chủ có phản hồi lạ.
-
 rendering_error=Lỗi khi hiển thị trang.
 
 # LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
@@ -242,6 +246,12 @@ editor_free_text2_label=Văn bản
 editor_ink2.title=Vẽ
 editor_ink2_label=Vẽ
 
+editor_stamp.title=Thêm một ảnh
+editor_stamp_label=Thêm một ảnh
+
+editor_stamp1.title=Thêm hoặc chỉnh sửa hình ảnh
+editor_stamp1_label=Thêm hoặc chỉnh sửa hình ảnh
+
 free_text2_default_content=Bắt đầu nhập…
 
 # Editor Parameters
@@ -251,6 +261,9 @@ editor_ink_color=Màu
 editor_ink_thickness=Độ dày
 editor_ink_opacity=Độ mờ
 
+editor_stamp_add_image_label=Thêm hình ảnh
+editor_stamp_add_image.title=Thêm hình ảnh
+
 # Editor aria
 editor_free_text2_aria_label=Trình sửa văn bản
 editor_ink2_aria_label=Trình sửa nét vẽ
diff --git a/viewer/locale/zh-CN/viewer.properties b/viewer/locale/zh-CN/viewer.properties
index 8fd022a64..4d9d7cc24 100644
--- a/viewer/locale/zh-CN/viewer.properties
+++ b/viewer/locale/zh-CN/viewer.properties
@@ -41,6 +41,11 @@ print.title=打印
 print_label=打印
 save.title=保存
 save_label=保存
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=下载
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=下载
 bookmark1.title=当前页面（在当前页面查看 URL）
 bookmark1_label=当前页面
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=绘图
 editor_stamp.title=添加图像
 editor_stamp_label=添加图像
 
+editor_stamp1.title=添加或编辑图像
+editor_stamp1_label=添加或编辑图像
+
 free_text2_default_content=开始输入…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=颜色
 editor_ink_thickness=粗细
 editor_ink_opacity=不透明度
 
+editor_stamp_add_image_label=添加图像
+editor_stamp_add_image.title=添加图像
+
 # Editor aria
 editor_free_text2_aria_label=文本编辑器
 editor_ink2_aria_label=绘图编辑器
diff --git a/viewer/locale/zh-TW/viewer.properties b/viewer/locale/zh-TW/viewer.properties
index bd1984bb9..8fee7c770 100644
--- a/viewer/locale/zh-TW/viewer.properties
+++ b/viewer/locale/zh-TW/viewer.properties
@@ -41,6 +41,11 @@ print.title=列印
 print_label=列印
 save.title=儲存
 save_label=儲存
+# LOCALIZATION NOTE (download_button.title): used in Firefox for Android as a tooltip for the download button (“download” is a verb).
+download_button.title=下載
+# LOCALIZATION NOTE (download_button_label): used in Firefox for Android as a label for the download button (“download” is a verb).
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+download_button_label=下載
 bookmark1.title=目前頁面（含目前檢視頁面的網址）
 bookmark1_label=目前頁面
 # LOCALIZATION NOTE (open_in_app.title): This string is used in Firefox for Android.
@@ -244,6 +249,9 @@ editor_ink2_label=繪圖
 editor_stamp.title=新增圖片
 editor_stamp_label=新增圖片
 
+editor_stamp1.title=新增或編輯圖片
+editor_stamp1_label=新增或編輯圖片
+
 free_text2_default_content=開始打字…
 
 # Editor Parameters
@@ -253,6 +261,9 @@ editor_ink_color=色彩
 editor_ink_thickness=線條粗細
 editor_ink_opacity=透​明度
 
+editor_stamp_add_image_label=新增圖片
+editor_stamp_add_image.title=新增圖片
+
 # Editor aria
 editor_free_text2_aria_label=文本編輯器
 editor_ink2_aria_label=圖形編輯器
diff --git a/viewer/viewer.css b/viewer/viewer.css
index abe98df1e..12d15c07d 100644
--- a/viewer/viewer.css
+++ b/viewer/viewer.css
@@ -871,6 +871,15 @@
   z-index: 4;
 }
 
+.annotationEditorLayer.waiting {
+  content: "";
+  cursor: wait;
+  position: absolute;
+  inset: 0;
+  width: 100%;
+  height: 100%;
+}
+
 .annotationEditorLayer.freeTextEditing {
   cursor: var(--editorFreeText-editing-cursor);
 }
@@ -880,7 +889,7 @@
 }
 
 .annotationEditorLayer
-  :is(.freeTextEditor, .inkEditor, .stampEditor)[draggable="true"] {
+  :is(.freeTextEditor, .inkEditor, .stampEditor).draggable.selectedEditor {
   cursor: move;
 }
 
@@ -971,123 +980,222 @@
   height: auto;
 }
 
-.annotationEditorLayer .stampEditor.loading {
-  aspect-ratio: 1;
-  width: 10%;
-  height: auto;
-  background-color: rgba(128, 128, 128, 0.5);
-  background-image: var(--loading-icon);
-  background-repeat: no-repeat;
-  background-position: 50%;
-  background-size: 16px 16px;
-  transition-property: background-size;
-  transition-delay: var(--loading-icon-delay);
-}
-
 .annotationEditorLayer .stampEditor canvas {
   width: 100%;
   height: 100%;
 }
 
-.annotationEditorLayer .resizers {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  inset: 0;
-}
-
-.annotationEditorLayer .resizers.hidden {
-  display: none;
-}
-
-.annotationEditorLayer .resizer {
-  width: var(--resizer-size);
-  height: var(--resizer-size);
-  border-radius: 50%;
-  background: var(--resizer-color);
-  border: var(--focus-outline);
-  position: absolute;
-}
-
-.annotationEditorLayer .resizer.topLeft {
-  cursor: nw-resize;
-  top: var(--resizer-shift);
-  left: var(--resizer-shift);
-}
-
-.annotationEditorLayer .resizer.topMiddle {
-  cursor: n-resize;
-  top: var(--resizer-shift);
-  left: calc(50% + var(--resizer-shift));
-}
-
-.annotationEditorLayer .resizer.topRight {
-  cursor: ne-resize;
-  top: var(--resizer-shift);
-  right: var(--resizer-shift);
-}
-
-.annotationEditorLayer .resizer.middleRight {
-  cursor: e-resize;
-  top: calc(50% + var(--resizer-shift));
-  right: var(--resizer-shift);
-}
-
-.annotationEditorLayer .resizer.bottomRight {
-  cursor: se-resize;
-  bottom: var(--resizer-shift);
-  right: var(--resizer-shift);
-}
-
-.annotationEditorLayer .resizer.bottomMiddle {
-  cursor: s-resize;
-  bottom: var(--resizer-shift);
-  left: calc(50% + var(--resizer-shift));
-}
-
-.annotationEditorLayer .resizer.bottomLeft {
-  cursor: sw-resize;
-  bottom: var(--resizer-shift);
-  left: var(--resizer-shift);
-}
-
-.annotationEditorLayer .resizer.middleLeft {
-  cursor: w-resize;
-  top: calc(50% + var(--resizer-shift));
-  left: var(--resizer-shift);
-}
-
-.annotationEditorLayer.resizingTopLeft {
-  cursor: nw-resize;
-}
-
-.annotationEditorLayer.resizingTopMiddle {
-  cursor: n-resize;
-}
-
-.annotationEditorLayer.resizingTopRight {
-  cursor: ne-resize;
-}
-
-.annotationEditorLayer.resizingMiddleRight {
-  cursor: e-resize;
-}
-
-.annotationEditorLayer.resizingBottomRight {
-  cursor: se-resize;
-}
-
-.annotationEditorLayer.resizingBottomMiddle {
-  cursor: s-resize;
-}
-
-.annotationEditorLayer.resizingBottomLeft {
-  cursor: sw-resize;
-}
-
-.annotationEditorLayer.resizingMiddleLeft {
-  cursor: w-resize;
-}
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers {
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      inset: 0;
+    }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers.hidden {
+        display: none;
+      }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers > .resizer {
+        width: var(--resizer-size);
+        height: var(--resizer-size);
+        border-radius: 50%;
+        background: var(--resizer-color);
+        border: var(--focus-outline);
+        position: absolute;
+      }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers > .resizer.topLeft {
+          top: var(--resizer-shift);
+          left: var(--resizer-shift);
+        }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers > .resizer.topMiddle {
+          top: var(--resizer-shift);
+          left: calc(50% + var(--resizer-shift));
+        }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers > .resizer.topRight {
+          top: var(--resizer-shift);
+          right: var(--resizer-shift);
+        }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers > .resizer.middleRight {
+          top: calc(50% + var(--resizer-shift));
+          right: var(--resizer-shift);
+        }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers > .resizer.bottomRight {
+          bottom: var(--resizer-shift);
+          right: var(--resizer-shift);
+        }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers > .resizer.bottomMiddle {
+          bottom: var(--resizer-shift);
+          left: calc(50% + var(--resizer-shift));
+        }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers > .resizer.bottomLeft {
+          bottom: var(--resizer-shift);
+          left: var(--resizer-shift);
+        }
+
+.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor) > .resizers > .resizer.middleLeft {
+          top: calc(50% + var(--resizer-shift));
+          left: var(--resizer-shift);
+        }
+
+.annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topLeft,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topLeft,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topLeft,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topLeft,
+      .annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomRight,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomRight,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomRight,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomRight {
+        cursor: nwse-resize;
+      }
+
+.annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topMiddle,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topMiddle,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topMiddle,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topMiddle,
+      .annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomMiddle,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomMiddle,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomMiddle,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomMiddle {
+        cursor: ns-resize;
+      }
+
+.annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topRight,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topRight,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topRight,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topRight,
+      .annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomLeft,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomLeft,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomLeft,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomLeft {
+        cursor: nesw-resize;
+      }
+
+.annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.middleRight,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.middleRight,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.middleRight,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.middleRight,
+      .annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.middleLeft,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.middleLeft,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.middleLeft,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.middleLeft {
+        cursor: ew-resize;
+      }
+
+.annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topLeft,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topLeft,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topLeft,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topLeft,
+      .annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomRight,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomRight,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomRight,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomRight {
+        cursor: nesw-resize;
+      }
+
+.annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topMiddle,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topMiddle,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topMiddle,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topMiddle,
+      .annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomMiddle,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomMiddle,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomMiddle,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomMiddle {
+        cursor: ew-resize;
+      }
+
+.annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.topRight,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.topRight,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.topRight,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.topRight,
+      .annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.bottomLeft,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.bottomLeft,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.bottomLeft,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.bottomLeft {
+        cursor: nwse-resize;
+      }
+
+.annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.middleRight,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.middleRight,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.middleRight,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.middleRight,
+      .annotationEditorLayer[data-main-rotation="0"]
+    :is([data-editor-rotation="90"], [data-editor-rotation="270"]) > .resizers > .resizer.middleLeft,
+      .annotationEditorLayer[data-main-rotation="90"]
+    :is([data-editor-rotation="0"], [data-editor-rotation="180"]) > .resizers > .resizer.middleLeft,
+      .annotationEditorLayer[data-main-rotation="180"]
+    :is([data-editor-rotation="270"], [data-editor-rotation="90"]) > .resizers > .resizer.middleLeft,
+      .annotationEditorLayer[data-main-rotation="270"]
+    :is([data-editor-rotation="180"], [data-editor-rotation="0"]) > .resizers > .resizer.middleLeft {
+        cursor: ns-resize;
+      }
 
 :root {
   --viewer-container-height: 0;
@@ -1159,6 +1267,12 @@
   height: var(--viewer-container-height);
 }
 
+.pdfViewer.noUserSelect {
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
+}
+
 .pdfViewer.removePageBorders .page {
   margin: 0 auto 10px;
   border: none;
@@ -1352,6 +1466,7 @@
   --secondaryToolbarButton-spreadOdd-icon: url(images/secondaryToolbarButton-spreadOdd.svg);
   --secondaryToolbarButton-spreadEven-icon: url(images/secondaryToolbarButton-spreadEven.svg);
   --secondaryToolbarButton-documentProperties-icon: url(images/secondaryToolbarButton-documentProperties.svg);
+  --editorParams-stampAddImage-icon: url(images/toolbarButton-zoomIn.svg);
 }
 
 [dir="rtl"]:root {
@@ -1825,16 +1940,26 @@ body {
   margin-bottom: -4px;
 }
 
-#editorInkParamsToolbar {
+#editorStampParamsToolbar {
   inset-inline-end: 40px;
   background-color: var(--toolbar-bg-color);
 }
 
-#editorFreeTextParamsToolbar {
+#editorInkParamsToolbar {
   inset-inline-end: 68px;
   background-color: var(--toolbar-bg-color);
 }
 
+#editorFreeTextParamsToolbar {
+  inset-inline-end: 96px;
+  background-color: var(--toolbar-bg-color);
+}
+
+#editorStampAddImage::before {
+  -webkit-mask-image: var(--editorParams-stampAddImage-icon);
+          mask-image: var(--editorParams-stampAddImage-icon);
+}
+
 .doorHanger,
 .doorHangerRight {
   border-radius: 2px;
diff --git a/viewer/viewer.html b/viewer/viewer.html
index 3d27764af..104ca2e05 100644
--- a/viewer/viewer.html
+++ b/viewer/viewer.html
@@ -152,6 +152,14 @@
           </div>
         </div>
 
+        <div class="editorParamsToolbar hidden doorHangerRight" id="editorStampParamsToolbar">
+          <div class="editorParamsToolbarContainer">
+            <button id="editorStampAddImage" class="secondaryToolbarButton" title="Add image" tabindex="105" data-l10n-id="editor_stamp_add_image">
+              <span data-l10n-id="editor_stamp_add_image_label">Add image</span>
+            </button>
+          </div>
+        </div>
+
         <div id="secondaryToolbar" class="secondaryToolbar hidden doorHangerRight">
           <div id="secondaryToolbarButtonContainer">
             <button id="secondaryOpenFile" class="secondaryToolbarButton visibleLargeView" title="Open File" tabindex="51" data-l10n-id="open_file">
@@ -298,15 +306,15 @@
                 <div class="verticalToolbarSeparator hiddenMediumView"></div>
 
                 <div id="editorModeButtons" class="splitToolbarButton toggled" role="radiogroup">
-                  <button id="editorStamp" class="toolbarButton hidden" disabled="disabled" title="Image" role="radio" aria-checked="false" tabindex="34" data-l10n-id="editor_stamp">
-                    <span data-l10n-id="editor_stamp_label">Image</span>
-                  </button>
-                  <button id="editorFreeText" class="toolbarButton" disabled="disabled" title="Text" role="radio" aria-checked="false" aria-controls="editorFreeTextParamsToolbar" tabindex="35" data-l10n-id="editor_free_text2">
+                  <button id="editorFreeText" class="toolbarButton" disabled="disabled" title="Text" role="radio" aria-checked="false" aria-controls="editorFreeTextParamsToolbar" tabindex="34" data-l10n-id="editor_free_text2">
                     <span data-l10n-id="editor_free_text2_label">Text</span>
                   </button>
-                  <button id="editorInk" class="toolbarButton" disabled="disabled" title="Draw" role="radio" aria-checked="false" aria-controls="editorInkParamsToolbar" tabindex="36" data-l10n-id="editor_ink2">
+                  <button id="editorInk" class="toolbarButton" disabled="disabled" title="Draw" role="radio" aria-checked="false" aria-controls="editorInkParamsToolbar" tabindex="35" data-l10n-id="editor_ink2">
                     <span data-l10n-id="editor_ink2_label">Draw</span>
                   </button>
+                  <button id="editorStamp" class="toolbarButton hidden" disabled="disabled" title="Add or edit images" role="radio" aria-checked="false" aria-controls="editorStampParamsToolbar" tabindex="36" data-l10n-id="editor_stamp1">
+                    <span data-l10n-id="editor_stamp1_label">Add or edit images</span>
+                  </button>
                 </div>
 
                 <div id="editorModeSeparator" class="verticalToolbarSeparator"></div>
diff --git a/viewer/viewer.js b/viewer/viewer.js
index 9fab555b6..61c9eea8d 100644
--- a/viewer/viewer.js
+++ b/viewer/viewer.js
@@ -736,7 +736,7 @@ const PDFViewerApplication = {
     this._contentLength = null;
     this._saveInProgress = false;
     this._hasAnnotationEditors = false;
-    promises.push(this.pdfScriptingManager.destroyPromise);
+    promises.push(this.pdfScriptingManager.destroyPromise, this.passwordPrompt.close());
     this.setTitle();
     this.pdfSidebar?.reset();
     this.pdfOutlineViewer?.reset();
@@ -1109,29 +1109,26 @@ const PDFViewerApplication = {
     };
   },
   async _initializeAutoPrint(pdfDocument, openActionPromise) {
-    const [openAction, javaScript] = await Promise.all([openActionPromise, !this.pdfViewer.enableScripting ? pdfDocument.getJavaScript() : null]);
+    const [openAction, jsActions] = await Promise.all([openActionPromise, this.pdfViewer.enableScripting ? null : pdfDocument.getJSActions()]);
     if (pdfDocument !== this.pdfDocument) {
       return;
     }
-    let triggerAutoPrint = false;
-    if (openAction?.action === "Print") {
-      triggerAutoPrint = true;
-    }
-    if (javaScript) {
-      javaScript.some(js => {
-        if (!js) {
-          return false;
+    let triggerAutoPrint = openAction?.action === "Print";
+    if (jsActions) {
+      console.warn("Warning: JavaScript support is not enabled");
+      for (const name in jsActions) {
+        if (triggerAutoPrint) {
+          break;
         }
-        console.warn("Warning: JavaScript support is not enabled");
-        return true;
-      });
-      if (!triggerAutoPrint) {
-        for (const js of javaScript) {
-          if (js && _ui_utils.AutoPrintRegExp.test(js)) {
-            triggerAutoPrint = true;
-            break;
-          }
+        switch (name) {
+          case "WillClose":
+          case "WillSave":
+          case "DidSave":
+          case "WillPrint":
+          case "DidPrint":
+            continue;
         }
+        triggerAutoPrint = jsActions[name].some(js => _ui_utils.AutoPrintRegExp.test(js));
       }
     }
     if (triggerAutoPrint) {
@@ -3848,7 +3845,8 @@ class AnnotationEditorParams {
     editorFreeTextColor,
     editorInkColor,
     editorInkThickness,
-    editorInkOpacity
+    editorInkOpacity,
+    editorStampAddImage
   }) {
     const dispatchEvent = (typeStr, value) => {
       this.eventBus.dispatch("switchannotationeditorparams", {
@@ -3872,6 +3870,9 @@ class AnnotationEditorParams {
     editorInkOpacity.addEventListener("input", function () {
       dispatchEvent("INK_OPACITY", this.valueAsNumber);
     });
+    editorStampAddImage.addEventListener("click", () => {
+      dispatchEvent("CREATE");
+    });
     this.eventBus._on("annotationeditorparamschanged", evt => {
       for (const [type, value] of evt.details) {
         switch (type) {
@@ -7064,6 +7065,7 @@ class PDFScriptingManager {
   #ready = false;
   #sandboxBundleSrc = null;
   #scripting = null;
+  #willPrintCapability = null;
   constructor({
     eventBus,
     sandboxBundleSrc = null,
@@ -7190,10 +7192,22 @@ class PDFScriptingManager {
     });
   }
   async dispatchWillPrint() {
-    return this.#scripting?.dispatchEventInSandbox({
-      id: "doc",
-      name: "WillPrint"
-    });
+    if (!this.#scripting) {
+      return;
+    }
+    await this.#willPrintCapability?.promise;
+    this.#willPrintCapability = new _pdfjsLib.PromiseCapability();
+    try {
+      await this.#scripting.dispatchEventInSandbox({
+        id: "doc",
+        name: "WillPrint"
+      });
+    } catch (ex) {
+      this.#willPrintCapability.resolve();
+      this.#willPrintCapability = null;
+      throw ex;
+    }
+    await this.#willPrintCapability.promise;
   }
   async dispatchDidPrint() {
     return this.#scripting?.dispatchEventInSandbox({
@@ -7283,6 +7297,10 @@ class PDFScriptingManager {
             pdfViewer.decreaseScale();
           }
           break;
+        case "WillPrintFinished":
+          this.#willPrintCapability?.resolve();
+          this.#willPrintCapability = null;
+          break;
       }
       return;
     }
@@ -7381,6 +7399,8 @@ class PDFScriptingManager {
     try {
       await this.#scripting.destroySandbox();
     } catch {}
+    this.#willPrintCapability?.reject(new Error("Scripting destroyed."));
+    this.#willPrintCapability = null;
     for (const [name, listener] of this._internalEvents) {
       this.#eventBus._off(name, listener);
     }
@@ -8341,7 +8361,7 @@ class PDFViewer {
   #scaleTimeoutId = null;
   #textLayerMode = _ui_utils.TextLayerMode.ENABLE;
   constructor(options) {
-    const viewerVersion = '3.9.179';
+    const viewerVersion = '3.10.111';
     if (_pdfjsLib.version !== viewerVersion) {
       throw new Error(`The API version "${_pdfjsLib.version}" does not match the Viewer version "${viewerVersion}".`);
     }
@@ -8748,7 +8768,7 @@ class PDFViewer {
         if (pdfDocument.isPureXfa) {
           console.warn("Warning: XFA-editing is not implemented.");
         } else if (isValidAnnotationEditorMode(mode)) {
-          this.#annotationEditorUIManager = new _pdfjsLib.AnnotationEditorUIManager(this.container, this.eventBus, pdfDocument, this.pageColors);
+          this.#annotationEditorUIManager = new _pdfjsLib.AnnotationEditorUIManager(this.container, this.viewer, this.eventBus, pdfDocument, this.pageColors);
           if (mode !== _pdfjsLib.AnnotationEditorType.NONE) {
             this.#annotationEditorUIManager.updateMode(mode);
           }
@@ -12049,14 +12069,15 @@ class Toolbar {
     editorFreeTextParamsToolbar,
     editorInkButton,
     editorInkParamsToolbar,
-    editorStampButton
+    editorStampButton,
+    editorStampParamsToolbar
   }) {
     const editorModeChanged = ({
       mode
     }) => {
       (0, _ui_utils.toggleCheckedBtn)(editorFreeTextButton, mode === _pdfjsLib.AnnotationEditorType.FREETEXT, editorFreeTextParamsToolbar);
       (0, _ui_utils.toggleCheckedBtn)(editorInkButton, mode === _pdfjsLib.AnnotationEditorType.INK, editorInkParamsToolbar);
-      (0, _ui_utils.toggleCheckedBtn)(editorStampButton, mode === _pdfjsLib.AnnotationEditorType.STAMP);
+      (0, _ui_utils.toggleCheckedBtn)(editorStampButton, mode === _pdfjsLib.AnnotationEditorType.STAMP, editorStampParamsToolbar);
       const isDisable = mode === _pdfjsLib.AnnotationEditorType.DISABLE;
       editorFreeTextButton.disabled = isDisable;
       editorInkButton.disabled = isDisable;
@@ -13629,8 +13650,8 @@ var _ui_utils = __webpack_require__(3);
 var _app_options = __webpack_require__(5);
 var _pdf_link_service = __webpack_require__(7);
 var _app = __webpack_require__(2);
-const pdfjsVersion = '3.9.179';
-const pdfjsBuild = '1ef6fbc52';
+const pdfjsVersion = '3.10.111';
+const pdfjsBuild = 'e142baecb';
 const AppConstants = {
   LinkTarget: _pdf_link_service.LinkTarget,
   RenderingStates: _ui_utils.RenderingStates,
@@ -13664,6 +13685,7 @@ function getViewerConfiguration() {
       editorInkButton: document.getElementById("editorInk"),
       editorInkParamsToolbar: document.getElementById("editorInkParamsToolbar"),
       editorStampButton: document.getElementById("editorStamp"),
+      editorStampParamsToolbar: document.getElementById("editorStampParamsToolbar"),
       download: document.getElementById("download")
     },
     secondaryToolbar: {
@@ -13750,7 +13772,8 @@ function getViewerConfiguration() {
       editorFreeTextColor: document.getElementById("editorFreeTextColor"),
       editorInkColor: document.getElementById("editorInkColor"),
       editorInkThickness: document.getElementById("editorInkThickness"),
-      editorInkOpacity: document.getElementById("editorInkOpacity")
+      editorInkOpacity: document.getElementById("editorInkOpacity"),
+      editorStampAddImage: document.getElementById("editorStampAddImage")
     },
     printContainer: document.getElementById("printContainer"),
     openFileInput: document.getElementById("fileInput"),