From b6d89ffa9c1f28b2c1f584c4fa8c309b551f2272 Mon Sep 17 00:00:00 2001
From: Tim van der Meij <timvandermeij@gmail.com>
Date: Sat, 25 Aug 2018 16:21:27 +0200
Subject: [PATCH 1/3] Update translations

---
 l10n/bg/viewer.properties    |  7 +++++++
 l10n/de/viewer.properties    | 14 ++++++++++++++
 l10n/eo/viewer.properties    |  9 +++++++++
 l10n/es-ES/viewer.properties |  1 +
 l10n/fi/viewer.properties    |  1 +
 l10n/gu-IN/viewer.properties |  7 +++++++
 l10n/ltg/viewer.properties   | 19 +++++++++++++++++++
 l10n/oc/viewer.properties    |  4 ++++
 l10n/pl/viewer.properties    |  6 +++---
 l10n/sl/viewer.properties    |  8 ++++++++
 l10n/ur/viewer.properties    |  1 +
 11 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/l10n/bg/viewer.properties b/l10n/bg/viewer.properties
index 6285338a0..00cabc3c9 100644
--- a/l10n/bg/viewer.properties
+++ b/l10n/bg/viewer.properties
@@ -69,6 +69,8 @@ scroll_vertical.title=Използване на вертикално плъзг
 scroll_vertical_label=Вертикално плъзгане
 scroll_horizontal.title=Използване на хоризонтално
 scroll_horizontal_label=Хоризонтално плъзгане
+scroll_wrapped.title=Използване на мащабируемо плъзгане
+scroll_wrapped_label=Мащабируемо плъзгане
 
 spread_none.title=Режимът на сдвояване е изключен
 spread_none_label=Без сдвояване
@@ -118,6 +120,11 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 # "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
 # the size, respectively their unit of measurement, name, and orientation, of the (current) page.
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Бърз преглед:
+document_properties_linearized_yes=Да
+document_properties_linearized_no=Не
 document_properties_close=Затваряне
 
 print_progress_message=Подготвяне на документа за отпечатване…
diff --git a/l10n/de/viewer.properties b/l10n/de/viewer.properties
index 3453a9b62..e8723d4cc 100644
--- a/l10n/de/viewer.properties
+++ b/l10n/de/viewer.properties
@@ -65,6 +65,20 @@ cursor_text_select_tool_label=Textauswahl-Werkzeug
 cursor_hand_tool.title=Hand-Werkzeug aktivieren
 cursor_hand_tool_label=Hand-Werkzeug
 
+scroll_vertical.title=Seiten übereinander anordnen
+scroll_vertical_label=Vertikale Seitenanordnung
+scroll_horizontal.title=Seiten nebeneinander anordnen
+scroll_horizontal_label=Horizontale Seitenanordnung
+scroll_wrapped.title=Seiten neben- und übereinander anordnen, anhängig vom Platz
+scroll_wrapped_label=Kombinierte Seitenanordnung
+
+spread_none.title=Seiten nicht nebeneinander anzeigen
+spread_none_label=Einzelne Seiten
+spread_odd.title=Jeweils eine ungerade und eine gerade Seite nebeneinander anzeigen
+spread_odd_label=Ungerade + gerade Seite
+spread_even.title=Jeweils eine gerade und eine ungerade Seite nebeneinander anzeigen
+spread_even_label=Gerade + ungerade Seite
+
 # Document properties dialog box
 document_properties.title=Dokumenteigenschaften
 document_properties_label=Dokumenteigenschaften…
diff --git a/l10n/eo/viewer.properties b/l10n/eo/viewer.properties
index e953e604a..ebd1a46ce 100644
--- a/l10n/eo/viewer.properties
+++ b/l10n/eo/viewer.properties
@@ -72,6 +72,12 @@ scroll_horizontal_label=Horizontala ŝovado
 scroll_wrapped.title=Uzi ambaŭdirektan ŝovadon
 scroll_wrapped_label=Ambaŭdirekta ŝovado
 
+spread_none.title=Ne montri paĝojn po du
+spread_none_label=Unupaĝa vido
+spread_odd.title=Kunigi paĝojn komencante per nepara paĝo
+spread_odd_label=Po du paĝoj, neparaj maldekstre
+spread_even.title=Kunigi paĝojn komencante per para paĝo
+spread_even_label=Po du paĝoj, paraj maldekstre
 
 # Document properties dialog box
 document_properties.title=Atributoj de dokumento…
@@ -116,6 +122,9 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Rapida tekstaĵa vido:
+document_properties_linearized_yes=Jes
+document_properties_linearized_no=Ne
 document_properties_close=Fermi
 
 print_progress_message=Preparo de dokumento por presi ĝin …
diff --git a/l10n/es-ES/viewer.properties b/l10n/es-ES/viewer.properties
index 02c7f885f..8b4d68c15 100644
--- a/l10n/es-ES/viewer.properties
+++ b/l10n/es-ES/viewer.properties
@@ -122,6 +122,7 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Vista rápida de la web:
 document_properties_linearized_yes=Sí
 document_properties_linearized_no=No
 document_properties_close=Cerrar
diff --git a/l10n/fi/viewer.properties b/l10n/fi/viewer.properties
index dc0c44de9..7f19d3f62 100644
--- a/l10n/fi/viewer.properties
+++ b/l10n/fi/viewer.properties
@@ -122,6 +122,7 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Nopea web-katselu:
 document_properties_linearized_yes=Kyllä
 document_properties_linearized_no=Ei
 document_properties_close=Sulje
diff --git a/l10n/gu-IN/viewer.properties b/l10n/gu-IN/viewer.properties
index aff600b8a..f635027de 100644
--- a/l10n/gu-IN/viewer.properties
+++ b/l10n/gu-IN/viewer.properties
@@ -67,10 +67,16 @@ cursor_hand_tool_label=હેન્ડ ટૂલ
 
 scroll_vertical.title=ઊભી સ્ક્રોલિંગનો ઉપયોગ કરો
 scroll_vertical_label=ઊભી સ્ક્રોલિંગ
+scroll_horizontal.title=આડી સ્ક્રોલિંગનો ઉપયોગ કરો
+scroll_horizontal_label=આડી સ્ક્રોલિંગ
+scroll_wrapped.title=આવરિત સ્ક્રોલિંગનો ઉપયોગ કરો
+scroll_wrapped_label=આવરિત સ્ક્રોલિંગ
 
 spread_none.title=પૃષ્ઠ સ્પ્રેડમાં જોડાવશો નહીં
 spread_none_label=કોઈ સ્પ્રેડ નથી
 spread_odd.title=એકી-ક્રમાંકિત પૃષ્ઠો સાથે પ્રારંભ થતાં પૃષ્ઠ સ્પ્રેડમાં જોડાઓ
+spread_odd_label=એકી સ્પ્રેડ્સ
+spread_even.title=નંબર-ક્રમાંકિત પૃષ્ઠોથી શરૂ થતાં પૃષ્ઠ સ્પ્રેડમાં જોડાઓ
 
 # Document properties dialog box
 document_properties.title=દસ્તાવેજ ગુણધર્મો…
@@ -115,6 +121,7 @@ document_properties_page_size_dimension_string=
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
 # LOCALIZATION NOTE (document_properties_linearized): The linearization status of
 # the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=ઝડપી વૅબ દૃશ્ય:
 document_properties_linearized_yes=હા
 document_properties_linearized_no=ના
 document_properties_close=બંધ કરો
diff --git a/l10n/ltg/viewer.properties b/l10n/ltg/viewer.properties
index 84f130061..ecdb72352 100644
--- a/l10n/ltg/viewer.properties
+++ b/l10n/ltg/viewer.properties
@@ -65,6 +65,20 @@ cursor_text_select_tool_label=Teksta izvieles reiks
 cursor_hand_tool.title=Aktivēt rūkys reiku
 cursor_hand_tool_label=Rūkys reiks
 
+scroll_vertical.title=Izmontōt vertikalū ritinōšonu
+scroll_vertical_label=Vertikalō ritinōšona
+scroll_horizontal.title=Izmontōt horizontalū ritinōšonu
+scroll_horizontal_label=Horizontalō ritinōšona
+scroll_wrapped.title=Izmontōt mārūgojamū ritinōšonu
+scroll_wrapped_label=Mārūgojamō ritinōšona
+
+spread_none.title=Naizmontōt lopu atvāruma režimu
+spread_none_label=Bez atvārumim
+spread_odd.title=Izmontōt lopu atvārumus sōkut nu napōra numeru lopom
+spread_odd_label=Napōra lopys pa kreisi
+spread_even.title=Izmontōt lopu atvārumus sōkut nu pōra numeru lopom
+spread_even_label=Pōra lopys pa kreisi
+
 # Document properties dialog box
 document_properties.title=Dokumenta īstatiejumi…
 document_properties_label=Dokumenta īstatiejumi…
@@ -106,6 +120,11 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 # "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
 # the size, respectively their unit of measurement, name, and orientation, of the (current) page.
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Fast Web View:
+document_properties_linearized_yes=Jā
+document_properties_linearized_no=Nā
 document_properties_close=Aiztaiseit
 
 print_progress_message=Preparing document for printing…
diff --git a/l10n/oc/viewer.properties b/l10n/oc/viewer.properties
index c7ba7736a..2c520c255 100644
--- a/l10n/oc/viewer.properties
+++ b/l10n/oc/viewer.properties
@@ -111,6 +111,10 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
 # "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
 # the size, respectively their unit of measurement, name, and orientation, of the (current) page.
 document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized_yes=Òc
+document_properties_linearized_no=Non
 document_properties_close=Tampar
 
 print_progress_message=Preparacion del document per l’impression…
diff --git a/l10n/pl/viewer.properties b/l10n/pl/viewer.properties
index 5b184fde0..df89fd49c 100644
--- a/l10n/pl/viewer.properties
+++ b/l10n/pl/viewer.properties
@@ -159,7 +159,7 @@ password_invalid=Nieprawidłowe hasło. Proszę spróbować ponownie.
 password_ok=OK
 password_cancel=Anuluj
 
-printing_not_supported=Ostrzeżenie: Drukowanie nie jest w pełni obsługiwane przez przeglądarkę.
-printing_not_ready=Ostrzeżenie: Dokument PDF nie jest całkowicie wczytany, więc nie można go wydrukować.
+printing_not_supported=Ostrzeżenie: drukowanie nie jest w pełni obsługiwane przez przeglądarkę.
+printing_not_ready=Ostrzeżenie: dokument PDF nie jest całkowicie wczytany, więc nie można go wydrukować.
 web_fonts_disabled=Czcionki sieciowe są wyłączone: nie można użyć osadzonych czcionek PDF.
-document_colors_not_allowed=Dokumenty PDF nie mogą używać własnych kolorów: Opcja „Pozwalaj stronom stosować inne kolory” w przeglądarce jest nieaktywna.
+document_colors_not_allowed=Dokumenty PDF nie mogą używać własnych kolorów: opcja „Pozwalaj stronom stosować inne kolory” w przeglądarce jest nieaktywna.
diff --git a/l10n/sl/viewer.properties b/l10n/sl/viewer.properties
index 6774692a4..7984fc770 100644
--- a/l10n/sl/viewer.properties
+++ b/l10n/sl/viewer.properties
@@ -69,7 +69,15 @@ scroll_vertical.title=Uporabi navpično drsenje
 scroll_vertical_label=Navpično drsenje
 scroll_horizontal.title=Uporabi vodoravno drsenje
 scroll_horizontal_label=Vodoravno drsenje
+scroll_wrapped.title=Uporabi ovito drsenje
+scroll_wrapped_label=Ovito drsenje
 
+spread_none.title=Ne združuj razponov strani
+spread_none_label=Brez razponov
+spread_odd.title=Združuj razpone strani z začetkom pri lihih straneh
+spread_odd_label=Lihi razponi
+spread_even.title=Združuj razpone strani z začetkom pri sodih straneh
+spread_even_label=Sodi razponi
 
 # Document properties dialog box
 document_properties.title=Lastnosti dokumenta …
diff --git a/l10n/ur/viewer.properties b/l10n/ur/viewer.properties
index 375d49d38..69ad73c84 100644
--- a/l10n/ur/viewer.properties
+++ b/l10n/ur/viewer.properties
@@ -90,6 +90,7 @@ document_properties_page_count=صفحہ شمار:
 document_properties_page_size_unit_inches=میں
 document_properties_page_size_unit_millimeters=mm
 document_properties_page_size_orientation_portrait=عمودی انداز
+document_properties_page_size_name_legal=قانونی
 # LOCALIZATION NOTE (document_properties_page_size_dimension_string):
 # "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
 # the size, respectively their unit of measurement and orientation, of the (current) page.

From fb8695d4812d4f3eebe77877abcf57f9a348182e Mon Sep 17 00:00:00 2001
From: Tim van der Meij <timvandermeij@gmail.com>
Date: Sat, 25 Aug 2018 16:22:21 +0200
Subject: [PATCH 2/3] Update packages

---
 package-lock.json | 12 ++++++------
 package.json      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 46a193ea3..6185a6cce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -321,9 +321,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
-      "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.2.tgz",
+      "integrity": "sha512-cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw==",
       "dev": true
     },
     "acorn-dynamic-import": {
@@ -13077,9 +13077,9 @@
       }
     },
     "webpack": {
-      "version": "4.16.5",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.5.tgz",
-      "integrity": "sha512-i5cHYHonzSc1zBuwB5MSzW4v9cScZFbprkHK8ZgzPDCRkQXGGpYzPmJhbus5bOrZ0tXTcQp+xyImRSvKb0b+Kw==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.17.1.tgz",
+      "integrity": "sha512-vdPYogljzWPhFKDj3Gcp01Vqgu7K3IQlybc3XIdKSQHelK1C3eIQuysEUR7MxKJmdandZlQB/9BG2Jb1leJHaw==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.5.13",
diff --git a/package.json b/package.json
index c5ef93cf7..8ac3eb026 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "pdf.js",
   "version": "2.0.0",
   "devDependencies": {
-    "acorn": "^5.7.1",
+    "acorn": "^5.7.2",
     "autoprefixer": "^8.6.5",
     "babel-core": "^6.26.3",
     "babel-loader": "^7.1.5",
@@ -37,7 +37,7 @@
     "uglify-es": "^3.3.9",
     "vinyl": "^2.2.0",
     "vinyl-fs": "^3.0.3",
-    "webpack": "^4.16.5",
+    "webpack": "^4.17.1",
     "webpack-stream": "^4.0.3",
     "wintersmith": "^2.4.1",
     "yargs": "^11.1.0"

From c454868be1127c882e7be76302d49f3aee85a697 Mon Sep 17 00:00:00 2001
From: Tim van der Meij <timvandermeij@gmail.com>
Date: Sat, 25 Aug 2018 16:23:20 +0200
Subject: [PATCH 3/3] Fix duplicated function name in the Esprima fixtures

This makes `gulp externaltest` work again. It looks like this wasn't
validated before, but is now after recent package updates.
---
 external/builder/fixtures_esprima/comments-expected.js | 2 +-
 external/builder/fixtures_esprima/comments.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/builder/fixtures_esprima/comments-expected.js b/external/builder/fixtures_esprima/comments-expected.js
index f216553cb..3d5b7ad7f 100644
--- a/external/builder/fixtures_esprima/comments-expected.js
+++ b/external/builder/fixtures_esprima/comments-expected.js
@@ -6,7 +6,7 @@ function f2() {
  "1";
  "2";
 }
-function f2() {
+function f3() {
  if ("1") {
   "1";
  }
diff --git a/external/builder/fixtures_esprima/comments.js b/external/builder/fixtures_esprima/comments.js
index 5ab6d4c0d..5c7758c6c 100644
--- a/external/builder/fixtures_esprima/comments.js
+++ b/external/builder/fixtures_esprima/comments.js
@@ -15,7 +15,7 @@ function f2() {
   // tail
 }
 
-function f2() {
+function f3() {
   if ("1") { // begin block
     "1";
   }