.eslintignore

@@ -8,5 +8,4 @@ external/builder/fixtures_esprima/
 external/quickjs/
 test/tmp/
 test/pdfs/
-web/locale/
 *~/

.eslintrc

@@ -142,10 +142,9 @@
     "no-lone-blocks": "error",
     "no-lonely-if": "error",
     "no-multi-str": "error",
-    "no-new": "error",
     "no-new-func": "error",
-    "no-new-symbol": "error",
     "no-new-wrappers": "error",
+    "no-new": "error",
     "no-octal-escape": "error",
     "no-octal": "error",
     "no-redeclare": "error",
@@ -243,9 +242,9 @@
     }],
 
     // ECMAScript 6
-    "arrow-body-style": ["error", "as-needed"],
     "constructor-super": "error",
     "no-class-assign": "error",
+    "no-confusing-arrow": "error",
     "no-const-assign": "error",
     "no-dupe-class-members": "error",
     "no-duplicate-imports": "error",
@@ -258,7 +257,6 @@
       "avoidQuotes": true,
     }],
     "prefer-const": "error",
-    "require-yield": "error",
     "sort-imports": ["error", {
       "ignoreCase": true,
     }],

.git-blame-ignore-revs

@@ -1,6 +0,0 @@
-# Auto-format `.js` files with ESLint/Prettier
-de36b2aabab2b7fd647d9591f959c4540129541d
-# Auto-format `.css` files with Stylelint/Prettier
-8aa2718d225ad701a5b8a2788b42d221f1e4327d
-# Auto-format `.json` files with Prettier
-29de9bdce6c9785574994fda0e51533d796a9bb4

.github/workflows/codeql.yml

@@ -23,13 +23,13 @@ jobs:
           fetch-depth: 0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           queries: security-and-quality
 
       - name: Autobuild CodeQL
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2

.github/workflows/fluent_linter.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Use Python 3.12
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: '3.12'
           cache: 'pip'

.github/workflows/font_tests.yml

@@ -52,7 +52,7 @@ jobs:
         run: npm install
 
       - name: Use Python 3.12
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: '3.12'
           cache: 'pip'

.github/workflows/publish_website.yml

@@ -52,7 +52,7 @@ jobs:
           INPUT_PATH: build/gh-pages
 
       - name: Upload the website
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: github-pages
           path: ${{ runner.temp }}/website.tar
@@ -69,4 +69,4 @@ jobs:
 
     steps:
       - name: Deploy the website
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v2

.prettierignore

@@ -1,12 +0,0 @@
-build/
-l10n/
-docs/
-node_modules/
-external/bcmaps/
-external/builder/fixtures/
-external/builder/fixtures_esprima/
-external/quickjs/
-test/tmp/
-test/pdfs/
-web/locale/
-*~/

.prettierrc

@@ -5,14 +5,5 @@
   "semi": true,
   "tabWidth": 2,
   "trailingComma": "es5",
-  "useTabs": false,
+  "useTabs": false
-
-  "overrides": [
-    {
-      files: ["tsconfig.json"],
-      options: {
-        parser: "json",
-      },
-    },
-  ]
 }

.stylelintignore

@@ -8,5 +8,4 @@ external/builder/fixtures_esprima/
 external/quickjs/
 test/tmp/
 test/pdfs/
-web/locale/
 *~/

README.md

@@ -55,17 +55,12 @@ Next, install Node.js via the [official package](https://nodejs.org) or via
 [nvm](https://github.com/creationix/nvm). You need to install the gulp package
 globally (see also [gulp's getting started](https://github.com/gulpjs/gulp/tree/master/docs/getting-started)):
 
-    $ npm install -g gulp-cli@^2.3.0
+    $ npm install -g gulp-cli
-
-If you prefer to not install `gulp-cli` globally, you have to prefix all the `gulp` commands with `npx` (for example, `npx gulp server` instead of `gulp server`).
 
 If everything worked out, install all dependencies for PDF.js:
 
     $ npm install
 
-> [!NOTE]
-> On MacOS M1/M2 you may see some `node-gyp`-related errors when running `npm install`. This is because one of our dependencies, `"canvas"`, does not provide pre-built binaries for this platform and instead `npm` will try to build it from source. Please make sure to first install the necessary native dependencies using `brew`: https://github.com/Automattic/node-canvas#compiling.
-
 Finally, you need to start a local web server as some browsers do not allow opening
 PDF files using a `file://` URL. Run:
 

examples/mobile-viewer/viewer.mjs

@@ -272,7 +272,7 @@ const PDFViewerApplication = {
     });
     this.pdfLinkService = linkService;
 
-    this.l10n = new pdfjsViewer.GenericL10n();
+    this.l10n = pdfjsViewer.NullL10n;
 
     const container = document.getElementById("viewerContainer");
     const pdfViewer = new pdfjsViewer.PDFViewer({

extensions/chromium/extension-router.js

@@ -47,7 +47,7 @@ limitations under the License.
     }
     var scheme = url.slice(0, schemeIndex).toLowerCase();
     if (schemes.includes(scheme)) {
-      url = url.split("#", 1)[0];
+      url = url.split("#")[0];
       if (url.charAt(schemeIndex) === ":") {
         url = encodeURIComponent(url);
       }

extensions/chromium/manifest.json

@@ -11,30 +11,32 @@
   },
   "permissions": [
     "fileBrowserHandler",
-    "webRequest",
+    "webRequest", "webRequestBlocking",
-    "webRequestBlocking",
     "<all_urls>",
     "tabs",
     "webNavigation",
     "storage"
   ],
-  "content_scripts": [
+  "content_scripts": [{
-    {
+    "matches": [
-      "matches": ["http://*/*", "https://*/*", "ftp://*/*", "file://*/*"],
+      "http://*/*",
-      "run_at": "document_start",
+      "https://*/*",
-      "all_frames": true,
+      "ftp://*/*",
-      "css": ["contentstyle.css"],
+      "file://*/*"
-      "js": ["contentscript.js"]
+    ],
-    }
+    "run_at": "document_start",
-  ],
+    "all_frames": true,
+    "css": ["contentstyle.css"],
+    "js": ["contentscript.js"]
+  }],
   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
-  "file_browser_handlers": [
+  "file_browser_handlers": [{
-    {
+    "id": "open-as-pdf",
-      "id": "open-as-pdf",
+    "default_title": "Open with PDF Viewer",
-      "default_title": "Open with PDF Viewer",
+    "file_filters": [
-      "file_filters": ["filesystem:*.pdf"]
+      "filesystem:*.pdf"
-    }
+    ]
-  ],
+  }],
   "storage": {
     "managed_schema": "preferences_schema.json"
   },

extensions/chromium/preferences_schema.json

@@ -5,7 +5,11 @@
       "title": "Theme",
       "description": "The theme to use.\n0 = Use system theme.\n1 = Light theme.\n2 = Dark theme.",
       "type": "integer",
-      "enum": [0, 1, 2],
+      "enum": [
+        0,
+        1,
+        2
+      ],
       "default": 2
     },
     "showPreviousViewOnLoad": {
@@ -17,7 +21,11 @@
       "title": "View position on load",
       "description": "The position in the document upon load.\n -1 = Default (uses OpenAction if available, otherwise equal to `viewOnLoad = 0`).\n 0 = The last viewed page/position.\n 1 = The initial page/position.",
       "type": "integer",
-      "enum": [-1, 0, 1],
+      "enum": [
+        -1,
+        0,
+        1
+      ],
       "default": 0
     },
     "defaultZoomDelay": {
@@ -37,7 +45,13 @@
       "title": "Sidebar state on load",
       "description": "Controls the state of the sidebar upon load.\n -1 = Default (uses PageMode if available, otherwise the last position if available/enabled).\n 0 = Do not show sidebar.\n 1 = Show thumbnails in sidebar.\n 2 = Show document outline in sidebar.\n 3 = Show attachments in sidebar.",
       "type": "integer",
-      "enum": [-1, 0, 1, 2, 3],
+      "enum": [
+        -1,
+        0,
+        1,
+        2,
+        3
+      ],
       "default": -1
     },
     "enableHandToolOnLoad": {
@@ -45,15 +59,14 @@
       "type": "boolean",
       "default": false
     },
-    "enableML": {
-      "type": "boolean",
-      "default": false
-    },
     "cursorToolOnLoad": {
       "title": "Cursor tool on load",
       "description": "The cursor tool that is enabled upon load.\n 0 = Text selection tool.\n 1 = Hand tool.",
       "type": "integer",
-      "enum": [0, 1],
+      "enum": [
+        0,
+        1
+      ],
       "default": 0
     },
     "pdfBugEnabled": {
@@ -68,22 +81,6 @@
       "description": "Whether to allow execution of active content (JavaScript) by PDF files.",
       "default": false
     },
-    "enableHighlightEditor": {
-      "type": "boolean",
-      "default": false
-    },
-    "enableHighlightFloatingButton": {
-      "type": "boolean",
-      "default": false
-    },
-    "highlightEditorColors": {
-      "type": "string",
-      "default": "yellow=#FFFF98,green=#53FFBC,blue=#80EBFF,pink=#FFCBE6,red=#FF4F5F"
-    },
-    "enableStampEditor": {
-      "type": "boolean",
-      "default": true
-    },
     "disableRange": {
       "title": "Disable range requests",
       "description": "Whether to disable range requests (not recommended).",
@@ -115,14 +112,23 @@
       "title": "Text layer mode",
       "description": "Controls if the text layer is enabled, and the selection mode that is used.\n 0 = Disabled.\n 1 = Enabled.",
       "type": "integer",
-      "enum": [0, 1],
+      "enum": [
+        0,
+        1
+      ],
       "default": 1
     },
     "externalLinkTarget": {
       "title": "External links target window",
       "description": "Controls how external links will be opened.\n 0 = default.\n 1 = replaces current window.\n 2 = new window/tab.\n 3 = parent.\n 4 = in top window.",
       "type": "integer",
-      "enum": [0, 1, 2, 3, 4],
+      "enum": [
+        0,
+        1,
+        2,
+        3,
+        4
+      ],
       "default": 0
     },
     "disablePageLabels": {
@@ -142,12 +148,22 @@
     },
     "annotationMode": {
       "type": "integer",
-      "enum": [0, 1, 2, 3],
+      "enum": [
+        0,
+        1,
+        2,
+        3
+      ],
       "default": 2
     },
     "annotationEditorMode": {
       "type": "integer",
-      "enum": [-1, 0, 3, 15],
+      "enum": [
+        -1,
+        0,
+        3,
+        15
+      ],
       "default": 0
     },
     "enablePermissions": {
@@ -178,14 +194,25 @@
       "title": "Scroll mode on load",
       "description": "Controls how the viewer scrolls upon load.\n -1 = Default (uses the last position if available/enabled).\n 3 = Page scrolling.\n 0 = Vertical scrolling.\n 1 = Horizontal scrolling.\n 2 = Wrapped scrolling.",
       "type": "integer",
-      "enum": [-1, 0, 1, 2, 3],
+      "enum": [
+        -1,
+        0,
+        1,
+        2,
+        3
+      ],
       "default": -1
     },
     "spreadModeOnLoad": {
       "title": "Spread mode on load",
       "description": "Whether the viewer should join pages into spreads upon load.\n -1 = Default (uses the last position if available/enabled).\n 0 = No spreads.\n 1 = Odd spreads.\n 2 = Even spreads.",
       "type": "integer",
-      "enum": [-1, 0, 1, 2],
+      "enum": [
+        -1,
+        0,
+        1,
+        2
+      ],
       "default": -1
     },
     "forcePageColors": {

external/builder/babel-plugin-pdfjs-preprocessor.mjs

@@ -1,253 +0,0 @@
-import { types as t, transformSync } from "@babel/core";
-import fs from "fs";
-import { join as joinPaths } from "path";
-import vm from "vm";
-
-const PDFJS_PREPROCESSOR_NAME = "PDFJSDev";
-const ROOT_PREFIX = "$ROOT/";
-
-function isPDFJSPreprocessor(obj) {
-  return obj.type === "Identifier" && obj.name === PDFJS_PREPROCESSOR_NAME;
-}
-
-function evalWithDefines(code, defines) {
-  if (!code || !code.trim()) {
-    throw new Error("No JavaScript expression given");
-  }
-  return vm.runInNewContext(code, defines, { displayErrors: false });
-}
-
-function handlePreprocessorAction(ctx, actionName, args, path) {
-  try {
-    const arg = args[0];
-    switch (actionName) {
-      case "test":
-        if (!t.isStringLiteral(arg)) {
-          throw new Error("No code for testing is given");
-        }
-        return !!evalWithDefines(arg.value, ctx.defines);
-      case "eval":
-        if (!t.isStringLiteral(arg)) {
-          throw new Error("No code for eval is given");
-        }
-        const result = evalWithDefines(arg.value, ctx.defines);
-        if (
-          typeof result === "boolean" ||
-          typeof result === "string" ||
-          typeof result === "number" ||
-          typeof result === "object"
-        ) {
-          return result;
-        }
-        break;
-      case "json":
-        if (!t.isStringLiteral(arg)) {
-          throw new Error("Path to JSON is not provided");
-        }
-        let jsonPath = arg.value;
-        if (jsonPath.startsWith(ROOT_PREFIX)) {
-          jsonPath = joinPaths(
-            ctx.rootPath,
-            jsonPath.substring(ROOT_PREFIX.length)
-          );
-        }
-        return JSON.parse(fs.readFileSync(jsonPath, "utf8"));
-    }
-    throw new Error("Unsupported action");
-  } catch (e) {
-    throw path.buildCodeFrameError(
-      "Could not process " +
-        PDFJS_PREPROCESSOR_NAME +
-        "." +
-        actionName +
-        ": " +
-        e.message
-    );
-  }
-}
-
-function babelPluginPDFJSPreprocessor(babel, ctx) {
-  return {
-    name: "babel-plugin-pdfjs-preprocessor",
-    manipulateOptions({ parserOpts }) {
-      parserOpts.attachComment = false;
-    },
-    visitor: {
-      "ExportNamedDeclaration|ImportDeclaration": ({ node }) => {
-        if (node.source && ctx.map?.[node.source.value]) {
-          node.source.value = ctx.map[node.source.value];
-        }
-      },
-      "IfStatement|ConditionalExpression": {
-        exit(path) {
-          const { node } = path;
-          if (t.isBooleanLiteral(node.test)) {
-            // if (true) stmt1; => stmt1
-            // if (false) stmt1; else stmt2; => stmt2
-            if (node.test.value === true) {
-              path.replaceWith(node.consequent);
-            } else if (node.alternate) {
-              path.replaceWith(node.alternate);
-            } else {
-              path.remove(node);
-            }
-          }
-        },
-      },
-      UnaryExpression: {
-        exit(path) {
-          const { node } = path;
-          if (
-            node.operator === "typeof" &&
-            isPDFJSPreprocessor(node.argument)
-          ) {
-            // typeof PDFJSDev => 'object'
-            path.replaceWith(t.stringLiteral("object"));
-            return;
-          }
-          if (node.operator === "!" && t.isBooleanLiteral(node.argument)) {
-            // !true => false,  !false => true
-            path.replaceWith(t.booleanLiteral(!node.argument.value));
-          }
-        },
-      },
-      LogicalExpression: {
-        exit(path) {
-          const { node } = path;
-          if (!t.isBooleanLiteral(node.left)) {
-            return;
-          }
-
-          switch (node.operator) {
-            case "&&":
-              // true && expr => expr
-              // false && expr => false
-              path.replaceWith(
-                node.left.value === true ? node.right : node.left
-              );
-              break;
-            case "||":
-              // true || expr => true
-              // false || expr => expr
-              path.replaceWith(
-                node.left.value === true ? node.left : node.right
-              );
-              break;
-          }
-        },
-      },
-      BinaryExpression: {
-        exit(path) {
-          const { node } = path;
-          switch (node.operator) {
-            case "==":
-            case "===":
-            case "!=":
-            case "!==":
-              if (t.isLiteral(node.left) && t.isLiteral(node.right)) {
-                // folding == and != check that can be statically evaluated
-                const { confident, value } = path.evaluate();
-                if (confident) {
-                  path.replaceWith(t.booleanLiteral(value));
-                }
-              }
-          }
-        },
-      },
-      CallExpression(path) {
-        const { node } = path;
-        if (
-          t.isMemberExpression(node.callee) &&
-          isPDFJSPreprocessor(node.callee.object) &&
-          t.isIdentifier(node.callee.property) &&
-          !node.callee.computed
-        ) {
-          // PDFJSDev.xxxx(arg1, arg2, ...) => transform
-          const action = node.callee.property.name;
-          const result = handlePreprocessorAction(
-            ctx,
-            action,
-            node.arguments,
-            path
-          );
-          path.replaceWith(t.inherits(t.valueToNode(result), path.node));
-        }
-
-        if (t.isIdentifier(node.callee, { name: "__non_webpack_import__" })) {
-          if (node.arguments.length !== 1) {
-            throw new Error("Invalid `__non_webpack_import__` usage.");
-          }
-          // Replace it with a standard `import`-call and
-          // ensure that Webpack will leave it alone.
-          const source = node.arguments[0];
-          source.leadingComments = [
-            {
-              type: "CommentBlock",
-              value: "webpackIgnore: true",
-            },
-          ];
-          path.replaceWith(t.importExpression(source));
-        }
-      },
-      BlockStatement: {
-        // Visit node in post-order so that recursive flattening
-        // of blocks works correctly.
-        exit(path) {
-          const { node } = path;
-
-          let subExpressionIndex = 0;
-          while (subExpressionIndex < node.body.length) {
-            switch (node.body[subExpressionIndex].type) {
-              case "EmptyStatement":
-                // Removing empty statements from the blocks.
-                node.body.splice(subExpressionIndex, 1);
-                continue;
-              case "BlockStatement":
-                // Block statements inside a block are flattened
-                // into the parent one.
-                const subChildren = node.body[subExpressionIndex].body;
-                node.body.splice(subExpressionIndex, 1, ...subChildren);
-                subExpressionIndex += Math.max(subChildren.length - 1, 0);
-                continue;
-              case "ReturnStatement":
-              case "ThrowStatement":
-                // Removing dead code after return or throw.
-                node.body.splice(
-                  subExpressionIndex + 1,
-                  node.body.length - subExpressionIndex - 1
-                );
-                break;
-            }
-            subExpressionIndex++;
-          }
-        },
-      },
-      Function: {
-        exit(path) {
-          if (!t.isBlockStatement(path.node.body)) {
-            // Arrow function with expression body
-            return;
-          }
-
-          const { body } = path.node.body;
-          if (
-            body.length > 0 &&
-            t.isReturnStatement(body.at(-1), { argument: null })
-          ) {
-            // Function body ends with return without arg -- removing it.
-            body.pop();
-          }
-        },
-      },
-    },
-  };
-}
-
-function preprocessPDFJSCode(ctx, content) {
-  return transformSync(content, {
-    configFile: false,
-    plugins: [[babelPluginPDFJSPreprocessor, ctx]],
-  }).code;
-}
-
-export { babelPluginPDFJSPreprocessor, preprocessPDFJSCode };

external/builder/fixtures_esprima/blocks-expected.js

@@ -1,10 +1,10 @@
 function test() {
-  "test";
+ "test";
-  "1";
+ "1";
-  "2";
+ "2";
-  "3";
+ "3";
-  if ("test") {
+ if ("test") {
-    "5";
+  "5";
-  }
+ }
-  "4";
+ "4";
 }

external/builder/fixtures_esprima/comments-expected.js

@@ -1,17 +1,17 @@
 function f1() {
-  "1";
+ "1";
-  "2";
+ "2";
 }
 function f2() {
-  "1";
+ "1";
-  "2";
+ "2";
 }
 function f3() {
-  if ("1") {
+ if ("1") {
-    "1";
+  "1";
-  }
+ }
-  "2";
+ "2";
-  if ("3") {
+ if ("3") {
-    "4";
+  "4";
-  }
+ }
 }

external/builder/fixtures_esprima/constants-expected.js

@@ -10,6 +10,6 @@ var i = true;
 var j = false;
 var k = false;
 var l = true;
-var m = false;
+var m = '1' === true;
 var n = false;
 var o = true;

external/builder/fixtures_esprima/deadcode-expected.js

@@ -1,21 +1,13 @@
-function f1() {}
+function f1() {
+}
 function f2() {
-  return 1;
+ return 1;
 }
 function f3() {
-  var i = 0;
+ var i = 0;
-  throw "test";
+ throw "test";
 }
 function f4() {
-  var i = 0;
+ var i = 0;
 }
-var obj = {
+
-  method1() {},
-  method2() {}
-};
-class C {
-  method1() {}
-  method2() {}
-}
-var arrow1 = () => {};
-var arrow2 = () => {};

external/builder/fixtures_esprima/deadcode.js

@@ -23,15 +23,3 @@ function f4() {
   var j = 0;
 }
 
-var obj = {
-  method1() { return; var i = 0; },
-  method2() { return; },
-};
-
-class C {
-  method1() { return; var i = 0; }
-  method2() { return; }
-}
-
-var arrow1 = () => { return; var i = 0; };
-var arrow2 = () => { return; };

external/builder/fixtures_esprima/evals-expected.js

@@ -3,19 +3,11 @@ var b = true;
 var c = true;
 var d = false;
 var e = true;
-var f = "text";
+var f = 'text';
 var g = {
-  obj: {
+ "obj": { "i": 1 },
-    i: 1
+ "j": 2
-  },
-  j: 2
-};
-var h = {
-  test: "test"
 };
+var h = { 'test': 'test' };
 var i = '0';
-var j = {
+var j = { "i": 1 };
-  i: 1
-};
-var k = false;
-var l = true;

external/builder/fixtures_esprima/evals.js

@@ -8,5 +8,3 @@ var g = PDFJSDev.eval('OBJ');
 var h = PDFJSDev.json('$ROOT/external/builder/fixtures_esprima/evals.json');
 var i = typeof PDFJSDev === 'undefined' ? PDFJSDev.eval('FALSE') : '0';
 var j = typeof PDFJSDev !== 'undefined' ? PDFJSDev.eval('OBJ.obj') : '0';
-var k = !PDFJSDev.test('TRUE');
-var l = !PDFJSDev.test('FALSE');

external/builder/fixtures_esprima/evals.json

@@ -1 +1 @@
-{ "test": "test" }
+{ 'test': 'test' }

external/builder/fixtures_esprima/ifs-expected.js

@@ -1,18 +1,17 @@
 if ('test') {
-  "1";
+ "1";
 }
 {
-  "1";
+ "1";
 }
 {
-  "1";
+ "1";
 }
+;
 {
-  "2";
+ "2";
 }
+;
 if ('1') {
-  "1";
+ "1";
-}
-function f1() {
-  "1";
 }

external/builder/fixtures_esprima/ifs.js

@@ -23,12 +23,3 @@ if (true && false) {
 if (true && false || '1') {
   "1";
 }
-
-function f1() {
-  if (true) {
-    "1";
-  }
-  if (false) {
-    "2";
-  }
-}

external/builder/fixtures_esprima/importalias-expected.js

@@ -1,4 +1,7 @@
-import { Test } from "import-name";
+import { Test } from 'import-name';
 import { Test2 } from './non-alias';
-export { Test3 } from "import-name";
+export {
-await import( /*webpackIgnore: true*/"./non-alias");
+ Test3
+} from 'import-name';
+var Imp = require('import-name');
+var Imp2 = require('./non-alias');

external/builder/fixtures_esprima/importalias.js

@@ -1,4 +1,5 @@
 import { Test } from 'import-alias';
 import { Test2 } from './non-alias';
 export { Test3 } from 'import-alias';
-await __non_webpack_import__("./non-alias");
+var Imp = require('import-alias');
+var Imp2 = require('./non-alias');

external/builder/preprocessor2.mjs

@@ -0,0 +1,347 @@
+import * as acorn from "acorn";
+import escodegen from "@javascript-obfuscator/escodegen";
+import fs from "fs";
+import path from "path";
+import vm from "vm";
+
+const PDFJS_PREPROCESSOR_NAME = "PDFJSDev";
+const ROOT_PREFIX = "$ROOT/";
+const ACORN_ECMA_VERSION = 2022;
+
+function isLiteral(obj, value) {
+  return obj.type === "Literal" && obj.value === value;
+}
+
+function isPDFJSPreprocessor(obj) {
+  return obj.type === "Identifier" && obj.name === PDFJS_PREPROCESSOR_NAME;
+}
+
+function evalWithDefines(code, defines, loc) {
+  if (!code || !code.trim()) {
+    throw new Error("No JavaScript expression given");
+  }
+  return vm.runInNewContext(code, defines, { displayErrors: false });
+}
+
+function handlePreprocessorAction(ctx, actionName, args, loc) {
+  try {
+    let arg;
+    switch (actionName) {
+      case "test":
+        arg = args[0];
+        if (!arg || arg.type !== "Literal" || typeof arg.value !== "string") {
+          throw new Error("No code for testing is given");
+        }
+        const isTrue = !!evalWithDefines(arg.value, ctx.defines);
+        return { type: "Literal", value: isTrue, loc };
+      case "eval":
+        arg = args[0];
+        if (!arg || arg.type !== "Literal" || typeof arg.value !== "string") {
+          throw new Error("No code for eval is given");
+        }
+        const result = evalWithDefines(arg.value, ctx.defines);
+        if (
+          typeof result === "boolean" ||
+          typeof result === "string" ||
+          typeof result === "number"
+        ) {
+          return { type: "Literal", value: result, loc };
+        }
+        if (typeof result === "object") {
+          const parsedObj = acorn.parse("(" + JSON.stringify(result) + ")", {
+            ecmaVersion: ACORN_ECMA_VERSION,
+          });
+          parsedObj.body[0].expression.loc = loc;
+          return parsedObj.body[0].expression;
+        }
+        break;
+      case "json":
+        arg = args[0];
+        if (!arg || arg.type !== "Literal" || typeof arg.value !== "string") {
+          throw new Error("Path to JSON is not provided");
+        }
+        let jsonPath = arg.value;
+        if (jsonPath.indexOf(ROOT_PREFIX) === 0) {
+          jsonPath = path.join(
+            ctx.rootPath,
+            jsonPath.substring(ROOT_PREFIX.length)
+          );
+        }
+        const jsonContent = fs.readFileSync(jsonPath).toString();
+        const parsedJSON = acorn.parse("(" + jsonContent + ")", {
+          ecmaVersion: ACORN_ECMA_VERSION,
+        });
+        parsedJSON.body[0].expression.loc = loc;
+        return parsedJSON.body[0].expression;
+    }
+    throw new Error("Unsupported action");
+  } catch (e) {
+    throw new Error(
+      "Could not process " +
+        PDFJS_PREPROCESSOR_NAME +
+        "." +
+        actionName +
+        " at " +
+        JSON.stringify(loc) +
+        "\n" +
+        e.name +
+        ": " +
+        e.message
+    );
+  }
+}
+
+function postprocessNode(ctx, node) {
+  switch (node.type) {
+    case "ExportNamedDeclaration":
+    case "ImportDeclaration":
+      if (
+        node.source &&
+        node.source.type === "Literal" &&
+        ctx.map &&
+        ctx.map[node.source.value]
+      ) {
+        const newValue = ctx.map[node.source.value];
+        node.source.value = node.source.raw = newValue;
+      }
+      break;
+    case "IfStatement":
+      if (isLiteral(node.test, true)) {
+        // if (true) stmt1; => stmt1
+        return node.consequent;
+      } else if (isLiteral(node.test, false)) {
+        // if (false) stmt1; else stmt2; => stmt2
+        return node.alternate || { type: "EmptyStatement", loc: node.loc };
+      }
+      break;
+    case "ConditionalExpression":
+      if (isLiteral(node.test, true)) {
+        // true ? stmt1 : stmt2 => stmt1
+        return node.consequent;
+      } else if (isLiteral(node.test, false)) {
+        // false ? stmt1 : stmt2 => stmt2
+        return node.alternate;
+      }
+      break;
+    case "UnaryExpression":
+      if (node.operator === "typeof" && isPDFJSPreprocessor(node.argument)) {
+        // typeof PDFJSDev => 'object'
+        return { type: "Literal", value: "object", loc: node.loc };
+      }
+      if (
+        node.operator === "!" &&
+        node.argument.type === "Literal" &&
+        typeof node.argument.value === "boolean"
+      ) {
+        // !true => false,  !false => true
+        return { type: "Literal", value: !node.argument.value, loc: node.loc };
+      }
+      break;
+    case "LogicalExpression":
+      switch (node.operator) {
+        case "&&":
+          if (isLiteral(node.left, true)) {
+            return node.right;
+          }
+          if (isLiteral(node.left, false)) {
+            return node.left;
+          }
+          break;
+        case "||":
+          if (isLiteral(node.left, true)) {
+            return node.left;
+          }
+          if (isLiteral(node.left, false)) {
+            return node.right;
+          }
+          break;
+      }
+      break;
+    case "BinaryExpression":
+      switch (node.operator) {
+        case "==":
+        case "===":
+        case "!=":
+        case "!==":
+          if (
+            node.left.type === "Literal" &&
+            node.right.type === "Literal" &&
+            typeof node.left.value === typeof node.right.value
+          ) {
+            // folding two literals == and != check
+            switch (typeof node.left.value) {
+              case "string":
+              case "boolean":
+              case "number":
+                const equal = node.left.value === node.right.value;
+                return {
+                  type: "Literal",
+                  value: (node.operator[0] === "=") === equal,
+                  loc: node.loc,
+                };
+            }
+          }
+          break;
+      }
+      break;
+    case "CallExpression":
+      if (
+        node.callee.type === "MemberExpression" &&
+        isPDFJSPreprocessor(node.callee.object) &&
+        node.callee.property.type === "Identifier"
+      ) {
+        // PDFJSDev.xxxx(arg1, arg2, ...) => transform
+        const action = node.callee.property.name;
+        return handlePreprocessorAction(ctx, action, node.arguments, node.loc);
+      }
+      // require('string')
+      if (
+        node.callee.type === "Identifier" &&
+        node.callee.name === "require" &&
+        node.arguments.length === 1 &&
+        node.arguments[0].type === "Literal" &&
+        ctx.map &&
+        ctx.map[node.arguments[0].value]
+      ) {
+        const requireName = node.arguments[0];
+        requireName.value = requireName.raw = ctx.map[requireName.value];
+      }
+      break;
+    case "BlockStatement":
+      let subExpressionIndex = 0;
+      while (subExpressionIndex < node.body.length) {
+        switch (node.body[subExpressionIndex].type) {
+          case "EmptyStatement":
+            // Removing empty statements from the blocks.
+            node.body.splice(subExpressionIndex, 1);
+            continue;
+          case "BlockStatement":
+            // Block statements inside a block are moved to the parent one.
+            const subChildren = node.body[subExpressionIndex].body;
+            Array.prototype.splice.apply(node.body, [
+              subExpressionIndex,
+              1,
+              ...subChildren,
+            ]);
+            subExpressionIndex += Math.max(subChildren.length - 1, 0);
+            continue;
+          case "ReturnStatement":
+          case "ThrowStatement":
+            // Removing dead code after return or throw.
+            node.body.splice(
+              subExpressionIndex + 1,
+              node.body.length - subExpressionIndex - 1
+            );
+            break;
+        }
+        subExpressionIndex++;
+      }
+      break;
+    case "FunctionDeclaration":
+    case "FunctionExpression":
+      const block = node.body;
+      if (
+        block.body.length > 0 &&
+        block.body.at(-1).type === "ReturnStatement" &&
+        !block.body.at(-1).argument
+      ) {
+        // Function body ends with return without arg -- removing it.
+        block.body.pop();
+      }
+      break;
+  }
+  return node;
+}
+
+function fixComments(ctx, node) {
+  if (!ctx.saveComments) {
+    return;
+  }
+  // Fixes double comments in the escodegen output.
+  delete node.trailingComments;
+  // Removes ESLint and other service comments.
+  if (node.leadingComments) {
+    const CopyrightRegExp = /\bcopyright\b/i;
+    const BlockCommentRegExp = /^\s*(globals|eslint|falls through)\b/;
+    const LineCommentRegExp = /^\s*eslint\b/;
+
+    let i = 0;
+    while (i < node.leadingComments.length) {
+      const type = node.leadingComments[i].type;
+      const value = node.leadingComments[i].value;
+
+      if (ctx.saveComments === "copyright") {
+        // Remove all comments, except Copyright notices and License headers.
+        if (!(type === "Block" && CopyrightRegExp.test(value))) {
+          node.leadingComments.splice(i, 1);
+          continue;
+        }
+      } else if (
+        (type === "Block" && BlockCommentRegExp.test(value)) ||
+        (type === "Line" && LineCommentRegExp.test(value))
+      ) {
+        node.leadingComments.splice(i, 1);
+        continue;
+      }
+      i++;
+    }
+  }
+}
+
+function traverseTree(ctx, node) {
+  // generic node processing
+  for (const i in node) {
+    const child = node[i];
+    if (typeof child === "object" && child !== null && child.type) {
+      const result = traverseTree(ctx, child);
+      if (result !== child) {
+        node[i] = result;
+      }
+    } else if (Array.isArray(child)) {
+      child.forEach(function (childItem, index) {
+        if (
+          typeof childItem === "object" &&
+          childItem !== null &&
+          childItem.type
+        ) {
+          const result = traverseTree(ctx, childItem);
+          if (result !== childItem) {
+            child[index] = result;
+          }
+        }
+      });
+    }
+  }
+
+  node = postprocessNode(ctx, node) || node;
+
+  fixComments(ctx, node);
+  return node;
+}
+
+function preprocessPDFJSCode(ctx, code) {
+  const format = ctx.format || {
+    indent: {
+      style: " ",
+    },
+  };
+  const parseOptions = {
+    ecmaVersion: ACORN_ECMA_VERSION,
+    locations: true,
+    sourceFile: ctx.sourceFile,
+    sourceType: "module",
+  };
+  const codegenOptions = {
+    format,
+    parse(input) {
+      return acorn.parse(input, { ecmaVersion: ACORN_ECMA_VERSION });
+    },
+    sourceMap: ctx.sourceMap,
+    sourceMapWithCode: ctx.sourceMap,
+  };
+  const syntax = acorn.parse(code, parseOptions);
+  traverseTree(ctx, syntax);
+  return escodegen.generate(syntax, codegenOptions);
+}
+
+export { preprocessPDFJSCode };

external/builder/test-fixtures.mjs

@@ -42,12 +42,6 @@ files.forEach(function (expectationFilename) {
   if (out !== expectation) {
     errors++;
 
-    // Allow regenerating the expected output using
-    //   OVERWRITE=true node ./external/builder/test-fixtures.mjs
-    if (process.env.OVERWRITE) {
-      fs.writeFileSync(expectationFilename, out + "\n");
-    }
-
     console.log("Assertion failed for " + inFilename);
     console.log("--------------------------------------------------");
     console.log("EXPECTED:");

external/builder/test-fixtures_esprima.mjs

@@ -1,7 +1,7 @@
 import { fileURLToPath } from "url";
 import fs from "fs";
 import path from "path";
-import { preprocessPDFJSCode } from "./babel-plugin-pdfjs-preprocessor.mjs";
+import { preprocessPDFJSCode } from "./preprocessor2.mjs";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -48,12 +48,6 @@ files.forEach(function (expectationFilename) {
   if (out !== expectation) {
     errors++;
 
-    // Allow regenerating the expected output using
-    //   OVERWRITE=true node ./external/builder/test-fixtures_esprima.mjs
-    if (process.env.OVERWRITE) {
-      fs.writeFileSync(expectationFilename, out + "\n");
-    }
-
     console.log("Assertion failed for " + inFilename);
     console.log("--------------------------------------------------");
     console.log("EXPECTED:");

external/importL10n/locales.mjs

@@ -14,6 +14,7 @@
  */
 
 import fs from "fs";
+import https from "https";
 import path from "path";
 
 // Fetches all languages that have an *active* translation in mozilla-central.
@@ -21,34 +22,47 @@ import path from "path";
 
 const DEFAULT_LOCALE = "en-US";
 
-const EXCLUDE_LANG_CODES = new Set(["ca-valencia", "ja-JP-mac"]);
+const EXCLUDE_LANG_CODES = ["ca-valencia", "ja-JP-mac"];
 
 function normalizeText(s) {
   return s.replaceAll(/\r\n?/g, "\n").replaceAll("\uFEFF", "");
 }
 
-async function downloadLanguageCodes() {
+function downloadLanguageCodes() {
   console.log("Downloading language codes...\n");
 
   const ALL_LOCALES =
     "https://hg.mozilla.org/mozilla-central/raw-file/tip/browser/locales/all-locales";
 
-  const response = await fetch(ALL_LOCALES);
+  return new Promise(function (resolve) {
-  if (!response.ok) {
+    https.get(ALL_LOCALES, function (response) {
-    throw new Error(response.statusText);
+      if (response.statusCode === 200) {
-  }
+        let content = "";
-  const content = await response.text();
+        response.setEncoding("utf8");
-
+        response.on("data", function (chunk) {
-  // Remove any leading/trailing white-space.
+          content += chunk;
-  const langCodes = normalizeText(content.trim()).split("\n");
+        });
-  // Remove all locales that we don't want to download below.
+        response.on("end", function () {
-  return langCodes.filter(
+          content = content.trim(); // Remove any leading/trailing white-space.
-    langCode => langCode !== DEFAULT_LOCALE && !EXCLUDE_LANG_CODES.has(langCode)
+          const langCodes = normalizeText(content).split("\n");
-  );
+          // Remove all locales that we don't want to download below.
+          for (const langCode of [DEFAULT_LOCALE, ...EXCLUDE_LANG_CODES]) {
+            const i = langCodes.indexOf(langCode);
+            if (i > -1) {
+              langCodes.splice(i, 1);
+            }
+          }
+          resolve(langCodes);
+        });
+      } else {
+        resolve([]);
+      }
+    });
+  });
 }
 
-async function downloadLanguageFiles(root, langCode) {
+function downloadLanguageFiles(root, langCode) {
-  console.log(`Downloading ${langCode}...`);
+  console.log("Downloading " + langCode + "...");
 
   // Constants for constructing the URLs. Translations are taken from the
   // Nightly channel as those are the most recent ones.
@@ -57,27 +71,41 @@ async function downloadLanguageFiles(root, langCode) {
 
   // Defines which files to download for each language.
   const files = ["viewer.ftl"];
+  let downloadsLeft = files.length;
 
   const outputDir = path.join(root, langCode);
   if (!fs.existsSync(outputDir)) {
     fs.mkdirSync(outputDir);
   }
 
-  // Download the necessary files for this language.
+  return new Promise(function (resolve) {
-  for (const fileName of files) {
+    // Download the necessary files for this language.
-    const outputPath = path.join(outputDir, fileName);
+    files.forEach(function (fileName) {
-    const url = MOZ_CENTRAL_ROOT + langCode + MOZ_CENTRAL_PDFJS_DIR + fileName;
+      const outputPath = path.join(outputDir, fileName);
+      const url =
+        MOZ_CENTRAL_ROOT + langCode + MOZ_CENTRAL_PDFJS_DIR + fileName;
 
-    const response = await fetch(url);
+      https.get(url, function (response) {
-    if (!response.ok) {
+        // Not all files exist for each language. Files without translations
-      // Not all files exist for each language. Files without translations
+        // have been removed (https://bugzilla.mozilla.org/show_bug.cgi?id=1443175).
-      // have been removed (https://bugzilla.mozilla.org/show_bug.cgi?id=1443175).
+        if (response.statusCode === 200) {
-      continue;
+          let content = "";
-    }
+          response.setEncoding("utf8");
-    const content = await response.text();
+          response.on("data", function (chunk) {
-
+            content += chunk;
-    fs.writeFileSync(outputPath, normalizeText(content), "utf8");
+          });
-  }
+          response.on("end", function () {
+            fs.writeFileSync(outputPath, normalizeText(content), "utf8");
+            if (--downloadsLeft === 0) {
+              resolve();
+            }
+          });
+        } else if (--downloadsLeft === 0) {
+          resolve();
+        }
+      });
+    });
+  });
 }
 
 async function downloadL10n(root) {

external/webpack/pdfjsdev-loader.mjs

@@ -0,0 +1,41 @@
+/* Copyright 2017 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import path from "path";
+import { preprocessPDFJSCode } from "../builder/preprocessor2.mjs";
+
+export default function (source) {
+  // Options must be specified, ignoring request if not.
+  if (!this.query || typeof this.query !== "object") {
+    return source;
+  }
+  this.cacheable();
+
+  const filePath = this.resourcePath;
+  const context = this.rootContext;
+  const sourcePath = path.relative(context, filePath).split(path.sep).join("/");
+
+  const ctx = Object.create(this.query);
+  ctx.sourceMap = true;
+  ctx.sourceFile = sourcePath;
+
+  const callback = this.callback;
+  const sourceAndMap = preprocessPDFJSCode(ctx, source);
+  const map = sourceAndMap.map.toJSON();
+  // escodegen does not embed source -- setting map's sourcesContent.
+  map.sourcesContent = [source];
+  callback(null, sourceAndMap.code, map);
+  return undefined;
+}

gulpfile.mjs

@@ -14,10 +14,6 @@
  */
 /* eslint-env node */
 
-import {
-  babelPluginPDFJSPreprocessor,
-  preprocessPDFJSCode,
-} from "./external/builder/babel-plugin-pdfjs-preprocessor.mjs";
 import { exec, spawn, spawnSync } from "child_process";
 import autoprefixer from "autoprefixer";
 import babel from "@babel/core";
@@ -34,12 +30,12 @@ import postcssDirPseudoClass from "postcss-dir-pseudo-class";
 import postcssDiscardComments from "postcss-discard-comments";
 import postcssNesting from "postcss-nesting";
 import { preprocess } from "./external/builder/builder.mjs";
+import { preprocessPDFJSCode } from "./external/builder/preprocessor2.mjs";
 import rename from "gulp-rename";
 import replace from "gulp-replace";
 import rimraf from "rimraf";
 import stream from "stream";
 import streamqueue from "streamqueue";
-import TerserPlugin from "terser-webpack-plugin";
 import through from "through2";
 import Vinyl from "vinyl";
 import webpack2 from "webpack";
@@ -208,18 +204,15 @@ function createWebpackConfig(
     !bundleDefines.MOZCENTRAL &&
     !bundleDefines.CHROME &&
     !bundleDefines.LIB &&
-    !bundleDefines.MINIFIED &&
     !bundleDefines.TESTING &&
     !disableSourceMaps;
   const isModule = output.library?.type === "module";
-  const isMinified = bundleDefines.MINIFIED;
   const skipBabel = bundleDefines.SKIP_BABEL;
 
-  const babelExcludeRegExp = [
+  // `core-js`, see https://github.com/zloirock/core-js/issues/514,
-    // `core-js`, see https://github.com/zloirock/core-js/issues/514,
+  // should be excluded from processing.
-    // should be excluded from processing.
+  const babelExcludes = ["node_modules[\\\\\\/]core-js"];
-    /node_modules[\\/]core-js/,
+  const babelExcludeRegExp = new RegExp(`(${babelExcludes.join("|")})`);
-  ];
 
   const babelPresets = skipBabel
     ? undefined
@@ -227,22 +220,14 @@ function createWebpackConfig(
         [
           "@babel/preset-env",
           {
-            corejs: "3.36.0",
+            corejs: "3.33.3",
             exclude: ["web.structured-clone"],
             shippedProposals: true,
             useBuiltIns: "usage",
           },
         ],
       ];
-  const babelPlugins = [
+  const babelPlugins = [];
-    [
-      babelPluginPDFJSPreprocessor,
-      {
-        rootPath: __dirname,
-        defines: bundleDefines,
-      },
-    ],
-  ];
 
   const plugins = [];
   if (!disableLicenseHeader) {
@@ -272,9 +257,8 @@ function createWebpackConfig(
   const viewerAlias = {
     "web-alt_text_manager": "web/alt_text_manager.js",
     "web-annotation_editor_params": "web/annotation_editor_params.js",
-    "web-download_manager": "",
+    "web-com": "",
-    "web-external_services": "",
+    "web-l10n_utils": "web/stubs.js",
-    "web-null_l10n": "",
     "web-pdf_attachment_viewer": "web/pdf_attachment_viewer.js",
     "web-pdf_cursor_tools": "web/pdf_cursor_tools.js",
     "web-pdf_document_properties": "web/pdf_document_properties.js",
@@ -284,7 +268,6 @@ function createWebpackConfig(
     "web-pdf_presentation_mode": "web/pdf_presentation_mode.js",
     "web-pdf_sidebar": "web/pdf_sidebar.js",
     "web-pdf_thumbnail_viewer": "web/pdf_thumbnail_viewer.js",
-    "web-preferences": "",
     "web-print_service": "",
     "web-secondary_toolbar": "web/secondary_toolbar.js",
     "web-toolbar": "web/toolbar.js",
@@ -293,10 +276,7 @@ function createWebpackConfig(
     libraryAlias["display-fetch_stream"] = "src/display/fetch_stream.js";
     libraryAlias["display-network"] = "src/display/network.js";
 
-    viewerAlias["web-download_manager"] = "web/download_manager.js";
+    viewerAlias["web-com"] = "web/chromecom.js";
-    viewerAlias["web-external_services"] = "web/chromecom.js";
-    viewerAlias["web-null_l10n"] = "web/l10n.js";
-    viewerAlias["web-preferences"] = "web/chromecom.js";
     viewerAlias["web-print_service"] = "web/pdf_print_service.js";
   } else if (bundleDefines.GENERIC) {
     // Aliases defined here must also be replicated in the paths section of
@@ -307,24 +287,20 @@ function createWebpackConfig(
     libraryAlias["display-node_stream"] = "src/display/node_stream.js";
     libraryAlias["display-node_utils"] = "src/display/node_utils.js";
 
-    viewerAlias["web-download_manager"] = "web/download_manager.js";
+    viewerAlias["web-com"] = "web/genericcom.js";
-    viewerAlias["web-external_services"] = "web/genericcom.js";
+    viewerAlias["web-l10n_utils"] = "web/l10n_utils.js";
-    viewerAlias["web-null_l10n"] = "web/genericl10n.js";
-    viewerAlias["web-preferences"] = "web/genericcom.js";
     viewerAlias["web-print_service"] = "web/pdf_print_service.js";
   } else if (bundleDefines.MOZCENTRAL) {
     if (bundleDefines.GECKOVIEW) {
       const gvAlias = {
+        "web-l10n_utils": "web/stubs.js",
         "web-toolbar": "web/toolbar-geckoview.js",
       };
       for (const key in viewerAlias) {
         viewerAlias[key] = gvAlias[key] || "web/stubs-geckoview.js";
       }
     }
-    viewerAlias["web-download_manager"] = "web/firefoxcom.js";
+    viewerAlias["web-com"] = "web/firefoxcom.js";
-    viewerAlias["web-external_services"] = "web/firefoxcom.js";
-    viewerAlias["web-null_l10n"] = "web/l10n.js";
-    viewerAlias["web-preferences"] = "web/firefoxcom.js";
     viewerAlias["web-print_service"] = "web/firefox_print_service.js";
   }
   const alias = { ...basicAlias, ...libraryAlias, ...viewerAlias };
@@ -336,28 +312,7 @@ function createWebpackConfig(
     mode: "production",
     optimization: {
       mangleExports: false,
-      minimize: isMinified,
+      minimize: false,
-      minimizer: !isMinified
-        ? undefined
-        : [
-            new TerserPlugin({
-              extractComments: false,
-              parallel: false,
-              terserOptions: {
-                compress: {
-                  // V8 chokes on very long sequences, work around that.
-                  sequences: false,
-                },
-                mangle: {
-                  // Ensure that the `tweakWebpackOutput` function works.
-                  reserved: ["__webpack_exports__"],
-                },
-                keep_classnames: true,
-                keep_fnames: true,
-                module: isModule,
-              },
-            }),
-          ],
     },
     experiments,
     output,
@@ -380,6 +335,14 @@ function createWebpackConfig(
             targets: BABEL_TARGETS,
           },
         },
+        {
+          loader: path.join(__dirname, "external/webpack/pdfjsdev-loader.mjs"),
+          options: {
+            rootPath: __dirname,
+            saveComments: false,
+            defines: bundleDefines,
+          },
+        },
       ],
     },
     // Avoid shadowing actual Node.js variables with polyfills, by disabling
@@ -443,24 +406,24 @@ function checkChromePreferencesFile(chromePrefsPath, webPrefs) {
 }
 
 function tweakWebpackOutput(jsName) {
-  const replacer = [
+  const replacer = ["__non_webpack_import__\\("];
-    " __webpack_exports__ = {};",
+
-    ",__webpack_exports__={};",
+  if (jsName) {
-    " __webpack_exports__ = await __webpack_exports__;",
+    replacer.push(
-    "\\(__webpack_exports__=await __webpack_exports__\\)",
+      " __webpack_exports__ = {};",
-  ];
+      " __webpack_exports__ = await __webpack_exports__;"
+    );
+  }
   const regex = new RegExp(`(${replacer.join("|")})`, "gm");
 
   return replace(regex, match => {
     switch (match) {
+      case "__non_webpack_import__(":
+        return "import(/* webpackIgnore: true */ ";
       case " __webpack_exports__ = {};":
         return ` __webpack_exports__ = globalThis.${jsName} = {};`;
-      case ",__webpack_exports__={};":
-        return `,__webpack_exports__=globalThis.${jsName}={};`;
       case " __webpack_exports__ = await __webpack_exports__;":
         return ` __webpack_exports__ = globalThis.${jsName} = await (globalThis.${jsName}Promise = __webpack_exports__);`;
-      case "(__webpack_exports__=await __webpack_exports__)":
-        return `(__webpack_exports__=globalThis.${jsName}=await (globalThis.${jsName}Promise=__webpack_exports__))`;
     }
     return match;
   });
@@ -468,7 +431,7 @@ function tweakWebpackOutput(jsName) {
 
 function createMainBundle(defines) {
   const mainFileConfig = createWebpackConfig(defines, {
-    filename: defines.MINIFIED ? "pdf.min.mjs" : "pdf.mjs",
+    filename: "pdf.mjs",
     library: {
       type: "module",
     },
@@ -492,13 +455,15 @@ function createScriptingBundle(defines, extraOptions = undefined) {
   );
   return gulp
     .src("./src/pdf.scripting.js")
-    .pipe(webpack2Stream(scriptingFileConfig));
+    .pipe(webpack2Stream(scriptingFileConfig))
+    .pipe(tweakWebpackOutput());
 }
 
 function createSandboxExternal(defines) {
   const licenseHeader = fs.readFileSync("./src/license_header.js").toString();
 
   const ctx = {
+    saveComments: false,
     defines,
   };
   return gulp
@@ -532,9 +497,7 @@ function createSandboxBundle(defines, extraOptions = undefined) {
   const sandboxFileConfig = createWebpackConfig(
     sandboxDefines,
     {
-      filename: sandboxDefines.MINIFIED
+      filename: "pdf.sandbox.mjs",
-        ? "pdf.sandbox.min.mjs"
-        : "pdf.sandbox.mjs",
       library: {
         type: "module",
       },
@@ -550,7 +513,7 @@ function createSandboxBundle(defines, extraOptions = undefined) {
 
 function createWorkerBundle(defines) {
   const workerFileConfig = createWebpackConfig(defines, {
-    filename: defines.MINIFIED ? "pdf.worker.min.mjs" : "pdf.worker.mjs",
+    filename: "pdf.worker.mjs",
     library: {
       type: "module",
     },
@@ -574,7 +537,10 @@ function createWebBundle(defines, options) {
       defaultPreferencesDir: options.defaultPreferencesDir,
     }
   );
-  return gulp.src("./web/viewer.js").pipe(webpack2Stream(viewerFileConfig));
+  return gulp
+    .src("./web/viewer.js")
+    .pipe(webpack2Stream(viewerFileConfig))
+    .pipe(tweakWebpackOutput());
 }
 
 function createGVWebBundle(defines, options) {
@@ -592,7 +558,8 @@ function createGVWebBundle(defines, options) {
   );
   return gulp
     .src("./web/viewer-geckoview.js")
-    .pipe(webpack2Stream(viewerFileConfig));
+    .pipe(webpack2Stream(viewerFileConfig))
+    .pipe(tweakWebpackOutput());
 }
 
 function createComponentsBundle(defines) {
@@ -610,9 +577,7 @@ function createComponentsBundle(defines) {
 
 function createImageDecodersBundle(defines) {
   const componentsFileConfig = createWebpackConfig(defines, {
-    filename: defines.MINIFIED
+    filename: "pdf.image_decoders.mjs",
-      ? "pdf.image_decoders.min.mjs"
-      : "pdf.image_decoders.mjs",
     library: {
       type: "module",
     },
@@ -726,9 +691,6 @@ function createTestSource(testsName, { bot = false, xfaOnly = false } = {}) {
 
     const testProcess = startNode(args, { cwd: TEST_DIR, stdio: "inherit" });
     testProcess.on("close", function (code) {
-      if (code !== 0) {
-        throw new Error(`Running ${testsName} tests failed.`);
-      }
       source.push(null);
     });
     return undefined;
@@ -760,10 +722,6 @@ function makeRef(done, bot) {
 
   const testProcess = startNode(args, { cwd: TEST_DIR, stdio: "inherit" });
   testProcess.on("close", function (code) {
-    if (code !== 0) {
-      done(new Error("Creating reference images failed."));
-      return;
-    }
     done();
   });
 }
@@ -863,17 +821,11 @@ async function parseDefaultPreferences(dir) {
     "./" + DEFAULT_PREFERENCES_DIR + dir + "app_options.mjs"
   );
 
-  const browserPrefs = AppOptions.getAll(
+  const browserPrefs = AppOptions.getAll(OptionKind.BROWSER);
-    OptionKind.BROWSER,
-    /* defaultOnly = */ true
-  );
   if (Object.keys(browserPrefs).length === 0) {
     throw new Error("No browser preferences found.");
   }
-  const prefs = AppOptions.getAll(
+  const prefs = AppOptions.getAll(OptionKind.PREFERENCE);
-    OptionKind.PREFERENCE,
-    /* defaultOnly = */ true
-  );
   if (Object.keys(prefs).length === 0) {
     throw new Error("No default preferences found.");
   }
@@ -1127,8 +1079,6 @@ function buildComponents(defines, dir) {
     "web/images/loading-icon.gif",
     "web/images/altText_*.svg",
     "web/images/editor-toolbar-*.svg",
-    "web/images/toolbarButton-{editorHighlight,menuArrow}.svg",
-    "web/images/cursor-*.svg",
   ];
 
   return merge([
@@ -1218,6 +1168,68 @@ function buildMinified(defines, dir) {
   ]);
 }
 
+async function parseMinified(dir) {
+  const pdfFile = fs.readFileSync(dir + "build/pdf.mjs").toString();
+  const pdfWorkerFile = fs
+    .readFileSync(dir + "build/pdf.worker.mjs")
+    .toString();
+  const pdfSandboxFile = fs
+    .readFileSync(dir + "build/pdf.sandbox.mjs")
+    .toString();
+  const pdfImageDecodersFile = fs
+    .readFileSync(dir + "image_decoders/pdf.image_decoders.mjs")
+    .toString();
+
+  console.log();
+  console.log("### Minifying js files");
+
+  const { minify } = await import("terser");
+  const options = {
+    compress: {
+      // V8 chokes on very long sequences, work around that.
+      sequences: false,
+    },
+    keep_classnames: true,
+    keep_fnames: true,
+    module: true,
+  };
+
+  fs.writeFileSync(
+    dir + "build/pdf.min.mjs",
+    (await minify(pdfFile, options)).code
+  );
+  fs.writeFileSync(
+    dir + "build/pdf.worker.min.mjs",
+    (await minify(pdfWorkerFile, options)).code
+  );
+  fs.writeFileSync(
+    dir + "build/pdf.sandbox.min.mjs",
+    (await minify(pdfSandboxFile, options)).code
+  );
+  fs.writeFileSync(
+    dir + "image_decoders/pdf.image_decoders.min.mjs",
+    (await minify(pdfImageDecodersFile, options)).code
+  );
+
+  console.log();
+  console.log("### Cleaning js files");
+
+  fs.unlinkSync(dir + "build/pdf.mjs");
+  fs.unlinkSync(dir + "build/pdf.worker.mjs");
+  fs.unlinkSync(dir + "build/pdf.sandbox.mjs");
+
+  fs.renameSync(dir + "build/pdf.min.mjs", dir + "build/pdf.mjs");
+  fs.renameSync(dir + "build/pdf.worker.min.mjs", dir + "build/pdf.worker.mjs");
+  fs.renameSync(
+    dir + "build/pdf.sandbox.min.mjs",
+    dir + "build/pdf.sandbox.mjs"
+  );
+  fs.renameSync(
+    dir + "image_decoders/pdf.image_decoders.min.mjs",
+    dir + "image_decoders/pdf.image_decoders.mjs"
+  );
+}
+
 gulp.task(
   "minified",
   gulp.series(
@@ -1239,6 +1251,10 @@ gulp.task(
       const defines = { ...DEFINES, MINIFIED: true, GENERIC: true };
 
       return buildMinified(defines, MINIFIED_DIR);
+    },
+    async function compressMinified(done) {
+      await parseMinified(MINIFIED_DIR);
+      done();
     }
   )
 );
@@ -1274,6 +1290,10 @@ gulp.task(
       };
 
       return buildMinified(defines, MINIFIED_LEGACY_DIR);
+    },
+    async function compressMinifiedLegacy(done) {
+      await parseMinified(MINIFIED_LEGACY_DIR);
+      done();
     }
   )
 );
@@ -1531,14 +1551,26 @@ gulp.task("types", function (done) {
 });
 
 function buildLibHelper(bundleDefines, inputStream, outputDir) {
+  function babelPluginReplaceNonWebpackImport(b) {
+    return {
+      visitor: {
+        Identifier(curPath, state) {
+          if (curPath.node.name === "__non_webpack_import__") {
+            curPath.replaceWith(b.types.identifier("import"));
+          }
+        },
+      },
+    };
+  }
   function preprocessLib(content) {
     const skipBabel = bundleDefines.SKIP_BABEL;
+    content = preprocessPDFJSCode(ctx, content);
     content = babel.transform(content, {
       sourceType: "module",
       presets: skipBabel
         ? undefined
         : [["@babel/preset-env", { loose: false, modules: false }]],
-      plugins: [[babelPluginPDFJSPreprocessor, ctx]],
+      plugins: [babelPluginReplaceNonWebpackImport],
       targets: BABEL_TARGETS,
     }).code;
     content = content.replaceAll(
@@ -1549,6 +1581,7 @@ function buildLibHelper(bundleDefines, inputStream, outputDir) {
   }
   const ctx = {
     rootPath: __dirname,
+    saveComments: false,
     defines: bundleDefines,
     map: {
       "pdfjs-lib": "../pdf.js",
@@ -1558,7 +1591,7 @@ function buildLibHelper(bundleDefines, inputStream, outputDir) {
       "display-node_utils": "./node_utils.js",
       "fluent-bundle": "../../../node_modules/@fluent/bundle/esm/index.js",
       "fluent-dom": "../../../node_modules/@fluent/dom/esm/index.js",
-      "web-null_l10n": "../web/genericl10n.js",
+      "web-l10n_utils": "../web/l10n_utils.js",
     },
   };
   const licenseHeaderLibre = fs
@@ -1902,7 +1935,7 @@ gulp.task(
 
 gulp.task("lint", function (done) {
   console.log();
-  console.log("### Linting JS/CSS/JSON files");
+  console.log("### Linting JS/CSS files");
 
   // Ensure that we lint the Firefox specific *.jsm files too.
   const esLintOptions = [
@@ -1925,16 +1958,6 @@ gulp.task("lint", function (done) {
     styleLintOptions.push("--fix");
   }
 
-  const prettierOptions = [
-    "node_modules/prettier/bin/prettier.cjs",
-    "**/*.json",
-  ];
-  if (process.argv.includes("--fix")) {
-    prettierOptions.push("--log-level", "silent", "--write");
-  } else {
-    prettierOptions.push("--log-level", "warn", "--check");
-  }
-
   const esLintProcess = startNode(esLintOptions, { stdio: "inherit" });
   esLintProcess.on("close", function (esLintCode) {
     if (esLintCode !== 0) {
@@ -1948,16 +1971,8 @@ gulp.task("lint", function (done) {
         done(new Error("Stylelint failed."));
         return;
       }
-
+      console.log("files checked, no errors found");
-      const prettierProcess = startNode(prettierOptions, { stdio: "inherit" });
+      done();
-      prettierProcess.on("close", function (prettierCode) {
-        if (prettierCode !== 0) {
-          done(new Error("Prettier failed."));
-          return;
-        }
-        console.log("files checked, no errors found");
-        done();
-      });
     });
   });
 });
@@ -2047,7 +2062,8 @@ gulp.task(
       console.log("### Starting local server");
 
       const { WebServer } = await import("./test/webserver.mjs");
-      const server = new WebServer({ port: 8888 });
+      const server = new WebServer();
+      server.port = 8888;
       server.start();
     }
   )
@@ -2228,20 +2244,36 @@ gulp.task(
           ])
           .pipe(gulp.dest(DIST_DIR + "legacy/build/")),
         gulp
-          .src(MINIFIED_DIR + "build/{pdf,pdf.worker,pdf.sandbox}.min.mjs")
+          .src(MINIFIED_DIR + "build/pdf.mjs")
+          .pipe(rename("pdf.min.mjs"))
           .pipe(gulp.dest(DIST_DIR + "build/")),
         gulp
-          .src(MINIFIED_DIR + "image_decoders/pdf.image_decoders.min.mjs")
+          .src(MINIFIED_DIR + "build/pdf.worker.mjs")
+          .pipe(rename("pdf.worker.min.mjs"))
+          .pipe(gulp.dest(DIST_DIR + "build/")),
+        gulp
+          .src(MINIFIED_DIR + "build/pdf.sandbox.mjs")
+          .pipe(rename("pdf.sandbox.min.mjs"))
+          .pipe(gulp.dest(DIST_DIR + "build/")),
+        gulp
+          .src(MINIFIED_DIR + "image_decoders/pdf.image_decoders.mjs")
+          .pipe(rename("pdf.image_decoders.min.mjs"))
           .pipe(gulp.dest(DIST_DIR + "image_decoders/")),
         gulp
-          .src(
+          .src(MINIFIED_LEGACY_DIR + "build/pdf.mjs")
-            MINIFIED_LEGACY_DIR + "build/{pdf,pdf.worker,pdf.sandbox}.min.mjs"
+          .pipe(rename("pdf.min.mjs"))
-          )
           .pipe(gulp.dest(DIST_DIR + "legacy/build/")),
         gulp
-          .src(
+          .src(MINIFIED_LEGACY_DIR + "build/pdf.worker.mjs")
-            MINIFIED_LEGACY_DIR + "image_decoders/pdf.image_decoders.min.mjs"
+          .pipe(rename("pdf.worker.min.mjs"))
-          )
+          .pipe(gulp.dest(DIST_DIR + "legacy/build/")),
+        gulp
+          .src(MINIFIED_LEGACY_DIR + "build/pdf.sandbox.mjs")
+          .pipe(rename("pdf.sandbox.min.mjs"))
+          .pipe(gulp.dest(DIST_DIR + "legacy/build/")),
+        gulp
+          .src(MINIFIED_LEGACY_DIR + "image_decoders/pdf.image_decoders.mjs")
+          .pipe(rename("pdf.image_decoders.min.mjs"))
           .pipe(gulp.dest(DIST_DIR + "legacy/image_decoders/")),
         gulp
           .src(COMPONENTS_DIR + "**/*", { base: COMPONENTS_DIR })

l10n/ar/viewer.ftl

@@ -39,24 +39,9 @@ pdfjs-open-file-button-label = افتح
 pdfjs-print-button =
     .title = اطبع
 pdfjs-print-button-label = اطبع
-pdfjs-save-button =
-    .title = احفظ
-pdfjs-save-button-label = احفظ
-# Used in Firefox for Android as a tooltip for the download button (“download” is a verb).
-pdfjs-download-button =
-    .title = نزّل
-# 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.
-pdfjs-download-button-label = نزّل
 pdfjs-bookmark-button =
     .title = الصفحة الحالية (عرض URL من الصفحة الحالية)
 pdfjs-bookmark-button-label = الصفحة الحالية
-# Used in Firefox for Android.
-pdfjs-open-in-app-button =
-    .title = افتح في تطبيق
-# Used in Firefox for Android.
-# Length of the translation matters since we are in a mobile context, with limited screen estate.
-pdfjs-open-in-app-button-label = افتح في تطبيق
 
 ##  Secondary toolbar and context menu
 
@@ -216,7 +201,6 @@ pdfjs-find-next-button =
 pdfjs-find-next-button-label = التالي
 pdfjs-find-highlight-checkbox = أبرِز الكل
 pdfjs-find-match-case-checkbox-label = طابق حالة الأحرف
-pdfjs-find-match-diacritics-checkbox-label = طابِق الحركات
 pdfjs-find-entire-word-checkbox-label = كلمات كاملة
 pdfjs-find-reached-top = تابعت من الأسفل بعدما وصلت إلى بداية المستند
 pdfjs-find-reached-bottom = تابعت من الأعلى بعدما وصلت إلى نهاية المستند
@@ -272,18 +256,9 @@ pdfjs-web-fonts-disabled = خطوط الوب مُعطّلة: تعذّر استخ
 ## Editing
 
 
-## Remove button for the various kind of editor.
-
-
-##
-
-
 ## Alt-text dialog
 
 
 ## Editor resizers
 ## This is used in an aria label to help to understand the role of the resizer.
 
-
-## Color picker
-

l10n/be/viewer.ftl

@@ -303,23 +303,6 @@ pdfjs-editor-ink-button-label = Маляваць
 pdfjs-editor-stamp-button =
     .title = Дадаць або змяніць выявы
 pdfjs-editor-stamp-button-label = Дадаць або змяніць выявы
-pdfjs-editor-highlight-button =
-    .title = Вылучэнне
-pdfjs-editor-highlight-button-label = Вылучэнне
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Выдаліць малюнак
-pdfjs-editor-remove-freetext-button =
-    .title = Выдаліць тэкст
-pdfjs-editor-remove-stamp-button =
-    .title = Выдаліць выяву
-pdfjs-editor-remove-highlight-button =
-    .title = Выдаліць падфарбоўку
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Колер
 pdfjs-editor-free-text-size-input = Памер
@@ -329,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Непразрыстасць
 pdfjs-editor-stamp-add-image-button =
     .title = Дадаць выяву
 pdfjs-editor-stamp-add-image-button-label = Дадаць выяву
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Таўшчыня
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Змяняць таўшчыню пры вылучэнні іншых элементаў, акрамя тэксту
 pdfjs-free-text =
     .aria-label = Тэкставы рэдактар
 pdfjs-free-text-default-content = Пачніце набор тэксту…
@@ -370,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Правы ніжні кут — зм
 pdfjs-editor-resizer-label-bottom-middle = Пасярэдзіне ўнізе — змяніць памер
 pdfjs-editor-resizer-label-bottom-left = Левы ніжні кут — змяніць памер
 pdfjs-editor-resizer-label-middle-left = Пасярэдзіне злева — змяніць памер
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Колер падфарбоўкі
-pdfjs-editor-colorpicker-button =
-    .title = Змяніць колер
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Выбар колеру
-pdfjs-editor-colorpicker-yellow =
-    .title = Жоўты
-pdfjs-editor-colorpicker-green =
-    .title = Зялёны
-pdfjs-editor-colorpicker-blue =
-    .title = Блакітны
-pdfjs-editor-colorpicker-pink =
-    .title = Ружовы
-pdfjs-editor-colorpicker-red =
-    .title = Чырвоны

l10n/bg/viewer.ftl

@@ -39,24 +39,6 @@ pdfjs-open-file-button-label = Отваряне
 pdfjs-print-button =
     .title = Отпечатване
 pdfjs-print-button-label = Отпечатване
-pdfjs-save-button =
-    .title = Запазване
-pdfjs-save-button-label = Запазване
-# Used in Firefox for Android as a tooltip for the download button (“download” is a verb).
-pdfjs-download-button =
-    .title = Изтегляне
-# 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.
-pdfjs-download-button-label = Изтегляне
-pdfjs-bookmark-button =
-    .title = Текуща страница (преглед на адреса на страницата)
-pdfjs-bookmark-button-label = Текуща страница
-# Used in Firefox for Android.
-pdfjs-open-in-app-button =
-    .title = Отваряне в приложение
-# Used in Firefox for Android.
-# Length of the translation matters since we are in a mobile context, with limited screen estate.
-pdfjs-open-in-app-button-label = Отваряне в приложение
 
 ##  Secondary toolbar and context menu
 
@@ -81,9 +63,6 @@ pdfjs-cursor-text-select-tool-button-label = Инструмент за избо
 pdfjs-cursor-hand-tool-button =
     .title = Включване на инструмента ръка
 pdfjs-cursor-hand-tool-button-label = Инструмент ръка
-pdfjs-scroll-page-button =
-    .title = Използване на плъзгане на страници
-pdfjs-scroll-page-button-label = Плъзгане на страници
 pdfjs-scroll-vertical-button =
     .title = Използване на вертикално плъзгане
 pdfjs-scroll-vertical-button-label = Вертикално плъзгане
@@ -175,8 +154,6 @@ pdfjs-printing-not-ready = Внимание: Този PDF файл не е на
 
 pdfjs-toggle-sidebar-button =
     .title = Превключване на страничната лента
-pdfjs-toggle-sidebar-notification-button =
-    .title = Превключване на страничната лента (документът има структура/прикачени файлове/слоеве)
 pdfjs-toggle-sidebar-button-label = Превключване на страничната лента
 pdfjs-document-outline-button =
     .title = Показване на структурата на документа (двукратно щракване за свиване/разгъване на всичко)
@@ -184,19 +161,12 @@ pdfjs-document-outline-button-label = Структура на документа
 pdfjs-attachments-button =
     .title = Показване на притурките
 pdfjs-attachments-button-label = Притурки
-pdfjs-layers-button =
-    .title = Показване на слоевете (двукратно щракване за възстановяване на всички слоеве към състоянието по подразбиране)
-pdfjs-layers-button-label = Слоеве
 pdfjs-thumbs-button =
     .title = Показване на миниатюрите
 pdfjs-thumbs-button-label = Миниатюри
-pdfjs-current-outline-item-button =
-    .title = Намиране на текущия елемент от структурата
-pdfjs-current-outline-item-button-label = Текущ елемент от структурата
 pdfjs-findbar-button =
     .title = Намиране в документа
 pdfjs-findbar-button-label = Търсене
-pdfjs-additional-layers = Допълнителни слоеве
 
 ## Thumbnails panel item (tooltip and alt text for images)
 
@@ -222,25 +192,9 @@ pdfjs-find-next-button =
 pdfjs-find-next-button-label = Следваща
 pdfjs-find-highlight-checkbox = Открояване на всички
 pdfjs-find-match-case-checkbox-label = Съвпадение на регистъра
-pdfjs-find-match-diacritics-checkbox-label = Без производни букви
 pdfjs-find-entire-word-checkbox-label = Цели думи
 pdfjs-find-reached-top = Достигнато е началото на документа, продължаване от края
 pdfjs-find-reached-bottom = Достигнат е краят на документа, продължаване от началото
-# Variables:
-#   $current (Number) - the index of the currently active find result
-#   $total (Number) - the total number of matches in the document
-pdfjs-find-match-count =
-    { $total ->
-        [one] { $current } от { $total } съвпадение
-       *[other] { $current } от { $total } съвпадения
-    }
-# Variables:
-#   $limit (Number) - the maximum number of matches
-pdfjs-find-match-count-limit =
-    { $limit ->
-        [one] Повече от { $limit } съвпадение
-       *[other] Повече от { $limit } съвпадения
-    }
 pdfjs-find-not-found = Фразата не е намерена
 
 ## Predefined zoom values
@@ -255,10 +209,6 @@ pdfjs-page-scale-percent = { $scale }%
 
 ## PDF page
 
-# Variables:
-#   $page (Number) - the page number
-pdfjs-page-landmark =
-    .aria-label = Страница { $page }
 
 ## Loading indicator messages
 
@@ -270,10 +220,6 @@ pdfjs-rendering-error = Грешка при изчертаване на стра
 
 ## Annotations
 
-# Variables:
-#   $date (Date) - the modification date of the annotation
-#   $time (Time) - the modification time of the annotation
-pdfjs-annotation-date-string = { $date }, { $time }
 # .alt: This is used as a tooltip.
 # Variables:
 #   $type (String) - an annotation type from a list defined in the PDF spec
@@ -292,93 +238,10 @@ pdfjs-web-fonts-disabled = Уеб-шрифтовете са забранени:
 
 ## Editing
 
-pdfjs-editor-free-text-button =
-    .title = Текст
-pdfjs-editor-free-text-button-label = Текст
-pdfjs-editor-ink-button =
-    .title = Рисуване
-pdfjs-editor-ink-button-label = Рисуване
-pdfjs-editor-stamp-button =
-    .title = Добавяне или променяне на изображения
-pdfjs-editor-stamp-button-label = Добавяне или променяне на изображения
-pdfjs-editor-remove-button =
-    .title = Премахване
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Премахване на рисунката
-pdfjs-editor-remove-freetext-button =
-    .title = Премахване на текста
-pdfjs-editor-remove-stamp-button =
-    .title = Пермахване на изображението
-pdfjs-editor-remove-highlight-button =
-    .title = Премахване на открояването
-
-##
-
-# Editor Parameters
-pdfjs-editor-free-text-color-input = Цвят
-pdfjs-editor-free-text-size-input = Размер
-pdfjs-editor-ink-color-input = Цвят
-pdfjs-editor-ink-thickness-input = Дебелина
-pdfjs-editor-ink-opacity-input = Прозрачност
-pdfjs-editor-stamp-add-image-button =
-    .title = Добавяне на изображение
-pdfjs-editor-stamp-add-image-button-label = Добавяне на изображение
-pdfjs-free-text =
-    .aria-label = Текстов редактор
-pdfjs-free-text-default-content = Започнете да пишете…
-pdfjs-ink =
-    .aria-label = Промяна на рисунка
-pdfjs-ink-canvas =
-    .aria-label = Изображение, създадено от потребител
 
 ## Alt-text dialog
 
-# Alternative text (alt text) helps when people can't see the image.
-pdfjs-editor-alt-text-button-label = Алтернативен текст
-pdfjs-editor-alt-text-edit-button-label = Промяна на алтернативния текст
-pdfjs-editor-alt-text-dialog-label = Изберете от възможностите
-pdfjs-editor-alt-text-dialog-description = Алтернативният текст помага на потребителите, когато не могат да видят изображението или то не се зарежда.
-pdfjs-editor-alt-text-add-description-label = Добавяне на описание
-pdfjs-editor-alt-text-add-description-description = Стремете се към 1-2 изречения, описващи предмета, настройката или действията.
-pdfjs-editor-alt-text-mark-decorative-label = Отбелязване като декоративно
-pdfjs-editor-alt-text-mark-decorative-description = Използва се за орнаменти или декоративни изображения, като контури и водни знаци.
-pdfjs-editor-alt-text-cancel-button = Отказ
-pdfjs-editor-alt-text-save-button = Запазване
-pdfjs-editor-alt-text-decorative-tooltip = Отбелязване като декоративно
-# .placeholder: This is a placeholder for the alt text input area
-pdfjs-editor-alt-text-textarea =
-    .placeholder = Например, „Млад мъж седи на маса и се храни“
 
 ## Editor resizers
 ## This is used in an aria label to help to understand the role of the resizer.
 
-pdfjs-editor-resizer-label-top-left = Горен ляв ъгъл — преоразмеряване
-pdfjs-editor-resizer-label-top-middle = Горе в средата — преоразмеряване
-pdfjs-editor-resizer-label-top-right = Горен десен ъгъл — преоразмеряване
-pdfjs-editor-resizer-label-middle-right = Дясно в средата — преоразмеряване
-pdfjs-editor-resizer-label-bottom-right = Долен десен ъгъл — преоразмеряване
-pdfjs-editor-resizer-label-bottom-middle = Долу в средата — преоразмеряване
-pdfjs-editor-resizer-label-bottom-left = Долен ляв ъгъл — преоразмеряване
-pdfjs-editor-resizer-label-middle-left = Ляво в средата — преоразмеряване
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Цвят на открояване
-pdfjs-editor-colorpicker-button =
-    .title = Промяна на цвят
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Избор на цвят
-pdfjs-editor-colorpicker-yellow =
-    .title = Жълто
-pdfjs-editor-colorpicker-green =
-    .title = Зелено
-pdfjs-editor-colorpicker-blue =
-    .title = Синьо
-pdfjs-editor-colorpicker-pink =
-    .title = Розово
-pdfjs-editor-colorpicker-red =
-    .title = Червено

l10n/br/viewer.ftl

@@ -39,22 +39,6 @@ pdfjs-open-file-button-label = Digeriñ ur restr
 pdfjs-print-button =
     .title = Moullañ
 pdfjs-print-button-label = Moullañ
-pdfjs-save-button =
-    .title = Enrollañ
-pdfjs-save-button-label = Enrollañ
-# Used in Firefox for Android as a tooltip for the download button (“download” is a verb).
-pdfjs-download-button =
-    .title = Pellgargañ
-# 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.
-pdfjs-download-button-label = Pellgargañ
-pdfjs-bookmark-button-label = Pajenn a-vremañ
-# Used in Firefox for Android.
-pdfjs-open-in-app-button =
-    .title = Digeriñ en arload
-# Used in Firefox for Android.
-# Length of the translation matters since we are in a mobile context, with limited screen estate.
-pdfjs-open-in-app-button-label = Digeriñ en arload
 
 ##  Secondary toolbar and context menu
 
@@ -268,46 +252,10 @@ pdfjs-web-fonts-disabled = Diweredekaet eo an nodrezhoù web: n'haller ket arver
 
 ## Editing
 
-pdfjs-editor-free-text-button =
-    .title = Testenn
-pdfjs-editor-free-text-button-label = Testenn
-pdfjs-editor-ink-button =
-    .title = Tresañ
-pdfjs-editor-ink-button-label = Tresañ
-pdfjs-editor-stamp-button =
-    .title = Ouzhpennañ pe aozañ skeudennoù
-pdfjs-editor-stamp-button-label = Ouzhpennañ pe aozañ skeudennoù
-
-## Remove button for the various kind of editor.
-
-
-##
-
-# Editor Parameters
-pdfjs-editor-free-text-color-input = Liv
-pdfjs-editor-free-text-size-input = Ment
-pdfjs-editor-ink-color-input = Liv
-pdfjs-editor-ink-thickness-input = Tevder
-pdfjs-editor-ink-opacity-input = Boullder
-pdfjs-editor-stamp-add-image-button =
-    .title = Ouzhpennañ ur skeudenn
-pdfjs-editor-stamp-add-image-button-label = Ouzhpennañ ur skeudenn
-pdfjs-free-text =
-    .aria-label = Aozer testennoù
-pdfjs-ink =
-    .aria-label = Aozer tresoù
-pdfjs-ink-canvas =
-    .aria-label = Skeudenn bet krouet gant an implijer·ez
 
 ## Alt-text dialog
 
-pdfjs-editor-alt-text-add-description-label = Ouzhpennañ un deskrivadur
-pdfjs-editor-alt-text-cancel-button = Nullañ
-pdfjs-editor-alt-text-save-button = Enrollañ
 
 ## Editor resizers
 ## This is used in an aria label to help to understand the role of the resizer.
 
-
-## Color picker
-

l10n/cs/viewer.ftl

@@ -305,23 +305,6 @@ pdfjs-editor-ink-button-label = Kreslení
 pdfjs-editor-stamp-button =
     .title = Přidání či úprava obrázků
 pdfjs-editor-stamp-button-label = Přidání či úprava obrázků
-pdfjs-editor-highlight-button =
-    .title = Zvýraznění
-pdfjs-editor-highlight-button-label = Zvýraznění
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Odebrat kresbu
-pdfjs-editor-remove-freetext-button =
-    .title = Odebrat text
-pdfjs-editor-remove-stamp-button =
-    .title = Odebrat obrázek
-pdfjs-editor-remove-highlight-button =
-    .title = Odebrat zvýraznění
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Barva
 pdfjs-editor-free-text-size-input = Velikost
@@ -331,10 +314,6 @@ pdfjs-editor-ink-opacity-input = Průhlednost
 pdfjs-editor-stamp-add-image-button =
     .title = Přidat obrázek
 pdfjs-editor-stamp-add-image-button-label = Přidat obrázek
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Tloušťka
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Změna tloušťky při zvýrazňování jiných položek než textu
 pdfjs-free-text =
     .aria-label = Textový editor
 pdfjs-free-text-default-content = Začněte psát…
@@ -372,22 +351,3 @@ pdfjs-editor-resizer-label-bottom-right = Pravý dolní roh — změna velikosti
 pdfjs-editor-resizer-label-bottom-middle = Střed dole — změna velikosti
 pdfjs-editor-resizer-label-bottom-left = Levý dolní roh — změna velikosti
 pdfjs-editor-resizer-label-middle-left = Vlevo uprostřed — změna velikosti
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Barva zvýraznění
-pdfjs-editor-colorpicker-button =
-    .title = Změna barvy
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Výběr barev
-pdfjs-editor-colorpicker-yellow =
-    .title = Žlutá
-pdfjs-editor-colorpicker-green =
-    .title = Zelená
-pdfjs-editor-colorpicker-blue =
-    .title = Modrá
-pdfjs-editor-colorpicker-pink =
-    .title = Růžová
-pdfjs-editor-colorpicker-red =
-    .title = Červená

l10n/cy/viewer.ftl

@@ -23,11 +23,11 @@ pdfjs-of-pages = o { $pagesCount }
 #   $pagesCount (Number) - the total number of pages in the document
 pdfjs-page-of-pages = ({ $pageNumber } o { $pagesCount })
 pdfjs-zoom-out-button =
-    .title = Lleihau
+    .title = Chwyddo Allan
-pdfjs-zoom-out-button-label = Lleihau
+pdfjs-zoom-out-button-label = Chwyddo Allan
 pdfjs-zoom-in-button =
-    .title = Cynyddu
+    .title = Chwyddo Mewn
-pdfjs-zoom-in-button-label = Cynyddu
+pdfjs-zoom-in-button-label = Chwyddo Mewn
 pdfjs-zoom-select =
     .title = Chwyddo
 pdfjs-presentation-mode-button =
@@ -44,10 +44,10 @@ pdfjs-save-button =
 pdfjs-save-button-label = Cadw
 # Used in Firefox for Android as a tooltip for the download button (“download” is a verb).
 pdfjs-download-button =
-    .title = Llwytho i lawr
+    .title = Llwytho i Lawr
 # 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.
-pdfjs-download-button-label = Llwytho i lawr
+pdfjs-download-button-label = Llwytho i Lawr
 pdfjs-bookmark-button =
     .title = Tudalen Gyfredol (Gweld URL o'r Dudalen Gyfredol)
 pdfjs-bookmark-button-label = Tudalen Gyfredol
@@ -309,23 +309,8 @@ pdfjs-editor-ink-button-label = Lluniadu
 pdfjs-editor-stamp-button =
     .title = Ychwanegu neu olygu delweddau
 pdfjs-editor-stamp-button-label = Ychwanegu neu olygu delweddau
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Amlygu
+    .title = Tynnu
-pdfjs-editor-highlight-button-label = Amlygu
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Dileu lluniad
-pdfjs-editor-remove-freetext-button =
-    .title = Dileu testun
-pdfjs-editor-remove-stamp-button =
-    .title = Dileu delwedd
-pdfjs-editor-remove-highlight-button =
-    .title = Tynnu amlygiad
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Lliw
 pdfjs-editor-free-text-size-input = Maint
@@ -335,10 +320,6 @@ pdfjs-editor-ink-opacity-input = Didreiddedd
 pdfjs-editor-stamp-add-image-button =
     .title = Ychwanegu delwedd
 pdfjs-editor-stamp-add-image-button-label = Ychwanegu delwedd
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Trwch
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Newid trwch wrth amlygu eitemau heblaw testun
 pdfjs-free-text =
     .aria-label = Golygydd Testun
 pdfjs-free-text-default-content = Cychwyn teipio…
@@ -376,22 +357,3 @@ pdfjs-editor-resizer-label-bottom-right = Y gornel dde isaf — newid maint
 pdfjs-editor-resizer-label-bottom-middle = Canol gwaelod — newid maint
 pdfjs-editor-resizer-label-bottom-left = Y gornel chwith isaf — newid maint
 pdfjs-editor-resizer-label-middle-left = Chwith canol — newid maint
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Lliw amlygu
-pdfjs-editor-colorpicker-button =
-    .title = Newid lliw
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Dewisiadau lliw
-pdfjs-editor-colorpicker-yellow =
-    .title = Melyn
-pdfjs-editor-colorpicker-green =
-    .title = Gwyrdd
-pdfjs-editor-colorpicker-blue =
-    .title = Glas
-pdfjs-editor-colorpicker-pink =
-    .title = Pinc
-pdfjs-editor-colorpicker-red =
-    .title = Coch

l10n/da/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Tegn
 pdfjs-editor-stamp-button =
     .title = Tilføj eller rediger billeder
 pdfjs-editor-stamp-button-label = Tilføj eller rediger billeder
-pdfjs-editor-highlight-button =
-    .title = Fremhæv
-pdfjs-editor-highlight-button-label = Fremhæv
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Fjern tegning
-pdfjs-editor-remove-freetext-button =
-    .title = Fjern tekst
-pdfjs-editor-remove-stamp-button =
-    .title = Fjern billede
-pdfjs-editor-remove-highlight-button =
-    .title = Fjern fremhævning
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Farve
 pdfjs-editor-free-text-size-input = Størrelse
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Uigennemsigtighed
 pdfjs-editor-stamp-add-image-button =
     .title = Tilføj billede
 pdfjs-editor-stamp-add-image-button-label = Tilføj billede
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Tykkelse
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Ændr tykkelse, når andre elementer end tekst fremhæves
 pdfjs-free-text =
     .aria-label = Teksteditor
 pdfjs-free-text-default-content = Begynd at skrive…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Nederste højre hjørne - tilpas stør
 pdfjs-editor-resizer-label-bottom-middle = Nederst i midten - tilpas størrelse
 pdfjs-editor-resizer-label-bottom-left = Nederste venstre hjørne - tilpas størrelse
 pdfjs-editor-resizer-label-middle-left = Midten til venstre — tilpas størrelse
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Fremhævningsfarve
-pdfjs-editor-colorpicker-button =
-    .title = Skift farve
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Farvevalg
-pdfjs-editor-colorpicker-yellow =
-    .title = Gul
-pdfjs-editor-colorpicker-green =
-    .title = Grøn
-pdfjs-editor-colorpicker-blue =
-    .title = Blå
-pdfjs-editor-colorpicker-pink =
-    .title = Lyserød
-pdfjs-editor-colorpicker-red =
-    .title = Rød

l10n/de/viewer.ftl

@@ -301,36 +301,15 @@ pdfjs-editor-ink-button-label = Zeichnen
 pdfjs-editor-stamp-button =
     .title = Grafiken hinzufügen oder bearbeiten
 pdfjs-editor-stamp-button-label = Grafiken hinzufügen oder bearbeiten
-pdfjs-editor-highlight-button =
-    .title = Hervorheben
-pdfjs-editor-highlight-button-label = Hervorheben
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Zeichnung entfernen
-pdfjs-editor-remove-freetext-button =
-    .title = Text entfernen
-pdfjs-editor-remove-stamp-button =
-    .title = Grafik entfernen
-pdfjs-editor-remove-highlight-button =
-    .title = Hervorhebung entfernen
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Farbe
 pdfjs-editor-free-text-size-input = Größe
 pdfjs-editor-ink-color-input = Farbe
-pdfjs-editor-ink-thickness-input = Linienstärke
+pdfjs-editor-ink-thickness-input = Dicke
 pdfjs-editor-ink-opacity-input = Deckkraft
 pdfjs-editor-stamp-add-image-button =
     .title = Grafik hinzufügen
 pdfjs-editor-stamp-add-image-button-label = Grafik hinzufügen
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Linienstärke
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Linienstärke beim Hervorheben anderer Elemente als Text ändern
 pdfjs-free-text =
     .aria-label = Texteditor
 pdfjs-free-text-default-content = Schreiben beginnen…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Rechte untere Ecke - Größe ändern
 pdfjs-editor-resizer-label-bottom-middle = Unten mittig - Größe ändern
 pdfjs-editor-resizer-label-bottom-left = Linke untere Ecke - Größe ändern
 pdfjs-editor-resizer-label-middle-left = Mitte links - Größe ändern
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Hervorhebungsfarbe
-pdfjs-editor-colorpicker-button =
-    .title = Farbe ändern
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Farbauswahl
-pdfjs-editor-colorpicker-yellow =
-    .title = Gelb
-pdfjs-editor-colorpicker-green =
-    .title = Grün
-pdfjs-editor-colorpicker-blue =
-    .title = Blau
-pdfjs-editor-colorpicker-pink =
-    .title = Pink
-pdfjs-editor-colorpicker-red =
-    .title = Rot

l10n/dsb/viewer.ftl

@@ -305,23 +305,8 @@ pdfjs-editor-ink-button-label = Kresliś
 pdfjs-editor-stamp-button =
     .title = Wobraze pśidaś abo wobźěłaś
 pdfjs-editor-stamp-button-label = Wobraze pśidaś abo wobźěłaś
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Wuzwignuś
+    .title = Wótwónoźeś
-pdfjs-editor-highlight-button-label = Wuzwignuś
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Kreslanku wótwónoźeś
-pdfjs-editor-remove-freetext-button =
-    .title = Tekst wótwónoźeś
-pdfjs-editor-remove-stamp-button =
-    .title = Wobraz wótwónoźeś
-pdfjs-editor-remove-highlight-button =
-    .title = Wuzwignjenje wótpóraś
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Barwa
 pdfjs-editor-free-text-size-input = Wjelikosć
@@ -331,10 +316,6 @@ pdfjs-editor-ink-opacity-input = Opacita
 pdfjs-editor-stamp-add-image-button =
     .title = Wobraz pśidaś
 pdfjs-editor-stamp-add-image-button-label = Wobraz pśidaś
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Tłustosć
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Tłustosć změniś, gaž se zapiski wuzwiguju, kótarež tekst njejsu
 pdfjs-free-text =
     .aria-label = Tekstowy editor
 pdfjs-free-text-default-content = Zachopśo pisaś…
@@ -372,22 +353,3 @@ pdfjs-editor-resizer-label-bottom-right = Dołojce napšawo – wjelikosć změn
 pdfjs-editor-resizer-label-bottom-middle = Dołojce wesrjejź – wjelikosć změniś
 pdfjs-editor-resizer-label-bottom-left = Dołojce nalěwo – wjelikosć změniś
 pdfjs-editor-resizer-label-middle-left = Wesrjejź nalěwo – wjelikosć změniś
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Barwa wuzwignjenja
-pdfjs-editor-colorpicker-button =
-    .title = Barwu změniś
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Wuběrk barwow
-pdfjs-editor-colorpicker-yellow =
-    .title = Žołty
-pdfjs-editor-colorpicker-green =
-    .title = Zeleny
-pdfjs-editor-colorpicker-blue =
-    .title = Módry
-pdfjs-editor-colorpicker-pink =
-    .title = Pink
-pdfjs-editor-colorpicker-red =
-    .title = Cerwjeny

l10n/el/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Σχέδιο
 pdfjs-editor-stamp-button =
     .title = Προσθήκη ή επεξεργασία εικόνων
 pdfjs-editor-stamp-button-label = Προσθήκη ή επεξεργασία εικόνων
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Επισήμανση
+    .title = Αφαίρεση
-pdfjs-editor-highlight-button-label = Επισήμανση
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Αφαίρεση σχεδίου
-pdfjs-editor-remove-freetext-button =
-    .title = Αφαίρεση κειμένου
-pdfjs-editor-remove-stamp-button =
-    .title = Αφαίρεση εικόνας
-pdfjs-editor-remove-highlight-button =
-    .title = Αφαίρεση επισήμανσης
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Χρώμα
 pdfjs-editor-free-text-size-input = Μέγεθος
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Αδιαφάνεια
 pdfjs-editor-stamp-add-image-button =
     .title = Προσθήκη εικόνας
 pdfjs-editor-stamp-add-image-button-label = Προσθήκη εικόνας
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Πάχος
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Αλλαγή πάχους κατά την επισήμανση στοιχείων εκτός κειμένου
 pdfjs-free-text =
     .aria-label = Επεξεργασία κειμένου
 pdfjs-free-text-default-content = Ξεκινήστε να πληκτρολογείτε…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Κάτω δεξιά γωνία — α
 pdfjs-editor-resizer-label-bottom-middle = Μέσο κάτω πλευράς — αλλαγή μεγέθους
 pdfjs-editor-resizer-label-bottom-left = Κάτω αριστερή γωνία — αλλαγή μεγέθους
 pdfjs-editor-resizer-label-middle-left = Μέσο αριστερής πλευράς — αλλαγή μεγέθους
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Χρώμα επισήμανσης
-pdfjs-editor-colorpicker-button =
-    .title = Αλλαγή χρώματος
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Επιλογές χρωμάτων
-pdfjs-editor-colorpicker-yellow =
-    .title = Κίτρινο
-pdfjs-editor-colorpicker-green =
-    .title = Πράσινο
-pdfjs-editor-colorpicker-blue =
-    .title = Μπλε
-pdfjs-editor-colorpicker-pink =
-    .title = Ροζ
-pdfjs-editor-colorpicker-red =
-    .title = Κόκκινο

l10n/en-CA/viewer.ftl

@@ -286,12 +286,6 @@ pdfjs-editor-ink-button-label = Draw
 pdfjs-editor-stamp-button =
     .title = Add or edit images
 pdfjs-editor-stamp-button-label = Add or edit images
-
-## Remove button for the various kind of editor.
-
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Colour
 pdfjs-editor-free-text-size-input = Size
@@ -315,22 +309,3 @@ pdfjs-ink-canvas =
 ## Editor resizers
 ## This is used in an aria label to help to understand the role of the resizer.
 
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Highlight colour
-pdfjs-editor-colorpicker-button =
-    .title = Change colour
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Colour choices
-pdfjs-editor-colorpicker-yellow =
-    .title = Yellow
-pdfjs-editor-colorpicker-green =
-    .title = Green
-pdfjs-editor-colorpicker-blue =
-    .title = Blue
-pdfjs-editor-colorpicker-pink =
-    .title = Pink
-pdfjs-editor-colorpicker-red =
-    .title = Red

l10n/en-GB/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Draw
 pdfjs-editor-stamp-button =
     .title = Add or edit images
 pdfjs-editor-stamp-button-label = Add or edit images
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Highlight
+    .title = Remove
-pdfjs-editor-highlight-button-label = Highlight
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Remove drawing
-pdfjs-editor-remove-freetext-button =
-    .title = Remove text
-pdfjs-editor-remove-stamp-button =
-    .title = Remove image
-pdfjs-editor-remove-highlight-button =
-    .title = Remove highlight
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Colour
 pdfjs-editor-free-text-size-input = Size
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Opacity
 pdfjs-editor-stamp-add-image-button =
     .title = Add image
 pdfjs-editor-stamp-add-image-button-label = Add image
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Thickness
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Change thickness when highlighting items other than text
 pdfjs-free-text =
     .aria-label = Text Editor
 pdfjs-free-text-default-content = Start typing…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Bottom right corner — resize
 pdfjs-editor-resizer-label-bottom-middle = Bottom middle — resize
 pdfjs-editor-resizer-label-bottom-left = Bottom left corner — resize
 pdfjs-editor-resizer-label-middle-left = Middle left — resize
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Highlight colour
-pdfjs-editor-colorpicker-button =
-    .title = Change colour
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Colour choices
-pdfjs-editor-colorpicker-yellow =
-    .title = Yellow
-pdfjs-editor-colorpicker-green =
-    .title = Green
-pdfjs-editor-colorpicker-blue =
-    .title = Blue
-pdfjs-editor-colorpicker-pink =
-    .title = Pink
-pdfjs-editor-colorpicker-red =
-    .title = Red

l10n/en-US/viewer.ftl

@@ -58,6 +58,14 @@ pdfjs-bookmark-button =
     .title = Current Page (View URL from Current Page)
 pdfjs-bookmark-button-label = Current Page
 
+# Used in Firefox for Android.
+pdfjs-open-in-app-button =
+    .title = Open in app
+
+# Used in Firefox for Android.
+# Length of the translation matters since we are in a mobile context, with limited screen estate.
+pdfjs-open-in-app-button-label = Open in app
+
 ##  Secondary toolbar and context menu
 
 pdfjs-tools-button =
@@ -315,24 +323,8 @@ pdfjs-editor-ink-button-label = Draw
 pdfjs-editor-stamp-button =
     .title = Add or edit images
 pdfjs-editor-stamp-button-label = Add or edit images
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Highlight
+    .title = Remove
-pdfjs-editor-highlight-button-label = Highlight
-pdfjs-highlight-floating-button =
-    .title = Highlight
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Remove drawing
-pdfjs-editor-remove-freetext-button =
-    .title = Remove text
-pdfjs-editor-remove-stamp-button =
-    .title = Remove image
-pdfjs-editor-remove-highlight-button =
-    .title = Remove highlight
-
-##
 
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Color
@@ -343,10 +335,6 @@ pdfjs-editor-ink-opacity-input = Opacity
 pdfjs-editor-stamp-add-image-button =
     .title = Add image
 pdfjs-editor-stamp-add-image-button-label = Add image
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Thickness
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Change thickness when highlighting items other than text
 
 pdfjs-free-text =
     .aria-label = Text Editor
@@ -387,30 +375,3 @@ pdfjs-editor-resizer-label-bottom-right = Bottom right corner — resize
 pdfjs-editor-resizer-label-bottom-middle = Bottom middle — resize
 pdfjs-editor-resizer-label-bottom-left = Bottom left corner — resize
 pdfjs-editor-resizer-label-middle-left = Middle left — resize
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Highlight color
-
-pdfjs-editor-colorpicker-button =
-    .title = Change color
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Color choices
-pdfjs-editor-colorpicker-yellow =
-    .title = Yellow
-pdfjs-editor-colorpicker-green =
-    .title = Green
-pdfjs-editor-colorpicker-blue =
-    .title = Blue
-pdfjs-editor-colorpicker-pink =
-    .title = Pink
-pdfjs-editor-colorpicker-red =
-    .title = Red
-
-## Show all highlights
-## This is a toggle button to show/hide all the highlights.
-
-pdfjs-editor-highlight-show-all-button-label = Show all
-pdfjs-editor-highlight-show-all-button =
-    .title = Show all

l10n/eo/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Desegni
 pdfjs-editor-stamp-button =
     .title = Aldoni aŭ modifi bildojn
 pdfjs-editor-stamp-button-label = Aldoni aŭ modifi bildojn
-pdfjs-editor-highlight-button =
-    .title = Elstarigi
-pdfjs-editor-highlight-button-label = Elstarigi
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Forigi desegnon
-pdfjs-editor-remove-freetext-button =
-    .title = Forigi tekston
-pdfjs-editor-remove-stamp-button =
-    .title = Forigi bildon
-pdfjs-editor-remove-highlight-button =
-    .title = Forigi elstaraĵon
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Koloro
 pdfjs-editor-free-text-size-input = Grando
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Maldiafaneco
 pdfjs-editor-stamp-add-image-button =
     .title = Aldoni bildon
 pdfjs-editor-stamp-add-image-button-label = Aldoni bildon
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Dikeco
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Ŝanĝi dikecon dum elstarigo de netekstaj elementoj
 pdfjs-free-text =
     .aria-label = Tekstan redaktilon
 pdfjs-free-text-default-content = Ektajpi…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Malsupra deksta angulo — ŝanĝi gra
 pdfjs-editor-resizer-label-bottom-middle = Malsupra mezo — ŝanĝi grandon
 pdfjs-editor-resizer-label-bottom-left = Malsupra maldekstra angulo — ŝanĝi grandon
 pdfjs-editor-resizer-label-middle-left = Maldekstra mezo — ŝanĝi grandon
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Elstarigi koloron
-pdfjs-editor-colorpicker-button =
-    .title = Ŝanĝi koloron
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Elekto de koloroj
-pdfjs-editor-colorpicker-yellow =
-    .title = Flava
-pdfjs-editor-colorpicker-green =
-    .title = Verda
-pdfjs-editor-colorpicker-blue =
-    .title = Blua
-pdfjs-editor-colorpicker-pink =
-    .title = Roza
-pdfjs-editor-colorpicker-red =
-    .title = Ruĝa

l10n/es-AR/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Dibujar
 pdfjs-editor-stamp-button =
     .title = Agregar o editar imágenes
 pdfjs-editor-stamp-button-label = Agregar o editar imágenes
-pdfjs-editor-highlight-button =
-    .title = Resaltar
-pdfjs-editor-highlight-button-label = Resaltar
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Eliminar dibujo
-pdfjs-editor-remove-freetext-button =
-    .title = Eliminar texto
-pdfjs-editor-remove-stamp-button =
-    .title = Eliminar imagen
-pdfjs-editor-remove-highlight-button =
-    .title = Eliminar resaltado
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Color
 pdfjs-editor-free-text-size-input = Tamaño
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Opacidad
 pdfjs-editor-stamp-add-image-button =
     .title = Agregar una imagen
 pdfjs-editor-stamp-add-image-button-label = Agregar una imagen
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Grosor
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Cambiar el grosor al resaltar elementos que no sean texto
 pdfjs-free-text =
     .aria-label = Editor de texto
 pdfjs-free-text-default-content = Empezar a tipear…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Esquina inferior derecha — cambiar e
 pdfjs-editor-resizer-label-bottom-middle = Abajo en el medio — cambiar el tamaño
 pdfjs-editor-resizer-label-bottom-left = Esquina inferior izquierda — cambiar el tamaño
 pdfjs-editor-resizer-label-middle-left = Al centro a la izquierda — cambiar el tamaño
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Color de resaltado
-pdfjs-editor-colorpicker-button =
-    .title = Cambiar el color
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Opciones de color
-pdfjs-editor-colorpicker-yellow =
-    .title = Amarillo
-pdfjs-editor-colorpicker-green =
-    .title = Verde
-pdfjs-editor-colorpicker-blue =
-    .title = Azul
-pdfjs-editor-colorpicker-pink =
-    .title = Rosado
-pdfjs-editor-colorpicker-red =
-    .title = Rojo

l10n/es-CL/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Dibujar
 pdfjs-editor-stamp-button =
     .title = Añadir o editar imágenes
 pdfjs-editor-stamp-button-label = Añadir o editar imágenes
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Destacar
+    .title = Eliminar
-pdfjs-editor-highlight-button-label = Destacar
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Eliminar dibujo
-pdfjs-editor-remove-freetext-button =
-    .title = Eliminar texto
-pdfjs-editor-remove-stamp-button =
-    .title = Eliminar imagen
-pdfjs-editor-remove-highlight-button =
-    .title = Quitar resaltado
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Color
 pdfjs-editor-free-text-size-input = Tamaño
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Opacidad
 pdfjs-editor-stamp-add-image-button =
     .title = Añadir imagen
 pdfjs-editor-stamp-add-image-button-label = Añadir imagen
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Grosor
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Cambia el grosor al resaltar elementos que no sean texto
 pdfjs-free-text =
     .aria-label = Editor de texto
 pdfjs-free-text-default-content = Empieza a escribir…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Esquina inferior derecha — cambiar e
 pdfjs-editor-resizer-label-bottom-middle = Borde inferior en el medio — cambiar el tamaño
 pdfjs-editor-resizer-label-bottom-left = Esquina inferior izquierda — cambiar el tamaño
 pdfjs-editor-resizer-label-middle-left = Borde izquierdo en el medio — cambiar el tamaño
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Color de resaltado
-pdfjs-editor-colorpicker-button =
-    .title = Cambiar color
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Opciones de color
-pdfjs-editor-colorpicker-yellow =
-    .title = Amarillo
-pdfjs-editor-colorpicker-green =
-    .title = Verde
-pdfjs-editor-colorpicker-blue =
-    .title = Azul
-pdfjs-editor-colorpicker-pink =
-    .title = Rosa
-pdfjs-editor-colorpicker-red =
-    .title = Rojo

l10n/es-ES/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Dibujar
 pdfjs-editor-stamp-button =
     .title = Añadir o editar imágenes
 pdfjs-editor-stamp-button-label = Añadir o editar imágenes
-pdfjs-editor-highlight-button =
-    .title = Resaltar
-pdfjs-editor-highlight-button-label = Resaltar
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Eliminar dibujo
-pdfjs-editor-remove-freetext-button =
-    .title = Eliminar texto
-pdfjs-editor-remove-stamp-button =
-    .title = Eliminar imagen
-pdfjs-editor-remove-highlight-button =
-    .title = Quitar resaltado
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Color
 pdfjs-editor-free-text-size-input = Tamaño
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Opacidad
 pdfjs-editor-stamp-add-image-button =
     .title = Añadir imagen
 pdfjs-editor-stamp-add-image-button-label = Añadir imagen
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Grosor
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Cambiar el grosor al resaltar elementos que no sean texto
 pdfjs-free-text =
     .aria-label = Editor de texto
 pdfjs-free-text-default-content = Empezar a escribir…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Esquina inferior derecha — redimensi
 pdfjs-editor-resizer-label-bottom-middle = Borde inferior en el medio — redimensionar
 pdfjs-editor-resizer-label-bottom-left = Esquina inferior izquierda — redimensionar
 pdfjs-editor-resizer-label-middle-left = Borde izquierdo en el medio — redimensionar
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Color de resaltado
-pdfjs-editor-colorpicker-button =
-    .title = Cambiar color
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Opciones de color
-pdfjs-editor-colorpicker-yellow =
-    .title = Amarillo
-pdfjs-editor-colorpicker-green =
-    .title = Verde
-pdfjs-editor-colorpicker-blue =
-    .title = Azul
-pdfjs-editor-colorpicker-pink =
-    .title = Rosa
-pdfjs-editor-colorpicker-red =
-    .title = Rojo

l10n/eu/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Marrazkia
 pdfjs-editor-stamp-button =
     .title = Gehitu edo editatu irudiak
 pdfjs-editor-stamp-button-label = Gehitu edo editatu irudiak
-pdfjs-editor-highlight-button =
-    .title = Nabarmendu
-pdfjs-editor-highlight-button-label = Nabarmendu
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Kendu marrazkia
-pdfjs-editor-remove-freetext-button =
-    .title = Kendu testua
-pdfjs-editor-remove-stamp-button =
-    .title = Kendu irudia
-pdfjs-editor-remove-highlight-button =
-    .title = Kendu nabarmentzea
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Kolorea
 pdfjs-editor-free-text-size-input = Tamaina
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Opakutasuna
 pdfjs-editor-stamp-add-image-button =
     .title = Gehitu irudia
 pdfjs-editor-stamp-add-image-button-label = Gehitu irudia
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Loditasuna
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Aldatu loditasuna testua ez beste elementuak nabarmentzean
 pdfjs-free-text =
     .aria-label = Testu-editorea
 pdfjs-free-text-default-content = Hasi idazten…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Beheko eskuineko izkina — aldatu tam
 pdfjs-editor-resizer-label-bottom-middle = Behean erdian — aldatu tamaina
 pdfjs-editor-resizer-label-bottom-left = Beheko ezkerreko izkina — aldatu tamaina
 pdfjs-editor-resizer-label-middle-left = Erdian ezkerrean —  aldatu tamaina
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Nabarmentze kolorea
-pdfjs-editor-colorpicker-button =
-    .title = Aldatu kolorea
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Kolore-aukerak
-pdfjs-editor-colorpicker-yellow =
-    .title = Horia
-pdfjs-editor-colorpicker-green =
-    .title = Berdea
-pdfjs-editor-colorpicker-blue =
-    .title = Urdina
-pdfjs-editor-colorpicker-pink =
-    .title = Arrosa
-pdfjs-editor-colorpicker-red =
-    .title = Gorria

l10n/fi/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Piirros
 pdfjs-editor-stamp-button =
     .title = Lisää tai muokkaa kuvia
 pdfjs-editor-stamp-button-label = Lisää tai muokkaa kuvia
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Korostus
+    .title = Poista
-pdfjs-editor-highlight-button-label = Korostus
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Poista piirros
-pdfjs-editor-remove-freetext-button =
-    .title = Poista teksti
-pdfjs-editor-remove-stamp-button =
-    .title = Poista kuva
-pdfjs-editor-remove-highlight-button =
-    .title = Poista korostus
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Väri
 pdfjs-editor-free-text-size-input = Koko
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Peittävyys
 pdfjs-editor-stamp-add-image-button =
     .title = Lisää kuva
 pdfjs-editor-stamp-add-image-button-label = Lisää kuva
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Paksuus
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Muuta paksuutta korostaessasi muita kohteita kuin tekstiä
 pdfjs-free-text =
     .aria-label = Tekstimuokkain
 pdfjs-free-text-default-content = Aloita kirjoittaminen…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Oikea alakulma - muuta kokoa
 pdfjs-editor-resizer-label-bottom-middle = Alhaalla keskellä - muuta kokoa
 pdfjs-editor-resizer-label-bottom-left = Vasen alakulma - muuta kokoa
 pdfjs-editor-resizer-label-middle-left = Keskellä vasemmalla - muuta kokoa
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Korostusväri
-pdfjs-editor-colorpicker-button =
-    .title = Vaihda väri
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Värivalinnat
-pdfjs-editor-colorpicker-yellow =
-    .title = Keltainen
-pdfjs-editor-colorpicker-green =
-    .title = Vihreä
-pdfjs-editor-colorpicker-blue =
-    .title = Sininen
-pdfjs-editor-colorpicker-pink =
-    .title = Pinkki
-pdfjs-editor-colorpicker-red =
-    .title = Punainen

l10n/fr/viewer.ftl

@@ -297,23 +297,8 @@ pdfjs-editor-ink-button-label = Dessiner
 pdfjs-editor-stamp-button =
     .title = Ajouter ou modifier des images
 pdfjs-editor-stamp-button-label = Ajouter ou modifier des images
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Surligner
+    .title = Supprimer
-pdfjs-editor-highlight-button-label = Surligner
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Supprimer le dessin
-pdfjs-editor-remove-freetext-button =
-    .title = Supprimer le texte
-pdfjs-editor-remove-stamp-button =
-    .title = Supprimer l’image
-pdfjs-editor-remove-highlight-button =
-    .title = Supprimer le surlignage
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Couleur
 pdfjs-editor-free-text-size-input = Taille
@@ -323,8 +308,6 @@ pdfjs-editor-ink-opacity-input = Opacité
 pdfjs-editor-stamp-add-image-button =
     .title = Ajouter une image
 pdfjs-editor-stamp-add-image-button-label = Ajouter une image
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Épaisseur
 pdfjs-free-text =
     .aria-label = Éditeur de texte
 pdfjs-free-text-default-content = Commencer à écrire…
@@ -362,22 +345,3 @@ pdfjs-editor-resizer-label-bottom-right = Coin inférieur droit — redimensionn
 pdfjs-editor-resizer-label-bottom-middle = Centre bas — redimensionner
 pdfjs-editor-resizer-label-bottom-left = Coin inférieur gauche — redimensionner
 pdfjs-editor-resizer-label-middle-left = Milieu gauche — redimensionner
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Couleur de surlignage
-pdfjs-editor-colorpicker-button =
-    .title = Changer de couleur
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Choix de couleurs
-pdfjs-editor-colorpicker-yellow =
-    .title = Jaune
-pdfjs-editor-colorpicker-green =
-    .title = Vert
-pdfjs-editor-colorpicker-blue =
-    .title = Bleu
-pdfjs-editor-colorpicker-pink =
-    .title = Rose
-pdfjs-editor-colorpicker-red =
-    .title = Rouge

l10n/fur/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Dissen
 pdfjs-editor-stamp-button =
     .title = Zonte o modifiche imagjins
 pdfjs-editor-stamp-button-label = Zonte o modifiche imagjins
-pdfjs-editor-highlight-button =
-    .title = Evidenzie
-pdfjs-editor-highlight-button-label = Evidenzie
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Gjave dissen
-pdfjs-editor-remove-freetext-button =
-    .title = Gjave test
-pdfjs-editor-remove-stamp-button =
-    .title = Gjave imagjin
-pdfjs-editor-remove-highlight-button =
-    .title = Gjave evidenziazion
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Colôr
 pdfjs-editor-free-text-size-input = Dimension
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Opacitât
 pdfjs-editor-stamp-add-image-button =
     .title = Zonte imagjin
 pdfjs-editor-stamp-add-image-button-label = Zonte imagjin
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Spessôr
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Modifiche il spessôr de selezion pai elements che no son testuâi
 pdfjs-free-text =
     .aria-label = Editôr di test
 pdfjs-free-text-default-content = Scomence a scrivi…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Cjanton in bas a diestre — ridimensi
 pdfjs-editor-resizer-label-bottom-middle = Bande inferiôr tal mieç — ridimensione
 pdfjs-editor-resizer-label-bottom-left = Cjanton in bas a çampe — ridimensione
 pdfjs-editor-resizer-label-middle-left = Bande di çampe tal mieç — ridimensione
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Colôr par evidenziâ
-pdfjs-editor-colorpicker-button =
-    .title = Cambie colôr
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Sieltis di colôr
-pdfjs-editor-colorpicker-yellow =
-    .title = Zâl
-pdfjs-editor-colorpicker-green =
-    .title = Vert
-pdfjs-editor-colorpicker-blue =
-    .title = Blu
-pdfjs-editor-colorpicker-pink =
-    .title = Rose
-pdfjs-editor-colorpicker-red =
-    .title = Ros

l10n/fy-NL/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Tekenje
 pdfjs-editor-stamp-button =
     .title = Ofbyldingen tafoegje of bewurkje
 pdfjs-editor-stamp-button-label = Ofbyldingen tafoegje of bewurkje
-pdfjs-editor-highlight-button =
-    .title = Markearje
-pdfjs-editor-highlight-button-label = Markearje
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Tekening fuortsmite
-pdfjs-editor-remove-freetext-button =
-    .title = Tekst fuortsmite
-pdfjs-editor-remove-stamp-button =
-    .title = Ofbylding fuortsmite
-pdfjs-editor-remove-highlight-button =
-    .title = Markearring fuortsmite
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Kleur
 pdfjs-editor-free-text-size-input = Grutte
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Transparânsje
 pdfjs-editor-stamp-add-image-button =
     .title = Ofbylding tafoegje
 pdfjs-editor-stamp-add-image-button-label = Ofbylding tafoegje
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Tsjokte
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Tsjokte wizigje by aksintuearring fan oare items as tekst
 pdfjs-free-text =
     .aria-label = Tekstbewurker
 pdfjs-free-text-default-content = Begjin mei typen…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Rjochterûnderhoek – formaat wizigje
 pdfjs-editor-resizer-label-bottom-middle = Midden ûnder – formaat wizigje
 pdfjs-editor-resizer-label-bottom-left = Linkerûnderhoek – formaat wizigje
 pdfjs-editor-resizer-label-middle-left = Links midden – formaat wizigje
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Markearringskleur
-pdfjs-editor-colorpicker-button =
-    .title = Kleur wizigje
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Kleurkarren
-pdfjs-editor-colorpicker-yellow =
-    .title = Giel
-pdfjs-editor-colorpicker-green =
-    .title = Grien
-pdfjs-editor-colorpicker-blue =
-    .title = Blau
-pdfjs-editor-colorpicker-pink =
-    .title = Roze
-pdfjs-editor-colorpicker-red =
-    .title = Read

l10n/gl/viewer.ftl

@@ -301,18 +301,6 @@ pdfjs-editor-ink-button-label = Debuxo
 pdfjs-editor-stamp-button =
     .title = Engadir ou editar imaxes
 pdfjs-editor-stamp-button-label = Engadir ou editar imaxes
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-freetext-button =
-    .title = Eliminar o texto
-pdfjs-editor-remove-stamp-button =
-    .title = Eliminar a imaxe
-pdfjs-editor-remove-highlight-button =
-    .title = Eliminar o resaltado
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Cor
 pdfjs-editor-free-text-size-input = Tamaño
@@ -322,8 +310,6 @@ pdfjs-editor-ink-opacity-input = Opacidade
 pdfjs-editor-stamp-add-image-button =
     .title = Engadir imaxe
 pdfjs-editor-stamp-add-image-button-label = Engadir imaxe
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Grosor
 pdfjs-free-text =
     .aria-label = Editor de texto
 pdfjs-free-text-default-content = Comezar a teclear…
@@ -359,6 +345,3 @@ pdfjs-editor-resizer-label-bottom-right = Esquina inferior dereita: cambia o tam
 pdfjs-editor-resizer-label-bottom-middle = Abaixo medio: cambia o tamaño
 pdfjs-editor-resizer-label-bottom-left = Esquina inferior esquerda: cambia o tamaño
 pdfjs-editor-resizer-label-middle-left = Medio esquerdo: cambia o tamaño
-
-## Color picker
-

l10n/gn/viewer.ftl

@@ -303,23 +303,6 @@ pdfjs-editor-stamp-button =
 pdfjs-editor-stamp-button-label = Embojuaju térã embosako’i ta’ãnga
 pdfjs-editor-remove-button =
     .title = Mboguete
-pdfjs-editor-highlight-button =
-    .title = Mbosa’y
-pdfjs-editor-highlight-button-label = Mbosa’y
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Emboguete ta’ãnga
-pdfjs-editor-remove-freetext-button =
-    .title = Emboguete moñe’ẽrã
-pdfjs-editor-remove-stamp-button =
-    .title = Emboguete ta’ãnga
-pdfjs-editor-remove-highlight-button =
-    .title = Eipe’a jehechaveha
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Sa’y
 pdfjs-editor-free-text-size-input = Tuichakue
@@ -366,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Yvy gotyo akatúape — emoambue tuich
 pdfjs-editor-resizer-label-bottom-middle = Yvy gotyo mbytépe — emoambue tuichakue
 pdfjs-editor-resizer-label-bottom-left = Iguýpe asu gotyo — emoambue tuichakue
 pdfjs-editor-resizer-label-middle-left = Mbyte asu gotyo — emoambue tuichakue
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Jehechaveha sa’y
-pdfjs-editor-colorpicker-button =
-    .title = Emoambue sa’y
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Sa’y poravopyrã
-pdfjs-editor-colorpicker-yellow =
-    .title = Sa’yju
-pdfjs-editor-colorpicker-green =
-    .title = Hovyũ
-pdfjs-editor-colorpicker-blue =
-    .title = Hovy
-pdfjs-editor-colorpicker-pink =
-    .title = Pytãngy
-pdfjs-editor-colorpicker-red =
-    .title = Pyha

l10n/he/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = ציור
 pdfjs-editor-stamp-button =
     .title = הוספה או עריכת תמונות
 pdfjs-editor-stamp-button-label = הוספה או עריכת תמונות
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = סימון
+    .title = הסרה
-pdfjs-editor-highlight-button-label = סימון
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = הסרת ציור
-pdfjs-editor-remove-freetext-button =
-    .title = הסרת טקסט
-pdfjs-editor-remove-stamp-button =
-    .title = הסרת תמונה
-pdfjs-editor-remove-highlight-button =
-    .title = הסרת הדגשה
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = צבע
 pdfjs-editor-free-text-size-input = גודל
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = אטימות
 pdfjs-editor-stamp-add-image-button =
     .title = הוספת תמונה
 pdfjs-editor-stamp-add-image-button-label = הוספת תמונה
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = עובי
-pdfjs-editor-free-highlight-thickness-title =
-    .title = שינוי עובי בעת הדגשת פריטים שאינם טקסט
 pdfjs-free-text =
     .aria-label = עורך טקסט
 pdfjs-free-text-default-content = להתחיל להקליד…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = פינה ימנית תחתונה - ש
 pdfjs-editor-resizer-label-bottom-middle = למטה באמצע - שינוי גודל
 pdfjs-editor-resizer-label-bottom-left = פינה שמאלית תחתונה - שינוי גודל
 pdfjs-editor-resizer-label-middle-left = שמאלה באמצע - שינוי גודל
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = צבע הדגשה
-pdfjs-editor-colorpicker-button =
-    .title = שינוי צבע
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = בחירת צבע
-pdfjs-editor-colorpicker-yellow =
-    .title = צהוב
-pdfjs-editor-colorpicker-green =
-    .title = ירוק
-pdfjs-editor-colorpicker-blue =
-    .title = כחול
-pdfjs-editor-colorpicker-pink =
-    .title = ורוד
-pdfjs-editor-colorpicker-red =
-    .title = אדום

l10n/hsb/viewer.ftl

@@ -305,23 +305,8 @@ pdfjs-editor-ink-button-label = Rysować
 pdfjs-editor-stamp-button =
     .title = Wobrazy přidać abo wobdźěłać
 pdfjs-editor-stamp-button-label = Wobrazy přidać abo wobdźěłać
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Wuzběhnyć
+    .title = Wotstronić
-pdfjs-editor-highlight-button-label = Wuzběhnyć
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Rysowanku wotstronić
-pdfjs-editor-remove-freetext-button =
-    .title = Tekst wotstronić
-pdfjs-editor-remove-stamp-button =
-    .title = Wobraz wotstronić
-pdfjs-editor-remove-highlight-button =
-    .title = Wuzběhnjenje wotstronić
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Barba
 pdfjs-editor-free-text-size-input = Wulkosć
@@ -331,10 +316,6 @@ pdfjs-editor-ink-opacity-input = Opacita
 pdfjs-editor-stamp-add-image-button =
     .title = Wobraz přidać
 pdfjs-editor-stamp-add-image-button-label = Wobraz přidać
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Tołstosć
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Tołstosć změnić, hdyž so zapiski wuzběhuja, kotrež tekst njejsu
 pdfjs-free-text =
     .aria-label = Tekstowy editor
 pdfjs-free-text-default-content = Započńće pisać…
@@ -372,22 +353,3 @@ pdfjs-editor-resizer-label-bottom-right = Deleka naprawo – wulkosć změnić
 pdfjs-editor-resizer-label-bottom-middle = Deleka wosrjedź – wulkosć změnić
 pdfjs-editor-resizer-label-bottom-left = Deleka nalěwo – wulkosć změnić
 pdfjs-editor-resizer-label-middle-left = Wosrjedź nalěwo – wulkosć změnić
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Barba wuzběhnjenja
-pdfjs-editor-colorpicker-button =
-    .title = Barbu změnić
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Wuběr barbow
-pdfjs-editor-colorpicker-yellow =
-    .title = Žołty
-pdfjs-editor-colorpicker-green =
-    .title = Zeleny
-pdfjs-editor-colorpicker-blue =
-    .title = Módry
-pdfjs-editor-colorpicker-pink =
-    .title = Pink
-pdfjs-editor-colorpicker-red =
-    .title = Čerwjeny

l10n/hu/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Rajzolás
 pdfjs-editor-stamp-button =
     .title = Képek hozzáadása vagy szerkesztése
 pdfjs-editor-stamp-button-label = Képek hozzáadása vagy szerkesztése
-pdfjs-editor-highlight-button =
-    .title = Kiemelés
-pdfjs-editor-highlight-button-label = Kiemelés
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Rajz eltávolítása
-pdfjs-editor-remove-freetext-button =
-    .title = Szöveg eltávolítása
-pdfjs-editor-remove-stamp-button =
-    .title = Kép eltávolítása
-pdfjs-editor-remove-highlight-button =
-    .title = Kiemelés eltávolítása
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Szín
 pdfjs-editor-free-text-size-input = Méret
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Átlátszatlanság
 pdfjs-editor-stamp-add-image-button =
     .title = Kép hozzáadása
 pdfjs-editor-stamp-add-image-button-label = Kép hozzáadása
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Vastagság
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Vastagság módosítása, ha nem szöveges elemeket emel ki
 pdfjs-free-text =
     .aria-label = Szövegszerkesztő
 pdfjs-free-text-default-content = Kezdjen el gépelni…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Jobb alsó sarok – átméretezés
 pdfjs-editor-resizer-label-bottom-middle = Alul középen – átméretezés
 pdfjs-editor-resizer-label-bottom-left = Bal alsó sarok – átméretezés
 pdfjs-editor-resizer-label-middle-left = Balra középen – átméretezés
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Kiemelés színe
-pdfjs-editor-colorpicker-button =
-    .title = Szín módosítása
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Színválasztások
-pdfjs-editor-colorpicker-yellow =
-    .title = Sárga
-pdfjs-editor-colorpicker-green =
-    .title = Zöld
-pdfjs-editor-colorpicker-blue =
-    .title = Kék
-pdfjs-editor-colorpicker-pink =
-    .title = Rózsaszín
-pdfjs-editor-colorpicker-red =
-    .title = Vörös

l10n/ia/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Designar
 pdfjs-editor-stamp-button =
     .title = Adder o rediger imagines
 pdfjs-editor-stamp-button-label = Adder o rediger imagines
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Evidentia
+    .title = Remover
-pdfjs-editor-highlight-button-label = Evidentia
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Remover le designo
-pdfjs-editor-remove-freetext-button =
-    .title = Remover texto
-pdfjs-editor-remove-stamp-button =
-    .title = Remover imagine
-pdfjs-editor-remove-highlight-button =
-    .title = Remover evidentia
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Color
 pdfjs-editor-free-text-size-input = Dimension
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Opacitate
 pdfjs-editor-stamp-add-image-button =
     .title = Adder imagine
 pdfjs-editor-stamp-add-image-button-label = Adder imagine
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Spissor
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Cambiar spissor evidentiante elementos differente de texto
 pdfjs-free-text =
     .aria-label = Editor de texto
 pdfjs-free-text-default-content = Comenciar a scriber…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Angulo inferior dextre — redimension
 pdfjs-editor-resizer-label-bottom-middle = Medio inferior — redimensionar
 pdfjs-editor-resizer-label-bottom-left = Angulo inferior sinistre — redimensionar
 pdfjs-editor-resizer-label-middle-left = Medio sinistre — redimensionar
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Color pro evidentiar
-pdfjs-editor-colorpicker-button =
-    .title = Cambiar color
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Electiones del color
-pdfjs-editor-colorpicker-yellow =
-    .title = Jalne
-pdfjs-editor-colorpicker-green =
-    .title = Verde
-pdfjs-editor-colorpicker-blue =
-    .title = Blau
-pdfjs-editor-colorpicker-pink =
-    .title = Rosate
-pdfjs-editor-colorpicker-red =
-    .title = Rubie

l10n/is/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Teikna
 pdfjs-editor-stamp-button =
     .title = Bæta við eða breyta myndum
 pdfjs-editor-stamp-button-label = Bæta við eða breyta myndum
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Áherslulita
+    .title = Fjarlægja
-pdfjs-editor-highlight-button-label = Áherslulita
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Fjarlægja teikningu
-pdfjs-editor-remove-freetext-button =
-    .title = Fjarlægja texta
-pdfjs-editor-remove-stamp-button =
-    .title = Fjarlægja mynd
-pdfjs-editor-remove-highlight-button =
-    .title = Fjarlægja áherslulit
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Litur
 pdfjs-editor-free-text-size-input = Stærð
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Ógegnsæi
 pdfjs-editor-stamp-add-image-button =
     .title = Bæta við mynd
 pdfjs-editor-stamp-add-image-button-label = Bæta við mynd
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Þykkt
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Breyta þykkt við áherslulitun annarra atriða en texta
 pdfjs-free-text =
     .aria-label = Textaritill
 pdfjs-free-text-default-content = Byrjaðu að skrifa…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Neðst í hægra horni - breyta stær
 pdfjs-editor-resizer-label-bottom-middle = Neðst á miðju - breyta stærð
 pdfjs-editor-resizer-label-bottom-left = Neðst í vinstra horni - breyta stærð
 pdfjs-editor-resizer-label-middle-left = Miðja til vinstri - breyta stærð
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Áherslulitur
-pdfjs-editor-colorpicker-button =
-    .title = Skipta um lit
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Val lita
-pdfjs-editor-colorpicker-yellow =
-    .title = Gult
-pdfjs-editor-colorpicker-green =
-    .title = Grænt
-pdfjs-editor-colorpicker-blue =
-    .title = Blátt
-pdfjs-editor-colorpicker-pink =
-    .title = Bleikt
-pdfjs-editor-colorpicker-red =
-    .title = Rautt

l10n/it/viewer.ftl

@@ -304,23 +304,8 @@ pdfjs-editor-ink-button-label = Disegno
 pdfjs-editor-stamp-button =
     .title = Aggiungi o rimuovi immagine
 pdfjs-editor-stamp-button-label = Aggiungi o rimuovi immagine
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Evidenzia
+    .title = Rimuovi
-pdfjs-editor-highlight-button-label = Evidenzia
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Rimuovi disegno
-pdfjs-editor-remove-freetext-button =
-    .title = Rimuovi testo
-pdfjs-editor-remove-stamp-button =
-    .title = Rimuovi immagine
-pdfjs-editor-remove-highlight-button =
-    .title = Rimuovi evidenziazione
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Colore
 pdfjs-editor-free-text-size-input = Dimensione
@@ -330,11 +315,6 @@ pdfjs-editor-ink-opacity-input = Opacità
 pdfjs-editor-stamp-add-image-button =
     .title = Aggiungi immagine
 pdfjs-editor-stamp-add-image-button-label = Aggiungi immagine
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Spessore
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Modifica lo spessore della selezione per elementi non testuali
-
 pdfjs-free-text =
     .aria-label = Editor di testo
 pdfjs-free-text-default-content = Inizia a digitare…
@@ -373,22 +353,4 @@ pdfjs-editor-resizer-label-bottom-middle = Lato inferiore nel mezzo — ridimens
 pdfjs-editor-resizer-label-bottom-left = Angolo in basso a sinistra — ridimensiona
 pdfjs-editor-resizer-label-middle-left = Lato sinistro nel mezzo — ridimensiona
 
-## Color picker
 
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Colore evidenziatore
-
-pdfjs-editor-colorpicker-button =
-    .title = Cambia colore
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Colori disponibili
-pdfjs-editor-colorpicker-yellow =
-    .title = Giallo
-pdfjs-editor-colorpicker-green =
-    .title = Verde
-pdfjs-editor-colorpicker-blue =
-    .title = Blu
-pdfjs-editor-colorpicker-pink =
-    .title = Rosa
-pdfjs-editor-colorpicker-red =
-    .title = Rosso

l10n/ja/viewer.ftl

@@ -293,31 +293,14 @@ pdfjs-web-fonts-disabled = ウェブフォントが無効になっています:
 ## Editing
 
 pdfjs-editor-free-text-button =
-    .title = フリーテキスト注釈を追加します
+    .title = フリーテキスト注釈
 pdfjs-editor-free-text-button-label = フリーテキスト注釈
 pdfjs-editor-ink-button =
-    .title = インク注釈を追加します
+    .title = インク注釈
 pdfjs-editor-ink-button-label = インク注釈
 pdfjs-editor-stamp-button =
     .title = 画像を追加または編集します
 pdfjs-editor-stamp-button-label = 画像を追加または編集
-pdfjs-editor-highlight-button =
-    .title = 強調します
-pdfjs-editor-highlight-button-label = 強調
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = インク注釈を削除します
-pdfjs-editor-remove-freetext-button =
-    .title = テキストを削除します
-pdfjs-editor-remove-stamp-button =
-    .title = 画像を削除します
-pdfjs-editor-remove-highlight-button =
-    .title = 強調を削除します
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = 色
 pdfjs-editor-free-text-size-input = サイズ
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = 不透明度
 pdfjs-editor-stamp-add-image-button =
     .title = 画像を追加します
 pdfjs-editor-stamp-add-image-button-label = 画像を追加
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = 太さ
-pdfjs-editor-free-highlight-thickness-title =
-    .title = テキスト以外のアイテムを強調する時の太さを変更します
 pdfjs-free-text =
     .aria-label = フリーテキスト注釈エディター
 pdfjs-free-text-default-content = テキストを入力してください...
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = 右下隅 — サイズ変更
 pdfjs-editor-resizer-label-bottom-middle = 下中央 — サイズ変更
 pdfjs-editor-resizer-label-bottom-left = 左下隅 — サイズ変更
 pdfjs-editor-resizer-label-middle-left = 左中央 — サイズ変更
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = 強調色
-pdfjs-editor-colorpicker-button =
-    .title = 色を変更します
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = 色の選択
-pdfjs-editor-colorpicker-yellow =
-    .title = 黄色
-pdfjs-editor-colorpicker-green =
-    .title = 緑色
-pdfjs-editor-colorpicker-blue =
-    .title = 青色
-pdfjs-editor-colorpicker-pink =
-    .title = ピンク色
-pdfjs-editor-colorpicker-red =
-    .title = 赤色

l10n/ka/viewer.ftl

@@ -220,7 +220,7 @@ pdfjs-find-previous-button-label = წინა
 pdfjs-find-next-button =
     .title = ფრაზის შემდეგი კონტექსტის პოვნა
 pdfjs-find-next-button-label = შემდეგი
-pdfjs-find-highlight-checkbox = ყველაფრის მონიშვნა
+pdfjs-find-highlight-checkbox = ყველას მონიშვნა
 pdfjs-find-match-case-checkbox-label = მთავრულით
 pdfjs-find-match-diacritics-checkbox-label = ნიშნებით
 pdfjs-find-entire-word-checkbox-label = მთლიანი სიტყვები
@@ -301,25 +301,6 @@ pdfjs-editor-ink-button-label = ხაზვა
 pdfjs-editor-stamp-button =
     .title = სურათების დართვა ან ჩასწორება
 pdfjs-editor-stamp-button-label = სურათების დართვა ან ჩასწორება
-pdfjs-editor-remove-button =
-    .title = მოცილება
-pdfjs-editor-highlight-button =
-    .title = მონიშვნა
-pdfjs-editor-highlight-button-label = მონიშვნა
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = დახაზულის მოცილება
-pdfjs-editor-remove-freetext-button =
-    .title = წარწერის მოცილება
-pdfjs-editor-remove-stamp-button =
-    .title = სურათის მოცილება
-pdfjs-editor-remove-highlight-button =
-    .title = მონიშვნის მოცილება
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = ფერი
 pdfjs-editor-free-text-size-input = ზომა
@@ -333,24 +314,24 @@ pdfjs-free-text =
     .aria-label = ნაწერის ჩასწორება
 pdfjs-free-text-default-content = აკრიფეთ…
 pdfjs-ink =
-    .aria-label = დახაზულის შესწორება
+    .aria-label = ნახატის ჩასწორება
 pdfjs-ink-canvas =
     .aria-label = მომხმარებლის შექმნილი სურათი
 
 ## Alt-text dialog
 
 # Alternative text (alt text) helps when people can't see the image.
-pdfjs-editor-alt-text-button-label = თანდართული წარწერა
+pdfjs-editor-alt-text-button-label = დართული წარწერა
-pdfjs-editor-alt-text-edit-button-label = თანდართული წარწერის ჩასწორება
+pdfjs-editor-alt-text-edit-button-label = დართული წარწერის ჩასწორება
 pdfjs-editor-alt-text-dialog-label = არჩევა
-pdfjs-editor-alt-text-dialog-description = თანდართული (შემნაცვლებელი) წარწერა გამოსადეგია მათთვის, ვინც ვერ ხედავს სურათებს ან გამოისახება მაშინ, როცა სურათი ვერ ჩაიტვირთება.
+pdfjs-editor-alt-text-dialog-description = დართული წარწერა (შემნაცვლებელი ტექსტი) გამოსადეგია მათთვის, ვინც ვერ ხედავს სურათებს ან როცა სურათი ვერ იტვირთება.
-pdfjs-editor-alt-text-add-description-label = აღწერილობის მითითება
+pdfjs-editor-alt-text-add-description-label = აღწერილობის დამატება
 pdfjs-editor-alt-text-add-description-description = განკუთვნილია 1-2 წინადადებით საგნის, მახასიათებლის ან მოქმედების აღსაწერად.
-pdfjs-editor-alt-text-mark-decorative-label = მოინიშნოს მორთულობად
+pdfjs-editor-alt-text-mark-decorative-label = მოინიშნოს მოსართავად
-pdfjs-editor-alt-text-mark-decorative-description = განკუთვნილია შესამკობი სურათებისთვის, გარსშემოსავლები ჩარჩოებისა და ჭვირნიშნებისთვის.
+pdfjs-editor-alt-text-mark-decorative-description = გამოიყენება შესამკობი სურათებისთვის, გარსშემოსავლები ჩარჩოებისა და ჭვირნიშნებისთვის.
 pdfjs-editor-alt-text-cancel-button = გაუქმება
 pdfjs-editor-alt-text-save-button = შენახვა
-pdfjs-editor-alt-text-decorative-tooltip = მოინიშნოს მორთულობად
+pdfjs-editor-alt-text-decorative-tooltip = მოინიშნოს მოსართავად
 # .placeholder: This is a placeholder for the alt text input area
 pdfjs-editor-alt-text-textarea =
     .placeholder = მაგალითად, „ახალგაზრდა მამაკაცი მაგიდასთან ზის და სადილობს“
@@ -366,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = ქვევით მარჯვნ
 pdfjs-editor-resizer-label-bottom-middle = ქვევით შუაში — ზომაცვლა
 pdfjs-editor-resizer-label-bottom-left = ზვევით მარცხნივ — ზომაცვლა
 pdfjs-editor-resizer-label-middle-left = შუაში მარცხნივ — ზომაცვლა
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = მოსანიშნი ფერი
-pdfjs-editor-colorpicker-button =
-    .title = ფერის შეცვლა
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = ფერის არჩევა
-pdfjs-editor-colorpicker-yellow =
-    .title = ყვითელი
-pdfjs-editor-colorpicker-green =
-    .title = მწვანე
-pdfjs-editor-colorpicker-blue =
-    .title = ლურჯი
-pdfjs-editor-colorpicker-pink =
-    .title = ვარდისფერი
-pdfjs-editor-colorpicker-red =
-    .title = წითელი

l10n/kab/viewer.ftl

@@ -234,13 +234,6 @@ pdfjs-find-match-count =
         [one] Timeḍriwt { $current } ɣef { $total }
        *[other] Timeḍriwin { $current } ɣef { $total }
     }
-# Variables:
-#   $limit (Number) - the maximum number of matches
-pdfjs-find-match-count-limit =
-    { $limit ->
-        [one] Ugar n { $limit } umṣada
-       *[other] Ugar n { $limit } yimṣadayen
-    }
 pdfjs-find-not-found = Ulac tawinest
 
 ## Predefined zoom values
@@ -322,15 +315,10 @@ pdfjs-ink-canvas =
 
 ## Alt-text dialog
 
-# Alternative text (alt text) helps when people can't see the image.
-pdfjs-editor-alt-text-button-label = Aḍris amaskal
-pdfjs-editor-alt-text-edit-button-label = Ẓreg aḍris amaskal
 pdfjs-editor-alt-text-dialog-label = Fren taxtirt
 pdfjs-editor-alt-text-add-description-label = Rnu aglam
-pdfjs-editor-alt-text-mark-decorative-label = Creḍ d adlag
 pdfjs-editor-alt-text-cancel-button = Sefsex
 pdfjs-editor-alt-text-save-button = Sekles
-pdfjs-editor-alt-text-decorative-tooltip = Yettwacreḍ d adlag
 
 ## Editor resizers
 ## This is used in an aria label to help to understand the role of the resizer.

l10n/kk/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Сурет салу
 pdfjs-editor-stamp-button =
     .title = Суреттерді қосу немесе түзету
 pdfjs-editor-stamp-button-label = Суреттерді қосу немесе түзету
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Ерекшелеу
+    .title = Өшіру
-pdfjs-editor-highlight-button-label = Ерекшелеу
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Сызбаны өшіру
-pdfjs-editor-remove-freetext-button =
-    .title = Мәтінді өшіру
-pdfjs-editor-remove-stamp-button =
-    .title = Суретті өшіру
-pdfjs-editor-remove-highlight-button =
-    .title = Түспен ерекшелеуді өшіру
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Түс
 pdfjs-editor-free-text-size-input = Өлшемі
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Мөлдірсіздігі
 pdfjs-editor-stamp-add-image-button =
     .title = Суретті қосу
 pdfjs-editor-stamp-add-image-button-label = Суретті қосу
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Қалыңдығы
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Мәтіннен басқа элементтерді ерекшелеу кезінде қалыңдықты өзгерту
 pdfjs-free-text =
     .aria-label = Мәтін түзеткіші
 pdfjs-free-text-default-content = Теруді бастау…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Төменгі оң жақ бұрыш
 pdfjs-editor-resizer-label-bottom-middle = Төменгі ортасы — өлшемін өзгерту
 pdfjs-editor-resizer-label-bottom-left = Төменгі сол жақ бұрыш — өлшемін өзгерту
 pdfjs-editor-resizer-label-middle-left = Ортаңғы сол жақ — өлшемін өзгерту
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Ерекшелеу түсі
-pdfjs-editor-colorpicker-button =
-    .title = Түсті өзгерту
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Түс таңдаулары
-pdfjs-editor-colorpicker-yellow =
-    .title = Сары
-pdfjs-editor-colorpicker-green =
-    .title = Жасыл
-pdfjs-editor-colorpicker-blue =
-    .title = Көк
-pdfjs-editor-colorpicker-pink =
-    .title = Қызғылт
-pdfjs-editor-colorpicker-red =
-    .title = Қызыл

l10n/ko/viewer.ftl

@@ -293,23 +293,8 @@ pdfjs-editor-ink-button-label = 그리기
 pdfjs-editor-stamp-button =
     .title = 이미지 추가 또는 편집
 pdfjs-editor-stamp-button-label = 이미지 추가 또는 편집
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = 강조
+    .title = 제거
-pdfjs-editor-highlight-button-label = 강조
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = 그리기 제거
-pdfjs-editor-remove-freetext-button =
-    .title = 텍스트 제거
-pdfjs-editor-remove-stamp-button =
-    .title = 이미지 제거
-pdfjs-editor-remove-highlight-button =
-    .title = 강조 제거
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = 색상
 pdfjs-editor-free-text-size-input = 크기
@@ -319,10 +304,6 @@ pdfjs-editor-ink-opacity-input = 불투명도
 pdfjs-editor-stamp-add-image-button =
     .title = 이미지 추가
 pdfjs-editor-stamp-add-image-button-label = 이미지 추가
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = 두께
-pdfjs-editor-free-highlight-thickness-title =
-    .title = 텍스트 이외의 항목을 강조 표시할 때 두께 변경
 pdfjs-free-text =
     .aria-label = 텍스트 편집기
 pdfjs-free-text-default-content = 입력하세요…
@@ -360,22 +341,3 @@ pdfjs-editor-resizer-label-bottom-right = 오른쪽 아래 - 크기 조정
 pdfjs-editor-resizer-label-bottom-middle = 가운데 아래 — 크기 조정
 pdfjs-editor-resizer-label-bottom-left = 왼쪽 아래 - 크기 조정
 pdfjs-editor-resizer-label-middle-left = 왼쪽 가운데 — 크기 조정
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = 강조 색
-pdfjs-editor-colorpicker-button =
-    .title = 색상 변경
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = 색상 선택
-pdfjs-editor-colorpicker-yellow =
-    .title = 노란색
-pdfjs-editor-colorpicker-green =
-    .title = 녹색
-pdfjs-editor-colorpicker-blue =
-    .title = 파란색
-pdfjs-editor-colorpicker-pink =
-    .title = 분홍색
-pdfjs-editor-colorpicker-red =
-    .title = 빨간색

l10n/nb-NO/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Tegn
 pdfjs-editor-stamp-button =
     .title = Legg til eller rediger bilder
 pdfjs-editor-stamp-button-label = Legg til eller rediger bilder
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Markere
+    .title = Fjern
-pdfjs-editor-highlight-button-label = Markere
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Fjern tegningen
-pdfjs-editor-remove-freetext-button =
-    .title = Fjern tekst
-pdfjs-editor-remove-stamp-button =
-    .title = Fjern bildet
-pdfjs-editor-remove-highlight-button =
-    .title = Fjern utheving
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Farge
 pdfjs-editor-free-text-size-input = Størrelse
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Ugjennomsiktighet
 pdfjs-editor-stamp-add-image-button =
     .title = Legg til bilde
 pdfjs-editor-stamp-add-image-button-label = Legg til bilde
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Tykkelse
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Endre tykkelse når du markerer andre elementer enn tekst
 pdfjs-free-text =
     .aria-label = Tekstredigering
 pdfjs-free-text-default-content = Begynn å skrive…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Nederste høyre hjørne – endre stø
 pdfjs-editor-resizer-label-bottom-middle = Nederst i midten — endre størrelse
 pdfjs-editor-resizer-label-bottom-left = Nederste venstre hjørne – endre størrelse
 pdfjs-editor-resizer-label-middle-left = Midt til venstre — endre størrelse
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Uthevingsfarge
-pdfjs-editor-colorpicker-button =
-    .title = Endre farge
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Fargevalg
-pdfjs-editor-colorpicker-yellow =
-    .title = Gul
-pdfjs-editor-colorpicker-green =
-    .title = Grønn
-pdfjs-editor-colorpicker-blue =
-    .title = Blå
-pdfjs-editor-colorpicker-pink =
-    .title = Rosa
-pdfjs-editor-colorpicker-red =
-    .title = Rød

l10n/nl/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Tekenen
 pdfjs-editor-stamp-button =
     .title = Afbeeldingen toevoegen of bewerken
 pdfjs-editor-stamp-button-label = Afbeeldingen toevoegen of bewerken
-pdfjs-editor-highlight-button =
-    .title = Markeren
-pdfjs-editor-highlight-button-label = Markeren
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Tekening verwijderen
-pdfjs-editor-remove-freetext-button =
-    .title = Tekst verwijderen
-pdfjs-editor-remove-stamp-button =
-    .title = Afbeelding verwijderen
-pdfjs-editor-remove-highlight-button =
-    .title = Markering verwijderen
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Kleur
 pdfjs-editor-free-text-size-input = Grootte
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Opaciteit
 pdfjs-editor-stamp-add-image-button =
     .title = Afbeelding toevoegen
 pdfjs-editor-stamp-add-image-button-label = Afbeelding toevoegen
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Dikte
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Dikte wijzigen bij accentuering van andere items dan tekst
 pdfjs-free-text =
     .aria-label = Tekstbewerker
 pdfjs-free-text-default-content = Begin met typen…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Rechterbenedenhoek – formaat wijzige
 pdfjs-editor-resizer-label-bottom-middle = Midden onder – formaat wijzigen
 pdfjs-editor-resizer-label-bottom-left = Linkerbenedenhoek – formaat wijzigen
 pdfjs-editor-resizer-label-middle-left = Links midden – formaat wijzigen
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Markeringskleur
-pdfjs-editor-colorpicker-button =
-    .title = Kleur wijzigen
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Kleurkeuzes
-pdfjs-editor-colorpicker-yellow =
-    .title = Geel
-pdfjs-editor-colorpicker-green =
-    .title = Groen
-pdfjs-editor-colorpicker-blue =
-    .title = Blauw
-pdfjs-editor-colorpicker-pink =
-    .title = Roze
-pdfjs-editor-colorpicker-red =
-    .title = Rood

l10n/nn-NO/viewer.ftl

@@ -301,8 +301,6 @@ pdfjs-editor-ink-button-label = Teikne
 pdfjs-editor-stamp-button =
     .title = Legg til eller rediger bilde
 pdfjs-editor-stamp-button-label = Legg til eller rediger bilde
-pdfjs-editor-remove-button =
-    .title = Fjern
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Farge
 pdfjs-editor-free-text-size-input = Storleik

l10n/pa-IN/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = ਵਾਹੋ
 pdfjs-editor-stamp-button =
     .title = ਚਿੱਤਰ ਜੋੜੋ ਜਾਂ ਸੋਧੋ
 pdfjs-editor-stamp-button-label = ਚਿੱਤਰ ਜੋੜੋ ਜਾਂ ਸੋਧੋ
-pdfjs-editor-highlight-button =
-    .title = ਹਾਈਲਾਈਟ
-pdfjs-editor-highlight-button-label = ਹਾਈਲਾਈਟ
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = ਡਰਾਇੰਗ ਨੂੰ ਹਟਾਓ
-pdfjs-editor-remove-freetext-button =
-    .title = ਲਿਖਤ ਨੂੰ ਹਟਾਓ
-pdfjs-editor-remove-stamp-button =
-    .title = ਚਿੱਤਰ ਨੂੰ ਹਟਾਓ
-pdfjs-editor-remove-highlight-button =
-    .title = ਹਾਈਲਾਈਟ ਨੂੰ ਹਟਾਓ
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = ਰੰਗ
 pdfjs-editor-free-text-size-input = ਆਕਾਰ
@@ -327,8 +310,6 @@ pdfjs-editor-ink-opacity-input = ਧੁੰਦਲਾਪਨ
 pdfjs-editor-stamp-add-image-button =
     .title = ਚਿੱਤਰ ਜੋੜੋ
 pdfjs-editor-stamp-add-image-button-label = ਚਿੱਤਰ ਜੋੜੋ
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = ਮੋਟਾਈ
 pdfjs-free-text =
     .aria-label = ਲਿਖਤ ਐਡੀਟਰ
 pdfjs-free-text-default-content = …ਲਿਖਣਾ ਸ਼ੁਰੂ ਕਰੋ
@@ -366,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = ਹੇਠਾਂ ਸੱਜਾ ਕੋਨ
 pdfjs-editor-resizer-label-bottom-middle = ਹੇਠਾਂ ਮੱਧ — ਮੁੜ-ਆਕਾਰ ਕਰੋ
 pdfjs-editor-resizer-label-bottom-left = ਹੇਠਾਂ ਖੱਬਾ ਕੋਨਾ — ਮੁੜ-ਆਕਾਰ ਕਰੋ
 pdfjs-editor-resizer-label-middle-left = ਮੱਧ ਖੱਬਾ — ਮੁੜ-ਆਕਾਰ ਕਰੋ
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = ਹਾਈਟਲਾਈਟ ਦਾ ਰੰਗ
-pdfjs-editor-colorpicker-button =
-    .title = ਰੰਗ ਨੂੰ ਬਦਲੋ
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = ਰੰਗ ਚੋਣਾਂ
-pdfjs-editor-colorpicker-yellow =
-    .title = ਪੀਲਾ
-pdfjs-editor-colorpicker-green =
-    .title = ਹਰਾ
-pdfjs-editor-colorpicker-blue =
-    .title = ਨੀਲਾ
-pdfjs-editor-colorpicker-pink =
-    .title = ਗੁਲਾਬੀ
-pdfjs-editor-colorpicker-red =
-    .title = ਲਾਲ

l10n/pl/viewer.ftl

@@ -303,23 +303,6 @@ pdfjs-editor-ink-button-label = Rysunek
 pdfjs-editor-stamp-button =
     .title = Dodaj lub edytuj obrazy
 pdfjs-editor-stamp-button-label = Dodaj lub edytuj obrazy
-pdfjs-editor-highlight-button =
-    .title = Wyróżnij
-pdfjs-editor-highlight-button-label = Wyróżnij
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Usuń rysunek
-pdfjs-editor-remove-freetext-button =
-    .title = Usuń tekst
-pdfjs-editor-remove-stamp-button =
-    .title = Usuń obraz
-pdfjs-editor-remove-highlight-button =
-    .title = Usuń wyróżnienie
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Kolor
 pdfjs-editor-free-text-size-input = Rozmiar
@@ -329,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Nieprzezroczystość
 pdfjs-editor-stamp-add-image-button =
     .title = Dodaj obraz
 pdfjs-editor-stamp-add-image-button-label = Dodaj obraz
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Grubość
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Zmień grubość podczas wyróżniania elementów innych niż tekst
 pdfjs-free-text =
     .aria-label = Edytor tekstu
 pdfjs-free-text-default-content = Zacznij pisać…
@@ -370,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Prawy dolny róg — zmień rozmiar
 pdfjs-editor-resizer-label-bottom-middle = Dolny środkowy — zmień rozmiar
 pdfjs-editor-resizer-label-bottom-left = Lewy dolny róg — zmień rozmiar
 pdfjs-editor-resizer-label-middle-left = Lewy środkowy — zmień rozmiar
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Kolor wyróżnienia
-pdfjs-editor-colorpicker-button =
-    .title = Zmień kolor
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Wybór kolorów
-pdfjs-editor-colorpicker-yellow =
-    .title = Żółty
-pdfjs-editor-colorpicker-green =
-    .title = Zielony
-pdfjs-editor-colorpicker-blue =
-    .title = Niebieski
-pdfjs-editor-colorpicker-pink =
-    .title = Różowy
-pdfjs-editor-colorpicker-red =
-    .title = Czerwony

l10n/pt-BR/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Desenho
 pdfjs-editor-stamp-button =
     .title = Adicionar ou editar imagens
 pdfjs-editor-stamp-button-label = Adicionar ou editar imagens
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Destaque
+    .title = Remover
-pdfjs-editor-highlight-button-label = Destaque
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Remover desenho
-pdfjs-editor-remove-freetext-button =
-    .title = Remover texto
-pdfjs-editor-remove-stamp-button =
-    .title = Remover imagem
-pdfjs-editor-remove-highlight-button =
-    .title = Remover destaque
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Cor
 pdfjs-editor-free-text-size-input = Tamanho
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Opacidade
 pdfjs-editor-stamp-add-image-button =
     .title = Adicionar imagem
 pdfjs-editor-stamp-add-image-button-label = Adicionar imagem
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Espessura
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Mudar espessura ao destacar itens que não são texto
 pdfjs-free-text =
     .aria-label = Editor de texto
 pdfjs-free-text-default-content = Comece digitando…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Canto inferior direito — redimension
 pdfjs-editor-resizer-label-bottom-middle = No centro da base — redimensionar
 pdfjs-editor-resizer-label-bottom-left = Canto inferior esquerdo — redimensionar
 pdfjs-editor-resizer-label-middle-left = No meio à esquerda — redimensionar
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Cor de destaque
-pdfjs-editor-colorpicker-button =
-    .title = Mudar cor
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Opções de cores
-pdfjs-editor-colorpicker-yellow =
-    .title = Amarelo
-pdfjs-editor-colorpicker-green =
-    .title = Verde
-pdfjs-editor-colorpicker-blue =
-    .title = Azul
-pdfjs-editor-colorpicker-pink =
-    .title = Rosa
-pdfjs-editor-colorpicker-red =
-    .title = Vermelho

l10n/pt-PT/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Desenhar
 pdfjs-editor-stamp-button =
     .title = Adicionar ou editar imagens
 pdfjs-editor-stamp-button-label = Adicionar ou editar imagens
-pdfjs-editor-highlight-button =
-    .title = Destaque
-pdfjs-editor-highlight-button-label = Destaque
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Remover desenho
-pdfjs-editor-remove-freetext-button =
-    .title = Remover texto
-pdfjs-editor-remove-stamp-button =
-    .title = Remover imagem
-pdfjs-editor-remove-highlight-button =
-    .title = Remover destaque
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Cor
 pdfjs-editor-free-text-size-input = Tamanho
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Opacidade
 pdfjs-editor-stamp-add-image-button =
     .title = Adicionar imagem
 pdfjs-editor-stamp-add-image-button-label = Adicionar imagem
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Espessura
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Alterar espessura quando destacar itens que não sejam texto
 pdfjs-free-text =
     .aria-label = Editor de texto
 pdfjs-free-text-default-content = Começar a digitar…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Canto inferior direito — redimension
 pdfjs-editor-resizer-label-bottom-middle = Inferior ao centro — redimensionar
 pdfjs-editor-resizer-label-bottom-left = Canto inferior esquerdo — redimensionar
 pdfjs-editor-resizer-label-middle-left = Centro à esquerda — redimensionar
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Cor de destaque
-pdfjs-editor-colorpicker-button =
-    .title = Alterar cor
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Escolhas de cor
-pdfjs-editor-colorpicker-yellow =
-    .title = Amarelo
-pdfjs-editor-colorpicker-green =
-    .title = Verde
-pdfjs-editor-colorpicker-blue =
-    .title = Azul
-pdfjs-editor-colorpicker-pink =
-    .title = Rosa
-pdfjs-editor-colorpicker-red =
-    .title = Vermelho

l10n/rm/viewer.ftl

@@ -301,23 +301,6 @@ pdfjs-editor-ink-button-label = Dissegnar
 pdfjs-editor-stamp-button =
     .title = Agiuntar u modifitgar maletgs
 pdfjs-editor-stamp-button-label = Agiuntar u modifitgar maletgs
-pdfjs-editor-highlight-button =
-    .title = Marcar
-pdfjs-editor-highlight-button-label = Marcar
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Allontanar il dissegn
-pdfjs-editor-remove-freetext-button =
-    .title = Allontanar il text
-pdfjs-editor-remove-stamp-button =
-    .title = Allontanar la grafica
-pdfjs-editor-remove-highlight-button =
-    .title = Allontanar l'emfasa
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Colur
 pdfjs-editor-free-text-size-input = Grondezza
@@ -327,10 +310,6 @@ pdfjs-editor-ink-opacity-input = Opacitad
 pdfjs-editor-stamp-add-image-button =
     .title = Agiuntar in maletg
 pdfjs-editor-stamp-add-image-button-label = Agiuntar in maletg
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Grossezza
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Midar la grossezza cun relevar elements betg textuals
 pdfjs-free-text =
     .aria-label = Editur da text
 pdfjs-free-text-default-content = Cumenzar a tippar…
@@ -368,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Chantun sut a dretga — redimensiunar
 pdfjs-editor-resizer-label-bottom-middle = Sutvart amez — redimensiunar
 pdfjs-editor-resizer-label-bottom-left = Chantun sut a sanestra — redimensiunar
 pdfjs-editor-resizer-label-middle-left = Vart sanestra amez — redimensiunar
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Colur per l'emfasa
-pdfjs-editor-colorpicker-button =
-    .title = Midar la colur
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Colurs disponiblas
-pdfjs-editor-colorpicker-yellow =
-    .title = Mellen
-pdfjs-editor-colorpicker-green =
-    .title = Verd
-pdfjs-editor-colorpicker-blue =
-    .title = Blau
-pdfjs-editor-colorpicker-pink =
-    .title = Rosa
-pdfjs-editor-colorpicker-red =
-    .title = Cotschen

l10n/ru/viewer.ftl

@@ -303,23 +303,8 @@ pdfjs-editor-ink-button-label = Рисовать
 pdfjs-editor-stamp-button =
     .title = Добавить или изменить изображения
 pdfjs-editor-stamp-button-label = Добавить или изменить изображения
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Выделение
+    .title = Удалить
-pdfjs-editor-highlight-button-label = Выделение
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Удалить рисунок
-pdfjs-editor-remove-freetext-button =
-    .title = Удалить текст
-pdfjs-editor-remove-stamp-button =
-    .title = Удалить изображение
-pdfjs-editor-remove-highlight-button =
-    .title = Удалить выделение
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Цвет
 pdfjs-editor-free-text-size-input = Размер
@@ -329,10 +314,6 @@ pdfjs-editor-ink-opacity-input = Прозрачность
 pdfjs-editor-stamp-add-image-button =
     .title = Добавить изображение
 pdfjs-editor-stamp-add-image-button-label = Добавить изображение
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Толщина
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Изменить толщину при выделении элементов, кроме текста
 pdfjs-free-text =
     .aria-label = Текстовый редактор
 pdfjs-free-text-default-content = Начните вводить…
@@ -370,22 +351,3 @@ pdfjs-editor-resizer-label-bottom-right = Нижний правый угол —
 pdfjs-editor-resizer-label-bottom-middle = Внизу посередине — изменить размер
 pdfjs-editor-resizer-label-bottom-left = Нижний левый угол — изменить размер
 pdfjs-editor-resizer-label-middle-left = В центре слева — изменить размер
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Цвет выделения
-pdfjs-editor-colorpicker-button =
-    .title = Изменить цвет
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Выбор цвета
-pdfjs-editor-colorpicker-yellow =
-    .title = Жёлтый
-pdfjs-editor-colorpicker-green =
-    .title = Зелёный
-pdfjs-editor-colorpicker-blue =
-    .title = Синий
-pdfjs-editor-colorpicker-pink =
-    .title = Розовый
-pdfjs-editor-colorpicker-red =
-    .title = Красный

l10n/sk/viewer.ftl

@@ -128,7 +128,7 @@ pdfjs-document-properties-modification-date = Dátum úpravy:
 #   $date (Date) - the creation/modification date of the PDF file
 #   $time (Time) - the creation/modification time of the PDF file
 pdfjs-document-properties-date-string = { $date }, { $time }
-pdfjs-document-properties-creator = Aplikácia:
+pdfjs-document-properties-creator = Vytvoril:
 pdfjs-document-properties-producer = Tvorca PDF:
 pdfjs-document-properties-version = Verzia PDF:
 pdfjs-document-properties-page-count = Počet strán:
@@ -156,7 +156,7 @@ pdfjs-document-properties-page-size-dimension-name-string = { $width } × { $hei
 
 # The linearization status of the document; usually called "Fast Web View" in
 # English locales of Adobe software.
-pdfjs-document-properties-linearized = Rýchle zobrazovanie z webu:
+pdfjs-document-properties-linearized = Rýchle Web View:
 pdfjs-document-properties-linearized-yes = Áno
 pdfjs-document-properties-linearized-no = Nie
 pdfjs-document-properties-close-button = Zavrieť
@@ -300,28 +300,13 @@ pdfjs-editor-free-text-button =
     .title = Text
 pdfjs-editor-free-text-button-label = Text
 pdfjs-editor-ink-button =
-    .title = Kresliť
+    .title = Kreslenie
 pdfjs-editor-ink-button-label = Kresliť
 pdfjs-editor-stamp-button =
     .title = Pridať alebo upraviť obrázky
 pdfjs-editor-stamp-button-label = Pridať alebo upraviť obrázky
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Zvýrazniť
+    .title = Odstrániť
-pdfjs-editor-highlight-button-label = Zvýrazniť
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Odstrániť kresbu
-pdfjs-editor-remove-freetext-button =
-    .title = Odstrániť text
-pdfjs-editor-remove-stamp-button =
-    .title = Odstrániť obrázok
-pdfjs-editor-remove-highlight-button =
-    .title = Odstrániť zvýraznenie
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Farba
 pdfjs-editor-free-text-size-input = Veľkosť
@@ -331,10 +316,6 @@ pdfjs-editor-ink-opacity-input = Priehľadnosť
 pdfjs-editor-stamp-add-image-button =
     .title = Pridať obrázok
 pdfjs-editor-stamp-add-image-button-label = Pridať obrázok
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Hrúbka
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Zmeňte hrúbku pre zvýrazňovanie iných položiek ako textu
 pdfjs-free-text =
     .aria-label = Textový editor
 pdfjs-free-text-default-content = Začnite písať…
@@ -372,22 +353,3 @@ pdfjs-editor-resizer-label-bottom-right = Pravý dolný roh – zmena veľkosti
 pdfjs-editor-resizer-label-bottom-middle = Stred dole – zmena veľkosti
 pdfjs-editor-resizer-label-bottom-left = Ľavý dolný roh – zmena veľkosti
 pdfjs-editor-resizer-label-middle-left = Vľavo uprostred – zmena veľkosti
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Farba zvýraznenia
-pdfjs-editor-colorpicker-button =
-    .title = Zmeniť farbu
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Výber farieb
-pdfjs-editor-colorpicker-yellow =
-    .title = Žltá
-pdfjs-editor-colorpicker-green =
-    .title = Zelená
-pdfjs-editor-colorpicker-blue =
-    .title = Modrá
-pdfjs-editor-colorpicker-pink =
-    .title = Ružová
-pdfjs-editor-colorpicker-red =
-    .title = Červená

l10n/skr/viewer.ftl

@@ -283,21 +283,12 @@ pdfjs-editor-free-text-button-label = متن
 pdfjs-editor-ink-button =
     .title = چھکو
 pdfjs-editor-ink-button-label = چھکو
-
-## Remove button for the various kind of editor.
-
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = رنگ
 pdfjs-editor-free-text-size-input = سائز
 pdfjs-editor-ink-color-input = رنگ
 pdfjs-editor-ink-thickness-input = ٹھولھ
 pdfjs-editor-ink-opacity-input = دھندلاپن
-pdfjs-editor-stamp-add-image-button =
-    .title = تصویر شامل کرو
-pdfjs-editor-stamp-add-image-button-label = تصویر شامل کرو
 pdfjs-free-text =
     .aria-label = ٹیکسٹ ایڈیٹر
 pdfjs-free-text-default-content = ٹائپنگ شروع کرو …
@@ -312,16 +303,3 @@ pdfjs-ink-canvas =
 ## Editor resizers
 ## This is used in an aria label to help to understand the role of the resizer.
 
-
-## Color picker
-
-pdfjs-editor-colorpicker-yellow =
-    .title = پیلا
-pdfjs-editor-colorpicker-green =
-    .title = ساوا
-pdfjs-editor-colorpicker-blue =
-    .title = نیلا
-pdfjs-editor-colorpicker-pink =
-    .title = گلابی
-pdfjs-editor-colorpicker-red =
-    .title = لال

l10n/sl/viewer.ftl

@@ -305,23 +305,6 @@ pdfjs-editor-ink-button-label = Riši
 pdfjs-editor-stamp-button =
     .title = Dodajanje ali urejanje slik
 pdfjs-editor-stamp-button-label = Dodajanje ali urejanje slik
-pdfjs-editor-highlight-button =
-    .title = Poudarek
-pdfjs-editor-highlight-button-label = Poudarek
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Odstrani risbo
-pdfjs-editor-remove-freetext-button =
-    .title = Odstrani besedilo
-pdfjs-editor-remove-stamp-button =
-    .title = Odstrani sliko
-pdfjs-editor-remove-highlight-button =
-    .title = Odstrani označbo
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Barva
 pdfjs-editor-free-text-size-input = Velikost
@@ -331,10 +314,6 @@ pdfjs-editor-ink-opacity-input = Neprosojnost
 pdfjs-editor-stamp-add-image-button =
     .title = Dodaj sliko
 pdfjs-editor-stamp-add-image-button-label = Dodaj sliko
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Debelina
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Spremeni debelino pri označevanju nebesedilnih elementov
 pdfjs-free-text =
     .aria-label = Urejevalnik besedila
 pdfjs-free-text-default-content = Začnite tipkati …
@@ -372,22 +351,3 @@ pdfjs-editor-resizer-label-bottom-right = Spodnji desni kot – spremeni velikos
 pdfjs-editor-resizer-label-bottom-middle = Spodaj na sredini – spremeni velikost
 pdfjs-editor-resizer-label-bottom-left = Spodnji levi kot – spremeni velikost
 pdfjs-editor-resizer-label-middle-left = Levo na sredini – spremeni velikost
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Barva označbe
-pdfjs-editor-colorpicker-button =
-    .title = Spremeni barvo
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Izbira barve
-pdfjs-editor-colorpicker-yellow =
-    .title = Rumena
-pdfjs-editor-colorpicker-green =
-    .title = Zelena
-pdfjs-editor-colorpicker-blue =
-    .title = Modra
-pdfjs-editor-colorpicker-pink =
-    .title = Roza
-pdfjs-editor-colorpicker-red =
-    .title = Rdeča

l10n/sq/viewer.ftl

@@ -292,22 +292,6 @@ pdfjs-editor-ink-button-label = Vizatoni
 pdfjs-editor-stamp-button =
     .title = Shtoni ose përpunoni figura
 pdfjs-editor-stamp-button-label = Shtoni ose përpunoni figura
-pdfjs-editor-remove-button =
-    .title = Hiqe
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Hiq vizatim
-pdfjs-editor-remove-freetext-button =
-    .title = Hiq tekst
-pdfjs-editor-remove-stamp-button =
-    .title = Hiq figurë
-pdfjs-editor-remove-highlight-button =
-    .title = Hiqe theksimin
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Ngjyrë
 pdfjs-editor-free-text-size-input = Madhësi
@@ -354,22 +338,3 @@ pdfjs-editor-resizer-label-bottom-right = Cepi i poshtëm djathtas — ripërmas
 pdfjs-editor-resizer-label-bottom-middle = Mesi i pjesës poshtë — ripërmasojeni
 pdfjs-editor-resizer-label-bottom-left = Cepi i poshtëm — ripërmasojeni
 pdfjs-editor-resizer-label-middle-left = Majtas në mes — ripërmasojeni
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Ngjyrë theksimi
-pdfjs-editor-colorpicker-button =
-    .title = Ndryshoni ngjyrë
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Zgjedhje ngjyre
-pdfjs-editor-colorpicker-yellow =
-    .title = E verdhë
-pdfjs-editor-colorpicker-green =
-    .title = E gjelbër
-pdfjs-editor-colorpicker-blue =
-    .title = Blu
-pdfjs-editor-colorpicker-pink =
-    .title = Rozë
-pdfjs-editor-colorpicker-red =
-    .title = E kuqe

l10n/sv-SE/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Rita
 pdfjs-editor-stamp-button =
     .title = Lägg till eller redigera bilder
 pdfjs-editor-stamp-button-label = Lägg till eller redigera bilder
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Markera
+    .title = Ta bort
-pdfjs-editor-highlight-button-label = Markera
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Ta bort ritning
-pdfjs-editor-remove-freetext-button =
-    .title = Ta bort text
-pdfjs-editor-remove-stamp-button =
-    .title = Ta bort bild
-pdfjs-editor-remove-highlight-button =
-    .title = Ta bort markering
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Färg
 pdfjs-editor-free-text-size-input = Storlek
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Opacitet
 pdfjs-editor-stamp-add-image-button =
     .title = Lägg till bild
 pdfjs-editor-stamp-add-image-button-label = Lägg till bild
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Tjocklek
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Ändra tjocklek när du markerar andra objekt än text
 pdfjs-free-text =
     .aria-label = Textredigerare
 pdfjs-free-text-default-content = Börja skriva…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Nedre högra hörnet — ändra storle
 pdfjs-editor-resizer-label-bottom-middle = Nedre mitten — ändra storlek
 pdfjs-editor-resizer-label-bottom-left = Nedre vänstra hörnet — ändra storlek
 pdfjs-editor-resizer-label-middle-left = Mitten till vänster — ändra storlek
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Markeringsfärg
-pdfjs-editor-colorpicker-button =
-    .title = Ändra färg
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Färgval
-pdfjs-editor-colorpicker-yellow =
-    .title = Gul
-pdfjs-editor-colorpicker-green =
-    .title = Grön
-pdfjs-editor-colorpicker-blue =
-    .title = Blå
-pdfjs-editor-colorpicker-pink =
-    .title = Rosa
-pdfjs-editor-colorpicker-red =
-    .title = Röd

l10n/tg/viewer.ftl

@@ -301,22 +301,6 @@ pdfjs-editor-ink-button-label = Расмкашӣ
 pdfjs-editor-stamp-button =
     .title = Илова ё таҳрир кардани тасвирҳо
 pdfjs-editor-stamp-button-label = Илова ё таҳрир кардани тасвирҳо
-pdfjs-editor-remove-button =
-    .title = Тоза кардан
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Тоза кардани нақша
-pdfjs-editor-remove-freetext-button =
-    .title = Тоза кардани матн
-pdfjs-editor-remove-stamp-button =
-    .title = Тоза кардани тасвир
-pdfjs-editor-remove-highlight-button =
-    .title = Тоза кардани ҷудокунӣ
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Ранг
 pdfjs-editor-free-text-size-input = Андоза
@@ -363,22 +347,3 @@ pdfjs-editor-resizer-label-bottom-right = Кунҷи рости поён — т
 pdfjs-editor-resizer-label-bottom-middle = Канори миёнаи поён — тағйир додани андоза
 pdfjs-editor-resizer-label-bottom-left = Кунҷи чапи поён — тағйир додани андоза
 pdfjs-editor-resizer-label-middle-left = Канори миёнаи чап — тағйир додани андоза
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Ранги ҷудокунӣ
-pdfjs-editor-colorpicker-button =
-    .title = Иваз кардани ранг
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Интихоби ранг
-pdfjs-editor-colorpicker-yellow =
-    .title = Зард
-pdfjs-editor-colorpicker-green =
-    .title = Сабз
-pdfjs-editor-colorpicker-blue =
-    .title = Кабуд
-pdfjs-editor-colorpicker-pink =
-    .title = Гулобӣ
-pdfjs-editor-colorpicker-red =
-    .title = Сурх

l10n/th/viewer.ftl

@@ -293,23 +293,6 @@ pdfjs-editor-ink-button-label = รูปวาด
 pdfjs-editor-stamp-button =
     .title = เพิ่มหรือแก้ไขภาพ
 pdfjs-editor-stamp-button-label = เพิ่มหรือแก้ไขภาพ
-pdfjs-editor-highlight-button =
-    .title = เน้น
-pdfjs-editor-highlight-button-label = เน้น
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = เอาภาพวาดออก
-pdfjs-editor-remove-freetext-button =
-    .title = เอาข้อความออก
-pdfjs-editor-remove-stamp-button =
-    .title = เอาภาพออก
-pdfjs-editor-remove-highlight-button =
-    .title = เอาการเน้นสีออก
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = สี
 pdfjs-editor-free-text-size-input = ขนาด
@@ -319,10 +302,6 @@ pdfjs-editor-ink-opacity-input = ความทึบ
 pdfjs-editor-stamp-add-image-button =
     .title = เพิ่มภาพ
 pdfjs-editor-stamp-add-image-button-label = เพิ่มภาพ
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = ความหนา
-pdfjs-editor-free-highlight-thickness-title =
-    .title = เปลี่ยนความหนาเมื่อเน้นรายการอื่นๆ ที่ไม่ใช่ข้อความ
 pdfjs-free-text =
     .aria-label = ตัวแก้ไขข้อความ
 pdfjs-free-text-default-content = เริ่มพิมพ์…
@@ -360,22 +339,3 @@ pdfjs-editor-resizer-label-bottom-right = มุมขวาล่าง — ป
 pdfjs-editor-resizer-label-bottom-middle = ตรงกลางด้านล่าง — ปรับขนาด
 pdfjs-editor-resizer-label-bottom-left = มุมซ้ายล่าง — ปรับขนาด
 pdfjs-editor-resizer-label-middle-left = ตรงกลางด้านซ้าย — ปรับขนาด
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = สีเน้น
-pdfjs-editor-colorpicker-button =
-    .title = เปลี่ยนสี
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = ทางเลือกสี
-pdfjs-editor-colorpicker-yellow =
-    .title = เหลือง
-pdfjs-editor-colorpicker-green =
-    .title = เขียว
-pdfjs-editor-colorpicker-blue =
-    .title = น้ำเงิน
-pdfjs-editor-colorpicker-pink =
-    .title = ชมพู
-pdfjs-editor-colorpicker-red =
-    .title = แดง

l10n/tr/viewer.ftl

@@ -301,23 +301,8 @@ pdfjs-editor-ink-button-label = Çiz
 pdfjs-editor-stamp-button =
     .title = Resim ekle veya düzenle
 pdfjs-editor-stamp-button-label = Resim ekle veya düzenle
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Vurgula
+    .title = Kaldır
-pdfjs-editor-highlight-button-label = Vurgula
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Çizimi kaldır
-pdfjs-editor-remove-freetext-button =
-    .title = Metni kaldır
-pdfjs-editor-remove-stamp-button =
-    .title = Resmi kaldır
-pdfjs-editor-remove-highlight-button =
-    .title = Vurgulamayı kaldır
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Renk
 pdfjs-editor-free-text-size-input = Boyut
@@ -327,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Saydamlık
 pdfjs-editor-stamp-add-image-button =
     .title = Resim ekle
 pdfjs-editor-stamp-add-image-button-label = Resim ekle
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Kalınlık
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Metin dışındaki öğeleri vurgularken kalınlığı değiştir
 pdfjs-free-text =
     .aria-label = Metin düzenleyicisi
 pdfjs-free-text-default-content = Yazmaya başlayın…
@@ -368,22 +349,3 @@ pdfjs-editor-resizer-label-bottom-right = Sağ alt köşe — yeniden boyutland
 pdfjs-editor-resizer-label-bottom-middle = Alt orta — yeniden boyutlandır
 pdfjs-editor-resizer-label-bottom-left = Sol alt köşe — yeniden boyutlandır
 pdfjs-editor-resizer-label-middle-left = Orta sol — yeniden boyutlandır
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Vurgu rengi
-pdfjs-editor-colorpicker-button =
-    .title = Rengi değiştir
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Renk seçenekleri
-pdfjs-editor-colorpicker-yellow =
-    .title = Sarı
-pdfjs-editor-colorpicker-green =
-    .title = Yeşil
-pdfjs-editor-colorpicker-blue =
-    .title = Mavi
-pdfjs-editor-colorpicker-pink =
-    .title = Pembe
-pdfjs-editor-colorpicker-red =
-    .title = Kırmızı

l10n/uk/viewer.ftl

@@ -288,7 +288,7 @@ pdfjs-text-annotation-type =
 
 pdfjs-password-label = Введіть пароль для відкриття цього PDF-файла.
 pdfjs-password-invalid = Невірний пароль. Спробуйте ще.
-pdfjs-password-ok-button = OK
+pdfjs-password-ok-button = Гаразд
 pdfjs-password-cancel-button = Скасувати
 pdfjs-web-fonts-disabled = Веб-шрифти вимкнено: неможливо використати вбудовані у PDF шрифти.
 
@@ -303,23 +303,6 @@ pdfjs-editor-ink-button-label = Малювати
 pdfjs-editor-stamp-button =
     .title = Додати чи редагувати зображення
 pdfjs-editor-stamp-button-label = Додати чи редагувати зображення
-pdfjs-editor-highlight-button =
-    .title = Підсвітити
-pdfjs-editor-highlight-button-label = Підсвітити
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Вилучити малюнок
-pdfjs-editor-remove-freetext-button =
-    .title = Вилучити текст
-pdfjs-editor-remove-stamp-button =
-    .title = Вилучити зображення
-pdfjs-editor-remove-highlight-button =
-    .title = Вилучити підсвічування
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Колір
 pdfjs-editor-free-text-size-input = Розмір
@@ -329,10 +312,6 @@ pdfjs-editor-ink-opacity-input = Прозорість
 pdfjs-editor-stamp-add-image-button =
     .title = Додати зображення
 pdfjs-editor-stamp-add-image-button-label = Додати зображення
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Товщина
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Змінюйте товщину під час підсвічування елементів, крім тексту
 pdfjs-free-text =
     .aria-label = Текстовий редактор
 pdfjs-free-text-default-content = Почніть вводити…
@@ -362,30 +341,11 @@ pdfjs-editor-alt-text-textarea =
 ## Editor resizers
 ## This is used in an aria label to help to understand the role of the resizer.
 
-pdfjs-editor-resizer-label-top-left = Верхній лівий кут – зміна розміру
+pdfjs-editor-resizer-label-top-left = Верхній лівий кут — зміна розміру
-pdfjs-editor-resizer-label-top-middle = Вгорі посередині – зміна розміру
+pdfjs-editor-resizer-label-top-middle = Вгорі посередині — зміна розміру
-pdfjs-editor-resizer-label-top-right = Верхній правий кут – зміна розміру
+pdfjs-editor-resizer-label-top-right = Верхній правий кут — зміна розміру
-pdfjs-editor-resizer-label-middle-right = Праворуч посередині – зміна розміру
+pdfjs-editor-resizer-label-middle-right = Праворуч посередині — зміна розміру
-pdfjs-editor-resizer-label-bottom-right = Нижній правий кут – зміна розміру
+pdfjs-editor-resizer-label-bottom-right = Нижній правий кут — зміна розміру
-pdfjs-editor-resizer-label-bottom-middle = Внизу посередині – зміна розміру
+pdfjs-editor-resizer-label-bottom-middle = Внизу посередині — зміна розміру
-pdfjs-editor-resizer-label-bottom-left = Нижній лівий кут – зміна розміру
+pdfjs-editor-resizer-label-bottom-left = Нижній лівий кут — зміна розміру
-pdfjs-editor-resizer-label-middle-left = Ліворуч посередині – зміна розміру
+pdfjs-editor-resizer-label-middle-left = Ліворуч посередині — зміна розміру
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Колір підсвічування
-pdfjs-editor-colorpicker-button =
-    .title = Змінити колір
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Вибір кольору
-pdfjs-editor-colorpicker-yellow =
-    .title = Жовтий
-pdfjs-editor-colorpicker-green =
-    .title = Зелений
-pdfjs-editor-colorpicker-blue =
-    .title = Блакитний
-pdfjs-editor-colorpicker-pink =
-    .title = Рожевий
-pdfjs-editor-colorpicker-red =
-    .title = Червоний

l10n/vi/viewer.ftl

@@ -220,7 +220,7 @@ pdfjs-find-previous-button-label = Trước
 pdfjs-find-next-button =
     .title = Tìm cụm từ ở phần sau
 pdfjs-find-next-button-label = Tiếp
-pdfjs-find-highlight-checkbox = Đánh dấu tất cả
+pdfjs-find-highlight-checkbox = Tô sáng tất cả
 pdfjs-find-match-case-checkbox-label = Phân biệt hoa, thường
 pdfjs-find-match-diacritics-checkbox-label = Khớp dấu phụ
 pdfjs-find-entire-word-checkbox-label = Toàn bộ từ
@@ -293,23 +293,8 @@ pdfjs-editor-ink-button-label = Vẽ
 pdfjs-editor-stamp-button =
     .title = Thêm hoặc chỉnh sửa hình ảnh
 pdfjs-editor-stamp-button-label = Thêm hoặc chỉnh sửa hình ảnh
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = Đánh dấu
+    .title = Xóa
-pdfjs-editor-highlight-button-label = Đánh dấu
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = Xóa bản vẽ
-pdfjs-editor-remove-freetext-button =
-    .title = Xóa văn bản
-pdfjs-editor-remove-stamp-button =
-    .title = Xóa ảnh
-pdfjs-editor-remove-highlight-button =
-    .title = Xóa phần đánh dấu
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = Màu
 pdfjs-editor-free-text-size-input = Kích cỡ
@@ -319,10 +304,6 @@ pdfjs-editor-ink-opacity-input = Độ mờ
 pdfjs-editor-stamp-add-image-button =
     .title = Thêm hình ảnh
 pdfjs-editor-stamp-add-image-button-label = Thêm hình ảnh
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = Độ dày
-pdfjs-editor-free-highlight-thickness-title =
-    .title = Thay đổi độ dày khi đánh dấu các mục không phải là văn bản
 pdfjs-free-text =
     .aria-label = Trình sửa văn bản
 pdfjs-free-text-default-content = Bắt đầu nhập…
@@ -360,22 +341,3 @@ pdfjs-editor-resizer-label-bottom-right = Dưới cùng bên phải — thay đ
 pdfjs-editor-resizer-label-bottom-middle = Ở giữa dưới cùng — thay đổi kích thước
 pdfjs-editor-resizer-label-bottom-left = Góc dưới bên trái — thay đổi kích thước
 pdfjs-editor-resizer-label-middle-left = Ở giữa bên trái — thay đổi kích thước
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = Màu đánh dấu
-pdfjs-editor-colorpicker-button =
-    .title = Thay đổi màu
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = Lựa chọn màu sắc
-pdfjs-editor-colorpicker-yellow =
-    .title = Vàng
-pdfjs-editor-colorpicker-green =
-    .title = Xanh lục
-pdfjs-editor-colorpicker-blue =
-    .title = Xanh dương
-pdfjs-editor-colorpicker-pink =
-    .title = Hồng
-pdfjs-editor-colorpicker-red =
-    .title = Đỏ

l10n/zh-CN/viewer.ftl

@@ -293,23 +293,6 @@ pdfjs-editor-ink-button-label = 绘图
 pdfjs-editor-stamp-button =
     .title = 添加或编辑图像
 pdfjs-editor-stamp-button-label = 添加或编辑图像
-pdfjs-editor-highlight-button =
-    .title = 高亮
-pdfjs-editor-highlight-button-label = 高亮
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = 移除绘图
-pdfjs-editor-remove-freetext-button =
-    .title = 移除文本
-pdfjs-editor-remove-stamp-button =
-    .title = 移除图像
-pdfjs-editor-remove-highlight-button =
-    .title = 移除高亮
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = 颜色
 pdfjs-editor-free-text-size-input = 字号
@@ -319,10 +302,6 @@ pdfjs-editor-ink-opacity-input = 不透明度
 pdfjs-editor-stamp-add-image-button =
     .title = 添加图像
 pdfjs-editor-stamp-add-image-button-label = 添加图像
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = 粗细
-pdfjs-editor-free-highlight-thickness-title =
-    .title = 更改高亮粗细（用于文本以外项目）
 pdfjs-free-text =
     .aria-label = 文本编辑器
 pdfjs-free-text-default-content = 开始输入…
@@ -360,22 +339,3 @@ pdfjs-editor-resizer-label-bottom-right = 调整尺寸 - 右下角
 pdfjs-editor-resizer-label-bottom-middle = 调整大小 - 底部中间
 pdfjs-editor-resizer-label-bottom-left = 调整尺寸 - 左下角
 pdfjs-editor-resizer-label-middle-left = 调整尺寸 - 左侧中间
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = 高亮色
-pdfjs-editor-colorpicker-button =
-    .title = 更改颜色
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = 颜色选择
-pdfjs-editor-colorpicker-yellow =
-    .title = 黄色
-pdfjs-editor-colorpicker-green =
-    .title = 绿色
-pdfjs-editor-colorpicker-blue =
-    .title = 蓝色
-pdfjs-editor-colorpicker-pink =
-    .title = 粉色
-pdfjs-editor-colorpicker-red =
-    .title = 红色

l10n/zh-TW/viewer.ftl

@@ -293,23 +293,8 @@ pdfjs-editor-ink-button-label = 繪圖
 pdfjs-editor-stamp-button =
     .title = 新增或編輯圖片
 pdfjs-editor-stamp-button-label = 新增或編輯圖片
-pdfjs-editor-highlight-button =
+pdfjs-editor-remove-button =
-    .title = 強調
+    .title = 移除
-pdfjs-editor-highlight-button-label = 強調
-
-## Remove button for the various kind of editor.
-
-pdfjs-editor-remove-ink-button =
-    .title = 移除繪圖
-pdfjs-editor-remove-freetext-button =
-    .title = 移除文字
-pdfjs-editor-remove-stamp-button =
-    .title = 移除圖片
-pdfjs-editor-remove-highlight-button =
-    .title = 移除強調範圍
-
-##
-
 # Editor Parameters
 pdfjs-editor-free-text-color-input = 色彩
 pdfjs-editor-free-text-size-input = 大小
@@ -319,10 +304,6 @@ pdfjs-editor-ink-opacity-input = 透​明度
 pdfjs-editor-stamp-add-image-button =
     .title = 新增圖片
 pdfjs-editor-stamp-add-image-button-label = 新增圖片
-# This refers to the thickness of the line used for free highlighting (not bound to text)
-pdfjs-editor-free-highlight-thickness-input = 線條粗細
-pdfjs-editor-free-highlight-thickness-title =
-    .title = 更改強調文字以外的項目時的線條粗細
 pdfjs-free-text =
     .aria-label = 文本編輯器
 pdfjs-free-text-default-content = 開始打字…
@@ -360,22 +341,3 @@ pdfjs-editor-resizer-label-bottom-right = 右下角 — 調整大小
 pdfjs-editor-resizer-label-bottom-middle = 底部中間 — 調整大小
 pdfjs-editor-resizer-label-bottom-left = 左下角 — 調整大小
 pdfjs-editor-resizer-label-middle-left = 中間左方 — 調整大小
-
-## Color picker
-
-# This means "Color used to highlight text"
-pdfjs-editor-highlight-colorpicker-label = 強調色彩
-pdfjs-editor-colorpicker-button =
-    .title = 更改色彩
-pdfjs-editor-colorpicker-dropdown =
-    .aria-label = 色彩選項
-pdfjs-editor-colorpicker-yellow =
-    .title = 黃色
-pdfjs-editor-colorpicker-green =
-    .title = 綠色
-pdfjs-editor-colorpicker-blue =
-    .title = 藍色
-pdfjs-editor-colorpicker-pink =
-    .title = 粉紅色
-pdfjs-editor-colorpicker-red =
-    .title = 紅色

package.json

@@ -2,34 +2,33 @@
   "name": "pdf.js",
   "type": "module",
   "devDependencies": {
-    "@babel/core": "^7.23.9",
+    "@babel/core": "^7.23.3",
-    "@babel/preset-env": "^7.23.9",
+    "@babel/preset-env": "^7.23.3",
-    "@babel/runtime": "^7.23.9",
+    "@babel/runtime": "^7.23.4",
     "@fluent/bundle": "^0.18.0",
     "@fluent/dom": "^0.9.0",
-    "@jazzer.js/core": "^2.1.0",
+    "@javascript-obfuscator/escodegen": "2.3.0",
-    "autoprefixer": "^10.4.17",
+    "acorn": "^8.11.2",
+    "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
-    "caniuse-lite": "^1.0.30001587",
+    "caniuse-lite": "^1.0.30001564",
     "canvas": "^2.11.2",
-    "core-js": "^3.36.0",
+    "core-js": "^3.33.3",
     "cross-env": "^7.0.3",
-    "eslint": "^8.56.0",
+    "eslint": "^8.54.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-fetch-options": "^0.0.5",
     "eslint-plugin-html": "^7.1.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jasmine": "^4.1.3",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-mozilla": "^3.3.2",
     "eslint-plugin-no-unsanitized": "^4.0.2",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.0.1",
-    "eslint-plugin-sort-exports": "^0.9.1",
+    "eslint-plugin-sort-exports": "^0.8.0",
-    "eslint-plugin-unicorn": "^51.0.1",
+    "eslint-plugin-unicorn": "^49.0.0",
-    "globals": "^14.0.0",
+    "globals": "^13.23.0",
     "gulp": "^4.0.2",
-    "gulp-cli": "^2.3.0",
+    "gulp-postcss": "^9.0.1",
-    "gulp-postcss": "^10.0.0",
     "gulp-rename": "^2.0.0",
     "gulp-replace": "^1.1.4",
     "gulp-zip": "^6.0.0",
@@ -38,28 +37,28 @@
     "jstransformer-markdown-it": "^3.0.0",
     "merge-stream": "^2.0.0",
     "mkdirp": "^3.0.1",
-    "needle": "^3.3.1",
+    "needle": "^3.2.0",
     "path2d-polyfill": "^2.0.1",
     "pngjs": "^7.0.0",
-    "postcss": "^8.4.35",
+    "postcss": "^8.4.31",
-    "postcss-dark-theme-class": "^1.2.1",
+    "postcss-dark-theme-class": "^1.0.0",
-    "postcss-dir-pseudo-class": "^8.0.1",
+    "postcss-dir-pseudo-class": "^8.0.0",
-    "postcss-discard-comments": "^6.0.1",
+    "postcss-discard-comments": "^6.0.0",
-    "postcss-nesting": "^12.0.2",
+    "postcss-nesting": "^12.0.1",
-    "prettier": "^3.2.5",
+    "prettier": "^3.1.0",
-    "puppeteer": "^22.3.0",
+    "puppeteer": "^21.5.2",
     "rimraf": "^3.0.2",
     "streamqueue": "^1.1.2",
-    "stylelint": "^16.2.1",
+    "stylelint": "^15.11.0",
-    "stylelint-prettier": "^5.0.0",
+    "stylelint-prettier": "^4.1.0",
-    "terser-webpack-plugin": "^5.3.10",
+    "terser": "^5.24.0",
     "through2": "^4.0.2",
     "tsc-alias": "^1.8.8",
     "ttest": "^4.0.0",
-    "typescript": "^5.3.3",
+    "typescript": "^5.3.2",
     "typogr": "^0.6.8",
     "vinyl": "^3.0.0",
-    "webpack": "^5.90.2",
+    "webpack": "^5.89.0",
     "webpack-stream": "^7.0.0",
     "wintersmith": "^2.5.0",
     "yargs": "^17.7.2"

pdfjs.config

@@ -1,5 +1,5 @@
 {
-  "stableVersion": "4.0.379",
+  "stableVersion": "4.0.189",
-  "baseVersion": "56ca2fd65858bf0045734fae11c295e290728463",
+  "baseVersion": "0edc490e1beeb9fea62162738d9effef30c70af7",
-  "versionPrefix": "4.1."
+  "versionPrefix": "4.0."
 }

src/core/annotation.js

@@ -79,7 +79,6 @@ class AnnotationFactory {
       // with "GoToE" actions, from throwing and thus breaking parsing:
       pdfManager.ensureCatalog("attachments"),
     ]).then(
-      // eslint-disable-next-line arrow-body-style
       ([acroForm, xfaDatasets, structTreeRoot, baseUrl, attachments]) => {
         return {
           pdfManager,
@@ -356,19 +355,13 @@ class AnnotationFactory {
           );
           break;
         case AnnotationEditorType.HIGHLIGHT:
-          if (annotation.quadPoints) {
+          promises.push(
-            promises.push(
+            HighlightAnnotation.createNewAnnotation(
-              HighlightAnnotation.createNewAnnotation(
+              xref,
-                xref,
+              annotation,
-                annotation,
+              dependencies
-                dependencies
+            )
-              )
+          );
-            );
-          } else {
-            promises.push(
-              InkAnnotation.createNewAnnotation(xref, annotation, dependencies)
-            );
-          }
           break;
         case AnnotationEditorType.INK:
           promises.push(
@@ -446,29 +439,16 @@ class AnnotationFactory {
           );
           break;
         case AnnotationEditorType.HIGHLIGHT:
-          if (annotation.quadPoints) {
+          promises.push(
-            promises.push(
+            HighlightAnnotation.createNewPrintAnnotation(
-              HighlightAnnotation.createNewPrintAnnotation(
+              annotationGlobals,
-                annotationGlobals,
+              xref,
-                xref,
+              annotation,
-                annotation,
+              {
-                {
+                evaluatorOptions: options,
-                  evaluatorOptions: options,
+              }
-                }
+            )
-              )
+          );
-            );
-          } else {
-            promises.push(
-              InkAnnotation.createNewPrintAnnotation(
-                annotationGlobals,
-                xref,
-                annotation,
-                {
-                  evaluatorOptions: options,
-                }
-              )
-            );
-          }
           break;
         case AnnotationEditorType.INK:
           promises.push(
@@ -1019,15 +999,12 @@ class Annotation {
     }
     if (borderStyle.has("BS")) {
       const dict = borderStyle.get("BS");
+      const dictType = dict.get("Type");
 
-      if (dict instanceof Dict) {
+      if (!dictType || isName(dictType, "Border")) {
-        const dictType = dict.get("Type");
+        this.borderStyle.setWidth(dict.get("W"), this.rectangle);
-
+        this.borderStyle.setStyle(dict.get("S"));
-        if (!dictType || isName(dictType, "Border")) {
+        this.borderStyle.setDashArray(dict.getArray("D"));
-          this.borderStyle.setWidth(dict.get("W"), this.rectangle);
-          this.borderStyle.setStyle(dict.get("S"));
-          this.borderStyle.setDashArray(dict.getArray("D"));
-        }
       }
     } else if (borderStyle.has("Border")) {
       const array = borderStyle.getArray("Border");
@@ -1215,7 +1192,7 @@ class Annotation {
           firstPosition ||= item.transform.slice(-2);
           buffer.push(item.str);
           if (item.hasEOL) {
-            text.push(buffer.join("").trimEnd());
+            text.push(buffer.join(""));
             buffer.length = 0;
           }
         }
@@ -1227,38 +1204,31 @@ class Annotation {
       task,
       resources,
       includeMarkedContent: true,
-      keepWhiteSpace: true,
       sink,
       viewBox,
     });
     this.reset();
 
     if (buffer.length) {
-      text.push(buffer.join("").trimEnd());
+      text.push(buffer.join(""));
     }
 
     if (text.length > 1 || text[0]) {
       const appearanceDict = this.appearance.dict;
-      this.data.textPosition = this._transformPoint(
+      const bbox = appearanceDict.getArray("BBox") || [0, 0, 1, 1];
-        firstPosition,
+      const matrix = appearanceDict.getArray("Matrix") || [1, 0, 0, 1, 0, 0];
-        appearanceDict.getArray("BBox"),
+      const rect = this.data.rect;
-        appearanceDict.getArray("Matrix")
+      const transform = getTransformMatrix(rect, bbox, matrix);
-      );
+      transform[4] -= rect[0];
+      transform[5] -= rect[1];
+      firstPosition = Util.applyTransform(firstPosition, transform);
+      firstPosition = Util.applyTransform(firstPosition, matrix);
+
+      this.data.textPosition = firstPosition;
       this.data.textContent = text;
     }
   }
 
-  _transformPoint(coords, bbox, matrix) {
-    const { rect } = this.data;
-    bbox ||= [0, 0, 1, 1];
-    matrix ||= [1, 0, 0, 1, 0, 0];
-    const transform = getTransformMatrix(rect, bbox, matrix);
-    transform[4] -= rect[0];
-    transform[5] -= rect[1];
-    coords = Util.applyTransform(coords, transform);
-    return Util.applyTransform(coords, matrix);
-  }
-
   /**
    * Get field data for usage in JS sandbox.
    *
@@ -2134,8 +2104,11 @@ class WidgetAnnotation extends Annotation {
       value,
     };
 
-    const encoder = val =>
+    const encoder = val => {
-      isAscii(val) ? val : stringToUTF16String(val, /* bigEndian = */ true);
+      return isAscii(val)
+        ? val
+        : stringToUTF16String(val, /* bigEndian = */ true);
+    };
     dict.set("V", Array.isArray(value) ? value.map(encoder) : encoder(value));
     this.amendSavedDict(annotationStorage, dict);
 
@@ -3684,10 +3657,6 @@ class LinkAnnotation extends Annotation {
     const { dict, annotationGlobals } = params;
     this.data.annotationType = AnnotationType.LINK;
 
-    // A link is never rendered on the main canvas so we must render its HTML
-    // version.
-    this.data.noHTML = false;
-
     const quadPoints = getQuadPoints(dict, this.rectangle);
     if (quadPoints) {
       this.data.quadPoints = quadPoints;
@@ -3795,9 +3764,7 @@ class FreeTextAnnotation extends MarkupAnnotation {
     const { evaluatorOptions, xref } = params;
     this.data.annotationType = AnnotationType.FREETEXT;
     this.setDefaultAppearance(params);
-    this._hasAppearance = !!this.appearance;
+    if (this.appearance) {
-
-    if (this._hasAppearance) {
       const { fontColor, fontSize } = parseAppearanceStream(
         this.appearance,
         evaluatorOptions,
@@ -3805,42 +3772,29 @@ class FreeTextAnnotation extends MarkupAnnotation {
       );
       this.data.defaultAppearanceData.fontColor = fontColor;
       this.data.defaultAppearanceData.fontSize = fontSize || 10;
-    } else {
+    } else if (this._isOffscreenCanvasSupported) {
+      const strokeAlpha = params.dict.get("CA");
+      const fakeUnicodeFont = new FakeUnicodeFont(xref, "sans-serif");
       this.data.defaultAppearanceData.fontSize ||= 10;
       const { fontColor, fontSize } = this.data.defaultAppearanceData;
-      if (this._contents.str) {
+      this.appearance = fakeUnicodeFont.createAppearance(
-        this.data.textContent = this._contents.str
+        this._contents.str,
-          .split(/\r\n?|\n/)
+        this.rectangle,
-          .map(line => line.trimEnd());
+        this.rotation,
-        const { coords, bbox, matrix } = FakeUnicodeFont.getFirstPositionInfo(
+        fontSize,
-          this.rectangle,
+        fontColor,
-          this.rotation,
+        strokeAlpha
-          fontSize
+      );
-        );
+      this._streams.push(this.appearance, FakeUnicodeFont.toUnicodeStream);
-        this.data.textPosition = this._transformPoint(coords, bbox, matrix);
+    } else {
-      }
+      warn(
-      if (this._isOffscreenCanvasSupported) {
+        "FreeTextAnnotation: OffscreenCanvas is not supported, annotation may not render correctly."
-        const strokeAlpha = params.dict.get("CA");
+      );
-        const fakeUnicodeFont = new FakeUnicodeFont(xref, "sans-serif");
-        this.appearance = fakeUnicodeFont.createAppearance(
-          this._contents.str,
-          this.rectangle,
-          this.rotation,
-          fontSize,
-          fontColor,
-          strokeAlpha
-        );
-        this._streams.push(this.appearance);
-      } else {
-        warn(
-          "FreeTextAnnotation: OffscreenCanvas is not supported, annotation may not render correctly."
-        );
-      }
     }
   }
 
   get hasTextContent() {
-    return this._hasAppearance;
+    return !!this.appearance;
   }
 
   static createNewDict(annotation, xref, { apRef, ap }) {
@@ -4361,25 +4315,19 @@ class InkAnnotation extends MarkupAnnotation {
   }
 
   static createNewDict(annotation, xref, { apRef, ap }) {
-    const { color, opacity, paths, outlines, rect, rotation, thickness } =
+    const { color, opacity, paths, rect, rotation, thickness } = annotation;
-      annotation;
     const ink = new Dict(xref);
     ink.set("Type", Name.get("Annot"));
     ink.set("Subtype", Name.get("Ink"));
     ink.set("CreationDate", `D:${getModificationDate()}`);
     ink.set("Rect", rect);
-    ink.set("InkList", outlines?.points || paths.map(p => p.points));
+    ink.set(
+      "InkList",
+      paths.map(p => p.points)
+    );
     ink.set("F", 4);
     ink.set("Rotate", rotation);
 
-    if (outlines) {
-      // Free highlight.
-      // There's nothing about this in the spec, but it's used when highlighting
-      // in Edge's viewer. Acrobat takes into account this parameter to indicate
-      // that the Ink is used for highlighting.
-      ink.set("IT", Name.get("InkHighlight"));
-    }
-
     // Line thickness.
     const bs = new Dict(xref);
     ink.set("BS", bs);
@@ -4407,13 +4355,6 @@ class InkAnnotation extends MarkupAnnotation {
   }
 
   static async createNewAppearanceStream(annotation, xref, params) {
-    if (annotation.outlines) {
-      return this.createNewAppearanceStreamForHighlight(
-        annotation,
-        xref,
-        params
-      );
-    }
     const { color, rect, paths, thickness, opacity } = annotation;
 
     const appearanceBuffer = [
@@ -4431,20 +4372,14 @@ class InkAnnotation extends MarkupAnnotation {
       buffer.push(
         `${numberToString(bezier[0])} ${numberToString(bezier[1])} m`
       );
-      if (bezier.length === 2) {
+      for (let i = 2, ii = bezier.length; i < ii; i += 6) {
-        buffer.push(
+        const curve = bezier
-          `${numberToString(bezier[0])} ${numberToString(bezier[1])} l S`
+          .slice(i, i + 6)
-        );
+          .map(numberToString)
-      } else {
+          .join(" ");
-        for (let i = 2, ii = bezier.length; i < ii; i += 6) {
+        buffer.push(`${curve} c`);
-          const curve = bezier
-            .slice(i, i + 6)
-            .map(numberToString)
-            .join(" ");
-          buffer.push(`${curve} c`);
-        }
-        buffer.push("S");
       }
+      buffer.push("S");
       appearanceBuffer.push(buffer.join("\n"));
     }
     const appearance = appearanceBuffer.join("\n");
@@ -4472,65 +4407,6 @@ class InkAnnotation extends MarkupAnnotation {
 
     return ap;
   }
-
-  static async createNewAppearanceStreamForHighlight(annotation, xref, params) {
-    const {
-      color,
-      rect,
-      outlines: { outline },
-      opacity,
-    } = annotation;
-    const appearanceBuffer = [
-      `${getPdfColor(color, /* isFill */ true)}`,
-      "/R0 gs",
-    ];
-
-    appearanceBuffer.push(
-      `${numberToString(outline[4])} ${numberToString(outline[5])} m`
-    );
-    for (let i = 6, ii = outline.length; i < ii; i += 6) {
-      if (isNaN(outline[i]) || outline[i] === null) {
-        appearanceBuffer.push(
-          `${numberToString(outline[i + 4])} ${numberToString(
-            outline[i + 5]
-          )} l`
-        );
-      } else {
-        const curve = outline
-          .slice(i, i + 6)
-          .map(numberToString)
-          .join(" ");
-        appearanceBuffer.push(`${curve} c`);
-      }
-    }
-    appearanceBuffer.push("h f");
-    const appearance = appearanceBuffer.join("\n");
-
-    const appearanceStreamDict = new Dict(xref);
-    appearanceStreamDict.set("FormType", 1);
-    appearanceStreamDict.set("Subtype", Name.get("Form"));
-    appearanceStreamDict.set("Type", Name.get("XObject"));
-    appearanceStreamDict.set("BBox", rect);
-    appearanceStreamDict.set("Length", appearance.length);
-
-    const resources = new Dict(xref);
-    const extGState = new Dict(xref);
-    resources.set("ExtGState", extGState);
-    appearanceStreamDict.set("Resources", resources);
-    const r0 = new Dict(xref);
-    extGState.set("R0", r0);
-    r0.set("BM", Name.get("Multiply"));
-
-    if (opacity !== 1) {
-      r0.set("ca", opacity);
-      r0.set("Type", Name.get("ExtGState"));
-    }
-
-    const ap = new StringStream(appearance);
-    ap.dict = appearanceStreamDict;
-
-    return ap;
-  }
 }
 
 class HighlightAnnotation extends MarkupAnnotation {
@@ -4826,7 +4702,9 @@ class StampAnnotation extends MarkupAnnotation {
 
     const jpegBufferPromise = canvas
       .convertToBlob({ type: "image/jpeg", quality: 1 })
-      .then(blob => blob.arrayBuffer());
+      .then(blob => {
+        return blob.arrayBuffer();
+      });
 
     const xobjectName = Name.get("XObject");
     const imageName = Name.get("Image");
@@ -4964,5 +4842,4 @@ export {
   getQuadPoints,
   MarkupAnnotation,
   PopupAnnotation,
-  WidgetAnnotation,
 };

src/core/catalog.js

@@ -445,10 +445,20 @@ class Catalog {
           continue;
         }
         groupRefs.put(groupRef);
-
+        const group = this.xref.fetch(groupRef);
-        groups.push(this.#readOptionalContentGroup(groupRef));
+        groups.push({
+          id: groupRef.toString(),
+          name:
+            typeof group.get("Name") === "string"
+              ? stringToPDFString(group.get("Name"))
+              : null,
+          intent:
+            typeof group.get("Intent") === "string"
+              ? stringToPDFString(group.get("Intent"))
+              : null,
+        });
       }
-      config = this.#readOptionalContentConfig(defaultConfig, groupRefs);
+      config = this._readOptionalContentConfig(defaultConfig, groupRefs);
       config.groups = groups;
     } catch (ex) {
       if (ex instanceof MissingDataException) {
@@ -459,65 +469,7 @@ class Catalog {
     return shadow(this, "optionalContentConfig", config);
   }
 
-  #readOptionalContentGroup(groupRef) {
+  _readOptionalContentConfig(config, contentGroupRefs) {
-    const group = this.xref.fetch(groupRef);
-    const obj = {
-      id: groupRef.toString(),
-      name: null,
-      intent: null,
-      usage: {
-        print: null,
-        view: null,
-      },
-    };
-
-    const name = group.get("Name");
-    if (typeof name === "string") {
-      obj.name = stringToPDFString(name);
-    }
-
-    let intent = group.getArray("Intent");
-    if (!Array.isArray(intent)) {
-      intent = [intent];
-    }
-    if (intent.every(i => i instanceof Name)) {
-      obj.intent = intent.map(i => i.name);
-    }
-
-    const usage = group.get("Usage");
-    if (!(usage instanceof Dict)) {
-      return obj;
-    }
-    const usageObj = obj.usage;
-
-    const print = usage.get("Print");
-    if (print instanceof Dict) {
-      const printState = print.get("PrintState");
-      if (printState instanceof Name) {
-        switch (printState.name) {
-          case "ON":
-          case "OFF":
-            usageObj.print = { printState: printState.name };
-        }
-      }
-    }
-
-    const view = usage.get("View");
-    if (view instanceof Dict) {
-      const viewState = view.get("ViewState");
-      if (viewState instanceof Name) {
-        switch (viewState.name) {
-          case "ON":
-          case "OFF":
-            usageObj.view = { viewState: viewState.name };
-        }
-      }
-    }
-
-    return obj;
-  }
-
-  #readOptionalContentConfig(config, contentGroupRefs) {
     function parseOnOff(refs) {
       const onParsed = [];
       if (Array.isArray(refs)) {
@@ -941,13 +893,14 @@ class Catalog {
         case "PrintPageRange":
           // The number of elements must be even.
           if (Array.isArray(value) && value.length % 2 === 0) {
-            const isValid = value.every(
+            const isValid = value.every((page, i, arr) => {
-              (page, i, arr) =>
+              return (
                 Number.isInteger(page) &&
                 page > 0 &&
                 (i === 0 || page >= arr[i - 1]) &&
                 page <= this.numPages
-            );
+              );
+            });
             if (isValid) {
               prefValue = value;
             }

src/core/cmap.js

@@ -691,9 +691,9 @@ async function createBuiltInCMap(name, fetchBuiltInCMap) {
   const cMap = new CMap(true);
 
   if (compressionType === CMapCompressionType.BINARY) {
-    return new BinaryCMapReader().process(cMapData, cMap, useCMap =>
+    return new BinaryCMapReader().process(cMapData, cMap, useCMap => {
-      extendCMap(cMap, fetchBuiltInCMap, useCMap)
+      return extendCMap(cMap, fetchBuiltInCMap, useCMap);
-    );
+    });
   }
   if (compressionType === CMapCompressionType.NONE) {
     const lexer = new Lexer(new Stream(cMapData));

src/core/core_utils.js

@@ -386,17 +386,6 @@ const XMLEntities = {
   /* ' */ 0x27: "'",
 };
 
-function* codePointIter(str) {
-  for (let i = 0, ii = str.length; i < ii; i++) {
-    const char = str.codePointAt(i);
-    if (char > 0xd7ff && (char < 0xe000 || char > 0xfffd)) {
-      // char is represented by two u16
-      i++;
-    }
-    yield char;
-  }
-}
-
 function encodeToXmlString(str) {
   const buffer = [];
   let start = 0;
@@ -611,22 +600,8 @@ function getRotationMatrix(rotation, width, height) {
   }
 }
 
-/**
- * Get the number of bytes to use to represent the given positive integer.
- * If n is zero, the function returns 0 which means that we don't need to waste
- * a byte to represent it.
- * @param {number} x - a positive integer.
- * @returns {number}
- */
-function getSizeInBytes(x) {
-  // n bits are required for numbers up to 2^n - 1.
-  // So for a number x, we need ceil(log2(1 + x)) bits.
-  return Math.ceil(Math.ceil(Math.log2(1 + x)) / 8);
-}
-
 export {
   arrayBuffersToBytes,
-  codePointIter,
   collectActions,
   encodeToXmlString,
   escapePDFName,
@@ -635,7 +610,6 @@ export {
   getLookupTableFactory,
   getNewAnnotationsMap,
   getRotationMatrix,
-  getSizeInBytes,
   isAscii,
   isWhiteSpace,
   log2,

src/core/default_appearance.js

@@ -13,14 +13,13 @@
  * limitations under the License.
  */
 
+import { Dict, Name } from "./primitives.js";
 import {
-  codePointIter,
   escapePDFName,
   getRotationMatrix,
   numberToString,
   stringToUTF16HexString,
 } from "./core_utils.js";
-import { Dict, Name } from "./primitives.js";
 import {
   LINE_DESCENT_FACTOR,
   LINE_FACTOR,
@@ -252,6 +251,35 @@ class FakeUnicodeFont {
     );
   }
 
+  get toUnicodeRef() {
+    if (!FakeUnicodeFont._toUnicodeRef) {
+      const toUnicode = `/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (Adobe)
+/Ordering (UCS) /Supplement 0 >> def
+/CMapName /Adobe-Identity-UCS def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+1 beginbfrange
+<0000> <FFFF> <0000>
+endbfrange
+endcmap CMapName currentdict /CMap defineresource pop end end`;
+      const toUnicodeStream = (FakeUnicodeFont.toUnicodeStream =
+        new StringStream(toUnicode));
+      const toUnicodeDict = new Dict(this.xref);
+      toUnicodeStream.dict = toUnicodeDict;
+      toUnicodeDict.set("Length", toUnicode.length);
+      FakeUnicodeFont._toUnicodeRef =
+        this.xref.getNewPersistentRef(toUnicodeStream);
+    }
+
+    return FakeUnicodeFont._toUnicodeRef;
+  }
+
   get fontDescriptorRef() {
     if (!FakeUnicodeFont._fontDescriptorRef) {
       const fontDescriptor = new Dict(this.xref);
@@ -322,7 +350,7 @@ class FakeUnicodeFont {
     baseFont.set("Subtype", Name.get("Type0"));
     baseFont.set("Encoding", Name.get("Identity-H"));
     baseFont.set("DescendantFonts", [this.descendantFontRef]);
-    baseFont.set("ToUnicode", Name.get("Identity-H"));
+    baseFont.set("ToUnicode", this.toUnicodeRef);
 
     return this.xref.getNewPersistentRef(baseFont);
   }
@@ -362,26 +390,6 @@ class FakeUnicodeFont {
     return this.resources;
   }
 
-  static getFirstPositionInfo(rect, rotation, fontSize) {
-    // Get the position of the first char in the rect.
-    const [x1, y1, x2, y2] = rect;
-    let w = x2 - x1;
-    let h = y2 - y1;
-
-    if (rotation % 180 !== 0) {
-      [w, h] = [h, w];
-    }
-    const lineHeight = LINE_FACTOR * fontSize;
-    const lineDescent = LINE_DESCENT_FACTOR * fontSize;
-
-    return {
-      coords: [0, h + lineDescent - lineHeight],
-      bbox: [0, 0, w, h],
-      matrix:
-        rotation !== 0 ? getRotationMatrix(rotation, h, lineHeight) : undefined,
-    };
-  }
-
   createAppearance(text, rect, rotation, fontSize, bgColor, strokeAlpha) {
     const ctx = this._createContext();
     const lines = [];
@@ -392,8 +400,8 @@ class FakeUnicodeFont {
       // languages, like arabic, it'd be wrong because of ligatures.
       const lineWidth = ctx.measureText(line).width;
       maxWidth = Math.max(maxWidth, lineWidth);
-      for (const code of codePointIter(line)) {
+      for (const char of line.split("")) {
-        const char = String.fromCodePoint(code);
+        const code = char.charCodeAt(0);
         let width = this.widths.get(code);
         if (width === undefined) {
           const metrics = ctx.measureText(char);

src/core/document.js

@@ -30,11 +30,7 @@ import {
   Util,
   warn,
 } from "../shared/util.js";
-import {
+import { AnnotationFactory, PopupAnnotation } from "./annotation.js";
-  AnnotationFactory,
-  PopupAnnotation,
-  WidgetAnnotation,
-} from "./annotation.js";
 import {
   collectActions,
   getInheritableProperty,
@@ -770,26 +766,19 @@ class Page {
         }
 
         const sortedAnnotations = [];
-        let popupAnnotations, widgetAnnotations;
+        let popupAnnotations;
         // Ensure that PopupAnnotations are handled last, since they depend on
         // their parent Annotation in the display layer; fixes issue 11362.
         for (const annotation of await Promise.all(annotationPromises)) {
           if (!annotation) {
             continue;
           }
-          if (annotation instanceof WidgetAnnotation) {
-            (widgetAnnotations ||= []).push(annotation);
-            continue;
-          }
           if (annotation instanceof PopupAnnotation) {
             (popupAnnotations ||= []).push(annotation);
             continue;
           }
           sortedAnnotations.push(annotation);
         }
-        if (widgetAnnotations) {
-          sortedAnnotations.push(...widgetAnnotations);
-        }
         if (popupAnnotations) {
           sortedAnnotations.push(...popupAnnotations);
         }
@@ -941,14 +930,7 @@ class PDFDocument {
       // Find the end of the first object.
       stream.reset();
       if (find(stream, ENDOBJ_SIGNATURE)) {
-        stream.skip(6);
+        startXRef = stream.pos + 6 - stream.start;
-
-        let ch = stream.peekByte();
-        while (isWhiteSpace(ch)) {
-          stream.pos++;
-          ch = stream.peekByte();
-        }
-        startXRef = stream.pos - stream.start;
       }
     } else {
       // Find `startxref` by checking backwards from the end of the file.
@@ -1595,7 +1577,6 @@ class PDFDocument {
     } else {
       promise = catalog.getPageDict(pageIndex);
     }
-    // eslint-disable-next-line arrow-body-style
     promise = promise.then(([pageDict, ref]) => {
       return new Page({
         pdfManager: this.pdfManager,