Bug 1621863 - Update fluent-syntax to 0.9.3. r=emilio,fluent-reviewers,flod

Differential Revision: https://phabricator.services.mozilla.com/D66533 --HG-- rename : third_party/rust/fluent-syntax/tests/ast/mod.rs => third_party/rust/fluent-syntax/src/json/mod.rs extra : moz-landing-system : lando
2020-03-12 12:00:25 +00:00 · 2020-03-12 12:00:25 +00:00 · 9fa9e33bfe
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1349,9 +1349,9 @@ dependencies = [

 [[package]]
 name = "fluent-syntax"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fe937dbd784d0f085f05c15a06f0d5dd06ce31cc823f7ab12ebb3758d948b39"
+checksum = "ac0f7e83d14cccbf26e165d8881dcac5891af0d85a88543c09dd72ebd31d91ba"

 [[package]]
 name = "fnv"
--- a/third_party/rust/fluent-syntax/.cargo-checksum.json
+++ b/third_party/rust/fluent-syntax/.cargo-checksum.json
--- a/third_party/rust/fluent-syntax/CHANGELOG.md
+++ b/third_party/rust/fluent-syntax/CHANGELOG.md
@ -4,6 +4,11 @@

  - …

+## fluent-syntax 0.9.3 (March 4, 2020)
+  - Move JSON serialization from tests to source code behind the feature flag.
+  - Fix a minor syntax issue that caused the parser to recognize a comment ending on EOF as Junk.
+  - Add context benchmarks for Firefox contexts - browser and preferences.
+
 ## fluent-syntax 0.9.2 (February 13, 2020)
  - Import updated tests from the reference parser.
  - Minor parser improvements to align with new tests.
--- a/third_party/rust/fluent-syntax/Cargo.lock
+++ b/third_party/rust/fluent-syntax/Cargo.lock
@ -0,0 +1,669 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "assert-json-diff"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c356497fd3417158bcb318266ac83c391219ca3a5fa659049f42e0041ab57d6"
+dependencies = [
+ "extend",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "bstr"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "502ae1441a0a5adb8fbd38a5955a6416b9493e92b465de5e4a9bde6a539c2c48"
+dependencies = [
+ "lazy_static",
+ "memchr",
+ "regex-automata",
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
+
+[[package]]
+name = "byteorder"
+version = "1.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+
+[[package]]
+name = "cast"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
+dependencies = [
+ "rustc_version",
+]
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "clap"
+version = "2.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+dependencies = [
+ "bitflags",
+ "textwrap",
+ "unicode-width",
+]
+
+[[package]]
+name = "criterion"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1"
+dependencies = [
+ "atty",
+ "cast",
+ "clap",
+ "criterion-plot",
+ "csv",
+ "itertools",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a01e15e0ea58e8234f96146b1f91fa9d0e4dd7a38da93ff7a75d42c0b9d3a545"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "maybe-uninit",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
+ "lazy_static",
+ "maybe-uninit",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "lazy_static",
+]
+
+[[package]]
+name = "csv"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
+dependencies = [
+ "bstr",
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "either"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+
+[[package]]
+name = "extend"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe9db393664b0e6c6230a14115e7e798f80b70f54038dc21165db24c6b7f28fc"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "fluent-syntax"
+version = "0.9.3"
+dependencies = [
+ "assert-json-diff",
+ "criterion",
+ "glob",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "itertools"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
+
+[[package]]
+name = "js-sys"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
+
+[[package]]
+name = "log"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "maybe-uninit"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+
+[[package]]
+name = "memchr"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+
+[[package]]
+name = "memoffset"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
+dependencies = [
+ "rustc_version",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "oorandom"
+version = "11.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"
+
+[[package]]
+name = "plotters"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
+dependencies = [
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7959c6467d962050d639361f7703b2051c43036d03493c36f01d440fdd3138a"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4002d9f55991d5e019fb940a90e1a95eb80c24e77cb2462dd4dc869604d543a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "syn-mid",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rayon"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
+dependencies = [
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-queue",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
+]
+
+[[package]]
+name = "regex"
+version = "1.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
+dependencies = [
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "syn-mid"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a3c6667d3e65eb1bc3aed6fd14011c6cbc3a0665218ab7f5daf040b9ec371a"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+
+[[package]]
+name = "version_check"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
+
+[[package]]
+name = "walkdir"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+dependencies = [
+ "same-file",
+ "winapi",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0da9c9a19850d3af6df1cb9574970b566d617ecfaf36eb0b706b6f3ef9bd2f8"
+dependencies = [
+ "bumpalo",
+ "lazy_static",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8"
+
+[[package]]
+name = "web-sys"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--- a/third_party/rust/fluent-syntax/Cargo.toml
+++ b/third_party/rust/fluent-syntax/Cargo.toml
@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "fluent-syntax"
-version = "0.9.2"
+version = "0.9.3"
 authors = ["Zibi Braniecki <gandalf@mozilla.com>", "Staś Małolepszy <stas@mozilla.com>"]
 description = "Parser/Serializer tools for Fluent Syntax. \n"
 homepage = "http://www.projectfluent.org"
@ -23,9 +23,26 @@ categories = ["localization", "internationalization"]
 license = "Apache-2.0/MIT"
 repository = "https://github.com/projectfluent/fluent-rs"

+[[bin]]
+name = "parser"
+path = "src/bin/parser.rs"
+
+[[test]]
+name = "parser_fixtures"
+path = "tests/parser_fixtures.rs"
+required-features = ["json"]
+
 [[bench]]
 name = "parser"
 harness = false
+[dependencies.serde]
+version = "1.0"
+features = ["derive"]
+optional = true
+
+[dependencies.serde_json]
+version = "1.0"
+optional = true
 [dev-dependencies.assert-json-diff]
 version = "1.0"

@ -41,3 +58,7 @@ features = ["derive"]

 [dev-dependencies.serde_json]
 version = "1.0"
+
+[features]
+default = []
+json = ["serde", "serde_json"]
--- a/third_party/rust/fluent-syntax/benches/contexts/README.md
+++ b/third_party/rust/fluent-syntax/benches/contexts/README.md
@ -0,0 +1,4 @@
+The following context is extracted from
+the `browser.xhtml` localization context
+from mozilla-central rev 51efc4b931f7
+from 2020-03-03.
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/appmenu.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/appmenu.ftl
@ -0,0 +1,21 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## App Menu
+
+appmenuitem-protection-report-title = Privacy Protections
+appmenuitem-protection-report-tooltip =
+    .tooltiptext = Go to your privacy report
+
+## Zoom Controls
+
+appmenuitem-zoom-enlarge =
+  .label = Zoom in
+appmenuitem-zoom-reduce =
+  .label = Zoom out
+
+## Firefox Account toolbar button and Sync panel in App menu.
+
+fxa-toolbar-sync-now =
+    .label = Sync Now
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/brand.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/brand.ftl
@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Firefox Brand
+##
+## Firefox must be treated as a brand, and kept in English.
+## It cannot be:
+## - Declined to adapt to grammatical case.
+## - Transliterated.
+## - Translated.
+##
+## Reference: https://www.mozilla.org/styleguide/communications/translation/
+
+-brand-shorter-name = Firefox
+-brand-short-name = Firefox
+-brand-full-name = Mozilla Firefox
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Firefox
+-vendor-short-name = Mozilla
+trademarkInfo = Firefox and the Firefox logos are trademarks of the Mozilla Foundation.
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/brandings.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/brandings.ftl
@ -0,0 +1,18 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## The following feature names must be treated as a brand, and kept in English.
+## They cannot be:
+## - Declined to adapt to grammatical case.
+## - Transliterated.
+## - Translated.
+
+-facebook-container-brand-name = Facebook Container
+-lockwise-brand-name = Firefox Lockwise
+-lockwise-brand-short-name = Lockwise
+-monitor-brand-name = Firefox Monitor
+-monitor-brand-short-name = Monitor
+-pocket-brand-name = Pocket
+-send-brand-name = Firefox Send
+-screenshots-brand-name = Firefox Screenshots
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/browser.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/browser.ftl
@ -0,0 +1,249 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+# This is the default window title in case there is no content
+# title to be displayed.
+#
+# Depending on the $mode, the string will look like this (in en-US):
+#
+# "default" - "Mozilla Firefox"
+# "private" - "Mozilla Firefox (Private Browsing)"
+#
+# Variables
+#   $mode (String) - "private" in case of a private browsing mode, "default" otherwise.
+browser-main-window-title = { $mode ->
+        [private] { -brand-full-name } (Private Browsing)
+       *[default] { -brand-full-name }
+    }
+
+## This is the default window title in case there is content
+## title to be displayed.
+##
+## On macOS the title doesn't include the brand name, on all other
+## platforms it does.
+##
+## For example, in private mode on Windows, the title will be:
+## "Example Title - Mozilla Firefox (Private Browsing)"
+##
+## while on macOS in default mode it will be:
+## "Example Title"
+##
+## Variables
+##   $title (String) - Content title string.
+
+browser-main-window-content-title-default = { PLATFORM() ->
+    [macos] { $title }
+   *[other] { $title } - { -brand-full-name }
+}
+
+browser-main-window-content-title-private = { PLATFORM() ->
+    [macos] { $title } - (Private Browsing)
+   *[other] { $title } - { -brand-full-name } (Private Browsing)
+}
+
+##
+
+urlbar-identity-button =
+    .aria-label = View site information
+
+## Tooltips for images appearing in the address bar
+
+urlbar-services-notification-anchor =
+    .tooltiptext = Open install message panel
+urlbar-web-notification-anchor =
+    .tooltiptext = Change whether you can receive notifications from the site
+urlbar-midi-notification-anchor =
+    .tooltiptext = Open MIDI panel
+urlbar-eme-notification-anchor =
+    .tooltiptext = Manage use of DRM software
+urlbar-web-authn-anchor =
+    .tooltiptext = Open Web Authentication panel
+urlbar-canvas-notification-anchor =
+    .tooltiptext = Manage canvas extraction permission
+urlbar-web-rtc-share-microphone-notification-anchor =
+    .tooltiptext = Manage sharing your microphone with the site
+urlbar-default-notification-anchor =
+    .tooltiptext = Open message panel
+urlbar-geolocation-notification-anchor =
+    .tooltiptext = Open location request panel
+urlbar-xr-notification-anchor =
+    .tooltiptext = Open virtual reality permission panel
+urlbar-storage-access-anchor =
+    .tooltiptext = Open browsing activity permission panel
+urlbar-translate-notification-anchor =
+    .tooltiptext = Translate this page
+urlbar-web-rtc-share-screen-notification-anchor =
+    .tooltiptext = Manage sharing your windows or screen with the site
+urlbar-indexed-db-notification-anchor =
+    .tooltiptext = Open offline storage message panel
+urlbar-password-notification-anchor =
+    .tooltiptext = Open save password message panel
+urlbar-translated-notification-anchor =
+    .tooltiptext = Manage page translation
+urlbar-plugins-notification-anchor =
+    .tooltiptext = Manage plug-in use
+urlbar-web-rtc-share-devices-notification-anchor =
+    .tooltiptext = Manage sharing your camera and/or microphone with the site
+urlbar-autoplay-notification-anchor =
+    .tooltiptext = Open autoplay panel
+urlbar-persistent-storage-notification-anchor =
+    .tooltiptext = Store data in Persistent Storage
+urlbar-addons-notification-anchor =
+    .tooltiptext = Open add-on installation message panel
+urlbar-tip-help-icon =
+    .title = Get help
+urlbar-search-tips-confirm = Okay, Got It
+# Read out before Urlbar Tip text content so screenreader users know the
+# subsequent text is a tip offered by the browser. It should end in a colon or
+# localized equivalent.
+urlbar-tip-icon-description =
+    .alt = Tip:
+
+## Prompts users to use the Urlbar when they open a new tab or visit the
+## homepage of their default search engine.
+## Variables:
+##  $engineName (String): The name of the user's default search engine. e.g. "Google" or "DuckDuckGo".
+urlbar-search-tips-onboard = Type less, find more: Search { $engineName } right from your address bar.
+urlbar-search-tips-redirect-2 = Start your search in the address bar to see suggestions from { $engineName } and your browsing history.
+
+##
+
+urlbar-geolocation-blocked =
+    .tooltiptext = You have blocked location information for this website.
+urlbar-xr-blocked =
+    .tooltiptext = You have blocked virtual reality device access for this website.
+urlbar-web-notifications-blocked =
+    .tooltiptext = You have blocked notifications for this website.
+urlbar-camera-blocked =
+    .tooltiptext = You have blocked your camera for this website.
+urlbar-microphone-blocked =
+    .tooltiptext = You have blocked your microphone for this website.
+urlbar-screen-blocked =
+    .tooltiptext = You have blocked this website from sharing your screen.
+urlbar-persistent-storage-blocked =
+    .tooltiptext = You have blocked persistent storage for this website.
+urlbar-popup-blocked =
+    .tooltiptext = You have blocked pop-ups for this website.
+urlbar-autoplay-media-blocked =
+    .tooltiptext = You have blocked autoplay media with sound for this website.
+urlbar-canvas-blocked =
+    .tooltiptext = You have blocked canvas data extraction for this website.
+urlbar-midi-blocked =
+    .tooltiptext = You have blocked MIDI access for this website.
+urlbar-install-blocked =
+    .tooltiptext = You have blocked add-on installation for this website.
+
+# Variables
+#   $shortcut (String) - A keyboard shortcut for the edit bookmark command.
+urlbar-star-edit-bookmark =
+    .tooltiptext = Edit this bookmark ({ $shortcut })
+
+# Variables
+#   $shortcut (String) - A keyboard shortcut for the add bookmark command.
+urlbar-star-add-bookmark =
+    .tooltiptext = Bookmark this page ({ $shortcut })
+
+## Page Action Context Menu
+
+page-action-add-to-urlbar =
+    .label = Add to Address Bar
+page-action-manage-extension =
+    .label = Manage Extension…
+page-action-remove-from-urlbar =
+    .label = Remove from Address Bar
+
+## Auto-hide Context Menu
+
+full-screen-autohide =
+    .label = Hide Toolbars
+    .accesskey = H
+full-screen-exit =
+    .label = Exit Full Screen Mode
+    .accesskey = F
+
+## Search Engine selection buttons (one-offs)
+
+# This string prompts the user to use the list of one-click search engines in
+# the Urlbar and searchbar.
+search-one-offs-with-title = This time, search with:
+
+# This string won't wrap, so if the translated string is longer,
+# consider translating it as if it said only "Search Settings".
+search-one-offs-change-settings-button =
+    .label = Change Search Settings
+search-one-offs-change-settings-compact-button =
+    .tooltiptext = Change search settings
+
+search-one-offs-context-open-new-tab =
+    .label = Search in New Tab
+    .accesskey = T
+search-one-offs-context-set-as-default =
+    .label = Set as Default Search Engine
+    .accesskey = D
+search-one-offs-context-set-as-default-private =
+    .label = Set as Default Search Engine for Private Windows
+    .accesskey = P
+
+## Bookmark Panel
+
+bookmark-panel-show-editor-checkbox =
+    .label = Show editor when saving
+    .accesskey = S
+
+bookmark-panel-done-button =
+    .label = Done
+
+# Width of the bookmark panel.
+# Should be large enough to fully display the Done and
+# Cancel/Remove Bookmark buttons.
+bookmark-panel =
+    .style = min-width: 23em
+
+## Identity Panel
+
+identity-connection-not-secure = Connection not secure
+identity-connection-secure = Connection secure
+identity-connection-internal = This is a secure { -brand-short-name } page.
+identity-connection-file = This page is stored on your computer.
+identity-extension-page = This page is loaded from an extension.
+identity-active-blocked = { -brand-short-name } has blocked parts of this page that are not secure.
+identity-custom-root = Connection verified by a certificate issuer that is not recognized by Mozilla.
+identity-passive-loaded = Parts of this page are not secure (such as images).
+identity-active-loaded = You have disabled protection on this page.
+identity-weak-encryption = This page uses weak encryption.
+identity-insecure-login-forms = Logins entered on this page could be compromised.
+identity-permissions =
+    .value = Permissions
+identity-permissions-reload-hint = You may need to reload the page for changes to apply.
+identity-permissions-empty = You have not granted this site any special permissions.
+identity-clear-site-data =
+    .label = Clear Cookies and Site Data…
+identity-connection-not-secure-security-view = You are not securely connected to this site.
+identity-connection-verified = You are securely connected to this site.
+identity-ev-owner-label = Certificate issued to:
+identity-description-custom-root = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator. <label data-l10n-name="link">Learn More</label>
+identity-remove-cert-exception =
+    .label = Remove Exception
+    .accesskey = R
+identity-description-insecure = Your connection to this site is not private. Information you submit could be viewed by others (like passwords, messages, credit cards, etc.).
+identity-description-insecure-login-forms = The login information you enter on this page is not secure and could be compromised.
+identity-description-weak-cipher-intro = Your connection to this website uses weak encryption and is not private.
+identity-description-weak-cipher-risk = Other people can view your information or modify the website’s behavior.
+identity-description-active-blocked = { -brand-short-name } has blocked parts of this page that are not secure. <label data-l10n-name="link">Learn More</label>
+identity-description-passive-loaded = Your connection is not private and information you share with the site could be viewed by others.
+identity-description-passive-loaded-insecure = This website contains content that is not secure (such as images). <label data-l10n-name="link">Learn More</label>
+identity-description-passive-loaded-mixed = Although { -brand-short-name } has blocked some content, there is still content on the page that is not secure (such as images). <label data-l10n-name="link">Learn More</label>
+identity-description-active-loaded = This website contains content that is not secure (such as scripts) and your connection to it is not private.
+identity-description-active-loaded-insecure = Information you share with this site could be viewed by others (like passwords, messages, credit cards, etc.).
+identity-learn-more =
+    .value = Learn More
+identity-disable-mixed-content-blocking =
+    .label = Disable protection for now
+    .accesskey = D
+identity-enable-mixed-content-blocking =
+    .label = Enable protection
+    .accesskey = E
+identity-more-info-link-text =
+    .label = More Information
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/browserContext.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/browserContext.ftl
@ -0,0 +1,389 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+navbar-tooltip-instruction =
+    .value = { PLATFORM() ->
+        [macos] Pull down to show history
+       *[other] Right-click or pull down to show history
+    }
+
+## Back
+
+main-context-menu-back =
+    .tooltiptext = Go back one page
+    .aria-label = Back
+    .accesskey = B
+
+navbar-tooltip-back = 
+    .value = { main-context-menu-back.tooltiptext }
+
+toolbar-button-back =
+    .label = { main-context-menu-back.aria-label }
+
+## Forward
+
+main-context-menu-forward =
+    .tooltiptext = Go forward one page
+    .aria-label = Forward
+    .accesskey = F
+
+navbar-tooltip-forward =
+    .value = { main-context-menu-forward.tooltiptext } 
+
+toolbar-button-forward =
+    .label = { main-context-menu-forward.aria-label }
+
+## Reload
+
+main-context-menu-reload =
+    .aria-label = Reload
+    .accesskey = R
+
+toolbar-button-reload =
+    .label = { main-context-menu-reload.aria-label }
+
+## Stop
+
+main-context-menu-stop =
+    .aria-label = Stop
+    .accesskey = S
+
+toolbar-button-stop =
+    .label = { main-context-menu-stop.aria-label }
+
+## Stop-Reload Button
+
+toolbar-button-stop-reload =
+    .title = { main-context-menu-reload.aria-label }
+
+## Save Page
+
+main-context-menu-page-save =
+    .label = Save Page As…
+    .accesskey = P
+
+toolbar-button-page-save =
+    .label = { main-context-menu-page-save.label }
+
+## Simple menu items
+
+main-context-menu-bookmark-add =
+    .aria-label = Bookmark This Page
+    .accesskey = m
+    .tooltiptext = Bookmark this page
+
+# Variables
+#   $shortcut (String) - A keyboard shortcut for the add bookmark command.
+main-context-menu-bookmark-add-with-shortcut =
+    .aria-label = Bookmark This Page
+    .accesskey = m
+    .tooltiptext = Bookmark this page ({ $shortcut })
+
+main-context-menu-bookmark-change =
+    .aria-label = Edit This Bookmark
+    .accesskey = m
+    .tooltiptext = Edit this bookmark
+
+# Variables
+#   $shortcut (String) - A keyboard shortcut for the edit bookmark command.
+main-context-menu-bookmark-change-with-shortcut =
+    .aria-label = Edit This Bookmark
+    .accesskey = m
+    .tooltiptext = Edit this bookmark ({ $shortcut })
+
+main-context-menu-open-link =
+    .label = Open Link
+    .accesskey = O
+
+main-context-menu-open-link-new-tab =
+    .label = Open Link in New Tab
+    .accesskey = T
+
+main-context-menu-open-link-container-tab =
+    .label = Open Link in New Container Tab
+    .accesskey = b
+
+main-context-menu-open-link-new-window =
+    .label = Open Link in New Window
+    .accesskey = W
+
+main-context-menu-open-link-new-private-window =
+    .label = Open Link in New Private Window
+    .accesskey = P
+
+main-context-menu-bookmark-this-link =
+    .label = Bookmark This Link
+    .accesskey = L
+
+main-context-menu-save-link =
+    .label = Save Link As…
+    .accesskey = k
+
+main-context-menu-save-link-to-pocket =
+    .label = Save Link to { -pocket-brand-name }
+    .accesskey = o
+
+## The access keys for "Copy Link Location" and "Copy Email Address"
+## should be the same if possible; the two context menu items
+## are mutually exclusive.
+
+main-context-menu-copy-email =
+    .label = Copy Email Address
+    .accesskey = A
+
+main-context-menu-copy-link =
+    .label = Copy Link Location
+    .accesskey = a
+
+## Media (video/audio) controls
+##
+## The accesskey for "Play" and "Pause" are the
+## same because the two context-menu items are
+## mutually exclusive.
+
+main-context-menu-media-play =
+    .label = Play
+    .accesskey = P
+
+main-context-menu-media-pause =
+    .label = Pause
+    .accesskey = P
+
+##
+
+main-context-menu-media-mute =
+    .label = Mute
+    .accesskey = M
+
+main-context-menu-media-unmute =
+    .label = Unmute
+    .accesskey = m
+
+main-context-menu-media-play-speed =
+    .label = Play Speed
+    .accesskey = d
+
+main-context-menu-media-play-speed-slow =
+    .label = Slow (0.5×)
+    .accesskey = S
+
+main-context-menu-media-play-speed-normal =
+    .label = Normal
+    .accesskey = N
+
+main-context-menu-media-play-speed-fast =
+    .label = Fast (1.25×)
+    .accesskey = F
+
+main-context-menu-media-play-speed-faster =
+    .label = Faster (1.5×)
+    .accesskey = a
+
+# "Ludicrous" is a reference to the movie "Space Balls" and is meant
+# to say that this speed is very fast.
+main-context-menu-media-play-speed-fastest =
+    .label = Ludicrous (2×)
+    .accesskey = L
+
+main-context-menu-media-loop =
+    .label = Loop
+    .accesskey = L
+
+## The access keys for "Show Controls" and "Hide Controls" are the same
+## because the two context-menu items are mutually exclusive.
+
+main-context-menu-media-show-controls =
+    .label = Show Controls
+    .accesskey = C
+
+main-context-menu-media-hide-controls =
+    .label = Hide Controls
+    .accesskey = C
+
+##
+
+main-context-menu-media-video-fullscreen =
+    .label = Full Screen
+    .accesskey = F
+
+main-context-menu-media-video-leave-fullscreen =
+    .label = Exit Full Screen
+    .accesskey = u
+
+# This is used when right-clicking on a video in the
+# content area when the Picture-in-Picture feature is enabled.
+main-context-menu-media-pip =
+    .label = Picture-in-Picture
+    .accesskey = u
+
+main-context-menu-image-reload =
+    .label = Reload Image
+    .accesskey = R
+
+main-context-menu-image-view =
+    .label = View Image
+    .accesskey = I
+
+main-context-menu-video-view =
+    .label = View Video
+    .accesskey = i
+
+main-context-menu-image-copy =
+    .label = Copy Image
+    .accesskey = y
+
+main-context-menu-image-copy-location =
+    .label = Copy Image Location
+    .accesskey = o
+
+main-context-menu-video-copy-location =
+    .label = Copy Video Location
+    .accesskey = o
+
+main-context-menu-audio-copy-location =
+    .label = Copy Audio Location
+    .accesskey = o
+
+main-context-menu-image-save-as =
+    .label = Save Image As…
+    .accesskey = v
+
+main-context-menu-image-email =
+    .label = Email Image…
+    .accesskey = g
+
+main-context-menu-image-set-as-background =
+    .label = Set As Desktop Background…
+    .accesskey = S
+
+main-context-menu-image-info =
+    .label = View Image Info
+    .accesskey = f
+
+main-context-menu-image-desc =
+    .label = View Description
+    .accesskey = D
+
+main-context-menu-video-save-as =
+    .label = Save Video As…
+    .accesskey = v
+
+main-context-menu-audio-save-as =
+    .label = Save Audio As…
+    .accesskey = v
+
+main-context-menu-video-image-save-as =
+    .label = Save Snapshot As…
+    .accesskey = S
+
+main-context-menu-video-email =
+    .label = Email Video…
+    .accesskey = a
+
+main-context-menu-audio-email =
+    .label = Email Audio…
+    .accesskey = a
+
+main-context-menu-plugin-play =
+    .label = Activate this plugin
+    .accesskey = c
+
+main-context-menu-plugin-hide =
+    .label = Hide this plugin
+    .accesskey = H
+
+main-context-menu-save-to-pocket =
+    .label = Save Page to { -pocket-brand-name }
+    .accesskey = k
+
+main-context-menu-send-to-device =
+    .label = Send Page to Device
+    .accesskey = n
+
+main-context-menu-view-background-image =
+    .label = View Background Image
+    .accesskey = w
+
+main-context-menu-generate-new-password =
+    .label = Use Generated Password…
+    .accesskey = G
+
+main-context-menu-keyword =
+    .label = Add a Keyword for this Search…
+    .accesskey = K
+
+main-context-menu-link-send-to-device =
+    .label = Send Link to Device
+    .accesskey = n
+
+main-context-menu-frame =
+    .label = This Frame
+    .accesskey = h
+
+main-context-menu-frame-show-this =
+    .label = Show Only This Frame
+    .accesskey = S
+
+main-context-menu-frame-open-tab =
+    .label = Open Frame in New Tab
+    .accesskey = T
+
+main-context-menu-frame-open-window =
+    .label = Open Frame in New Window
+    .accesskey = W
+
+main-context-menu-frame-reload =
+    .label = Reload Frame
+    .accesskey = R
+
+main-context-menu-frame-bookmark =
+    .label = Bookmark This Frame
+    .accesskey = m
+
+main-context-menu-frame-save-as =
+    .label = Save Frame As…
+    .accesskey = F
+
+main-context-menu-frame-print =
+    .label = Print Frame…
+    .accesskey = P
+
+main-context-menu-frame-view-source =
+    .label = View Frame Source
+    .accesskey = V
+
+main-context-menu-frame-view-info =
+    .label = View Frame Info
+    .accesskey = I
+
+main-context-menu-view-selection-source =
+    .label = View Selection Source
+    .accesskey = e
+
+main-context-menu-view-page-source =
+    .label = View Page Source
+    .accesskey = V
+
+main-context-menu-view-page-info =
+    .label = View Page Info
+    .accesskey = I
+
+main-context-menu-bidi-switch-text =
+    .label = Switch Text Direction
+    .accesskey = w
+
+main-context-menu-bidi-switch-page =
+    .label = Switch Page Direction
+    .accesskey = D
+
+main-context-menu-inspect-element =
+    .label = Inspect Element
+    .accesskey = Q
+
+main-context-menu-inspect-a11y-properties =
+    .label = Inspect Accessibility Properties
+
+main-context-menu-eme-learn-more =
+    .label = Learn more about DRM…
+    .accesskey = D
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/browserSets.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/browserSets.ftl
@ -0,0 +1,200 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+window-minimize-command =
+    .label = Minimize
+
+window-zoom-command =
+    .label = Zoom
+
+window-new-shortcut =
+    .key = N
+
+window-minimize-shortcut =
+    .key = M
+
+close-shortcut =
+    .key = W
+
+tab-new-shortcut =
+    .key = T
+
+location-open-shortcut =
+    .key = L
+
+location-open-shortcut-alt =
+    .key = D
+
+search-focus-shortcut =
+    .key = K
+
+# This shortcut is used in two contexts:
+#   - web search
+#   - find in page
+find-shortcut =
+    .key = F
+
+search-find-again-shortcut =
+    .key = G
+
+search-find-again-shortcut-alt =
+    .keycode = VK_F3
+
+search-find-selection-shortcut =
+    .key = E
+
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+search-focus-shortcut-alt =
+    .key = { PLATFORM() ->
+        [linux] J
+       *[other] E
+    }
+
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+downloads-shortcut =
+    .key = { PLATFORM() ->
+        [linux] Y
+       *[other] J
+    }
+
+addons-shortcut =
+    .key = A
+
+file-open-shortcut =
+    .key = O
+
+save-page-shortcut =
+    .key = S
+
+page-source-shortcut =
+    .key = U
+
+# This should match the Option+Command keyboard shortcut letter that Safari
+# and Chrome use for "View Source" on macOS. `page-source-shortcut` above
+# is Firefox's official keyboard shortcut shown in the GUI.
+# Safari variant is an alias provided for the convenience of Safari and Chrome
+# users on macOS. See bug 1398988.
+page-source-shortcut-safari =
+    .key = U
+
+page-info-shortcut =
+    .key = I
+
+print-shortcut =
+    .key = P
+
+mute-toggle-shortcut =
+    .key = M
+
+nav-back-shortcut-alt =
+    .key = [
+
+nav-fwd-shortcut-alt =
+    .key = ]
+
+nav-reload-shortcut =
+    .key = R
+
+# Shortcut available only on macOS.
+nav-stop-shortcut =
+    .key = .
+
+history-show-all-shortcut =
+    .key = H
+
+history-sidebar-shortcut =
+    .key = H
+
+full-screen-shortcut =
+    .key = F
+
+reader-mode-toggle-shortcut-windows =
+    .keycode = VK_F9
+
+reader-mode-toggle-shortcut-other =
+    .key = R
+
+picture-in-picture-toggle-shortcut =
+    .key = ]
+
+# Pick the key that is commonly present
+# in your locale keyboards above the
+# `picture-in-picture-toggle-shortcut` key.
+picture-in-picture-toggle-shortcut-alt =
+    .key = {"}"}
+
+bookmark-this-page-shortcut =
+    .key = D
+
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+bookmark-show-all-shortcut =
+    .key = { PLATFORM() ->
+        [linux] O
+       *[other] B
+    }
+
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+bookmark-show-sidebar-shortcut =
+    .key = B
+
+## All `-alt*` messages are alternative acceleration keys for zoom.
+## If shift key is needed with your locale popular keyboard for them,
+## you can use these alternative items. Otherwise, their values should be empty.
+
+full-zoom-reduce-shortcut =
+    .key = -
+
+# If in keyboard layouts popular for your locale you need to use the shift key
+# to access the original shortcuts, the following shortcuts can be used.
+# Otherwise their values should remain empty.
+full-zoom-reduce-shortcut-alt =
+    .key = {""}
+
+full-zoom-enlarge-shortcut =
+    .key = +
+
+full-zoom-enlarge-shortcut-alt =
+    .key = =
+
+full-zoom-enlarge-shortcut-alt2 =
+    .key = {""}
+
+full-zoom-reset-shortcut =
+    .key = 0
+
+full-zoom-reset-shortcut-alt =
+    .key = {""}
+##
+
+bidi-switch-direction-shortcut =
+    .key = X
+
+private-browsing-shortcut =
+    .key = P
+
+## The shortcuts below are for Mac specific
+## global menu.
+
+quit-app-shortcut =
+    .key = Q
+
+help-shortcut =
+    .key = ?
+
+preferences-shortcut =
+    .key = ,
+
+hide-app-shortcut =
+    .key = H
+
+hide-other-apps-shortcut =
+    .key = H
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/interventions.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/interventions.ftl
@ -0,0 +1,40 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+### These strings appear in Urlbar Interventions. Interventions appear in the
+### Urlbar in response to the user's query. For example, if we detect that the
+### user is searching how to clear their history, we show the Intervention
+### described by clear-data.
+
+intervention-clear-data = Clear your cache, cookies, history and more.
+intervention-clear-data-confirm = Choose What to Clear…
+intervention-refresh-profile = Restore default settings and remove old add-ons for optimal performance.
+intervention-refresh-profile-confirm = Refresh { -brand-short-name }…
+
+## These strings describe Interventions helping the user with the Firefox update
+## process.
+
+## Shown when an update is available to download.
+
+intervention-update-ask = A new version of { -brand-short-name } is available.
+intervention-update-ask-confirm = Install and Restart to Update
+
+## Shown when Firefox does not need to update so instead we offer to refresh
+## the user's profile.
+
+intervention-update-refresh = { -brand-short-name } is up to date. Trying to fix a problem? Restore default settings and remove old add-ons for optimal performance.
+intervention-update-refresh-confirm = Refresh { -brand-short-name }…
+
+## Shown when an update is downloaded and Firefox is ready to install it.
+
+intervention-update-restart = The latest { -brand-short-name } is downloaded and ready to install.
+intervention-update-restart-confirm = Restart to Update
+
+## Shown when Firefox cannot update itself. The button will open the download
+## page on the Firefox website.
+
+intervention-update-web = Get the latest { -brand-short-name } browser.
+intervention-update-web-confirm = Download Now
+
+##
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/menubar.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/menubar.ftl
@ -0,0 +1,270 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## File Menu
+
+menu-file =
+    .label = File
+    .accesskey = F
+menu-file-new-tab =
+    .label = New Tab
+    .accesskey = T
+menu-file-new-container-tab =
+    .label = New Container Tab
+    .accesskey = b
+menu-file-new-window =
+    .label = New Window
+    .accesskey = N
+menu-file-new-private-window =
+    .label = New Private Window
+    .accesskey = W
+# "Open Location" is only displayed on macOS, and only on windows
+# that aren't main browser windows, or when there are no windows
+# but Firefox is still running.
+menu-file-open-location =
+    .label = Open Location…
+menu-file-open-file =
+    .label = Open File…
+    .accesskey = O
+menu-file-close =
+    .label = Close
+    .accesskey = C
+menu-file-close-window =
+    .label = Close Window
+    .accesskey = d
+menu-file-save-page =
+    .label = Save Page As…
+    .accesskey = A
+menu-file-email-link =
+    .label = Email Link…
+    .accesskey = E
+menu-file-print-setup =
+    .label = Page Setup…
+    .accesskey = u
+menu-file-print-preview =
+    .label = Print Preview
+    .accesskey = v
+menu-file-print =
+    .label = Print…
+    .accesskey = P
+menu-file-import-from-another-browser =
+    .label = Import from Another Browser…
+    .accesskey = I
+menu-file-go-offline =
+    .label = Work Offline
+    .accesskey = k
+
+## Edit Menu
+
+menu-edit =
+    .label = Edit
+    .accesskey = E
+menu-edit-find-on =
+    .label = Find in This Page…
+    .accesskey = F
+menu-edit-find-again =
+    .label = Find Again
+    .accesskey = g
+menu-edit-bidi-switch-text-direction =
+    .label = Switch Text Direction
+    .accesskey = w
+
+## View Menu
+
+menu-view =
+    .label = View
+    .accesskey = V
+menu-view-toolbars-menu =
+    .label = Toolbars
+    .accesskey = T
+menu-view-customize-toolbar =
+    .label = Customize…
+    .accesskey = C
+menu-view-sidebar =
+    .label = Sidebar
+    .accesskey = e
+menu-view-bookmarks =
+    .label = Bookmarks
+menu-view-history-button =
+    .label = History
+menu-view-synced-tabs-sidebar =
+    .label = Synced Tabs
+menu-view-full-zoom =
+    .label = Zoom
+    .accesskey = Z
+menu-view-full-zoom-enlarge =
+    .label = Zoom In
+    .accesskey = I
+menu-view-full-zoom-reduce =
+    .label = Zoom Out
+    .accesskey = O
+menu-view-full-zoom-actual-size =
+    .label = Actual Size
+    .accesskey = A
+menu-view-full-zoom-toggle =
+    .label = Zoom Text Only
+    .accesskey = T
+menu-view-page-style-menu =
+    .label = Page Style
+    .accesskey = y
+menu-view-page-style-no-style =
+    .label = No Style
+    .accesskey = n
+menu-view-page-basic-style =
+    .label = Basic Page Style
+    .accesskey = B
+menu-view-charset =
+    .label = Text Encoding
+    .accesskey = c
+
+## These should match what Safari and other Apple applications
+## use on macOS.
+
+menu-view-enter-full-screen =
+    .label = Enter Full Screen
+    .accesskey = F
+menu-view-exit-full-screen =
+    .label = Exit Full Screen
+    .accesskey = F
+menu-view-full-screen =
+    .label = Full Screen
+    .accesskey = F
+
+##
+
+menu-view-show-all-tabs =
+    .label = Show All Tabs
+    .accesskey = A
+menu-view-bidi-switch-page-direction =
+    .label = Switch Page Direction
+    .accesskey = D
+
+## History Menu
+
+menu-history =
+    .label = History
+    .accesskey = s
+menu-history-show-all-history =
+    .label = Show All History
+menu-history-clear-recent-history =
+    .label = Clear Recent History…
+menu-history-synced-tabs =
+    .label = Synced Tabs
+menu-history-restore-last-session =
+    .label = Restore Previous Session
+menu-history-hidden-tabs =
+    .label = Hidden Tabs
+menu-history-undo-menu =
+    .label = Recently Closed Tabs
+menu-history-undo-window-menu =
+    .label = Recently Closed Windows
+
+## Bookmarks Menu
+
+menu-bookmarks-menu =
+    .label = Bookmarks
+    .accesskey = B
+menu-bookmarks-show-all =
+    .label = Show All Bookmarks
+menu-bookmark-this-page =
+    .label = Bookmark This Page
+menu-bookmark-edit =
+    .label = Edit This Bookmark
+menu-bookmarks-all-tabs =
+    .label = Bookmark All Tabs…
+menu-bookmarks-toolbar =
+    .label = Bookmarks Toolbar
+menu-bookmarks-other =
+    .label = Other Bookmarks
+menu-bookmarks-mobile =
+    .label = Mobile Bookmarks
+
+## Tools Menu
+
+menu-tools =
+    .label = Tools
+    .accesskey = T
+menu-tools-downloads =
+    .label = Downloads
+    .accesskey = D
+menu-tools-addons =
+    .label = Add-ons
+    .accesskey = A
+menu-tools-fxa-sign-in =
+    .label = Sign In To { -brand-product-name }…
+    .accesskey = g
+menu-tools-turn-on-sync =
+    .label = Turn on { -sync-brand-short-name }…
+    .accesskey = n
+menu-tools-sync-now =
+    .label = Sync Now
+    .accesskey = S
+menu-tools-fxa-re-auth =
+    .label = Reconnect to { -brand-product-name }…
+    .accesskey = R
+menu-tools-web-developer =
+    .label = Web Developer
+    .accesskey = W
+menu-tools-page-source =
+    .label = Page Source
+    .accesskey = o
+menu-tools-page-info =
+    .label = Page Info
+    .accesskey = I
+menu-preferences =
+    .label =
+        { PLATFORM() ->
+            [windows] Options
+           *[other] Preferences
+        }
+    .accesskey =
+        { PLATFORM() ->
+            [windows] O
+           *[other] n
+        }
+menu-tools-layout-debugger =
+    .label = Layout Debugger
+    .accesskey = L
+
+## Window Menu
+
+menu-window-menu =
+    .label = Window
+menu-window-bring-all-to-front =
+    .label = Bring All to Front
+
+## Help Menu
+
+menu-help =
+    .label = Help
+    .accesskey = H
+menu-help-product =
+    .label = { -brand-shorter-name } Help
+    .accesskey = H
+menu-help-show-tour =
+    .label = { -brand-shorter-name } Tour
+    .accesskey = o
+menu-help-keyboard-shortcuts =
+    .label = Keyboard Shortcuts
+    .accesskey = K
+menu-help-troubleshooting-info =
+    .label = Troubleshooting Information
+    .accesskey = T
+menu-help-feedback-page =
+    .label = Submit Feedback…
+    .accesskey = S
+menu-help-safe-mode-without-addons =
+    .label = Restart with Add-ons Disabled…
+    .accesskey = R
+menu-help-safe-mode-with-addons =
+    .label = Restart with Add-ons Enabled
+    .accesskey = R
+# Label of the Help menu item. Either this or
+# menu-help-notdeceptive is shown.
+menu-help-report-deceptive-site =
+    .label = Report Deceptive Site…
+    .accesskey = D
+menu-help-not-deceptive =
+    .label = This isn’t a deceptive site…
+    .accesskey = d
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/protectionsPanel.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/protectionsPanel.ftl
@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+protections-panel-sendreportview-error = There was an error sending the report. Please try again later.
+
+# A link shown when ETP is disabled for a site. Opens the breakage report subview when clicked.
+protections-panel-sitefixedsendreport-label = Site fixed? Send report
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/sync-brand.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/sync-brand.ftl
@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-sync-brand-short-name = Sync
+
+# “Sync” can be localized, “Firefox” must be treated as a brand,
+# and kept in English.
+-sync-brand-name = Firefox Sync
+
+# “Account” can be localized, “Firefox” must be treated as a brand,
+# and kept in English.
+-fxaccount-brand-name = Firefox Account
--- a/third_party/rust/fluent-syntax/benches/contexts/browser/textActions.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/browser/textActions.ftl
@ -0,0 +1,49 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+text-action-undo =
+    .label = Undo
+    .accesskey = U
+
+text-action-undo-shortcut =
+    .key = Z
+
+text-action-redo =
+    .label = Redo
+    .accesskey = R
+
+text-action-redo-shortcut =
+    .key = Y
+
+text-action-cut =
+    .label = Cut
+    .accesskey = t
+
+text-action-cut-shortcut =
+    .key = X
+
+text-action-copy =
+    .label = Copy
+    .accesskey = C
+
+text-action-copy-shortcut =
+    .key = C
+
+text-action-paste =
+    .label = Paste
+    .accesskey = P
+
+text-action-paste-shortcut =
+    .key = V
+
+text-action-delete =
+    .label = Delete
+    .accesskey = D
+
+text-action-select-all =
+    .label = Select All
+    .accesskey = A
+
+text-action-select-all-shortcut =
+    .key = A
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/aboutDialog.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/aboutDialog.ftl
@ -0,0 +1,61 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+aboutDialog-title =
+    .title = About { -brand-full-name }
+
+releaseNotes-link = What’s new
+
+update-checkForUpdatesButton =
+    .label = Check for updates
+    .accesskey = C
+
+update-updateButton =
+    .label = Restart to update { -brand-shorter-name }
+    .accesskey = R
+
+update-checkingForUpdates = Checking for updates…
+update-downloading = <img data-l10n-name="icon"/>Downloading update — <label data-l10n-name="download-status"/>
+update-applying = Applying update…
+
+update-failed = Update failed. <label data-l10n-name="failed-link">Download the latest version</label>
+update-failed-main =
+    Update failed. <a data-l10n-name="failed-link-main">Download the latest version</a>
+
+update-adminDisabled = Updates disabled by your system administrator
+update-noUpdatesFound = { -brand-short-name } is up to date
+update-otherInstanceHandlingUpdates = { -brand-short-name } is being updated by another instance
+
+update-manual = Updates available at <label data-l10n-name="manual-link"/>
+
+update-unsupported = You can not perform further updates on this system. <label data-l10n-name="unsupported-link">Learn more</label>
+
+update-restarting = Restarting…
+
+channel-description = You are currently on the <label data-l10n-name="current-channel"></label> update channel.
+
+warningDesc-version = { -brand-short-name } is experimental and may be unstable.
+
+community-exp = <label data-l10n-name="community-exp-mozillaLink">{ -vendor-short-name }</label> is a <label data-l10n-name="community-exp-creditsLink">global community</label> working together to keep the Web open, public and accessible to all.
+
+community-2 = { -brand-short-name } is designed by <label data-l10n-name="community-mozillaLink">{ -vendor-short-name }</label>, a <label data-l10n-name="community-creditsLink">global community</label> working together to keep the Web open, public and accessible to all.
+
+helpus = Want to help? <label data-l10n-name="helpus-donateLink">Make a donation</label> or <label data-l10n-name="helpus-getInvolvedLink">get involved!</label>
+
+bottomLinks-license = Licensing Information
+bottomLinks-rights = End-User Rights
+bottomLinks-privacy = Privacy Policy
+
+# Example of resulting string: 66.0.1 (64-bit)
+# Variables:
+#   $version (String): version of Firefox, e.g. 66.0.1
+#   $bits (Number): bits of the architecture (32 or 64)
+aboutDialog-version = { $version } ({ $bits }-bit)
+
+# Example of resulting string: 66.0a1 (2019-01-16) (64-bit)
+# Variables:
+#   $version (String): version of Firefox for Nightly builds, e.g. 66.0a1
+#   $isodate (String): date in ISO format, e.g. 2019-01-16
+#   $bits (Number): bits of the architecture (32 or 64)
+aboutDialog-version-nightly = { $version } ({ $isodate }) ({ $bits }-bit)
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/blocklists.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/blocklists.ftl
@ -0,0 +1,36 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+blocklist-window =
+    .title = Block Lists
+    .style = width: 55em
+
+blocklist-description = Choose the list { -brand-short-name } uses to block online trackers. Lists provided by <a data-l10n-name="disconnect-link" title="Disconnect">Disconnect</a>.
+blocklist-close-key =
+    .key = w
+
+blocklist-treehead-list =
+    .label = List
+
+blocklist-button-cancel =
+    .label = Cancel
+    .accesskey = C
+
+blocklist-button-ok =
+    .label = Save Changes
+    .accesskey = S
+
+# This template constructs the name of the block list in the block lists dialog.
+# It combines the list name and description.
+# e.g. "Standard (Recommended). This list does a pretty good job."
+#
+# Variables:
+#   $listName {string, "Standard (Recommended)."} - List name.
+#   $description {string, "This list does a pretty good job."} - Description of the list.
+blocklist-item-list-template = { $listName } { $description }
+
+blocklist-item-moz-std-listName = Level 1 block list (Recommended).
+blocklist-item-moz-std-description = Allows some trackers so fewer websites break.
+blocklist-item-moz-full-listName = Level 2 block list.
+blocklist-item-moz-full-description = Blocks all detected trackers. Some websites or content may not load properly.
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/brand.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/brand.ftl
@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Firefox Brand
+##
+## Firefox must be treated as a brand, and kept in English.
+## It cannot be:
+## - Declined to adapt to grammatical case.
+## - Transliterated.
+## - Translated.
+##
+## Reference: https://www.mozilla.org/styleguide/communications/translation/
+
+-brand-shorter-name = Firefox
+-brand-short-name = Firefox
+-brand-full-name = Mozilla Firefox
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Firefox
+-vendor-short-name = Mozilla
+trademarkInfo = Firefox and the Firefox logos are trademarks of the Mozilla Foundation.
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/brandings.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/brandings.ftl
@ -0,0 +1,18 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## The following feature names must be treated as a brand, and kept in English.
+## They cannot be:
+## - Declined to adapt to grammatical case.
+## - Transliterated.
+## - Translated.
+
+-facebook-container-brand-name = Facebook Container
+-lockwise-brand-name = Firefox Lockwise
+-lockwise-brand-short-name = Lockwise
+-monitor-brand-name = Firefox Monitor
+-monitor-brand-short-name = Monitor
+-pocket-brand-name = Pocket
+-send-brand-name = Firefox Send
+-screenshots-brand-name = Firefox Screenshots
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/certManager.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/certManager.ftl
@ -0,0 +1,296 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+certmgr-title =
+    .title = Certificate Manager
+
+certmgr-tab-mine =
+    .label = Your Certificates
+
+certmgr-tab-people =
+    .label = People
+
+certmgr-tab-servers =
+    .label = Servers
+
+certmgr-tab-ca =
+    .label = Authorities
+
+certmgr-mine = You have certificates from these organizations that identify you
+certmgr-people = You have certificates on file that identify these people
+certmgr-servers = You have certificates on file that identify these servers
+certmgr-ca = You have certificates on file that identify these certificate authorities
+
+certmgr-detail-general-tab-title =
+    .label = General
+    .accesskey = G
+
+certmgr-detail-pretty-print-tab-title =
+    .label = Details
+    .accesskey = D
+
+certmgr-pending-label =
+    .value = Currently verifying certificate…
+
+certmgr-subject-label = Issued To
+
+certmgr-issuer-label = Issued By
+
+certmgr-period-of-validity = Period of Validity
+
+certmgr-fingerprints = Fingerprints
+
+certmgr-cert-detail =
+    .title = Certificate Detail
+    .buttonlabelaccept = Close
+    .buttonaccesskeyaccept = C
+
+certmgr-cert-detail-commonname = Common Name (CN)
+
+certmgr-cert-detail-org = Organization (O)
+
+certmgr-cert-detail-orgunit = Organizational Unit (OU)
+
+certmgr-cert-detail-serial-number = Serial Number
+
+certmgr-cert-detail-sha-256-fingerprint = SHA-256 Fingerprint
+
+certmgr-cert-detail-sha-1-fingerprint = SHA1 Fingerprint
+
+certmgr-edit-ca-cert =
+    .title = Edit CA certificate trust settings
+    .style = width: 48em;
+
+certmgr-edit-cert-edit-trust = Edit trust settings:
+
+certmgr-edit-cert-trust-ssl =
+    .label = This certificate can identify websites.
+
+certmgr-edit-cert-trust-email =
+    .label = This certificate can identify mail users.
+
+certmgr-delete-cert =
+    .title = Delete Certificate
+    .style = width: 48em; height: 24em;
+
+certmgr-cert-name =
+    .label = Certificate Name
+
+certmgr-cert-server =
+    .label = Server
+
+certmgr-override-lifetime =
+    .label = Lifetime
+
+certmgr-token-name =
+    .label = Security Device
+
+certmgr-begins-on = Begins On
+
+certmgr-begins-label =
+    .label = Begins On
+
+certmgr-expires-on = Expires On
+
+certmgr-expires-label =
+    .label = Expires On
+
+certmgr-email =
+    .label = E-Mail Address
+
+certmgr-serial =
+    .label = Serial Number
+
+certmgr-view =
+    .label = View…
+    .accesskey = V
+
+certmgr-edit =
+    .label = Edit Trust…
+    .accesskey = E
+
+certmgr-export =
+    .label = Export…
+    .accesskey = x
+
+certmgr-delete =
+    .label = Delete…
+    .accesskey = D
+
+certmgr-delete-builtin =
+    .label = Delete or Distrust…
+    .accesskey = D
+
+certmgr-backup =
+    .label = Backup…
+    .accesskey = B
+
+certmgr-backup-all =
+    .label = Backup All…
+    .accesskey = k
+
+certmgr-restore =
+    .label = Import…
+    .accesskey = m
+
+certmgr-details =
+    .value = Certificate Fields
+    .accesskey = F
+
+certmgr-fields =
+    .value = Field Value
+    .accesskey = V
+
+certmgr-hierarchy =
+    .value = Certificate Hierarchy
+    .accesskey = H
+
+certmgr-add-exception =
+    .label = Add Exception…
+    .accesskey = x
+
+exception-mgr =
+    .title = Add Security Exception
+
+exception-mgr-extra-button =
+    .label = Confirm Security Exception
+    .accesskey = C
+
+exception-mgr-supplemental-warning = Legitimate banks, stores, and other public sites will not ask you to do this.
+
+exception-mgr-cert-location-url =
+    .value = Location:
+
+exception-mgr-cert-location-download =
+    .label = Get Certificate
+    .accesskey = G
+
+exception-mgr-cert-status-view-cert =
+    .label = View…
+    .accesskey = V
+
+exception-mgr-permanent =
+    .label = Permanently store this exception
+    .accesskey = P
+
+pk11-bad-password = The password entered was incorrect.
+pkcs12-decode-err = Failed to decode the file. Either it is not in PKCS #12 format, has been corrupted, or the password you entered was incorrect.
+pkcs12-unknown-err-restore = Failed to restore the PKCS #12 file for unknown reasons.
+pkcs12-unknown-err-backup = Failed to create the PKCS #12 backup file for unknown reasons.
+pkcs12-unknown-err = The PKCS #12 operation failed for unknown reasons.
+pkcs12-info-no-smartcard-backup = It is not possible to back up certificates from a hardware security device such as a smart card.
+pkcs12-dup-data = The certificate and private key already exist on the security device.
+
+## PKCS#12 file dialogs
+choose-p12-backup-file-dialog = File Name to Backup
+file-browse-pkcs12-spec = PKCS12 Files
+choose-p12-restore-file-dialog = Certificate File to Import
+
+## Import certificate(s) file dialog
+file-browse-certificate-spec = Certificate Files
+import-ca-certs-prompt = Select File containing CA certificate(s) to import
+import-email-cert-prompt = Select File containing somebody’s Email certificate to import
+
+## For editing certificates trust
+
+# Variables:
+#   $certName: the name of certificate
+edit-trust-ca = The certificate “{ $certName }” represents a Certificate Authority.
+
+## For Deleting Certificates
+
+delete-user-cert-title =
+    .title = Delete your Certificates
+delete-user-cert-confirm = Are you sure you want to delete these certificates?
+delete-user-cert-impact = If you delete one of your own certificates, you can no longer use it to identify yourself.
+
+
+delete-ssl-cert-title =
+    .title = Delete Server Certificate Exceptions
+delete-ssl-cert-confirm = Are you sure you want to delete these server exceptions?
+delete-ssl-cert-impact = If you delete a server exception, you restore the usual security checks for that server and require it uses a valid certificate.
+
+delete-ca-cert-title =
+    .title = Delete or Distrust CA Certificates
+delete-ca-cert-confirm = You have requested to delete these CA certificates. For built-in certificates all trust will be removed, which has the same effect. Are you sure you want to delete or distrust?
+delete-ca-cert-impact = If you delete or distrust a certificate authority (CA) certificate, this application will no longer trust any certificates issued by that CA.
+
+
+delete-email-cert-title =
+    .title = Delete E-Mail Certificates
+delete-email-cert-confirm = Are you sure you want to delete these people’s e-mail certificates?
+delete-email-cert-impact = If you delete a person’s e-mail certificate, you will no longer be able to send encrypted e-mail to that person.
+
+# Used for semi-uniquely representing a cert.
+#
+# Variables:
+#   $serialNumber : the serial number of the cert in AA:BB:CC hex format.
+cert-with-serial =
+    .value = Certificate with serial number: { $serialNumber }
+
+## Cert Viewer
+
+# Title used for the Certificate Viewer.
+#
+# Variables:
+#   $certificate : a string representative of the certificate being viewed.
+cert-viewer-title =
+    .title = Certificate Viewer: “{ $certName }”
+
+not-present =
+    .value = <Not Part Of Certificate>
+
+# Cert verification
+cert-verified = This certificate has been verified for the following uses:
+
+# Add usage
+verify-ssl-client =
+    .value = SSL Client Certificate
+
+verify-ssl-server =
+    .value = SSL Server Certificate
+
+verify-ssl-ca =
+    .value = SSL Certificate Authority
+
+verify-email-signer =
+    .value = Email Signer Certificate
+
+verify-email-recip =
+    .value = Email Recipient Certificate
+
+# Cert verification
+cert-not-verified-cert-revoked = Could not verify this certificate because it has been revoked.
+cert-not-verified-cert-expired = Could not verify this certificate because it has expired.
+cert-not-verified-cert-not-trusted = Could not verify this certificate because it is not trusted.
+cert-not-verified-issuer-not-trusted = Could not verify this certificate because the issuer is not trusted.
+cert-not-verified-issuer-unknown = Could not verify this certificate because the issuer is unknown.
+cert-not-verified-ca-invalid = Could not verify this certificate because the CA certificate is invalid.
+cert-not-verified_algorithm-disabled = Could not verify this certificate because it was signed using a signature algorithm that was disabled because that algorithm is not secure.
+cert-not-verified-unknown = Could not verify this certificate for unknown reasons.
+
+## Add Security Exception dialog
+add-exception-branded-warning = You are about to override how { -brand-short-name } identifies this site.
+add-exception-invalid-header = This site attempts to identify itself with invalid information.
+add-exception-domain-mismatch-short = Wrong Site
+add-exception-domain-mismatch-long = The certificate belongs to a different site, which could mean that someone is trying to impersonate this site.
+add-exception-expired-short = Outdated Information
+add-exception-expired-long = The certificate is not currently valid. It may have been stolen or lost, and could be used by someone to impersonate this site.
+add-exception-unverified-or-bad-signature-short = Unknown Identity
+add-exception-unverified-or-bad-signature-long = The certificate is not trusted because it hasn’t been verified as issued by a trusted authority using a secure signature.
+add-exception-valid-short = Valid Certificate
+add-exception-valid-long = This site provides valid, verified identification.  There is no need to add an exception.
+add-exception-checking-short = Checking Information
+add-exception-checking-long = Attempting to identify this site…
+add-exception-no-cert-short = No Information Available
+add-exception-no-cert-long = Unable to obtain identification status for this site.
+
+## Certificate export "Save as" and error dialogs
+save-cert-as = Save Certificate To File
+cert-format-base64 = X.509 Certificate (PEM)
+cert-format-base64-chain = X.509 Certificate with chain (PEM)
+cert-format-der = X.509 Certificate (DER)
+cert-format-pkcs7 = X.509 Certificate (PKCS#7)
+cert-format-pkcs7-chain = X.509 Certificate with chain (PKCS#7)
+write-file-failure = File Error
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/clearSiteData.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/clearSiteData.ftl
@ -0,0 +1,60 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+clear-site-data-window =
+    .title = Clear Data
+    .style = width: 35em
+
+clear-site-data-description = Clearing all cookies and site data stored by { -brand-short-name } may sign you out of websites and remove offline web content. Clearing cache data will not affect your logins.
+
+clear-site-data-close-key =
+    .key = w
+
+# The parameters in parentheses in this string describe disk usage
+# in the format ($amount $unit), e.g. "Cookies and Site Data (24 KB)"
+# Variables:
+#   $amount (Number) - Amount of site data currently stored on disk
+#   $unit (String) - Abbreviation of the unit that $amount is in, e.g. "MB"
+clear-site-data-cookies-with-data =
+    .label = Cookies and Site Data ({ $amount } { $unit })
+    .accesskey = S
+
+# This string is a placeholder for while the data used to fill
+# clear-site-data-cookies-with-data is loading. This placeholder is usually
+# only shown for a very short time (< 1s), so it should be very similar
+# or the same as clear-site-data-cookies-with-data (except the amount and unit),
+# to avoid flickering.
+clear-site-data-cookies-empty =
+    .label = Cookies and Site Data
+    .accesskey = S
+
+clear-site-data-cookies-info = You may get signed out of websites if cleared
+
+# The parameters in parentheses in this string describe disk usage
+# in the format ($amount $unit), e.g. "Cached Web Content (24 KB)"
+# Variables:
+#   $amount (Number) - Amount of cache currently stored on disk
+#   $unit (String) - Abbreviation of the unit that $amount is in, e.g. "MB"
+clear-site-data-cache-with-data =
+    .label = Cached Web Content ({ $amount } { $unit })
+    .accesskey = W
+
+# This string is a placeholder for while the data used to fill
+# clear-site-data-cache-with-data is loading. This placeholder is usually
+# only shown for a very short time (< 1s), so it should be very similar
+# or the same as clear-site-data-cache-with-data (except the amount and unit),
+# to avoid flickering.
+clear-site-data-cache-empty =
+    .label = Cached Web Content
+    .accesskey = W
+
+clear-site-data-cache-info = Will require websites to reload images and data
+
+clear-site-data-cancel =
+    .label = Cancel
+    .accesskey = C
+
+clear-site-data-clear =
+    .label = Clear
+    .accesskey = l
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/colors.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/colors.ftl
@ -0,0 +1,48 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+colors-window =
+    .title = Colors
+    .style =
+        { PLATFORM() ->
+            [macos] width: 41em
+           *[other] width: 38em
+        }
+
+colors-close-key =
+    .key = w
+
+colors-page-override = Override the colors specified by the page with your selections above
+    .accesskey = O
+
+colors-page-override-option-always =
+    .label = Always
+colors-page-override-option-auto =
+    .label = Only with High Contrast themes
+colors-page-override-option-never =
+    .label = Never
+
+colors-text-and-background = Text and Background
+
+colors-text-header = Text
+    .accesskey = T
+
+colors-background = Background
+    .accesskey = B
+
+colors-use-system =
+    .label = Use system colors
+    .accesskey = s
+
+colors-underline-links =
+    .label = Underline links
+    .accesskey = U
+
+colors-links-header = Link Colors
+
+colors-unvisited-links = Unvisited Links
+    .accesskey = L
+
+colors-visited-links = Visited Links
+    .accesskey = V
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/connection.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/connection.ftl
@ -0,0 +1,106 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+connection-window =
+    .title = Connection Settings
+    .style =
+        { PLATFORM() ->
+            [macos] width: 44em
+           *[other] width: 49em
+        }
+
+connection-close-key =
+    .key = w
+
+connection-disable-extension =
+    .label = Disable Extension
+
+connection-proxy-configure = Configure Proxy Access to the Internet
+
+connection-proxy-option-no =
+    .label = No proxy
+    .accesskey = y
+connection-proxy-option-system =
+    .label = Use system proxy settings
+    .accesskey = U
+connection-proxy-option-auto =
+    .label = Auto-detect proxy settings for this network
+    .accesskey = w
+connection-proxy-option-manual =
+    .label = Manual proxy configuration
+    .accesskey = M
+
+connection-proxy-http = HTTP Proxy
+    .accesskey = x
+connection-proxy-http-port = Port
+    .accesskey = P
+connection-proxy-http-sharing =
+    .label = Also use this proxy for FTP and HTTPS
+    .accesskey = s
+
+connection-proxy-https = HTTPS Proxy
+    .accesskey = H
+connection-proxy-ssl-port = Port
+    .accesskey = o
+
+connection-proxy-ftp = FTP Proxy
+    .accesskey = F
+connection-proxy-ftp-port = Port
+    .accesskey = r
+
+connection-proxy-socks = SOCKS Host
+    .accesskey = C
+connection-proxy-socks-port = Port
+    .accesskey = t
+
+connection-proxy-socks4 =
+    .label = SOCKS v4
+    .accesskey = K
+connection-proxy-socks5 =
+    .label = SOCKS v5
+    .accesskey = v
+connection-proxy-noproxy = No proxy for
+    .accesskey = N
+
+connection-proxy-noproxy-desc = Example: .mozilla.org, .net.nz, 192.168.1.0/24
+
+# Do not translate localhost, 127.0.0.1 and ::1.
+connection-proxy-noproxy-localhost-desc = Connections to localhost, 127.0.0.1, and ::1 are never proxied.
+
+connection-proxy-autotype =
+    .label = Automatic proxy configuration URL
+    .accesskey = A
+
+connection-proxy-reload =
+    .label = Reload
+    .accesskey = e
+
+connection-proxy-autologin =
+    .label = Do not prompt for authentication if password is saved
+    .accesskey = i
+    .tooltip = This option silently authenticates you to proxies when you have saved credentials for them. You will be prompted if authentication fails.
+
+connection-proxy-socks-remote-dns =
+    .label = Proxy DNS when using SOCKS v5
+    .accesskey = D
+
+connection-dns-over-https =
+    .label = Enable DNS over HTTPS
+    .accesskey = b
+
+connection-dns-over-https-url-resolver = Use Provider
+    .accesskey = P
+
+# Variables:
+#   $name (String) - Display name or URL for the DNS over HTTPS provider
+connection-dns-over-https-url-item-default =
+    .label = { $name } (Default)
+    .tooltiptext = Use the default URL for resolving DNS over HTTPS
+
+connection-dns-over-https-url-custom =
+    .label = Custom
+    .accesskey = C
+    .tooltiptext = Enter your preferred URL for resolving DNS over HTTPS
+
+connection-dns-over-https-custom-label = Custom
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/deviceManager.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/deviceManager.ftl
@ -0,0 +1,130 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## Strings used for device manager
+devmgr =
+    .title = Device Manager
+    .style = width: 67em; height: 32em;
+
+devmgr-devlist =
+    .label = Security Modules and Devices
+
+devmgr-header-details =
+    .label = Details
+
+devmgr-header-value =
+    .label = Value
+
+devmgr-button-login =
+    .label = Log In
+    .accesskey = n
+
+devmgr-button-logout =
+    .label = Log Out
+    .accesskey = O
+
+devmgr-button-changepw =
+    .label = Change Password
+    .accesskey = P
+
+devmgr-button-load =
+    .label = Load
+    .accesskey = L
+
+devmgr-button-unload =
+    .label = Unload
+    .accesskey = U
+
+devmgr-button-enable-fips =
+    .label = Enable FIPS
+    .accesskey = F
+
+devmgr-button-disable-fips =
+    .label = Disable FIPS
+    .accesskey = F
+
+## Strings used for load device
+load-device =
+    .title = Load PKCS#11 Device Driver
+
+load-device-info = Enter the information for the module you want to add.
+
+load-device-modname =
+    .value = Module Name
+    .accesskey = M
+
+load-device-modname-default =
+    .value = New PKCS#11 Module
+
+load-device-filename =
+    .value = Module filename
+    .accesskey = f
+
+load-device-browse =
+    .label = Browse…
+    .accesskey = B
+
+## Token Manager
+
+devinfo-status =
+    .label = Status
+
+devinfo-status-disabled =
+    .label = Disabled
+
+devinfo-status-not-present =
+    .label = Not Present
+
+devinfo-status-uninitialized =
+    .label = Uninitialized
+
+devinfo-status-not-logged-in =
+    .label = Not Logged In
+
+devinfo-status-logged-in =
+    .label = Logged In
+
+devinfo-status-ready =
+    .label = Ready
+
+devinfo-desc =
+    .label = Description
+
+devinfo-man-id =
+    .label = Manufacturer
+
+devinfo-hwversion =
+    .label = HW Version
+devinfo-fwversion =
+    .label = FW Version
+
+devinfo-modname =
+    .label = Module
+
+devinfo-modpath =
+    .label = Path
+
+login-failed = Failed to Login
+
+devinfo-label =
+    .label = Label
+
+devinfo-serialnum =
+    .label = Serial Number
+
+fips-nonempty-password-required = FIPS mode requires that you have a Master Password set for each security device. Please set the password before trying to enable FIPS mode.
+unable-to-toggle-fips = Unable to change the FIPS mode for the security device. It is recommended that you exit and restart this application.
+load-pk11-module-file-picker-title = Choose a PKCS#11 device driver to load
+
+# Load Module Dialog
+load-module-help-empty-module-name =
+    .value = The module name cannot be empty.
+
+# Do not translate 'Root Certs'
+load-module-help-root-certs-module-name =
+    .value = ‘Root Certs‘ is reserved and cannot be used as the module name.
+
+add-module-failure = Unable to add module
+del-module-warning = Are you sure you want to delete this security module?
+del-module-error = Unable to delete module
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/fonts.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/fonts.ftl
@ -0,0 +1,160 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+fonts-window =
+    .title = Fonts
+
+fonts-window-close =
+    .key = w
+
+## Font groups by language
+
+fonts-langgroup-header = Fonts for
+    .accesskey = F
+
+fonts-langgroup-arabic =
+    .label = Arabic
+fonts-langgroup-armenian =
+    .label = Armenian
+fonts-langgroup-bengali =
+    .label = Bengali
+fonts-langgroup-simpl-chinese =
+    .label = Simplified Chinese
+fonts-langgroup-trad-chinese-hk =
+    .label = Traditional Chinese (Hong Kong)
+fonts-langgroup-trad-chinese =
+    .label = Traditional Chinese (Taiwan)
+fonts-langgroup-cyrillic =
+    .label = Cyrillic
+fonts-langgroup-devanagari =
+    .label = Devanagari
+fonts-langgroup-ethiopic =
+    .label = Ethiopic
+fonts-langgroup-georgian =
+    .label = Georgian
+fonts-langgroup-el =
+    .label = Greek
+fonts-langgroup-gujarati =
+    .label = Gujarati
+fonts-langgroup-gurmukhi =
+    .label = Gurmukhi
+fonts-langgroup-japanese =
+    .label = Japanese
+fonts-langgroup-hebrew =
+    .label = Hebrew
+fonts-langgroup-kannada =
+    .label = Kannada
+fonts-langgroup-khmer =
+    .label = Khmer
+fonts-langgroup-korean =
+    .label = Korean
+# Translate "Latin" as the name of Latin (Roman) script, not as the name of the Latin language.
+fonts-langgroup-latin =
+    .label = Latin
+fonts-langgroup-malayalam =
+    .label = Malayalam
+fonts-langgroup-math =
+    .label = Mathematics
+fonts-langgroup-odia =
+    .label = Odia
+fonts-langgroup-sinhala =
+    .label = Sinhala
+fonts-langgroup-tamil =
+    .label = Tamil
+fonts-langgroup-telugu =
+    .label = Telugu
+fonts-langgroup-thai =
+    .label = Thai
+fonts-langgroup-tibetan =
+    .label = Tibetan
+fonts-langgroup-canadian =
+    .label = Unified Canadian Syllabary
+fonts-langgroup-other =
+    .label = Other Writing Systems
+
+## Default fonts and their sizes
+
+fonts-proportional-header = Proportional
+    .accesskey = P
+
+fonts-default-serif =
+    .label = Serif
+fonts-default-sans-serif =
+    .label = Sans Serif
+
+fonts-proportional-size = Size
+    .accesskey = z
+
+fonts-serif = Serif
+    .accesskey = S
+
+fonts-sans-serif = Sans-serif
+    .accesskey = n
+
+fonts-monospace = Monospace
+    .accesskey = M
+
+fonts-monospace-size = Size
+    .accesskey = e
+
+fonts-minsize = Minimum font size
+    .accesskey = o
+
+fonts-minsize-none =
+    .label = None
+
+fonts-allow-own =
+    .label = Allow pages to choose their own fonts, instead of your selections above
+    .accesskey = A
+
+## Text Encodings
+##
+## Translate the encoding names as adjectives for an encoding, not as the name
+## of the language.
+
+fonts-languages-fallback-header = Text Encoding for Legacy Content
+fonts-languages-fallback-desc = This text encoding is used for legacy content that fails to declare its encoding.
+
+fonts-languages-fallback-label = Fallback Text Encoding
+    .accesskey = T
+
+fonts-languages-fallback-name-auto =
+    .label = Default for Current Locale
+fonts-languages-fallback-name-arabic =
+    .label = Arabic
+fonts-languages-fallback-name-baltic =
+    .label = Baltic
+fonts-languages-fallback-name-ceiso =
+    .label = Central European, ISO
+fonts-languages-fallback-name-cewindows =
+    .label = Central European, Microsoft
+fonts-languages-fallback-name-simplified =
+    .label = Chinese, Simplified
+fonts-languages-fallback-name-traditional =
+    .label = Chinese, Traditional
+fonts-languages-fallback-name-cyrillic =
+    .label = Cyrillic
+fonts-languages-fallback-name-greek =
+    .label = Greek
+fonts-languages-fallback-name-hebrew =
+    .label = Hebrew
+fonts-languages-fallback-name-japanese =
+    .label = Japanese
+fonts-languages-fallback-name-korean =
+    .label = Korean
+fonts-languages-fallback-name-thai =
+    .label = Thai
+fonts-languages-fallback-name-turkish =
+    .label = Turkish
+fonts-languages-fallback-name-vietnamese =
+    .label = Vietnamese
+fonts-languages-fallback-name-other =
+    .label = Other (incl. Western European)
+
+# Variables:
+#   $name {string, "Arial"} - Name of the default font
+fonts-label-default =
+    .label = Default ({ $name })
+fonts-label-default-unnamed =
+    .label = Default
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/history.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/history.ftl
@ -0,0 +1,27 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+history-title = Update History
+history-intro = The following updates have been installed
+
+close-button-label =
+    .buttonlabelcancel = Close
+    .title = Update History
+
+no-updates-label = No updates installed yet
+name-header = Update Name
+date-header = Install Date
+type-header = Type
+state-header = State
+
+# Used to display update history
+#
+# Variables:
+#   $name (String): name of the update
+#   $buildID (String): build identifier from the local updates.xml
+update-full-build-name = { $name } ({ $buildID })
+
+update-details = Details
+update-installed-on = Installed on: { $date }
+update-status = Status: { $status }
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/languages.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/languages.ftl
@ -0,0 +1,73 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+webpage-languages-window =
+    .title = Webpage Language Settings
+    .style = width: 40em
+
+languages-close-key =
+    .key = w
+
+languages-description = Web pages are sometimes offered in more than one language. Choose languages for displaying these web pages, in order of preference
+
+languages-customize-spoof-english =
+    .label = Request English versions of web pages for enhanced privacy
+
+languages-customize-moveup =
+    .label = Move Up
+    .accesskey = U
+
+languages-customize-movedown =
+    .label = Move Down
+    .accesskey = D
+
+languages-customize-remove =
+    .label = Remove
+    .accesskey = R
+
+languages-customize-select-language =
+    .placeholder = Select a language to add…
+
+languages-customize-add =
+    .label = Add
+    .accesskey = A
+
+# The pattern used to generate strings presented to the user in the
+# locale selection list.
+#
+# Example:
+#   Icelandic [is]
+#   Spanish (Chile) [es-CL]
+#
+# Variables:
+#   $locale (String) - A name of the locale (for example: "Icelandic", "Spanish (Chile)")
+#   $code (String) - Locale code of the locale (for example: "is", "es-CL")
+languages-code-format =
+    .label = { $locale } [{ $code }]
+
+languages-active-code-format =
+    .value = { languages-code-format.label }
+
+browser-languages-window =
+    .title = { -brand-short-name } Language Settings
+    .style = width: 40em
+
+browser-languages-description = { -brand-short-name } will display the first language as your default and will display alternate languages if necessary in the order they appear.
+
+browser-languages-search = Search for more languages…
+
+browser-languages-searching =
+    .label = Searching for languages…
+
+browser-languages-downloading =
+    .label = Downloading…
+
+browser-languages-select-language =
+    .label = Select a language to add…
+    .placeholder = Select a language to add…
+
+browser-languages-installed-label = Installed languages
+browser-languages-available-label = Available languages
+
+browser-languages-error = { -brand-short-name } can’t update your languages right now. Check that you are connected to the internet or try again.
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/permissions.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/permissions.ftl
@ -0,0 +1,170 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+permissions-window =
+    .title = Exceptions
+    .style = width: 45em
+
+permissions-close-key =
+    .key = w
+
+permissions-address = Address of website
+    .accesskey = d
+
+permissions-block =
+    .label = Block
+    .accesskey = B
+
+permissions-session =
+    .label = Allow for Session
+    .accesskey = S
+
+permissions-allow =
+    .label = Allow
+    .accesskey = A
+
+permissions-site-name =
+    .label = Website
+
+permissions-status =
+    .label = Status
+
+permissions-remove =
+    .label = Remove Website
+    .accesskey = R
+
+permissions-remove-all =
+    .label = Remove All Websites
+    .accesskey = e
+
+permissions-button-cancel =
+    .label = Cancel
+    .accesskey = C
+
+permissions-button-ok =
+    .label = Save Changes
+    .accesskey = S
+
+permissions-autoplay-menu = Default for all websites:
+
+permissions-searchbox =
+    .placeholder = Search Website
+
+permissions-capabilities-autoplay-allow =
+    .label = Allow Audio and Video
+permissions-capabilities-autoplay-block =
+    .label = Block Audio
+permissions-capabilities-autoplay-blockall =
+    .label = Block Audio and Video
+
+permissions-capabilities-allow =
+    .label = Allow
+permissions-capabilities-block =
+    .label = Block
+permissions-capabilities-prompt =
+    .label = Always Ask
+
+permissions-capabilities-listitem-allow =
+    .value = Allow
+permissions-capabilities-listitem-block =
+    .value = Block
+permissions-capabilities-listitem-allow-session =
+    .value = Allow for Session
+
+## Invalid Hostname Dialog
+
+permissions-invalid-uri-title = Invalid Hostname Entered
+permissions-invalid-uri-label = Please enter a valid hostname
+
+## Exceptions - Tracking Protection
+
+permissions-exceptions-etp-window =
+    .title = Exceptions for Enhanced Tracking Protection
+    .style = { permissions-window.style }
+permissions-exceptions-etp-desc = You’ve turned off protections on these websites.
+
+## Exceptions - Cookies
+
+permissions-exceptions-cookie-window =
+    .title = Exceptions - Cookies and Site Data
+    .style = { permissions-window.style }
+permissions-exceptions-cookie-desc = You can specify which websites are always or never allowed to use cookies and site data.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
+
+## Exceptions - Pop-ups
+
+permissions-exceptions-popup-window =
+    .title = Allowed Websites - Pop-ups
+    .style = { permissions-window.style }
+permissions-exceptions-popup-desc = You can specify which websites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow.
+
+## Exceptions - Saved Logins
+
+permissions-exceptions-saved-logins-window =
+    .title = Exceptions - Saved Logins
+    .style = { permissions-window.style }
+permissions-exceptions-saved-logins-desc = Logins for the following websites will not be saved
+
+## Exceptions - Add-ons
+
+permissions-exceptions-addons-window =
+    .title = Allowed Websites - Add-ons Installation
+    .style = { permissions-window.style }
+permissions-exceptions-addons-desc = You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
+
+## Site Permissions - Autoplay
+
+permissions-site-autoplay-window =
+    .title = Settings - Autoplay
+    .style = { permissions-window.style }
+permissions-site-autoplay-desc = You can manage the sites that do not follow your default autoplay settings here.
+
+## Site Permissions - Notifications
+
+permissions-site-notification-window =
+    .title = Settings - Notification Permissions
+    .style = { permissions-window.style }
+permissions-site-notification-desc = The following websites have requested to send you notifications. You can specify which websites are allowed to send you notifications. You can also block new requests asking to allow notifications.
+permissions-site-notification-disable-label =
+    .label = Block new requests asking to allow notifications
+permissions-site-notification-disable-desc = This will prevent any websites not listed above from requesting permission to send notifications. Blocking notifications may break some website features.
+
+## Site Permissions - Location
+
+permissions-site-location-window =
+    .title = Settings - Location Permissions
+    .style = { permissions-window.style }
+permissions-site-location-desc = The following websites have requested to access your location. You can specify which websites are allowed to access your location. You can also block new requests asking to access your location.
+permissions-site-location-disable-label =
+    .label = Block new requests asking to access your location
+permissions-site-location-disable-desc = This will prevent any websites not listed above from requesting permission to access your location. Blocking access to your location may break some website features.
+
+## Site Permissions - Virtual Reality
+
+permissions-site-xr-window =
+    .title = Settings - Virtual Reality Permissions
+    .style = { permissions-window.style }
+permissions-site-xr-desc = The following websites have requested to access your virtual reality devices. You can specify which websites are allowed to access your virtual reality devices. You can also block new requests asking to access your virtual reality devices.
+permissions-site-xr-disable-label =
+    .label = Block new requests asking to access your virtual reality devices
+permissions-site-xr-disable-desc = This will prevent any websites not listed above from requesting permission to access your virtual reality devices. Blocking access to your virtual reality devices may break some website features.
+
+## Site Permissions - Camera
+
+permissions-site-camera-window =
+    .title = Settings - Camera Permissions
+    .style = { permissions-window.style }
+permissions-site-camera-desc = The following websites have requested to access your camera. You can specify which websites are allowed to access your camera. You can also block new requests asking to access your camera.
+permissions-site-camera-disable-label =
+    .label = Block new requests asking to access your camera
+permissions-site-camera-disable-desc = This will prevent any websites not listed above from requesting permission to access your camera. Blocking access to your camera may break some website features.
+
+## Site Permissions - Microphone
+
+permissions-site-microphone-window =
+    .title = Settings - Microphone Permissions
+    .style = { permissions-window.style }
+permissions-site-microphone-desc = The following websites have requested to access your microphone. You can specify which websites are allowed to access your microphone. You can also block new requests asking to access your microphone.
+permissions-site-microphone-disable-label =
+    .label = Block new requests asking to access your microphone
+permissions-site-microphone-disable-desc = This will prevent any websites not listed above from requesting permission to access your microphone. Blocking access to your microphone may break some website features.
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/preferences.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/preferences.ftl
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/sanitize.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/sanitize.ftl
@ -0,0 +1,110 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+sanitize-prefs =
+    .title = Settings for Clearing History
+    .style = width: 34em
+
+sanitize-prefs-style =
+    .style = width: 17em
+
+dialog-title =
+    .title = Clear Recent History
+    .style = width: 34em
+
+# When "Time range to clear" is set to "Everything", this message is used for the
+# title instead of dialog-title.
+dialog-title-everything =
+    .title = Clear All History
+    .style = width: 34em
+
+clear-data-settings-label = When closed, { -brand-short-name } should automatically clear all
+
+## clear-time-duration-prefix is followed by a dropdown list, with
+## values localized using clear-time-duration-value-* messages.
+## clear-time-duration-suffix is left empty in English, but can be
+## used in other languages to change the structure of the message.
+##
+## This results in English:
+## Time range to clear: (Last Hour, Today, etc.)
+
+clear-time-duration-prefix =
+    .value = Time range to clear:{ " " }
+    .accesskey = T
+
+clear-time-duration-value-last-hour =
+    .label = Last Hour
+
+clear-time-duration-value-last-2-hours =
+    .label = Last Two Hours
+
+clear-time-duration-value-last-4-hours =
+    .label = Last Four Hours
+
+clear-time-duration-value-today =
+    .label = Today
+
+clear-time-duration-value-everything =
+    .label = Everything
+
+clear-time-duration-suffix =
+    .value = { "" }
+
+## These strings are used as section comments and checkboxes
+## to select the items to remove
+
+history-section-label = History
+
+item-history-and-downloads =
+    .label = Browsing & Download History
+    .accesskey = B
+
+item-cookies =
+    .label = Cookies
+    .accesskey = C
+
+item-active-logins =
+    .label = Active Logins
+    .accesskey = L
+
+item-cache =
+    .label = Cache
+    .accesskey = a
+
+item-form-search-history =
+    .label = Form & Search History
+    .accesskey = F
+
+data-section-label = Data
+
+item-site-preferences =
+    .label = Site Preferences
+    .accesskey = S
+
+item-offline-apps =
+    .label = Offline Website Data
+    .accesskey = O
+
+sanitize-everything-undo-warning = This action cannot be undone.
+
+window-close =
+    .key = w
+
+sanitize-button-ok =
+    .label = Clear Now
+
+# The label for the default button between the user clicking it and the window
+# closing.  Indicates the items are being cleared.
+sanitize-button-clearing =
+    .label = Clearing
+
+# Warning that appears when "Time range to clear" is set to "Everything" in Clear
+# Recent History dialog, provided that the user has not modified the default set
+# of history items to clear.
+sanitize-everything-warning = All history will be cleared.
+
+# Warning that appears when "Time range to clear" is set to "Everything" in Clear
+# Recent History dialog, provided that the user has modified the default set of
+# history items to clear.
+sanitize-selected-warning = All selected items will be cleared.
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/selectBookmark.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/selectBookmark.ftl
@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+select-bookmark-window =
+    .title = Set Home Page
+    .style = width: 32em;
+
+select-bookmark-desc = Choose a Bookmark to be your Home Page. If you choose a folder, the Bookmarks in that folder will be opened in Tabs.
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/siteDataSettings.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/siteDataSettings.ftl
@ -0,0 +1,67 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+## Settings
+
+site-data-settings-window =
+    .title = Manage Cookies and Site Data
+
+site-data-settings-description = The following websites store cookies and site data on your computer. { -brand-short-name } keeps data from websites with persistent storage until you delete it, and deletes data from websites with non-persistent storage as space is needed.
+
+site-data-search-textbox =
+    .placeholder = Search websites
+    .accesskey = S
+
+site-data-column-host =
+    .label = Site
+site-data-column-cookies =
+    .label = Cookies
+site-data-column-storage =
+    .label = Storage
+site-data-column-last-used =
+    .label = Last Used
+
+# This label is used in the "Host" column for local files, which have no host.
+site-data-local-file-host = (local file)
+
+site-data-remove-selected =
+    .label = Remove Selected
+    .accesskey = R
+
+site-data-button-cancel =
+    .label = Cancel
+    .accesskey = C
+
+site-data-button-save =
+    .label = Save Changes
+    .accesskey = a
+
+# Variables:
+#   $value (Number) - Value of the unit (for example: 4.6, 500)
+#   $unit (String) - Name of the unit (for example: "bytes", "KB")
+site-storage-usage =
+    .value = { $value } { $unit }
+site-storage-persistent =
+    .value = { site-storage-usage.value } (Persistent)
+
+site-data-remove-all =
+    .label = Remove All
+    .accesskey = e
+
+site-data-remove-shown =
+    .label = Remove All Shown
+    .accesskey = e
+
+## Removing
+
+site-data-removing-dialog =
+    .title = { site-data-removing-header }
+    .buttonlabelaccept = Remove
+
+site-data-removing-header = Removing Cookies and Site Data
+
+site-data-removing-desc = Removing cookies and site data may log you out of websites. Are you sure you want to make the changes?
+
+site-data-removing-table = Cookies and site data for the following websites will be removed
--- a/third_party/rust/fluent-syntax/benches/contexts/preferences/sync-brand.ftl
+++ b/third_party/rust/fluent-syntax/benches/contexts/preferences/sync-brand.ftl
@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-sync-brand-short-name = Sync
+
+# “Sync” can be localized, “Firefox” must be treated as a brand,
+# and kept in English.
+-sync-brand-name = Firefox Sync
+
+# “Account” can be localized, “Firefox” must be treated as a brand,
+# and kept in English.
+-fxaccount-brand-name = Firefox Account
--- a/third_party/rust/fluent-syntax/benches/parser.rs
+++ b/third_party/rust/fluent-syntax/benches/parser.rs
@ -2,7 +2,7 @@ use criterion::criterion_group;
 use criterion::criterion_main;
 use criterion::Criterion;
 use std::collections::HashMap;
-use std::fs::File;
+use std::fs;
 use std::io;
 use std::io::Read;

@ -10,7 +10,7 @@ use fluent_syntax::parser::parse;
 use fluent_syntax::unicode::unescape_unicode;

 fn read_file(path: &str) -> Result<String, io::Error> {
-    let mut f = File::open(path)?;
+    let mut f = fs::File::open(path)?;
    let mut s = String::new();
    f.read_to_string(&mut s)?;
    Ok(s)
@ -25,6 +25,23 @@ fn get_strings(tests: &[&'static str]) -> HashMap<&'static str, String> {
    return ftl_strings;
 }

+fn get_ctxs(tests: &[&'static str]) -> HashMap<&'static str, Vec<String>> {
+    let mut ftl_strings = HashMap::new();
+    for test in tests {
+        let paths = fs::read_dir(format!("./benches/contexts/{}", test)).unwrap();
+        let strings = paths
+            .into_iter()
+            .map(|p| {
+                let p = p.unwrap().path();
+                let path = p.to_str().unwrap();
+                read_file(path).unwrap()
+            })
+        .collect::<Vec<_>>();
+        ftl_strings.insert(*test, strings);
+    }
+    return ftl_strings;
+}
+
 fn parser_bench(c: &mut Criterion) {
    let tests = &["simple", "preferences", "menubar"];
    let ftl_strings = get_strings(tests);
@ -66,5 +83,23 @@ fn unicode_unescape_bench(c: &mut Criterion) {
    });
 }

-criterion_group!(benches, parser_bench, unicode_unescape_bench);
+fn parser_ctx_bench(c: &mut Criterion) {
+    let tests = &["browser", "preferences"];
+    let ftl_strings = get_ctxs(tests);
+
+    c.bench_function_over_inputs(
+        "parse_ctx",
+        move |b, &&name| {
+            let sources = &ftl_strings[name];
+            b.iter(|| {
+                for source in sources {
+                    parse(source).expect("Parsing of the FTL failed.");
+                }
+            })
+        },
+        tests,
+    );
+}
+
+criterion_group!(benches, parser_bench, unicode_unescape_bench, parser_ctx_bench);
 criterion_main!(benches);
--- a/third_party/rust/fluent-syntax/src/bin/parser.rs
+++ b/third_party/rust/fluent-syntax/src/bin/parser.rs
@ -0,0 +1,34 @@
+use fluent_syntax::parser::parse;
+use std::env;
+use std::fs::File;
+use std::io;
+use std::io::Read;
+
+fn read_file(path: &str) -> Result<String, io::Error> {
+    let mut f = File::open(path)?;
+    let mut s = String::new();
+    f.read_to_string(&mut s)?;
+    Ok(s)
+}
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+    let source = read_file(args.get(1).expect("Pass an argument")).expect("Failed to fetch file");
+
+    let ast = parse(&source).expect("Failed to parse the source.");
+
+
+    #[cfg(feature = "json")]
+    {
+        use fluent_syntax::json;
+        let target_json = json::serialize_to_pretty_json(&ast).unwrap();
+        println!("{}", target_json);
+    }
+    #[cfg(not(feature = "json"))]
+    {
+        use std::fmt::Write;
+        let mut result = String::new();
+        write!(result, "{:#?}", ast).unwrap();
+        println!("{}", result);
+    }
+}
--- a/third_party/rust/fluent-syntax/tests/ast/mod.rs
+++ b/third_party/rust/fluent-syntax/tests/ast/mod.rs
@ -1,4 +1,4 @@
-use fluent_syntax::ast;
+use crate::ast;
 use serde::ser::SerializeMap;
 use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
@ -10,7 +10,7 @@ pub fn serialize<'s>(res: &'s ast::Resource) -> Result<String, Box<dyn Error>> {
    Ok(serde_json::to_string(&Helper(res)).unwrap())
 }

-pub fn _serialize_to_pretty_json<'s>(res: &'s ast::Resource) -> Result<String, Box<dyn Error>> {
+pub fn serialize_to_pretty_json<'s>(res: &'s ast::Resource) -> Result<String, Box<dyn Error>> {
    #[derive(Serialize)]
    struct Helper<'ast>(#[serde(with = "ResourceDef")] &'ast ast::Resource<'ast>);

--- a/third_party/rust/fluent-syntax/src/lib.rs
+++ b/third_party/rust/fluent-syntax/src/lib.rs
@ -1,3 +1,6 @@
 pub mod ast;
 pub mod parser;
 pub mod unicode;
+
+#[cfg(feature = "json")]
+pub mod json;
--- a/third_party/rust/fluent-syntax/src/parser/mod.rs
+++ b/third_party/rust/fluent-syntax/src/parser/mod.rs
@ -495,7 +495,9 @@ fn get_comment<'p>(ps: &mut ParserStream<'p>) -> Result<ast::Comment<'p>> {

        level = Some(line_level);

-        if ps.is_current_byte(b'\n') {
+        if ps.ptr == ps.length {
+            break;
+        } else if ps.is_current_byte(b'\n') {
            content.push(get_comment_line(ps)?);
        } else {
            if let Err(e) = ps.expect_byte(b' ') {
--- a/third_party/rust/fluent-syntax/tests/parser_fixtures.rs
+++ b/third_party/rust/fluent-syntax/tests/parser_fixtures.rs
@ -1,5 +1,3 @@
-mod ast;
-
 use assert_json_diff::assert_json_include;
 use glob::glob;
 use serde_json::Value;
@ -8,6 +6,7 @@ use std::io;
 use std::io::prelude::*;

 use fluent_syntax::parser::parse;
+use fluent_syntax::json;

 fn compare_jsons(value: &str, reference: &str) {
    let a: Value = serde_json::from_str(value).unwrap();
@ -44,7 +43,7 @@ fn parse_fixtures_compare() {
            Err((res, _errors)) => res,
        };

-        let target_json = ast::serialize(&target_ast).unwrap();
+        let target_json = json::serialize(&target_ast).unwrap();

        compare_jsons(&target_json, &reference_file);
    }