diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,310 @@
 # citeproc changelog
 
+## 0.14.2
+
+  * Move punctuation inside quotes wrapped in formatting (#48, Don Yin).
+
+  * Refactor `evalStyle` into separate phases, for readability.
+
+  * Update tests from upstream. There is one less expected failure.
+
+  * Update locales from upstream.
+
+  * Clean up code so we don't get warnings on GHC 9.14.
+
+## 0.14.1.1
+
+  * Group name-less cites only when the text before their dates matches
+    (#184, Daniel Gregg).
+
+  * Initialize given names in caseless romanesque scripts (#186,
+    Daniel Gregg).
+
+  * Do not initialize given names in non-romanesque scripts (#189,
+    Daniel Gregg).
+
+  * Render a literal date only where the date element shows the year
+    (#188, Daniel Gregg).
+
+  * Fix "et al.others" with et-al-use-last and a final "others" name
+    (Don Yin).
+
+  * A single number with digit grouping or a word takes the singular
+    label (#185, Daniel Gregg).
+
+  * Do not italicize text with no romanesque character (#190,
+    Daniel Gregg).
+
+  * Update stop words from canonical list upstream. This affects
+    title case.
+
+## 0.14.1
+
+  * Stop extracting particles from given and family names.
+    citeproc.js implemented a system by which particles would
+    be extracted automatically from given and family names (so
+    that users of Zotero wouldn't have to know about the various
+    types of particles). The test suite does this unless the
+    name is enclosed in straight quotes, in which case it is
+    considered literally. We don't want this feature, because it is
+    not part of the CSL spec, and the CSL JSON files exported from
+    Zotero don't put the quotes where they would be needed for this to
+    work. However, we still remove an outer pair of quotes, in case
+    there is legacy use of this feature.
+    See discussion at jgm/pandoc#11911 .
+
+  * Record how known failures fail, instead of just that they fail. A
+    test we don't yet pass now has an `.expected` file alongside its
+    `.txt` file, containing the output we currently produce. It counts
+    as an expected failure only if its output still matches that file
+    exactly, so a change in a known-bad result is no longer silently
+    tolerated. This replaces the flat list of expected failures in
+    test/Spec.hs, five entries of which had gone stale.
+
+  * Two new test-suite options: `--accept` (re)writes the `.expected` file of
+    every failing test and removes that of every test that now passes, and
+    `--verbose` reports warnings, passes, and expected failures with diffs,
+    which are otherwise suppressed.
+
+  * Add five new tests from upstream (all passing).
+
+## 0.14
+
+  * [API change] Replace unlawful Ord Term instance with `termMatches`.
+    The old instance violated the Ord laws. It was only used for term
+    matching in lookupTerm, so we now export a function `termMatches`
+    for that purpose.
+
+  * [API change] Add `isEmpty` to CiteprocOutput class.
+    This allows us to avoid rendering to Text just to check for
+    emptiness.
+
+  * Fix flip-flop state bugs in `cslJsonToJson`.
+
+  * Fix end-trimming bugs in the pandoc backend's `dropTextWhileEnd'`.
+
+  * Fix EDTF year 0000 (1 BC) rendering as an open date range.
+    EDTF uses astronomical year numbering, in which 0000 means 1 BC, but
+    the parser passed year 0 through unchanged, colliding with the internal
+    year-0 sentinel for the empty side of an open date range; a 1 BC date
+    therefore rendered as nothing.
+
+  * Fix `punctuationInsideQuotes` missing nested quoted content.
+
+  * Remove empty Str elemnets left behind by Pandoc inline trimming.
+
+  * Fix `showYearSuffix` overflow past "zz".
+
+  * Use locale-aware lowercasing in `initialize`.
+
+  * Make `removeDoubleSpaces` collapse all space runs.
+
+  * Add some benchmarks for disambiguation and collapsing.
+
+  * Make disambiguation re-render only affected citations.
+
+  * Avoid repeated traversals in citation grouping.
+
+  * Cache reference lang so we don't reparse it all the time.
+
+  * Simplify `endWithPunct`.
+
+  * Only apply `after-inverted-name` delimiter after actually inverted names.
+    Fixes `test/csl/name_DelimiterAfterInverted.txt`.
+
+  * Compare rendered names in subsequent-author-substitute.
+    Fixes `fullstyles_ChicagoAuthorDateSimple.txt`, `sort_ChicagoYearSuffix1.txt`,
+    and `sort_ChicagoYearSuffix2.txt`.
+
+  * Treat whitespace-only term definitions as empty.
+    Fixes `test/csl/label_EditorTranslator1.txt`.
+
+  * Suppress date variables rendered via `cs:substitute`.
+    Improves `test/csl/bugreports_LegislationCrash.txt`, which
+    however still is an expected failure because of a spurious
+    space in the expected output.
+
+  * Drop cites that render empty after collapsing.
+    Fixes `test/csl/collapse_AuthorCollapseNoDateSorted.txt`.
+
+  * Include non-dropping particle when grouping names for disambiguation.
+    Fixes `test/csl/disambiguate_PrimaryNameWithParticle.txt` and
+    `test/csl/disambiguate_PrimaryNameWithNonDroppingParticle.txt`.
+
+## 0.13.0.1
+
+  * Detect terminal punctuation hidden by closing quotes (#179,
+    Andrew Dunning).
+
+  * Clarify building executable in the README (#177).
+
+## 0.13
+
+  * Add `citationResetPosition` field to `Citation`. [API change]
+    When this field is set, it causes the processor to forget all
+    information about past citations.  This affects processing of
+    `position`.  The intended usage is to set this for the first
+    citation of every chapter, so that "subsequent" behavior is
+    reset at chapter boundaries. See #160 for discussion.
+
+## 0.12
+
+  * Fix suppression of substituted variables for number,
+    short- variants (#174).
+
+  * Fix is-numeric detection for non-locators with en-dash (#175).
+
+  * Fix handling of CSL JSON formatting (i.e. handling of
+    tags like `<i>` and also quotes, which are "smartified") (#170,
+    #173).
+
+    We were previously handling this in the wrong way, by parsing
+    it in the `fromText` method for `CslJson Text`.  This meant that
+    there was no way to prevent quotes from turning into smart
+    quotes, even in things like URLs (see #173).
+
+    What is more, we were not handling this sort of formatting at
+    all in other contexts, e.g. in terms, `text` elements with a
+    `value`, locators, prefixes, and suffixes.  The CSL tests were
+    passing only because the raw HTML was being passed through
+    verbatim, but in other formats this led to undesirable results
+    (see #170).
+
+    Formatting is now parsed in prefix, suffix, locator, text
+    value, and terms.  And `fromText` is now just `CslText`, so that
+    purely textual values like URLs can be inserted.
+
+    We also handle the conversion of Unicode superscript characters
+    to explicit `<sup>.</sup>` in CSL JSON somewhat differently.
+    Instead of making the replacement in *parsing* CSL JSON,
+    which would now affect other formats too, because terms in
+    locales are parsed as CSL JSON, we make the replacement in
+    *rendering* CSL JSON. This gives us behavior consistent with
+    the previous behavior, with the substitution occuring in
+    CSL JSON output but not in Pandoc.
+
+    [API changes]
+
+    + Citeproc.Types now exports `parseCslJson`, `lookupQuotes`,
+      `superscriptChars`.
+    + Citeproc.Locale no longer exports `lookupQuotes`.
+    + `parseCslJson` now takes an additional parameter for a Locale.
+
+  * Add StandardVariable constructor for VariableType [API change]
+    (#173). Also change the interpretation of StringVariable,
+    so that StringVariables are not parsed for quotes and HTML-like
+    formatting. Make URL, ISBN, etc. StringVariables.
+
+  * Test suite improvements:
+
+    + Indicate FAILED:EXPECTED or :UNEXPECTED in output.
+    + Fix formatting of columns in test summary.
+
+## 0.11
+
+  * Expand macros in evaluation rather than style parsing (#172).
+    This fixes a serious performance issue in styles with heavy
+    use of macros, such as the new chicago styles. With this change,
+    memory use goes down by more than a factor of ten with these styles.
+
+  * All fields in NameFormat are now Maybe values, so we can tell what
+    has been explicitly set [API change].
+
+  * A new function `combineNameFormat` allows filling Nothing values
+    in the first argument with Just values in the second [API change].
+    The old defaults that were used for the non-Maybe values are
+    now set at the appropriate place in Citeproc.Eval.
+
+  * Add `styleNameFormat` field to Style [API change].
+
+  * Add `layoutNameFormat` to Layout [API change].
+
+  * Add parameter for a NameFormat to SortKeyMacro constructor on SortKey
+    [API change].
+
+  * CSL JSON: allow formatting in numeric fields (#170).
+    There's a catch, though. Currently the number splitting code
+    (`splitNums`) has to convert everything to text, so the
+    formatting will be lost. Still, this is better than treating
+    the formatting code as plain text which will then be escaped
+    in the output.  So, for example, we get
+    `1er` instead of `1&#60;sup&#62;er&#60;/sup&#62;` for
+    CSL JSON `1<sup>er</sup>`.
+
+  * Improve test suite so that expected failures are tracked.
+
+## 0.10
+
+  * Update locales from upstream (#161). A number of new locales, as well
+    as new terms, e.g. `number-of-volumes`, have been added.
+
+  * Add PreserveCase constructor to TextCase [API change].
+    Ensure that PreserveCase is added to names that begin
+    with a lowercase letter. See jgm/pandoc#10983. This will
+    block transformations like the addition of a capital letter
+    at the beginning of a note citation.
+
+  * Fix handling of `<substitute>` so it works with `<choose>` inside (#159).
+
+  * Put TagPrefix/TagSuffix tags only over prefix/suffix.
+    Previously they also enclosed the material being prefixed/suffixed.
+    This change has no effect on any citeproc or pandoc tests.
+
+  * Update CSL tests from upstream and adjust tests expected to pass.
+    Note that the expected test outputs in these tests seem out of
+    sync with the new locales...
+
+  * locator = "page" should not be true when there is no locator (#165).
+
+  * Add Citation prefix and suffix (#156).
+    This adds `citationPrefix`, `citationSuffix` fields to `Citation`
+    [API change].
+
+  * Fix sorting so that anything with a prefix or suffix is left in place (#155,
+    cf. #89). Motivating example: `blabla [e.g., @zeta2021;@alpha2020]` should
+    not render as (Alpha 2020, e.g., Zeta 2021).
+
+  * Fix entity-escaping of characters in the executable output (#153,
+    Daphne Preston-Kendal).
+
+  * Fix `is-numeric="locator"` (#164). Previously we weren't looking at the
+    locator in this case, but only at the variables defined in the Reference.
+
+  * Improve `is-numeric` detection.
+
+  * Add Eq typeclass instance for `Result a` (Linus Arver) [API change].
+
+  * Improve README (#167, building on suggestinos by @listx).
+
+## 0.9.0.1
+
+  * Fix `readAsInt` so it handles negative numbers in strings.
+    `readAsInt` attempts to read strings as integers, but previously
+    it didn't properly handle strings like `"-387"`, which are
+    sometimes used in bibliographies. See jgm/pandoc#10839.
+
+## 0.9
+
+  * Fix handling of `type` conditions in `if` (#151).
+    In an `if` element with `type="article-journal chapter"`, citeproc
+    previously treated this as two separate conditions
+    (type=article-journal, type=chapter).  But it seems that the
+    intended behavior is to treat it as a single condition that
+    succeeds if any of the listed types match. The difference between
+    current and intended behavior comes out when `match="all"` is used;
+    this will always fail when `type` contains more than one type.
+
+    To fix this, we change the `HasType` constructor on `Condition`
+    so that it takes a list of Texts rather than single one [API change],
+    and we populate it with the result of splitting the argument
+    of `type`. In Eval, we change the clause for the HasType condition
+    so that it succeeds if any of the types in the list match.
+
+  * Add `--link-citations` and `--link-bibliography` options to binary
+    (#142, Daphne Preston-Kendal).
+
+  * Bump containers upper bound.
+
 ## 0.8.1.3
 
  * Don't add SubstitutedVal to variables that were empty (#148).
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -28,11 +28,6 @@
 
 - it is more flexible, not being tied to pandoc's types.
 
-Unlike pandoc-citeproc, this library does not provide an
-executable.  It will be used in pandoc itself to provide
-integrated citation support and bibliography format conversion
-(so the pandoc-citeproc filter will no longer be necessary).
-
 [CSL]: https://docs.citationstyles.org/en/stable/specification.html
 
 ## How to use it
@@ -74,25 +69,32 @@
 which represents formatted content in your bibliographic
 fields (e.g. the title).  If you want a classic CSL processor,
 you can use `CslJson Text`.  But you can also use another type,
-such as a pandoc `Inlines`.  All you need to do is define
-an instance of `CiteprocOutput` for your type.
+such as a pandoc `Inlines`.  If you want to work with a type
+other than these, you need to define an instance of
+`CiteprocOutput` for your type. This tells citeproc how to
+apply various kinds of formatting transformations, such as
+adding emphasis, making things uppercase, and so on.  Note that
+the same type must be used for `Reference`s and `Citation`s; thus,
+for example, you can't process a list of `Citation Inlines`
+against references of type `Reference (CslJson Text)`.
 
 The signature of `parseStyle` may not be self-evident:
 the first argument is a function that takes a URL and
 retrieves the text from that URL.  This is used to fetch
-the "indendent parent" of a dependent style.  You can supply
+the "independent parent" of a dependent style.  You can supply
 whatever function you like: it can search your local file
 system or fetch the content via HTTP.  If you're not using
 dependent styles, you can get by with `\_ -> return mempty`.
 
 ## The citeproc executable
 
-If the package is compiled with the `executable` flag, an
-executable `citeproc` will be built.  `citeproc` reads
-a JSON-encoded `Inputs` object from `stdin` (or from
-a file if a filename is provided) and writes
-a JSON-encoded `Result` object to `stdout`.  This executable
-can be used to add citation processing to non-Haskell projects.
+If the package is compiled with the `executable` flag
+(`cabal build -fexecutable`), a command-line program `citeproc`
+will be built. `citeproc` reads a JSON-encoded `Inputs` object
+from `stdin` (or from a file if a filename is provided) and
+writes a JSON-encoded `Result` object to `stdout`. (It does so
+using `CslJson Text` as the underlying type.) This executable can
+be used to add citation processing to non-Haskell projects.
 
 `citeproc --help` will summarize usage information.  See
 the [man page](man/citeproc.1.md) for more information.
diff --git a/app/Main.hs b/app/Main.hs
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -77,11 +77,16 @@
         Left e -> err (T.unpack $ prettyCiteprocError e)
         Right parsedStyle -> do
           let style = parsedStyle{ styleAbbreviations = abbreviations }
-          let result= citeproc defaultCiteprocOptions
-                         style
-                         lang
-                         references
-                         (fromMaybe [] (inputsCitations inp))
+          let result=
+                citeproc
+                  defaultCiteprocOptions
+                    { linkCitations = optLinkCitations opt
+                    , linkBibliography = optLinkBibliography opt
+                    }
+                  style
+                  lang
+                  references
+                  (fromMaybe [] (inputsCitations inp))
           let jsonResult :: Aeson.Value
               jsonResult =
                 case format of
@@ -94,7 +99,17 @@
                                    (resultBibliography result))
                           , ("warnings", Aeson.toJSON $ resultWarnings result)
                           ]
-                   Html -> Aeson.toJSON result
+                   Html -> Aeson.object
+                          [ ("citations", Aeson.toJSON $
+                               map cslJsonToHtml
+                                   (resultCitations result))
+                          , ("bibliography", Aeson.toJSON $
+                               map (second cslJsonToHtml)
+                                   (resultBibliography result))
+                          , ("warnings", Aeson.toJSON $ resultWarnings result)
+                          ]
+                          where cslJsonToHtml el =
+                                  renderCslJson True mempty el
           BL.putStr $ AesonPretty.encodePretty'
                        AesonPretty.defConfig
                          { confIndent = AesonPretty.Spaces 2
@@ -107,13 +122,15 @@
 data Format = Json | Html deriving (Show, Ord, Eq)
 
 data Opt =
-  Opt{ optStyle         :: Maybe String
-     , optReferences    :: Maybe String
-     , optAbbreviations :: Maybe String
-     , optFormat        :: Maybe String
-     , optLang          :: Maybe Lang
-     , optHelp          :: Bool
-     , optVersion       :: Bool
+  Opt{ optStyle            :: Maybe String
+     , optReferences       :: Maybe String
+     , optAbbreviations    :: Maybe String
+     , optFormat           :: Maybe String
+     , optLang             :: Maybe Lang
+     , optLinkCitations    :: Bool
+     , optLinkBibliography :: Bool
+     , optHelp             :: Bool
+     , optVersion          :: Bool
      } deriving Show
 
 defaultOpt :: Opt
@@ -123,6 +140,8 @@
       , optAbbreviations = Nothing
       , optFormat = Nothing
       , optLang = Nothing
+      , optLinkCitations = False
+      , optLinkBibliography = False
       , optHelp = False
       , optVersion = False
       }
@@ -148,6 +167,12 @@
   , Option ['f'] ["format"]
      (ReqArg (\format opt -> return opt{ optFormat = Just format }) "html|json")
      "Controls formatting of entries in result"
+  , Option [] ["link-citations"]
+     (NoArg (\opt -> return opt{ optLinkCitations = True }))
+     "Enable hyperlinking of citations to the bibliography"
+  , Option [] ["link-bibliography"]
+     (NoArg (\opt -> return opt{ optLinkBibliography = True }))
+     "Enable hyperlinking of bibliography entries"
   , Option ['h'] ["help"]
      (NoArg (\opt -> return opt{ optHelp = True }))
      "Print usage information"
diff --git a/bench/Bench.hs b/bench/Bench.hs
new file mode 100644
--- /dev/null
+++ b/bench/Bench.hs
@@ -0,0 +1,145 @@
+{-# LANGUAGE OverloadedStrings #-}
+-- | Benchmark for citation processing dominated by disambiguation.
+-- Generates n synthetic references, cites them all in clusters of
+-- three, and times 'citeproc', in two scenarios:
+--
+-- * dense: every reference's authors and years collide heavily (so
+--   that add-names, add-givenname, and year-suffix disambiguation all
+--   kick in); reference data repeats with period 24, so every
+--   reference has many exact duplicates.
+--
+-- * sparse: only every 20th reference collides; the rest have unique
+--   authors.  This is the realistic case for large bibliographies.
+--
+-- * collapse: the style has collapse="year" and the citation clusters
+--   have 100 items each, to exercise the cite grouping/collapsing
+--   code; authors are unique so that disambiguation stays quiet (and
+--   grouping does all-pairs comparisons, its worst case).
+--
+-- Run with, e.g.:
+--   cabal bench --benchmark-options="800 1600 3200"
+module Main (main) where
+import Citeproc
+import Citeproc.CslJson (CslJson, renderCslJson)
+import Control.Exception (evaluate)
+import Control.Monad (forM_)
+import qualified Data.Aeson as Aeson
+import Data.Aeson (object, (.=))
+import Data.Text (Text)
+import qualified Data.Text as T
+import System.Environment (getArgs)
+import System.Exit (exitFailure)
+import System.TimeIt (timeItT)
+import Text.Printf (printf)
+
+main :: IO ()
+main = do
+  args <- getArgs
+  let sizes = if null args then [800, 1600, 3200] else map read args
+  let getStyle collapse = do
+        parseResult <- parseStyle (\_ -> return "") (styleText collapse)
+        case parseResult of
+          Left err  -> print err >> exitFailure
+          Right sty -> return (sty :: Style (CslJson Text))
+  style <- getStyle False
+  collapseStyle <- getStyle True
+  let scenarios = [ ("dense",    const True,            3,   style)
+                  , ("sparse",   \i -> i `mod` 20 == 0, 3,   style)
+                  , ("collapse", const False,           100, collapseStyle)
+                  ] :: [(String, Int -> Bool, Int, Style (CslJson Text))]
+  forM_ scenarios $ \(scenario, collides, clusterSize, sty) ->
+      forM_ sizes $ \n -> do
+        refs <- either fail return $ mapM refFromValue
+                  $ mkRefValues collides n
+        let result = citeproc defaultCiteprocOptions sty Nothing refs
+                       (mkCitations clusterSize n)
+        (t, outlen) <- timeItT $ evaluate $ T.length $ T.concat
+                         $ map (renderCslJson False mempty)
+                         $ resultCitations result
+        printf "%-6s  n = %5d   %8.3f s   (%d chars of output)\n"
+               scenario n t outlen
+
+refFromValue :: Aeson.Value -> Either String (Reference (CslJson Text))
+refFromValue v =
+  case Aeson.fromJSON v of
+    Aeson.Success r -> Right r
+    Aeson.Error e   -> Left e
+
+mkRefValues :: (Int -> Bool) -> Int -> [Aeson.Value]
+mkRefValues collides n = map mkRef [1..n]
+ where
+  mkRef :: Int -> Aeson.Value
+  mkRef i = object
+    [ "id" .= itemName i
+    , "type" .= ("book" :: Text)
+    , "title" .= ("Title " <> T.pack (show i))
+    , "issued" .= object ["date-parts" .= [[2000 + i `mod` 4]]]
+    , "author" .=
+        if collides i
+           then map (mkAuthor i) [0 .. i `mod` 3]
+           else [object [ "family" .= ("Unique" <> T.pack (show i))
+                        , "given"  .= ("Author" :: Text) ]]
+    ]
+  mkAuthor i j = object
+    [ "family" .= families !! ((i + j) `mod` length families)
+    , "given"  .= givens !! ((i + j) `mod` length givens)
+    ]
+  families, givens :: [Text]
+  families = ["Smith", "Jones", "Garcia", "Chen",
+              "Miller", "Davis", "Wilson", "Moore"]
+  givens = ["Alexandra", "Benjamin", "Catherine",
+            "Daniel", "Eleanor", "Frederick"]
+
+mkCitations :: Int -> Int -> [Citation (CslJson Text)]
+mkCitations clusterSize n = map mkCitation (chunksOf clusterSize [1..n])
+ where
+  chunksOf _ [] = []
+  chunksOf k xs = let (as, bs) = splitAt k xs in as : chunksOf k bs
+  mkCitation is = Citation
+    { citationId = Nothing
+    , citationResetPosition = False
+    , citationNoteNumber = Nothing
+    , citationPrefix = Nothing
+    , citationSuffix = Nothing
+    , citationItems = map mkItem is
+    }
+  mkItem i = CitationItem
+    { citationItemId = ItemId (itemName i)
+    , citationItemLabel = Nothing
+    , citationItemLocator = Nothing
+    , citationItemType = NormalCite
+    , citationItemPrefix = Nothing
+    , citationItemSuffix = Nothing
+    , citationItemData = Nothing
+    }
+
+itemName :: Int -> Text
+itemName i = "ref" <> T.pack (show i)
+
+-- An author-date style with every disambiguation strategy enabled
+-- (and, if the argument is True, collapse=\"year\").
+styleText :: Bool -> Text
+styleText collapse = T.unlines
+  [ "<style xmlns=\"http://purl.org/net/xbiblio/csl\" class=\"in-text\" version=\"1.0\">"
+  , "  <info> <id/> <title/> <updated>2020-01-01T00:00:00Z</updated> </info>"
+  , "  <citation disambiguate-add-names=\"true\""
+  , "            disambiguate-add-givenname=\"true\""
+  , "            disambiguate-add-year-suffix=\"true\""
+  , if collapse then "            collapse=\"year\"" else ""
+  , "            et-al-min=\"3\" et-al-use-first=\"1\">"
+  , "    <layout prefix=\"(\" suffix=\")\" delimiter=\"; \">"
+  , "      <group delimiter=\" \">"
+  , "        <names variable=\"author\">"
+  , "          <name form=\"short\" and=\"symbol\"/>"
+  , "        </names>"
+  , "        <date variable=\"issued\" form=\"numeric\" date-parts=\"year\"/>"
+  , "        <choose>"
+  , "          <if disambiguate=\"true\">"
+  , "            <text value=\"[d]\"/>"
+  , "          </if>"
+  , "        </choose>"
+  , "      </group>"
+  , "    </layout>"
+  , "  </citation>"
+  , "</style>"
+  ]
diff --git a/cabal.project b/cabal.project
deleted file mode 100644
--- a/cabal.project
+++ /dev/null
@@ -1,5 +0,0 @@
-packages: citeproc.cabal
-
-package citeproc
-  flags: -icu +executable
-
diff --git a/citeproc.cabal b/citeproc.cabal
--- a/citeproc.cabal
+++ b/citeproc.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                citeproc
-version:             0.8.1.3
+version:             0.14.2
 synopsis:            Generates citations and bibliography from CSL styles.
 description:         citeproc parses CSL style files and uses them to
                      generate a list of formatted citations and bibliography
@@ -15,20 +15,16 @@
 build-type:          Simple
 extra-doc-files:     README.md
                    , CHANGELOG.md
-extra-source-files:  stack.yaml
-                     cabal.project
-                     locales/*.xml
-                     locales/locales.json
                      man/citeproc.1.md
                      man/citeproc.1
+extra-source-files:  locales/*.xml
+                     locales/locales.json
                      test/NOTES.md
                      test/csl/*.txt
+                     test/csl/*.expected
                      test/extra/*.txt
                      test/overrides/*.txt
-tested-with:         GHC == 8.0.2, GHC == 8.2.2,
-                     GHC == 8.4.4, GHC == 8.6.5,
-                     GHC == 8.8.4, GHC == 8.10.7,
-                     GHC == 9.0.2, GHC == 9.2.2
+                     test/overrides/*.expected
 
 source-repository    head
   type:              git
@@ -65,7 +61,7 @@
                      , safe
                      , bytestring
                      , text
-                     , containers >= 0.6.0.1 && < 0.8
+                     , containers >= 0.6.0.1 && < 0.9
                      , transformers >= 0.5.6 && < 0.7
                      , case-insensitive >= 1.2 && < 1.3
                      , vector
@@ -132,6 +128,32 @@
      buildable:        True
   else
      buildable:        False
+
+test-suite unit
+  import:              hie-options
+  type:                exitcode-stdio-1.0
+  hs-source-dirs:      test
+  main-is:             Unit.hs
+  build-depends:       base >= 4.8 && < 5
+                     , citeproc
+                     , pandoc-types
+                     , aeson
+                     , text
+  ghc-options:         -Wall
+  default-language:    Haskell2010
+
+benchmark bench
+  import:              hie-options
+  type:                exitcode-stdio-1.0
+  hs-source-dirs:      bench
+  main-is:             Bench.hs
+  build-depends:       base >= 4.8 && < 5
+                     , citeproc
+                     , aeson
+                     , text
+                     , timeit
+  ghc-options:         -Wall
+  default-language:    Haskell2010
 
 test-suite spec
   import:              hie-options
diff --git a/locales/af-ZA.xml b/locales/af-ZA.xml
--- a/locales/af-ZA.xml
+++ b/locales/af-ZA.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="af-ZA">
+   <!-- The abbreviations in this file follow the recommendations of the Afrikaanse woordelys en spelreëls ["Afrikaans word list and spelling rules"], 11th ed. (2017), sec. "Afkortingslys" ["abbreviation list"], https://www.pharosonline.co.za/aws (cited hereafter as AWS), unless stated otherwise (previous editions available at http://hdl.handle.net/2263/81572). -->
+  <!-- Additional abbreviations are from:
+        1. Verklarende Afrikaanse woordeboek, 9th ed. (2010), https://www.pharosonline.co.za/ (cited hereafter as VAW)
+        2. Skryf Afrikaans van A tot Z, 3rd ed. (2022), https://www.pharosonline.co.za/saaz (cited hereafter as SAAZ)
+        3. Pharos Afrikaansgids : Naslaanlyste en taalreëls (2018), https://research.ebsco.com/plink/95703106-0979-30de-bdd7-fc66c1eb3b3a or https://www.pharosonline.co.za/afrikaansgids (cited hereafter as PANT)
+        4. The style guides and/or author guidelines of the following Afrikaans-language journals: Literator (cited hereafter as LR) (https://literator.org.za/index.php/literator/pages/view/submission-guidelines#part_1), LitNet Akademies (cited hereafter as LA) (https://www.litnet.co.za/litnet-akademies-geesteswetenskappe-riglyne/), Stilet (cited hereafter as ST) (https://journals.co.za/journal/stilet/submit), Tydskrif vir Geesteswetenskappe (cited hereafter as TG) (https://tgwsak.co.za/voorskrifte/), Tydskrif vir Letterkunde (cited hereafter as TL) (https://letterkunde.africa/about)
+  -->
   <info>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2025-10-16T03:08:07+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -16,142 +23,151 @@
     <date-part name="day" form="numeric-leading-zeros" prefix="/"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">geraadpleeg</term>
+    <term name="advance-online-publication">aanlyn voordrukweergawe</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">persoonlike kommunikasie</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
-    <term name="accessed">toegang verkry</term>
     <term name="and">en</term>
-    <term name="and others">and others</term>
-    <term name="anonymous">anonymous</term>
-    <term name="anonymous" form="short">anon</term>
-    <term name="at">at</term>
-    <term name="available at">available at</term>
-    <term name="by">by</term>
+    <term name="and others">e.a.</term> <!-- like et al. the abbreviated form is the regular form in Afrikaans, also see LA  -->
+    <term name="anonymous">anoniem</term>
+    <term name="at">by</term>
+    <term name="audio-recording">klankopname</term>
+    <term name="available at">beskikbaar by</term>
+    <term name="by">deur</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">c.</term>
-    <term name="cited">cited</term>
-    <term name="edition">
-      <single>edition</single>
-      <multiple>editions</multiple>
-    </term>
-    <term name="edition" form="short">ed</term>
-    <term name="et-al">et al.</term>
+    <term name="cited">aangehaal</term>
+    <term name="et-al">et al.</term> <!-- unlike op.cit. the term et al. does contain a space (AWS) as explained in SAAW rule 4.3 because only second word of term is abbreviated  -->
+    <term name="film">film</term>
     <term name="forthcoming">voorhande</term>
     <term name="from">van</term>
+    <term name="henceforth">voortaan</term>
     <term name="ibid">ibid.</term>
     <term name="in">in</term>
-    <term name="in press">in press</term>
+    <term name="in press">ter perse</term>
     <term name="internet">internet</term>
     <term name="letter">brief</term>
-    <term name="no date">no date</term>
-    <term name="no date" form="short">n.d.</term>
-    <term name="online">online</term>
-    <term name="presented at">presented at the</term>
+    <term name="loc-cit">loc.cit.</term> <!-- like ibid., the abbreviated form is the regular form, and in Afrikaans the abbreviated form contains no spaces (AWS), as explained in SAAW rule 4.3  -->
+    <term name="no date">sonder jaar</term>
+    <term name="no-place">sine loco</term>
+    <term name="no-publisher">sine nomine</term> <!-- sine nomine -->
+    <term name="on">op</term>
+    <term name="online">aanlyn</term>
+    <term name="op-cit">op.cit.</term> <!-- like ibid., the abbreviated form is the regular form, and in Afrikaans the abbreviated form contains no spaces (AWS) as explained in SAAW rule 4.3  -->
+    <term name="original-work-published">oorspronklik gepubliseer</term>
+    <term name="personal-communication">persoonlike kommunikasie</term>
+    <term name="podcast">podsending</term>
+    <term name="podcast-episode">podsendingepisode</term>
+    <term name="preprint">voordruk</term>
+    <term name="presented at">gelewer by die</term>
+    <term name="radio-broadcast">radio-uitsending</term>
+    <term name="radio-series">radioreeks</term>
+    <term name="radio-series-episode">radioreeksepisode</term>
     <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
+      <single>verwysing</single>
+      <multiple>verwysings</multiple>
     </term>
+    <term name="retrieved">geraadpleeg</term>
+    <term name="review-of">resensie van</term>
+    <term name="scale">skaal</term>
+    <term name="special-issue">spesiale uitgawe</term>
+    <term name="special-section">spesiale afdeling</term>
+    <term name="television-broadcast">televisie-uitsending</term>
+    <term name="television-series">televisiereeks</term>
+    <term name="television-series-episode">televisiereeksepisode</term>
+    <term name="video">video</term>
+    <term name="working-paper">konsepdokument</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">ca.</term> <!-- ca. is the only accepted abbreviation (AWS), not c. like in English  -->
+    <term name="no date" form="short">s.j.</term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher" form="short">s.n.</term>
     <term name="reference" form="short">
-      <single>ref.</single>
-      <multiple>refs.</multiple>
+      <single>verw.</single>
+      <multiple>verws.</multiple>
     </term>
-    <term name="retrieved">opgehaal</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">resensie v.</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">voordruk-artikel</term>
+    <term name="article-journal">joernaalartikel</term>
+    <term name="article-magazine">tydskrifartikel</term>
+    <term name="article-newspaper">koerantartikel</term>
+    <term name="bill">wetsontwerp</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">uitsending</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">klassieke werk</term>
+    <term name="collection">versameling</term>
+    <term name="dataset">datastel</term>
+    <term name="document">dokument</term>
+    <term name="entry">inskrywing</term>
+    <term name="entry-dictionary">woordeboekinskrywing</term>
+    <term name="entry-encyclopedia">ensiklopedie-inskrywing</term>
+    <term name="event">geleentheid</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
-    <term name="interview">interview</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="graphic">visuele materiaal</term>
+    <term name="hearing">verhoor</term>
+    <term name="interview">onderhoud</term>
+    <term name="legal_case">regsaak</term>
+    <term name="legislation">wetgewing</term>
+    <term name="manuscript">manuskrip</term>
+    <term name="map">kaart</term>
+    <term name="motion_picture">video-opname</term>
+    <term name="musical_score">musiekpartituur</term>
+    <term name="pamphlet">pamflet</term>
+    <term name="paper-conference">kongresartikel</term>
     <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="performance">optrede</term>
+    <term name="periodical">tydskrif</term>
     <term name="personal_communication">persoonlike kommunikasie</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">inskrywing</term>
+    <term name="post-weblog">bloginskrywing</term>
+    <term name="regulation">regulasie</term>
+    <term name="report">verslag</term>
+    <term name="review">resensie</term>
+    <term name="review-book">boekresensie</term>
+    <term name="software">sagteware</term>
+    <term name="song">klankopname</term>
+    <term name="speech">lesing</term>
+    <term name="standard">norm</term>
+    <term name="thesis">tesis</term>
+    <term name="treaty">verdrag</term>
+    <term name="webpage">webblad</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">joernaalart.</term> <!-- no accepted abbreviation for joernaal in Afrikaans, the abbreviation joern. is only for joernalistiek  -->
+    <term name="article-magazine" form="short">tydskrifart.</term>
+    <term name="article-newspaper" form="short">koerantart.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">dok.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="graphic" form="short">visuele mat.</term>
+    <term name="interview" form="short">interv.</term> <!-- no accepted abbreviation Afrikaans  -->
+    <term name="manuscript" form="short">ms.</term> <!-- AWS  -->
+    <term name="motion_picture" form="short">video rec.</term> <!-- no accepted abbreviation Afrikaans  -->
+    <term name="report" form="short">rep.</term> <!-- no accepted abbreviation Afrikaans  -->
+    <term name="review" form="short">rev.</term> <!-- no accepted abbreviation Afrikaans  -->
+    <term name="review-book" form="short">bk. rev.</term> <!-- no accepted abbreviation Afrikaans  -->
+    <term name="song" form="short">audio rec.</term> <!-- no accepted abbreviation Afrikaans  -->
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">getuienis gelewer deur</term>
+    <term name="review" form="verb">geresenseer deur</term>
+    <term name="review-book" form="verb">boekresensie van</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">AD</term>
-    <term name="bc">BC</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="ad">AD</term> <!-- anno Domini, abbreviation has no periods (AWS rule 3.11)  -->
+    <term name="bc">v.C.</term> <!-- voor Christus, note periods and casing (AWS) -->
+    <term name="bce">VAJ</term> <!-- voor algemene jaartelling, abbreviation has no periods (AWS rule 3.11)  -->
+    <term name="ce">AJ</term> <!-- algemene jaartelling, abbreviation has no periods (AWS rule 3.11) -->
 
     <!-- PUNCTUATION -->
     <term name="open-quote">“</term>
@@ -164,102 +180,96 @@
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal">th</term>
-    <term name="ordinal-01">st</term>
-    <term name="ordinal-02">nd</term>
-    <term name="ordinal-03">rd</term>
-    <term name="ordinal-11">th</term>
-    <term name="ordinal-12">th</term>
-    <term name="ordinal-13">th</term>
+    <term name="ordinal">ste</term> <!-- past 20 most ordinals are ste in Afrikaans  -->
+    <term name="ordinal-01">ste</term>
+    <term name="ordinal-02">de</term>
+    <term name="ordinal-03">de</term>
+    <term name="ordinal-04">de</term>
+    <term name="ordinal-05">de</term>
+    <term name="ordinal-06">de</term>
+    <term name="ordinal-07">de</term>
+    <term name="ordinal-08">ste</term>
+    <term name="ordinal-09">de</term>
+    <term name="ordinal-10">de</term>
+    <term name="ordinal-11">de</term>
+    <term name="ordinal-12">de</term>
+    <term name="ordinal-13">de</term>
+    <term name="ordinal-14">de</term>
+    <term name="ordinal-15">de</term>
+    <term name="ordinal-16">de</term>
+    <term name="ordinal-17">de</term>
+    <term name="ordinal-18">de</term>
+    <term name="ordinal-19">de</term>
+    <term name="ordinal-20">ste</term>
 
     <!-- LONG ORDINALS -->
-    <term name="long-ordinal-01">first</term>
-    <term name="long-ordinal-02">second</term>
-    <term name="long-ordinal-03">third</term>
-    <term name="long-ordinal-04">fourth</term>
-    <term name="long-ordinal-05">fifth</term>
-    <term name="long-ordinal-06">sixth</term>
-    <term name="long-ordinal-07">seventh</term>
-    <term name="long-ordinal-08">eighth</term>
-    <term name="long-ordinal-09">ninth</term>
-    <term name="long-ordinal-10">tenth</term>
+    <term name="long-ordinal-01">eerste</term>
+    <term name="long-ordinal-02">tweede</term>
+    <term name="long-ordinal-03">derde</term>
+    <term name="long-ordinal-04">vierde</term>
+    <term name="long-ordinal-05">vyfde</term>
+    <term name="long-ordinal-06">sesde</term>
+    <term name="long-ordinal-07">sewende</term>
+    <term name="long-ordinal-08">agste</term>
+    <term name="long-ordinal-09">negende</term>
+    <term name="long-ordinal-10">tiende</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>bedryf</single>
+      <multiple>bedrywe</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>bylaag</single>
+      <multiple>bylae</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>artikel</single>
+      <multiple>artikels</multiple>
     </term>
     <term name="book">
-      <single>book</single>
-      <multiple>books</multiple>
+      <single>boek</single>
+      <multiple>boeke</multiple>
     </term>
+    <term name="canon">
+      <single>kanon</single>
+      <multiple>kanons</multiple>
+    </term>
     <term name="chapter">
-      <single>chapter</single>
-      <multiple>chapters</multiple>
+      <single>hoofstuk</single>
+      <multiple>hoofstukke</multiple>
     </term>
     <term name="column">
-      <single>column</single>
-      <multiple>columns</multiple>
+      <single>kolom</single>
+      <multiple>kolomme</multiple>
     </term>
+    <term name="elocation">
+      <single>posisie</single>
+      <multiple>posisies</multiple>
+    </term>
+    <term name="equation">
+      <single>vergelyking</single>
+      <multiple>vergelykings</multiple>
+    </term>
     <term name="figure">
-      <single>figure</single>
-      <multiple>figures</multiple>
+      <single>figuur</single>
+      <multiple>figure</multiple>
     </term>
     <term name="folio">
       <single>folio</single>
-      <multiple>folios</multiple>
+      <multiple>folio's</multiple> <!-- AWS rule 2.1 note apostrophe in plural  -->
     </term>
     <term name="issue">
-      <single>number</single>
-      <multiple>numbers</multiple>
+      <single>nommer</single>
+      <multiple>nommers</multiple>
     </term>
     <term name="line">
       <single>reël</single>
       <multiple>reëls</multiple>
     </term>
     <term name="note">
-      <single>note</single>
-      <multiple>notes</multiple>
+      <single>aantekening</single>
+      <multiple>aantekeninge</multiple>
     </term>
     <term name="opus">
       <single>opus</single>
@@ -269,29 +279,49 @@
       <single>bladsy</single>
       <multiple>bladsye</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>bladsy</single>
-      <multiple>bladsye</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraaf</single>
       <multiple>paragrawe</multiple>
     </term>
     <term name="part">
-      <single>part</single>
-      <multiple>parts</multiple>
+      <single>deel</single>
+      <multiple>dele</multiple>
     </term>
+    <term name="rule">
+      <single>bepaling</single>
+      <multiple>bepalings</multiple>
+    </term>
+    <term name="scene">
+      <single>toneel</single>
+      <multiple>tonele</multiple>
+    </term>
     <term name="section">
-      <single>section</single>
-      <multiple>sections</multiple>
+      <single>afdeling</single>
+      <multiple>afdelings</multiple>
     </term>
     <term name="sub-verbo">
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>bylaag</single>
+      <multiple>bylae</multiple>
+    </term>
+    <term name="table">
+      <single>tabel</single>
+      <multiple>tabelle</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>titel</single>
+      <multiple>titels</multiple>
+    </term>
     <term name="verse">
-      <single>verse</single>
-      <multiple>verses</multiple>
+      <single>vers</single>
+      <multiple>verse</multiple>
     </term>
     <term name="volume">
       <single>volume</single>
@@ -299,76 +329,76 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
+    <term name="appendix" form="short">
+      <single>byl.</single>
+      <multiple>byl.</multiple>	<!--abbreviation remains the same for single and plural in this case (VAW)  -->
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
+    <term name="book" form="short">bk.</term>
+    <term name="chapter" form="short">hfst.</term>
+    <term name="column" form="short">kol.</term> <!-- AWS both k. and kol. accepted abbreviations so kol. selected for disambiguation  -->
+    <term name="elocation" form="short">
+      <single>loc.</single> <!-- no accepted abbreviation Afrikaans  -->
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
+    <term name="equation" form="short">
+      <single>verg.</single>
+      <multiple>vergs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
+    <term name="figure" form="short">fig.</term>
+    <term name="folio" form="short">fol.</term>
+    <term name="issue" form="short">nr.</term>
+    <term name="line" form="short">r.</term>
+    <term name="note" form="short">aant.</term>
+    <term name="opus" form="short">op.</term>
+    <term name="page" form="short">
+      <single>bl.</single>
+      <multiple>ble.</multiple> <!-- AWS rule 3.18 see also LA  -->
     </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
+    <term name="paragraph" form="short">par.</term>
+    <term name="part" form="short">dl.</term>
+    <term name="rule" form="short">
+      <single>bep.</single>
+      <multiple>beps.</multiple>
     </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
+    <term name="scene" form="short">
+      <single>sc.</single> <!-- no accepted abbreviation Afrikaans  -->
+      <multiple>scs.</multiple>
     </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="section" form="short">afd.</term>
+    <term name="sub-verbo" form="short">
+      <single>s.v.</single>
+      <multiple>s.vv.</multiple>
     </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="supplement" form="short">
+      <single>byl.</single>
+      <multiple>byl.</multiple> <!-- abbreviation remains the same for single and plural in this case (VAW)  -->
     </term>
-    <term name="book" form="short">bk</term>
-    <term name="chapter" form="short">chap</term>
-    <term name="column" form="short">col</term>
-    <term name="figure" form="short">fig</term>
-    <term name="folio" form="short">f</term>
-    <term name="issue" form="short">no</term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
-    <term name="opus" form="short">op</term>
-    <term name="page" form="short">
-      <single>bl</single>
-      <multiple>bll</multiple>
+    <term name="table" form="short">
+      <single>tab.</single>
+      <multiple>tabs.</multiple> <!-- AWS rule 3.18 (note that plural abbreviation is determined by the plural version of the last letter of the abbeviation and not the plural of the word itself therefore tabs. not tabe.)  -->
     </term>
-    <term name="number-of-pages" form="short">
-      <single>bl</single>
-      <multiple>bll</multiple>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
     </term>
-    <term name="paragraph" form="short">para</term>
-    <term name="part" form="short">pt</term>
-    <term name="section" form="short">sec</term>
-    <term name="sub-verbo" form="short">
-      <single>s.v.</single>
-      <multiple>s.vv.</multiple>
+    <term name="title-locator" form="short">
+      <single>tit.</single> <!-- no accepted abbreviation Afrikaans  -->
+      <multiple>tits.</multiple>
     </term>
     <term name="verse" form="short">
-      <single>v</single>
-      <multiple>vv</multiple>
+      <single>vs.</single>
+      <multiple>vse.</multiple>
     </term>
     <term name="volume" form="short">
-      <single>vol</single>
-      <multiple>vols</multiple>
+      <single>vol.</single>
+      <multiple>vols.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -378,194 +408,296 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="edition">
+      <single>uitgawe</single>
+      <multiple>uitgawes</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>verwysing</single>
+      <multiple>verwysings</multiple>
+    </term>
+    <term name="number">
+      <single>nommer</single>
+      <multiple>nommers</multiple>
+    </term>
+    <term name="number-of-pages"> <!-- compare with term name pages as alternative  -->
+      <single>pagina</single>
+      <multiple>paginas</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>pagina</single>
+      <multiple>paginas</multiple>
+    </term>
+    <term name="printing">
+      <single>druk</single>
+      <multiple>drukke</multiple>
+    </term>
+    <term name="version">weergawe</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>hfst.</single>
+      <multiple>hfste.</multiple> <!-- AWS rule 3.16  -->
+    </term>
+    <term name="citation-number" form="short">
+      <single>verw.</single>
+      <multiple>verws.</multiple>
+    </term>
+    <term name="collection-number" form="short">nr.</term>
+    <term name="edition" form="short">uitg.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>verw.</single>
+      <multiple>verws.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>nr.</single> <!-- both no. and nr. are accepted (AWS), but nr. less ambiguous due to other abbreviations using no  -->
+      <multiple>nrs.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single> <!-- abbreviation for pagina (AWS) compare with page  -->
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single> <!-- abbreviation for pagina (AWS) compare with term page  -->
+      <multiple>pp.</multiple> <!-- AWS does not list plural form of abbreviations but pp. widely used in academic writing (LA, TG, TL, ST, LR)   -->
+    </term>
+    <term name="printing" form="short">
+      <single>dr.</single>
+      <multiple>dre.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+      <single>voorsitter</single>
+      <multiple>voorsitters</multiple>
     </term>
+    <term name="collection-editor">
+      <single>redakteur</single>
+      <multiple>redakteurs</multiple>
+    </term>
     <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+      <single>samesteller</single>
+      <multiple>samestellers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+      <single>bydraer</single>
+      <multiple>bydraers</multiple>
     </term>
     <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+      <single>kurator</single>
+      <multiple>kuratore</multiple>
     </term>
+    <term name="director">
+      <single>regisseur</single>
+      <multiple>regisseurs</multiple>
+    </term>
+    <term name="editor">
+      <single>redakteur</single>
+      <multiple>redakteurs</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>redakteur &amp; vertaler</single>
+      <multiple>redakteurs &amp; vertalers</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>redakteur &amp; vertaler</single>
+      <multiple>redakteurs &amp; vertalers</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>reeksredakteur</single>
+      <multiple>reeksredakteurs</multiple>
+    </term>
     <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+      <single>uitvoerende vervaardiger</single>
+      <multiple>uitvoerende vervaardigers</multiple>
     </term>
     <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+      <single>gas</single>
+      <multiple>gaste</multiple>
     </term>
     <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+      <single>aanbieder</single>
+      <multiple>aanbieders</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustreerder</single>
+      <multiple>illustreerders</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+      <single>verteller</single>
+      <multiple>vertellers</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>organiseerder</single>
+      <multiple>organiseerders</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+      <single>kunstenaar</single>
+      <multiple>kunstenaars</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>vervaardiger</single>
+      <multiple>vervaardigers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>draaiboekskrywer</single>
+      <multiple>draaiboekskrywers</multiple>
     </term>
     <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
-    </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>redakteur</single>
-      <multiple>redakteurs</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
+      <single>reeksskepper</single>
+      <multiple>reeksskeppers</multiple>
     </term>
     <term name="translator">
       <single>vertaler</single>
       <multiple>vertalers</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor &amp; translator</single>
-      <multiple>editors &amp; translators</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+      <single>samest.</single>
+      <multiple>samest.</multiple> <!-- abbreviation remains the same for single and plural in this case (see LA)  -->
     </term>
-    <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+    <term name="contributor" form="short"> <!-- no accepted abbreviation in Afrikaans  -->
+      <single>bydraer</single>
+      <multiple>bydraers</multiple>
     </term>
-    <term name="curator" form="short">
+    <term name="curator" form="short"> <!-- no accepted abbreviation in Afrikaans  -->
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
-    <term name="executive-producer" form="short">
+    <term name="director" form="short">
+      <single>reg.</single>
+      <multiple>regs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>red.</single>
+      <multiple>reds.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>red. &amp; vert.</single>
+      <multiple>reds. &amp; verts.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>red. &amp; vert.</single>
+      <multiple>reds. &amp; verts.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>red.</single>
+      <multiple>reds.</multiple>
+    </term>
+    <term name="executive-producer" form="short"> <!-- no accepted abbreviation in Afrikaans  -->
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
+      <single>vert.</single>
+      <multiple>verts.</multiple>
     </term>
     <term name="organizer" form="short">
       <single>org.</single>
       <multiple>orgs.</multiple>
     </term>
-    <term name="performer" form="short">
+    <term name="performer" form="short"> <!-- no accepted abbreviation in Afrikaans  -->
       <single>perf.</single>
       <multiple>perfs.</multiple>
     </term>
-    <term name="producer" form="short">
+    <term name="producer" form="short"> <!-- no accepted abbreviation in Afrikaans  -->
       <single>prod.</single>
       <multiple>prods.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>skr.</single>
+      <multiple>skrs.</multiple>
     </term>
-    <term name="series-creator" form="short">
+    <term name="series-creator" form="short"> <!-- no accepted abbreviation in Afrikaans  -->
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>red</single>
-      <multiple>reds</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
-      <single>vert</single>
-      <multiple>verts</multiple>
-    </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; tran.</single>
-      <multiple>eds. &amp; trans.</multiple>
+      <single>vert.</single>
+      <multiple>verts.</multiple>
     </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">onder redaksie van</term>
-    <term name="editorial-director" form="verb">edited by</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">interview by</term>
-    <term name="recipient" form="verb">to</term>
-    <term name="reviewed-author" form="verb">by</term>
+    <term name="chair" form="verb">onder voorsitterskap van</term>
+    <term name="collection-editor" form="verb">onder redaksie van</term>
+    <term name="compiler" form="verb">saamgestel deur</term>
+    <term name="container-author" form="verb">deur</term>
+    <term name="contributor" form="verb">met</term>
+    <term name="curator" form="verb">onder kurasie van</term>
+    <term name="director" form="verb">onder regie van</term>
+    <term name="editor" form="verb">geredigeer deur</term>
+    <term name="editor-translator" form="verb">geredigeer en vertaal deur</term>
+    <term name="editortranslator" form="verb">geredigeer en vertaal deur</term>
+    <term name="editorial-director" form="verb">onder redaksie van</term>
+    <term name="executive-producer" form="verb">uitvoerend vervaardig deur</term>
+    <term name="guest" form="verb">met verskyning deur</term>
+    <term name="host" form="verb">aangebied deur</term>
+    <term name="illustrator" form="verb">geïllustreer deur</term>
+    <term name="interviewer" form="verb">onderhoud gevoer deur</term>
+    <term name="narrator" form="verb">vertel deur</term>
+    <term name="organizer" form="verb">georganiseer deur</term>
+    <term name="performer" form="verb">uitgevoer deur</term>
+    <term name="producer" form="verb">vervaardig deur</term>
+    <term name="recipient" form="verb">aan</term>
+    <term name="reviewed-author" form="verb">resensie van</term>
+    <term name="script-writer" form="verb">geskryf deur</term>
+    <term name="series-creator" form="verb">geskep deur</term>
     <term name="translator" form="verb">vertaal deur</term>
-    <term name="editortranslator" form="verb">edited &amp; translated by</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">red</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
-    <term name="translator" form="verb-short">verts</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="collection-editor" form="verb-short">geredigeer deur</term>
+    <term name="compiler" form="verb-short">opg. deur</term>
+    <term name="contributor" form="verb-short">met</term>
+    <term name="curator" form="verb-short">gekureer deur</term>
+    <term name="director" form="verb-short">gedir. deur</term>
+    <term name="editor" form="verb-short">o.r.v.</term>
+    <term name="editor-translator" form="verb-short">gered. &amp; vert. deur</term>
+    <term name="editortranslator" form="verb-short">gered. &amp; vert. deur</term>
+    <term name="editorial-director" form="verb-short">o.r.v.</term>
+    <term name="executive-producer" form="verb-short">exec. prod. by</term> <!-- no accepted abbreviation in Afrikaans  -->
+    <term name="guest" form="verb-short">w. guest</term> <!-- no accepted abbreviation in Afrikaans  -->
+    <term name="host" form="verb-short">hosted by</term> <!-- no accepted abbreviation in Afrikaans  -->
+    <term name="illustrator" form="verb-short">geïill. deur</term>
+    <term name="narrator" form="verb-short">vertel</term>
+    <term name="organizer" form="verb-short">georg. deur</term>
+    <term name="performer" form="verb-short">perf. by</term> <!-- no accepted abbreviation in Afrikaans  -->
+    <term name="producer" form="verb-short">prod. by</term> <!-- no accepted abbreviation in Afrikaans  -->
+    <term name="script-writer" form="verb-short">geskr. deur</term>
+    <term name="series-creator" form="verb-short">cre. by</term> <!-- no accepted abbreviation in Afrikaans  -->
+    <term name="translator" form="verb-short">vert. deur</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Januarie</term>
@@ -582,23 +714,23 @@
     <term name="month-12">Desember</term>
 
     <!-- SHORT MONTH FORMS -->
-    <term name="month-01" form="short">Jan</term>
-    <term name="month-02" form="short">Feb</term>
-    <term name="month-03" form="short">Mrt</term>
-    <term name="month-04" form="short">Apr</term>
+    <term name="month-01" form="short">Jan.</term>
+    <term name="month-02" form="short">Feb.</term>
+    <term name="month-03" form="short">Mrt.</term>
+    <term name="month-04" form="short">Apr.</term>
     <term name="month-05" form="short">Mei</term>
-    <term name="month-06" form="short">Jun</term>
-    <term name="month-07" form="short">Jul</term>
-    <term name="month-08" form="short">Aug</term>
-    <term name="month-09" form="short">Sep</term>
-    <term name="month-10" form="short">Okt</term>
-    <term name="month-11" form="short">Nov</term>
-    <term name="month-12" form="short">Des</term>
+    <term name="month-06" form="short">Jun.</term>
+    <term name="month-07" form="short">Jul.</term>
+    <term name="month-08" form="short">Aug.</term>
+    <term name="month-09" form="short">Sep.</term>
+    <term name="month-10" form="short">Okt.</term>
+    <term name="month-11" form="short">Nov.</term>
+    <term name="month-12" form="short">Des.</term>
 
     <!-- SEASONS -->
-    <term name="season-01">Spring</term>
-    <term name="season-02">Summer</term>
-    <term name="season-03">Autumn</term>
+    <term name="season-01">Lente</term>
+    <term name="season-02">Somer</term>
+    <term name="season-03">Herfs</term>
     <term name="season-04">Winter</term>
   </terms>
 </locale>
diff --git a/locales/ar.xml b/locales/ar.xml
--- a/locales/ar.xml
+++ b/locales/ar.xml
@@ -2,13 +2,17 @@
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="ar">
   <info>
     <translator>
+        <name>Mazen Amria</name>
+        <email>t.mazenamria@gmail.com</email>
+    </translator>
+    <translator>
       <name>abdealikhurrum</name>
     </translator>
     <translator>
       <name>Dr. Ayman Saleh</name>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-03-09T22:17:05+01:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -22,26 +26,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">تاريخ الوصول</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">و</term>
+    <term name="and others">وآخرون</term>
+    <term name="anonymous">مجهول</term>
+    <term name="at">عند</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">موجود في</term>
+    <term name="by">عن طريق</term>
+    <term name="circa">حوالي</term>
+    <term name="cited">وثق</term>
+    <term name="et-al">وآخرون</term>
     <term name="film">film</term>
+    <term name="forthcoming">التالي</term>
+    <term name="from">من</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">المرجع السابق</term>
+    <term name="in">في</term>
+    <term name="in press">قيد النشر</term>
+    <term name="internet">انترنت</term>
+    <term name="letter">خطاب</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">دون تاريخ</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">مباشر على الإنترنت</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">اتصال شخصي</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">قُدَّم في</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>مرجع</single>
+      <multiple>مراجع</multiple>
+    </term>
+    <term name="retrieved">استرجع في</term>
+    <term name="review-of">review of</term>
+    <term name="scale">السلم الموسيقي</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -49,46 +79,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">تاريخ الوصول</term>
-    <term name="and">و</term>
-    <term name="and others">وآخرون</term>
-    <term name="anonymous">مجهول</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">مجهول</term>
-    <term name="at">عند</term>
-    <term name="available at">موجود في</term>
-    <term name="by">عن طريق</term>
-    <term name="circa">حوالي</term>
     <term name="circa" form="short">حوالي</term>
-    <term name="cited">وثق</term>
-    <term name="edition">
-      <single>الطبعة</single>
-      <multiple>الطبعات</multiple>
-    </term>
-    <term name="edition" form="short">ط</term>
-    <term name="et-al">وآخرون</term>
-    <term name="forthcoming">التالي</term>
-    <term name="from">من</term>
-    <term name="ibid">المرجع السابق</term>
-    <term name="in">في</term>
-    <term name="in press">قيد النشر</term>
-    <term name="internet">انترنت</term>
-    <term name="letter">خطاب</term>
-    <term name="no date">دون تاريخ</term>
     <term name="no date" form="short">د.ت</term>
-    <term name="online">مباشر على الإنترنت</term>
-    <term name="presented at">قُدَّم في</term>
-    <term name="reference">
-      <single>مرجع</single>
-      <multiple>مراجع</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>مرجع</single>
       <multiple>مراجع</multiple>
     </term>
-    <term name="retrieved">استرجع في</term>
-    <term name="scale">السلم الموسيقي</term>
-    <term name="version">إصدار</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -153,6 +158,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">ب.م.</term>
     <term name="bc">ق.م.</term>
@@ -170,69 +183,52 @@
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal"></term>
+    <term name="ordinal"/>
 
     <!-- LONG ORDINALS -->
-    <term name="long-ordinal-01">الأول</term>
-    <term name="long-ordinal-02">الثاني</term>
-    <term name="long-ordinal-03">الثالث</term>
-    <term name="long-ordinal-04">الرابع</term>
-    <term name="long-ordinal-05">الخامس</term>
-    <term name="long-ordinal-06">السادس</term>
-    <term name="long-ordinal-07">السابع</term>
-    <term name="long-ordinal-08">الثامن</term>
-    <term name="long-ordinal-09">التاسع</term>
-    <term name="long-ordinal-10">العاشر</term>
+    <term name="long-ordinal-01" gender-form="masculine">الأول</term>
+    <term name="long-ordinal-02" gender-form="masculine">الثاني</term>
+    <term name="long-ordinal-03" gender-form="masculine">الثالث</term>
+    <term name="long-ordinal-04" gender-form="masculine">الرابع</term>
+    <term name="long-ordinal-05" gender-form="masculine">الخامس</term>
+    <term name="long-ordinal-06" gender-form="masculine">السادس</term>
+    <term name="long-ordinal-07" gender-form="masculine">السابع</term>
+    <term name="long-ordinal-08" gender-form="masculine">الثامن</term>
+    <term name="long-ordinal-09" gender-form="masculine">التاسع</term>
+    <term name="long-ordinal-10" gender-form="masculine">العاشر</term>
 
+    <term name="long-ordinal-01" gender-form="feminine">الأولى</term>
+    <term name="long-ordinal-02" gender-form="feminine">الثانية</term>
+    <term name="long-ordinal-03" gender-form="feminine">الثالثة</term>
+    <term name="long-ordinal-04" gender-form="feminine">الرابعة</term>
+    <term name="long-ordinal-05" gender-form="feminine">الخامسة</term>
+    <term name="long-ordinal-06" gender-form="feminine">السادسة</term>
+    <term name="long-ordinal-07" gender-form="feminine">السابعة</term>
+    <term name="long-ordinal-08" gender-form="feminine">الثامنة</term>
+    <term name="long-ordinal-09" gender-form="feminine">التاسعة</term>
+    <term name="long-ordinal-10" gender-form="feminine">العاشرة</term>
+
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>كتاب</single>
       <multiple>كتب</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>فصل</single>
       <multiple>فصول</multiple>
@@ -241,6 +237,14 @@
       <single>عمود</single>
       <multiple>أعمدة</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>رسم توضيحي</single>
       <multiple>رسوم توضيحية</multiple>
@@ -269,10 +273,6 @@
       <single>صفحة</single>
       <multiple>صفحات</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>صفحة</single>
-      <multiple>صفحات</multiple>
-    </term>
     <term name="paragraph">
       <single>فقرة</single>
       <multiple>فقرات</multiple>
@@ -281,6 +281,14 @@
       <single>جزء</single>
       <multiple>أجزاء</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>قسم</single>
       <multiple>أقسام</multiple>
@@ -289,6 +297,22 @@
       <single>تفسير فرعي</single>
       <multiple>تفسيرات فرعية</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>بيت شعر</single>
       <multiple>أبيات شعر</multiple>
@@ -299,45 +323,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">كتاب</term>
+    <term name="chapter" form="short">فصل</term>
+    <term name="column" form="short">عمود</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">كتاب</term>
-    <term name="chapter" form="short">فصل</term>
-    <term name="column" form="short">عمود</term>
     <term name="figure" form="short">رسم توضيحي</term>
     <term name="folio" form="short">مطوية</term>
     <term name="issue" form="short">عدد</term>
@@ -348,17 +352,37 @@
       <single>ص</single>
       <multiple>ص</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>ص</single>
-      <multiple>ص</multiple>
-    </term>
     <term name="paragraph" form="short">فقرة</term>
     <term name="part" form="short">ج</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">قسم</term>
     <term name="sub-verbo" form="short">
       <single>تفسير فرعي</single>
       <multiple>تفسيرات فرعية</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>بيت شعر</single>
       <multiple>أبيات شعر</multiple>
@@ -368,7 +392,7 @@
       <multiple>م</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -378,15 +402,105 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number" gender="masculine">
+      <single>عدد</single>
+      <multiple>أعداد</multiple>
+      <!-- TODO: specify the gender as feminine once that is supported -->
+      <!-- <multiple gender="feminine">أعداد</multiple> -->
+    </term>
+    <term name="edition" gender="feminine">
+      <single>الطبعة</single>
+      <multiple>الطبعات</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>ملاحظة</single>
+      <multiple>ملاحظات</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages" gender="feminine">
+      <single>صفحة</single>
+      <multiple>صفحات</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version" gender="masculine">
+        <single>إصدار</single>
+        <multiple>إصدارات</multiple>
+        <!-- TODO: specify the gender as feminine once that is supported -->
+        <!-- <multiple gender="feminine">إصدارات</multiple> -->
+    </term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">عدد</term>
+    <term name="edition" form="short">ط</term>
+    <term name="first-reference-note-number" form="short">ملاحظة</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>ص</single>
+      <multiple>ص</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -395,6 +509,11 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">إدارة</term>
+    <term name="editor">تحقيق</term>
+    <term name="editor-translator">ترجمة وتحقيق</term>
+    <term name="editortranslator">ترجمة وتحقيق</term>
+    <term name="editorial-director">إدارة التحرير</term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -407,6 +526,8 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">رسوم</term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -415,6 +536,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -423,6 +545,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -431,12 +555,7 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">إدارة</term>
-    <term name="editor">تحقيق</term>
-    <term name="editorial-director">إدارة التحرير</term>
-    <term name="illustrator">رسوم</term>
     <term name="translator">ترجمة</term>
-    <term name="editortranslator">ترجمة وتحقيق</term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -482,33 +601,41 @@
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">إنشاء</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">إشراف</term>
+    <term name="editor" form="verb">تحقيق</term>
+    <term name="editor-translator" form="verb">تحقيق وترجمة</term>
+    <term name="editortranslator" form="verb">تحقيق وترجمة</term>
+    <term name="editorial-director" form="verb">إعداد</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">رسوم</term>
+    <term name="interviewer" form="verb">مقابلة مع</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">إنشاء</term>
-    <term name="director" form="verb">إشراف</term>
-    <term name="editor" form="verb">تحقيق</term>
-    <term name="editorial-director" form="verb">إعداد</term>
-    <term name="illustrator" form="verb">رسوم</term>
-    <term name="interviewer" form="verb">مقابلة مع</term>
     <term name="recipient" form="verb">المستلم</term>
     <term name="reviewed-author" form="verb">مراجعة</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">ترجمة</term>
-    <term name="editortranslator" form="verb">تحقيق وترجمة</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir. by</term>
+    <term name="editor" form="verb-short">ed. by</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editorial-director" form="verb-short">ed. by</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
@@ -518,23 +645,34 @@
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
- 
+
     <!-- LONG MONTH FORMS -->
-    <term name="month-01">يناير</term>
-    <term name="month-02">فبراير</term>
-    <term name="month-03">مارس</term>
-    <term name="month-04">أبريل</term>
-    <term name="month-05">مايو</term>
-    <term name="month-06">يونيو</term>
-    <term name="month-07">يوليو</term>
-    <term name="month-08">أغسطس</term>
-    <term name="month-09">سبتمبر</term>
-    <term name="month-10">أكتوبر</term>
-    <term name="month-11">نوفمبر</term>
-    <term name="month-12">ديسمبر</term>
+    <term name="month-01" gender="masculine">يناير</term>
+    <term name="month-02" gender="masculine">فبراير</term>
+    <term name="month-03" gender="masculine">مارس</term>
+    <term name="month-04" gender="masculine">أبريل</term>
+    <term name="month-05" gender="masculine">مايو</term>
+    <term name="month-06" gender="masculine">يونيو</term>
+    <term name="month-07" gender="masculine">يوليو</term>
+    <term name="month-08" gender="masculine">أغسطس</term>
+    <term name="month-09" gender="masculine">سبتمبر</term>
+    <term name="month-10" gender="masculine">أكتوبر</term>
+    <term name="month-11" gender="masculine">نوفمبر</term>
+    <term name="month-12" gender="masculine">ديسمبر</term>
 
     <!-- SHORT MONTH FORMS -->
-
+    <term name="month-01" form="short">يناير</term>
+    <term name="month-02" form="short">فبراير</term>
+    <term name="month-03" form="short">مارس</term>
+    <term name="month-04" form="short">أبريل</term>
+    <term name="month-05" form="short">مايو</term>
+    <term name="month-06" form="short">يونيو</term>
+    <term name="month-07" form="short">يوليو</term>
+    <term name="month-08" form="short">أغسطس</term>
+    <term name="month-09" form="short">سبتمبر</term>
+    <term name="month-10" form="short">أكتوبر</term>
+    <term name="month-11" form="short">نوفمبر</term>
+    <term name="month-12" form="short">ديسمبر</term>
 
     <!-- SEASONS -->
     <term name="season-01">ربيع</term>
diff --git a/locales/bal-PK.xml b/locales/bal-PK.xml
new file mode 100644
--- /dev/null
+++ b/locales/bal-PK.xml
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="bal-PK">
+  <info>
+    <translator>
+      <name>عثمان</name>
+    </translator>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2025-10-18T05:53:07+00:00</updated>
+  </info>
+  <style-options punctuation-in-quote="true"/>
+  <date form="text">
+    <date-part name="day" suffix="؍ "/>
+    <date-part name="month" suffix=" "/>
+    <date-part name="year" suffix="ء"/>
+  </date>
+  <date form="numeric">
+    <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+    <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+    <date-part name="year"/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">رسایی کرتگ</term>
+    <term name="advance-online-publication">دیما شتگیں تندتاک</term>
+    <term name="album">البم</term>
+    <term name="and">ءُ</term>
+    <term name="and others">آ دِگه</term>
+    <term name="anonymous">گمنام</term>
+    <term name="at">پر</term>
+    <term name="audio-recording">تواربند</term>
+    <term name="available at">رسان پر</term>
+    <term name="by">گون</term>
+    <term name="circa">کم ءُ گیش</term>
+    <term name="cited">سرشون داته</term>
+    <term name="et-al">آ دِگه</term>
+    <term name="film">تامُر</term>
+    <term name="forthcoming">آیوک</term>
+    <term name="from">از</term>
+    <term name="henceforth">چد ءُ رند</term>
+    <term name="ibid">ایزن</term>
+    <term name="in">در</term>
+    <term name="in press">در چاپار</term>
+    <term name="internet">نٹ</term>
+    <term name="letter">چٹی</term>
+    <term name="loc-cit">ایزن</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">بے رمس</term>
+    <term name="no-place">بے جاه</term>
+    <term name="no-publisher">بے شنگکار</term> <!-- sine nomine -->
+    <term name="on">پر</term>
+    <term name="online">تندیم</term>
+    <term name="op-cit">ایزن</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">اسلیں کار شنگ کرتگ</term>
+    <term name="personal-communication">زاتییں رسانک</term>
+    <term name="podcast">پاڈکسٹ</term>
+    <term name="podcast-episode">پاڈکسٹ اپیسوڈ</term>
+    <term name="preprint">پریپرنٹ</term>
+    <term name="presented at">پیش کرتگ پر</term>
+    <term name="radio-broadcast">ریڈیو براڈکسٹ</term>
+    <term name="radio-series">ریڈیو ردیگ</term>
+    <term name="radio-series-episode">ریڈیو ردیگ</term>
+    <term name="reference">
+      <single>سرشون</single>
+      <multiple>سرشون</multiple>
+    </term>
+    <term name="retrieved">هاسل کرتگ</term>
+    <term name="review-of">چمشانک از</term>
+    <term name="scale">سکیل</term>
+    <term name="special-issue">هاسیں تاک</term>
+    <term name="special-section">هاسین باب</term>
+    <term name="television-broadcast">ٹیوی براڈکسٹ</term>
+    <term name="television-series">ٹیوی ردیگ</term>
+    <term name="television-series-episode">ٹیوی اپیسوڈ</term>
+    <term name="video">ویڈیو</term>
+    <term name="working-paper">ورکنگ پیپر</term>
+
+    <!-- SHORT GENERAL TERMS -->
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="article">پریپرنٹ</term>
+    <term name="article-journal">نبشتانک</term>
+    <term name="article-magazine">میگزینءِ نبشتانک</term>
+    <term name="article-newspaper">اکبارءِ نبشتانک</term>
+    <term name="bill">بِل</term>
+    <!-- book is in the list of locator terms -->
+    <term name="broadcast">براڈکسٹ</term>
+    <!-- chapter is in the list of locator terms -->
+    <term name="classic">کلیسک</term>
+    <term name="collection">جمانک</term>
+    <term name="dataset">ڈیٹاسٹ</term>
+    <term name="document">مدرک</term>
+    <term name="entry">اندراج</term>
+    <term name="entry-dictionary">لبزبلدءِ اندراج</term>
+    <term name="entry-encyclopedia">زانتگنجءِ اندراج</term>
+    <term name="event">گندک</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic">نگاری</term>
+    <term name="hearing">سمایت</term>
+    <term name="interview">هالتران</term>
+    <term name="legal_case">شر</term>
+    <term name="legislation">کانودسازی</term>
+    <term name="manuscript">دزنبشت</term>
+    <term name="map">نکشه</term>
+    <term name="motion_picture">ویڈیو ریکارڈ</term>
+    <term name="musical_score">زیمرییں سکور</term>
+    <term name="pamphlet">پمپلٹ</term>
+    <term name="paper-conference">کانفرنس پیپر</term>
+    <term name="patent">پیٹنٹ</term>
+    <term name="performance">ناٹک</term>
+    <term name="periodical">تیلبند</term>
+    <term name="personal_communication">زاتییں رسانک</term>
+    <term name="post">پُسٹ</term>
+    <term name="post-weblog">بلاگ پُسٹ</term>
+    <term name="regulation">ریگولیشن</term>
+    <term name="report">اهوال</term>
+    <term name="review">چمشانک</term>
+    <term name="review-book">کتابءِ چمشانک</term>
+    <term name="software">نرم‌ابزار</term>
+    <term name="song">تواربند</term>
+    <term name="speech">گشتانک</term>
+    <term name="standard">انجار</term>
+    <term name="thesis">تهیسس</term>
+    <term name="treaty">پیمان</term>
+    <term name="webpage">تندیم</term>
+
+    <!-- SHORT ITEM TYPE FORMS -->
+
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">سبوت داته از</term>
+    <term name="review" form="verb">چمشانک کرتگ از</term>
+    <term name="review-book" form="verb">کتابءِ چمشانک کرتگ از</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad">میلادی</term>
+    <term name="bc">پیشمیلاد</term>
+    <term name="bce">پیشمیلاد</term>
+    <term name="ce">میلادی</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">”</term>
+    <term name="close-quote">“</term>
+    <term name="open-inner-quote">’</term>
+    <term name="close-inner-quote">‘</term>
+    <term name="page-range-delimiter">–</term>
+    <term name="colon">:</term>
+    <term name="comma">،</term>
+    <term name="semicolon">؛</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal">می</term>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01">یکمی</term>
+    <term name="long-ordinal-02">دومی</term>
+    <term name="long-ordinal-03">سیمی</term>
+    <term name="long-ordinal-04">چارمی</term>
+    <term name="long-ordinal-05">پنچمی</term>
+    <term name="long-ordinal-06">ششمی</term>
+    <term name="long-ordinal-07">هپتمی</term>
+    <term name="long-ordinal-08">هشتمی</term>
+    <term name="long-ordinal-09">نهمی</term>
+    <term name="long-ordinal-10">دهمی</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="act">
+      <single>ایکٹ</single>
+      <multiple>ایکٹ</multiple>
+    </term>
+    <term name="appendix">
+      <single>زمیمه</single>
+      <multiple>زمیمه</multiple>
+    </term>
+    <term name="article-locator">
+      <single>نبشتانک</single>
+      <multiple>نبشتانک</multiple>
+    </term>
+    <term name="book">
+      <single>کتاب</single>
+      <multiple>کتاب</multiple>
+    </term>
+    <term name="canon">
+      <single>کانون</single>
+      <multiple>کانون</multiple>
+    </term>
+    <term name="chapter">
+      <single>در</single>
+      <multiple>در</multiple>
+    </term>
+    <term name="column">
+      <single>تنب</single>
+      <multiple>تنب</multiple>
+    </term>
+    <term name="elocation">
+      <single>جاه</single>
+      <multiple>جاه</multiple>
+    </term>
+    <term name="equation">
+      <single>مساوات</single>
+      <multiple>مساوات</multiple>
+    </term>
+    <term name="figure">
+      <single>تسویر</single>
+      <multiple>تسویر</multiple>
+    </term>
+    <term name="folio">
+      <single>پولیو</single>
+      <multiple>پولیو</multiple>
+    </term>
+    <term name="issue">
+      <single>تاک</single>
+      <multiple>تاک</multiple>
+    </term>
+    <term name="line">
+      <single>بند</single>
+      <multiple>بند</multiple>
+    </term>
+    <term name="note">
+      <single>نوٹ</single>
+      <multiple>نوٹ</multiple>
+    </term>
+    <term name="opus">
+      <single>کارنامه</single>
+      <multiple>کارنامه</multiple>
+    </term>
+    <term name="page">
+      <single>تاکدیم</single>
+      <multiple>تاکدیم</multiple>
+    </term>
+    <term name="paragraph">
+      <single>بهرگ</single>
+      <multiple>بهرگ</multiple>
+    </term>
+    <term name="part">
+      <single>بهر</single>
+      <multiple>بهر</multiple>
+    </term>
+    <term name="rule">
+      <single>رول</single>
+      <multiple>رول</multiple>
+    </term>
+    <term name="scene">
+      <single>ندارگ</single>
+      <multiple>ندارگ</multiple>
+    </term>
+    <term name="section">
+      <single>باب</single>
+      <multiple>باب</multiple>
+    </term>
+    <term name="sub-verbo">
+      <single>زیر کلمه</single>
+      <multiple>زیر کلمه</multiple>
+    </term>
+    <term name="supplement">
+      <single>لاهک</single>
+      <multiple>لاهک</multiple>
+    </term>
+    <term name="table">
+      <single>ٹیبل</single>
+      <multiple>ٹیبل</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>سرگال</single>
+      <multiple>سرگال</multiple>
+    </term>
+    <term name="verse">
+      <single>لچه</single>
+      <multiple>لچه</multiple>
+    </term>
+    <term name="volume">
+      <single>جلد</single>
+      <multiple>جلد</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>در</single>
+      <multiple>در</multiple>
+    </term>
+    <term name="citation-number">
+      <single>سرشون</single>
+      <multiple>سرشون</multiple>
+    </term>
+    <term name="collection-number">
+      <single>نمبر</single>
+      <multiple>نمبر</multiple>
+    </term>
+    <term name="edition">
+      <single>چاپرد</single>
+      <multiple>چاپرد</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>سرشون</single>
+      <multiple>سرشون</multiple>
+    </term>
+    <term name="number">
+      <single>نمبر</single>
+      <multiple>نمبر</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>تاکدیم</single>
+      <multiple>تاکدیم</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>جلد</single>
+      <multiple>جلد</multiple>
+    </term>
+    <term name="page-first">
+      <single>تاکدیم</single>
+      <multiple>تاکدیم</multiple>
+    </term>
+    <term name="printing">
+      <single>چاپکاری</single>
+      <multiple>چاپکاری</multiple>
+    </term>
+    <term name="version">
+      <single>ورژن</single>
+      <multiple>ورژن</multiple>
+    </term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>چیر</single>
+      <multiple>چیر</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>شونکار</single>
+      <multiple>شونکار</multiple>
+    </term>
+    <term name="compiler">
+      <single>نزاروک</single>
+      <multiple>نزاروک</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>بهرشتکار</single>
+      <multiple>بهرشتکار</multiple>
+    </term>
+    <term name="curator">
+      <single>کیوریٹر</single>
+      <multiple>کیوریٹر</multiple>
+    </term>
+    <term name="director">
+      <single>سوجکار</single>
+      <multiple>سوجکار</multiple>
+    </term>
+    <term name="editor">
+      <single>شونکار</single>
+      <multiple>شونکار</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>شونکار ءُ رجانکار</single>
+      <multiple>شونکار ءُ رجانکار</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>شونکار ءُ رجانکار</single>
+      <multiple>شونکار ءُ رجانکار</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>سرشونکار</single>
+      <multiple>سرشونکار</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>انتزامیه</single>
+      <multiple>انتزامیه</multiple>
+    </term>
+    <term name="guest">
+      <single>مهمان</single>
+      <multiple>مهمان</multiple>
+    </term>
+    <term name="host">
+      <single>واسیدار</single>
+      <multiple>واسیدار</multiple>
+    </term>
+    <term name="illustrator">
+      <single>مسور</single>
+      <multiple>مسور</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>راوی</single>
+      <multiple>راوی</multiple>
+    </term>
+    <term name="organizer">
+      <single>برجمدار</single>
+      <multiple>برجمدار</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>ازمکار</single>
+      <multiple>ازمکار</multiple>
+    </term>
+    <term name="producer">
+      <single>پروڈیوسر</single>
+      <multiple>پروڈیوسر</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>لبزانت</single>
+      <multiple>لبزانت</multiple>
+    </term>
+    <term name="series-creator">
+      <single>ردیگءِ ساچشتکار</single>
+      <multiple>ردیگءِ ساچشتکار</multiple>
+    </term>
+    <term name="translator">
+      <single>رجانکار</single>
+      <multiple>رجانکار</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+
+    <!-- VERB ROLE FORMS -->
+    <term name="chair" form="verb">چیر کرتگ گون</term>
+    <term name="collection-editor" form="verb">ردینته گون</term>
+    <term name="compiler" form="verb">نزآرته گون</term>
+    <term name="composer" form="verb">پربسته گون</term>
+    <term name="container-author" form="verb">نبشته گون</term>
+    <term name="contributor" form="verb">بهرشته گون</term>
+    <term name="curator" form="verb">کیوریٹ کرتگ گون</term>
+    <term name="director" form="verb">سوج داته گون</term>
+    <term name="editor" form="verb">ردینته گون</term>
+    <term name="editor-translator" form="verb">ردینته ءُ رجانک کرتگ گون</term>
+    <term name="editortranslator" form="verb">ردینته ءُ رجانک کرتگ گون</term>
+    <term name="editorial-director" form="verb">ردینته گون</term>
+    <term name="executive-producer" form="verb">انتزامیه گون</term>
+    <term name="guest" form="verb">مهمان گون</term>
+    <term name="host" form="verb">واسیدار گون</term>
+    <term name="illustrator" form="verb">مسور گون</term>
+    <term name="interviewer" form="verb">انٹرویو گون</term>
+    <term name="narrator" form="verb">راوی گون</term>
+    <term name="organizer" form="verb">واسیدار گون</term>
+    <term name="original-author" form="verb">نبشته گون</term>
+    <term name="performer" form="verb">ازمکاری گون</term>
+    <term name="producer" form="verb">پروڈیوس کرتگ گون</term>
+    <term name="recipient" form="verb">په</term>
+    <term name="reviewed-author" form="verb">نبشته گون</term>
+    <term name="script-writer" form="verb">نبشته گون</term>
+    <term name="series-creator" form="verb">ساچشته گون</term>
+    <term name="translator" form="verb">رجانک کرتگ گون</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">جنوری</term>
+    <term name="month-02">پروری</term>
+    <term name="month-03">مارچ</term>
+    <term name="month-04">اپریل</term>
+    <term name="month-05">میی</term>
+    <term name="month-06">جون</term>
+    <term name="month-07">جلاییی</term>
+    <term name="month-08">اگست</term>
+    <term name="month-09">ستمبر</term>
+    <term name="month-10">اکتوبر</term>
+    <term name="month-11">نومبر</term>
+    <term name="month-12">دسمبر</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">جنو</term>
+    <term name="month-02" form="short">پرو</term>
+    <term name="month-03" form="short">مار</term>
+    <term name="month-04" form="short">اپر</term>
+    <term name="month-05" form="short">میی</term>
+    <term name="month-06" form="short">جون</term>
+    <term name="month-07" form="short">جلا</term>
+    <term name="month-08" form="short">اگس‍</term>
+    <term name="month-09" form="short">ستم‍</term>
+    <term name="month-10" form="short">اکت‍</term>
+    <term name="month-11" form="short">نوم‍</term>
+    <term name="month-12" form="short">دسم‍</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">بهار</term>
+    <term name="season-02">گرماگ</term>
+    <term name="season-03">توهمشان</term>
+    <term name="season-04">زمستان</term>
+  </terms>
+</locale>
diff --git a/locales/bg-BG.xml b/locales/bg-BG.xml
--- a/locales/bg-BG.xml
+++ b/locales/bg-BG.xml
@@ -2,7 +2,7 @@
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="bg-BG">
   <info>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2018-02-15T04:14:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
     <translator>
       <name>Valeriya Simeonova</name>
       <email>simeonova@fmi.uni-sofia.bg</email>
@@ -21,26 +21,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">отворен на</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">и</term>
+    <term name="and others">и други</term>
+    <term name="anonymous">анонимен</term>
+    <term name="at">в</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">достъпен на</term>
+    <term name="by">от</term>
+    <term name="circa">около</term>
+    <term name="cited">цитиран</term>
+    <term name="et-al">и съавт.</term>
     <term name="film">film</term>
+    <term name="forthcoming">предстоящ</term>
+    <term name="from">от</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">пак там</term>
+    <term name="in">в</term>
+    <term name="in press">под печат</term>
+    <term name="internet">интернет</term>
+    <term name="letter">писмо</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">без дата</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">онлайн</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">лична комуникация</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">представен на</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>източник</single>
+      <multiple>източници</multiple>
+    </term>
+    <term name="retrieved">изтеглен на</term>
+    <term name="review-of">review of</term>
+    <term name="scale">скала</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -48,46 +74,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">отворен на</term>
-    <term name="and">и</term>
-    <term name="and others">и други</term>
-    <term name="anonymous">анонимен</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">анон.</term>
-    <term name="at">в</term>
-    <term name="available at">достъпен на</term>
-    <term name="by">от</term>
-    <term name="circa">около</term>
     <term name="circa" form="short">ок.</term>
-    <term name="cited">цитиран</term>
-    <term name="edition">
-      <single>издание</single>
-      <multiple>издания</multiple>
-    </term>
-    <term name="edition" form="short">изд.</term>
-    <term name="et-al">и съавт.</term>
-    <term name="forthcoming">предстоящ</term>
-    <term name="from">от</term>
-    <term name="ibid">пак там</term>
-    <term name="in">в</term>
-    <term name="in press">под печат</term>
-    <term name="internet">интернет</term>
-    <term name="letter">писмо</term>
-    <term name="no date">без дата</term>
     <term name="no date" form="short">б.д.</term>
-    <term name="online">онлайн</term>
-    <term name="presented at">представен на</term>
-    <term name="reference">
-      <single>източник</single>
-      <multiple>източници</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>изт.</single>
       <multiple>изт.</multiple>
     </term>
-    <term name="retrieved">изтеглен на</term>
-    <term name="scale">скала</term>
-    <term name="version">версия</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -152,6 +153,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">сл.хр.</term>
     <term name="bc">пр.хр.</term>
@@ -224,54 +233,26 @@
     <term name="long-ordinal-10" gender-form="feminine">десета</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>книга</single>
       <multiple>книги</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>глава</single>
       <multiple>глави</multiple>
@@ -280,6 +261,14 @@
       <single>колона</single>
       <multiple>колони</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>фигура</single>
       <multiple>фигури</multiple>
@@ -308,7 +297,6 @@
       <single>страница</single>
       <multiple>страници</multiple>
     </term>
-    <term name="number-of-pages">брой страници</term>
     <term name="paragraph">
       <single>абзац</single>
       <multiple>абзаци</multiple>
@@ -317,6 +305,14 @@
       <single>част</single>
       <multiple>части</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>раздел</single>
       <multiple>раздели</multiple>
@@ -325,6 +321,22 @@
       <single>под раздел</single>
       <multiple>под раздели</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>стихотворение</single>
       <multiple>стихове</multiple>
@@ -335,45 +347,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">кн.</term>
+    <term name="chapter" form="short">гл.</term>
+    <term name="column" form="short">кол.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">кн.</term>
-    <term name="chapter" form="short">гл.</term>
-    <term name="column" form="short">кол.</term>
     <term name="figure" form="short">фиг.</term>
     <term name="folio" form="short">фол.</term>
     <term name="issue" form="short">бр.</term>
@@ -381,18 +373,41 @@
     <term name="note" form="short">бел.</term>
     <term name="opus" form="short">оп.</term>
     <term name="page" form="short">стр.</term>
-    <term name="number-of-pages" form="short">бр.стр.</term>
     <term name="paragraph" form="short">абз.</term>
     <term name="part" form="short">ч.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">разд.</term>
     <term name="sub-verbo" form="short">подразд.</term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">ст.</term>
     <term name="volume" form="short">
       <single>том</single>
       <multiple>томове</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -402,15 +417,91 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>брой</single>
+      <multiple>броеве</multiple>
+    </term>
+    <term name="edition">
+      <single>издание</single>
+      <multiple>издания</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>бележка</single>
+      <multiple>бележки</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">брой страници</term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">версия</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="edition" form="short">изд.</term>
+    <term name="first-reference-note-number" form="short">бел.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">бр.стр.</term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -419,6 +510,23 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">режисьор</term>
+    <term name="editor">
+      <single>редактор</single>
+      <multiple>редактори</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>главен редактор</single>
+      <multiple>редакторски колектив</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -431,6 +539,8 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">илюстрации</term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -439,6 +549,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -447,6 +558,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -455,24 +568,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">режисьор</term>
-    <term name="editor">
-      <single>редактор</single>
-      <multiple>редактори</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>главен редактор</single>
-      <multiple>редакторски колектив</multiple>
-    </term>
-    <term name="illustrator">илюстрации</term>
     <term name="translator">
       <single>преводач</single>
       <multiple>преводачи</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor &amp; translator</single>
-      <multiple>editors &amp; translators</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -487,10 +586,28 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">реж.</term>
+    <term name="editor" form="short">
+      <single>ред.</single>
+      <multiple>ред.кол.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ред. &amp; прев.</single>
+      <multiple>ред.кол. &amp; прев.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ред. &amp; прев.</single>
+      <multiple>ред.кол. &amp; прев.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>гл.ред.</single>
+      <multiple>гл.ред.кол.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">ил.</term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -515,69 +632,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">реж.</term>
-    <term name="editor" form="short">
-      <single>ред.</single>
-      <multiple>ред.кол.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>гл.ред.</single>
-      <multiple>гл.ред.кол.</multiple>
-    </term>
-    <term name="illustrator" form="short">ил.</term>
     <term name="translator" form="short">
       <single>прев</single>
       <multiple>прев.кол.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ред. &amp; прев.</single>
-      <multiple>ред.кол. &amp; прев.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">от</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">под общата редакция на</term>
+    <term name="editor" form="verb">редактиран от</term>
+    <term name="editor-translator" form="verb">редактирано &amp; преведено от</term>
+    <term name="editortranslator" form="verb">редактирано &amp; преведено от</term>
+    <term name="editorial-director" form="verb">главен редактор</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">илюстрации от</term>
+    <term name="interviewer" form="verb">интервюиран от</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">от</term>
-    <term name="director" form="verb">под общата редакция на</term>
-    <term name="editor" form="verb">редактиран от</term>
-    <term name="editorial-director" form="verb">главен редактор</term>
-    <term name="illustrator" form="verb">илюстрации от</term>
-    <term name="interviewer" form="verb">интервюиран от</term>
     <term name="recipient" form="verb">до</term>
     <term name="reviewed-author" form="verb">рецензент</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">преведен от</term>
-    <term name="editortranslator" form="verb">редактирано &amp; преведено от</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">п.о.р.</term>
+    <term name="editor" form="verb-short">ред.</term>
+    <term name="editor-translator" form="verb-short">ред. &amp; прев. от</term>
+    <term name="editortranslator" form="verb-short">ред. &amp; прев. от</term>
+    <term name="editorial-director" form="verb-short">гл.ред.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">ил.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">п.о.р.</term>
-    <term name="editor" form="verb-short">ред.</term>
-    <term name="editorial-director" form="verb-short">гл.ред.</term>
-    <term name="illustrator" form="verb-short">ил.</term>
     <term name="translator" form="verb-short">прев.</term>
-    <term name="editortranslator" form="verb-short">ред. &amp; прев. от</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Януари</term>
diff --git a/locales/brh-PK.xml b/locales/brh-PK.xml
new file mode 100644
--- /dev/null
+++ b/locales/brh-PK.xml
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="brh-PK">
+  <info>
+    <translator>
+      <name>عثمان</name>
+    </translator>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2025-10-18T05:53:06+00:00</updated>
+  </info>
+  <style-options punctuation-in-quote="true"/>
+  <date form="text">
+    <date-part name="day" suffix="؍ "/>
+    <date-part name="month" suffix=" "/>
+    <date-part name="year" suffix="ء"/>
+  </date>
+  <date form="numeric">
+    <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+    <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+    <date-part name="year"/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">رسوخ کرے</term>
+    <term name="advance-online-publication">پیشگی آن لائن چھاپ</term>
+    <term name="album">البم</term>
+    <term name="and">پر</term>
+    <term name="and others">پین پین</term>
+    <term name="anonymous">گم پن</term>
+    <term name="at">اوڑیک</term>
+    <term name="audio-recording">آڈیو ریکارڈ</term>
+    <term name="available at">داڑیک دوبروک</term>
+    <term name="by">اونگان</term>
+    <term name="circa">تقریباً</term>
+    <term name="cited">حوالہ تس</term>
+    <term name="et-al">پین پین</term>
+    <term name="film">فلم</term>
+    <term name="forthcoming">بردورہ‌ٹی</term>
+    <term name="from">ایکان</term>
+    <term name="henceforth">اینگی</term>
+    <term name="ibid">ایضاً</term>
+    <term name="in">اونگی</term>
+    <term name="in press">چھاپہ‌ٹی</term>
+    <term name="internet">انٹرنیٹ</term>
+    <term name="letter">چٹھی</term>
+    <term name="loc-cit">ایضاً</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">بے تاریخ</term>
+    <term name="no-place">بے جاگہ</term>
+    <term name="no-publisher">بے چھاپہ خانہ</term> <!-- sine nomine -->
+    <term name="on">زی</term>
+    <term name="online">آن لائن</term>
+    <term name="op-cit">ایضاً</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">اصل کار چھاپ کرے</term>
+    <term name="personal-communication">ذاتی ہیت</term>
+    <term name="podcast">پاڈکاسٹ</term>
+    <term name="podcast-episode">پاڈکاسٹ ایپیسوڈ</term>
+    <term name="preprint">پریپرنٹ</term>
+    <term name="presented at">کانفرنس</term>
+    <term name="radio-broadcast">ریڈیو تالان کننگ</term>
+    <term name="radio-series">ریڈیو سلسلہ</term>
+    <term name="radio-series-episode">ریڈیو ایپیسوڈ</term>
+    <term name="reference">
+      <single>حوالہ</single>
+      <multiple>حوالہ‌غاک</multiple>
+    </term>
+    <term name="retrieved">حاصل کرے</term>
+    <term name="review-of">ریویوکہ</term>
+    <term name="scale">سکیل</term>
+    <term name="special-issue">خاص شمارہ</term>
+    <term name="special-section">خاص جز</term>
+    <term name="television-broadcast">ٹیلی ویژن تالان کننگ</term>
+    <term name="television-series">ٹیلی ویژن سلسلہ</term>
+    <term name="television-series-episode">ٹیلی ویژن ایپیسوڈ</term>
+    <term name="video">ویڈیو</term>
+    <term name="working-paper">ورکنگ پیپر</term>
+
+    <!-- SHORT GENERAL TERMS -->
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="article">مضمون</term>
+    <term name="article-journal">جرنیل‌نا مضمون</term>
+    <term name="article-magazine">میگزین‌نا مضمون</term>
+    <term name="article-newspaper">اخبارنا مضمون</term>
+    <term name="bill">بِل</term>
+    <!-- book is in the list of locator terms -->
+    <term name="broadcast">تالان کننگ</term>
+    <!-- chapter is in the list of locator terms -->
+    <term name="classic">کلیسک</term>
+    <term name="collection">مجموعہ</term>
+    <term name="dataset">ڈیٹا سیٹ</term>
+    <term name="document">دستاویز</term>
+    <term name="entry">اندراج</term>
+    <term name="entry-dictionary">ڈکشنری‌نا اندراج</term>
+    <term name="entry-encyclopedia">انسائیکلو پیڈیانا اندراج</term>
+    <term name="event">واقعہ</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic">نگاری</term>
+    <term name="hearing">پیشی</term>
+    <term name="interview">انٹرویو</term>
+    <term name="legal_case">مقدمہ</term>
+    <term name="legislation">قانود نامہ</term>
+    <term name="manuscript">مسودہ</term>
+    <term name="map">نقشہ</term>
+    <term name="motion_picture">ویڈیو ریکارڈ</term>
+    <term name="musical_score">سازی سکور</term>
+    <term name="pamphlet">پمفلٹ</term>
+    <term name="paper-conference">کانفرنس پیپر</term>
+    <term name="patent">پیٹنٹ</term>
+    <term name="performance">ناٹک</term>
+    <term name="periodical">مدت‌نا چھاپ</term>
+    <term name="personal_communication">ذاتی ہیت</term>
+    <term name="post">پوسٹ</term>
+    <term name="post-weblog">بلاگ پوسٹ</term>
+    <term name="regulation">ضابطہ</term>
+    <term name="report">روداد</term>
+    <term name="review">ریویو</term>
+    <term name="review-book">کتابی ریویو</term>
+    <term name="software">سافٹویر</term>
+    <term name="song">آڈیو ریکارڈ</term>
+    <term name="speech">تران</term>
+    <term name="standard">علمدار</term>
+    <term name="thesis">تهیسس</term>
+    <term name="treaty">عہد نامہ</term>
+    <term name="webpage">ویب پنہ</term>
+
+    <!-- SHORT ITEM TYPE FORMS -->
+
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">پیشی‌کہ</term>
+    <term name="review" form="verb">ریویوکہ</term>
+    <term name="review-book" form="verb">کتاب‌نا ریویوکہ</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad">عیسوی سن</term>
+    <term name="bc">مست عیسوی سن</term>
+    <term name="bce">مست عام سن</term>
+    <term name="ce">عام سن</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">”</term>
+    <term name="close-quote">“</term>
+    <term name="open-inner-quote">’</term>
+    <term name="close-inner-quote">‘</term>
+    <term name="page-range-delimiter">–</term>
+    <term name="colon">:</term>
+    <term name="comma">،</term>
+    <term name="semicolon">؛</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal">میکو</term>
+    <term name="ordinal-01">لیکو</term>
+    <term name="ordinal-11">میکو</term>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01">اولیکو</term>
+    <term name="long-ordinal-02">ارٹمیکو</term>
+    <term name="long-ordinal-03">مسٹمیکو</term>
+    <term name="long-ordinal-04">چارمیکو</term>
+    <term name="long-ordinal-05">پنچمیکو</term>
+    <term name="long-ordinal-06">ششمیکو</term>
+    <term name="long-ordinal-07">ہفتمیکو</term>
+    <term name="long-ordinal-08">ہشتمیکو</term>
+    <term name="long-ordinal-09">نوہمیکو</term>
+    <term name="long-ordinal-10">دہمیکو</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="act">
+      <single>ایکٹ</single>
+      <multiple>ایکٹاک</multiple>
+    </term>
+    <term name="appendix">
+      <single>ضمیمہ</single>
+      <multiple>ضمیمہ‌غاک</multiple>
+    </term>
+    <term name="article-locator">
+      <single>مضمون</single>
+      <multiple>مضمونک</multiple>
+    </term>
+    <term name="book">
+      <single>کتاب</single>
+      <multiple>کتاباک</multiple>
+    </term>
+    <term name="canon">
+      <single>قانود</single>
+      <multiple>قانوداک</multiple>
+    </term>
+    <term name="chapter">
+      <single>در</single>
+      <multiple>دک</multiple>
+    </term>
+    <term name="column">
+      <single>کالم</single>
+      <multiple>کالمک</multiple>
+    </term>
+    <term name="elocation">
+      <single>جاگہ</single>
+      <multiple>جاگہ‌غاک</multiple>
+    </term>
+    <term name="equation">
+      <single>مساوات</single>
+      <multiple>مساواتاک</multiple>
+    </term>
+    <term name="figure">
+      <single>تصویر</single>
+      <multiple>تصویک</multiple>
+    </term>
+    <term name="folio">
+      <single>فولیو</single>
+      <multiple>فولیوک</multiple>
+    </term>
+    <term name="issue">
+      <single>شمارہ</single>
+      <multiple>شمارہ‌غاک</multiple>
+    </term>
+    <term name="line">
+      <single>قطار</single>
+      <multiple>قطاک</multiple>
+    </term>
+    <term name="note">
+      <single>نوٹ</single>
+      <multiple>نوٹاک</multiple>
+    </term>
+    <term name="opus">
+      <single>کارنامہ</single>
+      <multiple>کارنامہ‌غاک</multiple>
+    </term>
+    <term name="page">
+      <single>پنہ</single>
+      <multiple>پنہ‌غاک</multiple>
+    </term>
+    <term name="paragraph">
+      <single>بہرگ</single>
+      <multiple>بہرگاک</multiple>
+    </term>
+    <term name="part">
+      <single>حصہ</single>
+      <multiple>حصہ‌غاک</multiple>
+    </term>
+    <term name="rule">
+      <single>رول</single>
+      <multiple>رولک</multiple>
+    </term>
+    <term name="scene">
+      <single>سین</single>
+      <multiple>سینک</multiple>
+    </term>
+    <term name="section">
+      <single>جز</single>
+      <multiple>جزک</multiple>
+    </term>
+    <term name="sub-verbo">
+      <single>زیر کلمہ</single>
+      <multiple>زیر کلمہ‌غاک</multiple>
+    </term>
+    <term name="supplement">
+      <single>لاحق</single>
+      <multiple>لاحقاک</multiple>
+    </term>
+    <term name="table">
+      <single>ٹیبل</single>
+      <multiple>ٹیبلک</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>سرورق</single>
+      <multiple>سرورقاک</multiple>
+    </term>
+    <term name="verse">
+      <single>شعر</single>
+      <multiple>شعک</multiple>
+    </term>
+    <term name="volume">
+      <single>جلد</single>
+      <multiple>جلداک</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>در</single>
+      <multiple>دک</multiple>
+    </term>
+    <term name="citation-number">
+      <single>حوالہ</single>
+      <multiple>حوالہ‌غاک</multiple>
+    </term>
+    <term name="collection-number">
+      <single>نمبر</single>
+      <multiple>نمبک</multiple>
+    </term>
+    <term name="edition">
+      <single>چھاپ</single>
+      <multiple>چھاپاک</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>حوالہ</single>
+      <multiple>حوالہ‌غاک</multiple>
+    </term>
+    <term name="number">
+      <single>نمبر</single>
+      <multiple>نمبک</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>پنہ</single>
+      <multiple>پنہ‌غاک</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>جلد</single>
+      <multiple>جلداک</multiple>
+    </term>
+    <term name="page-first">
+      <single>پنہ</single>
+      <multiple>پنہ‌غاک</multiple>
+    </term>
+    <term name="printing">
+      <single>ٹپو</single>
+      <multiple>ٹپوک</multiple>
+    </term>
+    <term name="version">
+      <single>ورژن</single>
+      <multiple>ورژنک</multiple>
+    </term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>چیر</single>
+      <multiple>چیک</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>ایڈٹر</single>
+      <multiple>ایڈٹک</multiple>
+    </term>
+    <term name="compiler">
+      <single>سرجم کروک</single>
+      <multiple>سرجم کروکاک</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>حصہ دار</single>
+      <multiple>حصہ داک</multiple>
+    </term>
+    <term name="curator">
+      <single>کیوریٹر</single>
+      <multiple>کیودیٹک</multiple>
+    </term>
+    <term name="director">
+      <single>ڈائریکٹر</single>
+      <multiple>ڈائریکٹک</multiple>
+    </term>
+    <term name="editor">
+      <single>ایڈٹر</single>
+      <multiple>ایڈٹک</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>ایڈٹر &amp; مترجم</single>
+      <multiple>ایڈٹک &amp; مترجمک</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>ایڈٹر &amp; مترجم</single>
+      <multiple>ایڈٹک &amp; مترجمک</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>ایڈٹر</single>
+      <multiple>ایڈٹک</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>انتظامیہ</single>
+      <multiple>انتظامیہ</multiple>
+    </term>
+    <term name="guest">
+      <single>مہمان</single>
+      <multiple>مہمانک</multiple>
+    </term>
+    <term name="host">
+      <single>مہمانی کروک</single>
+      <multiple>مہمانی کروکاک</multiple>
+    </term>
+    <term name="illustrator">
+      <single>مصور</single>
+      <multiple>مصوک</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>راوی</single>
+      <multiple>راویک</multiple>
+    </term>
+    <term name="organizer">
+      <single>تنظیم کروک</single>
+      <multiple>نظیم کروکاک</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>فنکار</single>
+      <multiple>فنکاک</multiple>
+    </term>
+    <term name="producer">
+      <single>پیدا کروک</single>
+      <multiple>پیدا کروکاک</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>لکھوک</single>
+      <multiple>لکھوکاک</multiple>
+    </term>
+    <term name="series-creator">
+      <single>سلسلہ ودی کروک</single>
+      <multiple>سلسلہ ودی کروکاک</multiple>
+    </term>
+    <term name="translator">
+      <single>مترجم</single>
+      <multiple>مترجمک</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+
+    <!-- VERB ROLE FORMS -->
+    <term name="chair" form="verb">چیرٹ</term>
+    <term name="collection-editor" form="verb">ایڈٹرٹ</term>
+    <term name="compiler" form="verb">سرجم کروکٹ</term>
+    <term name="composer" form="verb">ترکیب کروک</term>
+    <term name="container-author" form="verb">لکھوکٹ</term>
+    <term name="contributor" form="verb">حصہ دارٹ</term>
+    <term name="curator" form="verb">کیوریٹرٹ</term>
+    <term name="director" form="verb">ڈائریکٹرٹ</term>
+    <term name="editor" form="verb">ایڈٹرٹ</term>
+    <term name="editor-translator" form="verb">مترجمٹ &amp; ایڈٹرٹ</term>
+    <term name="editortranslator" form="verb">مترجمٹ &amp; ایڈٹرٹ</term>
+    <term name="editorial-director" form="verb">ایڈٹرٹ</term>
+    <term name="executive-producer" form="verb">انتظامیٹ</term>
+    <term name="guest" form="verb">مہمانٹ</term>
+    <term name="host" form="verb">مہمانی کروکٹ</term>
+    <term name="illustrator" form="verb">مصورٹ</term>
+    <term name="interviewer" form="verb">انٹرویوئٹ</term>
+    <term name="narrator" form="verb">راویئٹ</term>
+    <term name="organizer" form="verb">تنظیم کروکٹ</term>
+    <term name="original-author" form="verb">لکھوکٹ</term>
+    <term name="performer" form="verb">فنکارٹ</term>
+    <term name="producer" form="verb">پیدا کروکٹ</term>
+    <term name="recipient" form="verb">وصول کروکٹ</term>
+    <term name="reviewed-author" form="verb">لکھوکٹ</term>
+    <term name="script-writer" form="verb">لکھوکٹ</term>
+    <term name="series-creator" form="verb">  سلسلہ ودی کروکٹ</term>
+    <term name="translator" form="verb">مترجمٹ</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">جنوری</term>
+    <term name="month-02">فروری</term>
+    <term name="month-03">مارچ</term>
+    <term name="month-04">اپریل</term>
+    <term name="month-05">مئی</term>
+    <term name="month-06">جون</term>
+    <term name="month-07">جلائی</term>
+    <term name="month-08">اگست</term>
+    <term name="month-09">ستمبر</term>
+    <term name="month-10">اکتوبر</term>
+    <term name="month-11">نومبر</term>
+    <term name="month-12">دسمبر</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">جنو</term>
+    <term name="month-02" form="short">فرو</term>
+    <term name="month-03" form="short">مار</term>
+    <term name="month-04" form="short">اپر</term>
+    <term name="month-05" form="short">مئی</term>
+    <term name="month-06" form="short">جون</term>
+    <term name="month-07" form="short">جلا</term>
+    <term name="month-08" form="short">اگس‍</term>
+    <term name="month-09" form="short">ستم‍</term>
+    <term name="month-10" form="short">اکت‌</term>
+    <term name="month-11" form="short">نوم‍</term>
+    <term name="month-12" form="short">دسم‌</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">ہتم</term>
+    <term name="season-02">تیرمہ</term>
+    <term name="season-03">خزان</term>
+    <term name="season-04">سیڷ</term>
+  </terms>
+</locale>
diff --git a/locales/ca-AD.xml b/locales/ca-AD.xml
--- a/locales/ca-AD.xml
+++ b/locales/ca-AD.xml
@@ -7,13 +7,16 @@
     <translator>
       <name>javimat</name>
     </translator>
+    <translator>
+      <name>jotaemi</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2025-10-16T03:08:07+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" suffix=" "/>
+    <date-part name="day" suffix=" de "/>
+    <date-part name="month" suffix=" de "/>
     <date-part name="year"/>
   </date>
   <date form="numeric">
@@ -22,137 +25,146 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">comunicació personal</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">consulta</term>
+    <term name="advance-online-publication">avançament de publicació en línia</term>
+    <term name="album">àlbum</term>
     <term name="and">i</term>
     <term name="and others">i altres</term>
     <term name="anonymous">anònim</term>
-    <term name="anonymous" form="short">anòn.</term>
     <term name="at">a</term>
+    <term name="audio-recording">enregistrament d'àudio</term>
     <term name="available at">disponible a</term>
     <term name="by">per</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">c.</term>
     <term name="cited">citat</term>
-    <term name="edition">
-      <single>edició</single>
-      <multiple>edicions</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
     <term name="et-al">et al.</term>
+    <term name="film">pel·lícula</term>
     <term name="forthcoming">previst</term>
     <term name="from">de</term>
+    <term name="henceforth">en endevant</term>
     <term name="ibid">ibíd.</term>
-    <term name="in">en</term>
+    <term name="in">dins</term>
     <term name="in press">en impremta</term>
     <term name="internet">internet</term>
     <term name="letter">carta</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">sense data</term>
-    <term name="no date" form="short">s.d.</term>
+    <term name="no-place">sense lloc</term>
+    <term name="no-publisher">sense nom</term> <!-- sine nomine -->
+    <term name="on">a</term>
     <term name="online">en línia</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">obra original publicada el</term>
+    <term name="personal-communication">comunicació personal</term>
+    <term name="podcast">pòdcast</term>
+    <term name="podcast-episode">capítol de pòdcast</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">presentat a</term>
+    <term name="radio-broadcast">emissió de ràdio</term>
+    <term name="radio-series">sèrie de ràdio</term>
+    <term name="radio-series-episode">capítol de sèrie de ràdio</term>
     <term name="reference">
       <single>referència</single>
       <multiple>referències</multiple>
     </term>
+    <term name="retrieved">recuperat</term>
+    <term name="review-of">ressenya de</term>
+    <term name="scale">escala</term>
+    <term name="special-issue">número especial</term>
+    <term name="special-section">secció especial</term>
+    <term name="television-broadcast">emissió de televisió</term>
+    <term name="television-series">sèrie de televisió</term>
+    <term name="television-series-episode">capítol de sèrie de televisió</term>
+    <term name="video">vídeo</term>
+    <term name="working-paper">working paper</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anòn.</term>
+    <term name="circa" form="short">c.</term>
+    <term name="no date" form="short">s.d.</term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher" form="short">s.n.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">recuperat</term>
-    <term name="scale">escala</term>
-    <term name="version">versió</term>
+    <term name="review-of" form="short">res. de</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article-journal">article de revista acadèmica</term>
+    <term name="article-magazine">article de revista</term>
+    <term name="article-newspaper">article de diari</term>
+    <term name="bill">projecte de llei</term> <!-- Caldria comprovar si és la millor traducció -->
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">emissió</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
+    <term name="classic">clàssic</term>
+    <term name="collection">col·lecció</term>
     <term name="dataset">dataset</term>
     <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="entry">entrada</term>
+    <term name="entry-dictionary">entrada de diccionari</term>
+    <term name="entry-encyclopedia">entrada d'enciclopèdia</term>
+    <term name="event">esdeveniment</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">gràfic</term>
+    <term name="hearing">vista</term>
     <term name="interview">entrevista</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="legal_case">causa judicial</term>
+    <term name="legislation">legislació</term>
+    <term name="manuscript">manuscrit</term>
+    <term name="map">mapa</term>
+    <term name="motion_picture">enregistrament de vídeo</term>
+    <term name="musical_score">partitura musical</term>
+    <term name="pamphlet">fullet</term>
+    <term name="paper-conference">comunicació</term>
     <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="performance">actuació</term>
+    <term name="periodical">periòdic</term>
     <term name="personal_communication">comunicació personal</term>
     <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post-weblog">entrada de blog</term>
+    <term name="regulation">regulació</term>
+    <term name="report">informe</term>
+    <term name="review">revisió</term>
+    <term name="review-book">ressenya de llibre</term>
+    <term name="software">programari</term>
+    <term name="song">enregistrament d'àudio</term>
+    <term name="speech">presentació</term>
+    <term name="standard">estàndard</term>
+    <term name="thesis">tesi</term>
+    <term name="treaty">tractat</term>
+    <term name="webpage">lloc web</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">art. acad.</term>
+    <term name="article-magazine" form="short">art. rev.</term>
+    <term name="article-newspaper" form="short">art. diari</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
+    <term name="graphic" form="short">graf.</term>
+    <term name="interview" form="short">entr.</term>
+    <term name="manuscript" form="short">manus.</term>
+    <term name="motion_picture" form="short">video</term>
+    <term name="report" form="short">inf.</term>
     <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="review-book" form="short">res.</term>
+    <term name="song" form="short">àudio</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimoni de</term>
+    <term name="review" form="verb">revisió de</term>
+    <term name="review-book" form="verb">ressenya del llibre</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">dC</term>
     <term name="bc">aC</term>
@@ -170,69 +182,56 @@
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal">a</term>
+    <term name="ordinal" gender-form="feminine">a</term>
+    <term name="ordinal" gender-form="masculine">è</term>
+    <term name="ordinal-01" gender-form="masculine">r</term>
+    <term name="ordinal-02" gender-form="masculine">n</term>
+    <term name="ordinal-03" gender-form="masculine">r</term>
+    <term name="ordinal-04" gender-form="masculine">t</term>
 
     <!-- LONG ORDINALS -->
-    <term name="long-ordinal-01">primera</term>
-    <term name="long-ordinal-02">segona</term>
-    <term name="long-ordinal-03">tercera</term>
-    <term name="long-ordinal-04">quarta</term>
-    <term name="long-ordinal-05">cinquena</term>
-    <term name="long-ordinal-06">sisena</term>
-    <term name="long-ordinal-07">setena</term>
-    <term name="long-ordinal-08">vuitena</term>
-    <term name="long-ordinal-09">novena</term>
-    <term name="long-ordinal-10">desena</term>
+    <term name="long-ordinal-01" gender-form="feminine">primera</term>
+    <term name="long-ordinal-02" gender-form="feminine">segona</term>
+    <term name="long-ordinal-03" gender-form="feminine">tercera</term>
+    <term name="long-ordinal-04" gender-form="feminine">quarta</term>
+    <term name="long-ordinal-05" gender-form="feminine">cinquena</term>
+    <term name="long-ordinal-06" gender-form="feminine">sisena</term>
+    <term name="long-ordinal-07" gender-form="feminine">setena</term>
+    <term name="long-ordinal-08" gender-form="feminine">vuitena</term>
+    <term name="long-ordinal-09" gender-form="feminine">novena</term>
+    <term name="long-ordinal-10" gender-form="feminine">desena</term>
+    <term name="long-ordinal-01" gender-form="masculine">primer</term>
+    <term name="long-ordinal-02" gender-form="masculine">segon</term>
+    <term name="long-ordinal-03" gender-form="masculine">tercer</term>
+    <term name="long-ordinal-04" gender-form="masculine">quart</term>
+    <term name="long-ordinal-05" gender-form="masculine">cinquè</term>
+    <term name="long-ordinal-06" gender-form="masculine">sisè</term>
+    <term name="long-ordinal-07" gender-form="masculine">setè</term>
+    <term name="long-ordinal-08" gender-form="masculine">vuitè</term>
+    <term name="long-ordinal-09" gender-form="masculine">novè</term>
+    <term name="long-ordinal-10" gender-form="masculine">desè</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
+    <term name="act">
+      <single>acte</single>
+      <multiple>actes</multiple>
     </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
+    <term name="appendix">
+      <single>apèndix</single>
+      <multiple>apèndixs</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>llibre</single>
       <multiple>llibres</multiple>
     </term>
+    <term name="canon">
+      <single>cànon</single>
+      <multiple>cànons</multiple>
+    </term>
     <term name="chapter">
       <single>capítol</single>
       <multiple>capítols</multiple>
@@ -241,6 +240,14 @@
       <single>columna</single>
       <multiple>columnes</multiple>
     </term>
+    <term name="elocation">
+      <single>localització</single>
+      <multiple>localitzacions</multiple>
+    </term>
+    <term name="equation">
+      <single>equació</single>
+      <multiple>equacions</multiple>
+    </term>
     <term name="figure">
       <single>figura</single>
       <multiple>figures</multiple>
@@ -269,10 +276,6 @@
       <single>pàgina</single>
       <multiple>pàgines</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>pàgina</single>
-      <multiple>pàgines</multiple>
-    </term>
     <term name="paragraph">
       <single>paràgraf</single>
       <multiple>paràgrafs</multiple>
@@ -281,6 +284,14 @@
       <single>part</single>
       <multiple>parts</multiple>
     </term>
+    <term name="rule"> <!-- Caldria comprovar si és la millor traducció -->
+      <single>norma</single>
+      <multiple>normes</multiple>
+    </term>
+    <term name="scene">
+      <single>escena</single>
+      <multiple>escenes</multiple>
+    </term>
     <term name="section">
       <single>secció</single>
       <multiple>seccions</multiple>
@@ -289,55 +300,51 @@
       <single>sub voce</single>
       <multiple>sub vocibus</multiple>
     </term>
+    <term name="supplement">
+      <single>suplement</single>
+      <multiple>suplements</multiple>
+    </term>
+    <term name="table">
+      <single>taula</single>
+      <multiple>taules</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>títol</single>
+      <multiple>títols</multiple>
+    </term>
     <term name="verse">
       <single>vers</single>
       <multiple>versos</multiple>
     </term>
-    <term name="volume">
+    <term name="volume" gender="masculine">
       <single>volum</single>
       <multiple>volums</multiple>
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
+    <term name="appendix" form="short">
+      <single>ap.</single>
+      <multiple>aps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">llib.</term>
+    <term name="chapter" form="short">cap.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">llib.</term>
-    <term name="chapter" form="short">cap.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">f.</term>
     <term name="issue" form="short">núm.</term>
@@ -346,19 +353,39 @@
     <term name="opus" form="short">op.</term>
     <term name="page" form="short">
       <single>p.</single>
-      <multiple>p.</multiple>
-    </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>p.</multiple>
+      <multiple>pp.</multiple>
     </term>
     <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">pt.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sec.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.v.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>sup.</single>
+      <multiple>sups.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
@@ -368,7 +395,7 @@
       <multiple>vol.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>§</single>
       <multiple>§</multiple>
@@ -378,15 +405,102 @@
       <multiple>§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>capítol</single>
+      <multiple>capítols</multiple>
+    </term>
+    <term name="citation-number">
+      <single>cita</single>
+      <multiple>cites</multiple>
+    </term>
+    <term name="collection-number">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="edition" gender="feminine">
+      <single>edició</single>
+      <multiple>edicions</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>referència</single>
+      <multiple>referències</multiple>
+    </term>
+    <term name="number" gender="masculine">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>pàgina</single>
+      <multiple>pàgines</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volum</single>
+      <multiple>volums</multiple>
+    </term>
+    <term name="page-first">
+      <single>pàgina</single>
+      <multiple>pàgines</multiple>
+    </term>
+    <term name="printing">
+      <single>impressió</single>
+      <multiple>impressions</multiple>
+    </term>
+    <term name="version">versió</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>cap.</single>
+      <multiple>caps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">núm.</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>ref.</single>
+      <multiple>refs.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>núm.</single>
+      <multiple>núms.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <!-- Pendents de traducció a manca de solucions sense marca de gènere -->
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -395,6 +509,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor i traductor</single>
+      <multiple>editors i traductors</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor i traductor</single>
+      <multiple>editors i traductors</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -407,6 +541,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>il·lustrador</single>
+      <multiple>il·lustradors</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -415,6 +554,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -423,6 +563,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -431,30 +573,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="illustrator">
-      <single>il·lustrador</single>
-      <multiple>il·lustradors</multiple>
-    </term>
     <term name="translator">
       <single>traductor</single>
       <multiple>traductors</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor i traductor</single>
-      <multiple>editors i traductors</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -469,10 +591,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dir.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>ed.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. i trad.</single>
+      <multiple>ed. i trad.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. i trad.</single>
+      <multiple>ed. i trad.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>ed.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>il·lust.</single>
+      <multiple>il·lust.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -497,89 +643,73 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dir.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>ed.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>ed.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>il·lust.</single>
-      <multiple>il·lust.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>trad.</single>
       <multiple>trad.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. i trad.</single>
-      <multiple>ed. i trad.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">chaired by</term> <!-- Pendent de traducció per desconeixement del context -->
+    <term name="collection-editor" form="verb">editat per</term>
+    <term name="compiler" form="verb">compilat per</term>
     <term name="container-author" form="verb">per</term>
+    <term name="contributor" form="verb">amb</term>
+    <term name="curator" form="verb">curat per</term>
     <term name="director" form="verb">dirigit per</term>
     <term name="editor" form="verb">editat per</term>
+    <term name="editor-translator" form="verb">editat i traduït per</term>
+    <term name="editortranslator" form="verb">editat i traduït per</term>
     <term name="editorial-director" form="verb">editat per</term>
+    <term name="executive-producer" form="verb">producció executiva de</term>
+    <term name="guest" form="verb">amb la participació de</term>
+    <term name="host" form="verb">presentat per</term>
     <term name="illustrator" form="verb">il·lustrat per</term>
-    <term name="interviewer" form="verb">entrevistat per</term>
+    <term name="interviewer" form="verb">entrevista feta per</term>
+    <term name="narrator" form="verb">narrat per</term>
+    <term name="organizer" form="verb">organitzat per</term>
+    <term name="performer" form="verb">representat per</term>
+    <term name="producer" form="verb">produït per</term>
     <term name="recipient" form="verb">a</term>
     <term name="reviewed-author" form="verb">per</term>
+    <term name="script-writer" form="verb">escrit per</term>
+    <term name="series-creator" form="verb">creat per</term>
     <term name="translator" form="verb">traduït per</term>
-    <term name="editortranslator" form="verb">editat i traduït per</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">ed.</term>
+    <term name="compiler" form="verb-short">comp.</term>
+    <term name="contributor" form="verb-short">amb</term>
+    <term name="curator" form="verb-short">cur.</term>
     <term name="director" form="verb-short">dir.</term>
     <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">ed. i trad. per</term>
+    <term name="editortranslator" form="verb-short">ed. i trad. per</term>
     <term name="editorial-director" form="verb-short">ed.</term>
+    <term name="executive-producer" form="verb-short">prod. exec.</term>
+    <term name="guest" form="verb-short">amb</term>
+    <term name="host" form="verb-short">pres.</term>
     <term name="illustrator" form="verb-short">il·lust.</term>
+    <term name="narrator" form="verb-short">narr.</term>
+    <term name="organizer" form="verb-short">org.</term>
+    <term name="performer" form="verb-short">act.</term>
+    <term name="producer" form="verb-short">prod.</term>
+    <term name="script-writer" form="verb-short">escr.</term>
+    <term name="series-creator" form="verb-short">crea.</term>
     <term name="translator" form="verb-short">trad.</term>
-    <term name="editortranslator" form="verb-short">ed. i trad. per</term>
 
     <!-- LONG MONTH FORMS -->
-    <term name="month-01">gener</term>
-    <term name="month-02">febrer</term>
-    <term name="month-03">març</term>
-    <term name="month-04">abril</term>
-    <term name="month-05">maig</term>
-    <term name="month-06">juny</term>
-    <term name="month-07">juliol</term>
-    <term name="month-08">agost</term>
-    <term name="month-09">setembre</term>
-    <term name="month-10">octubre</term>
-    <term name="month-11">novembre</term>
-    <term name="month-12">desembre</term>
+    <term name="month-01" gender="masculine">gener</term>
+    <term name="month-02" gender="masculine">febrer</term>
+    <term name="month-03" gender="masculine">març</term>
+    <term name="month-04" gender="masculine">abril</term>
+    <term name="month-05" gender="masculine">maig</term>
+    <term name="month-06" gender="masculine">juny</term>
+    <term name="month-07" gender="masculine">juliol</term>
+    <term name="month-08" gender="masculine">agost</term>
+    <term name="month-09" gender="masculine">setembre</term>
+    <term name="month-10" gender="masculine">octubre</term>
+    <term name="month-11" gender="masculine">novembre</term>
+    <term name="month-12" gender="masculine">desembre</term>
 
     <!-- SHORT MONTH FORMS -->
     <term name="month-01" form="short">gen.</term>
diff --git a/locales/cs-CZ.xml b/locales/cs-CZ.xml
--- a/locales/cs-CZ.xml
+++ b/locales/cs-CZ.xml
@@ -6,6 +6,7 @@
     </translator>
     <translator>
       <name>Andrew Dunning</name>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
     </translator>
     <translator>
       <name>libora</name>
@@ -14,7 +15,7 @@
       <name>Michal Hoftich</name>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-02-04T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -28,74 +29,75 @@
     <date-part name="year" range-delimiter="-"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">osobní komunikace</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">viděno</term>
-    <term name="accessed" form="short">vid.</term>
+    <term name="advance-online-publication">dostupné online před tiskem</term>
+    <term name="album">album</term>
     <term name="and">a</term>
     <term name="and others">a další</term>
     <term name="anonymous">anonym</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">v</term>
+    <term name="audio-recording">zvukový záznam</term>
     <term name="available at">dostupné z</term>
     <term name="by">od</term>
     <term name="circa">asi</term>
-    <term name="circa" form="short">cca.</term>
     <term name="cited">citován</term>
-    <term name="edition">
-      <single>vydání</single>
-      <multiple>vydání</multiple>
-    </term>
-    <term name="edition" form="short">vyd.</term>
     <term name="et-al">et al.</term>
+    <term name="film">film</term>
     <term name="forthcoming">nadcházející</term>
     <term name="from">z</term>
+    <term name="henceforth">dále jen</term>
     <term name="ibid">ibid.</term>
     <term name="in">in</term>
     <term name="in press">v tisku</term>
     <term name="internet">internet</term>
     <term name="letter">dopis</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">nedatováno</term>
-    <term name="no date" form="short">b.r.</term>
+    <term name="no-place">sine loco</term>
+    <term name="no-publisher">neuvedeno</term> <!-- sine nomine -->
+    <term name="on">on</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">původní dílo vydáno</term>
+    <term name="personal-communication">osobní komunikace</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcast episode</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">prezentováno v</term>
+    <term name="radio-broadcast">radio broadcast</term>
+    <term name="radio-series">radio series</term>
+    <term name="radio-series-episode">radio series episode</term>
     <term name="reference">
       <single>reference</single>
       <multiple>reference</multiple>
     </term>
+    <term name="retrieved">získáno</term>
+    <term name="review-of">review of</term>
+    <term name="scale">měřítko</term>
+    <term name="special-issue">special issue</term>
+    <term name="special-section">special section</term>
+    <term name="television-broadcast">television broadcast</term>
+    <term name="television-series">television series</term>
+    <term name="television-series-episode">television series episode</term>
+    <term name="video">video</term>
+    <term name="working-paper">working paper</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="accessed" form="short">vid.</term>
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">cca.</term>
+    <term name="no date" form="short">b.r.</term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher" form="short">neuved.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">získáno</term>
-    <term name="scale">měřítko</term>
-    <term name="version">verze</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -160,6 +162,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">n. l.</term>
     <term name="bc">př. n. l.</term>
@@ -168,9 +178,9 @@
 
     <!-- PUNCTUATION -->
     <term name="open-quote">„</term>
-    <term name="close-quote">"</term>
+    <term name="close-quote">“</term>
     <term name="open-inner-quote">‚</term>
-    <term name="close-inner-quote">´</term>
+    <term name="close-inner-quote">‘</term>
     <term name="page-range-delimiter">–</term>
     <term name="colon">:</term>
     <term name="comma">,</term>
@@ -192,54 +202,26 @@
     <term name="long-ordinal-10">desáté</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>kniha</single>
       <multiple>knihy</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>kapitola</single>
       <multiple>kapitoly</multiple>
@@ -248,6 +230,14 @@
       <single>sloupec</single>
       <multiple>sloupce</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>obrázek</single>
       <multiple>obrázky</multiple>
@@ -276,10 +266,6 @@
       <single>strana</single>
       <multiple>strany</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>strana</single>
-      <multiple>strany</multiple>
-    </term>
     <term name="paragraph">
       <single>odstavec</single>
       <multiple>odstavce</multiple>
@@ -288,6 +274,14 @@
       <single>část</single>
       <multiple>části</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>sekce</single>
       <multiple>sekce</multiple>
@@ -296,6 +290,22 @@
       <single>pod heslem</single>
       <multiple>pod hesly</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verš</single>
       <multiple>verše</multiple>
@@ -306,45 +316,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">k.</term>
+    <term name="chapter" form="short">kap.</term>
+    <term name="column" form="short">sl.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">k.</term>
-    <term name="chapter" form="short">kap.</term>
-    <term name="column" form="short">sl.</term>
     <term name="figure" form="short">obr.</term>
     <term name="folio" form="short">l.</term>
     <term name="issue" form="short">č.</term>
@@ -355,17 +345,37 @@
       <single>s.</single>
       <multiple>s.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>s.</single>
-      <multiple>s.</multiple>
-    </term>
     <term name="paragraph" form="short">odst.</term>
     <term name="part" form="short">č.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sek.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.v.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
@@ -375,7 +385,7 @@
       <multiple>roč.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -385,15 +395,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>číslo</single>
+      <multiple>čísla</multiple>
+    </term>
+    <term name="edition">
+      <single>vydání</single>
+      <multiple>vydání</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>poznámka</single>
+      <multiple>poznámky</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>strana</single>
+      <multiple>strany</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">verze</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">č.</term>
+    <term name="edition" form="short">vyd.</term>
+    <term name="first-reference-note-number" form="short">pozn.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>s.</single>
+      <multiple>s.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -402,6 +495,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>ředitel</single>
+      <multiple>ředitelé</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editoři</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor a překladatel</single>
+      <multiple>editoři a překladatelé</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor a překladatel</single>
+      <multiple>editoři a překladatelé</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>vedoucí editor</single>
+      <multiple>vedoucí editoři</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -414,6 +527,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>ilustrátor</single>
+      <multiple>ilustrátoři</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -422,6 +540,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -430,6 +549,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -438,30 +559,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>ředitel</single>
-      <multiple>ředitelé</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editoři</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>vedoucí editor</single>
-      <multiple>vedoucí editoři</multiple>
-    </term>
-    <term name="illustrator">
-      <single>ilustrátor</single>
-      <multiple>ilustrátoři</multiple>
-    </term>
     <term name="translator">
       <single>překladatel</single>
       <multiple>překladatelé</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor a překladatel</single>
-      <multiple>editoři a překladatelé</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -476,10 +577,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>řed.</single>
+      <multiple>řed.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>ed.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. a přel.</single>
+      <multiple>ed. a přel.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. a přel.</single>
+      <multiple>ed. a přel.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>ed.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>il.</single>
+      <multiple>il.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -504,75 +629,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>řed.</single>
-      <multiple>řed.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>ed.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>ed.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>il.</single>
-      <multiple>il.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>přel.</single>
       <multiple>přel.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. a přel.</single>
-      <multiple>ed. a přel.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb"/>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">řídil</term>
+    <term name="editor" form="verb">editoval</term>
+    <term name="editor-translator" form="verb">editoval a přeložil</term>
+    <term name="editortranslator" form="verb">editoval a přeložil</term>
+    <term name="editorial-director" form="verb">editoval</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">ilustroval</term>
+    <term name="interviewer" form="verb">rozhovor vedl</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb"></term>
-    <term name="director" form="verb">řídil</term>
-    <term name="editor" form="verb">editoval</term>
-    <term name="editorial-director" form="verb">editoval</term>
-    <term name="illustrator" form="verb">ilustroval</term>
-    <term name="interviewer" form="verb">rozhovor vedl</term>
     <term name="recipient" form="verb">pro</term>
     <term name="reviewed-author" form="verb">recenzoval</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">přeložil</term>
-    <term name="editortranslator" form="verb">editoval a přeložil</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">řed.</term>
+    <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">ed. a přel.</term>
+    <term name="editortranslator" form="verb-short">ed. a přel.</term>
+    <term name="editorial-director" form="verb-short">ed.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">ilust.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">řed.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">ilust.</term>
     <term name="translator" form="verb-short">přel.</term>
-    <term name="editortranslator" form="verb-short">ed. a přel.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">leden</term>
diff --git a/locales/cy-GB.xml b/locales/cy-GB.xml
--- a/locales/cy-GB.xml
+++ b/locales/cy-GB.xml
@@ -2,7 +2,7 @@
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="cy-GB">
   <info>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2014-10-08T12:00:00+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -16,26 +16,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">gwelwyd</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">a/ac</term>
+    <term name="and others">ac eraill</term>
+    <term name="anonymous">di-enw</term>
+    <term name="at">at</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">ar gael</term>
+    <term name="by">gan</term>
+    <term name="circa">circa</term>
+    <term name="cited">dyfynnwyd</term>
+    <term name="et-al">et al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">ar fin ymddangos</term>
+    <term name="from">gan</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">yn</term>
+    <term name="in press">yn y wasg</term>
+    <term name="internet">rhyngrwyd</term>
+    <term name="letter">llythyr</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">dim dyddiad</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">arlein</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">cyfathrebu personol</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">cyflwynwyd yn</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>cyfeirnod</single>
+      <multiple>cyfeirnodau</multiple>
+    </term>
+    <term name="retrieved">gwelwyd</term>
+    <term name="review-of">review of</term>
+    <term name="scale">graddfa</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -43,46 +69,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">gwelwyd</term>
-    <term name="and">a/ac</term>
-    <term name="and others">ac eraill</term>
-    <term name="anonymous">di-enw</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">dienw</term>
-    <term name="at">at</term>
-    <term name="available at">ar gael</term>
-    <term name="by">gan</term>
-    <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">dyfynnwyd</term>
-    <term name="edition">
-      <single>argraffiad</single>
-      <multiple>argraffiadau</multiple>
-    </term>
-    <term name="edition" form="short">arg.</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">ar fin ymddangos</term>
-    <term name="from">gan</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">yn</term>
-    <term name="in press">yn y wasg</term>
-    <term name="internet">rhyngrwyd</term>
-    <term name="letter">llythyr</term>
-    <term name="no date">dim dyddiad</term>
     <term name="no date" form="short">d.d.</term>
-    <term name="online">arlein</term>
-    <term name="presented at">cyflwynwyd yn</term>
-    <term name="reference">
-      <single>cyfeirnod</single>
-      <multiple>cyfeirnodau</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>cyf.</single>
       <multiple>cyf’au.</multiple>
     </term>
-    <term name="retrieved">gwelwyd</term>
-    <term name="scale">graddfa</term>
-    <term name="version">fersiwn</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -147,6 +148,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">OC</term>
     <term name="bc">CC</term>
@@ -185,54 +194,26 @@
     <term name="long-ordinal-10">degfed</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>llyfr</single>
       <multiple>llyfrau</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>pennod</single>
       <multiple>penodau</multiple>
@@ -241,6 +222,14 @@
       <single>colofn</single>
       <multiple>colofnau</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>ffigwr</single>
       <multiple>ffigyrau</multiple>
@@ -269,10 +258,6 @@
       <single>tudalen</single>
       <multiple>tudalennau</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>tudalen</single>
-      <multiple>tudalennau</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraff</single>
       <multiple>paragraffau</multiple>
@@ -281,6 +266,14 @@
       <single>rhan</single>
       <multiple>rhannau</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>adran</single>
       <multiple>adrannau</multiple>
@@ -289,6 +282,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>pennill</single>
       <multiple>penillion</multiple>
@@ -299,45 +308,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">llyfr.</term>
+    <term name="chapter" form="short">pen.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">llyfr.</term>
-    <term name="chapter" form="short">pen.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">ffig.</term>
     <term name="folio" form="short">ff.</term>
     <term name="issue" form="short">rhif.</term>
@@ -348,17 +337,37 @@
       <single>t.</single>
       <multiple>tt.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>t.</single>
-      <multiple>tt.</multiple>
-    </term>
     <term name="paragraph" form="short">para.</term>
     <term name="part" form="short">rhan.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">adr.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>p.</single>
       <multiple>pp.</multiple>
@@ -368,7 +377,7 @@
       <multiple>rhifu.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -378,15 +387,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>rhifyn</single>
+      <multiple>rhifynnau</multiple>
+    </term>
+    <term name="edition">
+      <single>argraffiad</single>
+      <multiple>argraffiadau</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>nodyn</single>
+      <multiple>nodiadau</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>tudalen</single>
+      <multiple>tudalennau</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">fersiwn</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">rhif.</term>
+    <term name="edition" form="short">arg.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>t.</single>
+      <multiple>tt.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -395,6 +487,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>cyfarwyddwr</single>
+      <multiple>cyfarwyddwyr</multiple>
+    </term>
+    <term name="editor">
+      <single>golygydd</single>
+      <multiple>golygyddion</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>golygydd a chyfieithydd</single>
+      <multiple>golygyddion a chyfieithwyr</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>golygydd a chyfieithydd</single>
+      <multiple>golygyddion a chyfieithwyr</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>cyfarwyddwr-golygyddol</single>
+      <multiple>cyfarwyddwyr-golygyddol</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -407,6 +519,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>darlunydd</single>
+      <multiple>darlunwyr</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -415,6 +532,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -423,6 +541,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -431,30 +551,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>cyfarwyddwr</single>
-      <multiple>cyfarwyddwyr</multiple>
-    </term>
-    <term name="editor">
-      <single>golygydd</single>
-      <multiple>golygyddion</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>cyfarwyddwr-golygyddol</single>
-      <multiple>cyfarwyddwyr-golygyddol</multiple>
-    </term>
-    <term name="illustrator">
-      <single>darlunydd</single>
-      <multiple>darlunwyr</multiple>
-    </term>
     <term name="translator">
       <single>cyfieithydd</single>
       <multiple>cyfieithwyr</multiple>
     </term>
-    <term name="editortranslator">
-      <single>golygydd a chyfieithydd</single>
-      <multiple>golygyddion a chyfieithwyr</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -469,10 +569,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>cyf.</single>
+      <multiple>cyfy.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>gol.</single>
+      <multiple>goln.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>gol. a chyf.</single>
+      <multiple>goln. a chyf.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>gol. a chyf.</single>
+      <multiple>goln. a chyf.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>gol.</single>
+      <multiple>goln.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>darlun.</single>
+      <multiple>darlun.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -497,75 +621,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>cyf.</single>
-      <multiple>cyfy.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>gol.</single>
-      <multiple>goln.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>gol.</single>
-      <multiple>goln.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>darlun.</single>
-      <multiple>darlun.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>cyf.</single>
       <multiple>cyf.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>gol. a chyf.</single>
-      <multiple>goln. a chyf.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">gan</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">cyfarwyddwyd gan</term>
+    <term name="editor" form="verb">golygwyd gan</term>
+    <term name="editor-translator" form="verb">golygwyd a chyfieithwyd gan</term>
+    <term name="editortranslator" form="verb">golygwyd a chyfieithwyd gan</term>
+    <term name="editorial-director" form="verb">cyfarwyddwyd a golygwyd gan</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">darlunwyd gan</term>
+    <term name="interviewer" form="verb">cyfweliad gan</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">gan</term>
-    <term name="director" form="verb">cyfarwyddwyd gan</term>
-    <term name="editor" form="verb">golygwyd gan</term>
-    <term name="editorial-director" form="verb">cyfarwyddwyd a golygwyd gan</term>
-    <term name="illustrator" form="verb">darlunwyd gan</term>
-    <term name="interviewer" form="verb">cyfweliad gan</term>
     <term name="recipient" form="verb">i</term>
     <term name="reviewed-author" form="verb">gan</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">cyfieithwyd gan </term>
-    <term name="editortranslator" form="verb">golygwyd a chyfieithwyd gan</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">cyf. gan</term>
+    <term name="editor" form="verb-short">gol. gan</term>
+    <term name="editor-translator" form="verb-short">gol. a chyf. gan</term>
+    <term name="editortranslator" form="verb-short">gol. a chyf. gan</term>
+    <term name="editorial-director" form="verb-short">cyf.-gol. gan</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">darlun. gan</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">cyf. gan</term>
-    <term name="editor" form="verb-short">gol. gan</term>
-    <term name="editorial-director" form="verb-short">cyf.-gol. gan</term>
-    <term name="illustrator" form="verb-short">darlun. gan</term>
     <term name="translator" form="verb-short">cyf. gan</term>
-    <term name="editortranslator" form="verb-short">gol. a chyf. gan</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Ionawr</term>
diff --git a/locales/da-DK.xml b/locales/da-DK.xml
--- a/locales/da-DK.xml
+++ b/locales/da-DK.xml
@@ -10,8 +10,12 @@
     <translator>
       <name>hafnius</name>
     </translator>
+    <translator>
+      <name>mufalab</name>
+      <email>mufa@kb.dk</email>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-04-29T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -25,137 +29,146 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">personlig kommunikation</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+        <!-- LONG GENERAL TERMS -->
     <term name="accessed">set</term>
+    <term name="advance-online-publication">online forhåndsvisning</term>
+    <term name="album">album</term>
     <term name="and">og</term>
     <term name="and others">med flere</term>
     <term name="anonymous">anonym</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">på</term>
+    <term name="audio-recording">lydoptagelse</term>
     <term name="available at">tilgængelig hos</term>
     <term name="by">af</term>
     <term name="circa">cirka</term>
-    <term name="circa" form="short">ca.</term>
     <term name="cited">henvist</term>
-    <term name="edition">
-      <single>udgave</single>
-      <multiple>udgaver</multiple>
-    </term>
-    <term name="edition" form="short">udg.</term>
     <term name="et-al">m.fl.</term>
+    <term name="film">film</term>
     <term name="forthcoming">kommende</term>
     <term name="from">fra</term>
+    <term name="henceforth">fra nu af</term>
     <term name="ibid">ibid.</term>
     <term name="in">i</term>
     <term name="in press">i trykken</term>
     <term name="internet">internet</term>
     <term name="letter">brev</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">uden år</term>
-    <term name="no date" form="short">u.å.</term>
+    <term name="no-place">uden sted</term>
+    <term name="no-publisher">uden forlag</term> <!-- sine nomine -->
+    <term name="on">on</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">originalt værk udgivet</term>
+    <term name="personal-communication">personlig kommunikation</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcast episode</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">præsenteret ved</term>
+    <term name="radio-broadcast">radio broadcast</term>
+    <term name="radio-series">radio series</term>
+    <term name="radio-series-episode">radioudsendelse</term>
     <term name="reference">
       <single>reference</single>
       <multiple>referencer</multiple>
     </term>
+    <term name="retrieved">hentet</term>
+    <term name="review-of">anmeldelse af</term>
+    <term name="scale">skala</term>
+    <term name="special-issue">temanummer</term>
+    <term name="special-section">særafsnit</term>
+    <term name="television-broadcast">tv-udsendelse</term>
+    <term name="television-series">tv-serie</term>
+    <term name="television-series-episode">tv-serie episode</term>
+    <term name="video">video</term>
+    <term name="working-paper">arbejdspapir</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">ca.</term>
+    <term name="no date" form="short">u.å.</term>
+    <term name="no-place" form="short">u.s.</term>
+    <term name="no-publisher" form="short">u.f.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refr.</multiple>
     </term>
-    <term name="retrieved">hentet</term>
-    <term name="scale">skala</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">artikel</term>
+    <term name="article-journal">tidsskriftsartikel</term>
+    <term name="article-magazine">magasinartikel</term>
+    <term name="article-newspaper">avisartikel</term>
+    <term name="bill">lovforslag</term>
     <!-- book is in the list of locator terms -->
     <term name="broadcast">broadcast</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
+    <term name="classic">klassik</term>
+    <term name="collection">samling</term>
     <term name="dataset">dataset</term>
-    <term name="document">document</term>
+    <term name="document">dokument</term>
     <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="entry-dictionary">ordbog opslag</term>
+    <term name="entry-encyclopedia">encyklopædi opslag</term>
+    <term name="event">begivenhed</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">figur</term>
+    <term name="hearing">høring</term>
     <term name="interview">interview</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="legal_case">dom</term>
+    <term name="legislation">lovgivning</term>
+    <term name="manuscript">manuskript</term>
+    <term name="map">kort</term>
+    <term name="motion_picture">film</term>
+    <term name="musical_score">partitur</term>
+    <term name="pamphlet">pamflet</term>
+    <term name="paper-conference">konferencepapir</term>
     <term name="patent">patent</term>
     <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="periodical">tidsskrift</term>
     <term name="personal_communication">personlig kommunikation</term>
     <term name="post">post</term>
     <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
+    <term name="regulation">bestemmelse</term>
+    <term name="report">rapport</term>
+    <term name="review">anmeldelse</term>
+    <term name="review-book">boganmeldelse</term>
     <term name="software">software</term>
-    <term name="song">audio recording</term>
+    <term name="song">sang</term>
     <term name="speech">presentation</term>
     <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="thesis">afhandling</term>
+    <term name="treaty">traktat</term>
+    <term name="webpage">hjemmeside</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">tss.art.</term>
+    <term name="article-magazine" form="short">mag.art.</term>
+    <term name="article-newspaper" form="short">avisart.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
+    <term name="graphic" form="short">fig.</term>
     <term name="interview" form="short">interv.</term>
     <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
+    <term name="motion_picture" form="short">film</term>
     <term name="report" form="short">rep.</term>
     <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="review-book" form="short">bog anm.</term>
+    <term name="song" form="short">sang</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">e.v.t.</term>
     <term name="bc">f.v.t.</term>
@@ -188,54 +201,26 @@
     <term name="long-ordinal-10">tiende</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>bog</single>
       <multiple>bøger</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>kapitel</single>
       <multiple>kapitler</multiple>
@@ -244,6 +229,14 @@
       <single>kolonne</single>
       <multiple>kolonner</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figur</single>
       <multiple>figurer</multiple>
@@ -272,10 +265,6 @@
       <single>side</single>
       <multiple>sider</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>side</single>
-      <multiple>sider</multiple>
-    </term>
     <term name="paragraph">
       <single>afsnit</single>
       <multiple>afsnit</multiple>
@@ -284,6 +273,14 @@
       <single>del</single>
       <multiple>dele</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>paragraf</single>
       <multiple>paragraffer</multiple>
@@ -292,6 +289,22 @@
       <single>sub voce</single>
       <multiple>sub voce</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>vers</single>
       <multiple>vers</multiple>
@@ -302,45 +315,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">b.</term>
+    <term name="chapter" form="short">kap.</term>
+    <term name="column" form="short">kol.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">b.</term>
-    <term name="chapter" form="short">kap.</term>
-    <term name="column" form="short">kol.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">nr.</term>
@@ -351,17 +344,37 @@
       <single>s.</single>
       <multiple>s.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>s.</single>
-      <multiple>s.</multiple>
-    </term>
     <term name="paragraph" form="short">afs.</term>
     <term name="part" form="short">d.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">par.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.v.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
@@ -371,7 +384,7 @@
       <multiple>bd.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -381,15 +394,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>nummer</single>
+      <multiple>numre</multiple>
+    </term>
+    <term name="edition">
+      <single>udgave</single>
+      <multiple>udgaver</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>note</single>
+      <multiple>noter</multiple>
+    </term>
+    <term name="number">
+      <single>nummer</single>
+      <multiple>numre</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>side</single>
+      <multiple>sider</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">nr.</term>
+    <term name="edition" form="short">udg.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>s.</single>
+      <multiple>s.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -398,6 +494,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>instruktør</single>
+      <multiple>instruktører</multiple>
+    </term>
+    <term name="editor">
+      <single>redaktør</single>
+      <multiple>redaktører</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>redaktør &amp; oversætter</single>
+      <multiple>redaktører &amp; oversættere</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>redaktør &amp; oversætter</single>
+      <multiple>redaktører &amp; oversættere</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>redaktør</single>
+      <multiple>redaktører</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -410,6 +526,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustratorer</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -418,6 +539,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -426,6 +548,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -434,30 +558,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>instruktør</single>
-      <multiple>instruktører</multiple>
-    </term>
-    <term name="editor">
-      <single>redaktør</single>
-      <multiple>redaktører</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>redaktør</single>
-      <multiple>redaktører</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustratorer</multiple>
-    </term>
     <term name="translator">
       <single>oversætter</single>
       <multiple>oversættere</multiple>
     </term>
-    <term name="editortranslator">
-      <single>redaktør &amp; oversætter</single>
-      <multiple>redaktører &amp; oversættere</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -472,10 +576,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>instr.</single>
+      <multiple>instr.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>red.</single>
+      <multiple>red.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>red. &amp; overs.</single>
+      <multiple>red. &amp; overs.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>red. &amp; overs.</single>
+      <multiple>red. &amp; overs.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>red.</single>
+      <multiple>red.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ill.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -500,75 +628,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>instr.</single>
-      <multiple>instr.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>red.</single>
-      <multiple>red.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>red.</single>
-      <multiple>red.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ill.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>overs.</single>
       <multiple>overs.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>red. &amp; overs.</single>
-      <multiple>red. &amp; overs.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">af</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">instrueret af</term>
+    <term name="editor" form="verb">redigeret af</term>
+    <term name="editor-translator" form="verb">redigeret &amp; oversat af</term>
+    <term name="editortranslator" form="verb">redigeret &amp; oversat af</term>
+    <term name="editorial-director" form="verb">redigeret af</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">illustreret af</term>
+    <term name="interviewer" form="verb">interviewet af</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">af</term>
-    <term name="director" form="verb">instrueret af</term>
-    <term name="editor" form="verb">redigeret af</term>
-    <term name="editorial-director" form="verb">redigeret af</term>
-    <term name="illustrator" form="verb">illustreret af</term>
-    <term name="interviewer" form="verb">interviewet af</term>
     <term name="recipient" form="verb">modtaget af</term>
     <term name="reviewed-author" form="verb">af</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">oversat af</term>
-    <term name="editortranslator" form="verb">redigeret &amp; oversat af</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">instr.</term>
+    <term name="editor" form="verb-short">red.</term>
+    <term name="editor-translator" form="verb-short">red. &amp; overs. af</term>
+    <term name="editortranslator" form="verb-short">red. &amp; overs. af</term>
+    <term name="editorial-director" form="verb-short">red.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">instr.</term>
-    <term name="editor" form="verb-short">red.</term>
-    <term name="editorial-director" form="verb-short">red.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
     <term name="translator" form="verb-short">overs.</term>
-    <term name="editortranslator" form="verb-short">red. &amp; overs. af</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">januar</term>
diff --git a/locales/de-AT.xml b/locales/de-AT.xml
--- a/locales/de-AT.xml
+++ b/locales/de-AT.xml
@@ -19,8 +19,14 @@
     <translator>
       <name>Frank Bennett</name>
     </translator>
+    <translator>
+      <name>Patrick O'Brien</name>
+    </translator>
+    <translator>
+      <name>Nicolas Chachereau</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-09-10T03:24:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -34,130 +40,130 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">persönliche Kommunikation</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">zugegriffen</term>
+    <term name="advance-online-publication">Online-Vorab-Publikation</term>
+    <term name="album">Album</term>
     <term name="and">und</term>
     <term name="and others">und andere</term>
     <term name="anonymous">ohne Autor</term>
-    <term name="anonymous" form="short">o.&#160;A.</term>
     <term name="at">auf</term>
+    <term name="audio-recording">Tonaufnahme</term>
     <term name="available at">verfügbar unter</term>
     <term name="by">von</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">ca.</term>
     <term name="cited">zitiert</term>
-    <term name="edition">
-      <single>Auflage</single>
-      <multiple>Auflagen</multiple>
-    </term>
-    <term name="edition" form="short">Aufl.</term>
     <term name="et-al">u.&#160;a.</term>
+    <term name="film">Film</term>
     <term name="forthcoming">i.&#160;E.</term>
     <term name="from">von</term>
+    <term name="henceforth">zukünftig</term>
     <term name="ibid">ebd.</term>
     <term name="in">in</term>
     <term name="in press">im Druck</term>
     <term name="internet">Internet</term>
     <term name="letter">Brief</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">ohne Datum</term>
-    <term name="no date" form="short">o.&#160;J.</term>
+    <term name="no-place">ohne Ort</term>
+    <term name="no-publisher">ohne Verlag</term> <!-- sine nomine -->
+    <term name="on">auf</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">Ursprünglich erschienen</term>
+    <term name="personal-communication">persönliche Kommunikation</term>
+    <term name="podcast">Podcast</term>
+    <term name="podcast-episode">Podcast-Episode</term>
+    <term name="preprint">Preprint</term>
     <term name="presented at">gehalten auf der</term>
+    <term name="radio-broadcast">Radioaufzeichnung</term>
+    <term name="radio-series">Sendereihe</term>
+    <term name="radio-series-episode">Sendereihenfolge</term>
     <term name="reference">
       <single>Referenz</single>
       <multiple>Referenzen</multiple>
     </term>
+    <term name="retrieved">abgerufen</term>
+    <term name="review-of">review of</term>
+    <term name="scale">Maßstab</term>
+    <term name="special-issue">Spezialausgabe</term>
+    <term name="special-section">Sonderbereich</term>
+    <term name="television-broadcast">Fernsehsendung</term>
+    <term name="television-series">Fernsehserie</term>
+    <term name="television-series-episode">Serienfolge</term>
+    <term name="video">Video</term>
+    <term name="working-paper">Arbeitspapier</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">o.&#160;A.</term>
+    <term name="circa" form="short">ca.</term>
+    <term name="no date" form="short">o.&#160;J.</term>
+    <term name="no-place" form="short">o.&#160;O.</term>
+    <term name="no-publisher" form="short">o.&#160;V.</term>
     <term name="reference" form="short">
       <single>Ref.</single>
       <multiple>Ref.</multiple>
     </term>
-    <term name="retrieved">abgerufen</term>
-    <term name="scale">Maßstab</term>
-    <term name="version">Version</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article-journal">Zeitschriftenartikel</term>
+    <term name="article-magazine">Magazinartikel</term>
+    <term name="article-newspaper">Zeitungsartikel</term>
+    <term name="bill">Gesetzentwurf</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">Sendung</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">Klassiker</term>
+    <term name="collection">Sammlung</term>
+    <term name="dataset">Datensatz</term>
+    <term name="document">Dokument</term>
+    <term name="entry">Eintrag</term>
+    <term name="entry-dictionary">Wörterbucheintrag</term>
+    <term name="entry-encyclopedia">Lexikoneintrag</term>
+    <term name="event">Event</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">Bild</term>
+    <term name="hearing">Anhörung</term>
     <term name="interview">Interview</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="legal_case">Rechtsfall</term>
+    <term name="legislation">Gesetz</term>
+    <term name="manuscript">Manuskript</term>
+    <term name="map">Karte</term>
+    <term name="motion_picture">Videoaufnahme</term>
+    <term name="musical_score">Partitur</term>
+    <term name="pamphlet">Broschüre</term>
+    <term name="paper-conference">Konferenzbeitrag</term>
+    <term name="patent">Patent</term>
+    <term name="performance">Aufführung</term>
+    <term name="periodical">Zeitschrift</term>
     <term name="personal_communication">persönliche Kommunikation</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">Post</term>
+    <term name="post-weblog">Blogeintrag</term>
+    <term name="regulation">Verordnung</term>
+    <term name="report">Bericht</term>
+    <term name="review">Rezension</term>
+    <term name="review-book">Buchbesprechung</term>
+    <term name="software">Software</term>
+    <term name="song">Audioaufnahme</term>
+    <term name="speech">Vortrag</term>
+    <term name="standard">Norm</term>
+    <term name="thesis">Abschlussarbeit</term>
+    <term name="treaty">Abkommen</term>
+    <term name="webpage">Webseite</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">Zeitschriftenart.</term>
+    <term name="article-magazine" form="short">Mag. Art.</term>
+    <term name="article-newspaper" form="short">Zeitungsart.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
+    <term name="graphic" form="short">Bild</term>
+    <term name="interview" form="short">Interv.</term>
     <term name="manuscript" form="short">MS</term>
     <term name="motion_picture" form="short">video rec.</term>
     <term name="report" form="short">rep.</term>
@@ -165,6 +171,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">&#160;n.&#160;Chr.</term>
     <term name="bc">&#160;v.&#160;Chr.</term>
@@ -197,54 +211,26 @@
     <term name="long-ordinal-10">zehnter</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>Appendix</single>
+      <multiple>Appendices</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>Artikel</single>
+      <multiple>Artikel</multiple>
     </term>
     <term name="book">
       <single>Buch</single>
       <multiple>Bücher</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>Kapitel</single>
       <multiple>Kapitel</multiple>
@@ -253,6 +239,14 @@
       <single>Spalte</single>
       <multiple>Spalten</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>Abbildung</single>
       <multiple>Abbildungen</multiple>
@@ -270,8 +264,8 @@
       <multiple>Zeilen</multiple>
     </term>
     <term name="note">
-      <single>Note</single>
-      <multiple>Noten</multiple>
+      <single>Anmerkung</single>
+      <multiple>Anmerkungen</multiple>
     </term>
     <term name="opus">
       <single>Opus</single>
@@ -281,10 +275,6 @@
       <single>Seite</single>
       <multiple>Seiten</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>Seite</single>
-      <multiple>Seiten</multiple>
-    </term>
     <term name="paragraph">
       <single>Absatz</single>
       <multiple>Absätze</multiple>
@@ -293,6 +283,14 @@
       <single>Teil</single>
       <multiple>Teile</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>Abschnitt</single>
       <multiple>Abschnitte</multiple>
@@ -301,6 +299,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>Vers</single>
       <multiple>Verse</multiple>
@@ -311,76 +325,76 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">B.</term>
+    <term name="chapter" form="short">Kap.</term>
+    <term name="column" form="short">Sp.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">B.</term>
-    <term name="chapter" form="short">Kap.</term>
-    <term name="column" form="short">Sp.</term>
     <term name="figure" form="short">Abb.</term>
     <term name="folio" form="short">Fol.</term>
     <term name="issue" form="short">Nr.</term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
+    <term name="line" form="short">Z.</term>
+    <term name="note" form="short">Anm.</term>
     <term name="opus" form="short">op.</term>
     <term name="page" form="short">
       <single>S.</single>
       <multiple>S.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>S.</single>
-      <multiple>S.</multiple>
-    </term>
     <term name="paragraph" form="short">Abs.</term>
     <term name="part" form="short">Teil</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">Abschn.</term>
     <term name="sub-verbo" form="short">
       <single>s.&#160;v.</single>
       <multiple>s.&#160;vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>V.</single>
       <multiple>V.</multiple>
     </term>
     <term name="volume" form="short">
       <single>Bd.</single>
-      <multiple>Bd.</multiple>
+      <multiple>Bde.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -390,59 +404,109 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>Nummer</single>
+      <multiple>Nummern</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>Auflage</single>
+      <multiple>Auflagen</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>Ref.</single>
+      <multiple>Ref.</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>Nummer</single>
+      <multiple>Nummern</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>Seite</single>
+      <multiple>Seiten</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">Version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">Nr.</term>
+    <term name="edition" form="short">Aufl.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>Ref.</single>
+      <multiple>Ref.</multiple>
     </term>
+    <term name="number" form="short">
+      <single>Nr.</single>
+      <multiple>Nr.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>S.</single>
+      <multiple>S.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>Vorsitz</single>
+      <multiple>Vorsitz</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>Reihenherausgeber</single>
+      <multiple>Reihenherausgeber</multiple>
+    </term>
+    <term name="compiler">
+      <single>Bearbeiter</single>
+      <multiple>Bearbeiter</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>Beitragende</single>
+      <multiple>Beitragende</multiple>
+    </term>
+    <term name="curator">
+      <single>Direktor</single>
+      <multiple>Direktor</multiple>
+    </term>
     <term name="director">
       <single>Regisseur</single>
       <multiple>Regisseure</multiple>
@@ -451,28 +515,72 @@
       <single>Herausgeber</single>
       <multiple>Herausgeber</multiple>
     </term>
-    <term name="collection-editor">
-      <single>Reihenherausgeber</single>
-      <multiple>Reihenherausgeber</multiple>
+    <term name="editor-translator">
+      <single>Herausgeber&#160;und Übersetzer</single>
+      <multiple>Herausgeber&#160;und Übersetzer</multiple>
     </term>
+    <term name="editortranslator">
+      <single>Herausgeber&#160;und Übersetzer</single>
+      <multiple>Herausgeber&#160;und Übersetzer</multiple>
+    </term>
     <term name="editorial-director">
       <single>Herausgeber</single>
       <multiple>Herausgeber</multiple>
     </term>
+    <term name="executive-producer">
+      <single>Produktionsleiter</single>
+      <multiple>Produktionsleiter</multiple>
+    </term>
+    <term name="guest">
+      <single>Gast</single>
+      <multiple>Gäste</multiple>
+    </term>
+    <term name="host">
+      <single>Gastgeber</single>
+      <multiple>Gastgeber</multiple>
+    </term>
     <term name="illustrator">
       <single>Illustrator</single>
       <multiple>Illustratoren</multiple>
     </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>Erzähler</single>
+      <multiple>Erzähler</multiple>
+    </term>
+    <term name="organizer">
+      <single>Organisator</single>
+      <multiple>Organisatoren</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>Künstler</single>
+      <multiple>Künstler</multiple>
+    </term>
+    <term name="producer">
+      <single>Produzent</single>
+      <multiple>Produzenten</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>Drehbuchautor</single>
+      <multiple>Drehbuchautoren</multiple>
+    </term>
+    <term name="series-creator">
+      <single>Idee</single>
+      <multiple>Idee</multiple>
+    </term>
     <term name="translator">
       <single>Übersetzer</single>
       <multiple>Übersetzer</multiple>
     </term>
-    <term name="editortranslator">
-      <single>Herausgeber&#160;&amp; Übersetzer</single>
-      <multiple>Herausgeber&#160;&amp; Übersetzer</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
+    <term name="collection-editor" form="short">
+      <single>Hrsg.</single>
+      <multiple>Hrsg.</multiple>
+    </term>
     <term name="compiler" form="short">
       <single>comp.</single>
       <multiple>comps.</multiple>
@@ -485,10 +593,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>Reg.</single>
+      <multiple>Reg.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>Hrsg.</single>
+      <multiple>Hrsg.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>Hrsg.&#160;u. Übers.</single>
+      <multiple>Hrsg.&#160;u. Übers.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>Hrsg.&#160;u. Übers.</single>
+      <multiple>Hrsg.&#160;u. Übers.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>Hrsg.</single>
+      <multiple>Hrsg.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>Ill.</single>
+      <multiple>Ill.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -513,81 +645,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>Reg.</single>
-      <multiple>Reg.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>Hrsg.</single>
-      <multiple>Hrsg.</multiple>
-    </term>
-    <term name="collection-editor" form="short">
-      <single>Hrsg.</single>
-      <multiple>Hrsg.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>Hrsg.</single>
-      <multiple>Hrsg.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>Ill.</single>
-      <multiple>Ill.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>Übers.</single>
       <multiple>Übers.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>Hrsg.&#160;&amp; Übers.</single>
-      <multiple>Hrsg.&#160;&amp; Übers.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">Vorsitz durch</term>
+    <term name="collection-editor" form="verb">herausgegeben von</term>
+    <term name="compiler" form="verb">kompiliert von</term>
     <term name="container-author" form="verb">von</term>
+    <term name="contributor" form="verb">mit</term>
+    <term name="curator" form="verb">kuriert von</term>
     <term name="director" form="verb">Regie von</term>
     <term name="editor" form="verb">herausgegeben von</term>
-    <term name="collection-editor" form="verb">herausgegeben von</term>
+    <term name="editor-translator" form="verb">herausgegeben und übersetzt von</term>
+    <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>
     <term name="editorial-director" form="verb">herausgegeben von</term>
+    <term name="executive-producer" form="verb">Produktionsleitung von</term>
+    <term name="guest" form="verb">mit Gast</term>
+    <term name="host" form="verb">veranstaltet von</term>
     <term name="illustrator" form="verb">illustriert von</term>
     <term name="interviewer" form="verb">interviewt von</term>
+    <term name="narrator" form="verb">Narration von</term>
+    <term name="organizer" form="verb">organisiert von</term>
+    <term name="performer" form="verb">Aufführung von</term>
+    <term name="producer" form="verb">produziert von</term>
     <term name="recipient" form="verb">an</term>
     <term name="reviewed-author" form="verb">von</term>
+    <term name="script-writer" form="verb">geschrieben von</term>
+    <term name="series-creator" form="verb">Idee von</term>
     <term name="translator" form="verb">übersetzt von</term>
-    <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">hrsg. von</term>
+    <term name="compiler" form="verb-short">komp. von</term>
+    <term name="contributor" form="verb-short">m.</term>
+    <term name="curator" form="verb-short">kur. von</term>
     <term name="director" form="verb-short">Reg.</term>
-    <term name="editor" form="verb-short">hg. von</term>
-    <term name="collection-editor" form="verb-short">hg. von</term>
-    <term name="editorial-director" form="verb-short">hg. von</term>
+    <term name="editor" form="verb-short">hrsg. von</term>
+    <term name="editor-translator" form="verb-short">hg.&#160;u. übers. von</term>
+    <term name="editortranslator" form="verb-short">hg.&#160;u. übers. von</term>
+    <term name="editorial-director" form="verb-short">hrsg. von</term>
+    <term name="executive-producer" form="verb-short">Prod. gel. v.</term>
+    <term name="guest" form="verb-short">w. guest</term>
+    <term name="host" form="verb-short">veranst. von</term>
     <term name="illustrator" form="verb-short">illus. von</term>
+    <term name="narrator" form="verb-short">Narr. von</term>
+    <term name="organizer" form="verb-short">org. von</term>
+    <term name="performer" form="verb-short">aufg. von</term>
+    <term name="producer" form="verb-short">prod. von</term>
+    <term name="script-writer" form="verb-short">geschr. von</term>
+    <term name="series-creator" form="verb-short">Idee von</term>
     <term name="translator" form="verb-short">übers. von</term>
-    <term name="editortranslator" form="verb-short">hg.&#160;&amp; übers. von</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Jänner</term>
diff --git a/locales/de-CH.xml b/locales/de-CH.xml
--- a/locales/de-CH.xml
+++ b/locales/de-CH.xml
@@ -13,8 +13,14 @@
     <translator>
       <name>Sebastian Karcher</name>
     </translator>
+    <translator>
+      <name>Patrick O'Brien</name>
+    </translator>
+    <translator>
+      <name>Nicolas Chachereau</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-09-10T03:24:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -28,130 +34,128 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">persönliche Kommunikation</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">zugegriffen</term>
+    <term name="advance-online-publication">Online-Vorab-Publikation</term>
+    <term name="album">Album</term>
     <term name="and">und</term>
     <term name="and others">und andere</term>
     <term name="anonymous">ohne Autor</term>
-    <term name="anonymous" form="short">o.&#160;A.</term>
     <term name="at">auf</term>
+    <term name="audio-recording">Tonaufnahme</term>
     <term name="available at">verfügbar unter</term>
     <term name="by">von</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">ca.</term>
     <term name="cited">zitiert</term>
-    <term name="edition">
-      <single>Auflage</single>
-      <multiple>Auflagen</multiple>
-    </term>
-    <term name="edition" form="short">Aufl.</term>
     <term name="et-al">u.&#160;a.</term>
+    <term name="film">Film</term>
     <term name="forthcoming">i.&#160;E.</term>
     <term name="from">von</term>
+    <term name="henceforth">zukünftig</term>
     <term name="ibid">ebd.</term>
     <term name="in">in</term>
     <term name="in press">im Druck</term>
     <term name="internet">Internet</term>
     <term name="letter">Brief</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">ohne Datum</term>
-    <term name="no date" form="short">o.&#160;J.</term>
+    <term name="no-place">ohne Ort</term>
+    <term name="no-publisher">ohne Verlag</term> <!-- sine nomine -->
+    <term name="on">auf</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">Ursprünglich erschienen</term>
+    <term name="personal-communication">persönliche Kommunikation</term>
+    <term name="podcast">Podcast</term>
+    <term name="podcast-episode">Podcast-Episode</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">gehalten auf der</term>
+    <term name="radio-broadcast">Radioaufzeichnung</term>
+    <term name="radio-series">Sendereihe</term>
+    <term name="radio-series-episode">Sendereihenfolge</term>
     <term name="reference">
       <single>Referenz</single>
       <multiple>Referenzen</multiple>
     </term>
+    <term name="retrieved">abgerufen</term>
+    <term name="review-of">Review von</term>
+    <term name="scale">Massstab</term>
+    <term name="special-issue">Spezialausgabe</term>
+    <term name="special-section">Sonderbereich</term>
+    <term name="television-broadcast">Fernsehsendung</term>
+    <term name="television-series">Fernsehserie</term>
+    <term name="television-series-episode">Serienfolge</term>
+    <term name="video">Video</term>
+    <term name="working-paper">Arbeitspapier</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">o.&#160;A.</term>
+    <term name="circa" form="short">ca.</term>
+    <term name="no date" form="short">o.&#160;J.</term>
+    <term name="no-place" form="short">o.&#160;O.</term>
+    <term name="no-publisher" form="short">o.&#160;V.</term>
     <term name="reference" form="short">
       <single>Ref.</single>
       <multiple>Ref.</multiple>
     </term>
-    <term name="retrieved">abgerufen</term>
-    <term name="scale">Massstab</term>
-    <term name="version">Version</term>
+    <term name="review-of" form="short">Rev. von</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">Preprint</term>
+    <term name="article-journal">Zeitschriftenartikel</term>
+    <term name="article-magazine">Magazinartikel</term>
+    <term name="article-newspaper">Zeitungsartikel</term>
+    <term name="bill">Gesetzentwurf</term>
     <!-- book is in the list of locator terms -->
     <term name="broadcast">broadcast</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">Klassiker</term>
+    <term name="collection">Sammlung</term>
+    <term name="dataset">Datensatz</term>
+    <term name="document">Dokument</term>
+    <term name="entry">Eintrag</term>
+    <term name="entry-dictionary">Wörterbucheintrag</term>
+    <term name="entry-encyclopedia">Lexikoneintrag</term>
+    <term name="event">Event</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
-    <term name="interview">Interview</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="legal_case">Rechtsfall</term>
+    <term name="legislation">Gesetz</term>
+    <term name="manuscript">Manuskript</term>
+    <term name="map">Karte</term>
+    <term name="motion_picture">Videoaufnahme</term>
+    <term name="musical_score">Partitur</term>
+    <term name="pamphlet">Broschüre</term>
+    <term name="paper-conference">Konferenzbeitrag</term>
+    <term name="patent">Patent</term>
+    <term name="performance">Aufführung</term>
+    <term name="periodical">Zeitschrift</term>
     <term name="personal_communication">persönliche Kommunikation</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">Post</term>
+    <term name="post-weblog">Blogeintrag</term>
+    <term name="regulation">Verordnung</term>
+    <term name="report">Bericht</term>
+    <term name="review">Rezension</term>
+    <term name="review-book">Buchbesprechung</term>
+    <term name="software">Software</term>
+    <term name="song">Audioaufnahme</term>
+    <term name="speech">Vortrag</term>
+    <term name="standard">Norm</term>
+    <term name="thesis">Abschlussarbeit</term>
+    <term name="treaty">Abkommen</term>
+    <term name="webpage">Webseite</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">Zeitschriftenart.</term>
+    <term name="article-magazine" form="short">Mag. Art.</term>
+    <term name="article-newspaper" form="short">Yeitungsart.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
+    <term name="graphic" form="short">Bild</term>
+    <term name="interview" form="short">Interv.</term>
     <term name="manuscript" form="short">MS</term>
     <term name="motion_picture" form="short">video rec.</term>
     <term name="report" form="short">rep.</term>
@@ -159,6 +163,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">&#160;n.&#160;Chr.</term>
     <term name="bc">&#160;v.&#160;Chr.</term>
@@ -191,54 +203,26 @@
     <term name="long-ordinal-10">zehnter</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>Appendix</single>
+      <multiple>Appendices</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>Artikel</single>
+      <multiple>Artikel</multiple>
     </term>
     <term name="book">
       <single>Buch</single>
       <multiple>Bücher</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>Kapitel</single>
       <multiple>Kapitel</multiple>
@@ -247,6 +231,14 @@
       <single>Spalte</single>
       <multiple>Spalten</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>Abbildung</single>
       <multiple>Abbildungen</multiple>
@@ -264,8 +256,8 @@
       <multiple>Zeilen</multiple>
     </term>
     <term name="note">
-      <single>Note</single>
-      <multiple>Noten</multiple>
+      <single>Anmerkung</single>
+      <multiple>Anmerkungen</multiple>
     </term>
     <term name="opus">
       <single>Opus</single>
@@ -275,10 +267,6 @@
       <single>Seite</single>
       <multiple>Seiten</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>Seite</single>
-      <multiple>Seiten</multiple>
-    </term>
     <term name="paragraph">
       <single>Absatz</single>
       <multiple>Absätze</multiple>
@@ -287,6 +275,14 @@
       <single>Teil</single>
       <multiple>Teile</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>Abschnitt</single>
       <multiple>Abschnitte</multiple>
@@ -295,6 +291,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>Vers</single>
       <multiple>Verse</multiple>
@@ -305,76 +317,76 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">B.</term>
+    <term name="chapter" form="short">Kap.</term>
+    <term name="column" form="short">Sp.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">B.</term>
-    <term name="chapter" form="short">Kap.</term>
-    <term name="column" form="short">Sp.</term>
     <term name="figure" form="short">Abb.</term>
     <term name="folio" form="short">Fol.</term>
     <term name="issue" form="short">Nr.</term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
+    <term name="line" form="short">Z.</term>
+    <term name="note" form="short">Anm.</term>
     <term name="opus" form="short">op.</term>
     <term name="page" form="short">
       <single>S.</single>
       <multiple>S.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>S.</single>
-      <multiple>S.</multiple>
-    </term>
     <term name="paragraph" form="short">Abs.</term>
     <term name="part" form="short">Teil</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">Abschn.</term>
     <term name="sub-verbo" form="short">
       <single>s.&#160;v.</single>
       <multiple>s.&#160;vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>V.</single>
       <multiple>V.</multiple>
     </term>
     <term name="volume" form="short">
       <single>Bd.</single>
-      <multiple>Bd.</multiple>
+      <multiple>Bde.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -384,59 +396,109 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>Nummer</single>
+      <multiple>Nummern</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>Auflage</single>
+      <multiple>Auflagen</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>Ref.</single>
+      <multiple>Ref.</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>Seite</single>
+      <multiple>Seiten</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">Version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">Nr.</term>
+    <term name="edition" form="short">Aufl.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>Ref.</single>
+      <multiple>Ref.</multiple>
     </term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>S.</single>
+      <multiple>S.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>Vorsitz</single>
+      <multiple>Vorsitz</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>Reihenherausgeber</single>
+      <multiple>Reihenherausgeber</multiple>
+    </term>
+    <term name="compiler">
+      <single>Bearbeiter</single>
+      <multiple>Bearbeiter</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>Beitragende</single>
+      <multiple>Beitragende</multiple>
+    </term>
+    <term name="curator">
+      <single>Direktor</single>
+      <multiple>Direktor</multiple>
+    </term>
     <term name="director">
       <single>Regisseur</single>
       <multiple>Regisseure</multiple>
@@ -445,40 +507,112 @@
       <single>Herausgeber</single>
       <multiple>Herausgeber</multiple>
     </term>
+    <term name="editor-translator">
+      <single>Herausgeber&#160;und Übersetzer</single>
+      <multiple>Herausgeber&#160;und Übersetzer</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>Herausgeber&#160;und Übersetzer</single>
+      <multiple>Herausgeber&#160;und Übersetzer</multiple>
+    </term>
     <term name="editorial-director">
       <single>Herausgeber</single>
       <multiple>Herausgeber</multiple>
     </term>
+    <term name="executive-producer">
+      <single>Produktionsleiter</single>
+      <multiple>Produktionsleiter</multiple>
+    </term>
+    <term name="guest">
+      <single>Gast</single>
+      <multiple>Gäste</multiple>
+    </term>
+    <term name="host">
+      <single>Gastgeber</single>
+      <multiple>Gastgeber</multiple>
+    </term>
     <term name="illustrator">
       <single>Illustrator</single>
       <multiple>Illustratoren</multiple>
     </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>Erzähler</single>
+      <multiple>Erzähler</multiple>
+    </term>
+    <term name="organizer">
+      <single>Organisator</single>
+      <multiple>Organisatoren</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>Darsteller</single>
+      <multiple>Darsteller</multiple>
+    </term>
+    <term name="producer">
+      <single>Produzent</single>
+      <multiple>Produzenten</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>Drehbuchautor</single>
+      <multiple>Drehbuchautoren</multiple>
+    </term>
+    <term name="series-creator">
+      <single>Seriencreator</single>
+      <multiple>Seriencreatoren</multiple>
+    </term>
     <term name="translator">
       <single>Übersetzer</single>
       <multiple>Übersetzer</multiple>
     </term>
-    <term name="editortranslator">
-      <single>Herausgeber&#160;&amp; Übersetzer</single>
-      <multiple>Herausgeber&#160;&amp; Übersetzer</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
+    <term name="collection-editor" form="short">
+      <single>Hrsg.</single>
+      <multiple>Hrsg.</multiple>
+    </term>
     <term name="compiler" form="short">
       <single>comp.</single>
       <multiple>comps.</multiple>
     </term>
     <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <single>Bearb.</single>
+      <multiple>Bearb.</multiple>
     </term>
     <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
+      <single>Dir.</single>
+      <multiple>Dir.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>Reg.</single>
+      <multiple>Reg.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>Hrsg.</single>
+      <multiple>Hrsg.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>Hrsg.&#160;u. Übers.</single>
+      <multiple>Hrsg.&#160;u. Übers.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>Hrsg.&#160;u. Übers.</single>
+      <multiple>Hrsg.&#160;u. Übers.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>Hrsg.</single>
+      <multiple>Hrsg.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>Ill.</single>
+      <multiple>Ill.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -503,75 +637,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>Reg.</single>
-      <multiple>Reg.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>Hrsg.</single>
-      <multiple>Hrsg.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>Hrsg.</single>
-      <multiple>Hrsg.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>Ill.</single>
-      <multiple>Ill.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>Übers.</single>
       <multiple>Übers.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>Hrsg.&#160;&amp; Übers.</single>
-      <multiple>Hrsg.&#160;&amp; Übers.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">Vorsitz durch</term>
+    <term name="collection-editor" form="verb">herausgegeben von</term>
+    <term name="compiler" form="verb">kompiliert von</term>
     <term name="container-author" form="verb">von</term>
+    <term name="contributor" form="verb">mit</term>
+    <term name="curator" form="verb">kuriert von</term>
     <term name="director" form="verb">Regie von</term>
     <term name="editor" form="verb">herausgegeben von</term>
+    <term name="editor-translator" form="verb">herausgegeben und übersetzt von</term>
+    <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>
     <term name="editorial-director" form="verb">herausgegeben von</term>
+    <term name="executive-producer" form="verb">Produktionsleitung von</term>
+    <term name="guest" form="verb">mit Gast</term>
+    <term name="host" form="verb">veranstaltet von</term>
     <term name="illustrator" form="verb">illustriert von</term>
     <term name="interviewer" form="verb">interviewt von</term>
+    <term name="narrator" form="verb">Narration von</term>
+    <term name="organizer" form="verb">organisiert von</term>
+    <term name="performer" form="verb">Aufführung von</term>
+    <term name="producer" form="verb">produziert von</term>
     <term name="recipient" form="verb">an</term>
     <term name="reviewed-author" form="verb">von</term>
+    <term name="script-writer" form="verb">geschrieben von</term>
+    <term name="series-creator" form="verb">Idee von</term>
     <term name="translator" form="verb">übersetzt von</term>
-    <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">hrsg. von</term>
+    <term name="compiler" form="verb-short">komp. von</term>
+    <term name="contributor" form="verb-short">m.</term>
+    <term name="curator" form="verb-short">kur. von</term>
     <term name="director" form="verb-short">Reg.</term>
-    <term name="editor" form="verb-short">hg. von</term>
-    <term name="editorial-director" form="verb-short">hg. von</term>
+    <term name="editor" form="verb-short">hrsg. von</term>
+    <term name="editor-translator" form="verb-short">hg.&#160;u. übers. von</term>
+    <term name="editortranslator" form="verb-short">hg.&#160;u. übers. von</term>
+    <term name="editorial-director" form="verb-short">hrsg. von</term>
+    <term name="executive-producer" form="verb-short">Prod. gel. v.</term>
+    <term name="guest" form="verb-short">mit Gast</term>
+    <term name="host" form="verb-short">veranst. von</term>
     <term name="illustrator" form="verb-short">illus. von</term>
+    <term name="narrator" form="verb-short">Narr. von</term>
+    <term name="organizer" form="verb-short">org. von</term>
+    <term name="performer" form="verb-short">aufg. von</term>
+    <term name="producer" form="verb-short">prod. von</term>
+    <term name="script-writer" form="verb-short">writ. by</term>
+    <term name="series-creator" form="verb-short">cre. by</term>
     <term name="translator" form="verb-short">übers. von</term>
-    <term name="editortranslator" form="verb-short">hg.&#160;&amp; übers. von</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Januar</term>
diff --git a/locales/de-DE.xml b/locales/de-DE.xml
--- a/locales/de-DE.xml
+++ b/locales/de-DE.xml
@@ -16,8 +16,14 @@
     <translator>
       <name>jakov</name>
     </translator>
+    <translator>
+      <name>Patrick O'Brien</name>
+    </translator>
+    <translator>
+      <name>Nicolas Chachereau</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-09-10T03:24:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -31,130 +37,131 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">persönliche Kommunikation</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">zugegriffen</term>
+    <term name="advance-online-publication">Online-Vorab-Publikation</term>
+    <term name="album">Album</term>
     <term name="and">und</term>
     <term name="and others">und andere</term>
     <term name="anonymous">ohne Autor</term>
-    <term name="anonymous" form="short">o.&#160;A.</term>
     <term name="at">auf</term>
+    <term name="audio-recording">Tonaufnahme</term>
     <term name="available at">verfügbar unter</term>
     <term name="by">von</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">ca.</term>
     <term name="cited">zitiert</term>
-    <term name="edition">
-      <single>Auflage</single>
-      <multiple>Auflagen</multiple>
-    </term>
-    <term name="edition" form="short">Aufl.</term>
     <term name="et-al">u.&#160;a.</term>
+    <term name="film">Film</term>
     <term name="forthcoming">i.&#160;E.</term>
     <term name="from">von</term>
+    <term name="henceforth">zukünftig</term>
     <term name="ibid">ebd.</term>
     <term name="in">in</term>
     <term name="in press">im Druck</term>
     <term name="internet">Internet</term>
     <term name="letter">Brief</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">ohne Datum</term>
-    <term name="no date" form="short">o.&#160;J.</term>
+    <term name="no-place">ohne Ort</term>
+    <term name="no-publisher">ohne Verlag</term> <!-- sine nomine -->
+    <term name="on">auf</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">Ursprünglich erschienen</term>
+    <term name="personal-communication">persönliche Kommunikation</term>
+    <term name="podcast">Podcast</term>
+    <term name="podcast-episode">Podcast-Episode</term>
+    <term name="preprint">Preprint</term>
     <term name="presented at">gehalten auf der</term>
+    <term name="radio-broadcast">Radioaufzeichnung</term>
+    <term name="radio-series">Sendereihe</term>
+    <term name="radio-series-episode">Sendereihenfolge</term>
     <term name="reference">
       <single>Referenz</single>
       <multiple>Referenzen</multiple>
     </term>
+    <term name="retrieved">abgerufen</term>
+    <term name="review-of">review of</term>
+    <term name="scale">Maßstab</term>
+    <term name="special-issue">Spezialausgabe</term>
+    <term name="special-section">Sonderbereich</term>
+    <term name="television-broadcast">Fernsehsendung</term>
+    <term name="television-series">Fernsehserie</term>
+    <term name="television-series-episode">Serienfolge</term>
+    <term name="video">Video</term>
+    <term name="working-paper">Arbeitspapier</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">o.&#160;A.</term>
+    <term name="circa" form="short">ca.</term>
+    <term name="no date" form="short">o.&#160;J.</term>
+    <term name="no-place" form="short">o.&#160;O.</term>
+    <term name="no-publisher" form="short">o.&#160;V.</term>
     <term name="reference" form="short">
       <single>Ref.</single>
       <multiple>Ref.</multiple>
     </term>
-    <term name="retrieved">abgerufen</term>
-    <term name="scale">Maßstab</term>
-    <term name="version">Version</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article-journal">Zeitschriftenartikel</term>
+    <term name="article-magazine">Magazinartikel</term>
+    <term name="article-newspaper">Zeitungsartikel</term>
+    <term name="bill">Gesetzentwurf</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">Sendung</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">Klassiker</term>
+    <term name="collection">Sammlung</term>
+    <term name="dataset">Datensatz</term>
+    <term name="document">Dokument</term>
+    <term name="entry">Eintrag</term>
+    <term name="entry-dictionary">Wörterbucheintrag</term>
+    <term name="entry-encyclopedia">Lexikoneintrag</term>
+    <term name="event">Event</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">Bild</term>
+    <term name="hearing">Anhörung</term>
     <term name="interview">Interview</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="legal_case">Rechtsfall</term>
+    <term name="legislation">Gesetz</term>
+    <term name="manuscript">Manuskript</term>
+    <term name="map">Karte</term>
+    <term name="motion_picture">Videoaufnahme</term>
+    <term name="musical_score">Partitur</term>
+    <term name="pamphlet">Broschüre</term>
+    <term name="paper-conference">Konferenzbeitrag</term>
+    <term name="patent">Patent</term>
+    <term name="performance">Aufführung</term>
+    <term name="periodical">Zeitschrift</term>
     <term name="personal_communication">persönliche Kommunikation</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">Post</term>
+    <term name="post-weblog">Blogeintrag</term>
+    <term name="regulation">Verordnung</term>
+    <term name="report">Bericht</term>
+    <term name="review">Rezension</term>
+    <term name="review-book">Buchbesprechung</term>
+    <term name="software">Software</term>
+    <term name="song">Audioaufnahme</term>
+    <term name="speech">Vortrag</term>
+    <term name="standard">Norm</term>
+    <term name="thesis">Abschlussarbeit</term>
+    <term name="treaty">Abkommen</term>
+    <term name="webpage">Webseite</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
+    <term name="article-journal" form="short">Zeitschriftenart.</term>
+    <term name="article-magazine" form="short">Mag. Art.</term>
     <term name="article-newspaper" form="short">newspaper art.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
+    <term name="graphic" form="short">Bild</term>
+    <term name="interview" form="short">Interv.</term>
     <term name="manuscript" form="short">MS</term>
     <term name="motion_picture" form="short">video rec.</term>
     <term name="report" form="short">rep.</term>
@@ -162,6 +169,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">&#160;n.&#160;Chr.</term>
     <term name="bc">&#160;v.&#160;Chr.</term>
@@ -194,54 +209,26 @@
     <term name="long-ordinal-10">zehnter</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>Akt</single>
+      <multiple>Akten</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>Appendix</single>
+      <multiple>Appendices</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>Artikel</single>
+      <multiple>Artikel</multiple>
     </term>
     <term name="book">
       <single>Buch</single>
       <multiple>Bücher</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>Kapitel</single>
       <multiple>Kapitel</multiple>
@@ -250,6 +237,14 @@
       <single>Spalte</single>
       <multiple>Spalten</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>Abbildung</single>
       <multiple>Abbildungen</multiple>
@@ -267,8 +262,8 @@
       <multiple>Zeilen</multiple>
     </term>
     <term name="note">
-      <single>Note</single>
-      <multiple>Noten</multiple>
+      <single>Anmerkung</single>
+      <multiple>Anmerkungen</multiple>
     </term>
     <term name="opus">
       <single>Opus</single>
@@ -278,10 +273,6 @@
       <single>Seite</single>
       <multiple>Seiten</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>Seite</single>
-      <multiple>Seiten</multiple>
-    </term>
     <term name="paragraph">
       <single>Absatz</single>
       <multiple>Absätze</multiple>
@@ -290,6 +281,14 @@
       <single>Teil</single>
       <multiple>Teile</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>Abschnitt</single>
       <multiple>Abschnitte</multiple>
@@ -298,6 +297,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>Vers</single>
       <multiple>Verse</multiple>
@@ -308,66 +323,66 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">B.</term>
+    <term name="chapter" form="short">Kap.</term>
+    <term name="column" form="short">Sp.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">B.</term>
-    <term name="chapter" form="short">Kap.</term>
-    <term name="column" form="short">Sp.</term>
     <term name="figure" form="short">Abb.</term>
     <term name="folio" form="short">Fol.</term>
     <term name="issue" form="short">Nr.</term>
     <term name="line" form="short">Z.</term>
-    <term name="note" form="short">N.</term>
+    <term name="note" form="short">Anm.</term>
     <term name="opus" form="short">op.</term>
     <term name="page" form="short">
       <single>S.</single>
       <multiple>S.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>S.</single>
-      <multiple>S.</multiple>
-    </term>
     <term name="paragraph" form="short">Abs.</term>
     <term name="part" form="short">Teil</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">Abschn.</term>
     <term name="sub-verbo" form="short">
       <single>s.&#160;v.</single>
       <multiple>s.&#160;vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>V.</single>
       <multiple>V.</multiple>
@@ -377,7 +392,7 @@
       <multiple>Bde.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -387,59 +402,109 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>Nummer</single>
+      <multiple>Nummern</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>Auflage</single>
+      <multiple>Auflagen</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>Ref.</single>
+      <multiple>Ref.</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>Nummer</single>
+      <multiple>Nummern</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>Seite</single>
+      <multiple>Seiten</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">Version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">Nr.</term>
+    <term name="edition" form="short">Aufl.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>Ref.</single>
+      <multiple>Ref.</multiple>
     </term>
+    <term name="number" form="short">
+      <single>Nr.</single>
+      <multiple>Nr.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>S.</single>
+      <multiple>S.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>Vorsitz</single>
+      <multiple>Vorsitz</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>Reihenherausgeber</single>
+      <multiple>Reihenherausgeber</multiple>
+    </term>
+    <term name="compiler">
+      <single>Bearbeiter</single>
+      <multiple>Bearbeiter</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>Beitragende</single>
+      <multiple>Beitragende</multiple>
+    </term>
+    <term name="curator">
+      <single>Direktor</single>
+      <multiple>Direktor</multiple>
+    </term>
     <term name="director">
       <single>Regisseur</single>
       <multiple>Regisseure</multiple>
@@ -448,28 +513,72 @@
       <single>Herausgeber</single>
       <multiple>Herausgeber</multiple>
     </term>
-    <term name="collection-editor">
-      <single>Reihenherausgeber</single>
-      <multiple>Reihenherausgeber</multiple>
+    <term name="editor-translator">
+      <single>Herausgeber&#160;und Übersetzer</single>
+      <multiple>Herausgeber&#160;und Übersetzer</multiple>
     </term>
+    <term name="editortranslator">
+      <single>Herausgeber&#160;und Übersetzer</single>
+      <multiple>Herausgeber&#160;und Übersetzer</multiple>
+    </term>
     <term name="editorial-director">
       <single>Herausgeber</single>
       <multiple>Herausgeber</multiple>
     </term>
+    <term name="executive-producer">
+      <single>Produktionsleiter</single>
+      <multiple>Produktionsleiter</multiple>
+    </term>
+    <term name="guest">
+      <single>Gast</single>
+      <multiple>Gäste</multiple>
+    </term>
+    <term name="host">
+      <single>Gastgeber</single>
+      <multiple>Gastgeber</multiple>
+    </term>
     <term name="illustrator">
       <single>Illustrator</single>
       <multiple>Illustratoren</multiple>
     </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>Erzähler</single>
+      <multiple>Erzähler</multiple>
+    </term>
+    <term name="organizer">
+      <single>Veranstalter</single>
+      <multiple>Veranstalter</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>Künstler</single>
+      <multiple>Künstler</multiple>
+    </term>
+    <term name="producer">
+      <single>Produzent</single>
+      <multiple>Produzenten</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>Drehbuchautor</single>
+      <multiple>Drehbuchautoren</multiple>
+    </term>
+    <term name="series-creator">
+      <single>Idee</single>
+      <multiple>Idee</multiple>
+    </term>
     <term name="translator">
       <single>Übersetzer</single>
       <multiple>Übersetzer</multiple>
     </term>
-    <term name="editortranslator">
-      <single>Herausgeber&#160;&amp; Übersetzer</single>
-      <multiple>Herausgeber&#160;&amp; Übersetzer</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
+    <term name="collection-editor" form="short">
+      <single>Hrsg.</single>
+      <multiple>Hrsg.</multiple>
+    </term>
     <term name="compiler" form="short">
       <single>comp.</single>
       <multiple>comps.</multiple>
@@ -482,10 +591,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>Reg.</single>
+      <multiple>Reg.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>Hrsg.</single>
+      <multiple>Hrsg.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>Hrsg.&#160;u. Übers.</single>
+      <multiple>Hrsg.&#160;u. Übers.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>Hrsg.&#160;u. Übers.</single>
+      <multiple>Hrsg.&#160;u. Übers.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>Hrsg.</single>
+      <multiple>Hrsg.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>Ill.</single>
+      <multiple>Ill.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -507,84 +640,62 @@
       <multiple>writs.</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>Reg.</single>
-      <multiple>Reg.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>Hrsg.</single>
-      <multiple>Hrsg.</multiple>
-    </term>
-    <term name="collection-editor" form="short">
-      <single>Hrsg.</single>
-      <multiple>Hrsg.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>Hrsg.</single>
-      <multiple>Hrsg.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>Ill.</single>
-      <multiple>Ill.</multiple>
+      <single>Idee</single>
+      <multiple>Idee</multiple>
     </term>
     <term name="translator" form="short">
       <single>Übers.</single>
       <multiple>Übers.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>Hrsg.&#160;&amp; Übers.</single>
-      <multiple>Hrsg.&#160;&amp; Übers.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">Vorsitz durch</term>
+    <term name="collection-editor" form="verb">herausgegeben von</term>
+    <term name="compiler" form="verb">kompiliert von</term>
     <term name="container-author" form="verb">von</term>
+    <term name="contributor" form="verb">mit</term>
+    <term name="curator" form="verb">kuriert von</term>
     <term name="director" form="verb">Regie von</term>
     <term name="editor" form="verb">herausgegeben von</term>
-    <term name="collection-editor" form="verb">herausgegeben von</term>
+    <term name="editor-translator" form="verb">herausgegeben und übersetzt von</term>
+    <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>
     <term name="editorial-director" form="verb">herausgegeben von</term>
+    <term name="executive-producer" form="verb">Produktionsleitung von</term>
+    <term name="guest" form="verb">mit Gast</term>
+    <term name="host" form="verb">veranstaltet von</term>
     <term name="illustrator" form="verb">illustriert von</term>
     <term name="interviewer" form="verb">interviewt von</term>
+    <term name="narrator" form="verb">Narration von</term>
+    <term name="organizer" form="verb">organisiert von</term>
+    <term name="performer" form="verb">Aufführung von</term>
+    <term name="producer" form="verb">produziert von</term>
     <term name="recipient" form="verb">an</term>
     <term name="reviewed-author" form="verb">von</term>
+    <term name="script-writer" form="verb">geschrieben von</term>
+    <term name="series-creator" form="verb">Idee von</term>
     <term name="translator" form="verb">übersetzt von</term>
-    <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">hrsg. von</term>
+    <term name="compiler" form="verb-short">komp. von</term>
+    <term name="contributor" form="verb-short">m.</term>
+    <term name="curator" form="verb-short">kur. von</term>
     <term name="director" form="verb-short">Reg.</term>
-    <term name="editor" form="verb-short">hg. von</term>
-    <term name="collection-editor" form="verb-short">hg. von</term>
-    <term name="editorial-director" form="verb-short">hg. von</term>
+    <term name="editor" form="verb-short">hrsg. von</term>
+    <term name="editor-translator" form="verb-short">hg.&#160;u. übers. von</term>
+    <term name="editortranslator" form="verb-short">hg.&#160;u. übers. von</term>
+    <term name="editorial-director" form="verb-short">hrsg. von</term>
+    <term name="executive-producer" form="verb-short">Prod. gel. v.</term>
+    <term name="guest" form="verb-short">w. guest</term>
+    <term name="host" form="verb-short">veranst. von</term>
     <term name="illustrator" form="verb-short">illus. von</term>
+    <term name="narrator" form="verb-short">Narr. von</term>
+    <term name="organizer" form="verb-short">org. von</term>
+    <term name="performer" form="verb-short">aufg. von</term>
+    <term name="producer" form="verb-short">prod. von</term>
+    <term name="script-writer" form="verb-short">writ. by</term>
+    <term name="series-creator" form="verb-short">Idee von</term>
     <term name="translator" form="verb-short">übers. von</term>
-    <term name="editortranslator" form="verb-short">hg.&#160;&amp; übers. von</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Januar</term>
diff --git a/locales/el-GR.xml b/locales/el-GR.xml
--- a/locales/el-GR.xml
+++ b/locales/el-GR.xml
@@ -7,8 +7,11 @@
     <translator>
       <name>dimtamb</name>
     </translator>
+    <translator>
+      <name>Patrick O'Brien</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2013-11-08T20:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -22,26 +25,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">ημερομηνία πρόσβασης</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">και</term>
+    <term name="and others">και άλλοι</term>
+    <term name="anonymous">ανώνυμο</term>
+    <term name="at">εφ.</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">διαθέσιμο στο</term>
+    <term name="by">από</term>
+    <term name="circa">περίπου</term>
+    <term name="cited">παρατίθεται</term>
+    <term name="et-al">κ.ά.</term>
     <term name="film">film</term>
+    <term name="forthcoming">προσεχές</term>
+    <term name="from">από</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">στο ίδιο</term>
+    <term name="in">στο</term>
+    <term name="in press">υπό έκδοση</term>
+    <term name="internet">διαδίκτυο</term>
+    <term name="letter">επιστολή</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">χωρίς χρονολογία</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">έκδοση σε ψηφιακή μορφή</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">προσωπική επικοινωνία</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">παρουσιάστηκε στο</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>παραπομπή</single>
+      <multiple>παραπομπές</multiple>
+    </term>
+    <term name="retrieved">ανακτήθηκε</term>
+    <term name="review-of">review of</term>
+    <term name="scale">κλίμακα</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -49,46 +78,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">ημερομηνία πρόσβασης</term>
-    <term name="and">και</term>
-    <term name="and others">και άλλοι</term>
-    <term name="anonymous">ανώνυμο</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">ανών.</term>
-    <term name="at">εφ.</term>
-    <term name="available at">διαθέσιμο στο</term>
-    <term name="by">από</term>
-    <term name="circa">περίπου</term>
     <term name="circa" form="short">περ.</term>
-    <term name="cited">παρατίθεται</term>
-    <term name="edition" gender="feminine">
-      <single>έκδοση</single>
-      <multiple>εκδόσεις</multiple>
-    </term>
-    <term name="edition" form="short">έκδ.</term>
-    <term name="et-al">κ.ά.</term>
-    <term name="forthcoming">προσεχές</term>
-    <term name="from">από</term>
-    <term name="ibid">στο ίδιο</term>
-    <term name="in">στο</term>
-    <term name="in press">υπό έκδοση</term>
-    <term name="internet">διαδίκτυο</term>
-    <term name="letter">επιστολή</term>
-    <term name="no date">χωρίς χρονολογία</term>
     <term name="no date" form="short">χ.χ.</term>
-    <term name="online">έκδοση σε ψηφιακή μορφή</term>
-    <term name="presented at">παρουσιάστηκε στο</term>
-    <term name="reference">
-      <single>παραπομπή</single>
-      <multiple>παραπομπές</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>παρ.</single>
       <multiple>παρ.</multiple>
     </term>
-    <term name="retrieved">ανακτήθηκε</term>
-    <term name="scale">κλίμακα</term>
-    <term name="version">εκδοχή</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -153,6 +157,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">μ.Χ.</term>
     <term name="bc">π.Χ.</term>
@@ -167,7 +179,7 @@
     <term name="page-range-delimiter">–</term>
     <term name="colon">:</term>
     <term name="comma">,</term>
-    <term name="semicolon">;</term>
+    <term name="semicolon">·</term>
 
     <!-- ORDINALS -->
     <term name="ordinal">ο</term>
@@ -187,54 +199,26 @@
     <term name="long-ordinal-10">δέκατος</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>βιβλίο</single>
       <multiple>βιβλία</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>κεφάλαιο</single>
       <multiple>κεφάλαια</multiple>
@@ -243,6 +227,14 @@
       <single>στήλη</single>
       <multiple>στήλες</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>εικόνα</single>
       <multiple>εικόνες</multiple>
@@ -271,10 +263,6 @@
       <single>σελίδα</single>
       <multiple>σελίδες</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>σελίδα</single>
-      <multiple>σελίδες</multiple>
-    </term>
     <term name="paragraph">
       <single>παράγραφος</single>
       <multiple>παράγραφοι</multiple>
@@ -283,6 +271,14 @@
       <single>μέρος</single>
       <multiple>μέρη</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>τμήμα</single>
       <multiple>τμήματα</multiple>
@@ -291,6 +287,22 @@
       <single>λήμμα</single>
       <multiple>λήμματα</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>στίχος</single>
       <multiple>στίχοι</multiple>
@@ -301,45 +313,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">βιβ.</term>
+    <term name="chapter" form="short">κεφ.</term>
+    <term name="column" form="short">στ.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">βιβ.</term>
-    <term name="chapter" form="short">κεφ.</term>
-    <term name="column" form="short">στ.</term>
     <term name="figure" form="short">εικ.</term>
     <term name="folio" form="short">φάκ</term>
     <term name="issue" form="short">τχ.</term>
@@ -347,20 +339,40 @@
     <term name="note" form="short">σημ.</term>
     <term name="opus" form="short">έργ.</term>
     <term name="page" form="short">
-      <single>σ.</single>
-      <multiple>σσ.</multiple>
-    </term>
-    <term name="number-of-pages" form="short">
-      <single>σ.</single>
-      <multiple>σσ.</multiple>
+      <single>σελ.</single>
+      <multiple>σελ.</multiple>
     </term>
     <term name="paragraph" form="short">παρ.</term>
     <term name="part" form="short">μέρ.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">τμ.</term>
     <term name="sub-verbo" form="short">
       <single>λήμ.</single>
       <multiple>λήμ.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>στ.</single>
       <multiple>στ.</multiple>
@@ -370,7 +382,7 @@
       <multiple>τ.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -380,15 +392,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>τεύχος</single>
+      <multiple>τεύχη</multiple>
+    </term>
+    <term name="edition" gender="feminine">
+      <single>έκδοση</single>
+      <multiple>εκδόσεις</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>σημείωση</single>
+      <multiple>σημειώσεις</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>σελίδα</single>
+      <multiple>σελίδες</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">εκδοχή</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">τχ.</term>
+    <term name="edition" form="short">έκδ.</term>
+    <term name="first-reference-note-number" form="short">σημ.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>σ.</single>
+      <multiple>σσ.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -397,6 +492,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>Διευθυντής</single>
+      <multiple>Διευθυντές</multiple>
+    </term>
+    <term name="editor">
+      <single>επιμελητής</single>
+      <multiple>επιμελητές</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>μεταφραστής και επιμελητής</single>
+      <multiple>μεταφραστές και επιμελητές</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>μεταφραστής και επιμελητής</single>
+      <multiple>μεταφραστές και επιμελητές</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>διευθυντής σειράς</single>
+      <multiple>διευθυντές σειράς</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -409,6 +524,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>εικονογράφος</single>
+      <multiple>εικονογράφοι</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -417,6 +537,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -425,6 +546,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -433,30 +556,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>Διευθυντής</single>
-      <multiple>Διευθυντές</multiple>
-    </term>
-    <term name="editor">
-      <single>επιμελητής</single>
-      <multiple>επιμελητές</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>διευθυντής σειράς</single>
-      <multiple>διευθυντές σειράς</multiple>
-    </term>
-    <term name="illustrator">
-      <single>εικονογράφος</single>
-      <multiple>εικονογράφοι</multiple>
-    </term>
     <term name="translator">
       <single>μεταφραστής</single>
       <multiple>μεταφραστές</multiple>
     </term>
-    <term name="editortranslator">
-      <single>μεταφραστής και επιμελητής</single>
-      <multiple>μεταφραστές και επιμελητές</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -471,10 +574,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>δ/ντης.</single>
+      <multiple>δ/ντές.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>επιμ.</single>
+      <multiple>επιμ.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>μτφ. και επιμ.</single>
+      <multiple>μτφ. και επιμ.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>μτφ. και επιμ.</single>
+      <multiple>μτφ. και επιμ.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>δ/ντής σειράς</single>
+      <multiple>δ/ντές σειρας</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>εικ.</single>
+      <multiple>εικ..</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -499,75 +626,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>δ/ντης.</single>
-      <multiple>δ/ντές.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>επιμ.</single>
-      <multiple>επιμ.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>δ/ντής σειράς</single>
-      <multiple>δ/ντές σειρας</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>εικ.</single>
-      <multiple>εικ..</multiple>
-    </term>
     <term name="translator" form="short">
       <single>μτφ.</single>
       <multiple>μτφ.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>μτφ. και επιμ.</single>
-      <multiple>μτφ. και επιμ.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">στον συλλ. τόμο</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">διεύθυνση</term>
+    <term name="editor" form="verb">επιμέλεια</term>
+    <term name="editor-translator" form="verb">μετάφραση και επιμέλεια</term>
+    <term name="editortranslator" form="verb">μετάφραση και επιμέλεια</term>
+    <term name="editorial-director" form="verb">διεύθυνση σειράς</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">εικονογράφηση:</term>
+    <term name="interviewer" form="verb">συνέντευξη</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">στον συλλ. τόμο</term>
-    <term name="director" form="verb">διεύθυνση</term>
-    <term name="editor" form="verb">επιμέλεια</term>
-    <term name="editorial-director" form="verb">διεύθυνση σειράς</term>
-    <term name="illustrator" form="verb">εικονογράφηση:</term>
-    <term name="interviewer" form="verb">συνέντευξη</term>
     <term name="recipient" form="verb">παραλήπτης</term>
     <term name="reviewed-author" form="verb">συγγραφέας:</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">μετάφραση</term>
-    <term name="editortranslator" form="verb">μετάφραση και επιμέλεια</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">διευθ.</term>
+    <term name="editor" form="verb-short">επιμέλ.</term>
+    <term name="editor-translator" form="verb-short">μετάφρ. και επιμέλ.</term>
+    <term name="editortranslator" form="verb-short">μετάφρ. και επιμέλ.</term>
+    <term name="editorial-director" form="verb-short">δ/νση σειράς</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">εικον.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">διευθ.</term>
-    <term name="editor" form="verb-short">επιμέλ.</term>
-    <term name="editorial-director" form="verb-short">δ/νση σειράς</term>
-    <term name="illustrator" form="verb-short">εικον.</term>
     <term name="translator" form="verb-short">μετάφρ.</term>
-    <term name="editortranslator" form="verb-short">μετάφρ. και επιμέλ.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Ιανουάριος</term>
diff --git a/locales/en-GB.xml b/locales/en-GB.xml
--- a/locales/en-GB.xml
+++ b/locales/en-GB.xml
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="en-GB">
+  <!-- The abbreviations in this file follow the New Oxford Dictionary for Writers and Editors, 2nd edn (2014), unless stated otherwise (cited hereafter as NODWE). This work is also available as part of the New Oxford Style Manual, 3rd edn (2016). -->
+  <!-- Additional abbreviations are from:
+        1. Oxford Dictionary for Writers and Editors (2000), https://archive.org/details/oxfordstylemanua0000unse (cited hereafter as ODWE). NODWE is an abridged version of ODWE, meaning that the earlier edition still provides useful recommendations in some specialized fields, especially law. Periods must be removed from contractions to reflect current British English usage (a convention that the dictionary adopted with NODWE in 2005).
+        2. Oxford Dictionary of Abbreviations (2011), https://doi.org/10.1093/acref/9780199698295.001.0001 (cited hereafter as ODA).
+        3. The Chicago Manual of Style, 18th edn (2024), sect. 10.48, https://www.chicagomanualofstyle.org (cited hereafter as CMOS), the foundational source for the en-US CSL locale.
+  -->
   <info>
     <translator>
       <name>Andrew Dunning</name>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
     </translator>
     <translator>
       <name>Sebastian Karcher</name>
+      <uri>https://orcid.org/0000-0001-8249-7388</uri>
     </translator>
     <translator>
       <name>Rintze M. Zelle</name>
+      <uri>https://orcid.org/0000-0003-1779-8883</uri>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2015-10-10T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -25,26 +34,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">accessed</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">and</term>
+    <term name="and others">and others</term>
+    <term name="anonymous">anonymous</term>
+    <term name="at">at</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">available at</term>
+    <term name="by">by</term>
+    <term name="circa">circa</term>
+    <term name="cited">cited</term>
+    <term name="et-al">et al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">forthcoming</term>
+    <term name="from">from</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">in</term>
+    <term name="in press">in press</term>
+    <term name="internet">internet</term>
+    <term name="letter">letter</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">no date</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
+    <term name="no-publisher">no publisher</term>
     <term name="on">on</term>
+    <term name="online">online</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">personal communication</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">presented at the</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>reference</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="retrieved">retrieved</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scale</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -52,46 +87,46 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">accessed</term>
-    <term name="and">and</term>
-    <term name="and others">and others</term>
-    <term name="anonymous">anonymous</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <!-- Omitted short forms: accessed, album, and (symbol), and others, at (symbol), forthcoming, henceforth, ibid, in, in press, internet, loc-cit, on, online, op-cit, podcast, preprint, presented at -->
+    <term name="advance-online-publication" form="short">adv. online pub.</term> <!-- ODA -->
     <term name="anonymous" form="short">anon.</term>
-    <term name="at">at</term>
-    <term name="available at">available at</term>
-    <term name="by">by</term>
-    <term name="circa">circa</term>
+    <term name="audio-recording" form="short">au. rec.</term> <!-- ODA -->
+    <term name="available at" form="short">avail. at</term> <!-- ODA -->
     <term name="circa" form="short">c.</term>
-    <term name="cited">cited</term>
-    <term name="edition">
-      <single>edition</single>
-      <multiple>editions</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">forthcoming</term>
-    <term name="from">from</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">in</term>
-    <term name="in press">in press</term>
-    <term name="internet">internet</term>
-    <term name="letter">letter</term>
-    <term name="no date">no date</term>
+    <term name="cited" form="short">cit.</term> <!-- ODA -->
+    <term name="film" form="short">flm</term> <!-- ODA -->
+    <term name="from" form="short">fr.</term>
+    <term name="letter" form="short">let.</term> <!-- ODA -->
     <term name="no date" form="short">n.d.</term>
-    <term name="online">online</term>
-    <term name="presented at">presented at the</term>
-    <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
+    <term name="original-work-published" form="short">orig. pub.</term> <!-- Oxford Guide to Style -->
+    <term name="personal-communication" form="short">pers. comm.</term>
+    <term name="podcast-episode" form="short">podcast ep.</term>
+    <term name="radio-broadcast" form="short">radio bdcst</term> <!-- ODA -->
+    <term name="radio-series" form="short">radio ser.</term> <!-- ODA -->
+    <term name="radio-series-episode" form="short">radio ser. ep.</term> <!-- ODA -->
     <term name="reference" form="short">
       <single>ref.</single>
-      <multiple>refs.</multiple>
+      <multiple>refs</multiple>
     </term>
-    <term name="retrieved">retrieved</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="retrieved" form="short">rtvd</term> <!-- ODA -->
+    <term name="review-of" form="short">rev. of</term>
+    <term name="scale" form="short">sc.</term> <!-- ODA -->
+    <term name="special-issue" form="short">spec. iss.</term> <!-- ODA -->
+    <term name="special-section" form="short">spec. sect.</term> <!-- ODA/CMOS -->
+    <term name="television-broadcast" form="short">TV bdcst</term> <!-- ODA -->
+    <term name="television-series" form="short">TV ser.</term> <!-- ODA -->
+    <term name="television-series-episode" form="short">TV ser. ep.</term> <!-- ODA -->
+    <term name="video" form="short">vid.</term> <!-- ODA -->
+    <term name="working-paper" form="short">wkg paper</term> <!-- ODA -->
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+    <term name="and" form="symbol">&amp;</term>
+    <term name="at" form="symbol">@</term>
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -101,13 +136,13 @@
     <!-- book is in the list of locator terms -->
     <term name="broadcast">broadcast</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
+    <term name="classic">classical work</term>
+    <term name="collection">archival collection</term>
+    <term name="dataset">data set</term>
     <term name="document">document</term>
     <term name="entry">entry</term>
     <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
+    <term name="entry-encyclopedia">encyclopaedia entry</term>
     <term name="event">event</term>
     <!-- figure is in the list of locator terms -->
     <term name="graphic">graphic</term>
@@ -137,30 +172,64 @@
     <term name="standard">standard</term>
     <term name="thesis">thesis</term>
     <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="webpage">web page</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
+    <!-- Omitted short forms: article, bill, entry, event, hearing, map, periodical, speech, treaty -->
+    <term name="article-journal" form="short">jour. art.</term> <!-- ODWE -->
+    <term name="article-magazine" form="short">mag. art.</term> <!-- ODWE -->
     <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="broadcast" form="short">bdcst</term> <!-- ODA -->
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
+    <term name="classic" form="short">class. wk</term> <!-- ODWE -->
+    <term name="collection" form="short">arch. coll.</term> <!-- ODA -->
     <term name="document" form="short">doc.</term>
+    <term name="entry-dictionary" form="short">dict. entry</term>
+    <term name="entry-encyclopedia" form="short">ency. entry</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
+    <term name="graphic" form="short">gr.</term> <!-- ODA -->
+    <term name="interview" form="short">int.</term> <!-- ODA -->
+    <term name="legal_case" form="short">leg. case</term> <!-- ODA -->
+    <term name="legislation" form="short">legis.</term> <!-- ODA -->
+    <term name="manuscript" form="short">
+      <single>MS</single>
+      <multiple>MSS</multiple>
+    </term>
+    <term name="motion_picture" form="short">vid. rec.</term> <!-- ODA -->
+    <term name="musical_score" form="short">mus. score</term> <!-- ODWE -->
+    <term name="pamphlet" form="short">pam.</term> <!-- ODWE -->
+    <term name="paper-conference" form="short">conf. paper</term> <!-- ODA -->
+    <term name="patent" form="short">pat.</term> <!-- ODWE -->
+    <term name="performance" form="short">prfm.</term> <!-- ODA -->
+    <term name="personal_communication" form="short">pers. comm.</term>
+    <term name="regulation" form="short">reg.</term> <!-- ODA -->
+    <term name="report" form="short">rep.</term> <!-- ODWE -->
     <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="review-book" form="short">bk rev.</term>
+    <term name="software" form="short">sftw.</term> <!-- ODA -->
+    <term name="song" form="short">au. rec.</term> <!-- ODA -->
+    <term name="standard" form="short">std</term> <!-- ODA -->
+    <term name="thesis" form="short">thes.</term> <!-- ODA -->
+    <term name="webpage" form="short">web pg.</term> <!-- ODA -->
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb-short">test. of</term> <!-- ODA -->
+    <term name="review" form="verb-short">rev. of</term>
+    <term name="review-book" form="verb-short">rev. of the bk</term>
+
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">AD</term>
-    <term name="bc">BC</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="ad"> AD</term>
+    <term name="bc"> BC</term>
+    <term name="bce"> BCE</term>
+    <term name="ce"> CE</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">‘</term>
@@ -194,54 +263,26 @@
     <term name="long-ordinal-10">tenth</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">	
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>book</single>
       <multiple>books</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>chapter</single>
       <multiple>chapters</multiple>
@@ -250,6 +291,14 @@
       <single>column</single>
       <multiple>columns</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figure</single>
       <multiple>figures</multiple>
@@ -259,8 +308,8 @@
       <multiple>folios</multiple>
     </term>
     <term name="issue">
-      <single>number</single>
-      <multiple>numbers</multiple>
+      <single>issue</single>
+      <multiple>issues</multiple>
     </term>
     <term name="line">
       <single>line</single>
@@ -278,10 +327,6 @@
       <single>page</single>
       <multiple>pages</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>page</single>
-      <multiple>pages</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraph</single>
       <multiple>paragraphs</multiple>
@@ -290,6 +335,14 @@
       <single>part</single>
       <multiple>parts</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>section</single>
       <multiple>sections</multiple>
@@ -298,6 +351,20 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <!-- A timestamp is a composite of hours, minutes, etc. and therefore has no default label. -->
+    <term name="timestamp"/>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verse</single>
       <multiple>verses</multiple>
@@ -308,54 +375,40 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <!-- Omitted short forms: act, timestamp -->
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+      <multiple>arts</multiple>
     </term>
     <term name="book" form="short">
-      <single>bk.</single>
+      <single>bk</single>
       <multiple>bks</multiple>
     </term>
+    <term name="canon" form="short">
+      <!-- Oxford Dictionary for Writers and Editors -->
+      <single>can.</single>
+      <multiple>cann.</multiple>
+    </term>
     <term name="chapter" form="short">
-      <single>chap.</single>
-      <multiple>chaps</multiple>
+      <single>ch.</single>
+      <multiple>chs</multiple>
     </term>
     <term name="column" form="short">
       <single>col.</single>
       <multiple>cols</multiple>
     </term>
+    <term name="elocation" form="short">
+      <single>loc.</single>
+      <multiple>locs</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>eq.</single>
+      <multiple>eqq.</multiple>
+    </term>
     <term name="figure" form="short">
       <single>fig.</single>
       <multiple>figs</multiple>
@@ -366,7 +419,7 @@
     </term>
     <term name="issue" form="short">
       <single>no.</single>
-      <multiple>nos.</multiple>
+      <multiple>nos</multiple>
     </term>
     <term name="line" form="short">
       <single>l.</single>
@@ -384,26 +437,45 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">
       <single>para.</single>
       <multiple>paras</multiple>
     </term>
     <term name="part" form="short">
-      <single>pt.</single>
+      <single>pt</single>
       <multiple>pts</multiple>
     </term>
+    <term name="rule" form="short">
+      <!-- legal abbreviations in the Oxford Guide to Style, sect. 13.2.1 -->
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs</multiple>
+    </term>
     <term name="section" form="short">
-      <single>sec.</single>
-      <multiple>secs</multiple>
+      <single>sect.</single>
+      <multiple>sects</multiple>
     </term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>suppl.</single>
+      <multiple>suppls</multiple>
+    </term>
+    <term name="table" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>tbl.</single>
+      <multiple>tbls</multiple>
+    </term>
+    <term name="title-locator" form="short">
+      <!-- Oxford Dictionary for Writers and Editors -->
+      <single>tit.</single>
+      <multiple>titt.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -413,7 +485,12 @@
       <multiple>vols</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="chapter" form="symbol">
+      <!-- caput/capita, esp. in legal works -->
+      <single>c.</single>
+      <multiple>cc.</multiple>
+    </term>
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -423,15 +500,111 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="edition">
+      <single>edition</single>
+      <multiple>editions</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>note</single>
+      <multiple>notes</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">
+      <single>version</single>
+      <multiple>versions</multiple>
+    </term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>ch.</single>
+      <multiple>chs</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits</multiple>
+    </term>
+    <term name="collection-number" form="short">
+      <single>no.</single>
+      <multiple>nos</multiple>
+    </term>
+    <term name="edition" form="short">
+      <single>edn</single>
+      <multiple>edns</multiple>
+    </term>
+    <term name="first-reference-note-number" form="short">
+      <single>n.</single>
+      <multiple>nn.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>ptg</single>
+      <multiple>ptgs</multiple>
+    </term>
+    <term name="version" form="short">v.</term> <!-- no plural -->
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -440,6 +613,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -452,14 +645,20 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>organiser</single>
+      <multiple>organisers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -468,6 +667,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -476,141 +677,143 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
-    </term>
     <term name="translator">
       <single>translator</single>
       <multiple>translators</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor &amp; translator</single>
-      <multiple>editors &amp; translators</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, composer, container-author, guest, host, interviewer, original-author, recipient, reviewed-author
+    -->
+    <term name="collection-editor" form="short">
+      <single>ed.</single>
+      <multiple>eds</multiple>
+    </term>
     <term name="compiler" form="short">
       <single>comp.</single>
-      <multiple>comps.</multiple>
+      <multiple>comps</multiple>
     </term>
     <term name="contributor" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <multiple>contribs</multiple>
     </term>
     <term name="curator" form="short">
+      <!-- Oxford Art Online <https://www.oxfordartonline.com/page/1661> -->
       <single>cur.</single>
-      <multiple>curs.</multiple>
+      <multiple>curs</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; trans.</single>
+      <multiple>eds &amp; trans.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; trans.</single>
+      <multiple>eds &amp; trans.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds</multiple>
+    </term>
     <term name="executive-producer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <multiple>exec. prods</multiple>
     </term>
+    <term name="illustrator" form="short">illus.</term> <!-- no plural -->
     <term name="narrator" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>narr.</single>
-      <multiple>narrs.</multiple>
+      <multiple>narrs</multiple>
     </term>
     <term name="organizer" form="short">
+      <!-- possibly misleading: Oxford Dictionary of Abbreviations only defines this as organization or organized -->
       <single>org.</single>
-      <multiple>orgs.</multiple>
+      <multiple>orgs</multiple>
     </term>
     <term name="performer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>perf.</single>
-      <multiple>perfs.</multiple>
+      <multiple>perfs</multiple>
     </term>
     <term name="producer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>prod.</single>
-      <multiple>prods.</multiple>
+      <multiple>prods</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>wrtr</single>
+      <multiple>wrtrs</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
-    <term name="translator" form="short">
-      <single>tran.</single>
-      <multiple>trans.</multiple>
-    </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; tran.</single>
-      <multiple>eds. &amp; trans.</multiple>
+      <single>ser. creator</single>
+      <multiple>ser. creators</multiple>
     </term>
+    <term name="translator" form="short">trans.</term> <!-- no plural -->
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="composer" form="verb">composed by</term>
+    <term name="container-author" form="verb">by</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
     <term name="director" form="verb">directed by</term>
     <term name="editor" form="verb">edited by</term>
+    <term name="editor-translator" form="verb">edited &amp; translated by</term>
+    <term name="editortranslator" form="verb">edited &amp; translated by</term>
     <term name="editorial-director" form="verb">edited by</term>
+    <term name="executive-producer" form="verb">executive produced by</term>
+    <term form="verb" name="guest">
+      <single>with guest</single>
+      <multiple>with guests</multiple>
+    </term>
+    <term name="host" form="verb">hosted by</term>
     <term name="illustrator" form="verb">illustrated by</term>
     <term name="interviewer" form="verb">interview by</term>
+    <term name="narrator" form="verb">read by</term> <!-- verb role form in Oxford Style Manual, MHRA -->
+    <term name="organizer" form="verb">organised by</term>
+    <term name="original-author" form="verb">by</term>
+    <term name="performer" form="verb">performed by</term>
+    <term name="producer" form="verb">produced by</term>
     <term name="recipient" form="verb">to</term>
     <term name="reviewed-author" form="verb">by</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">translated by</term>
-    <term name="editortranslator" form="verb">edited &amp; translated by</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, container-author, contributor, guest, host, interviewer, original-author, recipient, reviewed-author, series-creator
+    -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="composer" form="verb-short">comp. by</term> <!-- ODWE -->
+    <term name="curator" form="verb-short">cur. by</term> <!-- Oxford Art Online -->
     <term name="director" form="verb-short">dir. by</term>
     <term name="editor" form="verb-short">ed. by</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
     <term name="editorial-director" form="verb-short">ed. by</term>
+    <term name="executive-producer" form="verb-short">exec. prod. by</term> <!-- ODA -->
     <term name="illustrator" form="verb-short">illus. by</term>
+    <term name="narrator" form="verb-short">read by</term> <!-- repetition required to avoid fallback to en-US -->
+    <term name="organizer" form="verb-short">org. by</term> <!-- ODA -->
+    <term name="performer" form="verb-short">perfd by</term> <!-- ODA -->
+    <term name="producer" form="verb-short">prod. by</term> <!-- ODA -->
+    <term name="script-writer" form="verb-short">writ. by</term> <!-- ODA -->
     <term name="translator" form="verb-short">trans. by</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">January</term>
@@ -627,15 +830,16 @@
     <term name="month-12">December</term>
 
     <!-- SHORT MONTH FORMS -->
+    <!-- New Hart's Rules, 2nd edn, sect. 10.2.6 summarizes NODWE recommendations; identical to CMOS 10.44 -->
     <term name="month-01" form="short">Jan.</term>
     <term name="month-02" form="short">Feb.</term>
     <term name="month-03" form="short">Mar.</term>
     <term name="month-04" form="short">Apr.</term>
     <term name="month-05" form="short">May</term>
-    <term name="month-06" form="short">Jun.</term>
-    <term name="month-07" form="short">Jul.</term>
+    <term name="month-06" form="short">June</term>
+    <term name="month-07" form="short">July</term>
     <term name="month-08" form="short">Aug.</term>
-    <term name="month-09" form="short">Sep.</term>
+    <term name="month-09" form="short">Sept.</term>
     <term name="month-10" form="short">Oct.</term>
     <term name="month-11" form="short">Nov.</term>
     <term name="month-12" form="short">Dec.</term>
diff --git a/locales/en-US.xml b/locales/en-US.xml
--- a/locales/en-US.xml
+++ b/locales/en-US.xml
@@ -1,23 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="en-US">
+  <!-- The abbreviations in this file follow the recommendations of The Chicago Manual of Style, 18th ed. (2024), sec. 10.48 (cited hereafter as CMOS), unless stated otherwise. -->
+  <!-- Additional abbreviations are from:
+        1. Oxford Dictionary for Writers and Editors (2000), https://archive.org/details/oxfordstylemanua0000unse (cited hereafter as ODWE): reference has also been made to the New Oxford Dictionary for Writers and Editors (NODWE), but periods must be added to contractions in these later editions to reflect US English usage
+        2. Oxford Dictionary of Abbreviations (2011), https://doi.org/10.1093/acref/9780199698295.001.0001 (cited hereafter as ODA)
+  -->
   <info>
     <translator>
       <name>Andrew Dunning</name>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
     </translator>
     <translator>
       <name>Sebastian Karcher</name>
+      <uri>https://orcid.org/0000-0001-8249-7388</uri>
     </translator>
     <translator>
       <name>Rintze M. Zelle</name>
+      <uri>https://orcid.org/0000-0003-1779-8883</uri>
     </translator>
     <translator>
       <name>Denis Meier</name>
     </translator>
     <translator>
       <name>Brenton M. Wiernik</name>
+      <uri>https://orcid.org/0000-0001-9560-6336</uri>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2015-10-10T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="true"/>
   <date form="text">
@@ -31,26 +40,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">accessed</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">and</term>
+    <term name="and others">and others</term>
+    <term name="anonymous">anonymous</term>
+    <term name="at">at</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">available at</term>
+    <term name="by">by</term>
+    <term name="circa">circa</term>
+    <term name="cited">cited</term>
+    <term name="et-al">et al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">forthcoming</term>
+    <term name="from">from</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">in</term>
+    <term name="in press">in press</term>
+    <term name="internet">internet</term>
+    <term name="letter">letter</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">no date</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
+    <term name="no-publisher">no publisher</term>
     <term name="on">on</term>
+    <term name="online">online</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">personal communication</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">presented at the</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>reference</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="retrieved">retrieved</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scale</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -58,46 +93,47 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">accessed</term>
-    <term name="and">and</term>
-    <term name="and others">and others</term>
-    <term name="anonymous">anonymous</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <!-- Omitted short forms: accessed, album, and (symbol), and others, at (symbol), forthcoming, henceforth, ibid, in, in press, internet, loc-cit, on, online, op-cit, podcast, preprint, presented at -->
+    <term name="advance-online-publication" form="short">adv. online pub.</term> <!-- ODA -->
     <term name="anonymous" form="short">anon.</term>
-    <term name="at">at</term>
-    <term name="available at">available at</term>
-    <term name="by">by</term>
-    <term name="circa">circa</term>
+    <term name="audio-recording" form="short">au. rec.</term> <!-- ODA -->
+    <term name="available at" form="short">avail. at</term> <!-- ODA -->
     <term name="circa" form="short">c.</term>
-    <term name="cited">cited</term>
-    <term name="edition">
-      <single>edition</single>
-      <multiple>editions</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">forthcoming</term>
-    <term name="from">from</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">in</term>
-    <term name="in press">in press</term>
-    <term name="internet">internet</term>
-    <term name="letter">letter</term>
-    <term name="no date">no date</term>
+    <!-- CMOS 10.48 recommends "ca." for "circa" but also allows "c.", which CSL has used historically -->
+    <term name="cited" form="short">cit.</term> <!-- ODA -->
+    <term name="film" form="short">flm.</term> <!-- ODA -->
+    <term name="from" form="short">fr.</term>
+    <term name="letter" form="short">let.</term> <!-- ODA -->
     <term name="no date" form="short">n.d.</term>
-    <term name="online">online</term>
-    <term name="presented at">presented at the</term>
-    <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
+    <term name="original-work-published" form="short">orig. pub.</term> <!-- Oxford Guide to Style -->
+    <term name="personal-communication" form="short">pers. comm.</term>
+    <term name="podcast-episode" form="short">podcast ep.</term>
+    <term name="radio-broadcast" form="short">radio bdcst.</term> <!-- ODA -->
+    <term name="radio-series" form="short">radio ser.</term> <!-- ODA -->
+    <term name="radio-series-episode" form="short">radio ser. ep.</term> <!-- ODA -->
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">retrieved</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="retrieved" form="short">rtvd.</term> <!-- ODA -->
+    <term name="review-of" form="short">rev. of</term>
+    <term name="scale" form="short">sc.</term> <!-- ODA -->
+    <term name="special-issue" form="short">spec. iss.</term> <!-- ODA -->
+    <term name="special-section" form="short">spec. sec.</term> <!-- ODA/CMOS -->
+    <term name="television-broadcast" form="short">TV bdcst.</term> <!-- ODA -->
+    <term name="television-series" form="short">TV ser.</term> <!-- ODA -->
+    <term name="television-series-episode" form="short">TV ser. ep.</term> <!-- ODA -->
+    <term name="video" form="short">vid.</term> <!-- ODA -->
+    <term name="working-paper" form="short">wkg. paper</term> <!-- ODA -->
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+    <term name="and" form="symbol">&amp;</term>
+    <term name="at" form="symbol">@</term>
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -107,8 +143,8 @@
     <!-- book is in the list of locator terms -->
     <term name="broadcast">broadcast</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
+    <term name="classic">classical work</term>
+    <term name="collection">archival collection</term>
     <term name="dataset">dataset</term>
     <term name="document">document</term>
     <term name="entry">entry</term>
@@ -146,27 +182,61 @@
     <term name="webpage">webpage</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
+    <!-- Omitted short forms: article, bill, entry, event, hearing, map, periodical, speech, treaty -->
+    <term name="article-journal" form="short">jour. art.</term> <!-- ODWE -->
+    <term name="article-magazine" form="short">mag. art.</term> <!-- ODWE -->
     <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="broadcast" form="short">bdcst.</term> <!-- ODA -->
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
+    <term name="classic" form="short">class. wk.</term> <!-- ODWE -->
+    <term name="collection" form="short">arch. coll.</term> <!-- ODA -->
     <term name="document" form="short">doc.</term>
+    <term name="entry-dictionary" form="short">dict. entry</term>
+    <term name="entry-encyclopedia" form="short">ency. entry</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
+    <term name="graphic" form="short">gr.</term> <!-- ODA -->
+    <term name="interview" form="short">int.</term> <!-- ODA -->
+    <term name="legal_case" form="short">leg. case</term> <!-- ODA -->
+    <term name="legislation" form="short">legis.</term> <!-- ODA -->
+    <term name="manuscript" form="short">
+      <single>MS</single>
+      <multiple>MSS</multiple>
+    </term>
+    <term name="motion_picture" form="short">vid. rec.</term> <!-- ODA -->
+    <term name="musical_score" form="short">mus. score</term> <!-- ODWE -->
+    <term name="pamphlet" form="short">pam.</term> <!-- ODWE -->
+    <term name="paper-conference" form="short">conf. paper</term> <!-- ODA -->
+    <term name="patent" form="short">pat.</term> <!-- ODWE -->
+    <term name="performance" form="short">prfm.</term> <!-- ODA -->
+    <term name="personal_communication" form="short">pers. comm.</term>
+    <term name="regulation" form="short">reg.</term> <!-- ODA -->
+    <term name="report" form="short">rep.</term> <!-- ODWE -->
     <term name="review" form="short">rev.</term>
     <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="software" form="short">sftw.</term> <!-- ODA -->
+    <term name="song" form="short">au. rec.</term> <!-- ODA -->
+    <term name="standard" form="short">std.</term> <!-- ODA -->
+    <term name="thesis" form="short">thes.</term> <!-- ODA -->
+    <term name="webpage" form="short">webpg.</term> <!-- ODA -->
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb-short">test. of</term> <!-- ODA -->
+    <term name="review" form="verb-short">rev. of</term>
+    <term name="review-book" form="verb-short">rev. of the bk.</term>
+
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">AD</term>
-    <term name="bc">BC</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="ad"> AD</term>
+    <term name="bc"> BC</term>
+    <term name="bce"> BCE</term>
+    <term name="ce"> CE</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">“</term>
@@ -200,54 +270,26 @@
     <term name="long-ordinal-10">tenth</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>book</single>
       <multiple>books</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>chapter</single>
       <multiple>chapters</multiple>
@@ -256,6 +298,14 @@
       <single>column</single>
       <multiple>columns</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figure</single>
       <multiple>figures</multiple>
@@ -265,8 +315,8 @@
       <multiple>folios</multiple>
     </term>
     <term name="issue">
-      <single>number</single>
-      <multiple>numbers</multiple>
+      <single>issue</single>
+      <multiple>issues</multiple>
     </term>
     <term name="line">
       <single>line</single>
@@ -284,10 +334,6 @@
       <single>page</single>
       <multiple>pages</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>page</single>
-      <multiple>pages</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraph</single>
       <multiple>paragraphs</multiple>
@@ -296,6 +342,14 @@
       <single>part</single>
       <multiple>parts</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>section</single>
       <multiple>sections</multiple>
@@ -304,6 +358,20 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <!-- A timestamp is a composite of hours, minutes, etc. and therefore has no default label. -->
+    <term name="timestamp"/>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verse</single>
       <multiple>verses</multiple>
@@ -314,46 +382,24 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <!-- Omitted short forms: act, timestamp -->
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
     <term name="book" form="short">
       <single>bk.</single>
       <multiple>bks.</multiple>
     </term>
+    <term name="canon" form="short">
+      <!-- Oxford Dictionary for Writers and Editors -->
+      <single>can.</single>
+      <multiple>cann.</multiple>
+    </term>
     <term name="chapter" form="short">
       <single>chap.</single>
       <multiple>chaps.</multiple>
@@ -362,6 +408,14 @@
       <single>col.</single>
       <multiple>cols.</multiple>
     </term>
+    <term name="elocation" form="short">
+      <single>loc.</single>
+      <multiple>locs.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>eq.</single>
+      <multiple>eqq.</multiple>
+    </term>
     <term name="figure" form="short">
       <single>fig.</single>
       <multiple>figs.</multiple>
@@ -390,10 +444,6 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">
       <single>para.</single>
       <multiple>paras.</multiple>
@@ -402,6 +452,15 @@
       <single>pt.</single>
       <multiple>pts.</multiple>
     </term>
+    <term name="rule" form="short">
+      <!-- legal abbreviations in the Oxford Guide to Style, sec. 13.2.1 -->
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">
       <single>sec.</single>
       <multiple>secs.</multiple>
@@ -410,6 +469,20 @@
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="title-locator" form="short">
+      <!-- Oxford Dictionary for Writers and Editors -->
+      <single>tit.</single>
+      <multiple>titt.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -419,7 +492,12 @@
       <multiple>vols.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="chapter" form="symbol">
+      <!-- caput/capita, esp. in legal works; cf. CMOS 14.196 -->
+      <single>c.</single>
+      <multiple>cc.</multiple>
+    </term>
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -429,15 +507,112 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="edition">
+      <single>edition</single>
+      <multiple>editions</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>note</single>
+      <multiple>notes</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">
+      <single>version</single>
+      <multiple>versions</multiple>
+    </term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="edition" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="first-reference-note-number" form="short">
+      <single>n.</single>
+      <multiple>nn.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <!-- Oxford Dictionary for Writers and Editors -->
+      <single>ptg.</single>
+      <multiple>ptgs.</multiple>
+    </term>
+    <term name="version" form="short">v.</term> <!-- no plural -->
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -446,6 +621,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -458,6 +653,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -466,6 +666,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -474,6 +675,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -482,141 +685,146 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
-    </term>
     <term name="translator">
       <single>translator</single>
       <multiple>translators</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor &amp; translator</single>
-      <multiple>editors &amp; translators</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, composer, container-author, guest, host, interviewer, original-author, recipient, reviewed-author
+    -->
+    <term name="collection-editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler" form="short">
       <single>comp.</single>
       <multiple>comps.</multiple>
     </term>
     <term name="contributor" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>contrib.</single>
       <multiple>contribs.</multiple>
     </term>
     <term name="curator" form="short">
+      <!-- Oxford Art Online <https://www.oxfordartonline.com/page/1661> -->
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; trans.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; trans.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="executive-producer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>narr.</single>
       <multiple>narrs.</multiple>
     </term>
     <term name="organizer" form="short">
+      <!-- possibly misleading: Oxford Dictionary of Abbreviations only defines this as organization or organized -->
       <single>org.</single>
       <multiple>orgs.</multiple>
     </term>
     <term name="performer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>perf.</single>
       <multiple>perfs.</multiple>
     </term>
     <term name="producer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
       <single>prod.</single>
       <multiple>prods.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>wrtr.</single>
+      <multiple>wrtrs.</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
-    <term name="translator" form="short">
-      <single>tran.</single>
-      <multiple>trans.</multiple>
-    </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; tran.</single>
-      <multiple>eds. &amp; trans.</multiple>
+      <single>ser. creator</single>
+      <multiple>ser. creators</multiple>
     </term>
+    <term name="translator" form="short">trans.</term> <!-- no plural -->
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="composer" form="verb">composed by</term>
+    <term name="container-author" form="verb">by</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">directed by</term>
+    <term name="editor" form="verb">edited by</term>
+    <term name="editor-translator" form="verb">edited &amp; translated by</term>
+    <term name="editortranslator" form="verb">edited &amp; translated by</term>
+    <term name="editorial-director" form="verb">edited by</term>
     <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
+    <term form="verb" name="guest">
+      <single>with guest</single>
+      <multiple>with guests</multiple>
+    </term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="interviewer" form="verb">interview by</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
+    <term name="original-author" form="verb">by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">edited by</term>
-    <term name="editorial-director" form="verb">edited by</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">interview by</term>
     <term name="recipient" form="verb">to</term>
     <term name="reviewed-author" form="verb">by</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">translated by</term>
-    <term name="editortranslator" form="verb">edited &amp; translated by</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, container-author, contributor, guest, host, interviewer, original-author, recipient, reviewed-author, series-creator
+    -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="composer" form="verb-short">comp. by</term> <!-- ODWE -->
+    <term name="curator" form="verb-short">cur. by</term> <!-- Oxford Art Online -->
     <term name="director" form="verb-short">dir. by</term>
     <term name="editor" form="verb-short">ed. by</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
     <term name="editorial-director" form="verb-short">ed. by</term>
-    <term name="illustrator" form="verb-short">illus. by</term>
+    <term name="executive-producer" form="verb-short">exec. prod. by</term> <!-- ODA -->
+    <term name="illustrator" form="verb-short">ill. by</term>
+    <term name="narrator" form="verb-short">narr. by</term> <!-- ODA -->
+    <term name="organizer" form="verb-short">org. by</term> <!-- ODA -->
+    <term name="performer" form="verb-short">perf. by</term> <!-- ODA -->
+    <term name="producer" form="verb-short">prod. by</term> <!-- ODA -->
+    <term name="script-writer" form="verb-short">writ. by</term> <!-- ODA -->
     <term name="translator" form="verb-short">trans. by</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">January</term>
@@ -633,15 +841,16 @@
     <term name="month-12">December</term>
 
     <!-- SHORT MONTH FORMS -->
+    <!-- Chicago Manual of Style, 18th ed., sec. 10.44 (identical to New Hart's Rules, 2nd ed., sec. 10.2.6) -->
     <term name="month-01" form="short">Jan.</term>
     <term name="month-02" form="short">Feb.</term>
     <term name="month-03" form="short">Mar.</term>
     <term name="month-04" form="short">Apr.</term>
     <term name="month-05" form="short">May</term>
-    <term name="month-06" form="short">Jun.</term>
-    <term name="month-07" form="short">Jul.</term>
+    <term name="month-06" form="short">June</term>
+    <term name="month-07" form="short">July</term>
     <term name="month-08" form="short">Aug.</term>
-    <term name="month-09" form="short">Sep.</term>
+    <term name="month-09" form="short">Sept.</term>
     <term name="month-10" form="short">Oct.</term>
     <term name="month-11" form="short">Nov.</term>
     <term name="month-12" form="short">Dec.</term>
diff --git a/locales/es-CL.xml b/locales/es-CL.xml
--- a/locales/es-CL.xml
+++ b/locales/es-CL.xml
@@ -6,7 +6,7 @@
       <uri>http://sadowsky.cl/</uri>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2013-10-28T13:57:31-04:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -15,31 +15,57 @@
     <date-part name="year"/>
   </date>
   <date form="numeric">
-    <date-part name="day" form="numeric-leading-zeros" suffix="/"/>
-    <date-part name="month" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+    <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">accedido</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">y</term>
+    <term name="and others">et&#160;al.</term>
+    <term name="anonymous">anónimo</term>
+    <term name="at">en</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">disponible en</term>
+    <term name="by">de</term>
+    <term name="circa">circa</term>
+    <term name="cited">citado</term>
+    <term name="et-al">et&#160;al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">en preparación</term>
+    <term name="from">a partir de</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">en</term>
+    <term name="in press">en imprenta</term>
+    <term name="internet">internet</term>
+    <term name="letter">carta</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">sin fecha</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">en línea</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">comunicación personal</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">presentado en</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>referencia</single>
+      <multiple>referencias</multiple>
+    </term>
+    <term name="retrieved">recuperado</term>
+    <term name="review-of">review of</term>
+    <term name="scale">escala</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -47,46 +73,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">accedido</term>
-    <term name="and">y</term>
-    <term name="and others">et&#160;al.</term>
-    <term name="anonymous">anónimo</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anón.</term>
-    <term name="at">en</term>
-    <term name="available at">disponible en</term>
-    <term name="by">de</term>
-    <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">citado</term>
-    <term name="edition">
-      <single>edición</single>
-      <multiple>ediciones</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
-    <term name="et-al">et&#160;al.</term>
-    <term name="forthcoming">en preparación</term>
-    <term name="from">a partir de</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">en</term>
-    <term name="in press">en imprenta</term>
-    <term name="internet">internet</term>
-    <term name="letter">carta</term>
-    <term name="no date">sin fecha</term>
     <term name="no date" form="short">s.&#160;f.</term>
-    <term name="online">en línea</term>
-    <term name="presented at">presentado en</term>
-    <term name="reference">
-      <single>referencia</single>
-      <multiple>referencias</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">recuperado</term>
-    <term name="scale">escala</term>
-    <term name="version">versión</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -151,6 +152,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">d.&#160;C.</term>
     <term name="bc">a.&#160;C.</term>
@@ -183,54 +192,26 @@
     <term name="long-ordinal-10">décima</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>libro</single>
       <multiple>libros</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>capítulo</single>
       <multiple>capítulos</multiple>
@@ -239,6 +220,14 @@
       <single>columna</single>
       <multiple>columnas</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figura</single>
       <multiple>figuras</multiple>
@@ -267,10 +256,6 @@
       <single>página</single>
       <multiple>páginas</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>página</single>
-      <multiple>páginas</multiple>
-    </term>
     <term name="paragraph">
       <single>párrafo</single>
       <multiple>párrafos</multiple>
@@ -279,6 +264,14 @@
       <single>parte</single>
       <multiple>partes</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>sección</single>
       <multiple>secciones</multiple>
@@ -287,6 +280,22 @@
       <single>sub voce</single>
       <multiple>sub vocibus</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verso</single>
       <multiple>versos</multiple>
@@ -297,45 +306,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">lib.</term>
+    <term name="chapter" form="short">cap.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">lib.</term>
-    <term name="chapter" form="short">cap.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">f.</term>
     <term name="issue" form="short">nº</term>
@@ -346,17 +335,37 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">párr.</term>
     <term name="part" form="short">pt.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sec.</term>
     <term name="sub-verbo" form="short">
       <single>s.&#160;v.</single>
       <multiple>s.&#160;vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -366,7 +375,7 @@
       <multiple>vols.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>§</single>
       <multiple>§</multiple>
@@ -376,15 +385,98 @@
       <multiple>§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="edition">
+      <single>edición</single>
+      <multiple>ediciones</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>nota</single>
+      <multiple>notas</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>página</single>
+      <multiple>páginas</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">versión</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">nº</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -393,6 +485,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directores</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor y traductor</single>
+      <multiple>editores y traductores</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor y traductor</single>
+      <multiple>editores y traductores</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>coordinador</single>
+      <multiple>coordinadores</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -405,6 +517,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>ilustrador</single>
+      <multiple>ilustradores</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -413,6 +530,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -421,6 +539,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -429,30 +549,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directores</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editores</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>coordinador</single>
-      <multiple>coordinadores</multiple>
-    </term>
-    <term name="illustrator">
-      <single>ilustrador</single>
-      <multiple>ilustradores</multiple>
-    </term>
     <term name="translator">
       <single>traductor</single>
       <multiple>traductores</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor y traductor</single>
-      <multiple>editores y traductores</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -467,10 +567,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. y trad.</single>
+      <multiple>eds. y trads.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. y trad.</single>
+      <multiple>eds. y trads.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>coord.</single>
+      <multiple>coords.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ilust.</single>
+      <multiple>ilusts.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -495,75 +619,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>coord.</single>
-      <multiple>coords.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ilust.</single>
-      <multiple>ilusts.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>trad.</single>
       <multiple>trads.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. y trad.</single>
-      <multiple>eds. y trads.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">de</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">dirigido por</term>
+    <term name="editor" form="verb">editado por</term>
+    <term name="editor-translator" form="verb">editado y traducido por</term>
+    <term name="editortranslator" form="verb">editado y traducido por</term>
+    <term name="editorial-director" form="verb">coordinado por</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">ilustrado por</term>
+    <term name="interviewer" form="verb">entrevistado por</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">de</term>
-    <term name="director" form="verb">dirigido por</term>
-    <term name="editor" form="verb">editado por</term>
-    <term name="editorial-director" form="verb">coordinado por</term>
-    <term name="illustrator" form="verb">ilustrado por</term>
-    <term name="interviewer" form="verb">entrevistado por</term>
     <term name="recipient" form="verb">a</term>
     <term name="reviewed-author" form="verb">por</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">traducido por</term>
-    <term name="editortranslator" form="verb">editado y traducido por</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">ed. y trad.</term>
+    <term name="editortranslator" form="verb-short">ed. y trad.</term>
+    <term name="editorial-director" form="verb-short">coord.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">ilust.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">coord.</term>
-    <term name="illustrator" form="verb-short">ilust.</term>
     <term name="translator" form="verb-short">trad.</term>
-    <term name="editortranslator" form="verb-short">ed. y trad.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">enero</term>
diff --git a/locales/es-ES.xml b/locales/es-ES.xml
--- a/locales/es-ES.xml
+++ b/locales/es-ES.xml
@@ -5,7 +5,7 @@
       <name>javimat</name>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,26 +19,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">accedido</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">y</term>
+    <term name="and others">y otros</term>
+    <term name="anonymous">anónimo</term>
+    <term name="at">en</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">disponible en</term>
+    <term name="by">de</term>
+    <term name="circa">circa</term>
+    <term name="cited">citado</term>
+    <term name="et-al">et&#160;al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">previsto</term>
+    <term name="from">a partir de</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">en</term>
+    <term name="in press">en imprenta</term>
+    <term name="internet">internet</term>
+    <term name="letter">carta</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">sin fecha</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">en línea</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
+    <term name="original-work-published">obra original publicada en</term>
     <term name="personal-communication">comunicación personal</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">presentado en</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>referencia</single>
+      <multiple>referencias</multiple>
+    </term>
+    <term name="retrieved">recuperado</term>
+    <term name="review-of">review of</term>
+    <term name="scale">escala</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -46,46 +72,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">accedido</term>
-    <term name="and">y</term>
-    <term name="and others">y otros</term>
-    <term name="anonymous">anónimo</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anón.</term>
-    <term name="at">en</term>
-    <term name="available at">disponible en</term>
-    <term name="by">de</term>
-    <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">citado</term>
-    <term name="edition">
-      <single>edición</single>
-      <multiple>ediciones</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
-    <term name="et-al">et&#160;al.</term>
-    <term name="forthcoming">previsto</term>
-    <term name="from">a partir de</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">en</term>
-    <term name="in press">en imprenta</term>
-    <term name="internet">internet</term>
-    <term name="letter">carta</term>
-    <term name="no date">sin fecha</term>
     <term name="no date" form="short">s.&#160;f.</term>
-    <term name="online">en línea</term>
-    <term name="presented at">presentado en</term>
-    <term name="reference">
-      <single>referencia</single>
-      <multiple>referencias</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">recuperado</term>
-    <term name="scale">escala</term>
-    <term name="version">versión</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -150,6 +151,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">d.&#160;C.</term>
     <term name="bc">a.&#160;C.</term>
@@ -182,54 +191,26 @@
     <term name="long-ordinal-10">décima</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>libro</single>
       <multiple>libros</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>capítulo</single>
       <multiple>capítulos</multiple>
@@ -238,6 +219,14 @@
       <single>columna</single>
       <multiple>columnas</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figura</single>
       <multiple>figuras</multiple>
@@ -266,10 +255,6 @@
       <single>página</single>
       <multiple>páginas</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>página</single>
-      <multiple>páginas</multiple>
-    </term>
     <term name="paragraph">
       <single>párrafo</single>
       <multiple>párrafos</multiple>
@@ -278,6 +263,14 @@
       <single>parte</single>
       <multiple>partes</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>sección</single>
       <multiple>secciones</multiple>
@@ -286,6 +279,22 @@
       <single>sub voce</single>
       <multiple>sub vocibus</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verso</single>
       <multiple>versos</multiple>
@@ -296,45 +305,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">lib.</term>
+    <term name="chapter" form="short">cap.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">lib.</term>
-    <term name="chapter" form="short">cap.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">f.</term>
     <term name="issue" form="short">n.º</term>
@@ -345,17 +334,37 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">párr.</term>
     <term name="part" form="short">pt.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sec.</term>
     <term name="sub-verbo" form="short">
       <single>s.&#160;v.</single>
       <multiple>s.&#160;vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -365,7 +374,7 @@
       <multiple>vols.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>§</single>
       <multiple>§</multiple>
@@ -375,15 +384,98 @@
       <multiple>§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="edition">
+      <single>edición</single>
+      <multiple>ediciones</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>nota</single>
+      <multiple>notas</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>página</single>
+      <multiple>páginas</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">versión</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">n.º</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -392,6 +484,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directores</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor y traductor</single>
+      <multiple>editores y traductores</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor y traductor</single>
+      <multiple>editores y traductores</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -404,6 +516,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>ilustrador</single>
+      <multiple>ilustradores</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -412,6 +529,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -420,6 +538,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -428,30 +548,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directores</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editores</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editores</multiple>
-    </term>
-    <term name="illustrator">
-      <single>ilustrador</single>
-      <multiple>ilustradores</multiple>
-    </term>
     <term name="translator">
       <single>traductor</single>
       <multiple>traductores</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor y traductor</single>
-      <multiple>editores y traductores</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -466,10 +566,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. y trad.</single>
+      <multiple>eds. y trads.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. y trad.</single>
+      <multiple>eds. y trads.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ilust.</single>
+      <multiple>ilusts.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -494,75 +618,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ilust.</single>
-      <multiple>ilusts.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>trad.</single>
       <multiple>trads.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. y trad.</single>
-      <multiple>eds. y trads.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">de</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">dirigido por</term>
+    <term name="editor" form="verb">editado por</term>
+    <term name="editor-translator" form="verb">editado y traducido por</term>
+    <term name="editortranslator" form="verb">editado y traducido por</term>
+    <term name="editorial-director" form="verb">editado por</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">ilustrado por</term>
+    <term name="interviewer" form="verb">entrevistado por</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">de</term>
-    <term name="director" form="verb">dirigido por</term>
-    <term name="editor" form="verb">editado por</term>
-    <term name="editorial-director" form="verb">editado por</term>
-    <term name="illustrator" form="verb">ilustrado por</term>
-    <term name="interviewer" form="verb">entrevistado por</term>
     <term name="recipient" form="verb">a</term>
     <term name="reviewed-author" form="verb">por</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">traducido por</term>
-    <term name="editortranslator" form="verb">editado y traducido por</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">ed. y trad.</term>
+    <term name="editortranslator" form="verb-short">ed. y trad.</term>
+    <term name="editorial-director" form="verb-short">ed.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">ilust.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">ilust.</term>
     <term name="translator" form="verb-short">trad.</term>
-    <term name="editortranslator" form="verb-short">ed. y trad.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">enero</term>
diff --git a/locales/es-MX.xml b/locales/es-MX.xml
--- a/locales/es-MX.xml
+++ b/locales/es-MX.xml
@@ -6,7 +6,7 @@
       <uri>https://www.mendeley.com/profiles/juan-ignacio-flores-salgado/</uri>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2015-06-13T13:57:31-04:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -20,26 +20,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">consultado</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">y</term>
+    <term name="and others">et&#160;al.</term>
+    <term name="anonymous">anónimo</term>
+    <term name="at">en</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">disponible en</term>
+    <term name="by">de</term>
+    <term name="circa">circa</term>
+    <term name="cited">citado</term>
+    <term name="et-al">et&#160;al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">en preparación</term>
+    <term name="from">a partir de</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">en</term>
+    <term name="in press">en imprenta</term>
+    <term name="internet">internet</term>
+    <term name="letter">carta</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">sin fecha</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">en línea</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
+    <term name="original-work-published">obra original publicada en</term>
     <term name="personal-communication">comunicación personal</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">presentado en</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>referencia</single>
+      <multiple>referencias</multiple>
+    </term>
+    <term name="retrieved">recuperado</term>
+    <term name="review-of">review of</term>
+    <term name="scale">escala</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -47,49 +73,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">consultado</term>
-    <term name="and">y</term>
-    <term name="and others">et&#160;al.</term>
-    <term name="anonymous">anónimo</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anón.</term>
-    <term name="at">en</term>
-    <term name="available at">disponible en</term>
-    <term name="by">de</term>
-    <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">citado</term>
-    <term name="edition">
-      <single>edición</single>
-      <multiple>ediciones</multiple>
-    </term>
-    <term name="edition" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="et-al">et&#160;al.</term>
-    <term name="forthcoming">en preparación</term>
-    <term name="from">a partir de</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">en</term>
-    <term name="in press">en imprenta</term>
-    <term name="internet">internet</term>
-    <term name="letter">carta</term>
-    <term name="no date">sin fecha</term>
     <term name="no date" form="short">s/f</term>
-    <term name="online">en línea</term>
-    <term name="presented at">presentado en</term>
-    <term name="reference">
-      <single>referencia</single>
-      <multiple>referencias</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">recuperado</term>
-    <term name="scale">escala</term>
-    <term name="version">versión</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -154,6 +152,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">d.&#160;C.</term>
     <term name="bc">a.&#160;C.</term>
@@ -188,54 +194,26 @@
     <term name="long-ordinal-10">décima</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>libro</single>
       <multiple>libros</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>capítulo</single>
       <multiple>capítulos</multiple>
@@ -244,6 +222,14 @@
       <single>columna</single>
       <multiple>columnas</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figura</single>
       <multiple>figuras</multiple>
@@ -272,10 +258,6 @@
       <single>página</single>
       <multiple>páginas</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>página</single>
-      <multiple>páginas</multiple>
-    </term>
     <term name="paragraph">
       <single>párrafo</single>
       <multiple>párrafos</multiple>
@@ -284,6 +266,14 @@
       <single>parte</single>
       <multiple>partes</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>sección</single>
       <multiple>secciones</multiple>
@@ -292,6 +282,22 @@
       <single>sub voce</single>
       <multiple>sub vocibus</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verso</single>
       <multiple>versos</multiple>
@@ -302,42 +308,14 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
     <term name="book" form="short">
       <single>lib.</single>
       <multiple>libs.</multiple>
@@ -350,6 +328,14 @@
       <single>col.</single>
       <multiple>cols.</multiple>
     </term>
+    <term name="elocation" form="short">
+      <single>loc.</single>
+      <multiple>locs.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>eq.</single>
+      <multiple>eqs.</multiple>
+    </term>
     <term name="figure" form="short">
       <single>fig.</single>
       <multiple>figs.</multiple>
@@ -378,10 +364,6 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">
       <single>párr.</single>
       <multiple>párrs.</multiple>
@@ -390,6 +372,14 @@
       <single>pt.</single>
       <multiple>pts.</multiple>
     </term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">
       <single>sec.</single>
       <multiple>secs.</multiple>
@@ -398,6 +388,22 @@
       <single>s.&#160;v.</single>
       <multiple>s.&#160;vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -407,7 +413,7 @@
       <multiple>vols.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶</multiple>
@@ -417,15 +423,107 @@
       <multiple>§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="edition">
+      <single>edición</single>
+      <multiple>ediciones</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>nota</single>
+      <multiple>notas</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>página</single>
+      <multiple>páginas</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">versión</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">
+      <single>núm.</single>
+      <multiple>núms.</multiple>
+    </term>
+    <term name="edition" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="first-reference-note-number" form="short">
+      <single>n.</single>
+      <multiple>nn.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -434,6 +532,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directores</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor y traductor</single>
+      <multiple>editores y traductores</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor y traductor</single>
+      <multiple>editores y traductores</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>coordinador</single>
+      <multiple>coordinadores</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -446,6 +564,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>ilustrador</single>
+      <multiple>ilustradores</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -454,6 +577,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -462,6 +586,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -470,30 +596,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directores</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editores</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>coordinador</single>
-      <multiple>coordinadores</multiple>
-    </term>
-    <term name="illustrator">
-      <single>ilustrador</single>
-      <multiple>ilustradores</multiple>
-    </term>
     <term name="translator">
       <single>traductor</single>
       <multiple>traductores</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor y traductor</single>
-      <multiple>editores y traductores</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -508,10 +614,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. y trad.</single>
+      <multiple>eds. y trads.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. y trad.</single>
+      <multiple>eds. y trads.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>coord.</single>
+      <multiple>coords.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ilust.</single>
+      <multiple>ilusts.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -536,75 +666,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>coord.</single>
-      <multiple>coords.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ilust.</single>
-      <multiple>ilusts.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>trad.</single>
       <multiple>trads.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. y trad.</single>
-      <multiple>eds. y trads.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">de</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">dirigido por</term>
+    <term name="editor" form="verb">editado por</term>
+    <term name="editor-translator" form="verb">editado y traducido por</term>
+    <term name="editortranslator" form="verb">editado y traducido por</term>
+    <term name="editorial-director" form="verb">coordinado por</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">ilustrado por</term>
+    <term name="interviewer" form="verb">entrevistado por</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">de</term>
-    <term name="director" form="verb">dirigido por</term>
-    <term name="editor" form="verb">editado por</term>
-    <term name="editorial-director" form="verb">coordinado por</term>
-    <term name="illustrator" form="verb">ilustrado por</term>
-    <term name="interviewer" form="verb">entrevistado por</term>
     <term name="recipient" form="verb">a</term>
     <term name="reviewed-author" form="verb">por</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">traducido por</term>
-    <term name="editortranslator" form="verb">editado y traducido por</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">ed. y trad.</term>
+    <term name="editortranslator" form="verb-short">ed. y trad.</term>
+    <term name="editorial-director" form="verb-short">coord.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">ilust.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">coord.</term>
-    <term name="illustrator" form="verb-short">ilust.</term>
     <term name="translator" form="verb-short">trad.</term>
-    <term name="editortranslator" form="verb-short">ed. y trad.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">enero</term>
diff --git a/locales/et-EE.xml b/locales/et-EE.xml
--- a/locales/et-EE.xml
+++ b/locales/et-EE.xml
@@ -3,9 +3,10 @@
   <info>
     <translator>
       <name>Andrew Dunning</name>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-04-29T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,26 +20,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">vaadatud</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">ja</term>
+    <term name="and others">ja teised</term>
+    <term name="anonymous">anonüümne</term>
+    <term name="at"/>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">kättesaadav aadressil</term>
+    <term name="by"/>
+    <term name="circa">umbes</term>
+    <term name="cited">tsiteeritud</term>
+    <term name="et-al">et al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">ilmumisel</term>
+    <term name="from"/>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in"/>
+    <term name="in press">trükis</term>
+    <term name="internet">internet</term>
+    <term name="letter">kiri</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">s.a.</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">online</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">isiklik suhtlus</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">esitatud</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>viide</single>
+      <multiple>viited</multiple>
+    </term>
+    <term name="retrieved">vaadatud</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scale</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -46,46 +73,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">vaadatud</term>
-    <term name="and">ja</term>
-    <term name="and others">ja teised</term>
-    <term name="anonymous">anonüümne</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anon</term>
-    <term name="at"></term>
-    <term name="available at">available at</term>
-    <term name="by"></term>
-    <term name="circa">umbes</term>
     <term name="circa" form="short">u</term>
-    <term name="cited">tsiteeritud</term>
-    <term name="edition">
-      <single>väljaanne</single>
-      <multiple>väljaanded</multiple>
-    </term>
-    <term name="edition" form="short">tr</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">ilmumisel</term>
-    <term name="from"></term>
-    <term name="ibid">ibid.</term>
-    <term name="in"></term>
-    <term name="in press">trükis</term>
-    <term name="internet">internet</term>
-    <term name="letter">kiri</term>
-    <term name="no date">s.a.</term>
     <term name="no date" form="short">s.a.</term>
-    <term name="online">online</term>
-    <term name="presented at">esitatud</term>
-    <term name="reference">
-      <single>viide</single>
-      <multiple>viited</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>viide</single>
       <multiple>viited</multiple>
     </term>
-    <term name="retrieved">salvestatud</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -150,6 +152,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">pKr</term>
     <term name="bc">eKr</term>
@@ -182,54 +192,26 @@
     <term name="long-ordinal-10">kümnes</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>raamat</single>
       <multiple>raamatud</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>peatükk</single>
       <multiple>peatükid</multiple>
@@ -238,6 +220,14 @@
       <single>veerg</single>
       <multiple>veerud</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>joonis</single>
       <multiple>joonised</multiple>
@@ -266,10 +256,6 @@
       <single>lehekülg</single>
       <multiple>leheküljed</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>lehekülg</single>
-      <multiple>leheküljed</multiple>
-    </term>
     <term name="paragraph">
       <single>lõik</single>
       <multiple>lõigud</multiple>
@@ -278,6 +264,14 @@
       <single>osa</single>
       <multiple>osad</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>alajaotis</single>
       <multiple>alajaotised</multiple>
@@ -286,6 +280,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>värss</single>
       <multiple>värsid</multiple>
@@ -296,45 +306,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">rmt</term>
+    <term name="chapter" form="short">ptk</term>
+    <term name="column" form="short">v</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">rmt</term>
-    <term name="chapter" form="short">ptk</term>
-    <term name="column" form="short">v</term>
     <term name="figure" form="short">joon</term>
     <term name="folio" form="short">f</term>
     <term name="issue" form="short">nr</term>
@@ -345,17 +335,37 @@
       <single>lk</single>
       <multiple>lk</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>lk</single>
-      <multiple>lk</multiple>
-    </term>
     <term name="paragraph" form="short">lõik</term>
     <term name="part" form="short">osa</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">alajaot.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v</single>
       <multiple>vv</multiple>
@@ -365,7 +375,7 @@
       <multiple>kd</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -375,15 +385,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>number</single>
+      <multiple>numbrid</multiple>
+    </term>
+    <term name="edition">
+      <single>väljaanne</single>
+      <multiple>väljaanded</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>viide</single>
+      <multiple>viited</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>lehekülg</single>
+      <multiple>leheküljed</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">nr</term>
+    <term name="edition" form="short">tr</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>lk</single>
+      <multiple>lk</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -392,6 +485,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>toimetaja</single>
+      <multiple>toimetajad</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>toimetaja &amp; tõlkija</single>
+      <multiple>toimetajad &amp; tõlkijad</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>toimetaja &amp; tõlkija</single>
+      <multiple>toimetajad &amp; tõlkijad</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>toimetaja</single>
+      <multiple>toimetajad</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -404,6 +517,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -412,6 +530,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -420,6 +539,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -428,30 +549,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>toimetaja</single>
-      <multiple>toimetajad</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>toimetaja</single>
-      <multiple>toimetajad</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
-    </term>
     <term name="translator">
       <single>tõlkija</single>
       <multiple>tõlkijad</multiple>
     </term>
-    <term name="editortranslator">
-      <single>toimetaja &amp; tõlkija</single>
-      <multiple>toimetajad &amp; tõlkijad</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -466,10 +567,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>toim</single>
+      <multiple>toim</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>toim &amp; tõlk</single>
+      <multiple>toim &amp; tõlk</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>toim &amp; tõlk</single>
+      <multiple>toim &amp; tõlk</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>toim</single>
+      <multiple>toim</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -494,75 +619,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>toim</single>
-      <multiple>toim</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>toim</single>
-      <multiple>toim</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>tõlk</single>
       <multiple>tõlk</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>toim &amp; tõlk</single>
-      <multiple>toim &amp; tõlk</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb"/>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">directed by</term>
+    <term name="editor" form="verb">toimetanud</term>
+    <term name="editor-translator" form="verb">toimetanud &amp; tõlkinud</term>
+    <term name="editortranslator" form="verb">toimetanud &amp; tõlkinud</term>
+    <term name="editorial-director" form="verb">toimetanud</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="interviewer" form="verb">intervjueerinud</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
+    <term name="recipient" form="verb"/>
+    <term name="reviewed-author" form="verb">by</term>
     <term name="script-writer" form="verb">written by</term>
     <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb"></term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">toimetanud</term>
-    <term name="editorial-director" form="verb">toimetanud</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">intervjueerinud</term>
-    <term name="recipient" form="verb"></term>
-    <term name="reviewed-author" form="verb">by</term>
     <term name="translator" form="verb">tõlkinud</term>
-    <term name="editortranslator" form="verb">toimetanud &amp; tõlkinud</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">toim</term>
+    <term name="editor-translator" form="verb-short">toim &amp; tõlk</term>
+    <term name="editortranslator" form="verb-short">toim &amp; tõlk</term>
+    <term name="editorial-director" form="verb-short">toim</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">toim</term>
-    <term name="editorial-director" form="verb-short">toim</term>
-    <term name="illustrator" form="verb-short">illus.</term>
     <term name="translator" form="verb-short">tõlk</term>
-    <term name="editortranslator" form="verb-short">toim &amp; tõlk</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">jaanuar</term>
diff --git a/locales/eu.xml b/locales/eu.xml
--- a/locales/eu.xml
+++ b/locales/eu.xml
@@ -4,14 +4,21 @@
     <translator>
       <name>Amaraun</name>
     </translator>
+    <translator>
+      <name>Miren BZ</name>
+    </translator>
+    <translator>
+      <name>Inigo Urrestarazu-Porta</name>
+      <email>inigo.urrestarazu@ehu.eus</email>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-09-10T12:40:00+02:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
     <date-part name="year" suffix="(e)ko "/>
     <date-part name="month" suffix="aren "/>
-    <date-part name="day" suffix="a"/>
+    <date-part name="day" suffix="(e)an"/>
   </date>
   <date form="numeric">
     <date-part name="year" suffix="/"/>
@@ -19,137 +26,146 @@
     <date-part name="day" form="numeric-leading-zeros"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">eskuratua</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">komunikazio pertsonala</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
-    <term name="accessed">eskuratua</term>
     <term name="and">eta</term>
     <term name="and others">eta beste</term>
     <term name="anonymous">ezezaguna</term>
-    <term name="anonymous" form="short">ezez.</term>
     <term name="at">-(e)n</term>
-    <term name="available at">available at</term>
+    <term name="audio-recording">audio grabazioa</term>
+    <term name="available at">-(e)n eskuragarri</term>
     <term name="by">-(e)k egina</term>
     <term name="circa">inguru</term>
-    <term name="circa" form="short">ing.</term>
     <term name="cited">aipatua</term>
-    <term name="edition">
-      <single>argitalpena</single>
-      <multiple>argitalpenak</multiple>
-    </term>
-    <term name="edition" form="short">arg.</term>
     <term name="et-al">et al.</term>
+    <term name="film">film</term>
     <term name="forthcoming">bidean</term>
-    <term name="from">-(e)tik</term>
+    <term name="from">hemendik</term>
+    <term name="henceforth">aurrerantzean</term>
     <term name="ibid">ibíd.</term>
     <term name="in">in</term>
-    <term name="in press">moldiztegian</term>
+    <term name="in press">inprimategian</term>
     <term name="internet">internet</term>
     <term name="letter">gutuna</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">datarik gabe</term>
-    <term name="no date" form="short">d. g.</term>
+    <term name="no-place">lekurik gabe</term>
+    <term name="no-publisher">argitaratzailerik ez</term> <!-- sine nomine -->
+    <term name="on">on</term>
     <term name="online">sarean</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">sortzeko lana hemen argitaratua</term>
+    <term name="personal-communication">komunikazio pertsonala</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcast atal</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">-(e)n aurkeztua</term>
+    <term name="radio-broadcast">irrati broadcast</term>
+    <term name="radio-series">irrati programa</term>
+    <term name="radio-series-episode">irratsaio</term>
     <term name="reference">
       <single>aipamena</single>
       <multiple>aipamenak</multiple>
     </term>
+    <term name="retrieved">berreskuratua</term>
+    <term name="review-of">-(e)n berrikuspena</term>
+    <term name="scale">eskala</term>
+    <term name="special-issue">ale berezi</term>
+    <term name="special-section">atal berezi</term>
+    <term name="television-broadcast">telebista broadcast</term>
+    <term name="television-series">telebista serie</term>
+    <term name="television-series-episode">telebistako seriearen atal</term>
+    <term name="video">bideoa</term>
+    <term name="working-paper">behin-behineko artikulu</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">ezez.</term>
+    <term name="circa" form="short">ing.</term>
+    <term name="no date" form="short">d. g.</term>
+    <term name="no-place" form="short">l. g.</term>
+    <term name="no-publisher" form="short">a. g.</term>
     <term name="reference" form="short">
       <single>aip.</single>
       <multiple>aip.</multiple>
     </term>
-    <term name="retrieved">berreskuratua</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">berrik.</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">artikulu</term>
+    <term name="article-journal">aldizkariko artikulu</term>
+    <term name="article-magazine">magazin artikulu</term>
+    <term name="article-newspaper">egunkari artikulu</term>
+    <term name="bill">lege</term>
     <!-- book is in the list of locator terms -->
     <term name="broadcast">broadcast</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">klasiko</term>
+    <term name="collection">bilduma</term>
+    <term name="dataset">datu multzo</term>
+    <term name="document">fitxategia</term>
+    <term name="entry">sarrera</term>
+    <term name="entry-dictionary">hiztegi sarrera</term>
+    <term name="entry-encyclopedia">entziklopedia sarrera</term>
+    <term name="event">gertaera</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">grafikoa</term>
+    <term name="hearing">bista</term>
     <term name="interview">elkarrizketa</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="legal_case">auzi</term>
+    <term name="legislation">araudi</term>
+    <term name="manuscript">eskuizkribu</term>
+    <term name="map">mapa</term>
+    <term name="motion_picture">bideo grabazio</term>
+    <term name="musical_score">partitura</term>
+    <term name="pamphlet">liburuxka</term>
+    <term name="paper-conference">biltzar paper</term>
+    <term name="patent">patente</term>
+    <term name="performance">emankizun</term>
+    <term name="periodical">aldizkako</term>
     <term name="personal_communication">komunikazio pertsonala</term>
     <term name="post">post</term>
     <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
+    <term name="regulation">araudi</term>
+    <term name="report">txosten</term>
+    <term name="review">berrikuspen</term>
+    <term name="review-book">liburu erreseina</term>
     <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="song">abesti</term>
+    <term name="speech">aurkezpen</term>
+    <term name="standard">estandar</term>
+    <term name="thesis">tesi</term>
+    <term name="treaty">itun</term>
+    <term name="webpage">web orri</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
+    <term name="article-journal" form="short">aldizkari art.</term>
     <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-newspaper" form="short">egunkari art.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">dok.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="graphic" form="short">graf.</term>
+    <term name="interview" form="short">elk.</term>
+    <term name="manuscript" form="short">eskuiz.</term>
+    <term name="motion_picture" form="short">bideo grab.</term>
+    <term name="report" form="short">txost.</term>
+    <term name="review" form="short">berrik.</term>
+    <term name="review-book" form="short">lib. berrik.</term>
+    <term name="song" form="short">abest.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">-(e)n bista</term>
+    <term name="review" form="verb">-(e)n berrikuspen</term>
+    <term name="review-book" form="verb">liburuaren berrikuspen</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">K.a.</term>
     <term name="bc">K.o.</term>
@@ -170,7 +186,7 @@
     <term name="ordinal">.</term>
 
     <!-- LONG ORDINALS -->
-    <term name="long-ordinal-01">lehengo</term>
+    <term name="long-ordinal-01">lehenengo</term>
     <term name="long-ordinal-02">bigarren</term>
     <term name="long-ordinal-03">hirugarren</term>
     <term name="long-ordinal-04">laugarren</term>
@@ -182,54 +198,26 @@
     <term name="long-ordinal-10">hamargarren</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>atal</single>
+      <multiple>atal</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>eranskin</single>
+      <multiple>eranskin</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>artikulu</single>
+      <multiple>artikulu</multiple>
     </term>
     <term name="book">
       <single>liburua</single>
       <multiple>liburuak</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canon</multiple>
+    </term>
     <term name="chapter">
       <single>kapitulua</single>
       <multiple>kapituluak</multiple>
@@ -238,6 +226,14 @@
       <single>zutabea</single>
       <multiple>zutabeak</multiple>
     </term>
+    <term name="elocation">
+      <single>kokapen</single>
+      <multiple>kokapen</multiple>
+    </term>
+    <term name="equation">
+      <single>ekuazio</single>
+      <multiple>ekuazio</multiple>
+    </term>
     <term name="figure">
       <single>irudia</single>
       <multiple>irudiak</multiple>
@@ -266,10 +262,6 @@
       <single>orrialdea</single>
       <multiple>orrialdeak</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>orrialdea</single>
-      <multiple>orrialdeak</multiple>
-    </term>
     <term name="paragraph">
       <single>paragrafoa</single>
       <multiple>paragrafoak</multiple>
@@ -278,6 +270,14 @@
       <single>zatia</single>
       <multiple>zatiak</multiple>
     </term>
+    <term name="rule">
+      <single>arau</single> 
+      <multiple>arau</multiple>
+    </term>
+    <term name="scene">
+      <single>eszena</single>
+      <multiple>eszena</multiple>
+    </term>
     <term name="section">
       <single>atala</single>
       <multiple>atalak</multiple>
@@ -286,86 +286,102 @@
       <single>sub voce</single>
       <multiple>sub vocem</multiple>
     </term>
+    <term name="supplement">
+      <single>eranskin</single>
+      <multiple>eranskin</multiple>
+    </term>
+    <term name="table">
+      <single>taula</single>
+      <multiple>taula</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>izenburu</single>
+      <multiple>izenburu</multiple>
+    </term>
     <term name="verse">
       <single>bertsoa</single>
       <multiple>bertsoak</multiple>
     </term>
     <term name="volume">
-      <single>luburikia</single>
-      <multiple>luburukiak</multiple>
+      <single>liburukia</single>
+      <multiple>liburukiak</multiple>
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
+    <term name="appendix" form="short">
+      <single>er.</single>
+      <multiple>er.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+      <multiple>art.</multiple>
     </term>
     <term name="book" form="short">lib.</term>
     <term name="chapter" form="short">kap.</term>
     <term name="column" form="short">zut.</term>
+    <term name="elocation" form="short">
+      <single>kok.</single>
+      <multiple>kok.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>ek.</single>
+      <multiple>ek.</multiple>
+    </term>
     <term name="figure" form="short">iru.</term>
     <term name="folio" form="short">or.</term>
     <term name="issue" form="short">zenb.</term>
     <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
-    <term name="opus" form="short">op.</term>
+    <term name="note" form="short">oh.</term>
+    <term name="opus" form="short">ob.</term>
     <term name="page" form="short">
       <single>or.</single>
       <multiple>or.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>or.</single>
-      <multiple>or.</multiple>
-    </term>
     <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">zt.</term>
+    <term name="rule" form="short">
+      <single>ar.</single>
+      <multiple>ar.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>esz.</single>
+      <multiple>esz.</multiple>
+    </term>
     <term name="section" form="short">atal.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.v.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>er.</single>
+      <multiple>er.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>taula</single>
+      <multiple>taula</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>iz.</single>
+      <multiple>iz.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>b.</single>
-      <multiple>bb.</multiple>
+      <multiple>b.</multiple>
     </term>
     <term name="volume" form="short">
       <single>libk.</single>
       <multiple>libk.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -375,213 +391,312 @@
       <multiple>§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>kapitulu</single>
+      <multiple>kapitulu</multiple>
+    </term>
+    <term name="citation-number">
+      <single>aipamen</single>
+      <multiple>aipamen</multiple>
+    </term>
+    <term name="collection-number">
+      <single>zenbakia</single>
+      <multiple>zenbakiak</multiple>
+    </term>
+    <term name="edition">
+      <single>argitalpena</single>
+      <multiple>argitalpenak</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>oharra</single>
+      <multiple>oharrak</multiple>
+    </term>
+    <term name="number">
+      <single>zenbaki</single>
+      <multiple>zenbaki</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>orrialdea</single>
+      <multiple>orrialdeak</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>liburuki</single>
+      <multiple>liburuki</multiple>
+    </term>
+    <term name="page-first">
+      <single>orri</single>
+      <multiple>orri</multiple>
+    </term>
+    <term name="printing">
+      <single>inprimazio</single>
+      <multiple>inprimazio</multiple>
+    </term>
+    <term name="version">bertsioa</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>kap.</single>
+      <multiple>kap.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>aip.</single>
+      <multiple>aip.</multiple>
+    </term>
+    <term name="collection-number" form="short">zenb.</term>
+    <term name="edition" form="short">arg.</term>
+    <term name="first-reference-note-number" form="short">oh.</term>
+    <term name="number" form="short">
+      <single>zbk.</single>
+      <multiple>zbk.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>or.</single>
+      <multiple>or.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>liburuki</single>
+      <multiple>liburuki</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>or.</single>
+      <multiple>or.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>inpr.</single>
+      <multiple>inpr.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+      <single>arduradun</single>
+      <multiple>arduradun</multiple>
     </term>
+    <term name="collection-editor">
+      <single>arg.</single>
+      <multiple>arg.</multiple>
+    </term>
     <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+      <single>biltzaile</single>
+      <multiple>biltzaile</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+      <single>laguntzaile</single>
+      <multiple>laguntzaile</multiple>
     </term>
     <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+      <single>arduradun</single>
+      <multiple>arduradun</multiple>
     </term>
+    <term name="director">
+      <single>zuzendari</single>
+      <multiple>zuzendari</multiple>
+    </term>
+    <term name="editor">
+      <single>argitaratzailea</single>
+      <multiple>argitaratzaileak</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>argitaratzaile eta itzultzailea</single>
+      <multiple>argitaratzaile eta itzultzaileak</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>argitaratzaile eta itzultzailea</single>
+      <multiple>argitaratzaile eta itzultzaileak</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>argitaratzailea</single>
+      <multiple>argitaratzaileak</multiple>
+    </term>
     <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+      <single>ekoizle exekutibo</single>
+      <multiple>ekoizle exekutibo</multiple>
     </term>
     <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+      <single>gonbidatu</single>
+      <multiple>gonbidatu</multiple>
     </term>
     <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+      <single>anfitrioi</single>
+      <multiple>anfitrioi</multiple>
     </term>
+    <term name="illustrator">
+      <single>irudigile</single>
+      <multiple>irudigile</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+      <single>esatari</single>
+      <multiple>esatari</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>antolatzaile</single>
+      <multiple>antolatzaile</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+      <single>interpretatzaile</single>
+      <multiple>interpretatzaile</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>ekoizle</single>
+      <multiple>ekoizle</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>idazle</single>
+      <multiple>idazle</multiple>
     </term>
     <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
-    </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>argitaratzailea</single>
-      <multiple>argitaratzaileak</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>argitaratzailea</single>
-      <multiple>argitaratzaileak</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
+      <single>seriearen sortzaile</single>
+      <multiple>seriaren sortzaile</multiple>
     </term>
     <term name="translator">
       <single>itzultzailea</single>
       <multiple>itzultzaileak</multiple>
     </term>
-    <term name="editortranslator">
-      <single>argitaratzaile eta itzultzailea</single>
-      <multiple>argitaratzaile eta itzultzaileak</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+      <single>biltz.</single>
+      <multiple>biltz.</multiple>
     </term>
     <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <single>laguntz.</single>
+      <multiple>laguntz.</multiple>
     </term>
     <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
+      <single>ard.</single>
+      <multiple>ard.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>zuz.</single>
+      <multiple>zuz.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>arg.</single>
+      <multiple>arg.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>arg. eta itzul.</single>
+      <multiple>arg. eta itzul.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>arg. eta itzul.</single>
+      <multiple>arg. eta itzul.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>arg.</single>
+      <multiple>arg.</multiple>
+    </term>
     <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <single>exek. ek.</single>
+      <multiple>exek. ek.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>irudig.</single>
+      <multiple>irudig.</multiple>
+    </term>
     <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
+      <single>esat.</single>
+      <multiple>esat.</multiple>
     </term>
     <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
+      <single>ant.</single>
+      <multiple>ant.</multiple>
     </term>
     <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+      <single>interpret.</single>
+      <multiple>interpret.</multiple>
     </term>
     <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
+      <single>ek.</single>
+      <multiple>ek.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>id.</single>
+      <multiple>id.</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>arg.</single>
-      <multiple>arg.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>arg.</single>
-      <multiple>arg.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
+      <single>sort.</single>
+      <multiple>sort.</multiple>
     </term>
     <term name="translator" form="short">
       <single>itzul.</single>
       <multiple>itzul.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>arg. eta itzul.</single>
-      <multiple>arg. eta itzul.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb"></term>
-    <term name="director" form="verb">directed by</term>
+    <term name="chair" form="verb">-(e)k gidatua</term>
+    <term name="collection-editor" form="verb">-(e)k argitaratua</term>
+    <term name="compiler" form="verb">-(e)k bildua</term>
+    <term name="container-author" form="verb"/>
+    <term name="contributor" form="verb">-(e)kin</term>
+    <term name="curator" form="verb">-(r)en ardurapean</term>
+    <term name="director" form="verb">-(e)k zuzendua</term>
     <term name="editor" form="verb">-(e)k argitaratua</term>
+    <term name="editor-translator" form="verb">-(e)k argitaratu eta itzulia</term>
+    <term name="editortranslator" form="verb">-(e)k argitaratu eta itzulia</term>
     <term name="editorial-director" form="verb">-(e)k argitaratua</term>
-    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="executive-producer" form="verb">-(r)en ekoizpen exekutiboa</term>
+    <term name="guest" form="verb">gonbidatuarekin</term>
+    <term name="host" form="verb">anfitrioi</term>
+    <term name="illustrator" form="verb">-(r)en irudiak</term>
     <term name="interviewer" form="verb">-(e)k elkarrizketatua</term>
+    <term name="narrator" form="verb">esatari</term>
+    <term name="organizer" form="verb">-(e)k antolatua</term>
+    <term name="performer" form="verb">-(e)k egina</term>
+    <term name="producer" form="verb">-(e)k ekoitzia</term>
     <term name="recipient" form="verb">-(r)entzat</term>
-    <term name="reviewed-author" form="verb">by</term>
+    <term name="reviewed-author" form="verb">-(e)k berrikusia</term>
+    <term name="script-writer" form="verb">-(e)k idatzia</term>
+    <term name="series-creator" form="verb">-(e)k sortua</term>
     <term name="translator" form="verb">-(e)k itzulia</term>
-    <term name="editortranslator" form="verb">-(e)k argitaratu eta itzulia</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
+    <term name="collection-editor" form="verb-short">-(e)k arg.</term>
+    <term name="compiler" form="verb-short">-(e)k bild.</term>
+    <term name="contributor" form="verb-short">-(r)ekin</term>
+    <term name="curator" form="verb-short">-(e)n ard.</term>
+    <term name="director" form="verb-short">zuz.</term>
     <term name="editor" form="verb-short">arg.</term>
+    <term name="editor-translator" form="verb-short">-(e)k arg. eta itzul.</term>
+    <term name="editortranslator" form="verb-short">-(e)k arg. eta itzul.</term>
     <term name="editorial-director" form="verb-short">arg.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
+    <term name="executive-producer" form="verb-short">-(r)en ek. exek.</term>
+    <term name="guest" form="verb-short">gonb.arekin</term>
+    <term name="host" form="verb-short">anf.</term>
+    <term name="illustrator" form="verb-short">-(r)en irud.</term>
+    <term name="narrator" form="verb-short">esat.</term>
+    <term name="organizer" form="verb-short">-(e)k ant.</term>
+    <term name="performer" form="verb-short">-(e)k eg.</term>
+    <term name="producer" form="verb-short">-(e)k ek.</term>
+    <term name="script-writer" form="verb-short">-(e)k id.</term>
+    <term name="series-creator" form="verb-short">-(e)k sor.</term>
     <term name="translator" form="verb-short">itzul.</term>
-    <term name="editortranslator" form="verb-short">-(e)k arg. eta itzul.</term>
 
     <!-- LONG MONTH FORMS -->
-    <term name="month-01">urtarrilak</term>
-    <term name="month-02">otsailak</term>
-    <term name="month-03">martxoak</term>
-    <term name="month-04">apirilak</term>
-    <term name="month-05">maiatzak</term>
-    <term name="month-06">ekainak</term>
-    <term name="month-07">uztailak</term>
-    <term name="month-08">abuztuak</term>
-    <term name="month-09">irailak</term>
-    <term name="month-10">urriak</term>
-    <term name="month-11">azaroak</term>
-    <term name="month-12">abenduak</term>
+    <term name="month-01">urtarrila</term>
+    <term name="month-02">otsaila</term>
+    <term name="month-03">martxoa</term>
+    <term name="month-04">apirila</term>
+    <term name="month-05">maiatza</term>
+    <term name="month-06">ekaina</term>
+    <term name="month-07">uztaila</term>
+    <term name="month-08">abuztua</term>
+    <term name="month-09">iraila</term>
+    <term name="month-10">urria</term>
+    <term name="month-11">azaroa</term>
+    <term name="month-12">abendua</term>
 
     <!-- SHORT MONTH FORMS -->
     <term name="month-01" form="short">urt.</term>
     <term name="month-02" form="short">ots.</term>
-    <term name="month-03" form="short">martx.</term>
+    <term name="month-03" form="short">mar.</term>
     <term name="month-04" form="short">apr.</term>
     <term name="month-05" form="short">mai.</term>
     <term name="month-06" form="short">eka.</term>
diff --git a/locales/fa-IR.xml b/locales/fa-IR.xml
--- a/locales/fa-IR.xml
+++ b/locales/fa-IR.xml
@@ -8,7 +8,7 @@
       <name>abdealikhurrum</name>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="true"/>
   <date form="text">
@@ -22,26 +22,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">دسترسی</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">و</term>
+    <term name="and others">و دیگران</term>
+    <term name="anonymous">ناشناس</term>
+    <term name="at">در</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">قابل دسترس در</term>
+    <term name="by">توسط</term>
+    <term name="circa">تقریباً</term>
+    <term name="cited">ارجاع شده</term>
+    <term name="et-al">و همکاران</term>
     <term name="film">film</term>
+    <term name="forthcoming">در دست انتشار</term>
+    <term name="from">از</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">همان</term>
+    <term name="in">در</term>
+    <term name="in press">زیر چاپ</term>
+    <term name="internet">اینترنت</term>
+    <term name="letter">نامه</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">بدون تاریخ</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">آنلاین</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">ارتباط شخصی</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">ارائه شده در</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>مرجع</single>
+      <multiple>مراجع</multiple>
+    </term>
+    <term name="retrieved">retrieved</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scale</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -49,46 +75,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">دسترسی</term>
-    <term name="and">و</term>
-    <term name="and others">و دیگران</term>
-    <term name="anonymous">ناشناس</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">ناشناس</term>
-    <term name="at">در</term>
-    <term name="available at">قابل دسترس در</term>
-    <term name="by">توسط</term>
-    <term name="circa">تقریباً</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">ارجاع شده</term>
-    <term name="edition">
-      <single>ویرایش</single>
-      <multiple>ویرایش‌های</multiple>
-    </term>
-    <term name="edition" form="short">ویرایش</term>
-    <term name="et-al">و همکاران</term>
-    <term name="forthcoming">در دست انتشار</term>
-    <term name="from">از</term>
-    <term name="ibid">همان</term>
-    <term name="in">در</term>
-    <term name="in press">زیر چاپ</term>
-    <term name="internet">اینترنت</term>
-    <term name="letter">نامه</term>
-    <term name="no date">بدون تاریخ</term>
     <term name="no date" form="short">بدون تاریخ</term>
-    <term name="online">آنلاین</term>
-    <term name="presented at">ارائه شده در</term>
-    <term name="reference">
-      <single>مرجع</single>
-      <multiple>مراجع</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>مرجع</single>
       <multiple>مراجع</multiple>
     </term>
-    <term name="retrieved">retrieved</term>
-    <term name="scale">scale</term>
-    <term name="version">نسخه</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -153,6 +154,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">بعد از میلاد</term>
     <term name="bc">قبل از میلاد</term>
@@ -170,7 +179,7 @@
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal"></term>
+    <term name="ordinal"/>
 
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">اول</term>
@@ -185,54 +194,26 @@
     <term name="long-ordinal-10">دهم</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>کتاب</single>
       <multiple>کتاب‌های</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>فصل</single>
       <multiple>فصل‌های</multiple>
@@ -241,6 +222,14 @@
       <single>ستون</single>
       <multiple>ستون‌های</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>تصویر</single>
       <multiple>تصاویر</multiple>
@@ -269,10 +258,6 @@
       <single>صفحه</single>
       <multiple>صفحات</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>صفحه</single>
-      <multiple>صفحات</multiple>
-    </term>
     <term name="paragraph">
       <single>پاراگراف</single>
       <multiple>پاراگراف‌های</multiple>
@@ -281,6 +266,14 @@
       <single>بخش</single>
       <multiple>بخش‌های</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>قسمت</single>
       <multiple>قسمت‌های</multiple>
@@ -289,6 +282,22 @@
       <single>در ذیلِ واژه</single>
       <multiple>در ذیلِ واژه‌های</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>بیت</single>
       <multiple>بیت‌های</multiple>
@@ -299,45 +308,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">کتاب</term>
+    <term name="chapter" form="short">فصل</term>
+    <term name="column" form="short">ستون</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">کتاب</term>
-    <term name="chapter" form="short">فصل</term>
-    <term name="column" form="short">ستون</term>
     <term name="figure" form="short">تصویر</term>
     <term name="folio" form="short">برگ</term>
     <term name="issue" form="short">ش</term>
@@ -348,17 +337,37 @@
       <single>ص</single>
       <multiple>صص</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>ص</single>
-      <multiple>صص</multiple>
-    </term>
     <term name="paragraph" form="short">پاراگراف</term>
     <term name="part" form="short">بخش</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">قسمت</term>
     <term name="sub-verbo" form="short">
       <single>s.v</single>
       <multiple>s.vv</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>بیت</single>
       <multiple>ابیات</multiple>
@@ -368,7 +377,7 @@
       <multiple>جج</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -378,15 +387,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>شماره</single>
+      <multiple>شماره‌های</multiple>
+    </term>
+    <term name="edition">
+      <single>ویرایش</single>
+      <multiple>ویرایش‌های</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>یادداشت</single>
+      <multiple>یادداشت‌های</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>صفحه</single>
+      <multiple>صفحات</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">نسخه</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">ش</term>
+    <term name="edition" form="short">ویرایش</term>
+    <term name="first-reference-note-number" form="short">یادداشت</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>ص</single>
+      <multiple>صص</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -395,6 +487,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>ویراستار</single>
+      <multiple>ویراستاران</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>ویراستار و مترجم</single>
+      <multiple>ویراستاران و مترجمین</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>ویراستار و مترجم</single>
+      <multiple>ویراستاران و مترجمین</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>ویراستار</single>
+      <multiple>ویراستاران</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -407,6 +519,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>طراح گرافیک</single>
+      <multiple>طراحان گرافیک</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -415,6 +532,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -423,6 +541,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -431,30 +551,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>ویراستار</single>
-      <multiple>ویراستاران</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>ویراستار</single>
-      <multiple>ویراستاران</multiple>
-    </term>
-    <term name="illustrator">
-      <single>طراح گرافیک</single>
-      <multiple>طراحان گرافیک</multiple>
-    </term>
     <term name="translator">
       <single>مترجم</single>
       <multiple>مترجمین</multiple>
     </term>
-    <term name="editortranslator">
-      <single>ویراستار و مترجم</single>
-      <multiple>ویراستاران و مترجمین</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -469,10 +569,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ویراستار</single>
+      <multiple>ویراستاران</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ویراستار و مترجم</single>
+      <multiple>ویراستاران و مترجمین</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ویراستار و مترجم</single>
+      <multiple>ویراستاران و مترجمین</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ویراستار</single>
+      <multiple>ویراستاران</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>تصویرگر</single>
+      <multiple>تصویرگران</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -497,75 +621,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ویراستار</single>
-      <multiple>ویراستاران</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ویراستار</single>
-      <multiple>ویراستاران</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>تصویرگر</single>
-      <multiple>تصویرگران</multiple>
-    </term>
     <term name="translator" form="short">
       <single>مترجم</single>
       <multiple>مترجمین</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ویراستار و مترجم</single>
-      <multiple>ویراستاران و مترجمین</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">توسط</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">زیر نظر</term>
+    <term name="editor" form="verb">ویراسته‌ی</term>
+    <term name="editor-translator" form="verb">ترجمه و ویراسته‌ی</term>
+    <term name="editortranslator" form="verb">ترجمه و ویراسته‌ی</term>
+    <term name="editorial-director" form="verb">ویراسته‌ی</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">طراحی گرافیکی از</term>
+    <term name="interviewer" form="verb">مصاحبه توسط</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">توسط</term>
-    <term name="director" form="verb">زیر نظر</term>
-    <term name="editor" form="verb">ویراسته‌ی</term>
-    <term name="editorial-director" form="verb">ویراسته‌ی</term>
-    <term name="illustrator" form="verb">طراحی گرافیکی از</term>
-    <term name="interviewer" form="verb">مصاحبه توسط</term>
     <term name="recipient" form="verb">به</term>
     <term name="reviewed-author" form="verb">بازبینی توسط</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">ترجمه‌ی</term>
-    <term name="editortranslator" form="verb">ترجمه و ویراسته‌ی</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ویراسته‌ی</term>
+    <term name="editor-translator" form="verb-short">ترجمه و ویراسته‌ی</term>
+    <term name="editortranslator" form="verb-short">ترجمه و ویراسته‌ی</term>
+    <term name="editorial-director" form="verb-short">ویراسته‌ی</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">طراحی از</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ویراسته‌ی</term>
-    <term name="editorial-director" form="verb-short">ویراسته‌ی</term>
-    <term name="illustrator" form="verb-short">طراحی از</term>
     <term name="translator" form="verb-short">ترجمه‌ی</term>
-    <term name="editortranslator" form="verb-short">ترجمه و ویراسته‌ی</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">ژانویه</term>
diff --git a/locales/fi-FI.xml b/locales/fi-FI.xml
--- a/locales/fi-FI.xml
+++ b/locales/fi-FI.xml
@@ -13,8 +13,17 @@
     <translator>
       <name>Juhana Venäläinen</name>
     </translator>
+    <translator>
+      <name>Tuomas Hietala</name>
+    </translator>
+    <translator>
+      <name>Luukas Pörtfors</name>
+    </translator>
+    <translator>
+      <name>Piia Bartos</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-10-19T03:24:01+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -28,142 +37,151 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">henkilökohtainen viestintä</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">viitattu</term>
+    <term name="advance-online-publication">ennakkoverkkojulkaisu</term>
+    <term name="album">albumi</term>
     <term name="and">ja</term>
     <term name="and others">ym.</term>
     <term name="anonymous">tuntematon</term>
-    <term name="anonymous" form="short">tuntematon</term>
     <term name="at">osoitteessa</term>
+    <term name="audio-recording">äänite</term>
     <term name="available at">saatavissa</term>
     <term name="by">tekijä</term>
     <term name="circa">noin</term>
-    <term name="circa" form="short">n.</term>
     <term name="cited">viitattu</term>
-    <term name="edition">
-      <single>painos</single>
-      <multiple>painokset</multiple>
-    </term>
-    <term name="edition" form="short">p.</term>
     <term name="et-al">ym.</term>
+    <term name="film">video</term>
     <term name="forthcoming">tulossa</term>
     <term name="from">osoitteesta</term>
+    <term name="henceforth">vastedes</term>
     <term name="ibid">mt.</term>
     <term name="in">teoksessa</term>
     <term name="in press">painossa</term>
     <term name="internet">internet</term>
     <term name="letter">kirje</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">ei päivämäärää</term>
-    <term name="no date" form="short">ei pvm.</term>
+    <term name="no-place">ei paikkaa</term>
+    <term name="no-publisher">ei julkaisijaa</term> <!-- sine nomine -->
+    <term name="on">on</term> <!-- there is no Finnish equivalent for this -->
     <term name="online">verkossa</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">alkuperäinen julkaisu</term>
+    <term name="personal-communication">henkilökohtainen viestintä</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcastin jakso</term>
+    <term name="preprint">esijulkaisu</term>
     <term name="presented at">esitetty tilaisuudessa</term>
+    <term name="radio-broadcast">radiolähetys</term>
+    <term name="radio-series">radiosarja</term>
+    <term name="radio-series-episode">radiosarjan jakso</term>
     <term name="reference">
       <single>viittaus</single>
       <multiple>viittaukset</multiple>
     </term>
+    <term name="retrieved">noudettu</term>
+    <term name="review-of">review of</term>
+    <term name="scale">mittakaava</term>
+    <term name="special-issue">erikoisnumero</term>
+    <term name="special-section">erikoisosa</term>
+    <term name="television-broadcast">televisiolähetys</term>
+    <term name="television-series">televisiosarja</term>
+    <term name="television-series-episode">televisiosarjan jakso</term>
+    <term name="video">video</term>
+    <term name="working-paper">valmisteluasiakirja</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">tuntematon</term>
+    <term name="circa" form="short">n.</term>
+    <term name="no date" form="short">ei pvm.</term>
+    <term name="no-place" form="short">ei paik.</term>
+    <term name="no-publisher" form="short">ei julk.</term>
     <term name="reference" form="short">
       <single>viit.</single>
       <multiple>viit.</multiple>
     </term>
-    <term name="retrieved">noudettu</term>
-    <term name="scale">mittakaava</term>
-    <term name="version">versio</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article-journal">lehtijulkaisu</term>
+    <term name="article-magazine">aikakauslehtijulkaisu</term>
+    <term name="article-newspaper">sanomalehtijulkaisu</term>
+    <term name="bill">lakialoite</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">lähetys</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">klassikko</term>
+    <term name="collection">kokoelma</term>
+    <term name="dataset">tietoaineisto</term>
+    <term name="document">asiakirja</term>
+    <term name="entry">merkintä</term>
+    <term name="entry-dictionary">sanakirjan hakusana-artikkeli</term>
+    <term name="entry-encyclopedia">tietosanakirjan artikkeli</term>
+    <term name="event">tapahtuma</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">piirros</term>
+    <term name="hearing">kuuleminen</term>
     <term name="interview">haastattelu</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="legal_case">oikeustapaus</term>
+    <term name="legislation">lainsäädäntö</term>
+    <term name="manuscript">käsikirjoitus</term>
+    <term name="map">kartta</term>
+    <term name="motion_picture">videotallenne</term>
+    <term name="musical_score">musiikki</term>
+    <term name="pamphlet">pamfletti</term>
+    <term name="paper-conference">konferenssijulkaisu</term>
+    <term name="patent">patentti</term>
+    <term name="performance">esitys</term>
+    <term name="periodical">aikakausjulkaisu</term>
     <term name="personal_communication">henkilökohtainen viestintä</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">viesti</term>
+    <term name="post-weblog">blogikirjoitus</term>
+    <term name="regulation">säännös</term>
+    <term name="report">raportti</term>
+    <term name="review">arvostelu</term>
+    <term name="review-book">kirja-arvostelu</term>
+    <term name="software">ohjelmisto</term>
+    <term name="song">äänite</term>
+    <term name="speech">esitys</term>
+    <term name="standard">standardi</term>
+    <term name="thesis">opinnäyte</term> <!-- in Finnish the names of thesis depends on the level (MSc, PhD etc), this is the general term -->
+    <term name="treaty">traktaatti</term>
+    <term name="webpage">verkkosivu</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">lehtijulk.</term>
+    <term name="article-magazine" form="short">aikakauslehtijulk.</term>
+    <term name="article-newspaper" form="short">sanomalehtijulk.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">asiak.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="graphic" form="short">piir.</term>
+    <term name="interview" form="short">haast.</term>
+    <term name="manuscript" form="short">käsik.</term>
+    <term name="motion_picture" form="short">videonauh.</term>
+    <term name="report" form="short">rap.</term>
+    <term name="review" form="short">arv.</term>
+    <term name="review-book" form="short">kirja-arv.</term>
+    <term name="song" form="short">äänit.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">todistajanlausunto</term>
+    <term name="review" form="verb">arvostelu</term>
+    <term name="review-book" form="verb">kirja-arvostelu</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">jaa.</term>
-    <term name="bc">eaa.</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="ad">jKr.</term>
+    <term name="bc">eKr.</term>
+    <term name="bce">eaa.</term>
+    <term name="ce">jaa.</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">”</term>
@@ -191,54 +209,26 @@
     <term name="long-ordinal-10">kymmenes</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>näytös</single>
+      <multiple>näytökset</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>liite</single>
+      <multiple>liitteet</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>julkaisu</single>
+      <multiple>julkaisu</multiple>
     </term>
     <term name="book">
       <single>kirja</single>
       <multiple>kirjat</multiple>
     </term>
+    <term name="canon">
+      <single>kaanon</single>
+      <multiple>kaanonit</multiple>
+    </term>
     <term name="chapter">
       <single>luku</single>
       <multiple>luvut</multiple>
@@ -247,9 +237,17 @@
       <single>palsta</single>
       <multiple>palstat</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>yhtälö</single>
+      <multiple>yhtälöt</multiple>
+    </term>
     <term name="figure">
-      <single>kuvio</single>
-      <multiple>kuviot</multiple>
+      <single>kuva</single>
+      <multiple>kuvat</multiple>
     </term>
     <term name="folio">
       <single>folio</single>
@@ -275,10 +273,6 @@
       <single>sivu</single>
       <multiple>sivut</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>sivu</single>
-      <multiple>sivut</multiple>
-    </term>
     <term name="paragraph">
       <single>kappale</single>
       <multiple>kappaleet</multiple>
@@ -287,6 +281,14 @@
       <single>osa</single>
       <multiple>osat</multiple>
     </term>
+    <term name="rule">
+      <single>sääntö</single>
+      <multiple>säännöt</multiple>
+    </term>
+    <term name="scene">
+      <single>kohtaus</single>
+      <multiple>kohtaukset</multiple>
+    </term>
     <term name="section">
       <single>osa</single>
       <multiple>osat</multiple>
@@ -295,55 +297,51 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>liite</single>
+      <multiple>liitteet</multiple>
+    </term>
+    <term name="table">
+      <single>taulukko</single>
+      <multiple>taulukot</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>otsikko</single>
+      <multiple>otsikot</multiple>
+    </term>
     <term name="verse">
       <single>säkeistö</single>
       <multiple>säkeistöt</multiple>
     </term>
     <term name="volume">
-      <single>vuosikerta</single>
-      <multiple>vuosikerrat</multiple>
+      <single>volyymi</single>
+      <multiple>volyymit</multiple>
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
+    <term name="appendix" form="short">
+      <single>liitt.</single>
+      <multiple>liitt.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
-      <single>art.</single>
-      <multiple>arts.</multiple>
+    <term name="article-locator" form="short">
+      <single>julk.</single>
+      <multiple>julk.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">kirja</term>
+    <term name="chapter" form="short">luku</term>
+    <term name="column" form="short">palsta</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="equation" form="short">
+      <single>kaav.</single>
+      <multiple>kaav.</multiple>
     </term>
-    <term name="book" form="short">kirja</term>
-    <term name="chapter" form="short">luku</term>
-    <term name="column" form="short">palsta</term>
     <term name="figure" form="short">kuv.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">nro</term>
@@ -354,27 +352,47 @@
       <single>s.</single>
       <multiple>ss.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>s.</single>
-      <multiple>ss.</multiple>
-    </term>
     <term name="paragraph" form="short">kappale</term>
     <term name="part" form="short">osa</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">osa</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>liitt.</single>
+      <multiple>liitt.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>taul.</single>
+      <multiple>taul.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>ots.</single>
+      <multiple>ots.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>säk.</single>
       <multiple>säk.</multiple>
     </term>
     <term name="volume" form="short">
-      <single>vsk.</single>
-      <multiple>vsk.</multiple>
+      <single>vuos.</single>
+      <multiple>vuos.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -384,59 +402,109 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>luku</single>
+      <multiple>luvut</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>viite</single>
+      <multiple>viitteet</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>numero</single>
+      <multiple>numerot</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>painos</single>
+      <multiple>painokset</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>viite</single>
+      <multiple>viitteet</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>numero</single>
+      <multiple>numerot</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>sivumäärä</single>
+      <multiple>sivumäärät</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>vuosikerta</single>
+      <multiple>vuosikerrat</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>sivu</single>
+      <multiple>sivut</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>tuloste</single>
+      <multiple>tulosteet</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">versio</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>kapp.</single>
+      <multiple>kapp.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>viitt.</single>
+      <multiple>viitt.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">nro</term>
+    <term name="edition" form="short">p.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>viitt.</single>
+      <multiple>viitt.</multiple>
     </term>
+    <term name="number" form="short">
+      <single>nro.</single>
+      <multiple>nro:t</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>s.</single>
+      <multiple>ss.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vuosik.</single>
+      <multiple>vuosik.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>s.</single>
+      <multiple>ss.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>tulost.</single>
+      <multiple>tulost.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>puheenjohtaja</single>
+      <multiple>puheenjohtaja</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>toim.</single>
+      <multiple>toim.</multiple>
+    </term>
+    <term name="compiler">
+      <single>laatija</single>
+      <multiple>laatijat</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>avustaja</single>
+      <multiple>avustajat</multiple>
+    </term>
+    <term name="curator">
+      <single>kuraattori</single>
+      <multiple>kuraattorit</multiple>
+    </term>
     <term name="director">
       <single>ohjaaja</single>
       <multiple>ohjaajat</multiple>
@@ -445,26 +513,70 @@
       <single>toimittaja</single>
       <multiple>toimittajat</multiple>
     </term>
+    <term name="editor-translator">
+      <single>toimittaja ja kääntäjä</single>
+      <multiple>toimittajat ja kääntäjät</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>toimittaja ja kääntäjä</single>
+      <multiple>toimittajat ja kääntäjät</multiple>
+    </term>
     <term name="editorial-director">
       <single>toimittaja</single>
       <multiple>toimittajat</multiple>
     </term>
+    <term name="executive-producer">
+      <single>tuotannonjohtaja</single>
+      <multiple>tuotannonjohtajat</multiple>
+    </term>
+    <term name="guest">
+      <single>vieras</single>
+      <multiple>vieraat</multiple>
+    </term>
+    <term name="host">
+      <single>juontaja</single>
+      <multiple>juontajat</multiple>
+    </term>
     <term name="illustrator">
       <single>kuvittaja</single>
       <multiple>kuvittajat</multiple>
     </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>kertoja</single>
+      <multiple>kertojat</multiple>
+    </term>
+    <term name="organizer">
+      <single>järjestäjä</single>
+      <multiple>järjestäjät</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>esittäjä</single>
+      <multiple>esittäjät</multiple>
+    </term>
+    <term name="producer">
+      <single>tuottaja</single>
+      <multiple>tuottajat</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>käsikirjoittaja</single>
+      <multiple>käsikirjoittajat</multiple>
+    </term>
+    <term name="series-creator">
+      <single>sarjan luoja</single>
+      <multiple>sarjan luojat</multiple>
+    </term>
     <term name="translator">
       <single>kääntäjä</single>
       <multiple>kääntäjät</multiple>
     </term>
-    <term name="editortranslator">
-      <single>toimittaja ja kääntäjä</single>
-      <multiple>toimittajat ja kääntäjät</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
-      <single>comp.</single>
+      <single>.</single>
       <multiple>comps.</multiple>
     </term>
     <term name="contributor" form="short">
@@ -475,34 +587,6 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
-    <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
-    </term>
-    <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
-    </term>
-    <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
-    </term>
-    <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
-    </term>
-    <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
-    </term>
-    <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
-    </term>
-    <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
     <term name="director" form="short">
       <single>ohj.</single>
       <multiple>ohj.</multiple>
@@ -511,67 +595,103 @@
       <single>toim.</single>
       <multiple>toim.</multiple>
     </term>
+    <term name="editor-translator" form="short">
+      <single>toim. ja käänt.</single>
+      <multiple>toim. ja käänt.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>toim. ja käänt.</single>
+      <multiple>toim. ja käänt.</multiple>
+    </term>
     <term name="editorial-director" form="short">
       <single>toim.</single>
       <multiple>toim.</multiple>
     </term>
+    <term name="executive-producer" form="short">
+      <single>tuotannonjoht.</single>
+      <multiple>tuotannonjoht.</multiple>
+    </term>
     <term name="illustrator" form="short">
       <single>kuv.</single>
       <multiple>kuv.</multiple>
     </term>
+    <term name="narrator" form="short">
+      <single>kert.</single>
+      <multiple>kert.</multiple>
+    </term>
+    <term name="organizer" form="short">
+      <single>järj.</single>
+      <multiple>järj.</multiple>
+    </term>
+    <term name="performer" form="short">
+      <single>esitt.</single>
+      <multiple>esitt.</multiple>
+    </term>
+    <term name="producer" form="short">
+      <single>tuott.</single>
+      <multiple>tuott.</multiple>
+    </term>
+    <term name="script-writer" form="short">
+      <single>käsik.</single>
+      <multiple>käsik.</multiple>
+    </term>
+    <term name="series-creator" form="short">
+      <single>luoj.</single>
+      <multiple>luoj.</multiple>
+    </term>
     <term name="translator" form="short">
       <single>käänt.</single>
       <multiple>käänt.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>toim. ja käänt.</single>
-      <multiple>toim. ja käänt.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb"></term>
+    <term name="chair" form="verb">puheenjohtajana</term>
+    <term name="collection-editor" form="verb">toimittanut</term>
+    <term name="compiler" form="verb">laatinut</term>
+    <term name="container-author" form="verb"/>
+    <term name="contributor" form="verb">avustanut</term>
+    <term name="curator" form="verb">kuratoinut</term>
     <term name="director" form="verb">ohjannut</term>
     <term name="editor" form="verb">toimittanut</term>
+    <term name="editor-translator" form="verb">toimittanut ja kääntänyt</term>
+    <term name="editortranslator" form="verb">toimittanut ja kääntänyt</term>
     <term name="editorial-director" form="verb">toimittanut</term>
-    <term name="illustrator" form="verb">kuvittanut</term>
-    <term name="interviewer" form="verb">haastatellut</term>
+    <term name="executive-producer" form="verb">tuotantoa johtanut</term>
+    <term name="guest" form="verb">vieraana</term>
+    <term name="host" form="verb">juontajana</term>
+    <term name="illustrator" form="verb">kuvittajana</term>
+    <term name="interviewer" form="verb">haastattelijana</term>
+    <term name="narrator" form="verb">kertojana</term>
+    <term name="organizer" form="verb">järjestänyt</term>
+    <term name="performer" form="verb">esittänyt</term>
+    <term name="producer" form="verb">tuottanut</term>
     <term name="recipient" form="verb">vastaanottaja</term>
-    <term name="reviewed-author" form="verb"></term>
+    <term name="reviewed-author" form="verb"/>
+    <term name="script-writer" form="verb">käsikirjoittanut</term>
+    <term name="series-creator" form="verb">luonut</term>
     <term name="translator" form="verb">kääntänyt</term>
-    <term name="editortranslator" form="verb">toimittanut ja kääntänyt</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">koonn.</term>
+    <term name="compiler" form="verb-short">laat.</term>
+    <term name="contributor" form="verb-short">laat.</term>
+    <term name="curator" form="verb-short">laat.</term>
     <term name="director" form="verb-short">ohj.</term>
     <term name="editor" form="verb-short">toim.</term>
+    <term name="editor-translator" form="verb-short">toim. ja käänt.</term>
+    <term name="editortranslator" form="verb-short">toim. ja käänt.</term>
     <term name="editorial-director" form="verb-short">toim.</term>
+    <term name="executive-producer" form="verb-short">tuot.joht.</term>
+    <term name="guest" form="verb-short">vier.</term>
+    <term name="host" form="verb-short">juont.</term>
     <term name="illustrator" form="verb-short">kuv.</term>
+    <term name="narrator" form="verb-short">kert.</term>
+    <term name="organizer" form="verb-short">järj.</term>
+    <term name="performer" form="verb-short">esitt.</term>
+    <term name="producer" form="verb-short">tuott.</term>
+    <term name="script-writer" form="verb-short">käsik.</term>
+    <term name="series-creator" form="verb-short">luon.</term>
     <term name="translator" form="verb-short">käänt.</term>
-    <term name="editortranslator" form="verb-short">toim. ja käänt.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">tammikuuta</term>
diff --git a/locales/fr-CA.xml b/locales/fr-CA.xml
--- a/locales/fr-CA.xml
+++ b/locales/fr-CA.xml
@@ -4,8 +4,11 @@
     <translator>
       <name>Grégoire Colly</name>
     </translator>
+    <translator>
+      <name>Collectif Zotero francophone</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2025-10-18T05:52:36+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false" limit-day-ordinals-to-day-1="true"/>
   <date form="text">
@@ -19,142 +22,201 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">communication personnelle</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">consulté le</term>
+    <term name="advance-online-publication">publication en ligne anticipée</term>
+    <term name="album">album</term>
     <term name="and">et</term>
     <term name="and others">et autres</term>
     <term name="anonymous">anonyme</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">sur</term>
-    <term name="available at">disponible à</term>
+    <term name="audio-recording">enregistrement audio</term>
+    <term name="available at">disponible sur</term>
     <term name="by">par</term>
     <term name="circa">vers</term>
-    <term name="circa" form="short">v.</term>
     <term name="cited">cité</term>
-    <term name="edition" gender="feminine">
-      <single>édition</single>
-      <multiple>éditions</multiple>
-    </term>
-    <term name="edition" form="short">éd.</term>
     <term name="et-al">et al.</term>
+    <term name="film">film</term>
     <term name="forthcoming">à paraître</term>
     <term name="from">à l'adresse</term>
+    <term name="henceforth">désormais</term>
     <term name="ibid">ibid.</term>
-    <term name="in">dans</term>
+    <term name="in">dans</term> <!-- different from fr-FR -->
     <term name="in press">sous presse</term>
     <term name="internet">Internet</term>
     <term name="letter">lettre</term>
+    <term name="loc-cit">loc.&#160;cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">sans date</term>
-    <term name="no date" form="short">s.&#160;d.</term>
+    <term name="no-place">sans lieu</term>
+    <term name="no-publisher">sans nom</term> <!-- sine nomine -->
+    <term name="on">sur</term>
     <term name="online">en ligne</term>
+    <term name="op-cit">op.&#160;cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">édition originale</term>
+    <term name="personal-communication">communication personnelle</term>
+    <term name="podcast">balladodiffusion</term> <!-- different from fr-FR -->
+    <term name="podcast-episode">épisode de balladodiffusion</term> <!-- different from fr-FR -->
+    <term name="preprint">prépublication</term>
     <term name="presented at">présenté à</term>
+    <term name="radio-broadcast">émission de radio</term>
+    <term name="radio-series">série radiophonique</term>
+    <term name="radio-series-episode">épisode de série radiophonique</term>
     <term name="reference">
       <single>référence</single>
       <multiple>références</multiple>
     </term>
+    <term name="retrieved">consulté</term>
+    <term name="review-of">recension de</term>
+    <term name="scale">échelle</term>
+    <term name="special-issue">numéro spécial</term>
+    <term name="special-section">section spéciale</term>
+    <term name="television-broadcast">émission de télévision</term>
+    <term name="television-series">série télévisée</term>
+    <term name="television-series-episode">épisode de série télévisée</term>
+    <term name="video">vidéo</term>
+    <term name="working-paper">document de travail</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <!-- Omitted short forms: accessed, album, and (symbol), and others, at (symbol), forthcoming, henceforth, ibid, in, in press, internet, loc-cit, on, online, op-cit, podcast, preprint, presented at -->
+
+    <term name="advance-online-publication" form="short">publ. en ligne antic.</term>
+    <term name="anonymous" form="short">anon.</term>
+    <term name="audio-recording" form="short">enr. audio</term>
+    <term name="available at" form="short">dispo. sur</term>
+    <term name="circa" form="short">v.</term>
+    <term name="cited" form="short">cité</term>
+    <term name="film" form="short">film</term>
+    <term name="from" form="short">à l'adr.</term>
+    <term name="letter" form="short">let.</term>
+    <term name="no date" form="short">s.&#160;d.</term>
+    <term name="no-place" form="short">s.&#160;l.</term>
+    <term name="no-publisher" form="short">s.&#160;n.</term>
+    <term name="original-work-published" form="short">éd. orig.</term>
+    <term name="personal-communication" form="short">comm. perso.</term>
+    <term name="podcast-episode" form="short">épis. de ballado.</term> <!-- different from fr-FR -->
+    <term name="radio-broadcast" form="short">émiss. de radio</term>
+    <term name="radio-series-episode" form="short">épis. de série radio</term>
     <term name="reference" form="short">
       <single>réf.</single>
       <multiple>réf.</multiple>
     </term>
-    <term name="retrieved">consulté</term>
-    <term name="scale">échelle</term>
-    <term name="version">version</term>
+    <term name="retrieved" form="short">consulté</term>
+    <term name="review-of" form="short">recens. de</term>
+    <term name="scale" form="short">éch.</term>
+    <term name="special-issue" form="short">nᵒ spéc.</term>
+    <term name="special-section" form="short">sect. spéc.</term>
+    <term name="television-broadcast" form="short">émiss. de TV</term>
+    <term name="television-series" form="short">série TV</term>
+    <term name="television-series-episode" form="short">épis. de série TV</term>
+    <term name="video" form="short">vidéo</term>
+    <term name="working-paper" form="short">doc. de travail</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+    <term name="and" form="symbol">&amp;</term>
+    <term name="at" form="symbol">@</term>
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">article</term>
+    <term name="article-journal">article de revue</term>
+    <term name="article-magazine">article de magazine</term>
+    <term name="article-newspaper">article de presse</term>
+    <term name="bill">projet de loi</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">émission</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
+    <term name="classic">classique</term>
     <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
+    <term name="dataset">jeu de données</term>
     <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="entry">entrée</term>
+    <term name="entry-dictionary">entrée de dictionnaire</term>
+    <term name="entry-encyclopedia">entrée d'encyclopédie</term>
+    <term name="event">événement</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">image</term>
+    <term name="hearing">audience</term>
     <term name="interview">entretien</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
+    <term name="legal_case">affaire</term>
+    <term name="legislation">acte juridique</term>
+    <term name="manuscript">manuscrit</term>
+    <term name="map">carte</term>
+    <term name="motion_picture">enregistrement vidéo</term>
+    <term name="musical_score">partition musicale</term>
     <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="paper-conference">article de colloque</term>
+    <term name="patent">brevet</term>
+    <term name="performance">interprétation</term>
+    <term name="periodical">périodique</term>
     <term name="personal_communication">communication personnelle</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">billet</term>
+    <term name="post-weblog">billet de blogue</term> <!-- different from fr-FR -->
+    <term name="regulation">règlement</term>
+    <term name="report">rapport</term>
+    <term name="review">recension</term>
+    <term name="review-book">recension de livre</term>
+    <term name="software">logiciel</term>
+    <term name="song">chanson</term>
+    <term name="speech">présentation</term>
+    <term name="standard">norme</term>
+    <term name="thesis">thèse</term>
+    <term name="treaty">traité</term>
+    <term name="webpage">page web</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <!-- Omitted short forms: article, bill, entry, event, hearing, map, periodical, speech, treaty -->
+    <term name="article-journal" form="short">art. de revue</term>
+    <term name="article-magazine" form="short">art. de mag.</term>
+    <term name="article-newspaper" form="short">art. de presse</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
+    <term name="classic" form="short">class.</term>
+    <term name="collection" form="short">coll.</term>
     <term name="document" form="short">doc.</term>
+    <term name="entry-dictionary" form="short">entrée de dict.</term>
+    <term name="entry-encyclopedia" form="short">entrée d'encycl.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="graphic" form="short">img.</term>
+    <term name="interview" form="short">entret.</term>
+    <term name="legal_case" form="short">aff.</term>
+    <term name="legislation" form="short">acte jurid.</term>
+    <term name="manuscript" form="short">
+      <single>ms.</single>
+      <multiple>mss.</multiple>
+    </term>
+    <term name="motion_picture" form="short">enr. vidéo</term>
+    <term name="musical_score" form="short">partit. music.</term>
+    <term name="pamphlet" form="short">pamph.</term>
+    <term name="paper-conference" form="short">art. de conf.</term>
+    <term name="patent" form="short">brevet</term>
+    <term name="performance" form="short">interprét.</term>
+    <term name="personal_communication" form="short">comm. perso.</term>
+    <term name="regulation" form="short">règl.</term>
+    <term name="report" form="short">rapp.</term>
+    <term name="review" form="short">recens.</term>
+    <term name="review-book" form="short">recens. de livre</term>
+    <term name="software" form="short">logic.</term>
+    <term name="song" form="short">enr. audio</term>
+    <term name="standard" form="short">norme</term>
+    <term name="thesis" form="short">thèse</term>
+    <term name="webpage" form="short">p. web</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">témoignage de</term>
+    <term name="review" form="verb">recension</term>
+    <term name="review-book" form="verb">recension de livre</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb-short">témoign. de</term> <!-- ODA -->
+    <term name="review" form="verb-short">recens. de</term>
+    <term name="review-book" form="verb-short">recens. de livre</term>
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">apr. J.-C.</term>
     <term name="bc">av. J.-C.</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="bce">av. n. è.</term>
+    <term name="ce">n. è.</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">«&#160;</term>
@@ -162,13 +224,13 @@
     <term name="open-inner-quote">“</term>
     <term name="close-inner-quote">”</term>
     <term name="page-range-delimiter">&#8209;</term> <!-- non-breaking hyphen -->
-    <term name="colon">:</term>
+    <term name="colon">&#160;:</term>
     <term name="comma">,</term>
-    <term name="semicolon">;</term>
+    <term name="semicolon">&#160;;</term>
 
     <!-- ORDINALS -->
     <term name="ordinal">ᵉ</term>
-   	<term name="ordinal-01" gender-form="feminine" match="whole-number">ʳᵉ</term>
+    <term name="ordinal-01" gender-form="feminine" match="whole-number">ʳᵉ</term>
     <term name="ordinal-01" gender-form="masculine" match="whole-number">ᵉʳ</term>
 
     <!-- LONG ORDINALS -->
@@ -184,54 +246,26 @@
     <term name="long-ordinal-10">dixième</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
+    <term name="act">
+      <single>acte</single>
+      <multiple>actes</multiple>
     </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
+    <term name="appendix">
+      <single>appendice</single>
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>livre</single>
       <multiple>livres</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>chapitre</single>
       <multiple>chapitres</multiple>
@@ -240,6 +274,14 @@
       <single>colonne</single>
       <multiple>colonnes</multiple>
     </term>
+    <term name="elocation">
+      <single>emplacement</single>
+      <multiple>emplacements</multiple>
+    </term>
+    <term name="equation">
+      <single>équation</single>
+      <multiple>équations</multiple>
+    </term>
     <term name="figure">
       <single>figure</single>
       <multiple>figures</multiple>
@@ -268,10 +310,6 @@
       <single>page</single>
       <multiple>pages</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>page</single>
-      <multiple>pages</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraphe</single>
       <multiple>paragraphes</multiple>
@@ -280,6 +318,14 @@
       <single>partie</single>
       <multiple>parties</multiple>
     </term>
+    <term name="rule">
+      <single>règle</single>
+      <multiple>règles</multiple>
+    </term>
+    <term name="scene">
+      <single>scène</single>
+      <multiple>scènes</multiple>
+    </term>
     <term name="section">
       <single>section</single>
       <multiple>sections</multiple>
@@ -288,6 +334,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplément</single>
+      <multiple>suppléments</multiple>
+    </term>
+    <term name="table">
+      <single>tableau</single>
+      <multiple>tableaux</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>titre</single>
+      <multiple>titres</multiple>
+    </term>
     <term name="verse">
       <single>verset</single>
       <multiple>versets</multiple>
@@ -298,46 +360,43 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
+    <!-- Omitted short forms: act, timestamp -->
+    <term name="appendix" form="short">
+      <single>append.</single>
+      <multiple>append.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
-      <multiple>arts.</multiple>
+      <multiple>art.</multiple>
     </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
+    <term name="book" form="short">
+      <single>livre</single>
+      <multiple>livres</multiple>
     </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
+    <term name="canon" form="short">
+      <single>can.</single>
+      <multiple>can.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
+    <term name="chapter" form="short">
+      <single>chap.</single>
+      <multiple>chap.</multiple>
     </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
+    <term name="column" form="short">
+      <single>col.</single>
+      <multiple>col.</multiple>
     </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
+    <term name="elocation" form="short">
+      <single>emplact</single>
+      <multiple>emplact</multiple>
     </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="equation" form="short">
+      <single>eqt.</single>
+      <multiple>eqt.</multiple>
     </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="figure" form="short">
+      <single>fig.</single>
+      <multiple>fig.</multiple>
     </term>
-    <term name="book" form="short">liv.</term>
-    <term name="chapter" form="short">chap.</term>
-    <term name="column" form="short">col.</term>
-    <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">
       <single>fᵒ</single>
       <multiple>fᵒˢ</multiple>
@@ -346,24 +405,62 @@
       <single>nᵒ</single>
       <multiple>nᵒˢ</multiple>
     </term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
-    <term name="opus" form="short">op.</term>
+    <term name="line" form="short">
+      <single>l.</single>
+      <multiple>l.</multiple>
+    </term>
+    <term name="note" form="short">
+      <single>n.</single>
+      <multiple>n.</multiple>
+    </term>
+    <term name="opus" form="short">
+      <single>op.</single>
+      <multiple>op.</multiple>
+    </term>
     <term name="page" form="short">
       <single>p.</single>
       <multiple>p.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>p.</multiple>
+    <term name="paragraph" form="short">
+      <single>paragr.</single>
+      <multiple>paragr.</multiple>
     </term>
-    <term name="paragraph" form="short">paragr.</term>
-    <term name="part" form="short">part.</term>
-    <term name="section" form="short">sect.</term>
+    <term name="part" form="short">
+      <single>part.</single>
+      <multiple>part.</multiple>
+    </term>
+    <term name="rule" form="short">
+      <single>règle</single>
+      <multiple>règles</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>sc.</multiple>
+    </term>
+    <term name="section" form="short">
+      <single>sect.</single>
+      <multiple>sect.</multiple>
+    </term>
     <term name="sub-verbo" form="short">
       <single>s.&#160;v.</single>
-      <multiple>s.&#160;vv.</multiple>
+      <multiple>s.&#160;v.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>suppl.</single>
+      <multiple>suppl.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tab.</single>
+      <multiple>tab.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tit.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
@@ -373,7 +470,12 @@
       <multiple>vol.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="chapter" form="symbol">
+      <!-- caput/capita, esp. in legal works; cf. CMOS 14.196 -->
+      <single>c.</single>
+      <multiple>c.</multiple>
+    </term>
     <term name="paragraph" form="symbol">
       <single>§</single>
       <multiple>§</multiple>
@@ -383,194 +485,322 @@
       <multiple>§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapitre</single>
+      <multiple>chapitres</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number" gender="masculine">
+      <single>numéro</single>
+      <multiple>numéros</multiple>
+    </term>
+    <term name="edition" gender="feminine">
+      <single>édition</single>
+      <multiple>éditions</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>référence</single>
+      <multiple>références</multiple>
+    </term>
+    <term name="number">
+      <single>numéro</single>
+      <multiple>numéros</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>impression</single>
+      <multiple>impressions</multiple>
+    </term>
+    <term name="version">
+      <single>version</single>
+      <multiple>versions</multiple>
+    </term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chap.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cit.</multiple>
+    </term>
+    <term name="collection-number" form="short">
+     <single>nᵒ</single>
+      <multiple>nᵒˢ</multiple>
+    </term>
+    <term name="edition" form="short">
+      <single>éd.</single>
+      <multiple>éd.</multiple>
+    </term>
+    <term name="first-reference-note-number" form="short">
+      <single>réf.</single>
+      <multiple>réf.</multiple>
+    </term>
+    <term name="number" form="short">
+     <single>nᵒ</single>
+     <multiple>nᵒˢ</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>p.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vol.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>p.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>impr.</single>
+      <multiple>impr.</multiple>
+    </term>
+    <term name="version" form="short">v.</term> <!-- no plural -->
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+      <single>président</single>
+      <multiple>présidents</multiple>
     </term>
+    <term name="collection-editor">
+      <single>directeur</single>
+      <multiple>directeurs</multiple>
+    </term>
     <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+      <single>compilateur</single>
+      <multiple>compilateurs</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+      <single>contributeur</single>
+      <multiple>contributeurs</multiple>
     </term>
     <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+      <single>commissaire</single>
+      <multiple>commissaires</multiple>
     </term>
+    <term name="director">
+      <single>réalisateur</single>
+      <multiple>réalisateurs</multiple>
+    </term>
+    <term name="editor"> <!-- different from fr-FR -->
+      <single>directeur scientifique</single>
+      <multiple>directeurs scientifiques</multiple>
+    </term>
+    <term name="editor-translator"> <!-- different from fr-FR -->
+      <single>directeur scientifique et traducteur</single>
+      <multiple>directeurs scientifiques et traducteurs</multiple>
+    </term>
+    <term name="editortranslator"> <!-- different from fr-FR -->
+      <single>directeur scientifique et traducteur</single>
+      <multiple>directeurs scientifiques et traducteurs</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>directeur</single>
+      <multiple>directeurs</multiple>
+    </term>
     <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+      <single>producteur exécutif</single>
+      <multiple>producteurs exécutifs</multiple>
     </term>
     <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+      <single>invité</single>
+      <multiple>invités</multiple>
     </term>
     <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+      <single>hôte</single>
+      <multiple>hôtes</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrateur</single>
+      <multiple>illustrateurs</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+      <single>narrateur</single>
+      <multiple>narrateurs</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>organisateur</single>
+      <multiple>organisateurs</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+      <single>interprète</single>
+      <multiple>interprètes</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>producteur</single>
+      <multiple>producteurs</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>scénariste</single>
+      <multiple>scénaristes</multiple>
     </term>
     <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
-    </term>
-    <term name="director">
-      <single>réalisateur</single>
-      <multiple>réalisateurs</multiple>
-    </term>
-    <term name="editor">
-      <single>éditeur</single>
-      <multiple>éditeurs</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>directeur</single>
-      <multiple>directeurs</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrateur</single>
-      <multiple>illustrateurs</multiple>
+      <single>créateur de série</single>
+      <multiple>créateurs de série</multiple>
     </term>
     <term name="translator">
       <single>traducteur</single>
       <multiple>traducteurs</multiple>
     </term>
-    <term name="editortranslator">
-      <single>éditeur et traducteur</single>
-      <multiple>éditeurs et traducteurs</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, composer, container-author, guest, host, interviewer, original-author, recipient, reviewed-author
+    -->
+    <term name="collection-editor" form="short">
+      <single>dir.</single>
+      <multiple>dir.</multiple>
+    </term>
     <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+      <single>compil.</single>
+      <multiple>compil.</multiple>
     </term>
     <term name="contributor" form="short">
       <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <multiple>contrib.</multiple>
     </term>
     <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
+      <single>commiss.</single>
+      <multiple>commiss.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>réal.</single>
+      <multiple>réal.</multiple>
+    </term>
+    <term name="editor" form="short"> <!-- different from fr-FR -->
+      <single>dir.</single>
+      <multiple>dir.</multiple>
+    </term>
+    <term name="editor-translator" form="short"> <!-- different from fr-FR -->
+      <single>dir. et trad.</single>
+      <multiple>dir. et trad.</multiple>
+    </term>
+    <term name="editortranslator" form="short"> <!-- different from fr-FR -->
+      <single>dir. et trad.</single>
+      <multiple>dir. et trad.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>dir.</single>
+      <multiple>dir.</multiple>
+    </term>
     <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <single>prod. exé.</single>
+      <multiple>prod. exé.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ill.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
-      <multiple>narrs.</multiple>
+      <multiple>narr.</multiple>
     </term>
     <term name="organizer" form="short">
       <single>org.</single>
-      <multiple>orgs.</multiple>
+      <multiple>org.</multiple>
     </term>
     <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+      <single>interpr.</single>
+      <multiple>interpr.</multiple>
     </term>
     <term name="producer" form="short">
       <single>prod.</single>
-      <multiple>prods.</multiple>
+      <multiple>prod.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>scénar.</single>
+      <multiple>scénar.</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>réal.</single>
-      <multiple>réal.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>éd.</single>
-      <multiple>éd.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>dir.</single>
-      <multiple>dir.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ill.</multiple>
+      <single>créat.</single>
+      <multiple>créat.</multiple>
     </term>
     <term name="translator" form="short">
       <single>trad.</single>
       <multiple>trad.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>éd. et trad.</single>
-      <multiple>éd. et trad.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">présidé par</term>
+    <term name="collection-editor" form="verb">sous la direction de</term>
+    <term name="compiler" form="verb">compilé par</term>
+    <term name="composer" form="verb">composé par</term>
     <term name="container-author" form="verb">par</term>
+    <term name="contributor" form="verb">avec</term>
+    <term name="curator" form="verb">organisé par</term>
     <term name="director" form="verb">réalisé par</term>
-    <term name="editor" form="verb">édité par</term>
+    <term name="editor" form="verb">sous la direction de</term> <!-- different from fr-FR -->
+    <term name="editor-translator" form="verb">sous la direction de et traduit par</term> <!-- different from fr-FR -->
+    <term name="editortranslator" form="verb">sous la direction de et traduit par</term> <!-- different from fr-FR -->
     <term name="editorial-director" form="verb">sous la direction de</term>
+    <term name="executive-producer" form="verb">production exécutive par</term>
+    <term name="guest" form="verb">
+      <single>avec pour invité</single>
+      <multiple>avec pour invités</multiple>
+    </term>
+    <term name="host" form="verb">animé par</term>
     <term name="illustrator" form="verb">illustré par</term>
     <term name="interviewer" form="verb">entretien réalisé par</term>
+    <term name="narrator" form="verb">lu par</term>
+    <term name="organizer" form="verb">organisé par</term>
+    <term name="original-author" form="verb">par</term>
+    <term name="performer" form="verb">interprété par</term>
+    <term name="producer" form="verb">produit par</term>
     <term name="recipient" form="verb">à</term>
     <term name="reviewed-author" form="verb">par</term>
+    <term name="script-writer" form="verb">scénario de</term>
+    <term name="series-creator" form="verb">créé par</term>
     <term name="translator" form="verb">traduit par</term>
-    <term name="editortranslator" form="verb">édité et traduit par</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <!-- Omitted roles:
+         author, chair, container-author, contributor, guest, host, interviewer, original-author, recipient, reviewed-author, series-creator
+    -->
+    <term name="collection-editor" form="verb-short">sous la dir. de</term> <!-- different from fr-FR -->
+    <term name="compiler" form="verb-short">compil. par</term>
+    <term name="composer" form="verb-short">comp. par</term>
+    <term name="contributor" form="verb-short">ac</term>
+    <term name="curator" form="verb-short">org. par</term>
     <term name="director" form="verb-short">réal. par</term>
-    <term name="editor" form="verb-short">éd. par</term>
-    <term name="editorial-director" form="verb-short">ss la dir. de</term>
+    <term name="editor" form="verb-short">sous la dir. de</term> <!-- different from fr-FR -->
+    <term name="editor-translator" form="verb-short">dir. et trad.</term> <!-- different from fr-FR -->
+    <term name="editortranslator" form="verb-short">dir. et trad.</term> <!-- different from fr-FR -->
+    <term name="editorial-director" form="verb-short">sous la dir. de</term> <!-- different from fr-FR -->
+    <term name="executive-producer" form="verb-short">prod. exé. par</term>
+    <term name="guest" form="verb-short">ac pr inv.</term>
+    <term name="host" form="verb-short">animé par</term>
     <term name="illustrator" form="verb-short">ill. par</term>
+    <term name="narrator" form="verb-short">lu par</term>
+    <term name="organizer" form="verb-short">org. par</term>
+    <term name="performer" form="verb-short">interpr. par</term>
+    <term name="producer" form="verb-short">prod. par</term>
+    <term name="script-writer" form="verb-short">scénar. de</term>
+    <term name="series-creator" form="verb-short">créé par</term>
     <term name="translator" form="verb-short">trad. par</term>
-    <term name="editortranslator" form="verb-short">éd. et trad. par</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01" gender="masculine">janvier</term>
diff --git a/locales/fr-FR.xml b/locales/fr-FR.xml
--- a/locales/fr-FR.xml
+++ b/locales/fr-FR.xml
@@ -8,7 +8,7 @@
       <name>Collectif Zotero francophone</name>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2025-10-18T05:52:35+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false" limit-day-ordinals-to-day-1="true"/>
   <date form="text">
@@ -22,26 +22,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">consulté le</term>
     <term name="advance-online-publication">publication en ligne anticipée</term>
     <term name="album">album</term>
+    <term name="and">et</term>
+    <term name="and others">et autres</term>
+    <term name="anonymous">anonyme</term>
+    <term name="at">sur</term>
     <term name="audio-recording">enregistrement audio</term>
+    <term name="available at">disponible sur</term>
+    <term name="by">par</term>
+    <term name="circa">vers</term>
+    <term name="cited">cité</term>
+    <term name="et-al">et al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">à paraître</term>
+    <term name="from">à l'adresse</term>
     <term name="henceforth">désormais</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">in</term>
+    <term name="in press">sous presse</term>
+    <term name="internet">Internet</term>
+    <term name="letter">lettre</term>
     <term name="loc-cit">loc.&#160;cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">sans date</term>
     <term name="no-place">sans lieu</term>
-    <term name="no-place" form="short">s.&#160;l.</term>
     <term name="no-publisher">sans nom</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">s.&#160;n.</term>
     <term name="on">sur</term>
+    <term name="online">en ligne</term>
     <term name="op-cit">op.&#160;cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">édition originale</term>
     <term name="personal-communication">communication personnelle</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">épisode de podcast</term>
     <term name="preprint">prépublication</term>
+    <term name="presented at">présenté à</term>
     <term name="radio-broadcast">émission de radio</term>
     <term name="radio-series">série radiophonique</term>
     <term name="radio-series-episode">épisode de série radiophonique</term>
+    <term name="reference">
+      <single>référence</single>
+      <multiple>références</multiple>
+    </term>
+    <term name="retrieved">consulté</term>
+    <term name="review-of">recension de</term>
+    <term name="scale">échelle</term>
     <term name="special-issue">numéro spécial</term>
     <term name="special-section">section spéciale</term>
     <term name="television-broadcast">émission de télévision</term>
@@ -49,46 +75,46 @@
     <term name="television-series-episode">épisode de série télévisée</term>
     <term name="video">vidéo</term>
     <term name="working-paper">document de travail</term>
-    <term name="accessed">consulté le</term>
-    <term name="and">et</term>
-    <term name="and others">et autres</term>
-    <term name="anonymous">anonyme</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <!-- Omitted short forms: accessed, album, and (symbol), and others, at (symbol), forthcoming, henceforth, ibid, in, in press, internet, loc-cit, on, online, op-cit, podcast, preprint, presented at -->
+
+    <term name="advance-online-publication" form="short">publ. en ligne antic.</term>
     <term name="anonymous" form="short">anon.</term>
-    <term name="at">sur</term>
-    <term name="available at">disponible sur</term>
-    <term name="by">par</term>
-    <term name="circa">vers</term>
+    <term name="audio-recording" form="short">enr. audio</term>
+    <term name="available at" form="short">dispo. sur</term>
     <term name="circa" form="short">v.</term>
-    <term name="cited">cité</term>
-    <term name="edition" gender="feminine">
-      <single>édition</single>
-      <multiple>éditions</multiple>
-    </term>
-    <term name="edition" form="short">éd.</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">à paraître</term>
-    <term name="from">à l'adresse</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">in</term>
-    <term name="in press">sous presse</term>
-    <term name="internet">Internet</term>
-    <term name="letter">lettre</term>
-    <term name="no date">sans date</term>
+    <term name="cited" form="short">cité</term>
+    <term name="film" form="short">film</term>
+    <term name="from" form="short">à l'adr.</term>
+    <term name="letter" form="short">let.</term>
     <term name="no date" form="short">s.&#160;d.</term>
-    <term name="online">en ligne</term>
-    <term name="presented at">présenté à</term>
-    <term name="reference">
-      <single>référence</single>
-      <multiple>références</multiple>
-    </term>
+    <term name="no-place" form="short">s.&#160;l.</term>
+    <term name="no-publisher" form="short">s.&#160;n.</term>
+    <term name="original-work-published" form="short">éd. orig.</term>
+    <term name="personal-communication" form="short">comm. perso.</term>
+    <term name="podcast-episode" form="short">épis. de podcast</term>
+    <term name="radio-broadcast" form="short">émiss. de radio</term>
+    <term name="radio-series-episode" form="short">épis. de série radio</term>
     <term name="reference" form="short">
       <single>réf.</single>
       <multiple>réf.</multiple>
     </term>
-    <term name="retrieved">consulté</term>
-    <term name="scale">échelle</term>
-    <term name="version">version</term>
+    <term name="retrieved" form="short">consulté</term>
+    <term name="review-of" form="short">recens. de</term>
+    <term name="scale" form="short">éch.</term>
+    <term name="special-issue" form="short">nᵒ spéc.</term>
+    <term name="special-section" form="short">sect. spéc.</term>
+    <term name="television-broadcast" form="short">émiss. de TV</term>
+    <term name="television-series" form="short">série TV</term>
+    <term name="television-series-episode" form="short">épis. de série TV</term>
+    <term name="video" form="short">vidéo</term>
+    <term name="working-paper" form="short">doc. de travail</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+    <term name="and" form="symbol">&amp;</term>
+    <term name="at" form="symbol">@</term>
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">article</term>
     <term name="article-journal">article de revue</term>
@@ -115,7 +141,7 @@
     <term name="manuscript">manuscrit</term>
     <term name="map">carte</term>
     <term name="motion_picture">enregistrement vidéo</term>
-    <term name="musical_score">partition</term>
+    <term name="musical_score">partition musicale</term>
     <term name="pamphlet">pamphlet</term>
     <term name="paper-conference">article de colloque</term>
     <term name="patent">brevet</term>
@@ -137,22 +163,55 @@
     <term name="webpage">page web</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
+    <!-- Omitted short forms: article, bill, entry, event, hearing, map, periodical, speech, treaty -->
     <term name="article-journal" form="short">art. de revue</term>
     <term name="article-magazine" form="short">art. de mag.</term>
     <term name="article-newspaper" form="short">art. de presse</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
+    <term name="classic" form="short">class.</term>
+    <term name="collection" form="short">coll.</term>
     <term name="document" form="short">doc.</term>
+    <term name="entry-dictionary" form="short">entrée de dict.</term>
+    <term name="entry-encyclopedia" form="short">entrée d'encycl.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">ms</term>
+    <term name="graphic" form="short">img.</term>
+    <term name="interview" form="short">entret.</term>
+    <term name="legal_case" form="short">aff.</term>
+    <term name="legislation" form="short">acte jurid.</term>
+    <term name="manuscript" form="short">
+      <single>ms.</single>
+      <multiple>mss.</multiple>
+    </term>
     <term name="motion_picture" form="short">enr. vidéo</term>
-    <term name="report" form="short">rap.</term>
+    <term name="musical_score" form="short">partit. music.</term>
+    <term name="pamphlet" form="short">pamph.</term>
+    <term name="paper-conference" form="short">art. de conf.</term>
+    <term name="patent" form="short">brevet</term>
+    <term name="performance" form="short">interprét.</term>
+    <term name="personal_communication" form="short">comm. perso.</term>
+    <term name="regulation" form="short">règl.</term>
+    <term name="report" form="short">rapp.</term>
     <term name="review" form="short">recens.</term>
-    <term name="review-book" form="short">recens. de liv.</term>
+    <term name="review-book" form="short">recens. de livre</term>
+    <term name="software" form="short">logic.</term>
     <term name="song" form="short">enr. audio</term>
+    <term name="standard" form="short">norme</term>
+    <term name="thesis" form="short">thèse</term>
+    <term name="webpage" form="short">p. web</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">témoignage de</term>
+    <term name="review" form="verb">recension</term>
+    <term name="review-book" form="verb">recension de livre</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb-short">témoign. de</term> <!-- ODA -->
+    <term name="review" form="verb-short">recens. de</term>
+    <term name="review-book" form="verb-short">recens. de livre</term>
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">apr. J.-C.</term>
     <term name="bc">av. J.-C.</term>
@@ -199,42 +258,14 @@
       <single>article</single>
       <multiple>articles</multiple>
     </term>
-    <term name="canon">
-      <single>canon</single>
-      <multiple>canons</multiple>
-    </term>
-    <term name="elocation">
-      <single>emplacement</single>
-      <multiple>emplacements</multiple>
-    </term>
-    <term name="equation">
-      <single>équation</single>
-      <multiple>équations</multiple>
-    </term>
-    <term name="rule">
-      <single>règle</single>
-      <multiple>règles</multiple>
-    </term>
-    <term name="scene">
-      <single>scène</single>
-      <multiple>scènes</multiple>
-    </term>
-    <term name="table">
-      <single>tableau</single>
-      <multiple>tableaux</multiple>
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>
-    </term>
-    <term name="title-locator">
-      <single>titre</single>
-      <multiple>titres</multiple>
-    </term>
     <term name="book">
       <single>livre</single>
       <multiple>livres</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>chapitre</single>
       <multiple>chapitres</multiple>
@@ -243,6 +274,14 @@
       <single>colonne</single>
       <multiple>colonnes</multiple>
     </term>
+    <term name="elocation">
+      <single>emplacement</single>
+      <multiple>emplacements</multiple>
+    </term>
+    <term name="equation">
+      <single>équation</single>
+      <multiple>équations</multiple>
+    </term>
     <term name="figure">
       <single>figure</single>
       <multiple>figures</multiple>
@@ -271,10 +310,6 @@
       <single>page</single>
       <multiple>pages</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>page</single>
-      <multiple>pages</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraphe</single>
       <multiple>paragraphes</multiple>
@@ -283,6 +318,14 @@
       <single>partie</single>
       <multiple>parties</multiple>
     </term>
+    <term name="rule">
+      <single>règle</single>
+      <multiple>règles</multiple>
+    </term>
+    <term name="scene">
+      <single>scène</single>
+      <multiple>scènes</multiple>
+    </term>
     <term name="section">
       <single>section</single>
       <multiple>sections</multiple>
@@ -291,6 +334,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplément</single>
+      <multiple>suppléments</multiple>
+    </term>
+    <term name="table">
+      <single>tableau</single>
+      <multiple>tableaux</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>titre</single>
+      <multiple>titres</multiple>
+    </term>
     <term name="verse">
       <single>verset</single>
       <multiple>versets</multiple>
@@ -301,6 +360,7 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
+    <!-- Omitted short forms: act, timestamp -->
     <term name="appendix" form="short">
       <single>append.</single>
       <multiple>append.</multiple>
@@ -309,14 +369,66 @@
       <single>art.</single>
       <multiple>art.</multiple>
     </term>
+    <term name="book" form="short">
+      <single>livre</single>
+      <multiple>livres</multiple>
+    </term>
+    <term name="canon" form="short">
+      <single>can.</single>
+      <multiple>can.</multiple>
+    </term>
+    <term name="chapter" form="short">
+      <single>chap.</single>
+      <multiple>chap.</multiple>
+    </term>
+    <term name="column" form="short">
+      <single>col.</single>
+      <multiple>col.</multiple>
+    </term>
     <term name="elocation" form="short">
       <single>emplact</single>
       <multiple>emplact</multiple>
     </term>
     <term name="equation" form="short">
-      <single>eq.</single>
-      <multiple>eq.</multiple>
+      <single>eqt.</single>
+      <multiple>eqt.</multiple>
     </term>
+    <term name="figure" form="short">
+      <single>fig.</single>
+      <multiple>fig.</multiple>
+    </term>
+    <term name="folio" form="short">
+      <single>fᵒ</single>
+      <multiple>fᵒˢ</multiple>
+    </term>
+    <term name="issue" form="short">
+      <single>nᵒ</single>
+      <multiple>nᵒˢ</multiple>
+    </term>
+    <term name="line" form="short">
+      <single>l.</single>
+      <multiple>l.</multiple>
+    </term>
+    <term name="note" form="short">
+      <single>n.</single>
+      <multiple>n.</multiple>
+    </term>
+    <term name="opus" form="short">
+      <single>op.</single>
+      <multiple>op.</multiple>
+    </term>
+    <term name="page" form="short">
+      <single>p.</single>
+      <multiple>p.</multiple>
+    </term>
+    <term name="paragraph" form="short">
+      <single>paragr.</single>
+      <multiple>paragr.</multiple>
+    </term>
+    <term name="part" form="short">
+      <single>part.</single>
+      <multiple>part.</multiple>
+    </term>
     <term name="rule" form="short">
       <single>règle</single>
       <multiple>règles</multiple>
@@ -325,48 +437,30 @@
       <single>sc.</single>
       <multiple>sc.</multiple>
     </term>
+    <term name="section" form="short">
+      <single>sect.</single>
+      <multiple>sect.</multiple>
+    </term>
+    <term name="sub-verbo" form="short">
+      <single>s.&#160;v.</single>
+      <multiple>s.&#160;v.</multiple>
+    </term>
+    <term name="supplement" form="short">
+      <single>suppl.</single>
+      <multiple>suppl.</multiple>
+    </term>
     <term name="table" form="short">
       <single>tab.</single>
       <multiple>tab.</multiple>
     </term>
     <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>
+      <single/>
+      <multiple/>
     </term>
     <term name="title-locator" form="short">
       <single>tit.</single>
       <multiple>tit.</multiple>
     </term>
-    <term name="book" form="short">liv.</term>
-    <term name="chapter" form="short">chap.</term>
-    <term name="column" form="short">col.</term>
-    <term name="figure" form="short">fig.</term>
-    <term name="folio" form="short">
-      <single>fᵒ</single>
-      <multiple>fᵒˢ</multiple>
-    </term>
-    <term name="issue" form="short">
-      <single>nᵒ</single>
-      <multiple>nᵒˢ</multiple>
-    </term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
-    <term name="opus" form="short">op.</term>
-    <term name="page" form="short">
-      <single>p.</single>
-      <multiple>p.</multiple>
-    </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>p.</multiple>
-    </term>
-    <term name="paragraph" form="short">paragr.</term>
-    <term name="part" form="short">part.</term>
-    <term name="section" form="short">sect.</term>
-    <term name="sub-verbo" form="short">
-      <single>s.&#160;v.</single>
-      <multiple>s.&#160;vv.</multiple>
-    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
@@ -376,7 +470,12 @@
       <multiple>vol.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="chapter" form="symbol">
+      <!-- caput/capita, esp. in legal works; cf. CMOS 14.196 -->
+      <single>c.</single>
+      <multiple>c.</multiple>
+    </term>
     <term name="paragraph" form="symbol">
       <single>§</single>
       <multiple>§</multiple>
@@ -386,15 +485,111 @@
       <multiple>§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapitre</single>
+      <multiple>chapitres</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number" gender="masculine">
+      <single>numéro</single>
+      <multiple>numéros</multiple>
+    </term>
+    <term name="edition" gender="feminine">
+      <single>édition</single>
+      <multiple>éditions</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>référence</single>
+      <multiple>références</multiple>
+    </term>
+    <term name="number">
+      <single>numéro</single>
+      <multiple>numéros</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>impression</single>
+      <multiple>impressions</multiple>
+    </term>
+    <term name="version">
+      <single>version</single>
+      <multiple>versions</multiple>
+    </term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chap.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cit.</multiple>
+    </term>
+    <term name="collection-number" form="short">
+     <single>nᵒ</single>
+      <multiple>nᵒˢ</multiple>
+    </term>
+    <term name="edition" form="short">
+      <single>éd.</single>
+      <multiple>éd.</multiple>
+    </term>
+    <term name="first-reference-note-number" form="short">
+      <single>réf.</single>
+      <multiple>réf.</multiple>
+    </term>
+    <term name="number" form="short">
+     <single>nᵒ</single>
+     <multiple>nᵒˢ</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>p.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vol.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>p.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>impr.</single>
+      <multiple>impr.</multiple>
+    </term>
+    <term name="version" form="short">v.</term> <!-- no plural -->
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>président</single>
       <multiple>présidents</multiple>
     </term>
+    <term name="collection-editor">
+      <single>directeur</single>
+      <multiple>directeurs</multiple>
+    </term>
     <term name="compiler">
       <single>compilateur</single>
       <multiple>compilateurs</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributeur</single>
       <multiple>contributeurs</multiple>
@@ -403,6 +598,26 @@
       <single>commissaire</single>
       <multiple>commissaires</multiple>
     </term>
+    <term name="director">
+      <single>réalisateur</single>
+      <multiple>réalisateurs</multiple>
+    </term>
+    <term name="editor">
+      <single>éditeur</single>
+      <multiple>éditeurs</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>éditeur et traducteur</single>
+      <multiple>éditeurs et traducteurs</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>éditeur et traducteur</single>
+      <multiple>éditeurs et traducteurs</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>directeur</single>
+      <multiple>directeurs</multiple>
+    </term>
     <term name="executive-producer">
       <single>producteur exécutif</single>
       <multiple>producteurs exécutifs</multiple>
@@ -415,6 +630,11 @@
       <single>hôte</single>
       <multiple>hôtes</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrateur</single>
+      <multiple>illustrateurs</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrateur</single>
       <multiple>narrateurs</multiple>
@@ -423,6 +643,7 @@
       <single>organisateur</single>
       <multiple>organisateurs</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>interprète</single>
       <multiple>interprètes</multiple>
@@ -431,6 +652,8 @@
       <single>producteur</single>
       <multiple>producteurs</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>scénariste</single>
       <multiple>scénaristes</multiple>
@@ -439,32 +662,19 @@
       <single>créateur de série</single>
       <multiple>créateurs de série</multiple>
     </term>
-    <term name="director">
-      <single>réalisateur</single>
-      <multiple>réalisateurs</multiple>
-    </term>
-    <term name="editor">
-      <single>éditeur</single>
-      <multiple>éditeurs</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>directeur</single>
-      <multiple>directeurs</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrateur</single>
-      <multiple>illustrateurs</multiple>
-    </term>
     <term name="translator">
       <single>traducteur</single>
       <multiple>traducteurs</multiple>
     </term>
-    <term name="editortranslator">
-      <single>éditeur et traducteur</single>
-      <multiple>éditeurs et traducteurs</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, composer, container-author, guest, host, interviewer, original-author, recipient, reviewed-author
+    -->
+    <term name="collection-editor" form="short">
+      <single>dir.</single>
+      <multiple>dir.</multiple>
+    </term>
     <term name="compiler" form="short">
       <single>compil.</single>
       <multiple>compil.</multiple>
@@ -477,10 +687,34 @@
       <single>commiss.</single>
       <multiple>commiss.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>réal.</single>
+      <multiple>réal.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>éd.</single>
+      <multiple>éd.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>éd. et trad.</single>
+      <multiple>éd. et trad.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>éd. et trad.</single>
+      <multiple>éd. et trad.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>dir.</single>
+      <multiple>dir.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>prod. exé.</single>
       <multiple>prod. exé.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ill.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narr.</multiple>
@@ -505,75 +739,68 @@
       <single>créat.</single>
       <multiple>créat.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>réal.</single>
-      <multiple>réal.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>éd.</single>
-      <multiple>éd.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>dir.</single>
-      <multiple>dir.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ill.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>trad.</single>
       <multiple>trad.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>éd. et trad.</single>
-      <multiple>éd. et trad.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">présidé par</term>
+    <term name="collection-editor" form="verb">sous la direction de</term>
     <term name="compiler" form="verb">compilé par</term>
+    <term name="composer" form="verb">composé par</term>
+    <term name="container-author" form="verb">par</term>
     <term name="contributor" form="verb">avec</term>
     <term name="curator" form="verb">organisé par</term>
+    <term name="director" form="verb">réalisé par</term>
+    <term name="editor" form="verb">édité par</term>
+    <term name="editor-translator" form="verb">édité et traduit par</term>
+    <term name="editortranslator" form="verb">édité et traduit par</term>
+    <term name="editorial-director" form="verb">sous la direction de</term>
     <term name="executive-producer" form="verb">production exécutive par</term>
-    <term name="guest" form="verb">avec pour invité</term>
+    <term name="guest" form="verb">
+      <single>avec pour invité</single>
+      <multiple>avec pour invités</multiple>
+    </term>
     <term name="host" form="verb">animé par</term>
+    <term name="illustrator" form="verb">illustré par</term>
+    <term name="interviewer" form="verb">entretien réalisé par</term>
     <term name="narrator" form="verb">lu par</term>
     <term name="organizer" form="verb">organisé par</term>
+    <term name="original-author" form="verb">par</term>
     <term name="performer" form="verb">interprété par</term>
     <term name="producer" form="verb">produit par</term>
-    <term name="script-writer" form="verb">scénario de</term>
-    <term name="series-creator" form="verb">créé par</term>
-    <term name="container-author" form="verb">par</term>
-    <term name="director" form="verb">réalisé par</term>
-    <term name="editor" form="verb">édité par</term>
-    <term name="editorial-director" form="verb">sous la direction de</term>
-    <term name="illustrator" form="verb">illustré par</term>
-    <term name="interviewer" form="verb">entretien réalisé par</term>
     <term name="recipient" form="verb">à</term>
     <term name="reviewed-author" form="verb">par</term>
+    <term name="script-writer" form="verb">scénario de</term>
+    <term name="series-creator" form="verb">créé par</term>
     <term name="translator" form="verb">traduit par</term>
-    <term name="editortranslator" form="verb">édité et traduit par</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, container-author, contributor, guest, host, interviewer, original-author, recipient, reviewed-author, series-creator
+    -->
+    <term name="collection-editor" form="verb-short">ss la dir. de</term>
     <term name="compiler" form="verb-short">compil. par</term>
+    <term name="composer" form="verb-short">comp. par</term>
     <term name="contributor" form="verb-short">ac</term>
     <term name="curator" form="verb-short">org. par</term>
+    <term name="director" form="verb-short">réal. par</term>
+    <term name="editor" form="verb-short">éd. par</term>
+    <term name="editor-translator" form="verb-short">éd. et trad. par</term>
+    <term name="editortranslator" form="verb-short">éd. et trad. par</term>
+    <term name="editorial-director" form="verb-short">ss la dir. de</term>
     <term name="executive-producer" form="verb-short">prod. exé. par</term>
     <term name="guest" form="verb-short">ac pr inv.</term>
-    <term name="host" form="verb-short">anim. par</term>
+    <term name="host" form="verb-short">animé par</term>
+    <term name="illustrator" form="verb-short">ill. par</term>
     <term name="narrator" form="verb-short">lu par</term>
     <term name="organizer" form="verb-short">org. par</term>
     <term name="performer" form="verb-short">interpr. par</term>
     <term name="producer" form="verb-short">prod. par</term>
     <term name="script-writer" form="verb-short">scénar. de</term>
     <term name="series-creator" form="verb-short">créé par</term>
-    <term name="director" form="verb-short">réal. par</term>
-    <term name="editor" form="verb-short">éd. par</term>
-    <term name="editorial-director" form="verb-short">ss la dir. de</term>
-    <term name="illustrator" form="verb-short">ill. par</term>
     <term name="translator" form="verb-short">trad. par</term>
-    <term name="editortranslator" form="verb-short">éd. et trad. par</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01" gender="masculine">janvier</term>
diff --git a/locales/gl-ES.xml b/locales/gl-ES.xml
new file mode 100644
--- /dev/null
+++ b/locales/gl-ES.xml
@@ -0,0 +1,719 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="gl-ES">
+  <!-- Several sources
+    1. https://academia.gal/inicio (cited hereafter as RAG)
+    2. https://digalego.xunta.gal/gl/abreviaturas (cited hereafter as DiGalego)
+    3. Méndez López, I., Ríos Noia, M., Sanmartín Rei, G., Pita Rubido, M. L., & Martínez Fernández, A. I. (2006). Criterios para o uso da lingua. Universidade da Coruña. (cited hereafter as CritUso)
+    4. Castro Figueiras, E. M., & Rodríguez Ricart, M. C. (2014). Na universidade en galego sen dúbida. Área de Normalización Lingüística. (cited hereafter as UniGal)
+  -->
+  <info>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2025-10-16T03:24:00+00:00</updated>
+    <translator>
+      <name>Manuel Magán</name>
+    </translator>
+    <translator>
+      <name>David Cotelo Varela</name>
+    </translator>
+    <translator>
+      <name>Andrea Real</name>
+    </translator>
+  </info>
+  <style-options punctuation-in-quote="false"/>
+  <date form="text">
+    <date-part name="day" suffix=" de "/>
+    <date-part name="month" suffix=" de "/>
+    <date-part name="year"/>
+  </date>
+  <date form="numeric">
+    <date-part name="day" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="month" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="year"/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">accedido</term>
+    <term name="advance-online-publication">publicación en liña anticipada</term>
+    <term name="album">álbum</term>
+    <term name="and">e</term>
+    <term name="and others">e outros/as</term>
+    <term name="anonymous">anónimo</term>
+    <term name="at">en</term>
+    <term name="audio-recording">gravación de son</term>
+    <term name="available at">dispoñíbel en</term>
+    <term name="by">por</term>
+    <term name="circa">circa</term> <!-- CritUso, cerca de -->
+    <term name="cited">citado</term>
+    <term name="et-al">e outros/as</term> <!-- UniGal -->
+    <term name="film">filme</term>
+    <term name="forthcoming">a publicar</term>
+    <term name="from">de</term>
+    <term name="henceforth">en adiante</term>
+    <term name="ibid">íb.</term> <!-- CritUso -->
+    <term name="in">en</term>
+    <term name="in press">no prelo</term>
+    <term name="internet">internet</term>
+    <term name="letter">carta</term>
+    <term name="loc-cit">loc. cit.</term>
+    <term name="no date">sen data</term>
+    <term name="no-place">sen lugar</term>
+    <term name="no-publisher">sen editorial</term>
+    <term name="on">en</term>
+    <term name="online">en liña</term>
+    <term name="op-cit">o. cit.</term> <!-- UniGal, op. cit. (Opere Citato), obra citada -->
+    <term name="original-work-published">traballo orixinal publicado</term>
+    <term name="personal-communication">comunicado persoal</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">episodio de podcast</term>
+    <term name="preprint">pre-impresión</term>
+    <term name="presented at">presentado en</term>
+    <term name="radio-broadcast">emisión de radio</term>
+    <term name="radio-series">serie de radio</term>
+    <term name="radio-series-episode">episodio de serie de radio</term>
+    <term name="reference">
+      <single>referencia</single>
+      <multiple>referencias</multiple>
+    </term>
+    <term name="retrieved">obtido</term>
+    <term name="review-of">recensión de</term>
+    <term name="scale">escala</term>
+    <term name="special-issue">número especial</term>
+    <term name="special-section">sección especial</term>
+    <term name="television-broadcast">emisión de televisión</term>
+    <term name="television-series">serie de televisión</term>
+    <term name="television-series-episode">episodio de serie de televisión</term>
+    <term name="video">vídeo</term>
+    <term name="working-paper">artigo inacabado</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anón.</term>
+    <term name="circa" form="short">ca.</term> <!-- CritUso -->
+    <term name="no date" form="short">s. d.</term> <!-- CritUso -->
+    <term name="no-place" form="short">s. l.</term> <!-- CritUso -->
+    <term name="no-publisher" form="short">s. ed.</term> <!-- CritUso -->
+    <term name="reference" form="short">
+      <single>ref.</single>
+      <multiple>refs.</multiple>
+    </term>
+    <term name="review-of" form="short">rec. de</term>
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="article">pre-impresión</term>
+    <term name="article-journal">artigo</term>
+    <term name="article-magazine">artigo de revista</term>
+    <term name="article-newspaper">artigo de xornal</term>
+    <term name="bill">proxecto de lei</term>
+    <term name="broadcast">emisión</term>
+    <term name="classic">clásico</term>
+    <term name="collection">colección</term>
+    <term name="dataset">conxunto de datos</term>
+    <term name="document">documento</term>
+    <term name="entry">entrada</term>
+    <term name="entry-dictionary">entrada no dicionario</term>
+    <term name="entry-encyclopedia">entrada na enciclopedia</term>
+    <term name="event">evento</term>
+    <term name="graphic">gráfica</term>
+    <term name="hearing">audio</term>
+    <term name="interview">entrevista</term>
+    <term name="legal_case">suceso legal</term>
+    <term name="legislation">lexislación</term>
+    <term name="manuscript">manuscrito</term>
+    <term name="map">mapa</term>
+    <term name="motion_picture">gravación de vídeo</term>
+    <term name="musical_score">partitura musical</term>
+    <term name="pamphlet">panfleto</term>
+    <term name="paper-conference">artigo de congreso</term>
+    <term name="patent">patente</term>
+    <term name="performance">actuación</term> <!-- a theater/concert performance -->
+    <term name="periodical">periódico</term>
+    <term name="personal_communication">comunicado persoal</term>
+    <term name="post">publicación</term>
+    <term name="post-weblog">publicación web</term>
+    <term name="regulation">regulamento</term>
+    <term name="report">informe</term>
+    <term name="review">revisión</term>
+    <term name="review-book">recensión</term>
+    <term name="software">software</term>
+    <term name="song">canción</term>
+    <term name="speech">discurso</term>
+    <term name="standard">estándar</term>
+    <term name="thesis">tese</term>
+    <term name="treaty">tratado</term>
+    <term name="webpage">páxina web</term> <!-- RAG -->
+
+    <!-- SHORT ITEM TYPE FORMS -->
+    <term name="article-journal" form="short">art. acad.</term>
+    <term name="article-magazine" form="short">art. rev.</term>
+    <term name="article-newspaper" form="short">art. xornal</term>
+    <term name="document" form="short">doc.</term>
+    <term name="graphic" form="short">gráf.</term>
+    <term name="manuscript" form="short">ms.</term> <!-- CritUso -->
+    <term name="motion_picture" form="short">grav. vídeo</term>
+    <term name="report" form="short">inf.</term>
+    <term name="review" form="short">rev.</term>
+    <term name="review-book" form="short">rec. libro</term>
+    <term name="song" form="short">canción</term>
+
+    <!-- LONG VERB ITEM TYPE FORMS -->
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad">d. C.</term>
+    <term name="bc">a. C.</term>
+    <term name="bce">BCE</term>
+    <term name="ce">CE</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">«</term>
+    <term name="close-quote">»</term>
+    <term name="open-inner-quote">“</term>
+    <term name="close-inner-quote">”</term>
+    <term name="colon">:</term>
+    <term name="comma">,</term>
+    <term name="semicolon">;</term>
+    <term name="page-range-delimiter">–</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal" gender-form="masculine" match="whole-number">º</term>
+    <term name="ordinal" gender-form="feminine" match="whole-number">ª</term>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01" gender-form="masculine">primeiro</term>
+    <term name="long-ordinal-02" gender-form="masculine">segundo</term>
+    <term name="long-ordinal-03" gender-form="masculine">terceiro</term>
+    <term name="long-ordinal-04" gender-form="masculine">cuarto</term>
+    <term name="long-ordinal-05" gender-form="masculine">quinto</term>
+    <term name="long-ordinal-06" gender-form="masculine">sexto</term>
+    <term name="long-ordinal-07" gender-form="masculine">sétimo</term>
+    <term name="long-ordinal-08" gender-form="masculine">oitavo</term>
+    <term name="long-ordinal-09" gender-form="masculine">nono</term>
+    <term name="long-ordinal-10" gender-form="masculine">décimo</term>
+    <term name="long-ordinal-01" gender-form="feminine">primeira</term>
+    <term name="long-ordinal-02" gender-form="feminine">segunda</term>
+    <term name="long-ordinal-03" gender-form="feminine">terceira</term>
+    <term name="long-ordinal-04" gender-form="feminine">cuarta</term>
+    <term name="long-ordinal-05" gender-form="feminine">quinta</term>
+    <term name="long-ordinal-06" gender-form="feminine">sexta</term>
+    <term name="long-ordinal-07" gender-form="feminine">sétima</term>
+    <term name="long-ordinal-08" gender-form="feminine">oitava</term>
+    <term name="long-ordinal-09" gender-form="feminine">nona</term>
+    <term name="long-ordinal-10" gender-form="feminine">décima</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="act">
+      <single>acta</single>
+      <multiple>actas</multiple>
+    </term>
+    <term name="appendix">
+      <single>apéndice</single>
+      <multiple>apéndices</multiple>
+    </term>
+    <term name="article-locator">
+      <single>artigo</single>
+      <multiple>artigos</multiple>
+    </term>
+    <term name="book">
+      <single>libro</single>
+      <multiple>libros</multiple>
+    </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
+    <term name="chapter">
+      <single>capítulo</single>
+      <multiple>capítulos</multiple>
+    </term>
+    <term name="column">
+      <single>columna</single>
+      <multiple>columnas</multiple>
+    </term>
+    <term name="elocation">
+      <single>localización</single>
+      <multiple>localizacións</multiple>
+    </term>
+    <term name="equation">
+      <single>ecuación</single>
+      <multiple>ecuacións</multiple>
+    </term>
+    <term name="figure">
+      <single>figura</single>
+      <multiple>figuras</multiple>
+    </term>
+    <term name="folio">
+      <single>folio</single>
+      <multiple>folios</multiple>
+    </term>
+    <term name="issue">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="line">
+      <single>liña</single>
+      <multiple>liñas</multiple>
+    </term>
+    <term name="note">
+      <single>nota</single>
+      <multiple>notas</multiple>
+    </term>
+    <term name="opus">
+      <single>opus</single>
+      <multiple>ópera</multiple>
+    </term>
+    <term name="page">
+      <single>páxina</single>
+      <multiple>páxinas</multiple>
+    </term>
+    <term name="paragraph">
+      <single>parágrafo</single>
+      <multiple>parágrafos</multiple>
+    </term>
+    <term name="part">
+      <single>parte</single>
+      <multiple>partes</multiple>
+    </term>
+    <term name="rule">
+      <single>regra</single>
+      <multiple>regras</multiple>
+    </term>
+    <term name="scene">
+      <single>escena</single>
+      <multiple>escenas</multiple>
+    </term>
+    <term name="section">
+      <single>sección</single>
+      <multiple>seccións</multiple>
+    </term>
+    <term name="sub-verbo">
+      <single>sub verbo</single>
+      <multiple>sub verbos</multiple>
+    </term>
+    <term name="supplement">
+      <single>suplemento</single>
+      <multiple>suplementos</multiple>
+    </term>
+    <term name="table">
+      <single>táboa</single>
+      <multiple>táboas</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>título</single>
+      <multiple>títulos</multiple>
+    </term>
+    <term name="verse">
+      <single>verso</single>
+      <multiple>versos</multiple>
+    </term>
+    <term name="volume">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+    <term name="appendix" form="short">
+      <single>ap.</single>
+      <multiple>aps.</multiple>
+    </term>
+    <term name="article-locator" form="short">
+      <single>art.</single>
+      <multiple>arts.</multiple>
+    </term>
+    <term name="book" form="short">lib.</term>
+    <term name="chapter" form="short">cap.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
+      <single>loc.</single>
+      <multiple>locs.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>ec.</single>
+      <multiple>ecs.</multiple>
+    </term>
+    <term name="figure" form="short">fig.</term>
+    <term name="folio" form="short">f.</term>
+    <term name="issue" form="short">núm.</term>
+    <term name="line" form="short">l.</term>
+    <term name="note" form="short">n.</term>
+    <term name="opus" form="short">op.</term>
+    <term name="page" form="short">
+      <single>páx.</single>
+      <multiple>páxs.</multiple>
+    </term>
+    <term name="paragraph" form="short">par.</term>
+    <term name="part" form="short">pt.</term>
+    <term name="rule" form="short">
+      <single>regra</single>
+      <multiple>regras</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>escena</single>
+      <multiple>escenas</multiple>
+    </term>
+    <term name="section" form="short">sec.</term>
+    <term name="sub-verbo" form="short">
+      <single>s. v.</single>
+      <multiple>s. vv.</multiple>
+    </term>
+    <term name="supplement" form="short">
+      <single>supl.</single>
+      <multiple>supls.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>táb.</single>
+      <multiple>tábs.</multiple>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tít.</single>
+      <multiple>títs.</multiple>
+    </term>
+    <term name="verse" form="short">
+      <single>v.</single>
+      <multiple>vv.</multiple>
+    </term>
+    <term name="volume" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>capítulo</single>
+      <multiple>capítulos</multiple>
+    </term>
+    <term name="citation-number">
+      <single>cita</single>
+      <multiple>citas</multiple>
+    </term>
+    <term name="collection-number">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="edition">
+      <single>edición</single>
+      <multiple>edicións</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>referencia</single>
+      <multiple>referencias</multiple>
+    </term>
+    <term name="number">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>páxina</single>
+      <multiple>páxinas</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>páxina</single>
+      <multiple>páxina</multiple>
+    </term>
+    <term name="printing">
+      <single>impreso</single>
+      <multiple>impresos</multiple>
+    </term>
+    <term name="version">versión</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>cap.</single>
+      <multiple>caps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">núm.</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>ref.</single>
+      <multiple>refs.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>núm.</single>
+      <multiple>núms.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>páx.</single>
+      <multiple>páxs.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>páx.</single>
+      <multiple>páxs.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>impr.</single>
+      <multiple>imprs.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>presidente</single>
+      <multiple>presidentes</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
+    <term name="compiler">
+      <single>compilador</single>
+      <multiple>compiladores</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>contribuínte</single>
+      <multiple>contribuíntes</multiple>
+    </term>
+    <term name="curator">
+      <single>conservador</single>
+      <multiple>conservadores</multiple>
+    </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directores</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor e tradutor</single>
+      <multiple>editores e tradutores</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor e tradutor</single>
+      <multiple>editores e tradutores</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>produtor executivo</single>
+      <multiple>produtores executivos</multiple>
+    </term>
+    <term name="guest">
+      <single>convidado</single>
+      <multiple>convidados</multiple>
+    </term>
+    <term name="host">
+      <single>anfitrión</single>
+      <multiple>anfitrións</multiple>
+    </term>
+    <term name="illustrator">
+      <single>ilustrador</single>
+      <multiple>ilustradores</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>narrador</single>
+      <multiple>narradores</multiple>
+    </term>
+    <term name="organizer">
+      <single>organizador</single>
+      <multiple>organizadores</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>intérprete</single>
+      <multiple>intérpretes</multiple>
+    </term>
+    <term name="producer">
+      <single>produtor</single>
+      <multiple>produtores</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>escritor</single>
+      <multiple>escritores</multiple>
+    </term>
+    <term name="series-creator">
+      <single>creador da serie</single>
+      <multiple>creadores da serie</multiple>
+    </term>
+    <term name="translator">
+      <single>tradutor</single>
+      <multiple>tradutores</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+    <term name="compiler" form="short">
+      <single>comp.</single>
+      <multiple>comps.</multiple>
+    </term>
+    <term name="contributor" form="short">
+      <single>contrib.</single>
+      <multiple>contribs.</multiple>
+    </term>
+    <term name="curator" form="short">
+      <single>conservador</single>
+      <multiple>conservadores</multiple>
+    </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. e trad.</single>
+      <multiple>eds. e trads.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. e trad.</single>
+      <multiple>eds. e trads.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="executive-producer" form="short">
+      <single>prod. exec.</single>
+      <multiple>prods. execs.</multiple>
+    </term>
+    <term name="illustrator" form="short">
+      <single>il.</single>
+      <multiple>ils.</multiple>
+    </term>
+    <term name="narrator" form="short">
+      <single>narr.</single>
+      <multiple>narrs.</multiple>
+    </term>
+    <term name="organizer" form="short">
+      <single>org.</single>
+      <multiple>orgs.</multiple>
+    </term>
+    <term name="performer" form="short">
+      <single>intérp.</single>
+      <multiple>intérps.</multiple>
+    </term>
+    <term name="producer" form="short">
+      <single>prod.</single>
+      <multiple>prods.</multiple>
+    </term>
+    <term name="script-writer" form="short">
+      <single>escritor</single>
+      <multiple>escritores</multiple>
+    </term>
+    <term name="series-creator" form="short">
+      <single>cre.</single>
+      <multiple>cres.</multiple>
+    </term>
+    <term name="translator" form="short">
+      <single>trad.</single>
+      <multiple>trads.</multiple>
+    </term>
+
+    <!-- VERB ROLE FORMS -->
+    <term name="chair" form="verb">presidido por</term>
+    <term name="collection-editor" form="verb">editado por</term>
+    <term name="compiler" form="verb">compilado con</term>
+    <term name="container-author" form="verb">por</term>
+    <term name="contributor" form="verb">contribuído por</term>
+    <term name="curator" form="verb">conservado por</term>
+    <term name="director" form="verb">dirixido por</term>
+    <term name="editor" form="verb">editado por</term>
+    <term name="editor-translator" form="verb">editado e traducido por</term>
+    <term name="editortranslator" form="verb">editado e traducido por</term>
+    <term name="editorial-director" form="verb">editado por</term>
+    <term name="executive-producer" form="verb">produción executiva de</term>
+    <term name="guest" form="verb">coa participación de</term>
+    <term name="host" form="verb">presentado por</term>
+    <term name="illustrator" form="verb">ilustrado por</term>
+    <term name="interviewer" form="verb">entrevistado por</term>
+    <term name="narrator" form="verb">narrado por</term>
+    <term name="organizer" form="verb">organizado por</term>
+    <term name="performer" form="verb">interpretado por</term>
+    <term name="producer" form="verb">producido por</term>
+    <term name="recipient" form="verb">para</term>
+    <term name="reviewed-author" form="verb">revisado por</term>
+    <term name="script-writer" form="verb">escrito por</term>
+    <term name="series-creator" form="verb">creado por</term>
+    <term name="translator" form="verb">traducido por</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. por</term>
+    <term name="compiler" form="verb-short">comp. por</term>
+    <term name="contributor" form="verb-short">con</term>
+    <term name="curator" form="verb-short">con</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">ed. e trad.</term>
+    <term name="editortranslator" form="verb-short">ed. e trad.</term>
+    <term name="editorial-director" form="verb-short">ed.</term>
+    <term name="executive-producer" form="verb-short">prod. exec.</term>
+    <term name="guest" form="verb-short">con</term>
+    <term name="illustrator" form="verb-short">ilus.</term>
+    <term name="narrator" form="verb-short">narr.</term>
+    <term name="organizer" form="verb-short">org.</term>
+    <term name="performer" form="verb-short">interp.</term>
+    <term name="producer" form="verb-short">prod.</term>
+    <term name="script-writer" form="verb-short">escr.</term>
+    <term name="series-creator" form="verb-short">crea.</term>
+    <term name="translator" form="verb-short">trad.</term>
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">xaneiro</term>
+    <term name="month-02">febreiro</term>
+    <term name="month-03">marzo</term>
+    <term name="month-04">abril</term>
+    <term name="month-05">maio</term>
+    <term name="month-06">xuño</term>
+    <term name="month-07">xullo</term>
+    <term name="month-08">agosto</term>
+    <term name="month-09">setembro</term>
+    <term name="month-10">outubro</term>
+    <term name="month-11">novembro</term>
+    <term name="month-12">decembro</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">xan.</term>
+    <term name="month-02" form="short">feb.</term>
+    <term name="month-03" form="short">mar.</term>
+    <term name="month-04" form="short">abr.</term>
+    <term name="month-05" form="short">mai.</term>
+    <term name="month-06" form="short">xuñ.</term>
+    <term name="month-07" form="short">xul.</term>
+    <term name="month-08" form="short">ago.</term>
+    <term name="month-09" form="short">set.</term>
+    <term name="month-10" form="short">out.</term>
+    <term name="month-11" form="short">nov.</term>
+    <term name="month-12" form="short">dec.</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">primavera</term>
+    <term name="season-02">verán</term>
+    <term name="season-03">outono</term>
+    <term name="season-04">inverno</term>
+  </terms>
+</locale>
diff --git a/locales/he-IL.xml b/locales/he-IL.xml
--- a/locales/he-IL.xml
+++ b/locales/he-IL.xml
@@ -4,8 +4,11 @@
     <translator>
       <name>roypeled1</name>
     </translator>
+    <translator>
+      <name>dinkame</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,89 +22,90 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">נבדק לאחרונה</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">תקשורת אישית</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
-    <term name="accessed">נבדק לאחרונה</term>
     <term name="and">ו</term>
     <term name="and others">ואחרים</term>
     <term name="anonymous">אלמוני</term>
-    <term name="anonymous" form="short">anon</term>
     <term name="at">-ב</term>
+    <term name="audio-recording">audio recording</term>
     <term name="available at">זמין ב</term>
     <term name="by">על-ידי</term>
     <term name="circa">לערך</term>
-    <term name="circa" form="short">c.</term>
     <term name="cited">מצוטט ב</term>
-    <term name="edition">
-      <single>מהדורה</single>
-      <multiple>מהדורות</multiple>
-    </term>
-    <term name="edition" form="short">ed</term>
     <term name="et-al">ואחרים</term>
+    <term name="film">סרט</term>
     <term name="forthcoming">צפוי</term>
     <term name="from">מתוך</term>
+    <term name="henceforth">henceforth</term>
     <term name="ibid">שם</term>
     <term name="in">בתוך</term>
-    <term name="in press">בהדפסה</term>
-    <term name="internet">אינטרנט</term>
+    <term name="in press">בדפוס</term>
+    <term name="internet">אתר</term>
     <term name="letter">מכתב</term>
-    <term name="no date">אין נתונים</term>
-    <term name="no date" form="short">nd</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">לא ידוע</term>
+    <term name="no-place">no place</term>
+    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
+    <term name="on">on</term>
     <term name="online">מקוון</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">פורסם במקור בשנת</term>
+    <term name="personal-communication">תקשורת אישית</term>
+    <term name="podcast">הסכת</term>
+    <term name="podcast-episode">פרק בהסכת</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">הוצג ב</term>
+    <term name="radio-broadcast">תשדיר רדיו</term>
+    <term name="radio-series">תוכנית רדיו </term>
+    <term name="radio-series-episode">פרק בתוכנית רדיו</term>
     <term name="reference">
       <single>הפניה</single>
       <multiple>הפניות</multiple>
     </term>
+    <term name="retrieved">אוחזר</term>
+    <term name="review-of">review of</term>
+    <term name="scale">קנ"מ</term>
+    <term name="special-issue">special issue</term>
+    <term name="special-section">special section</term>
+    <term name="television-broadcast">television broadcast</term>
+    <term name="television-series">סדרת טלוויזיה</term>
+    <term name="television-series-episode">television series episode</term>
+    <term name="video">וידאו</term>
+    <term name="working-paper">working paper</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short"/>
+    <term name="circa" form="short">~</term>
+    <term name="no date" form="short"/>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">אוחזר</term>
-    <term name="scale">scale</term>
-    <term name="version">גירסה</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
+    <term name="article-journal">מאמר בכתב עת</term>
     <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
+    <term name="article-newspaper">מאמר בעיתון</term>
     <term name="bill">bill</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">תשדיר</term>
     <!-- chapter is in the list of locator terms -->
     <term name="classic">classic</term>
     <term name="collection">collection</term>
     <term name="dataset">dataset</term>
     <term name="document">document</term>
     <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
+    <term name="entry-dictionary">ערך מילוני</term>
+    <term name="entry-encyclopedia">ערך אנציקלופדי</term>
     <term name="event">event</term>
     <!-- figure is in the list of locator terms -->
     <term name="graphic">graphic</term>
@@ -110,7 +114,7 @@
     <term name="legal_case">legal case</term>
     <term name="legislation">legislation</term>
     <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
+    <term name="map">מפה</term>
     <term name="motion_picture">video recording</term>
     <term name="musical_score">musical score</term>
     <term name="pamphlet">pamphlet</term>
@@ -119,22 +123,22 @@
     <term name="performance">performance</term>
     <term name="periodical">periodical</term>
     <term name="personal_communication">תקשורת אישית</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
+    <term name="post">פוסט</term>
+    <term name="post-weblog">פוסט בבלוג</term>
     <term name="regulation">regulation</term>
-    <term name="report">report</term>
+    <term name="report">דוח</term>
     <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
+    <term name="review-book">סקירת ספר</term>
+    <term name="software">תוכנה</term>
     <term name="song">audio recording</term>
     <term name="speech">presentation</term>
     <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
+    <term name="thesis">תזה</term>
     <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="webpage">עמוד אינטרנט</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
+    <term name="article-journal" form="short">מאמר</term>
     <term name="article-magazine" form="short">mag. art.</term>
     <term name="article-newspaper" form="short">newspaper art.</term>
     <!-- book is in the list of locator terms -->
@@ -142,7 +146,7 @@
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
     <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
+    <term name="interview" form="short">ראיון</term>
     <term name="manuscript" form="short">MS</term>
     <term name="motion_picture" form="short">video rec.</term>
     <term name="report" form="short">rep.</term>
@@ -150,30 +154,41 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">לספירה</term>
     <term name="bc">לפני הספירה</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="bce">לספירה</term>
+    <term name="ce">לפני הספירה</term>
 
     <!-- PUNCTUATION -->
-    <term name="open-quote">“</term>
-    <term name="close-quote">”</term>
-    <term name="open-inner-quote">‘</term>
-    <term name="close-inner-quote">’</term>
-    <term name="page-range-delimiter">–</term>
+    <term name="open-quote">"</term>
+    <term name="close-quote">"</term>
+    <term name="open-inner-quote">'</term>
+    <term name="close-inner-quote">'</term>
+    <term name="page-range-delimiter">-</term>
     <term name="colon">:</term>
     <term name="comma">,</term>
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal">th</term>
-    <term name="ordinal-01">st</term>
-    <term name="ordinal-02">nd</term>
-    <term name="ordinal-03">rd</term>
-    <term name="ordinal-11">th</term>
-    <term name="ordinal-12">th</term>
-    <term name="ordinal-13">th</term>
+    <term name="ordinal-01">1</term>
+    <term name="ordinal-02">2</term>
+    <term name="ordinal-03">3</term>
+    <term name="ordinal-04">4</term>
+    <term name="ordinal-05">5</term>
+    <term name="ordinal-06">6</term>
+    <term name="ordinal-07">7</term>
+    <term name="ordinal-08">8</term>
+    <term name="ordinal-09">9</term>
+    <term name="ordinal-10">10</term>
 
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">ראשון</term>
@@ -188,54 +203,26 @@
     <term name="long-ordinal-10">עשירי</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>ספר</single>
       <multiple>ספרים</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>פרק</single>
       <multiple>פרקים</multiple>
@@ -244,9 +231,17 @@
       <single>טור</single>
       <multiple>טורים</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>משוואה</single>
+      <multiple>משוואות</multiple>
+    </term>
     <term name="figure">
-      <single>figure</single>
-      <multiple>figures</multiple>
+      <single>איור</single>
+      <multiple>איורים</multiple>
     </term>
     <term name="folio">
       <single>פוליו</single>
@@ -272,10 +267,6 @@
       <single>עמוד</single>
       <multiple>עמודים</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>עמוד</single>
-      <multiple>עמודים</multiple>
-    </term>
     <term name="paragraph">
       <single>פיסקה</single>
       <multiple>פיסקאות</multiple>
@@ -284,6 +275,14 @@
       <single>חלק</single>
       <multiple>חלקים</multiple>
     </term>
+    <term name="rule">
+      <single>חוק</single>
+      <multiple>חוקים</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>סעיף</single>
       <multiple>סעיפים</multiple>
@@ -292,9 +291,25 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
-      <single>בית</single>
-      <multiple>בתים</multiple>
+      <single>פסוק</single>
+      <multiple>פסוקים</multiple>
     </term>
     <term name="volume">
       <single>כרך</single>
@@ -302,76 +317,76 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short"/>
+    <term name="chapter" form="short">פ'</term>
+    <term name="column" form="short">ט'</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
+    <term name="figure" form="short">א.</term>
+    <term name="folio" form="short">פול'</term>
+    <term name="issue" form="short">מס'</term>
+    <term name="line" form="short">ש'</term>
+    <term name="note" form="short">הע'</term>
+    <term name="opus" form="short">אופ'</term>
+    <term name="page" form="short">
+      <single>'עמ</single>
+      <multiple>'עמ</multiple>
+    </term>
+    <term name="paragraph" form="short">פ.</term>
+    <term name="part" form="short">חלק</term>
+    <term name="rule" form="short">
       <single>r.</single>
-      <multiple>rr.</multiple>						 
+      <multiple>rr.</multiple>
     </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
+    <term name="scene" form="short">
+      <single>סצנה</single>
+      <multiple>סצנות</multiple>
     </term>
-    <term name="table" form="short">			 
+    <term name="section" form="short">סע'</term>
+    <term name="sub-verbo" form="short">
+      <single>s.v.</single>
+      <multiple>s.vv.</multiple>
+    </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
       <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
+      <multiple>tbls.</multiple>
     </term>
     <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+      <single/>
+      <multiple/>
     </term>
-    <term name="title-locator" form="short">			 
+    <term name="title-locator" form="short">
       <single>tit.</single>
       <multiple>tits.</multiple>
     </term>
-    <term name="book" form="short">bk</term>
-    <term name="chapter" form="short">chap</term>
-    <term name="column" form="short">col</term>
-    <term name="figure" form="short">fig</term>
-    <term name="folio" form="short">f</term>
-    <term name="issue" form="short">no</term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
-    <term name="opus" form="short">op</term>
-    <term name="page" form="short">
-      <single>'עמ</single>
-      <multiple>'עמ</multiple>
-    </term>
-    <term name="number-of-pages" form="short">
-      <single>'עמ</single>
-      <multiple>'עמ</multiple>
-    </term>
-    <term name="paragraph" form="short">para</term>
-    <term name="part" form="short">pt</term>
-    <term name="section" form="short">ס'</term>
-    <term name="sub-verbo" form="short">
-      <single>s.v.</single>
-      <multiple>s.vv.</multiple>
-    </term>
     <term name="verse" form="short">
-      <single>v</single>
-      <multiple>vv</multiple>
+      <single>פס'</single>
+      <multiple>פס'</multiple>
     </term>
     <term name="volume" form="short">
-      <single>vol</single>
-      <multiple>vols</multiple>
+      <single>כרך</single>
+      <multiple>כרכים</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -381,15 +396,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>פרק</single>
+      <multiple>פרקים</multiple>
+    </term>
+    <term name="citation-number">
+      <single>ציטוט</single>
+      <multiple>ציטוטים</multiple>
+    </term>
+    <term name="collection-number">
+      <single>מספר</single>
+      <multiple>מספרים</multiple>
+    </term>
+    <term name="edition">
+      <single>מהדורה</single>
+      <multiple>מהדורות</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>הערה</single>
+      <multiple>הערות</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>עמוד</single>
+      <multiple>עמודים</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>כרך</single>
+      <multiple>כרכים</multiple>
+    </term>
+    <term name="page-first">
+      <single>עמוד</single>
+      <multiple>עמודים</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">גירסה</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>פרק.</single>
+      <multiple>פרקים</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">no</term>
+    <term name="edition" form="short">מהדורה</term>
+    <term name="first-reference-note-number" form="short">הע'</term>
+    <term name="number" form="short">
+      <single>מס׳</single>
+      <multiple>מס׳</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>'עמ</single>
+      <multiple>'עמ</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>כרך</single>
+      <multiple>כרכים</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>עמ׳</single>
+      <multiple>עמ׳</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -398,6 +496,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>במאי</single>
+      <multiple>במאים</multiple>
+    </term>
+    <term name="editor">
+      <single>עורך</single>
+      <multiple>עורכים</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>בתרגום ועריכת</single>
+      <multiple>בתרגום ועריכת:</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>עורך ראשי</single>
+      <multiple>עורכים ראשיים</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -410,6 +528,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>איור</single>
+      <multiple>איור</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -418,6 +541,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -426,6 +550,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -434,29 +560,9 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>במאי</single>
-      <multiple>במאים</multiple>
-    </term>
-    <term name="editor">
-      <single>עורך</single>
-      <multiple>עורכים</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>עורך ראשי</single>
-      <multiple>עורכים ראשיים</multiple>
-    </term>
-    <term name="illustrator">
-      <single>מאייר</single>
-      <multiple>מאיירים</multiple>
-    </term>
     <term name="translator">
-      <single>מתרגם</single>
-      <multiple>מתרגמים</multiple>
-    </term>
-    <term name="editortranslator">
-      <single>editor &amp; translator</single>
-      <multiple>editors &amp; translators</multiple>
+      <single>תרגום</single>
+      <multiple>תרגום</multiple>
     </term>
 
     <!-- SHORT ROLE FORMS -->
@@ -472,10 +578,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>בימוי</single>
+      <multiple>בימוי:</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>בעריכת</single>
+      <multiple>בעריכת:</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>עריכה ותרגום</single>
+      <multiple>עריכה ותרגום:</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ע.ר.</single>
+      <multiple>עריכה ראשית:</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>איור</single>
+      <multiple>איור:</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -500,75 +630,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed</single>
-      <multiple>eds</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
-      <single>tran</single>
-      <multiple>trans</multiple>
-    </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; tran.</single>
-      <multiple>eds. &amp; trans.</multiple>
+      <single>בתרגום</single>
+      <multiple>בתרגום:</multiple>
     </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">על ידי</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">בוים ע"י</term>
+    <term name="editor" form="verb">נערך ע"י</term>
+    <term name="editor-translator" form="verb">תורגם ונכרך על ידי:</term>
+    <term name="editortranslator" form="verb">תורגם ונכרך על ידי:</term>
+    <term name="editorial-director" form="verb">בוים ע"י</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">אויר ע"י</term>
+    <term name="interviewer" form="verb">רואיין ע"י</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">בוים ע"י</term>
-    <term name="editor" form="verb">נערך ע"י</term>
-    <term name="editorial-director" form="verb">בוים ע"י</term>
-    <term name="illustrator" form="verb">אויר ע"י</term>
-    <term name="interviewer" form="verb">רואיין ע"י</term>
     <term name="recipient" form="verb">אל</term>
     <term name="reviewed-author" form="verb">ע"י</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">תורגם ע"י</term>
-    <term name="editortranslator" form="verb">edited &amp; translated by</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">בימוי</term>
+    <term name="editor" form="verb-short">עריכה:</term>
+    <term name="editor-translator" form="verb-short">עריכה ותרגום:</term>
+    <term name="editortranslator" form="verb-short">עריכה ותרגום:</term>
+    <term name="editorial-director" form="verb-short">עריכה ראשית:</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">מאיירים:</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
-    <term name="translator" form="verb-short">trans</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="translator" form="verb-short">תרגום: </term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">ינואר</term>
@@ -585,23 +699,23 @@
     <term name="month-12">דצמבר</term>
 
     <!-- SHORT MONTH FORMS -->
-    <term name="month-01" form="short">Jan</term>
-    <term name="month-02" form="short">Feb</term>
-    <term name="month-03" form="short">Mar</term>
-    <term name="month-04" form="short">Apr</term>
-    <term name="month-05" form="short">May</term>
-    <term name="month-06" form="short">Jun</term>
-    <term name="month-07" form="short">Jul</term>
-    <term name="month-08" form="short">Aug</term>
-    <term name="month-09" form="short">Sep</term>
-    <term name="month-10" form="short">Oct</term>
-    <term name="month-11" form="short">Nov</term>
-    <term name="month-12" form="short">Dec</term>
+    <term name="month-01" form="short">ינו'</term>
+    <term name="month-02" form="short">פב'</term>
+    <term name="month-03" form="short">מרץ</term>
+    <term name="month-04" form="short">אפר'</term>
+    <term name="month-05" form="short">מאי</term>
+    <term name="month-06" form="short">יונ'</term>
+    <term name="month-07" form="short">יול'</term>
+    <term name="month-08" form="short">אוג'</term>
+    <term name="month-09" form="short">ספט'</term>
+    <term name="month-10" form="short">אוק'</term>
+    <term name="month-11" form="short">נוב'</term>
+    <term name="month-12" form="short">דצמ'</term>
 
     <!-- SEASONS -->
-    <term name="season-01">Spring</term>
-    <term name="season-02">Summer</term>
-    <term name="season-03">Autumn</term>
-    <term name="season-04">Winter</term>
+    <term name="season-01">אביב</term>
+    <term name="season-02">קיץ</term>
+    <term name="season-03">סתיו</term>
+    <term name="season-04">חורף</term>
   </terms>
 </locale>
diff --git a/locales/hi-IN.xml b/locales/hi-IN.xml
--- a/locales/hi-IN.xml
+++ b/locales/hi-IN.xml
@@ -6,7 +6,7 @@
       <email>neha-srivastava@outlook.com</email>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2021-02-22T12:13:02+05:30</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="true"/>
   <date form="text">
@@ -20,26 +20,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">अंतिम उपयोग</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">व</term>
+    <term name="and others">व अन्य</term>
+    <term name="anonymous">अज्ञात</term>
+    <term name="at">पर</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">पर उपलब्ध</term>
+    <term name="by">द्वारा</term>
+    <term name="circa">सन </term>
+    <term name="cited">उल्लेखित</term>
+    <term name="et-al">इत्यादि</term>
     <term name="film">film</term>
+    <term name="forthcoming">आगामी</term>
+    <term name="from">से</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">उक्त</term>
+    <term name="in">में</term>
+    <term name="in press">मुद्रण में</term>
+    <term name="internet">इंटर्नेट</term>
+    <term name="letter">पत्र</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">दिनांक अज्ञात</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">ऑनलाइन</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">personal communication</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">पर प्रस्तुत</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>संदर्भ</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="retrieved">पुनर्प्राप्त</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scale</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -47,46 +73,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">अंतिम उपयोग</term>
-    <term name="and">व</term>
-    <term name="and others">व अन्य</term>
-    <term name="anonymous">अज्ञात</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">अज्ञात</term>
-    <term name="at">पर</term>
-    <term name="available at">पर उपलब्ध</term>
-    <term name="by">द्वारा</term>
-    <term name="circa">सन </term>
     <term name="circa" form="short">सन.</term>
-    <term name="cited">उल्लेखित</term>
-    <term name="edition">
-      <single>संस्करण</single>
-      <multiple>संस्करण</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
-    <term name="et-al">इत्यादि</term>
-    <term name="forthcoming">आगामी</term>
-    <term name="from">से</term>
-    <term name="ibid">उक्त</term>
-    <term name="in">में</term>
-    <term name="in press">मुद्रण में</term>
-    <term name="internet">इंटर्नेट</term>
-    <term name="letter">पत्र</term>
-    <term name="no date">दिनांक अज्ञात</term>
     <term name="no date" form="short">n.d.</term>
-    <term name="online">ऑनलाइन</term>
-    <term name="presented at">पर प्रस्तुत</term>
-    <term name="reference">
-      <single>संदर्भ</single>
-      <multiple>references</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">पुनर्प्राप्त</term>
-    <term name="scale">scale</term>
-    <term name="version">संस्करण</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -151,6 +152,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">CE</term>
     <term name="bc">BCE</term>
@@ -169,83 +178,55 @@
 
     <!-- ORDINALS -->
     <term name="ordinal">वाँ</term>
-    <term name="ordinal-01"></term>
-    <term name="ordinal-02"></term>
-    <term name="ordinal-03"></term>
-    <term name="ordinal-04"></term>
-    <term name="ordinal-06"></term>
+    <term name="ordinal-01"/>
+    <term name="ordinal-02"/>
+    <term name="ordinal-03"/>
+    <term name="ordinal-04"/>
+    <term name="ordinal-06"/>
 
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">पहला</term>
-    <term name="long-ordinal-01" gender-form="feminine">पहली</term>
     <term name="long-ordinal-02">दूसरा</term>
-    <term name="long-ordinal-02" gender-form="feminine">दूसरी</term>
     <term name="long-ordinal-03">तीसरा</term>
-    <term name="long-ordinal-03" gender-form="feminine">तीसरी</term>
     <term name="long-ordinal-04">चौथा</term>
-    <term name="long-ordinal-04" gender-form="feminine">चौथी</term>
     <term name="long-ordinal-05">पाँचवा</term>
-    <term name="long-ordinal-05" gender-form="feminine">पाँचवी</term>
     <term name="long-ordinal-06">छठा</term>
-    <term name="long-ordinal-06" gender-form="feminine">छठी</term>
     <term name="long-ordinal-07">सातवाँ</term>
-    <term name="long-ordinal-07" gender-form="feminine">सातवीं</term>
     <term name="long-ordinal-08">आठवाँ</term>
-    <term name="long-ordinal-08" gender-form="feminine">आठवीं</term>
     <term name="long-ordinal-09">नवाँ</term>
-    <term name="long-ordinal-09" gender-form="feminine">नौवीं</term>
     <term name="long-ordinal-10">दसवाँ</term>
+    <term name="long-ordinal-01" gender-form="feminine">पहली</term>
+    <term name="long-ordinal-02" gender-form="feminine">दूसरी</term>
+    <term name="long-ordinal-03" gender-form="feminine">तीसरी</term>
+    <term name="long-ordinal-04" gender-form="feminine">चौथी</term>
+    <term name="long-ordinal-05" gender-form="feminine">पाँचवी</term>
+    <term name="long-ordinal-06" gender-form="feminine">छठी</term>
+    <term name="long-ordinal-07" gender-form="feminine">सातवीं</term>
+    <term name="long-ordinal-08" gender-form="feminine">आठवीं</term>
+    <term name="long-ordinal-09" gender-form="feminine">नौवीं</term>
     <term name="long-ordinal-10" gender-form="feminine">दसवीं</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>पुस्तक</single>
       <multiple>पुस्तकें</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>अध्याय</single>
       <multiple>अध्याय</multiple>
@@ -254,6 +235,14 @@
       <single>कॉलम</single>
       <multiple>columns</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>चित्र</single>
       <multiple>चित्रों</multiple>
@@ -272,7 +261,7 @@
     </term>
     <term name="note">
       <single>नोट</single>
-      <multiple>notes</multiple>
+      <multiple>टिप्पणियाँ</multiple>
     </term>
     <term name="opus">
       <single>opus</single>
@@ -282,10 +271,6 @@
       <single>पृष्ठ</single>
       <multiple>पृष्ठ</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>पृष्ठ संख्या</single>
-      <multiple>पृष्ठों की संख्या</multiple>
-    </term>
     <term name="paragraph">
       <single>अनुच्छेद</single>
       <multiple>paragraphs</multiple>
@@ -294,6 +279,14 @@
       <single>भाग</single>
       <multiple>parts</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>अनुभाग</single>
       <multiple>sections</multiple>
@@ -302,6 +295,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>पद</single>
       <multiple>verses</multiple>
@@ -312,42 +321,14 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
     <term name="book" form="short">
       <single>bk.</single>
       <multiple>bks.</multiple>
@@ -360,6 +341,14 @@
       <single>col.</single>
       <multiple>cols.</multiple>
     </term>
+    <term name="elocation" form="short">
+      <single>loc.</single>
+      <multiple>locs.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>eq.</single>
+      <multiple>eqs.</multiple>
+    </term>
     <term name="figure" form="short">
       <single>fig.</single>
       <multiple>figs.</multiple>
@@ -388,10 +377,6 @@
       <single>पृ.</single>
       <multiple>पृ.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>पृ. स.</single>
-      <multiple>पृ. स.</multiple>
-    </term>
     <term name="paragraph" form="short">
       <single>para.</single>
       <multiple>paras.</multiple>
@@ -400,6 +385,14 @@
       <single>pt.</single>
       <multiple>pts.</multiple>
     </term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">
       <single>sec.</single>
       <multiple>secs.</multiple>
@@ -408,6 +401,22 @@
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -417,7 +426,7 @@
       <multiple>vols.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -427,15 +436,104 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>संख्या</single>
+      <multiple>संख्याएँ</multiple>
+    </term>
+    <term name="edition">
+      <single>संस्करण</single>
+      <multiple>संस्करण</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>नोट</single>
+      <multiple>टिप्पणियाँ</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>पृष्ठ संख्या</single>
+      <multiple>पृष्ठों की संख्या</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">संस्करण</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>n.</single>
+      <multiple>nn.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>पृ. स.</single>
+      <multiple>पृ. स.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -444,6 +542,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>निर्देशक</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>सम्पादक</single>
+      <multiple>editors</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>सम्पादक &amp; अनुवादक</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>सम्पादक &amp; अनुवादक</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>सम्पादक</single>
+      <multiple>editors</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -456,6 +574,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>चित्रकार</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -464,6 +587,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -472,6 +596,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -480,30 +606,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>निर्देशक</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>सम्पादक</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>सम्पादक</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="illustrator">
-      <single>चित्रकार</single>
-      <multiple>illustrators</multiple>
-    </term>
     <term name="translator">
       <single>अनुवादक</single>
       <multiple>translators</multiple>
     </term>
-    <term name="editortranslator">
-      <single>सम्पादक &amp; अनुवादक</single>
-      <multiple>editors &amp; translators</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -518,10 +624,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -546,75 +676,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>tran.</single>
       <multiple>trans.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; tran.</single>
-      <multiple>eds. &amp; trans.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">द्वारा</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">निर्देशन</term>
+    <term name="editor" form="verb">सम्पादन</term>
+    <term name="editor-translator" form="verb">सम्पादन &amp; अनुवाद</term>
+    <term name="editortranslator" form="verb">सम्पादन &amp; अनुवाद</term>
+    <term name="editorial-director" form="verb">निर्देशन</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">चित्रकारी</term>
+    <term name="interviewer" form="verb">साक्षात्कारकर्ता</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">द्वारा</term>
-    <term name="director" form="verb">निर्देशन</term>
-    <term name="editor" form="verb">सम्पादन</term>
-    <term name="editorial-director" form="verb">निर्देशन</term>
-    <term name="illustrator" form="verb">चित्रकारी</term>
-    <term name="interviewer" form="verb">साक्षात्कारकर्ता</term>
     <term name="recipient" form="verb">सेवा में</term>
     <term name="reviewed-author" form="verb">द्वारा</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">अनुवाद </term>
-    <term name="editortranslator" form="verb">सम्पादन &amp; अनुवाद</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir. by</term>
+    <term name="editor" form="verb-short">ed. by</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editorial-director" form="verb-short">ed. by</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus. by</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir. by</term>
-    <term name="editor" form="verb-short">ed. by</term>
-    <term name="editorial-director" form="verb-short">ed. by</term>
-    <term name="illustrator" form="verb-short">illus. by</term>
     <term name="translator" form="verb-short">trans. by</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">जनवरी</term>
diff --git a/locales/hr-HR.xml b/locales/hr-HR.xml
--- a/locales/hr-HR.xml
+++ b/locales/hr-HR.xml
@@ -5,7 +5,7 @@
       <name>tvrbanec</name>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,26 +19,52 @@
     <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">pristupljeno</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">i</term>
+    <term name="and others">i dr.</term>
+    <term name="anonymous">anonimno</term>
+    <term name="at">na</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">dostupno na</term>
+    <term name="by">od</term>
+    <term name="circa">oko</term>
+    <term name="cited">citirano</term>
+    <term name="et-al">i sur.</term>
     <term name="film">film</term>
+    <term name="forthcoming">u pripremi</term>
+    <term name="from">od</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">u</term>
+    <term name="in press">u tisku</term>
+    <term name="internet">internet</term>
+    <term name="letter">pismo</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">bez datuma</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">na internetu</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">osobna komunikacija</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">predstavljeno na</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>reference</single>
+      <multiple>reference</multiple>
+    </term>
+    <term name="retrieved">preuzeto</term>
+    <term name="review-of">review of</term>
+    <term name="scale">skala</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -46,46 +72,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">pristupljeno</term>
-    <term name="and">i</term>
-    <term name="and others">i ostali</term>
-    <term name="anonymous">anonimno</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anon.</term>
-    <term name="at">na</term>
-    <term name="available at">dostupno na</term>
-    <term name="by">od</term>
-    <term name="circa">oko</term>
     <term name="circa" form="short">oko</term>
-    <term name="cited">citirano</term>
-    <term name="edition">
-      <single>izdanje</single>
-      <multiple>izdanja</multiple>
-    </term>
-    <term name="edition" form="short">izd.</term>
-    <term name="et-al">i ostali</term>
-    <term name="forthcoming">u pripremi</term>
-    <term name="from">od</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">u</term>
-    <term name="in press">u tisku</term>
-    <term name="internet">internet</term>
-    <term name="letter">pismo</term>
-    <term name="no date">bez datuma</term>
     <term name="no date" form="short">bez dat.</term>
-    <term name="online">na internetu</term>
-    <term name="presented at">predstavljeno na</term>
-    <term name="reference">
-      <single>reference</single>
-      <multiple>reference</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">preuzeto</term>
-    <term name="scale">skala</term>
-    <term name="version">verzija</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -150,8 +151,16 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad"></term>
+    <term name="ad"/>
     <term name="bc">pr. Kr.</term>
     <term name="bce">BCE</term>
     <term name="ce">CE</term>
@@ -182,54 +191,26 @@
     <term name="long-ordinal-10">deseti</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>knjiga</single>
       <multiple>knjige</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>poglavlje</single>
       <multiple>poglavlja</multiple>
@@ -238,6 +219,14 @@
       <single>stupac</single>
       <multiple>stupci</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>crtež</single>
       <multiple>crteži</multiple>
@@ -266,10 +255,6 @@
       <single>stranica</single>
       <multiple>stranice</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>stranica</single>
-      <multiple>stranice</multiple>
-    </term>
     <term name="paragraph">
       <single>pasus</single>
       <multiple>pasusi</multiple>
@@ -278,6 +263,14 @@
       <single>dio</single>
       <multiple>dijelova</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>odjeljak</single>
       <multiple>odjeljci</multiple>
@@ -286,6 +279,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>stih</single>
       <multiple>stihovi</multiple>
@@ -296,45 +305,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">knj.</term>
+    <term name="chapter" form="short">pogl.</term>
+    <term name="column" form="short">stup.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">knj.</term>
-    <term name="chapter" form="short">pogl.</term>
-    <term name="column" form="short">stup.</term>
     <term name="figure" form="short">crt.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">izd.</term>
@@ -345,17 +334,37 @@
       <single>str.</single>
       <multiple>str.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>str.</single>
-      <multiple>str.</multiple>
-    </term>
     <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">dio</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">od.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>st.</single>
       <multiple>st.</multiple>
@@ -365,7 +374,7 @@
       <multiple>sv.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -375,15 +384,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>izdanje</single>
+      <multiple>izdanja</multiple>
+    </term>
+    <term name="edition">
+      <single>izdanje</single>
+      <multiple>izdanja</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>bilješka</single>
+      <multiple>bilješke</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>stranica</single>
+      <multiple>stranice</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">verzija</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">izd.</term>
+    <term name="edition" form="short">izd.</term>
+    <term name="first-reference-note-number" form="short">bilj.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>str.</single>
+      <multiple>str.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -392,6 +484,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>voditelj</single>
+      <multiple>voditelji</multiple>
+    </term>
+    <term name="editor">
+      <single>urednik</single>
+      <multiple>urednici</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>urednik &amp; prevoditelj</single>
+      <multiple>urednici &amp; prevoditelji</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>urednik &amp; prevoditelj</single>
+      <multiple>urednici &amp; prevoditelji</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>urednik</single>
+      <multiple>urednici</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -404,6 +516,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>ilustrator</single>
+      <multiple>ilustratori</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -412,6 +529,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -420,6 +538,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -428,30 +548,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>voditelj</single>
-      <multiple>voditelji</multiple>
-    </term>
-    <term name="editor">
-      <single>urednik</single>
-      <multiple>urednici</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>urednik</single>
-      <multiple>urednici</multiple>
-    </term>
-    <term name="illustrator">
-      <single>ilustrator</single>
-      <multiple>ilustratori</multiple>
-    </term>
     <term name="translator">
       <single>prevoditelj</single>
       <multiple>prevoditelji</multiple>
     </term>
-    <term name="editortranslator">
-      <single>urednik &amp; prevoditelj</single>
-      <multiple>urednici &amp; prevoditelji</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -466,10 +566,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>vod.</single>
+      <multiple>vod.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ur.</single>
+      <multiple>ur.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ur. &amp; prev.</single>
+      <multiple>ur. &amp; prev.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ur. &amp; prev.</single>
+      <multiple>ur. &amp; prev.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ur.-vod.</single>
+      <multiple>ur.-vod.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>il.</single>
+      <multiple>il.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -494,75 +618,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>vod.</single>
-      <multiple>vod.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ur.</single>
-      <multiple>ur.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ur.-vod.</single>
-      <multiple>ur.-vod.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>il.</single>
-      <multiple>il.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>prev.</single>
       <multiple>prev.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ur. &amp; prev.</single>
-      <multiple>ur. &amp; prev.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">od</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">vodio</term>
+    <term name="editor" form="verb">uredio</term>
+    <term name="editor-translator" form="verb">uredio &amp; preveo</term>
+    <term name="editortranslator" form="verb">uredio &amp; preveo</term>
+    <term name="editorial-director" form="verb">uredio</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">ilustrirao</term>
+    <term name="interviewer" form="verb">intervjuirao</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">od</term>
-    <term name="director" form="verb">vodio</term>
-    <term name="editor" form="verb">uredio</term>
-    <term name="editorial-director" form="verb">uredio</term>
-    <term name="illustrator" form="verb">ilustrirao</term>
-    <term name="interviewer" form="verb">intervjuirao</term>
     <term name="recipient" form="verb">primatelj</term>
     <term name="reviewed-author" form="verb">pregledao</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">preveo</term>
-    <term name="editortranslator" form="verb">uredio &amp; preveo</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">vod.</term>
+    <term name="editor" form="verb-short">ur.</term>
+    <term name="editor-translator" form="verb-short">ur. &amp; prev.</term>
+    <term name="editortranslator" form="verb-short">ur. &amp; prev.</term>
+    <term name="editorial-director" form="verb-short">ur. vod.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">ilus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">vod.</term>
-    <term name="editor" form="verb-short">ur.</term>
-    <term name="editorial-director" form="verb-short">ur. vod.</term>
-    <term name="illustrator" form="verb-short">ilus.</term>
     <term name="translator" form="verb-short">prev.</term>
-    <term name="editortranslator" form="verb-short">ur. &amp; prev.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">siječanj</term>
diff --git a/locales/hu-HU.xml b/locales/hu-HU.xml
--- a/locales/hu-HU.xml
+++ b/locales/hu-HU.xml
@@ -4,8 +4,11 @@
     <translator>
       <name>Miklos Vajna</name>
     </translator>
+    <translator>
+      <name>Simon Farády</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2014-06-17T09:56:35+02:00</updated>
+    <updated>2026-03-29T11:35:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,137 +22,146 @@
     <date-part name="day" form="numeric-leading-zeros" prefix="."/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">személyes kommunikáció</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">elérés</term>
+    <term name="advance-online-publication">előzetes online publikáció</term>
+    <term name="album">album</term>
     <term name="and">és</term>
     <term name="and others">és mások</term>
     <term name="anonymous">szerző nélkül</term>
-    <term name="anonymous" form="short">sz. n.</term>
-    <term name="at"></term>
+    <term name="at"/>
+    <term name="audio-recording">hangfelvétel</term>
     <term name="available at">elérhető</term>
     <term name="by">by</term>
     <term name="circa">körülbelül</term>
-    <term name="circa" form="short">kb.</term>
     <term name="cited">idézi</term>
-    <term name="edition">
-      <single>kiadás</single>
-      <multiple>kiadás</multiple>
-    </term>
-    <term name="edition" form="short">kiad.</term>
     <term name="et-al">és mtsai.</term>
+    <term name="film">film</term>
     <term name="forthcoming">megjelenés alatt</term>
     <term name="from">forrás</term>
+    <term name="henceforth">a továbbiakban</term>
     <term name="ibid">uo.</term>
     <term name="in">in</term>
     <term name="in press">nyomtatás alatt</term>
     <term name="internet">internet</term>
     <term name="letter">levél</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">évszám nélkül</term>
-    <term name="no date" form="short">é. n.</term>
+    <term name="no-place">hely nélkül</term>
+    <term name="no-publisher">kiadó nélkül</term> <!-- sine nomine -->
+    <term name="on">on</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">eredeti mű kiadva</term>
+    <term name="personal-communication">személyes kommunikáció</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcast epizód</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">előadás</term>
+    <term name="radio-broadcast">rádióadás</term>
+    <term name="radio-series">rádiósorozat</term>
+    <term name="radio-series-episode">rádiósorozat epizód</term>
     <term name="reference">
       <single>hivatkozás</single>
       <multiple>hivatkozás</multiple>
     </term>
+    <term name="retrieved">elérés</term>
+    <term name="review-of">recenzió</term>
+    <term name="scale">skála</term>
+    <term name="special-issue">különszám</term>
+    <term name="special-section">különleges rovat</term>
+    <term name="television-broadcast">televíziós adás</term>
+    <term name="television-series">televíziós sorozat</term>
+    <term name="television-series-episode">televíziós sorozat epizód</term>
+    <term name="video">videó</term>
+    <term name="working-paper">munkadolgozat</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">sz. n.</term>
+    <term name="circa" form="short">kb.</term>
+    <term name="no date" form="short">é. n.</term>
+    <term name="no-place" form="short">h. n.</term>
+    <term name="no-publisher" form="short">k. n.</term>
     <term name="reference" form="short">
       <single>hiv.</single>
       <multiple>hiv.</multiple>
     </term>
-    <term name="retrieved">elérés</term>
-    <term name="scale">skála</term>
-    <term name="version">verzió</term>
+    <term name="review-of" form="short">rec.</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article-journal">folyóiratcikk</term>
+    <term name="article-magazine">magazincikk</term>
+    <term name="article-newspaper">újságcikk</term>
+    <term name="bill">törvényjavaslat</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">közvetítés</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">klasszikus</term>
+    <term name="collection">gyűjtemény</term>
+    <term name="dataset">adatbázis</term>
+    <term name="document">dokumentum</term>
+    <term name="entry">cikk</term>
+    <term name="entry-dictionary">szótár-bejegyzés</term>
+    <term name="entry-encyclopedia">enciklopédia-bejegyzés</term>
+    <term name="event">esemény</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">grafika</term>
+    <term name="hearing">tárgyalás</term>
     <term name="interview">interjú</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="legal_case">jogi eset</term>
+    <term name="legislation">jogszabály</term>
+    <term name="manuscript">kézirat</term>
+    <term name="map">térkép</term>
+    <term name="motion_picture">mozgókép</term>
+    <term name="musical_score">zenei partitúra</term>
+    <term name="pamphlet">röpirat</term>
+    <term name="paper-conference">konferencia dolgozat</term>
+    <term name="patent">szabadalom</term>
+    <term name="performance">előadás</term>
+    <term name="periodical">folyóirat</term>
     <term name="personal_communication">személyes kommunikáció</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">bejegyzés</term>
+    <term name="post-weblog">blogbejegyzés</term>
+    <term name="regulation">előírás</term>
+    <term name="report">jelentés</term>
+    <term name="review">recenzió</term>
+    <term name="review-book">könyvrecenzió</term>
+    <term name="software">szoftver</term>
+    <term name="song">hangfelvétel</term>
+    <term name="speech">előadás</term>
+    <term name="standard">szabvány</term>
+    <term name="thesis">dolgozat</term>
+    <term name="treaty">egyezmény</term>
+    <term name="webpage">weboldal</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">foly.c.</term>
+    <term name="article-magazine" form="short">mag.c.</term>
+    <term name="article-newspaper" form="short">újs.c.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">dok.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="graphic" form="short">graf.</term>
+    <term name="interview" form="short">interjú</term>
+    <term name="manuscript" form="short">kézir.</term>
+    <term name="motion_picture" form="short">mozgókép</term>
+    <term name="report" form="short">jel.</term>
+    <term name="review" form="short">rec.</term>
+    <term name="review-book" form="short">könyvrec.</term>
+    <term name="song" form="short">hangfelv.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">beszámolója</term>
+    <term name="review" form="verb">recenziója</term>
+    <term name="review-book" form="verb">könyvrecenziója</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">Kr. u.</term>
     <term name="bc">Kr. e.</term>
@@ -182,54 +194,26 @@
     <term name="long-ordinal-10">tizedik</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>törvénycikk</single>
+      <multiple>törvénycikk</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>függelék</single>
+      <multiple>függelék</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>cikk</single>
+      <multiple>cikk</multiple>
     </term>
     <term name="book">
       <single>könyv</single>
       <multiple>könyv</multiple>
     </term>
+    <term name="canon">
+      <single>kánon</single>
+      <multiple>kánon</multiple>
+    </term>
     <term name="chapter">
       <single>fejezet</single>
       <multiple>fejezet</multiple>
@@ -238,6 +222,14 @@
       <single>oszlop</single>
       <multiple>oszlop</multiple>
     </term>
+    <term name="elocation">
+      <single>cikkazonosító</single>
+      <multiple>cikkazonosító</multiple>
+    </term>
+    <term name="equation">
+      <single>egyenlet</single>
+      <multiple>egyenletek</multiple>
+    </term>
     <term name="figure">
       <single>ábra</single>
       <multiple>ábra</multiple>
@@ -266,10 +258,6 @@
       <single>oldal</single>
       <multiple>oldal</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>oldal</single>
-      <multiple>oldal</multiple>
-    </term>
     <term name="paragraph">
       <single>bekezdés</single>
       <multiple>bekezdés</multiple>
@@ -278,6 +266,14 @@
       <single>rész</single>
       <multiple>rész</multiple>
     </term>
+    <term name="rule">
+      <single>szabály</single>
+      <multiple>szabály</multiple>
+    </term>
+    <term name="scene">
+      <single>jelenet</single>
+      <multiple>jelenet</multiple>
+    </term>
     <term name="section">
       <single>szakasz</single>
       <multiple>szakasz</multiple>
@@ -286,6 +282,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>melléklet</single>
+      <multiple>melléklet</multiple>
+    </term>
+    <term name="table">
+      <single>táblázat</single>
+      <multiple>táblázat</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>rész</single>
+      <multiple>rész</multiple>
+    </term>
     <term name="verse">
       <single>versszak</single>
       <multiple>versszak</multiple>
@@ -296,76 +308,76 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
-    </term>
-    <term name="article-locator" form="short">			 
-      <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix" form="short">
+      <single>függ.</single>
+      <multiple>függ.</multiple>
     </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="article-locator" form="short">
+      <single>cikk</single>
+      <multiple>cikk</multiple>
     </term>
     <term name="book" form="short">könyv</term>
     <term name="chapter" form="short">fej.</term>
     <term name="column" form="short">oszl.</term>
+    <term name="elocation" form="short">
+      <single>cikkazon.</single>
+      <multiple>cikkazon.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>egyenlet</single>
+      <multiple>egyenlet</multiple>
+    </term>
     <term name="figure" form="short">ábr.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">sz.</term>
     <term name="line" form="short">s.</term>
     <term name="note" form="short">j.</term>
-    <term name="opus" form="short">op.</term>
+    <term name="opus" form="short">mű</term>
     <term name="page" form="short">
       <single>o.</single>
       <multiple>o.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>o.</single>
-      <multiple>o.</multiple>
-    </term>
     <term name="paragraph" form="short">bek.</term>
     <term name="part" form="short">rész</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>jelenet</single>
+      <multiple>jelenet</multiple>
+    </term>
     <term name="section" form="short">szak.</term>
     <term name="sub-verbo" form="short">
       <single>s. v.</single>
       <multiple>s. vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>mell.</single>
+      <multiple>mell.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tábl.</single>
+      <multiple>tábl.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>rész</single>
+      <multiple>rész</multiple>
+    </term>
     <term name="verse" form="short">
-      <single>vsz.</single>
-      <multiple>vsz.</multiple>
+      <single>vers</single>
+      <multiple>vers</multiple>
     </term>
     <term name="volume" form="short">
       <single>köt.</single>
       <multiple>köt.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -375,59 +387,109 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>fejezet</single>
+      <multiple>fejezet</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>hivatkozás</single>
+      <multiple>hivatkozás</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>szám</single>
+      <multiple>szám</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>kiadás</single>
+      <multiple>kiadás</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>hivatkozás</single>
+      <multiple>hivatkozás</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>szám</single>
+      <multiple>szám</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>oldal</single>
+      <multiple>oldal</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>kötet</single>
+      <multiple>kötet</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>oldal</single>
+      <multiple>oldal</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>nyomtatás</single>
+      <multiple>nyomtatás</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">verzió</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>fej.</single>
+      <multiple>fej.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>hiv.</single>
+      <multiple>hiv.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">sz.</term>
+    <term name="edition" form="short">kiad.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>hiv.</single>
+      <multiple>hiv.</multiple>
     </term>
+    <term name="number" form="short">
+      <single>szám</single>
+      <multiple>szám</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>o.</single>
+      <multiple>o.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>köt.</single>
+      <multiple>köt.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>o.</single>
+      <multiple>o.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>nyom.</single>
+      <multiple>nyom.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>elnök</single>
+      <multiple>elnök</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>sorozatszerkesztő</single>
+      <multiple>sorozatszerkesztő</multiple>
+    </term>
+    <term name="compiler">
+      <single>összeállító</single>
+      <multiple>összeállító</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>közreműködő</single>
+      <multiple>közreműködő</multiple>
+    </term>
+    <term name="curator">
+      <single>kurátor</single>
+      <multiple>kurátor</multiple>
+    </term>
     <term name="director">
       <single>igazgató</single>
       <multiple>igazgató</multiple>
@@ -436,133 +498,185 @@
       <single>szerkesztő</single>
       <multiple>szerkesztő</multiple>
     </term>
+    <term name="editor-translator">
+      <single>szerkesztő &amp; fordító</single>
+      <multiple>szerkesztő &amp; fordító</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>szerkesztő &amp; fordító</single>
+      <multiple>szerkesztő &amp; fordító</multiple>
+    </term>
     <term name="editorial-director">
       <single>szerkesztőségi igazgató</single>
       <multiple>szerkesztőségi igazgató</multiple>
     </term>
+    <term name="executive-producer">
+      <single>executive producer</single>
+      <multiple>executive producer</multiple>
+    </term>
+    <term name="guest">
+      <single>vendég</single>
+      <multiple>vendég</multiple>
+    </term>
+    <term name="host">
+      <single>házigazda</single>
+      <multiple>házigazda</multiple>
+    </term>
     <term name="illustrator">
       <single>illusztrátor</single>
       <multiple>illusztrátor</multiple>
     </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>narrátor</single>
+      <multiple>narrátor</multiple>
+    </term>
+    <term name="organizer">
+      <single>szervező</single>
+      <multiple>szervező</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>előadó</single>
+      <multiple>előadó</multiple>
+    </term>
+    <term name="producer">
+      <single>producer</single>
+      <multiple>producer</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>forgatókönyvíró</single>
+      <multiple>forgatókönyvíró</multiple>
+    </term>
+    <term name="series-creator">
+      <single>sorozat készítője</single>
+      <multiple>sorozat készítője</multiple>
+    </term>
     <term name="translator">
       <single>fordító</single>
       <multiple>fordító</multiple>
     </term>
-    <term name="editortranslator">
-      <single>szerkesztő &amp; fordító</single>
-      <multiple>szerkesztő &amp; fordító</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+      <single>összeáll.</single>
+      <multiple>összeáll.</multiple>
     </term>
     <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <single>közr.</single>
+      <multiple>közr.</multiple>
     </term>
     <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
+      <single>kur.</single>
+      <multiple>kur.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>ig.</single>
+      <multiple>ig.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>szerk.</single>
+      <multiple>szerk.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>szerk. &amp; ford.</single>
+      <multiple>szerk. &amp; ford.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>szerk. &amp; ford.</single>
+      <multiple>szerk. &amp; ford.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>szerk. ig.</single>
+      <multiple>szerk. ig.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <multiple>exec. prod.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ill.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
-      <multiple>narrs.</multiple>
+      <multiple>narr.</multiple>
     </term>
     <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
+      <single>szerv.</single>
+      <multiple>szerv.</multiple>
     </term>
     <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+      <single>előadó</single>
+      <multiple>előadó</multiple>
     </term>
     <term name="producer" form="short">
       <single>prod.</single>
-      <multiple>prods.</multiple>
+      <multiple>prod.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>forg.könyvíró</single>
+      <multiple>forg.könyvíró</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>ig.</single>
-      <multiple>ig.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>szerk.</single>
-      <multiple>szerk.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>szerk. ig.</single>
-      <multiple>szerk. ig.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ill.</multiple>
+      <single>sor.kész.</single>
+      <multiple>sor.kész.</multiple>
     </term>
     <term name="translator" form="short">
       <single>ford.</single>
       <multiple>ford.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>szerk. &amp; ford.</single>
-      <multiple>szerk. &amp; ford.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">directed by</term>
+    <term name="chair" form="verb">elnök</term>
+    <term name="collection-editor" form="verb">sorozatszerkesztő</term>
+    <term name="compiler" form="verb">összeállította</term>
+    <term name="container-author" form="verb">által</term>
+    <term name="contributor" form="verb">közreműködésével</term>
+    <term name="curator" form="verb">gondozta</term>
+    <term name="director" form="verb">rendezte</term>
     <term name="editor" form="verb">szerkesztette</term>
-    <term name="editorial-director" form="verb">edited by</term>
+    <term name="editor-translator" form="verb">szerkesztette &amp; fordította</term>
+    <term name="editortranslator" form="verb">szerkesztette &amp; fordította</term>
+    <term name="editorial-director" form="verb">szerkesztette</term>
+    <term name="executive-producer" form="verb">executive producer</term>
+    <term name="guest" form="verb">vendég</term>
+    <term name="host" form="verb">házigazda</term>
     <term name="illustrator" form="verb">illusztrálta</term>
     <term name="interviewer" form="verb">interjúkészítő</term>
+    <term name="narrator" form="verb">narrátor</term>
+    <term name="organizer" form="verb">szervezte</term>
+    <term name="performer" form="verb">előadó</term>
+    <term name="producer" form="verb">producer</term>
     <term name="recipient" form="verb">címzett</term>
-    <term name="reviewed-author" form="verb">by</term>
+    <term name="reviewed-author" form="verb">ismertette</term>
+    <term name="script-writer" form="verb">írta</term>
+    <term name="series-creator" form="verb">készítette</term>
     <term name="translator" form="verb">fordította</term>
-    <term name="editortranslator" form="verb">szerkesztette &amp; fordította</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">sor.szerk.</term>
+    <term name="compiler" form="verb-short">összeáll.</term>
+    <term name="contributor" form="verb-short">közr.</term>
+    <term name="curator" form="verb-short">gond.</term>
     <term name="director" form="verb-short">ig.</term>
     <term name="editor" form="verb-short">szerk.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">szerk. &amp; ford.</term>
+    <term name="editortranslator" form="verb-short">szerk. &amp; ford.</term>
+    <term name="editorial-director" form="verb-short">szerk.</term>
+    <term name="executive-producer" form="verb-short">exec. prod.</term>
+    <term name="guest" form="verb-short">vendég</term>
+    <term name="host" form="verb-short">házigazda</term>
     <term name="illustrator" form="verb-short">ill.</term>
+    <term name="narrator" form="verb-short">narr.</term>
+    <term name="organizer" form="verb-short">szerv.</term>
+    <term name="performer" form="verb-short">előadó</term>
+    <term name="producer" form="verb-short">prod.</term>
+    <term name="script-writer" form="verb-short">f.könyvíró</term>
+    <term name="series-creator" form="verb-short">sor.kész.</term>
     <term name="translator" form="verb-short">ford.</term>
-    <term name="editortranslator" form="verb-short">szerk. &amp; ford.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">január</term>
diff --git a/locales/hy-AM.xml b/locales/hy-AM.xml
new file mode 100644
--- /dev/null
+++ b/locales/hy-AM.xml
@@ -0,0 +1,591 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="hy-AM">
+  <!-- The abbreviations in this file follow the recommendations of The System of Standards on Information, Librarianship and Publishing: Bibliographic Record; Bibliographic Description; General Requirements and Rule Specifications, HST 361-2013, https://www.armstandard.am/en/standart/15414 (cited hereafter HST-316) -->
+  <!-- Additional abbreviations are from:
+        1. Հայոց լեզվի հապավումների բառարան := Dictionary of Armenian Language Abbreviations / Ալեքսանդր Սիմոնի Մարգարյան; Խմբ.՝ Լ.Հ. Մկրտչյան.— Երևան: Հայաստան, 1979.- 148 էջ. https://haygirk.nla.am/upload/1941-/margaryan_hayoc_1979.pdf (cited hereafter as DAAL)
+		2. Գրադարանային տերմինների բառարան: Ռուս-հայերեն և հայ-ռուսերեն := Словарь библиотечных терминов := Dictionary of Library Terms / Արամ Սահակի Բաբայան; Խմբ.՝ Գուրգեն Սևակի.— Երևան: Ա. հ., 1950.- 264 էջ. https://haygirk.nla.am/upload/1941-/babayan_gradaranayin_1950.pdf (cited hereafter as DLT)
+  -->
+  <info>
+    <translator>
+      <name>Hayk M. Kocharyan</name>
+      <uri>https://orcid.org/0000-0002-1370-3325</uri>
+    </translator>
+	<translator>
+      <name>Marat M. Yavrumyan</name>
+      <uri>https://orcid.org/0000-0002-9722-0653</uri>
+    </translator>
+	<translator>
+      <name>Armenian Language Technology Research Laboratory</name>
+      <uri>https://github.com/RLALT</uri>
+    </translator>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2026-01-31T12:37:21+04:00</updated>
+  </info>
+  <style-options punctuation-in-quote="false"/>
+  <date form="text">
+    <date-part name="day" suffix=" "/>
+    <date-part name="month" suffix=", "/>
+    <date-part name="year" suffix="&#160;թ."/>
+  </date>
+  <date form="numeric">
+    <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+    <date-part name="month" form="numeric-leading-zeros" suffix="."/>
+    <date-part name="year" suffix="&#160;թ."/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">դիտված</term>
+    <term name="advance-online-publication">առցանց առաջնատիպ</term>
+    <term name="album">ալբոմ</term>
+    <term name="and">և</term>
+    <term name="and others">և&#160;ուրիշներ</term>
+    <term name="anonymous">անանուն</term>
+    <term name="at">ըստ՝</term> <!-- the armenian comma was preferred to avoid the flexed forms -->
+    <term name="audio-recording">ձայնագրություն</term>
+    <term name="available at">հասանելի&#160;է</term>
+    <term name="by"></term>
+    <term name="circa">մոտ</term>
+    <term name="cited">մեջբերումն ըստ՝</term> <!-- the armenian comma was preferred to avoid the flexed forms -->
+    <term name="et-al">և&#160;ուրիշներ</term> <!-- like "and others", in the armenian tradition they are the same; the alternative spelling «և այլք» was deemed archaic -->
+    <term name="film">կինոնկար</term>
+    <term name="forthcoming">հանձնված&#160;է հրապարակման</term>
+    <term name="from">իմա՝</term> <!-- the term «սկզբնաղբյուրը» is more specific and is primarily used in archival studies -->
+    <term name="henceforth">այսուհետ՝</term>
+    <term name="ibid">նույնը</term>
+    <term name="in">ի&#160;մեջ</term>
+    <term name="in press">հանձնված&#160;է տպագրության</term>
+    <term name="internet">համացանց</term>
+    <term name="letter">նամակ</term>
+    <term name="loc-cit">նույն տեղում</term>
+    <term name="no date">ա.&#160;թ.</term> <!-- the abbreviated form is the regular form; -->
+    <term name="no-place">ա.&#160;տ.</term> <!-- the abbreviated form is the regular form  -->
+    <term name="no-publisher">ա.&#160;հ.</term> <!-- the abbreviated form is the regular form  -->
+    <term name="on">ընդ</term>
+    <term name="online">առցանց</term>
+    <term name="op-cit">նշվ. աշխ.</term> <!-- the abbreviated form is the regular form -->
+    <term name="original-work-published">սկզբնապես հրապարակվել&#160;է</term>
+    <term name="personal-communication">մասնավոր հաղորդակցություն</term>
+    <term name="podcast">փոդքաստ</term>
+    <term name="podcast-episode">թողարկում փոդքաստում</term>
+    <term name="preprint">սկզբնագիր</term> <!-- «սկզբնատիպ» is another possible alternative to this neologism -->
+    <term name="presented at">ներկայացվել&#160;է</term>
+    <term name="radio-broadcast">ռադիոհաղորդում</term> <!-- «հեռարձակում» is a more accurate spelling of "broadcast" -->
+    <term name="radio-series">ռադիոշարք</term>
+    <term name="radio-series-episode">թողարկում ռադիոշարքում</term>
+    <term name="reference">տե՛ս</term> <!-- no plural -->
+    <term name="retrieved">քաղված&#160;է</term>
+    <term name="review-of">գրախոսված&#160;է՝</term>
+    <term name="scale">չափ</term>
+    <term name="special-issue">հատուկ թողարկում</term>
+    <term name="special-section">հատուկ պրակ</term>
+    <term name="television-broadcast">հեռուստահաղորդում</term> <!-- «հեռարձակում» is a more accurate spelling of "broadcast" -->
+    <term name="television-series">հեռուստաշարք</term>
+    <term name="television-series-episode">թողարկում հեռուստաշարքում</term>
+    <term name="video">տեսանյութ</term>
+    <term name="working-paper">աշխատանքային նյութեր</term> <!-- "աշխատանքային թղթեր" is a more literal translation of "working-paper" -->
+
+    <!-- SHORT GENERAL TERMS -->
+    <!-- Omitted short forms: accessed, advance-online-publication, album, and (symbol), at (symbol), audio-recording, available at, circa, film, forthcoming, from, henceforth, ibid, in, in press, internet, letter, loc-cit, no date, no-place, no-publisher, on, online, op-cit, original-work-published, personal-communication, podcast, podcast-episode, preprint, presented at, radio-broadcast, radio-series, radio-series-episode, reference, retrieved, review-of, scale, special-issue, special-section, television-broadcast, television-series, television-series-episode, video, working-paper -->
+    <term name="anonymous" form="short">անան.</term>
+	<term name="and others" form="short">և&#160;ուրիշ.</term>
+    <term name="cited" form="short">մջբ.՝</term>
+    <term name="et-al" form="short">և&#160;ուրիշ.</term>
+   
+    <!-- SYMBOLIC GENERAL FORMS -->
+    <term name="and" form="symbol">և</term>
+    <term name="at" form="symbol">@</term>
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="article">հոդված</term>
+    <term name="article-journal">հոդված հանդեսում</term>
+    <term name="article-magazine">հոդված ամսագրում</term>
+    <term name="article-newspaper">հոդված թերթում</term>
+    <term name="bill">օրինագիծ</term> <!-- as a neologism, "իրավանախագիծ" is a more general term -->
+    <!-- book is in the list of locator terms -->
+    <term name="broadcast">հեռարձակում</term>
+    <!-- chapter is in the list of locator terms -->
+    <term name="classic">դասական երկ</term> <!-- «դասական գործ» is a more literal spelling of "classic" -->
+    <term name="collection">հավաքածո</term>
+    <term name="dataset">տվյալակազմ</term> <!-- neologism -->
+    <term name="document">վավերագիր</term> <!-- «փաստատուղթ» is a more general term -->
+    <term name="entry">գլխաբառ</term> <!-- the neologism «մուտքագիր» is another possible alternative to this term -->
+    <term name="entry-dictionary">բառահոդված</term>
+    <term name="entry-encyclopedia">հանրագիտարանային հոդված</term>
+    <term name="event">միջոցառում</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic">գծագիր</term>
+    <term name="hearing">լսումներ</term>
+    <term name="interview">հարցազրույց</term>
+    <term name="legal_case">դատական գործ</term>
+    <term name="legislation">օրենսդրություն</term>
+    <term name="manuscript">ձեռագիր</term>
+    <term name="map">քարտեզ</term>
+    <term name="motion_picture">շարժանկար</term>
+    <term name="musical_score">երաժշտական ստեղծագործություն</term>
+    <term name="pamphlet">գրքույկ</term>
+    <term name="paper-conference">զեկույց գիտաժողովում</term>
+    <term name="patent">արտոնագիր</term> <!-- «պատենտ» is another possible alternative -->
+    <term name="performance">պերֆորմանս</term>
+    <term name="periodical">պարբերական</term>
+    <term name="personal_communication">մասնավոր հաղորդակցություն</term>
+    <term name="post">գրառում</term>
+    <term name="post-weblog">բլոգ</term>
+    <term name="regulation">իրավակարգավորում</term>
+    <term name="report">զեկույց</term> <!-- «տեղեկագիր» is another possible alternative to this term -->
+    <term name="review">գրախոսություն</term>
+    <term name="review-book">մատենախոսություն</term> <!-- archaisms, used especially to distinguish book reviews -->
+    <term name="software">ծրագրաշար</term>
+    <term name="song">ձայնագրություն</term>
+    <term name="speech">ելույթ</term>
+    <term name="standard">ստանդարտ</term>
+    <term name="thesis">ավարտագիր</term>
+    <term name="treaty">համաձայնագիր</term>
+    <term name="webpage">կայքէջ</term>
+
+    <!-- SHORT ITEM TYPE FORMS -->
+    <!-- Omitted short forms: article, article-journal; article-magazine; article-newspaper, bill, broadcast, classic, collection, document, entry, entry-dictionary, entry-encyclopedia, event, hearing, interview, legal_case, legislation, map, motion_picture, musical_score, pamphlet, paper-conference, patent, performance, periodical, personal_communication, regulation, report, review, review-book, software, song, speech, standard, thesis, treaty -->
+	<!-- book is in the list of locator terms -->
+    <!-- chapter is in the list of locator terms -->
+    <!-- figure is in the list of locator terms -->
+	<term name="graphic" form="short">գծ.</term>
+    <term name="manuscript" form="short">ձեռ.</term> <!-- no plural -->
+	<term name="periodical" form="short">պբ.</term>
+	
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">ցուցմունք</term>
+    <term name="review" form="verb">գրախոսվել&#160;է՝</term> <!-- the armenian comma was preferred to avoid the flexed forms -->
+    <term name="review-book" form="verb">գրախոսվել&#160;է՝</term> <!-- the armenian comma was preferred to avoid the flexed forms -->
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad">Ք.հ.&#160;</term>
+    <term name="bc">Ք.ա.&#160;</term>
+    <term name="bce">մ.թ.ա.&#160;</term>
+    <term name="ce">մ.թ.&#160;</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">«</term>
+    <term name="close-quote">»</term>
+    <term name="open-inner-quote">«</term>
+    <term name="close-inner-quote">»</term>
+    <term name="page-range-delimiter">–</term>
+    <term name="colon">։</term> <!-- it's not the armenian "verjaket," which looks like a latin colon with two vertically stacked dots and is used as an ordinary full stop -->
+    <term name="comma">,</term>
+    <term name="semicolon">;</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal">-րդ</term>
+    <term name="ordinal-01">-ին</term>
+ 
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01">առաջին</term>
+    <term name="long-ordinal-02">երկրորդ</term>
+    <term name="long-ordinal-03">երրորդ</term>
+    <term name="long-ordinal-04">չորրորդ</term>
+    <term name="long-ordinal-05">հինգերորդ</term>
+    <term name="long-ordinal-06">վեցերորդ</term>
+    <term name="long-ordinal-07">յոթերորդ</term>
+    <term name="long-ordinal-08">ութերորդ</term>
+    <term name="long-ordinal-09">իններորդ</term>
+    <term name="long-ordinal-10">տասներորդ</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="act">
+      <single>ակտ</single>
+      <multiple>ակտեր</multiple>
+    </term>
+    <term name="appendix"> <!-- the archaic "Հավելվածք" (pl.) conveys the meaning more accurately -->
+      <single>հավելված</single> <!-- DLT (p. 110, p. 216) -->
+      <multiple>հավելվածներ</multiple>
+    </term>
+    <term name="article-locator">
+      <single>հոդված</single>
+      <multiple>հոդվածներ</multiple>
+    </term>
+    <term name="book">
+      <single>գիրք</single>
+      <multiple>գրքեր</multiple>
+    </term>
+    <term name="canon">
+      <single>կանոն</single>
+      <multiple>կանոններ</multiple>
+    </term>
+    <term name="chapter">
+      <single>գլուխ</single>
+      <multiple>գլուխներ</multiple>
+    </term>
+    <term name="column">
+      <single>սյունակ</single>
+      <multiple>սյունակներ</multiple>
+    </term>
+    <term name="elocation">
+      <single>հասցե</single>
+      <multiple>հասցեներ</multiple>
+    </term>
+    <term name="equation">
+      <single>հավասարում</single>
+      <multiple>հավասարումներ</multiple>
+    </term>
+    <term name="figure">
+      <single>պատկեր</single>
+      <multiple>պատկերներ</multiple>
+    </term>
+    <term name="folio">
+      <single>թերթ</single>
+      <multiple>թերթեր</multiple>
+    </term>
+    <term name="issue">
+      <single>թողարկում</single>
+      <multiple>թողարկումներ</multiple>
+    </term>
+    <term name="line">
+      <single>տող</single>
+      <multiple>տողեր</multiple>
+    </term>
+    <term name="note">
+      <single>ծանոթագրություն</single>
+      <multiple>ծանոթագրություններ</multiple>
+    </term>
+    <term name="opus">
+      <single>երկ</single>
+      <multiple>երկեր</multiple>
+    </term>
+    <term name="page">
+      <single>էջ</single>
+      <multiple>էջեր</multiple>
+    </term>
+    <term name="paragraph">
+      <single>պարբերություն</single>
+      <multiple>պարբերություններ</multiple>
+    </term>
+    <term name="part">
+      <single>մաս</single>
+      <multiple>մասեր</multiple>
+    </term>
+    <term name="rule">
+      <single>կանոն</single>
+      <multiple>կանոններ</multiple>
+    </term>
+    <term name="scene">
+      <single>գործողություն</single> <!-- «արար» is another possible alternative to this term -->
+      <multiple>գործողություններ</multiple>
+    </term>
+    <term name="section">
+      <single>բաժին</single>
+      <multiple>բաժիններ</multiple>
+	</term>
+    <term name="sub-verbo">տե՛ս գլխաբառ</term> <!-- no plural -->
+    <term name="supplement"> <!-- the DLT (p. 46) recommends using the term "լրացում;" bibliographies usually use adjectival forms such as "լրացված հրատարակություն" or "հավելյալ հատոր" (DLT, p. 203); we prefer the more general term "հավելված" (DLT, p. 110). -->
+      <single>հավելված</single>
+      <multiple>հավելվածներ</multiple>
+    </term>
+    <term name="table">
+      <single>աղյուսակ</single>
+      <multiple>աղյուսակներ</multiple>
+    </term>
+    <!-- A timestamp is a composite of hours, minutes, etc. and therefore has no default label. -->
+    <term name="timestamp"/>
+    <term name="title-locator">
+      <single>վերնագիր</single>
+      <multiple>վերնագրեր</multiple>
+    </term>
+    <term name="verse">
+      <single>բանատող</single>
+      <multiple>բանատողեր</multiple>
+    </term>
+    <term name="version"> <!-- DLT (p. 32, p. 252, p. 260) recommends the more specific term "փոխակ" -->
+      <single>տարբերակ</single>
+      <multiple>տարբերակներ</multiple>
+    </term>
+    <term name="volume">
+      <single>հատոր</single>
+      <multiple>հատորներ</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+    <!-- Omitted short forms: act, appendix, book, canon, column, elocation, equation, figure, folio, line, opus, page, part, rule, scene, sub-verbo, sub-verbo, timestamp, title-locator, verse -->
+    <term name="article-locator" form="short">հոդվ.</term> <!-- no plural -->
+    <term name="chapter" form="short">գլ.</term> <!-- HST-316, no plural -->
+    <term name="issue" form="short">թող.</term> <!-- HST-316, no plural -->
+    <term name="note" form="short">ծնթ.</term> <!-- no plural -->
+    <term name="paragraph" form="short">պրբ.</term> <!-- no plural -->
+	<term name="section" form="short">բաժ.</term> <!-- no plural -->
+	<term name="table" form="short">աղ.</term> <!-- no plural -->
+    <term name="version" form="short">տարբ.</term> <!-- no plural -->
+    <term name="volume" form="short">հտ.</term> <!-- no plural -->
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>գլուխ</single>
+      <multiple>գլուխներ</multiple>
+    </term>
+    <term name="citation-number">
+      <single>հղում</single>
+      <multiple>հղումներ</multiple>
+    </term>
+    <term name="collection-number">
+      <single>համար</single>
+      <multiple>համարներ</multiple>
+    </term>
+    <term name="edition">
+      <single>հրատարակություն</single>
+      <multiple>հրատարակություններ</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>ծանոթագրություն</single>
+      <multiple>ծանոթագրություններ</multiple>
+    </term>
+    <term name="number">
+      <single>թիվ</single>
+      <multiple>թվեր</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>էջ</single>
+      <multiple>էջեր</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>հատոր</single>
+      <multiple>հատորներ</multiple>
+    </term>
+    <term name="page-first">
+      <single>էջ</single>
+      <multiple>էջեր</multiple>
+    </term>
+    <term name="printing"> <!-- Ընկալվում է որպես «Վերատպություն»՝ նույն փաստաթղթի նախորդ հրատարակություններից ընթացիկը տարբերակող «Տարբերակ», «Թողարկում», «Խմբագրություն» տերմինների շարքում։ -->
+      <single>վերատպություն</single>
+      <multiple>վերատպություններ</multiple>
+    </term>
+	<term name="version">
+      <single>տարբերակ</single>
+      <multiple>տարբերակներ</multiple>
+    </term>
+	
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+	<term name="chapter-number" form="short">գլ.</term> <!-- HST-316, no plural -->
+    <term name="citation-number" form="short">հղ.</term> <!-- no plural -->
+	<term name="collection-number" form="short">հմ.</term> <!-- no plural -->
+    <term name="edition" form="short">հրատ.</term> <!-- no plural -->
+    <term name="first-reference-note-number" form="short">ծնթ.</term> <!-- no plural -->
+    <term name="number" form="short">
+      <single>№</single>
+      <multiple>№№</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>էջ</single>
+      <multiple>էջեր</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">հտ.</term> <!-- no plural -->
+    <term name="page-first" form="short">
+      <single>էջ</single>
+      <multiple>էջեր</multiple>
+    </term>
+    <term name="printing" form="short">վերատպ.</term> <!-- no plural -->
+	<term name="version" form="short">տարբ.</term> <!-- no plural -->
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>նախագահություն</single>
+      <multiple>նախագահություններ</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>շարքի խմբագիր</single>
+      <multiple>շարքի խմբագիրներ</multiple>
+    </term>
+    <term name="compiler">
+      <single>կազմող</single>
+      <multiple>կազմողներ</multiple>
+    </term>
+	<term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>համահեղինակ</single>
+      <multiple>համահեղինակներ</multiple>
+    </term>
+    <term name="curator">
+      <single>համակարգող</single>
+      <multiple>համակարգողներ</multiple>
+    </term>
+    <term name="director">
+      <single>ռեժիսոր</single>
+      <multiple>ռեժիսորներ</multiple>
+    </term>
+    <term name="editor">
+      <single>խմբագիր</single>
+      <multiple>խմբագիրներ</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>խմբագիր-թարգմանիչ</single>
+      <multiple>խմբագիր-թարգմանիչներ</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>խմբագիր և թարգմանիչ</single>
+      <multiple>խմբագիրներ և թարգմանիչներ</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>պատասխանատու խմբագիր</single>
+      <multiple>պատասխանատու խմբագիրներ</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>գործադիր պրոդյուսեր</single>
+      <multiple>գործադիր պրոդյուսերներ</multiple>
+    </term>
+    <term name="guest">
+      <single>հյուր</single>
+      <multiple>հյուրեր</multiple>
+    </term>
+    <term name="host">
+      <single>հաղորդավար</single>
+      <multiple>հաղորդավարներ</multiple>
+    </term>
+    <term name="illustrator">
+      <single>նկարազարդող</single>
+      <multiple>նկարազարդողներ</multiple>
+    </term>
+	<term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>մեկնաբան</single>
+      <multiple>մեկնաբաններ</multiple>
+    </term>
+    <term name="organizer">
+      <single>կազմակերպիչ</single>
+      <multiple>կազմակերպիչներ</multiple>
+    </term>
+	<term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>կատարող</single>
+      <multiple>կատարողներ</multiple>
+    </term>
+    <term name="producer">
+      <single>պրոդյուսեր</single>
+      <multiple>պրոդյուսերներ</multiple>
+    </term>
+	<term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>սցենարի հեղինակ</single>
+      <multiple>սցենարի հեղինակներ</multiple>
+    </term>
+    <term name="series-creator">
+      <single>շարքի հիմնադիր</single>
+      <multiple>շարքի հիմնադիրներ</multiple>
+    </term>
+    <term name="translator">
+      <single>թարգմանիչ</single>
+      <multiple>թարգմանիչներ</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, composer, container-author, curator, executive-producer, guest, host, interviewer, illustrator, organizer, original-author, performer, recipient, reviewed-author
+    -->
+	<!-- no plural for short role forms in armenian-->
+    <term name="collection-editor" form="short">շարքի խմբ.</term> <!-- no plural -->
+    <term name="compiler" form="short">կազմ.</term> <!-- no plural -->
+    <term name="contributor" form="short">համահեղ.</term> <!-- no plural -->
+    <term name="director" form="short">ռեժ.</term> <!-- no plural -->
+    <term name="editor" form="short">խմբ.</term> <!-- no plural -->
+    <term name="editor-translator" form="short">խմբ.-թարգմ.</term> <!-- no plural -->
+    <term name="editortranslator" form="short">խմբ. և&#160;թարգմ.</term> <!-- no plural -->
+    <term name="editorial-director" form="short">պատ. խմբ.</term> <!-- no plural -->
+    <term name="narrator" form="short">մեկնաբ.</term> <!-- no plural -->
+    <term name="producer" form="short">պրոդ.</term> <!-- no plural -->
+    <term name="script-writer" form="short">սց. հեղ.</term> <!-- no plural -->
+    <term name="series-creator" form="short">շարքի հիմն.</term> <!-- no plural -->
+    <term name="translator" form="short">թարգմ.</term> <!-- no plural -->
+
+    <!-- VERB ROLE FORMS -->
+	<!-- the armenian comma was preferred to avoid the flexed forms -->
+	<!-- Այս շարքում նախընտրված տարբերակները միշտ չէ որ ամենից գործածականն են (հմմտ.՝ խմբագրությամբ, աշխատասիրությամբ, թարգմանությամբ). նման ընտրությունը և բութի գործածությունը պայմանավորված է տերմիններին հաջորդող ազգանունները հնարավորինս ուղիղ ձևով պահելու ցանկությամբ -->
+    <term name="chair" form="verb">նախագահությամբ՝</term>
+    <term name="collection-editor" form="verb">շարքը խմբագրեց՝</term>
+    <term name="compiler" form="verb">կազմեց՝</term>
+    <term name="composer" form="verb">աշխատասիրեց՝</term>
+    <term name="container-author" form="verb">հեղինակեց՝</term>
+    <term name="contributor" form="verb">համահեղինակեց՝</term>
+    <term name="curator" form="verb">համակարգեց՝</term>
+    <term name="director" form="verb">ռեժիսուրան՝</term>
+    <term name="editor" form="verb">խմբագրեց՝</term>
+    <term name="editor-translator" form="verb">խմբագրեց-թարգմանեց՝</term>
+    <term name="editortranslator" form="verb">խմբագրեց և&#160;թարգմանեց՝</term>
+    <term name="editorial-director" form="verb">պատ. խմբագրությամբ՝</term>
+    <term name="executive-producer" form="verb">գործ. պրոդյուսերը՝</term>
+    <term name="guest" form="verb">հյուրը՝</term>
+    <term name="host" form="verb">հաղորդավարը՝</term>
+    <term name="illustrator" form="verb">նկարազարդումը՝</term>
+    <term name="interviewer" form="verb">հարցազրույցը՝</term>
+    <term name="narrator" form="verb">մեկնաբանը՝</term>
+    <term name="organizer" form="verb">կազմակերպեց՝</term>
+    <term name="original-author" form="verb">հեղինակեց՝</term>
+    <term name="performer" form="verb">կատարողը՝</term>
+    <term name="producer" form="verb">պրոդյուսերը՝</term>
+    <term name="recipient" form="verb">ի</term>
+    <term name="reviewed-author" form="verb"/>
+    <term name="script-writer" form="verb">սցենարն ըստ՝</term>
+    <term name="series-creator" form="verb">շարքը հիմնադրեց՝</term>
+    <term name="translator" form="verb">թարգմանեց՝</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, container-author, contributor, curator, guest, host, interviewer, illustrator, narrator, organizer, original-author, performer, recipient, reviewed-author, series-creator
+    -->
+    <term name="collection-editor" form="verb-short">շարքը խմբ.՝</term>
+    <term name="compiler" form="verb-short">կազմ.՝</term>
+    <term name="composer" form="verb-short">աշխատ.՝</term>
+    <term name="director" form="verb-short">ռեժ.՝</term>
+    <term name="editor" form="verb-short">խմբ.՝</term>
+    <term name="editor-translator" form="verb-short">խմբ.-թարգմ.՝</term>
+    <term name="editortranslator" form="verb-short">խմբ. և&#160;թարգմ.՝</term>
+    <term name="editorial-director" form="verb-short">պատ. խմբ.՝</term>
+    <term name="executive-producer" form="verb-short">գործ. պրոդ.՝</term>
+    <term name="producer" form="verb-short">պրոդ.՝</term>
+    <term name="script-writer" form="verb-short">սց. ըստ՝</term>
+    <term name="translator" form="verb-short">թարգմ.՝</term>
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">հունվար</term>
+    <term name="month-02">փետրվար</term>
+    <term name="month-03">մարտ</term>
+    <term name="month-04">ապրիլ</term>
+    <term name="month-05">մայիս</term>
+    <term name="month-06">հունիս</term>
+    <term name="month-07">հուլիս</term>
+    <term name="month-08">օգոստոս</term>
+    <term name="month-09">սեպտեմբեր</term>
+    <term name="month-10">հոկտեմբեր</term>
+    <term name="month-11">նոյեմբեր</term>
+    <term name="month-12">դեկտեմբեր</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">հնվ.</term>
+    <term name="month-02" form="short">փտր.</term>
+    <term name="month-03" form="short">մրտ.</term>
+    <term name="month-04" form="short">ապր.</term>
+    <term name="month-05" form="short">մյս.</term>
+    <term name="month-06" form="short">հնս.</term>
+    <term name="month-07" form="short">հլս.</term>
+    <term name="month-08" form="short">օգս.</term>
+    <term name="month-09" form="short">սպտ.</term>
+    <term name="month-10" form="short">հկտ.</term>
+    <term name="month-11" form="short">նյմ.</term>
+    <term name="month-12" form="short">դկտ.</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">գարուն</term>
+    <term name="season-02">ամառ</term>
+    <term name="season-03">աշուն</term>
+    <term name="season-04">ձմեռ</term>
+  </terms>
+</locale>
diff --git a/locales/id-ID.xml b/locales/id-ID.xml
--- a/locales/id-ID.xml
+++ b/locales/id-ID.xml
@@ -10,8 +10,14 @@
     <translator>
       <name>xbypass</name>
     </translator>
+    <translator>
+      <name>mzaini30</name>
+    </translator>
+	  <translator>
+      <name>rusli3</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2015-08-05T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="true"/>
   <date form="text">
@@ -25,119 +31,120 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">diakses</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">komunikasi pribadi</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
-    <term name="accessed">diakses</term>
     <term name="and">dan</term>
     <term name="and others">dan lainnya</term>
     <term name="anonymous">anonim</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">pada</term>
+    <term name="audio-recording">rekaman audio</term>
     <term name="available at">tersedia pada</term>
     <term name="by">oleh</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">ca.</term>
     <term name="cited">dikutip</term>
-    <term name="edition">
-      <single>edisi</single>
-      <multiple>edisi</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
     <term name="et-al">dkk.</term>
+    <term name="film">film</term>
     <term name="forthcoming">mendatang</term>
     <term name="from">dari</term>
+    <term name="henceforth">selanjutnya</term>
     <term name="ibid">ibid.</term>
     <term name="in">dalam</term>
-    <term name="in press">dalam proses cetakan</term>
+    <term name="in press">dalam proses cetak</term>
     <term name="internet">internet</term>
     <term name="letter">surat</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">tanpa tanggal</term>
-    <term name="no date" form="short">t.t.</term>
+    <term name="no-place">tanpa tempat</term>
+    <term name="no-publisher">tanpa penerbit</term> <!-- sine nomine -->
+    <term name="on">on</term>
     <term name="online">daring</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">original work published</term>
+    <term name="personal-communication">komunikasi pribadi</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcast episode</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">dipresentasikan pada</term>
+    <term name="radio-broadcast">radio broadcast</term>
+    <term name="radio-series">seri radio</term>
+    <term name="radio-series-episode">episode seri radio</term>
     <term name="reference">
       <single>referensi</single>
       <multiple>referensi</multiple>
     </term>
+    <term name="retrieved">diambil</term>
+    <term name="review-of">review of</term>
+    <term name="scale">skala</term>
+    <term name="special-issue">edisi khusus</term>
+    <term name="special-section">bagian khusus</term>
+    <term name="television-broadcast">siaran televisi</term>
+    <term name="television-series">seri televisi</term>
+    <term name="television-series-episode">episode seri televisi</term>
+    <term name="video">video</term>
+    <term name="working-paper">naskah kerja</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">ca.</term>
+    <term name="no date" form="short">t.t.</term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">diambil</term>
-    <term name="scale">skala</term>
-    <term name="version">versi</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">artikel</term>
+    <term name="article-journal">artikel jurnal</term>
+    <term name="article-magazine">artikel majalah</term>
+    <term name="article-newspaper">artikel koran</term>
+    <term name="bill">rancangan undang-undang</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">siaran</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
+    <term name="classic">klasik</term>
+    <term name="collection">koleksi</term>
     <term name="dataset">dataset</term>
-    <term name="document">document</term>
+    <term name="document">dokumen</term>
     <term name="entry">entry</term>
     <term name="entry-dictionary">dictionary entry</term>
     <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="event">acara</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">grafis</term>
+    <term name="hearing">dengar pendapat</term>
     <term name="interview">wawancara</term>
-    <term name="legal_case">legal case</term>
+    <term name="legal_case">kasus legal</term>
     <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
+    <term name="manuscript">manuskrip</term>
+    <term name="map">peta</term>
     <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="musical_score">skor musik</term>
+    <term name="pamphlet">pamflet</term>
+    <term name="paper-conference">makalah konferensi</term>
+    <term name="patent">paten</term>
+    <term name="performance">pertunjukan</term>
+    <term name="periodical">berkala</term>
     <term name="personal_communication">komunikasi pribadi</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">postingan</term>
+    <term name="post-weblog">postingan blog</term>
+    <term name="regulation">regulasi</term>
+    <term name="report">laporan</term>
+    <term name="review">ulasan</term>
+    <term name="review-book">ulasan buku</term>
+    <term name="software">perangkat lunak</term>
+    <term name="song">lagu</term>
+    <term name="speech">pidato</term>
+    <term name="standard">standar</term>
+    <term name="thesis">tesis</term>
+    <term name="treaty">perjanjian internasional</term>
+    <term name="webpage">laman web</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
     <term name="article-journal" form="short">journal art.</term>
@@ -156,6 +163,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">M</term>
     <term name="bc">SM</term>
@@ -173,13 +188,13 @@
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal"></term>
-    <term name="ordinal-01"></term>
-    <term name="ordinal-02"></term>
-    <term name="ordinal-03"></term>
-    <term name="ordinal-11"></term>
-    <term name="ordinal-12"></term>
-    <term name="ordinal-13"></term>
+    <term name="ordinal"/>
+    <term name="ordinal-01"/>
+    <term name="ordinal-02"/>
+    <term name="ordinal-03"/>
+    <term name="ordinal-11"/>
+    <term name="ordinal-12"/>
+    <term name="ordinal-13"/>
 
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">pertama</term>
@@ -194,54 +209,26 @@
     <term name="long-ordinal-10">kesepuluh</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>buku</single>
       <multiple>buku</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>bab</single>
       <multiple>bab</multiple>
@@ -250,6 +237,14 @@
       <single>kolom</single>
       <multiple>kolom</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>gambar</single>
       <multiple>gambar</multiple>
@@ -278,10 +273,6 @@
       <single>halaman</single>
       <multiple>halaman</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>halaman</single>
-      <multiple>halaman</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraf</single>
       <multiple>paragraf</multiple>
@@ -290,6 +281,14 @@
       <single>bagian</single>
       <multiple>bagian</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>bagian</single>
       <multiple>bagian</multiple>
@@ -298,6 +297,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>ayat</single>
       <multiple>ayat</multiple>
@@ -308,45 +323,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">bk.</term>
+    <term name="chapter" form="short">bb.</term>
+    <term name="column" form="short">kol.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">bk.</term>
-    <term name="chapter" form="short">bb.</term>
-    <term name="column" form="short">kol.</term>
     <term name="figure" form="short">gbr.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">no.</term>
@@ -357,17 +352,37 @@
       <single>hlm.</single>
       <multiple>hlm.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>hlm.</single>
-      <multiple>hlm.</multiple>
-    </term>
     <term name="paragraph" form="short">para.</term>
     <term name="part" form="short">bag.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">bag.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>a.</single>
       <multiple>a.</multiple>
@@ -377,7 +392,7 @@
       <multiple>vol.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -387,15 +402,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>nomor</single>
+      <multiple>nomor</multiple>
+    </term>
+    <term name="edition">
+      <single>edisi</single>
+      <multiple>edisi</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>catatan</single>
+      <multiple>catatan</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>halaman</single>
+      <multiple>halaman</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">versi</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">no.</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">ctt.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>hlm.</single>
+      <multiple>hlm.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -404,6 +502,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>sutradara</single>
+      <multiple>sutradara</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editor</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor &amp; penerjemah</single>
+      <multiple>editor &amp; penerjemah</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor &amp; penerjemah</single>
+      <multiple>editor &amp; penerjemah</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>editor</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -416,6 +534,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>ilustrator</single>
+      <multiple>ilustrator</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -424,6 +547,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -432,6 +556,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -440,30 +566,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>direktur</single>
-      <multiple>direktur</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editor</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editor</multiple>
-    </term>
-    <term name="illustrator">
-      <single>ilustrator</single>
-      <multiple>ilustrator</multiple>
-    </term>
     <term name="translator">
       <single>penerjemah</single>
       <multiple>penerjemah</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor &amp; penerjemah</single>
-      <multiple>editor &amp; penerjemah</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -478,10 +584,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dir.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>ed.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; penerj.</single>
+      <multiple>ed. &amp; penerj.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; penerj.</single>
+      <multiple>ed. &amp; penerj.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>ed.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>il.</single>
+      <multiple>il.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -506,75 +636,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dir.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>ed.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>ed.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>il.</single>
-      <multiple>il.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>penerj.</single>
       <multiple>penerj.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; penerj.</single>
-      <multiple>ed. &amp; penerj.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">oleh</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">diarahkan oleh</term>
+    <term name="editor" form="verb">disunting oleh</term>
+    <term name="editor-translator" form="verb">disunting &amp; diterjemahkan oleh</term>
+    <term name="editortranslator" form="verb">disunting &amp; diterjemahkan oleh</term>
+    <term name="editorial-director" form="verb">disunting oleh</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">diilustrasi oleh</term>
+    <term name="interviewer" form="verb">diwawancara oleh</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">oleh</term>
-    <term name="director" form="verb">diarahkan oleh</term>
-    <term name="editor" form="verb">disunting oleh</term>
-    <term name="editorial-director" form="verb">disunting oleh</term>
-    <term name="illustrator" form="verb">diilustrasi oleh</term>
-    <term name="interviewer" form="verb">diwawancara oleh</term>
     <term name="recipient" form="verb">kepada</term>
     <term name="reviewed-author" form="verb">oleh</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">diterjemahkan oleh</term>
-    <term name="editortranslator" form="verb">disunting &amp; diterjemahkan oleh</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir. oleh</term>
+    <term name="editor" form="verb-short">ed. oleh</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; penerj. oleh</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; penerj. oleh</term>
+    <term name="editorial-director" form="verb-short">ed. oleh</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus. oleh</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir. oleh</term>
-    <term name="editor" form="verb-short">ed. oleh</term>
-    <term name="editorial-director" form="verb-short">ed. oleh</term>
-    <term name="illustrator" form="verb-short">illus. oleh</term>
     <term name="translator" form="verb-short">trans. oleh</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; penerj. oleh</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Januari</term>
diff --git a/locales/is-IS.xml b/locales/is-IS.xml
--- a/locales/is-IS.xml
+++ b/locales/is-IS.xml
@@ -7,8 +7,11 @@
     <translator>
       <name>styrmirm</name>
     </translator>
+    <translator>
+      <name>magnimarels</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2025-10-16T03:24:01+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -22,137 +25,146 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">persónuleg samskipti</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">sótt</term>
+    <term name="advance-online-publication">advance online publication</term>
+    <term name="album">albúm</term>
     <term name="and">og</term>
     <term name="and others">og fleiri</term>
     <term name="anonymous">nafnlaus</term>
-    <term name="anonymous" form="short">nafnl.</term>
     <term name="at">af</term>
+    <term name="audio-recording">hljóðupptaka</term>
     <term name="available at">aðgengilegt á</term>
     <term name="by">eftir</term>
     <term name="circa">sirka</term>
-    <term name="circa" form="short">u.þ.b.</term>
     <term name="cited">tilvitnun</term>
-    <term name="edition">
-      <single>útgáfa</single>
-      <multiple>útgáfur</multiple>
-    </term>
-    <term name="edition" form="short">útg.</term>
     <term name="et-al">o.fl.</term>
+    <term name="film">film</term>
     <term name="forthcoming">óbirt</term>
     <term name="from">af</term>
+    <term name="henceforth">henceforth</term>
     <term name="ibid">sama heimild</term>
     <term name="in">í</term>
     <term name="in press">í prentun</term>
     <term name="internet">rafrænt</term>
     <term name="letter">bréf</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">engin dagsetning</term>
-    <term name="no date" form="short">e.d.</term>
+    <term name="no-place">no place</term>
+    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
+    <term name="on">on</term>
     <term name="online">rafrænt</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">original work published</term>
+    <term name="personal-communication">persónuleg samskipti</term>
+    <term name="podcast">hlaðvarp</term>
+    <term name="podcast-episode">hlaðvarpsþáttur</term>
+    <term name="preprint">forprentun</term>
     <term name="presented at">flutt á</term>
+    <term name="radio-broadcast">útvarpsútsending</term>
+    <term name="radio-series">útvarpssería</term>
+    <term name="radio-series-episode">útvarpsþáttur</term>
     <term name="reference">
       <single>tilvitnun</single>
       <multiple>tilvitnanir</multiple>
     </term>
+    <term name="retrieved">sótt</term>
+    <term name="review-of">gagnrýni á</term>
+    <term name="scale">skali</term>
+    <term name="special-issue">sérstök útgáfa</term>
+    <term name="special-section">special section</term>
+    <term name="television-broadcast">sjónvarpsútsending</term>
+    <term name="television-series">sjónvarpssería</term>
+    <term name="television-series-episode">sjónvarpsþáttur</term>
+    <term name="video">myndband</term>
+    <term name="working-paper">working paper</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">nafnl.</term>
+    <term name="circa" form="short">u.þ.b.</term>
+    <term name="no date" form="short">e.d.</term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>tilv.</single>
       <multiple>tilv.</multiple>
     </term>
-    <term name="retrieved">sótt</term>
-    <term name="scale">scale</term>
-    <term name="version">útgáfa</term>
+    <term name="review-of" form="short">gagnr. á</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
+    <term name="article">forprentun</term>
+    <term name="article-journal">tímaritsgrein</term>
+    <term name="article-magazine">tímaritsgrein</term>
+    <term name="article-newspaper">blaðagrein</term>
     <term name="bill">bill</term>
     <!-- book is in the list of locator terms -->
     <term name="broadcast">broadcast</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">klassísk</term>
+    <term name="collection">samansafn</term>
+    <term name="dataset">gagnasafn</term>
+    <term name="document">skjal</term>
+    <term name="entry">færsla</term>
+    <term name="entry-dictionary">orðabókarfærsla</term>
+    <term name="entry-encyclopedia">alfræðiorðabókarfærsla</term>
+    <term name="event">viðburður</term>
     <!-- figure is in the list of locator terms -->
     <term name="graphic">graphic</term>
     <term name="hearing">hearing</term>
     <term name="interview">viðtal</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
+    <term name="legal_case">réttarmál</term>
+    <term name="legislation">lagasetning</term>
+    <term name="manuscript">handrit</term>
+    <term name="map">kort</term>
+    <term name="motion_picture">myndbandsupptaka</term>
+    <term name="musical_score">söngleikur</term>
+    <term name="pamphlet">bæklingur</term>
     <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
+    <term name="patent">einkaleyfi</term>
+    <term name="performance">flutningur</term>
     <term name="periodical">periodical</term>
     <term name="personal_communication">persónuleg samskipti</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">færsla</term>
+    <term name="post-weblog">bloggfærsla</term>
+    <term name="regulation">reglugerð</term>
+    <term name="report">skýrsla</term>
+    <term name="review">gagnrýni</term>
+    <term name="review-book">bókagagnrýni</term>
+    <term name="software">hugbúnaður</term>
+    <term name="song">hljóðupptaka</term>
+    <term name="speech">kynning</term>
+    <term name="standard">staðall</term>
+    <term name="thesis">ritgerð</term>
+    <term name="treaty">sáttmáli</term>
+    <term name="webpage">vefsíða</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">tímaritsgr.</term>
+    <term name="article-magazine" form="short">tímaritsgr.</term>
+    <term name="article-newspaper" form="short">blaðagr.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">skj.</term>
     <!-- figure is in the list of locator terms -->
     <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
+    <term name="interview" form="short">viðt.</term>
     <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="motion_picture" form="short">myndbandsuppt.</term>
+    <term name="report" form="short">skýrsla</term>
+    <term name="review" form="short">gagnr.</term>
+    <term name="review-book" form="short">bókagagnr..</term>
+    <term name="song" form="short">hlóðuppt.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">vitnisburður um</term>
+    <term name="review" form="verb">gagnrýni á</term>
+    <term name="review-book" form="verb">gagnrýni á bók</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">e.Kr.</term>
     <term name="bc">f.Kr.</term>
@@ -185,54 +197,26 @@
     <term name="long-ordinal-10">tíundi</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>bók</single>
       <multiple>bækur</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>kafli</single>
       <multiple>kaflar</multiple>
@@ -241,6 +225,14 @@
       <single>dálkur</single>
       <multiple>dálkar</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>mynd</single>
       <multiple>myndir</multiple>
@@ -269,10 +261,6 @@
       <single>blaðsíða</single>
       <multiple>blaðsíður</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>blaðsíða</single>
-      <multiple>blaðsíður</multiple>
-    </term>
     <term name="paragraph">
       <single>málsgrein</single>
       <multiple>málsgreinar</multiple>
@@ -281,6 +269,14 @@
       <single>hluti</single>
       <multiple>hlutar</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>hluti</single>
       <multiple>hlutar</multiple>
@@ -289,6 +285,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>vers</single>
       <multiple>vers</multiple>
@@ -299,45 +311,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">bók</term>
+    <term name="chapter" form="short">k.</term>
+    <term name="column" form="short">d.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">bók</term>
-    <term name="chapter" form="short">k.</term>
-    <term name="column" form="short">d.</term>
     <term name="figure" form="short">mynd.</term>
     <term name="folio" form="short">handr.</term>
     <term name="issue" form="short">tbl.</term>
@@ -348,17 +340,37 @@
       <single>bls.</single>
       <multiple>bls.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>bls.</single>
-      <multiple>bls.</multiple>
-    </term>
     <term name="paragraph" form="short">málsgr.</term>
     <term name="part" form="short">hl.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">hl.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
@@ -368,7 +380,7 @@
       <multiple>b.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -378,15 +390,101 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>kafli</single>
+      <multiple>kaflar</multiple>
+    </term>
+    <term name="citation-number">
+      <single>tilvitnun</single>
+      <multiple>tilvitnanir</multiple>
+    </term>
+    <term name="collection-number">
+      <single>tölublað</single>
+      <multiple>tölublöð</multiple>
+    </term>
+    <term name="edition">
+      <single>útgáfa</single>
+      <multiple>útgáfur</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>tilvísun</single>
+      <multiple>tilvísanir</multiple>
+    </term>
+    <term name="number">
+      <single>númer</single>
+      <multiple>númer</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>blaðsíða</single>
+      <multiple>blaðsíður</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>bindi</single>
+      <multiple>bindi</multiple>
+    </term>
+    <term name="page-first">
+      <single>síða</single>
+      <multiple>síður</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">útgáfa</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>kafli</single>
+      <multiple>kaflar</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>tilv.</single>
+      <multiple>tilv.</multiple>
+    </term>
+    <term name="collection-number" form="short">tbl.</term>
+    <term name="edition" form="short">útg.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>tilv.</single>
+      <multiple>tilv.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>nr.</single>
+      <multiple>nr.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>bls.</single>
+      <multiple>bls.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -395,18 +493,43 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>leikstjóri</single>
+      <multiple>leikstjórar</multiple>
+    </term>
+    <term name="editor">
+      <single>ritstjóri</single>
+      <multiple>ritstjórar</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>ritstjóri og þýðandi</single>
+      <multiple>ritstjórar og þýðendur</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>ritstjóri og þýðandi</single>
+      <multiple>ritstjórar og þýðendur</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>ritstjóri</single>
+      <multiple>ritstjórar</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
     </term>
     <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+      <single>gestur</single>
+      <multiple>gestir</multiple>
     </term>
     <term name="host">
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>höfundur myndskreytinga</single>
+      <multiple>höfundar myndskreytinga</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -415,46 +538,29 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+      <single>flytjandi</single>
+      <multiple>flytjendur</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>framleiðandi</single>
+      <multiple>framleiðendur</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>rithöfundur</single>
+      <multiple>rithöfundar</multiple>
     </term>
     <term name="series-creator">
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>leikstjóri</single>
-      <multiple>leikstjórar</multiple>
-    </term>
-    <term name="editor">
-      <single>ritstjóri</single>
-      <multiple>ritstjórar</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>ritstjóri</single>
-      <multiple>ritstjórar</multiple>
-    </term>
-    <term name="illustrator">
-      <single>höfundur myndskreytinga</single>
-      <multiple>höfundar myndskreytinga</multiple>
-    </term>
     <term name="translator">
       <single>þýðandi</single>
       <multiple>þýðendur</multiple>
     </term>
-    <term name="editortranslator">
-      <single>ritstjóri og þýðandi</single>
-      <multiple>ritstjórar og þýðendur</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -469,10 +575,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>leikstj.</single>
+      <multiple>leikstj.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ritstj.</single>
+      <multiple>ritstj.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ritstj. og þýð.</single>
+      <multiple>ritstj. og þýð.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ritstj. og þýð.</single>
+      <multiple>ritstj. og þýð.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ritstj.</single>
+      <multiple>ritstj.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>höf. mynd.</single>
+      <multiple>höf. mynd.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -482,90 +612,74 @@
       <multiple>orgs.</multiple>
     </term>
     <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+      <single>flytj.</single>
+      <multiple>flytj.</multiple>
     </term>
     <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
+      <single>framl.</single>
+      <multiple>framl.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>rith.</single>
+      <multiple>rith.</multiple>
     </term>
     <term name="series-creator" form="short">
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>leikstj.</single>
-      <multiple>leikstj.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ritstj.</single>
-      <multiple>ritstj.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ritstj.</single>
-      <multiple>ritstj.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>höf. mynd.</single>
-      <multiple>höf. mynd.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>þýð.</single>
       <multiple>þýð.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ritstj. og þýð.</single>
-      <multiple>ritstj. og þýð.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">breytt af</term>
     <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
     <term name="container-author" form="verb">eftir</term>
+    <term name="contributor" form="verb">með</term>
+    <term name="curator" form="verb">curated by</term>
     <term name="director" form="verb">leikstýrt af</term>
     <term name="editor" form="verb">ritstýrt af</term>
+    <term name="editor-translator" form="verb">ritstýrt og þýtt af</term>
+    <term name="editortranslator" form="verb">ritstýrt og þýtt af</term>
     <term name="editorial-director" form="verb">ritstýrt af</term>
+    <term name="executive-producer" form="verb">executive produced by</term>
+    <term name="guest" form="verb">með gesti</term>
+    <term name="host" form="verb">haldið af</term>
     <term name="illustrator" form="verb">myndskreytt af</term>
     <term name="interviewer" form="verb">viðtal tók</term>
+    <term name="narrator" form="verb">narrated by</term>
+    <term name="organizer" form="verb">organized by</term>
+    <term name="performer" form="verb">flutt af</term>
+    <term name="producer" form="verb">framleitt af</term>
     <term name="recipient" form="verb">til</term>
-    <term name="reviewed-author" form="verb">by</term>
+    <term name="reviewed-author" form="verb">af</term>
+    <term name="script-writer" form="verb">skrifað</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">þýddi</term>
-    <term name="editortranslator" form="verb">ritstýrt og þýtt af</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ristj.</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">leikstj.</term>
+    <term name="editor" form="verb-short">ritstj.</term>
+    <term name="editor-translator" form="verb-short">ritstj. og þýð.</term>
+    <term name="editortranslator" form="verb-short">ritstj. og þýð.</term>
+    <term name="editorial-director" form="verb-short">ritstj.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">myndskr.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">leikstj.</term>
-    <term name="editor" form="verb-short">ritstj.</term>
-    <term name="editorial-director" form="verb-short">ritstj.</term>
-    <term name="illustrator" form="verb-short">myndskr.</term>
     <term name="translator" form="verb-short">þýð.</term>
-    <term name="editortranslator" form="verb-short">ritstj. og þýð.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">janúar</term>
diff --git a/locales/it-IT.xml b/locales/it-IT.xml
--- a/locales/it-IT.xml
+++ b/locales/it-IT.xml
@@ -5,8 +5,12 @@
       <name>Filippo Vomiero</name>
       <email>filippo.vomiero@unipd.it</email>
     </translator>
+    <translator>
+      <name>Pietro Liuzzo</name>
+      <email>Pietro Liuzzo</email>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2022-07-07T17:56:02+01:00</updated>
+    <updated>2026-08-19T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -20,26 +24,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">consultato</term>
     <term name="advance-online-publication">pubblicazione online ad accesso anticipato</term>
     <term name="album">album</term>
+    <term name="and">e</term>
+    <term name="and others">e altri</term>
+    <term name="anonymous">anonimo</term>
+    <term name="at">a</term>
     <term name="audio-recording">registrazione audio</term>
+    <term name="available at">disponibile su</term>
+    <term name="by">di</term>
+    <term name="circa">circa</term>
+    <term name="cited">citato</term>
+    <term name="et-al">et al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">in corso di pubblicazione</term>
+    <term name="from">da</term>
     <term name="henceforth">d'ora in poi</term>
+    <term name="ibid">ibidem</term>
+    <term name="in">in</term>
+    <term name="in press">in stampa</term>
+    <term name="internet">internet</term>
+    <term name="letter">lettera</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">sine data</term>
     <term name="no-place">sine loco</term>
-    <term name="no-place" form="short">s.l.</term>
     <term name="no-publisher">sine nomine</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">s.n.</term>
     <term name="on">su</term>
+    <term name="online">online</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">opera originale pubblicata</term>
     <term name="personal-communication">comunicazione personale</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">episodio di podcast</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">presentato al</term>
     <term name="radio-broadcast">trasmissione radiofonica</term>
     <term name="radio-series">serie radiofonica</term>
     <term name="radio-series-episode">episodio di serie radiofonica</term>
+    <term name="reference">
+      <single>riferimento</single>
+      <multiple>riferimenti</multiple>
+    </term>
+    <term name="retrieved">recuperato</term>
+    <term name="review-of">recensione di</term>
+    <term name="scale">scala</term>
     <term name="special-issue">edizione speciale</term>
     <term name="special-section">sezione speciale</term>
     <term name="television-broadcast">trasmissione televisiva</term>
@@ -47,48 +77,23 @@
     <term name="television-series-episode">episodio di serie televisiva</term>
     <term name="video">video</term>
     <term name="working-paper">documento di lavoro</term>
-    <term name="accessed">consultato</term>
-    <term name="and">e</term>
-    <term name="and others">e altri</term>
-    <term name="anonymous">anonimo</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anon.</term>
-    <term name="at">a</term>
-    <term name="available at">disponibile su</term>
     <term name="available at" form="short">su</term>
-    <term name="by">di</term>
-    <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">citato</term>
-    <term name="edition" gender="feminine">
-      <single>edizione</single>
-      <multiple>edizioni</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">in corso di pubblicazione</term>
-    <term name="from">da</term>
-    <term name="ibid">ibidem</term>
     <term name="ibid" form="short">ibid.</term>
-    <term name="in">in</term>
-    <term name="in press">in stampa</term>
-    <term name="internet">internet</term>
-    <term name="letter">lettera</term>
-    <term name="no date">sine data</term>
     <term name="no date" form="short">s.d.</term>
-    <term name="online">online</term>
-    <term name="presented at">presentato al</term>
-    <term name="reference">
-      <single>riferimento</single>
-      <multiple>riferimenti</multiple>
-    </term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher" form="short">s.n.</term>
     <term name="reference" form="short">
       <single>rif.</single>
       <multiple>rif.</multiple>
     </term>
-    <term name="retrieved">recuperato</term>
-    <term name="scale">scala</term>
-    <term name="version">versione</term>
+    <term name="review-of" form="short">rec. di</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">articolo di rivista</term>
@@ -96,7 +101,7 @@
     <term name="article-newspaper">articolo di giornale</term>
     <term name="bill">proposta di legge</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">transmissione</term>
     <!-- chapter is in the list of locator terms -->
     <term name="classic">classico</term>
     <term name="collection">collezione</term>
@@ -125,8 +130,8 @@
     <term name="post">messaggio</term>
     <term name="post-weblog">messaggio di blog</term>
     <term name="regulation">decreto</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
+    <term name="report">resoconto</term>
+    <term name="review">recensione</term>
     <term name="review-book">recensione di libro</term>
     <term name="software">software</term>
     <term name="song">registrazione audio</term>
@@ -153,6 +158,14 @@
     <term name="review-book" form="short">rec. di l.</term>
     <term name="song" form="short">reg. audio</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimonianza di</term>
+    <term name="review" form="verb">recensione di</term>
+    <term name="review-book" form="verb">recensione del libro</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">d.C.</term>
     <term name="bc">a.C.</term>
@@ -176,85 +189,57 @@
 
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">prima</term>
-    <term name="long-ordinal-01" gender-form="masculine">primo</term>
-    <term name="long-ordinal-01" gender-form="feminine">prima</term>
     <term name="long-ordinal-02">seconda</term>
-    <term name="long-ordinal-02" gender-form="masculine">secondo</term>
-    <term name="long-ordinal-02" gender-form="feminine">seconda</term>
     <term name="long-ordinal-03">terza</term>
-    <term name="long-ordinal-03" gender-form="masculine">terzo</term>
-    <term name="long-ordinal-03" gender-form="feminine">terza</term>
     <term name="long-ordinal-04">quarta</term>
-    <term name="long-ordinal-04" gender-form="masculine">quarto</term>
-    <term name="long-ordinal-04" gender-form="feminine">quarta</term>
     <term name="long-ordinal-05">quinta</term>
-    <term name="long-ordinal-05" gender-form="masculine">quinto</term>
-    <term name="long-ordinal-05" gender-form="feminine">quinta</term>
     <term name="long-ordinal-06">sesta</term>
-    <term name="long-ordinal-06" gender-form="masculine">sesto</term>
-    <term name="long-ordinal-06" gender-form="feminine">sesta</term>
     <term name="long-ordinal-07">settima</term>
-    <term name="long-ordinal-07" gender-form="masculine">settimo</term>
-    <term name="long-ordinal-07" gender-form="feminine">settima</term>
     <term name="long-ordinal-08">ottava</term>
-    <term name="long-ordinal-08" gender-form="masculine">ottavo</term>
-    <term name="long-ordinal-08" gender-form="feminine">ottava</term>
     <term name="long-ordinal-09">nona</term>
-    <term name="long-ordinal-09" gender-form="masculine">nono</term>
-    <term name="long-ordinal-09" gender-form="feminine">nona</term>
     <term name="long-ordinal-10">decima</term>
+    <term name="long-ordinal-01" gender-form="masculine">primo</term>
+    <term name="long-ordinal-02" gender-form="masculine">secondo</term>
+    <term name="long-ordinal-03" gender-form="masculine">terzo</term>
+    <term name="long-ordinal-04" gender-form="masculine">quarto</term>
+    <term name="long-ordinal-05" gender-form="masculine">quinto</term>
+    <term name="long-ordinal-06" gender-form="masculine">sesto</term>
+    <term name="long-ordinal-07" gender-form="masculine">settimo</term>
+    <term name="long-ordinal-08" gender-form="masculine">ottavo</term>
+    <term name="long-ordinal-09" gender-form="masculine">nono</term>
     <term name="long-ordinal-10" gender-form="masculine">decimo</term>
+    <term name="long-ordinal-01" gender-form="feminine">prima</term>
+    <term name="long-ordinal-02" gender-form="feminine">seconda</term>
+    <term name="long-ordinal-03" gender-form="feminine">terza</term>
+    <term name="long-ordinal-04" gender-form="feminine">quarta</term>
+    <term name="long-ordinal-05" gender-form="feminine">quinta</term>
+    <term name="long-ordinal-06" gender-form="feminine">sesta</term>
+    <term name="long-ordinal-07" gender-form="feminine">settima</term>
+    <term name="long-ordinal-08" gender-form="feminine">ottava</term>
+    <term name="long-ordinal-09" gender-form="feminine">nona</term>
     <term name="long-ordinal-10" gender-form="feminine">decima</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>atto</single>
-      <multiple>atto</multiple>						 
+      <multiple>atto</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendice</single>
-      <multiple>appendici</multiple>						 
+      <multiple>appendici</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>articolo</single>
-      <multiple>articoli</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canone</single>
-      <multiple>canoni</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>indirizzo</single>
-      <multiple>indirizzi</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equazione</single>
-      <multiple>equazioni</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>regola</single>
-      <multiple>regole</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scena</single>
-      <multiple>scene</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>tavola</single>
-      <multiple>tavole</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>titolo</single>
-      <multiple>titoli</multiple>						 
+      <multiple>articoli</multiple>
     </term>
     <term name="book">
       <single>libro</single>
       <multiple>libri</multiple>
     </term>
+    <term name="canon">
+      <single>canone</single>
+      <multiple>canoni</multiple>
+    </term>
     <term name="chapter">
       <single>capitolo</single>
       <multiple>capitoli</multiple>
@@ -263,6 +248,14 @@
       <single>colonna</single>
       <multiple>colonne</multiple>
     </term>
+    <term name="elocation">
+      <single>indirizzo</single>
+      <multiple>indirizzi</multiple>
+    </term>
+    <term name="equation">
+      <single>equazione</single>
+      <multiple>equazioni</multiple>
+    </term>
     <term name="figure">
       <single>figura</single>
       <multiple>figure</multiple>
@@ -291,10 +284,6 @@
       <single>pagina</single>
       <multiple>pagine</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>pagina</single>
-      <multiple>pagine</multiple>
-    </term>
     <term name="paragraph">
       <single>paragrafo</single>
       <multiple>paragrafi</multiple>
@@ -303,6 +292,14 @@
       <single>parte</single>
       <multiple>parti</multiple>
     </term>
+    <term name="rule">
+      <single>regola</single>
+      <multiple>regole</multiple>
+    </term>
+    <term name="scene">
+      <single>scena</single>
+      <multiple>scene</multiple>
+    </term>
     <term name="section">
       <single>sezione</single>
       <multiple>sezioni</multiple>
@@ -311,6 +308,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplemento</single>
+      <multiple>supplementi</multiple>
+    </term>
+    <term name="table">
+      <single>tavola</single>
+      <multiple>tavole</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>titolo</single>
+      <multiple>titoli</multiple>
+    </term>
     <term name="verse">
       <single>verso</single>
       <multiple>versi</multiple>
@@ -321,50 +334,30 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>app.</multiple>						 
+      <multiple>app.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>art.</multiple>
     </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eq.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>r.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>sc.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tab.</single>
-      <multiple>tab.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
     <term name="book" form="short">lib.</term>
     <term name="chapter" form="short">
       <single>cap.</single>
       <multiple>capp.</multiple>
     </term>
     <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
+      <single>loc.</single>
+      <multiple>loc.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>eq.</single>
+      <multiple>eq.</multiple>
+    </term>
     <term name="figure" form="short">fig.</term>
-    <term name="folio" form="short">fgl.</term>
+    <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">fasc.</term>
     <term name="line" form="short">r.</term>
     <term name="note" form="short">n.</term>
@@ -373,17 +366,37 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">pt.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>r.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>sc.</multiple>
+    </term>
     <term name="section" form="short">sez.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supp.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tab.</single>
+      <multiple>tab.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tit.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -393,7 +406,7 @@
       <multiple>voll.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -403,15 +416,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>capitolo</single>
+      <multiple>capitoli</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citazione</single>
+      <multiple>citazioni</multiple>
+    </term>
+    <term name="collection-number" gender="masculine">
+      <single>fascicolo</single>
+      <multiple>fascicoli</multiple>
+    </term>
+    <term name="edition" gender="feminine">
+      <single>edizione</single>
+      <multiple>edizioni</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>nota</single>
+      <multiple>note</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>pagina</single>
+      <multiple>pagine</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumi</multiple>
+    </term>
+    <term name="page-first">
+      <single>pagina</single>
+      <multiple>pagine</multiple>
+    </term>
+    <term name="printing">
+      <single>stampa</single>
+      <multiple>stampe</multiple>
+    </term>
+    <term name="version">versione</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>cap.</single>
+      <multiple>cap.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cit.</multiple>
+    </term>
+    <term name="collection-number" form="short">fasc.</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>voll.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>stampa</single>
+      <multiple>stampe</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>presidente</single>
       <multiple>presidenti</multiple>
     </term>
+    <term name="collection-editor">
+      <single>a cura di</single>
+      <multiple>a cura di</multiple>
+    </term>
     <term name="compiler">
       <single>compilatore</single>
       <multiple>compilatori</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>collaboratore</single>
       <multiple>collaboratori</multiple>
@@ -420,6 +516,26 @@
       <single>curatore</single>
       <multiple>curatori</multiple>
     </term>
+    <term name="director">
+      <single>regista</single>
+      <multiple>registi</multiple>
+    </term>
+    <term name="editor">
+      <single>curatore</single>
+      <multiple>curatori</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>curatore e traduttore</single>
+      <multiple>curatori e tradutori</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>curatore e traduttore</single>
+      <multiple>curatori e tradutori</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>direttore editoriale</single>
+      <multiple>direttori editoriali</multiple>
+    </term>
     <term name="executive-producer">
       <single>produttore esecutivo</single>
       <multiple>produttori esecutivi</multiple>
@@ -432,6 +548,11 @@
       <single>conduttore</single>
       <multiple>conduttori</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustratore</single>
+      <multiple>illustratori</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narratore</single>
       <multiple>narratori</multiple>
@@ -440,6 +561,7 @@
       <single>organizzatore</single>
       <multiple>organizzatori</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>esecutore</single>
       <multiple>esecutori</multiple>
@@ -448,6 +570,8 @@
       <single>produttore</single>
       <multiple>produttori</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>sceneggiatore</single>
       <multiple>sceneggiatori</multiple>
@@ -456,30 +580,10 @@
       <single>autore della serie</single>
       <multiple>autori della serie</multiple>
     </term>
-    <term name="director">
-      <single>regista</single>
-      <multiple>registi</multiple>
-    </term>
-    <term name="editor">
-      <single>curatore</single>
-      <multiple>curatori</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>direttore editoriale</single>
-      <multiple>direttori editoriali</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustratore</single>
-      <multiple>illustratori</multiple>
-    </term>
     <term name="translator">
       <single>traduttore</single>
       <multiple>traduttori</multiple>
     </term>
-    <term name="editortranslator">
-      <single>curatore e traduttore</single>
-      <multiple>curatori e tradutori</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -494,10 +598,34 @@
       <single>cur.</single>
       <multiple>cur.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>reg.</single>
+      <multiple>reg.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>a c. di</single>
+      <multiple>a c. di</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>cur. e trad.</single>
+      <multiple>cur. e trad.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>cur. e trad.</single>
+      <multiple>cur. e trad.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>dir. ed.</single>
+      <multiple>dir. ed.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>prod.es.</single>
       <multiple>prod. es.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ill.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narr.</multiple>
@@ -522,75 +650,59 @@
       <single>aut. d. serie</single>
       <multiple>aut. d. serie</multiple>
     </term>
-    <term name="director" form="short">
-      <single>reg.</single>
-      <multiple>reg.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>a c. di</single>
-      <multiple>a c. di</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>dir. ed.</single>
-      <multiple>dir. ed.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ill.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>trad.</single>
       <multiple>trad.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>cur. e trad.</single>
-      <multiple>cur. e trad.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">presieduto da</term>
+    <term name="collection-editor" form="verb">a cura di</term>
     <term name="compiler" form="verb">compilato da</term>
+    <term name="container-author" form="verb">di</term>
     <term name="contributor" form="verb">con un contributo di</term>
     <term name="curator" form="verb">a cura di</term>
+    <term name="director" form="verb">diretto da</term>
+    <term name="editor" form="verb">a cura di</term>
+    <term name="editor-translator" form="verb">a cura di e tradotto da</term>
+    <term name="editortranslator" form="verb">a cura di e tradotto da</term>
+    <term name="editorial-director" form="verb">direzione editoriale di</term>
     <term name="executive-producer" form="verb">produzione esecutiva di</term>
     <term name="guest" form="verb">con ospite</term>
     <term name="host" form="verb">condotto da</term>
+    <term name="illustrator" form="verb">illustrato da</term>
+    <term name="interviewer" form="verb">intervista di</term>
     <term name="narrator" form="verb">narrato da</term>
     <term name="organizer" form="verb">organizzato da</term>
     <term name="performer" form="verb">esecuzione di</term>
     <term name="producer" form="verb">prodotto da</term>
-    <term name="script-writer" form="verb">scritto da</term>
-    <term name="series-creator" form="verb">creato da</term>
-    <term name="container-author" form="verb">di</term>
-    <term name="director" form="verb">diretto da</term>
-    <term name="editor" form="verb">a cura di</term>
-    <term name="editorial-director" form="verb">direzione editoriale di</term>
-    <term name="illustrator" form="verb">illustrato da</term>
-    <term name="interviewer" form="verb">intervista di</term>
     <term name="recipient" form="verb">a</term>
     <term name="reviewed-author" form="verb">di</term>
+    <term name="script-writer" form="verb">scritto da</term>
+    <term name="series-creator" form="verb">creato da</term>
     <term name="translator" form="verb">tradotto da</term>
-    <term name="editortranslator" form="verb">a cura di e tradotto da</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">a c. di</term>
     <term name="compiler" form="verb-short">comp. da</term>
     <term name="contributor" form="verb-short">con un contrib. di</term>
     <term name="curator" form="verb-short">a c. di</term>
+    <term name="director" form="verb-short">dir. da</term>
+    <term name="editor" form="verb-short">a c. di</term>
+    <term name="editor-translator" form="verb-short">a c. di e trad. da</term>
+    <term name="editortranslator" form="verb-short">a c. di e trad. da</term>
+    <term name="editorial-director" form="verb-short">dir. ed. di</term>
     <term name="executive-producer" form="verb-short">prod. esec. di</term>
     <term name="guest" form="verb-short">con osp.</term>
     <term name="host" form="verb-short">cond. da</term>
+    <term name="illustrator" form="verb-short">ill. da</term>
     <term name="narrator" form="verb-short">narr. da</term>
     <term name="organizer" form="verb-short">org. da</term>
     <term name="performer" form="verb-short">esec. di</term>
     <term name="producer" form="verb-short">prod. da</term>
     <term name="script-writer" form="verb-short">scr. da</term>
     <term name="series-creator" form="verb-short">cre. da</term>
-    <term name="director" form="verb-short">dir. da</term>
-    <term name="editor" form="verb-short">a c. di</term>
-    <term name="editorial-director" form="verb-short">dir. ed. di</term>
-    <term name="illustrator" form="verb-short">ill. da</term>
     <term name="translator" form="verb-short">trad. da</term>
-    <term name="editortranslator" form="verb-short">a c. di e trad. da</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01" gender="masculine">gennaio</term>
diff --git a/locales/ja-JP.xml b/locales/ja-JP.xml
--- a/locales/ja-JP.xml
+++ b/locales/ja-JP.xml
@@ -4,8 +4,16 @@
     <translator>
       <name>Shoji Takahashi</name>
     </translator>
+    <translator>
+      <name>cmplstofB</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
+    <!--
+      日本語化にあたって参考にした文献
+      * SIST 02:2007「参照文献の書き方」
+      * JIS X 0807:1999「電子文献の引用法」
+    -->
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,142 +27,151 @@
     <date-part name="day" suffix="日"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">個人的なやり取り</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">参照</term>
+    <!-- cf: https://www.jstage.jst.go.jp/static/pages/advance_online_publication/-char/ja -->
+    <term name="advance-online-publication">早期公開</term>
+    <term name="album">アルバム</term>
     <term name="and">と</term>
-    <term name="and others">and others</term>
-    <term name="anonymous">anonymous</term>
-    <term name="anonymous" form="short">anon</term>
-    <term name="at">at</term>
-    <term name="available at">available at</term>
-    <term name="by">by</term>
-    <term name="circa">circa</term>
-    <term name="circa" form="short">c.</term>
-    <term name="cited">cited</term>
-    <term name="edition">
-      <single>版</single>
-      <multiple>版</multiple>
-    </term>
-    <term name="edition" form="short">版</term>
+    <term name="and others">ほか</term>
+    <term name="anonymous">匿名</term>
+    <term name="at">にて</term>
+    <term name="audio-recording">音声録音</term>
+    <term name="available at">入手先</term>
+    <term name="by">による</term>
+    <term name="circa">およそ</term>
+    <term name="cited">引用</term>
     <term name="et-al">ほか</term>
+    <term name="film">映像作品</term>
     <term name="forthcoming">近刊</term>
     <term name="from">から</term>
+    <term name="henceforth">現在より</term>
     <term name="ibid">前掲</term>
-    <term name="in"></term>
-    <term name="in press">in press</term>
-    <term name="internet">internet</term>
+    <term name="in"/>
+    <term name="in press">近刊</term>
+    <term name="internet">インターネット</term>
     <term name="letter">手紙</term>
-    <term name="no date">no date</term>
-    <term name="no date" form="short">日付なし</term>
-    <term name="online">online</term>
-    <term name="presented at">presented at the</term>
+    <term name="loc-cit">同頁</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">日付なし</term>
+    <term name="no-place">所在不詳</term>
+    <term name="no-publisher">作者不詳</term> <!-- sine nomine -->
+    <term name="on">において</term>
+    <term name="online">オンライン</term>
+    <term name="op-cit">同前</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">original work published</term>
+    <term name="personal-communication">個人間疎通</term>
+    <term name="podcast">音声配信</term>
+    <term name="podcast-episode">音声配信の一話</term>
+    <term name="preprint">査読前原稿</term>
+    <term name="presented at">講演場所</term>
+    <term name="radio-broadcast">ラジオ配信</term>
+    <term name="radio-series">ラジオ番組</term>
+    <term name="radio-series-episode">ラジオ番組の一話</term>
     <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
+      <single>参照</single>
+      <multiple>参照</multiple>
     </term>
+    <term name="retrieved">回収</term>
+    <term name="review-of">review of</term>
+    <term name="scale">位</term>
+    <term name="special-issue">特別号</term>
+    <term name="special-section">特別節</term>
+    <term name="television-broadcast">テレビ放送</term>
+    <term name="television-series">テレビ番組</term>
+    <term name="television-series-episode">テレビ番組の一話</term>
+    <term name="video">動画</term>
+    <term name="working-paper">報告書</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">匿名</term>
+    <term name="circa" form="short">およそ</term>
+    <term name="no date" form="short">日付なし</term>
+    <term name="no-place" form="short">所在不詳</term>
+    <term name="no-publisher" form="short">作者不詳</term>
     <term name="reference" form="short">
-      <single>ref.</single>
-      <multiple>refs.</multiple>
+      <single>参照</single>
+      <multiple>参照</multiple>
     </term>
-    <term name="retrieved">読み込み</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">記事</term>
+    <term name="article-journal">学術論文</term>
+    <term name="article-magazine">雑誌記事</term>
+    <term name="article-newspaper">報道記事</term>
+    <term name="bill">証書</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">配信</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">古典</term>
+    <term name="collection">集体</term>
+    <term name="dataset">データ集合</term>
+    <term name="document">文書</term>
+    <term name="entry">見出し語</term>
+    <term name="entry-dictionary">辞書の見出し語</term>
+    <term name="entry-encyclopedia">辞典の見出し語</term>
+    <term name="event">催し</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
-    <term name="interview">interview</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
-    <term name="personal_communication">個人的なやり取り</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="graphic">視覚的</term>
+    <term name="hearing">聴覚的</term>
+    <term name="interview">面接</term>
+    <term name="legal_case">裁判事例</term>
+    <term name="legislation">法律</term>
+    <term name="manuscript">写本</term>
+    <term name="map">地図</term>
+    <term name="motion_picture">映像記録</term>
+    <term name="musical_score">楽譜</term>
+    <term name="pamphlet">小冊子</term>
+    <term name="paper-conference">会議論文</term>
+    <term name="patent">特許</term>
+    <term name="performance">実演</term>
+    <term name="periodical">定期刊行物</term>
+    <term name="personal_communication">個人間疎通</term>
+    <term name="post">投稿</term>
+    <term name="post-weblog">ブログ投稿</term>
+    <term name="regulation">規則</term>
+    <term name="report">報告書</term>
+    <term name="review">論評</term>
+    <term name="review-book">書評</term>
+    <term name="software">ソフトウェア</term>
+    <term name="song">音声記録</term>
+    <term name="speech">講演</term>
+    <term name="standard">標準</term>
+    <term name="thesis">定立</term>
+    <term name="treaty">条約</term>
+    <term name="webpage">Webページ</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">学術論文</term>
+    <term name="article-magazine" form="short">雑誌記事</term>
+    <term name="article-newspaper" form="short">報道記事</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">文書</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="graphic" form="short">視覚的</term>
+    <term name="manuscript" form="short">写本</term>
+    <term name="motion_picture" form="short">映像記録</term>
+    <term name="report" form="short">報告書</term>
+    <term name="review" form="short">論評</term>
+    <term name="review-book" form="short">書評</term>
+    <term name="song" form="short">音声記録</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">AD</term>
-    <term name="bc">BC</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="ad">紀元前</term>
+    <term name="bc">紀元後</term>
+    <term name="bce">通用紀元前</term>
+    <term name="ce">通用紀元</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">「</term>
@@ -167,211 +184,215 @@
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal">th</term>
-    <term name="ordinal-01">st</term>
-    <term name="ordinal-02">nd</term>
-    <term name="ordinal-03">rd</term>
-    <term name="ordinal-11">th</term>
-    <term name="ordinal-12">th</term>
-    <term name="ordinal-13">th</term>
+    <term name="ordinal">番目</term>
+    <term name="ordinal-01">番目</term>
+    <term name="ordinal-02">番目</term>
+    <term name="ordinal-03">番目</term>
+    <term name="ordinal-11">番目</term>
+    <term name="ordinal-12">番目</term>
+    <term name="ordinal-13">番目</term>
 
     <!-- LONG ORDINALS -->
-    <term name="long-ordinal-01">first</term>
-    <term name="long-ordinal-02">second</term>
-    <term name="long-ordinal-03">third</term>
-    <term name="long-ordinal-04">fourth</term>
-    <term name="long-ordinal-05">fifth</term>
-    <term name="long-ordinal-06">sixth</term>
-    <term name="long-ordinal-07">seventh</term>
-    <term name="long-ordinal-08">eighth</term>
-    <term name="long-ordinal-09">ninth</term>
-    <term name="long-ordinal-10">tenth</term>
+    <term name="long-ordinal-01">1番目</term>
+    <term name="long-ordinal-02">2番目</term>
+    <term name="long-ordinal-03">3番目</term>
+    <term name="long-ordinal-04">4番目</term>
+    <term name="long-ordinal-05">5番目</term>
+    <term name="long-ordinal-06">6番目</term>
+    <term name="long-ordinal-07">7番目</term>
+    <term name="long-ordinal-08">8番目</term>
+    <term name="long-ordinal-09">9番目</term>
+    <term name="long-ordinal-10">10番目</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>幕</single>
+      <multiple>幕</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>附録</single>
+      <multiple>附録</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>記事</single>
+      <multiple>記事</multiple>
     </term>
     <term name="book">
-      <single>book</single>
-      <multiple>books</multiple>
+      <single>書籍</single>
+      <multiple>書籍</multiple>
     </term>
+    <term name="canon">
+      <single>規範</single>
+      <multiple>規範</multiple>
+    </term>
     <term name="chapter">
-      <single>chapter</single>
-      <multiple>chapters</multiple>
+      <single>章</single>
+      <multiple>章</multiple>
     </term>
     <term name="column">
-      <single>column</single>
-      <multiple>columns</multiple>
+      <single>欄</single>
+      <multiple>欄</multiple>
     </term>
+    <term name="elocation">
+      <single>場所</single>
+      <multiple>場所</multiple>
+    </term>
+    <term name="equation">
+      <single>式</single>
+      <multiple>式</multiple>
+    </term>
     <term name="figure">
-      <single>figure</single>
-      <multiple>figures</multiple>
+      <single>図</single>
+      <multiple>図</multiple>
     </term>
     <term name="folio">
-      <single>folio</single>
-      <multiple>folios</multiple>
+      <single>面</single>
+      <multiple>面</multiple>
     </term>
     <term name="issue">
-      <single>number</single>
-      <multiple>numbers</multiple>
+      <single>号</single>
+      <multiple>号</multiple>
     </term>
     <term name="line">
       <single>行</single>
       <multiple>行</multiple>
     </term>
     <term name="note">
-      <single>note</single>
-      <multiple>notes</multiple>
+      <single>註</single>
+      <multiple>註</multiple>
     </term>
     <term name="opus">
-      <single>opus</single>
-      <multiple>opera</multiple>
+      <single>作品</single>
+      <multiple>作品</multiple>
     </term>
     <term name="page">
       <single>ページ</single>
       <multiple>ページ</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>ページ</single>
-      <multiple>ページ</multiple>
-    </term>
     <term name="paragraph">
       <single>段落</single>
       <multiple>段落</multiple>
     </term>
     <term name="part">
-      <single>part</single>
-      <multiple>parts</multiple>
+      <single>部</single>
+      <multiple>部</multiple>
     </term>
+    <term name="rule">
+      <single>規則</single>
+      <multiple>規則</multiple>
+    </term>
+    <term name="scene">
+      <single>舞台</single>
+      <multiple>舞台</multiple>
+    </term>
     <term name="section">
-      <single>section</single>
-      <multiple>sections</multiple>
+      <single>節</single>
+      <multiple>節</multiple>
     </term>
     <term name="sub-verbo">
-      <single>sub verbo</single>
-      <multiple>sub verbis</multiple>
+      <!--
+        『辞書』における「単語」
+                ^^^^^^^^
+      -->
+      <single>における</single>
+      <multiple>における</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>表</single>
+      <multiple>表</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>題名</single>
+      <multiple>題名</multiple>
+    </term>
     <term name="verse">
-      <single>verse</single>
-      <multiple>verses</multiple>
+      <single>詩歌</single>
+      <multiple>詩歌</multiple>
     </term>
     <term name="volume">
-      <single>volume</single>
-      <multiple>volumes</multiple>
+      <single>巻</single>
+      <multiple>巻</multiple>
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
+    <term name="appendix" form="short">
+      <single>附録</single>
+      <multiple>附録</multiple>
     </term>
-    <term name="article-locator" form="short">			 
-      <single>art.</single>
-      <multiple>arts.</multiple>
+    <term name="article-locator" form="short">
+      <single>記事</single>
+      <multiple>記事</multiple>
     </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
+    <term name="book" form="short">書籍</term>
+    <term name="chapter" form="short">章</term>
+    <term name="column" form="short">欄</term>
+    <term name="elocation" form="short">
+      <single>場所</single>
+      <multiple>場所</multiple>
     </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
+    <term name="equation" form="short">
+      <single>式</single>
+      <multiple>式</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
+    <term name="figure" form="short">図</term>
+    <term name="folio" form="short">面</term>
+    <term name="issue" form="short">号</term>
+    <term name="line" form="short">行</term>
+    <term name="note" form="short">註</term>
+    <term name="opus" form="short">作品</term>
+    <term name="page" form="short">
+      <single>ページ</single>
+      <multiple>ページ</multiple>
     </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
+    <term name="paragraph" form="short">段落</term>
+    <term name="part" form="short">部</term>
+    <term name="rule" form="short">
+      <single>規則</single>
+      <multiple>規則</multiple>
     </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
+    <term name="scene" form="short">
+      <single>舞台</single>
+      <multiple>舞台</multiple>
     </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="section" form="short">節</term>
+    <term name="sub-verbo" form="short">
+      <single>における</single>
+      <multiple>における</multiple>
     </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
     </term>
-    <term name="book" form="short">bk.</term>
-    <term name="chapter" form="short">chap.</term>
-    <term name="column" form="short">col.</term>
-    <term name="figure" form="short">fig.</term>
-    <term name="folio" form="short">f.</term>
-    <term name="issue" form="short">no.</term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
-    <term name="opus" form="short">op.</term>
-    <term name="page" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
+    <term name="table" form="short">
+      <single>題名</single>
+      <multiple>題名</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
     </term>
-    <term name="paragraph" form="short">para.</term>
-    <term name="part" form="short">pt.</term>
-    <term name="section" form="short">sec.</term>
-    <term name="sub-verbo" form="short">
-      <single>s.v.</single>
-      <multiple>s.vv.</multiple>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
     </term>
     <term name="verse" form="short">
-      <single>v.</single>
-      <multiple>vv.</multiple>
+      <single>詩歌</single>
+      <multiple>詩歌</multiple>
     </term>
     <term name="volume" form="short">
-      <single>vol.</single>
-      <multiple>vols.</multiple>
+      <single>巻</single>
+      <multiple>巻</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -381,194 +402,242 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>号</single>
+      <multiple>号</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>版</single>
+      <multiple>版</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>註</single>
+      <multiple>註</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>ページ</single>
+      <multiple>ページ</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">版</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">no.</term>
+    <term name="edition" form="short">版</term>
+    <term name="first-reference-note-number" form="short">註</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
+    <term name="number-of-pages" form="short">
+      <single>ページ</single>
+      <multiple>ページ</multiple>
     </term>
-    <term name="editor">
-      <single>編</single>
-      <multiple>編</multiple>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
     </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editors</multiple>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
     </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
     </term>
-    <term name="translator">
-      <single>翻訳者</single>
-      <multiple>翻訳者</multiple>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>議長</single>
+      <multiple/>
     </term>
-    <term name="editortranslator">
-      <single>editor &amp; translator</single>
-      <multiple>editors &amp; translators</multiple>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
     </term>
-
-    <!-- SHORT ROLE FORMS -->
-    <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+    <term name="compiler">
+      <single>編纂者</single>
+      <multiple/>
     </term>
-    <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>協力者</single>
+      <multiple>協力者</multiple>
     </term>
-    <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
+    <term name="curator">
+      <single>管理者</single>
+      <multiple>管理者</multiple>
     </term>
-    <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+    <term name="director">
+      <single>指導者</single>
+      <multiple>指導者</multiple>
     </term>
-    <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
+    <term name="editor">
+      <single>編集者</single>
+      <multiple>編集者</multiple>
     </term>
-    <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
+    <term name="editor-translator">
+      <single>編集・翻訳者</single>
+      <multiple>編集・翻訳者</multiple>
     </term>
-    <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+    <term name="editortranslator">
+      <single>編集・翻訳者</single>
+      <multiple>編集・翻訳者</multiple>
     </term>
-    <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
+    <term name="editorial-director">
+      <single>編集者</single>
+      <multiple>編集者</multiple>
     </term>
-    <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+    <term name="executive-producer">
+      <single>制作総指揮者</single>
+      <multiple>制作総指揮者</multiple>
     </term>
-    <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
+    <term name="guest">
+      <single>特別出演者</single>
+      <multiple>特別出演者</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
+    <term name="host">
+      <single>主催者</single>
+      <multiple>主催者</multiple>
     </term>
-    <term name="editor" form="short">
-      <single>編</single>
-      <multiple>編</multiple>
+    <term name="illustrator">
+      <single>図解者</single>
+      <multiple>図解者</multiple>
     </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>語り手</single>
+      <multiple>語り手</multiple>
     </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
+    <term name="organizer">
+      <single>組織者</single>
+      <multiple>組織者</multiple>
     </term>
-    <term name="translator" form="short">
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>演者</single>
+      <multiple>演者</multiple>
+    </term>
+    <term name="producer">
+      <single>指揮者</single>
+      <multiple>指揮者</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>執筆者</single>
+      <multiple>執筆者</multiple>
+    </term>
+    <term name="series-creator">
+      <single>番組制作者</single>
+      <multiple>番組制作者</multiple>
+    </term>
+    <term name="translator">
       <single>翻訳者</single>
       <multiple>翻訳者</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; tran.</single>
-      <multiple>eds. &amp; trans.</multiple>
-    </term>
 
+    <!-- SHORT ROLE FORMS -->
+    <term name="compiler" form="short">纂</term>
+    <term name="contributor" form="short">協力</term>
+    <term name="curator" form="short">管理</term>
+    <term name="director" form="short">指導</term>
+    <term name="editor" form="short">編</term>
+    <term name="editor-translator" form="short">編・訳</term>
+    <term name="editortranslator" form="short">編・訳</term>
+    <term name="editorial-director" form="short">編・指導</term>
+    <term name="executive-producer" form="short">総指揮</term>
+    <term name="illustrator" form="short">図解</term>
+    <term name="narrator" form="short">語り</term>
+    <term name="organizer" form="short">組織</term>
+    <term name="performer" form="short">演</term>
+    <term name="producer" form="short">指揮</term>
+    <term name="script-writer" form="short">執筆</term>
+    <term name="series-creator" form="short">番組制作</term>
+    <term name="translator" form="short">訳</term>
+
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">編集者：</term>
-    <term name="editorial-director" form="verb">edited by</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">interview by</term>
-    <term name="recipient" form="verb">to</term>
-    <term name="reviewed-author" form="verb">by</term>
-    <term name="translator" form="verb">翻訳者：</term>
-    <term name="editortranslator" form="verb">edited &amp; translated by</term>
+    <term name="chair" form="verb">議長: </term>
+    <term name="collection-editor" form="verb">編集者: </term>
+    <term name="compiler" form="verb">編纂者: </term>
+    <term name="container-author" form="verb">作者: </term>
+    <term name="contributor" form="verb">協力者: </term>
+    <term name="curator" form="verb">蒐集者: </term>
+    <term name="director" form="verb">指導者: </term>
+    <term name="editor" form="verb">編集者: </term>
+    <term name="editor-translator" form="verb">編集・翻訳者: </term>
+    <term name="editortranslator" form="verb">編集・翻訳者: </term>
+    <term name="editorial-director" form="verb">編集者: </term>
+    <term name="executive-producer" form="verb">制作総指揮者: </term>
+    <term name="guest" form="verb">特別出演者: </term>
+    <term name="host" form="verb">主催者: </term>
+    <term name="illustrator" form="verb">図解者: </term>
+    <term name="interviewer" form="verb">面接者: </term>
+    <term name="narrator" form="verb">語り手: </term>
+    <term name="organizer" form="verb">組織者: </term>
+    <term name="performer" form="verb">演者: </term>
+    <term name="producer" form="verb">指揮者: </term>
+    <term name="recipient" form="verb">受領者: </term>
+    <term name="reviewed-author" form="verb">査読者: </term>
+    <term name="script-writer" form="verb">執筆者: </term>
+    <term name="series-creator" form="verb">番組作成者: </term>
+    <term name="translator" form="verb">翻訳者: </term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">編集者：</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
-    <term name="translator" form="verb-short">翻訳者：</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="collection-editor" form="verb-short">編: </term>
+    <term name="compiler" form="verb-short">纂: </term>
+    <term name="contributor" form="verb-short">協力: </term>
+    <term name="curator" form="verb-short">管理: </term>
+    <term name="director" form="verb-short">指導: </term>
+    <term name="editor" form="verb-short">編: </term>
+    <term name="editor-translator" form="verb-short">編・訳: </term>
+    <term name="editortranslator" form="verb-short">編・訳: </term>
+    <term name="editorial-director" form="verb-short">編: </term>
+    <term name="executive-producer" form="verb-short">総指揮: </term>
+    <term name="guest" form="verb-short">特別出演: </term>
+    <term name="host" form="verb-short">主催: </term>
+    <term name="illustrator" form="verb-short">図: </term>
+    <term name="narrator" form="verb-short">語り: </term>
+    <term name="organizer" form="verb-short">組織: </term>
+    <term name="performer" form="verb-short">演: </term>
+    <term name="producer" form="verb-short">指揮: </term>
+    <term name="script-writer" form="verb-short">執筆: </term>
+    <term name="series-creator" form="verb-short">番組制作: </term>
+    <term name="translator" form="verb-short">訳: </term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">1月</term>
@@ -599,9 +668,9 @@
     <term name="month-12" form="short">12月</term>
 
     <!-- SEASONS -->
-    <term name="season-01">Spring</term>
-    <term name="season-02">Summer</term>
-    <term name="season-03">Autumn</term>
-    <term name="season-04">Winter</term>
+    <term name="season-01">春季</term>
+    <term name="season-02">夏季</term>
+    <term name="season-03">秋季</term>
+    <term name="season-04">冬季</term>
   </terms>
 </locale>
diff --git a/locales/km-KH.xml b/locales/km-KH.xml
--- a/locales/km-KH.xml
+++ b/locales/km-KH.xml
@@ -2,7 +2,7 @@
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="km-KH">
   <info>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -16,26 +16,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">accessed</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">and</term>
+    <term name="and others">and others</term>
+    <term name="anonymous">anonymous</term>
+    <term name="at">at</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">available at</term>
+    <term name="by">by</term>
+    <term name="circa">circa</term>
+    <term name="cited">cited</term>
+    <term name="et-al">et al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">forthcoming</term>
+    <term name="from">from</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid</term>
+    <term name="in">in</term>
+    <term name="in press">in press</term>
+    <term name="internet">internet</term>
+    <term name="letter">letter</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">no date</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">online</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">personal communication</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">presented at the</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>reference</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="retrieved">retrieved</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scale</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -43,46 +69,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">accessed</term>
-    <term name="and">and</term>
-    <term name="and others">and others</term>
-    <term name="anonymous">anonymous</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anon.</term>
-    <term name="at">at</term>
-    <term name="available at">available at</term>
-    <term name="by">by</term>
-    <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">cited</term>
-    <term name="edition">
-      <single>edition</single>
-      <multiple>editions</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">forthcoming</term>
-    <term name="from">from</term>
-    <term name="ibid">ibid</term>
-    <term name="in">in</term>
-    <term name="in press">in press</term>
-    <term name="internet">internet</term>
-    <term name="letter">letter</term>
-    <term name="no date">no date</term>
     <term name="no date" form="short">n.d.</term>
-    <term name="online">online</term>
-    <term name="presented at">presented at the</term>
-    <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">retrieved</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -147,6 +148,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">AD</term>
     <term name="bc">BC</term>
@@ -185,54 +194,26 @@
     <term name="long-ordinal-10">ទីដប់មួយ</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>សៀវភៅ</single>
       <multiple>សៀវភៅ</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>ជំពូក</single>
       <multiple>ជំពូក</multiple>
@@ -241,6 +222,14 @@
       <single>កាឡោន</single>
       <multiple>កាឡោន</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>តួលេខ</single>
       <multiple>តួលេខ</multiple>
@@ -269,10 +258,6 @@
       <single>ទំព័រ</single>
       <multiple>ទំព័រ</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>ទំព័រ</single>
-      <multiple>ទំព័រ</multiple>
-    </term>
     <term name="paragraph">
       <single>កថាខណ្ឌ</single>
       <multiple>កថាខណ្ឌ</multiple>
@@ -281,6 +266,14 @@
       <single>ជំពូក</single>
       <multiple>ជំពូក</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>ផ្នែក</single>
       <multiple>ផ្នែក</multiple>
@@ -289,6 +282,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verse</single>
       <multiple>verses</multiple>
@@ -299,45 +308,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">bk.</term>
+    <term name="chapter" form="short">chap.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">bk.</term>
-    <term name="chapter" form="short">chap.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">f.</term>
     <term name="issue" form="short">no.</term>
@@ -348,17 +337,37 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">para.</term>
     <term name="part" form="short">pt.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sec.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -368,7 +377,7 @@
       <multiple>vols.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -378,15 +387,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>ចំនួន</single>
+      <multiple>ចំនួន</multiple>
+    </term>
+    <term name="edition">
+      <single>edition</single>
+      <multiple>editions</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>កំណត់ចំណាំ</single>
+      <multiple>កំណត់ចំណាំ</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>ទំព័រ</single>
+      <multiple>ទំព័រ</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">no.</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -395,6 +487,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editorial-director">
+      <single/>
+      <multiple>editors</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -407,6 +519,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -415,6 +532,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -423,6 +541,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -431,30 +551,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="editorial-director">
-      <single></single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
-    </term>
     <term name="translator">
       <single>translator</single>
       <multiple>translator</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor &amp; translator</single>
-      <multiple>editors &amp; translators</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -469,10 +569,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -497,75 +621,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>tran.</single>
       <multiple>trans.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; tran.</single>
-      <multiple>eds. &amp; trans.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">by</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">directed by</term>
+    <term name="editor" form="verb">edited by</term>
+    <term name="editor-translator" form="verb">edited &amp; translated by</term>
+    <term name="editortranslator" form="verb">edited &amp; translated by</term>
+    <term name="editorial-director" form="verb">edited by</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="interviewer" form="verb">interview by</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">edited by</term>
-    <term name="editorial-director" form="verb">edited by</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">interview by</term>
     <term name="recipient" form="verb">to</term>
     <term name="reviewed-author" form="verb">by</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">translated by</term>
-    <term name="editortranslator" form="verb">edited &amp; translated by</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editorial-director" form="verb-short">ed.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
     <term name="translator" form="verb-short">trans.</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">មករា</term>
diff --git a/locales/ko-KR.xml b/locales/ko-KR.xml
--- a/locales/ko-KR.xml
+++ b/locales/ko-KR.xml
@@ -2,7 +2,7 @@
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="ko-KR">
   <info>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -16,26 +16,52 @@
     <date-part name="day" form="numeric-leading-zeros" prefix="/"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">접근된</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">와/과</term>
+    <term name="and others">and others</term>
+    <term name="anonymous">anonymous</term>
+    <term name="at">at</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">available at</term>
+    <term name="by">by</term>
+    <term name="circa">circa</term>
+    <term name="cited">cited</term>
+    <term name="et-al">기타</term>
     <term name="film">film</term>
+    <term name="forthcoming">근간</term>
+    <term name="from">(으)로부터</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">in</term>
+    <term name="in press">in press</term>
+    <term name="internet">internet</term>
+    <term name="letter">편지</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">no date</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">online</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">개인 서신</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">presented at the</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>reference</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="retrieved">retrieved</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scale</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -43,46 +69,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">접근된</term>
-    <term name="and">와/과</term>
-    <term name="and others">and others</term>
-    <term name="anonymous">anonymous</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anon</term>
-    <term name="at">at</term>
-    <term name="available at">available at</term>
-    <term name="by">by</term>
-    <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">cited</term>
-    <term name="edition">
-      <single>edition</single>
-      <multiple>editions</multiple>
-    </term>
-    <term name="edition" form="short">ed</term>
-    <term name="et-al">기타</term>
-    <term name="forthcoming">근간</term>
-    <term name="from">(으)로부터</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">in</term>
-    <term name="in press">in press</term>
-    <term name="internet">internet</term>
-    <term name="letter">편지</term>
-    <term name="no date">no date</term>
     <term name="no date" form="short">일자 없음</term>
-    <term name="online">online</term>
-    <term name="presented at">presented at the</term>
-    <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">retrieved</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -147,6 +148,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">AD</term>
     <term name="bc">BC</term>
@@ -185,54 +194,26 @@
     <term name="long-ordinal-10">tenth</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>book</single>
       <multiple>books</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>chapter</single>
       <multiple>chapters</multiple>
@@ -241,6 +222,14 @@
       <single>column</single>
       <multiple>columns</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figure</single>
       <multiple>figures</multiple>
@@ -269,10 +258,6 @@
       <single>페이지</single>
       <multiple>페이지</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>페이지</single>
-      <multiple>페이지</multiple>
-    </term>
     <term name="paragraph">
       <single>단락</single>
       <multiple>단락</multiple>
@@ -281,6 +266,14 @@
       <single>part</single>
       <multiple>parts</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>section</single>
       <multiple>sections</multiple>
@@ -289,6 +282,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verse</single>
       <multiple>verses</multiple>
@@ -299,45 +308,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">bk</term>
+    <term name="chapter" form="short">chap</term>
+    <term name="column" form="short">col</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">bk</term>
-    <term name="chapter" form="short">chap</term>
-    <term name="column" form="short">col</term>
     <term name="figure" form="short">fig</term>
     <term name="folio" form="short">f</term>
     <term name="issue" form="short">호</term>
@@ -348,17 +337,37 @@
       <single>p</single>
       <multiple>pp</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p</single>
-      <multiple>pp</multiple>
-    </term>
     <term name="paragraph" form="short">para</term>
     <term name="part" form="short">pt</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sec</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v</single>
       <multiple>vv</multiple>
@@ -368,7 +377,7 @@
       <multiple>vols</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -378,15 +387,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="edition">
+      <single>edition</single>
+      <multiple>editions</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>note</single>
+      <multiple>notes</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>페이지</single>
+      <multiple>페이지</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">호</term>
+    <term name="edition" form="short">ed</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p</single>
+      <multiple>pp</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -395,6 +487,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>편집자</single>
+      <multiple>편집자</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor &amp; translator</single>
+      <multiple>editors &amp; translators</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>editors</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -407,6 +519,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -415,6 +532,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -423,6 +541,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -431,30 +551,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>편집자</single>
-      <multiple>편집자</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
-    </term>
     <term name="translator">
       <single>번역자</single>
       <multiple>번역자</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor &amp; translator</single>
-      <multiple>editors &amp; translators</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -469,10 +569,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>편집자</single>
+      <multiple>편집자</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -497,75 +621,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>편집자</single>
-      <multiple>편집자</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>번역자</single>
       <multiple>번역자</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; tran.</single>
-      <multiple>eds. &amp; trans.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">by</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">directed by</term>
+    <term name="editor" form="verb">편집자：</term>
+    <term name="editor-translator" form="verb">edited &amp; translated by</term>
+    <term name="editortranslator" form="verb">edited &amp; translated by</term>
+    <term name="editorial-director" form="verb">edited by</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="interviewer" form="verb">interview by</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">편집자：</term>
-    <term name="editorial-director" form="verb">edited by</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">interview by</term>
     <term name="recipient" form="verb">to</term>
     <term name="reviewed-author" form="verb">by</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">번역자：</term>
-    <term name="editortranslator" form="verb">edited &amp; translated by</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ed</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editorial-director" form="verb-short">ed.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
     <term name="translator" form="verb-short">trans</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">1월</term>
diff --git a/locales/la.xml b/locales/la.xml
--- a/locales/la.xml
+++ b/locales/la.xml
@@ -3,9 +3,10 @@
   <info>
     <translator>
       <name>Andrew Dunning</name>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2019-01-21T13:33:33+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,26 +20,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">consultatus</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">et</term>
+    <term name="and others">et alii</term>
+    <term name="anonymous">anonymus</term>
+    <term name="at">ad</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">praestatus ad</term>
+    <term name="by">a</term>
+    <term name="circa">circa</term>
+    <term name="cited">citatus</term>
+    <term name="et-al">et al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">futurus</term>
+    <term name="from">ab</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">in</term>
+    <term name="in press">impressorio</term>
+    <term name="internet">interrete</term>
+    <term name="letter">epistula</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">sine die</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">in linea</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">personal communication</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">praebitus ad</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>relatio</single>
+      <multiple>relationes</multiple>
+    </term>
+    <term name="retrieved">recuperatus</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scala</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -46,46 +73,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">consultatus</term>
-    <term name="and">et</term>
-    <term name="and others">et alii</term>
-    <term name="anonymous">anonymus</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anon.</term>
-    <term name="at">ad</term>
-    <term name="available at">praestatus ad</term>
-    <term name="by">a</term>
-    <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">citatus</term>
-    <term name="edition">
-      <single>editio</single>
-      <multiple>editiones</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">futurus</term>
-    <term name="from">ab</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">in</term>
-    <term name="in press">impressorio</term>
-    <term name="internet">interrete</term>
-    <term name="letter">epistula</term>
-    <term name="no date">sine die</term>
     <term name="no date" form="short">s.d.</term>
-    <term name="online">in linea</term>
-    <term name="presented at">praebitus ad</term>
-    <term name="reference">
-      <single>relatio</single>
-      <multiple>relationes</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>rel.</single>
       <multiple>rell.</multiple>
     </term>
-    <term name="retrieved">recuperatus</term>
-    <term name="scale">scala</term>
-    <term name="version">uersio</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -150,6 +152,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">A.D.</term>
     <term name="bc">A.C.</term>
@@ -182,54 +192,26 @@
     <term name="long-ordinal-10">decimus</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>liber</single>
       <multiple>libri</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>capitulum</single>
       <multiple>capitula</multiple>
@@ -238,6 +220,14 @@
       <single>columna</single>
       <multiple>columnae</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figura</single>
       <multiple>figurae</multiple>
@@ -266,10 +256,6 @@
       <single>pagina</single>
       <multiple>paginae</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>pagina</single>
-      <multiple>paginae</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraphus</single>
       <multiple>paragraphi</multiple>
@@ -278,6 +264,14 @@
       <single>pars</single>
       <multiple>partes</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>paragraphus</single>
       <multiple>paragraphi</multiple>
@@ -286,6 +280,22 @@
       <single>sub uerbo</single>
       <multiple>sub uerbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>versus</single>
       <multiple>versus</multiple>
@@ -296,66 +306,72 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">lib.</term>
+    <term name="chapter" form="short">cap.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">lib.</term>
-    <term name="chapter" form="short">cap.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">n.</term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
+    <term name="line" form="short">
+      <single>l.</single>
+      <multiple>ll.</multiple>
+    </term>
+    <term name="note" form="short">
+      <single>n.</single>
+      <multiple>nn.</multiple>
+    </term>
     <term name="opus" form="short">op.</term>
     <term name="page" form="short">
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">pr.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">par.</term>
     <term name="sub-verbo" form="short">
       <single>s.u.</single>
       <multiple>s.uu.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>u.</single>
       <multiple>uu.</multiple>
@@ -365,7 +381,7 @@
       <multiple>tt.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -375,15 +391,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>numerus</single>
+      <multiple>numeri</multiple>
+    </term>
+    <term name="edition">
+      <single>editio</single>
+      <multiple>editiones</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>nota</single>
+      <multiple>notae</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>pagina</single>
+      <multiple>paginae</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">uersio</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">n.</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -392,6 +491,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directores</multiple>
+    </term>
+    <term name="editor">
+      <single>curator</single>
+      <multiple>curatores</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>curator et interpres</single>
+      <multiple>curatores et interpretes</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>curator et interpres</single>
+      <multiple>curatores et interpretes</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -404,6 +523,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustratores</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -412,6 +536,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -420,6 +545,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -428,30 +555,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directores</multiple>
-    </term>
-    <term name="editor">
-      <single>curator</single>
-      <multiple>curatores</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editores</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustratores</multiple>
-    </term>
     <term name="translator">
       <single>interpres</single>
       <multiple>interpretes</multiple>
     </term>
-    <term name="editortranslator">
-      <single>curator et interpres</single>
-      <multiple>curatores et interpretes</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -466,10 +573,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>cur.</single>
+      <multiple>curs.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>cur. et interp.</single>
+      <multiple>curs. et interps.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>cur. et interp.</single>
+      <multiple>curs. et interps.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -494,75 +625,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>interp.</single>
       <multiple>interps.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>cur. et interp.</single>
-      <multiple>curs. et interps.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">a</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">a directione</term>
+    <term name="editor" form="verb">a cura</term>
+    <term name="editor-translator" form="verb">a cura et interpretatione</term>
+    <term name="editortranslator" form="verb">a cura et interpretatione</term>
+    <term name="editorial-director" form="verb">ab editione</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">ab illustratione</term>
+    <term name="interviewer" form="verb">a congressione</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">a</term>
-    <term name="director" form="verb">a directione</term>
-    <term name="editor" form="verb">a cura</term>
-    <term name="editorial-director" form="verb">ab editione</term>
-    <term name="illustrator" form="verb">ab illustratione</term>
-    <term name="interviewer" form="verb">a congressione</term>
     <term name="recipient" form="verb">a</term>
     <term name="reviewed-author" form="verb">a</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">a interpretatione</term>
-    <term name="editortranslator" form="verb">a cura et interpretatione</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">cur.</term>
+    <term name="editor-translator" form="verb-short">a cur. et interp.</term>
+    <term name="editortranslator" form="verb-short">a cur. et interp.</term>
+    <term name="editorial-director" form="verb-short">ed.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">cur.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
     <term name="translator" form="verb-short">interp.</term>
-    <term name="editortranslator" form="verb-short">a cur. et interp.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">ianuarius</term>
diff --git a/locales/lij-IT.xml b/locales/lij-IT.xml
new file mode 100644
--- /dev/null
+++ b/locales/lij-IT.xml
@@ -0,0 +1,741 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="lij-IT">
+  <info>
+    <translator>
+      <name>Jean Maillard</name>
+    </translator>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2025-10-16T03:24:00+00:00</updated>
+  </info>
+  <style-options punctuation-in-quote="false" limit-day-ordinals-to-day-1="true"/>
+  <date form="text" delimiter=" ">
+    <!-- "22 de arvî do 2025" -->
+    <date-part name="day" suffix="de"/>
+    <date-part name="month" suffix="do"/>
+    <date-part name="year"/>
+  </date>
+  <date form="numeric">
+    <!-- "22/04/2025" -->
+    <date-part name="day" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="month" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="year"/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">consultou</term>
+    <term name="advance-online-publication">pubricaçion in linia antiçipâ</term>
+    <term name="album">album</term>
+    <term name="and">e</term>
+    <term name="and others">e atri</term>
+    <term name="anonymous">anònimo</term>
+    <term name="at">à</term>
+    <term name="audio-recording">registraçion audio</term>
+    <term name="available at">disponibile in sce</term>
+    <term name="by">de</term>
+    <term name="circa">circa</term>
+    <term name="cited">çittou</term>
+    <term name="et-al">et al.</term>
+    <term name="film">cine</term>
+    <term name="forthcoming">in pubricaçion</term>
+    <term name="from">da</term>
+    <term name="henceforth">de chì in avanti</term>
+    <term name="ibid">ibidem</term>
+    <term name="in">inte</term>
+    <term name="in press">in stampa</term>
+    <term name="internet">internet</term>
+    <term name="letter">lettia</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">sine data</term>
+    <term name="no-place">sine loco</term>
+    <term name="no-publisher">sine nomine</term> <!-- sine nomine -->
+    <term name="on">in sce</term>
+    <term name="online">in linia</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">euvia originale pubricâ</term>
+    <term name="personal-communication">communicaçion personale</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">pontâ de podcast</term>
+    <term name="preprint">preprint</term>
+    <term name="presented at">presentou à</term>
+    <term name="radio-broadcast">trasmiscion pe l'aradio</term>
+    <term name="radio-series">serie pe l'aradio</term>
+    <term name="radio-series-episode">pontâ de serie pe l'aradio</term>
+    <term name="reference">
+      <single>referensa</single>
+      <multiple>referense</multiple>
+    </term>
+    <term name="retrieved">ottegnuo</term>
+    <term name="review-of">reçenscion de</term>
+    <term name="scale">scâ</term>
+    <term name="special-issue">ediçion speçiale</term>
+    <term name="special-section">seçion speçiale</term>
+    <term name="television-broadcast">trasmiscion pe televixon</term>
+    <term name="television-series">serie pe televixon</term>
+    <term name="television-series-episode">pontâ de serie pe televixon</term>
+    <term name="video">video</term>
+    <term name="working-paper">documento de travaggio</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anòn.</term>
+    <term name="available at" form="short">in sce</term>
+    <term name="circa" form="short">c.</term>
+    <term name="ibid" form="short">ibid.</term>
+    <term name="no date" form="short">s.d.</term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher" form="short">s.n.</term>
+    <term name="reference" form="short">
+      <single>ref.</single>
+      <multiple>reff.</multiple>
+    </term>
+    <term name="review-of" form="short">reç. de</term>
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="article">articolo</term>
+    <term name="article-journal">articolo de revista</term>
+    <term name="article-magazine">articolo de revista generalista</term>
+    <term name="article-newspaper">articolo de giornale</term>
+    <term name="bill">propòsta de lezze</term>
+    <!-- book is in the list of locator terms -->
+    <term name="broadcast">trasmiscion</term>
+    <!-- chapter is in the list of locator terms -->
+    <term name="classic">clascico</term>
+    <term name="collection">arrecuggeita</term>
+    <term name="dataset">dataset</term>
+    <term name="document">documento</term>
+    <term name="entry">intrâ</term>
+    <term name="entry-dictionary">intrâ de diçionäio</term>
+    <term name="entry-encyclopedia">intrâ d'ençiclopedia</term>
+    <term name="event">evento</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic">euvia d'arte</term>
+    <term name="hearing">udiensa</term>
+    <term name="interview">intervista</term>
+    <term name="legal_case">causa</term>
+    <term name="legislation">legislaçion</term>
+    <term name="manuscript">manoscrito</term>
+    <term name="map">carta</term>
+    <term name="motion_picture">cine</term>
+    <term name="musical_score">spartio de muxica</term>
+    <term name="pamphlet">volantin</term>
+    <term name="paper-conference">atto de convëgno</term>
+    <term name="patent">brevetto</term>
+    <term name="performance">esecuçion</term>
+    <term name="periodical">periòdico</term>
+    <term name="personal_communication">communicaçion personale</term>
+    <term name="post">messaggio</term>
+    <term name="post-weblog">messaggio de blog</term>
+    <term name="regulation">decretto</term>
+    <term name="report">report</term>
+    <term name="review">reçenscion</term>
+    <term name="review-book">reçenscion de libbro</term>
+    <term name="software">software</term>
+    <term name="song">registraçion audio</term>
+    <term name="speech">presentaçion</term>
+    <term name="standard">nòrma</term>
+    <term name="thesis">texi</term>
+    <term name="treaty">trattato</term>
+    <term name="webpage">pagina web</term>
+
+    <!-- SHORT ITEM TYPE FORMS -->
+    <term name="article-journal" form="short">art. de rev.</term>
+    <term name="article-magazine" form="short">art. de rev. gen.</term>
+    <term name="article-newspaper" form="short">art. de giorn.</term>
+    <!-- book is in the list of locator terms -->
+    <!-- chapter is in the list of locator terms -->
+    <term name="document" form="short">doc.</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic" form="short">euv. d'arte</term>
+    <term name="interview" form="short">interv.</term>
+    <term name="manuscript" form="short">ms.</term>
+    <term name="motion_picture" form="short">cine</term>
+    <term name="report" form="short">rep.</term>
+    <term name="review" form="short">reç.</term>
+    <term name="review-book" form="short">reç. de l.</term>
+    <term name="song" form="short">reg. audio</term>
+
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimoniansa de</term>
+    <term name="review" form="verb">reçenscion de</term>
+    <term name="review-book" form="verb">reçenscion do libbro</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad">d.C.</term>
+    <term name="bc">a.C.</term>
+    <term name="bce">AEV</term>
+    <term name="ce">EV</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">«</term>
+    <term name="close-quote">»</term>
+    <term name="open-inner-quote">“</term>
+    <term name="close-inner-quote">”</term>
+    <term name="page-range-delimiter">–</term>
+    <term name="colon">:</term>
+    <term name="comma">,</term>
+    <term name="semicolon">;</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal">º</term>
+    <term name="ordinal" gender-form="masculine">º</term>
+    <term name="ordinal" gender-form="feminine">ª</term>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01">primma</term>
+    <term name="long-ordinal-02">segonda</term>
+    <term name="long-ordinal-03">tersa</term>
+    <term name="long-ordinal-04">quarta</term>
+    <term name="long-ordinal-05">quinta</term>
+    <term name="long-ordinal-06">sesta</term>
+    <term name="long-ordinal-07">setteña</term>
+    <term name="long-ordinal-08">otteña</term>
+    <term name="long-ordinal-09">noveña</term>
+    <term name="long-ordinal-10">dexeña</term>
+    <term name="long-ordinal-01" gender-form="masculine">primmo</term>
+    <term name="long-ordinal-02" gender-form="masculine">segondo</term>
+    <term name="long-ordinal-03" gender-form="masculine">terso</term>
+    <term name="long-ordinal-04" gender-form="masculine">quarto</term>
+    <term name="long-ordinal-05" gender-form="masculine">quinto</term>
+    <term name="long-ordinal-06" gender-form="masculine">sesto</term>
+    <term name="long-ordinal-07" gender-form="masculine">setten</term>
+    <term name="long-ordinal-08" gender-form="masculine">otten</term>
+    <term name="long-ordinal-09" gender-form="masculine">noven</term>
+    <term name="long-ordinal-10" gender-form="masculine">dexen</term>
+    <term name="long-ordinal-01" gender-form="feminine">primma</term>
+    <term name="long-ordinal-02" gender-form="feminine">segonda</term>
+    <term name="long-ordinal-03" gender-form="feminine">tersa</term>
+    <term name="long-ordinal-04" gender-form="feminine">quarta</term>
+    <term name="long-ordinal-05" gender-form="feminine">quinta</term>
+    <term name="long-ordinal-06" gender-form="feminine">sesta</term>
+    <term name="long-ordinal-07" gender-form="feminine">setteña</term>
+    <term name="long-ordinal-08" gender-form="feminine">otteña</term>
+    <term name="long-ordinal-09" gender-form="feminine">noveña</term>
+    <term name="long-ordinal-10" gender-form="feminine">dexeña</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="act">
+      <single>atto</single>
+      <multiple>atto</multiple>
+    </term>
+    <term name="appendix">
+      <single>appendixe</single>
+      <multiple>appendixe</multiple>
+    </term>
+    <term name="article-locator">
+      <single>articolo</single>
+      <multiple>articoli</multiple>
+    </term>
+    <term name="book">
+      <single>libbro</single>
+      <multiple>libbri</multiple>
+    </term>
+    <term name="canon">
+      <single>canone</single>
+      <multiple>canoni</multiple>
+    </term>
+    <term name="chapter">
+      <single>cavo</single>
+      <multiple>cavi</multiple>
+    </term>
+    <term name="column">
+      <single>colònna</single>
+      <multiple>colònne</multiple>
+    </term>
+    <term name="elocation">
+      <single>adresso</single>
+      <multiple>adressi</multiple>
+    </term>
+    <term name="equation">
+      <single>equaçion</single>
+      <multiple>equaçioin</multiple>
+    </term>
+    <term name="figure">
+      <single>figua</single>
+      <multiple>figue</multiple>
+    </term>
+    <term name="folio">
+      <single>feuggio</single>
+      <multiple>feuggi</multiple>
+    </term>
+    <term name="issue" gender="masculine">
+      <single>fascicolo</single>
+      <multiple>fascicoli</multiple>
+    </term>
+    <term name="line">
+      <single>riga</single>
+      <multiple>righe</multiple>
+    </term>
+    <term name="note">
+      <single>nòtta</single>
+      <multiple>nòtte</multiple>
+    </term>
+    <term name="opus">
+      <single>euvia</single>
+      <multiple>euvie</multiple>
+    </term>
+    <term name="page">
+      <single>pagina</single>
+      <multiple>pagine</multiple>
+    </term>
+    <term name="paragraph">
+      <single>paragrafo</single>
+      <multiple>paragrafi</multiple>
+    </term>
+    <term name="part">
+      <single>parte</single>
+      <multiple>parte</multiple>
+    </term>
+    <term name="rule">
+      <single>regola</single>
+      <multiple>regole</multiple>
+    </term>
+    <term name="scene">
+      <single>scena</single>
+      <multiple>scene</multiple>
+    </term>
+    <term name="section">
+      <single>seçion</single>
+      <multiple>seçioin</multiple>
+    </term>
+    <term name="sub-verbo">
+      <single>sub verbo</single>
+      <multiple>sub verbis</multiple>
+    </term>
+    <term name="supplement">
+      <single>supplemento</single>
+      <multiple>supplementi</multiple>
+    </term>
+    <term name="table">
+      <single>töa</single>
+      <multiple>töe</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>titolo</single>
+      <multiple>titoli</multiple>
+    </term>
+    <term name="verse">
+      <single>verso</single>
+      <multiple>versci</multiple>
+    </term>
+    <term name="volume" gender="masculine">
+      <single>volumme</single>
+      <multiple>volummi</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+    <term name="appendix" form="short">
+      <single>app.</single>
+      <multiple>app.</multiple>
+    </term>
+    <term name="article-locator" form="short">
+      <single>art.</single>
+      <multiple>art.</multiple>
+    </term>
+    <term name="book" form="short">lib.</term>
+    <term name="chapter" form="short">
+      <single>cap.</single>
+      <multiple>capp.</multiple>
+    </term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
+      <single>loc.</single>
+      <multiple>locc.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>eq.</single>
+      <multiple>eqq.</multiple>
+    </term>
+    <term name="figure" form="short">fig.</term>
+    <term name="folio" form="short">fgg.</term>
+    <term name="issue" form="short">fasc.</term>
+    <term name="line" form="short">r.</term>
+    <term name="note" form="short">n.</term>
+    <term name="opus" form="short">euv.</term>
+    <term name="page" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="paragraph" form="short">par.</term>
+    <term name="part" form="short">pt.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>r.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>sc.</multiple>
+    </term>
+    <term name="section" form="short">seç.</term>
+    <term name="sub-verbo" form="short">
+      <single>s.v.</single>
+      <multiple>s.vv.</multiple>
+    </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supp.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>töa</single>
+      <multiple>töe</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tit.</multiple>
+    </term>
+    <term name="verse" form="short">
+      <single>v.</single>
+      <multiple>vv.</multiple>
+    </term>
+    <term name="volume" form="short">
+      <single>vol.</single>
+      <multiple>voll.</multiple>
+    </term>
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>cavo</single>
+      <multiple>cavi</multiple>
+    </term>
+    <term name="citation-number">
+      <single>çittaçion</single>
+      <multiple>çittaçioin</multiple>
+    </term>
+    <term name="collection-number">
+      <single>fascicolo</single>
+      <multiple>fascicoli</multiple>
+    </term>
+    <term name="edition" gender="feminine">
+      <single>ediçion</single>
+      <multiple>ediçioin</multiple>
+    </term>
+    <term name="first-reference-note-number" gender="feminine">
+      <single>referensa</single>
+      <multiple>referense</multiple>
+    </term>
+    <term name="number">
+      <single>numero</single>
+      <multiple>numeri</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>pag.</single>
+      <multiple>pagg.</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volumme</single>
+      <multiple>volummi</multiple>
+    </term>
+    <term name="page-first">
+      <single>pagina</single>
+      <multiple>pagine</multiple>
+    </term>
+    <term name="printing">
+      <single>stampa</single>
+      <multiple>stampe</multiple>
+    </term>
+    <term name="version">verscion</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>cav.</single>
+      <multiple>cavv.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>çit.</single>
+      <multiple>çitt.</multiple>
+    </term>
+    <term name="collection-number" form="short">fasc.</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>ref.</single>
+      <multiple>reff.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>n.</single>
+      <multiple>nn.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>voll.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>st.</single>
+      <multiple>stt.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>prescidente</single>
+      <multiple>prescidenti</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>edd.</multiple>
+    </term>
+    <term name="compiler">
+      <single>realizzatô</single>
+      <multiple>realizzatoî</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>conlaboratô</single>
+      <multiple>conlaboratoî</multiple>
+    </term>
+    <term name="curator">
+      <single>cuatô</single>
+      <multiple>cuatoî</multiple>
+    </term>
+    <term name="director">
+      <single>regista</single>
+      <multiple>registi</multiple>
+    </term>
+    <term name="editor">
+      <single>cuatô</single>
+      <multiple>cuatoî</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>cuatô e traduttô</single>
+      <multiple>curatoî e traduttoî</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>cuatô e traduttô</single>
+      <multiple>curatoî e traduttoî</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>direttô editoriale</single>
+      <multiple>direttoî editoriali</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>produttô executivo</single>
+      <multiple>produttoî executivi</multiple>
+    </term>
+    <term name="guest">
+      <single>òspite</single>
+      <multiple>òspiti</multiple>
+    </term>
+    <term name="host">
+      <single>conduttô</single>
+      <multiple>conduttoî</multiple>
+    </term>
+    <term name="illustrator">
+      <single>inlustratô</single>
+      <multiple>inlustratoî</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>narratô</single>
+      <multiple>narratoî</multiple>
+    </term>
+    <term name="organizer">
+      <single>organizzatô</single>
+      <multiple>organizzatoî</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>executô</single>
+      <multiple>executoî</multiple>
+    </term>
+    <term name="producer">
+      <single>produttô</single>
+      <multiple>produttoî</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>scenezzatô</single>
+      <multiple>scenezzatoî</multiple>
+    </term>
+    <term name="series-creator">
+      <single>autô da serie</single>
+      <multiple>autoî da serie</multiple>
+    </term>
+    <term name="translator">
+      <single>traduttô</single>
+      <multiple>traduttoî</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+    <term name="compiler" form="short">
+      <single>realizz.</single>
+      <multiple>realizz.</multiple>
+    </term>
+    <term name="contributor" form="short">
+      <single>conlab.</single>
+      <multiple>conlab.</multiple>
+    </term>
+    <term name="curator" form="short">
+      <single>cua.</single>
+      <multiple>cua.</multiple>
+    </term>
+    <term name="director" form="short">
+      <single>reg.</single>
+      <multiple>reg.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>à c. de</single>
+      <multiple>à c. de</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>cua. e trad.</single>
+      <multiple>cua. e trad.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>cua. e trad.</single>
+      <multiple>cua. e trad.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>dir. ed.</single>
+      <multiple>dir. ed.</multiple>
+    </term>
+    <term name="executive-producer" form="short">
+      <single>prod.ex.</single>
+      <multiple>prod.ex.</multiple>
+    </term>
+    <term name="illustrator" form="short">
+      <single>inl.</single>
+      <multiple>inl.</multiple>
+    </term>
+    <term name="narrator" form="short">
+      <single>narr.</single>
+      <multiple>narr.</multiple>
+    </term>
+    <term name="organizer" form="short">
+      <single>org.</single>
+      <multiple>org.</multiple>
+    </term>
+    <term name="performer" form="short">
+      <single>exec.</single>
+      <multiple>exec.</multiple>
+    </term>
+    <term name="producer" form="short">
+      <single>prod.</single>
+      <multiple>prod.</multiple>
+    </term>
+    <term name="script-writer" form="short">
+      <single>scen.</single>
+      <multiple>scen.</multiple>
+    </term>
+    <term name="series-creator" form="short">
+      <single>autô da serie</single>
+      <multiple>autoî da serie</multiple>
+    </term>
+    <term name="translator" form="short">
+      <single>trad.</single>
+      <multiple>trad.</multiple>
+    </term>
+
+    <!-- VERB ROLE FORMS -->
+    <term name="chair" form="verb">prescieduo da</term>
+    <term name="collection-editor" form="verb">à cua de</term>
+    <term name="compiler" form="verb">realizzou da</term>
+    <term name="container-author" form="verb">de</term>
+    <term name="contributor" form="verb">con un contributo de</term>
+    <term name="curator" form="verb">à cua de</term>
+    <term name="director" form="verb">diretto da</term>
+    <term name="editor" form="verb">à cua de</term>
+    <term name="editor-translator" form="verb">à cua de e traduto da</term>
+    <term name="editortranslator" form="verb">à cua de e traduto da</term>
+    <term name="editorial-director" form="verb">direçion editoriale de</term>
+    <term name="executive-producer" form="verb">produçion executiva de</term>
+    <term name="guest" form="verb">con òspite</term>
+    <term name="host" form="verb">conduto da</term>
+    <term name="illustrator" form="verb">inlustrou da</term>
+    <term name="interviewer" form="verb">intervista de</term>
+    <term name="narrator" form="verb">narrou da</term>
+    <term name="organizer" form="verb">organizzou da</term>
+    <term name="performer" form="verb">execuçion de</term>
+    <term name="producer" form="verb">produto da</term>
+    <term name="recipient" form="verb">à</term>
+    <term name="reviewed-author" form="verb">de</term>
+    <term name="script-writer" form="verb">scrito da</term>
+    <term name="series-creator" form="verb">creou da</term>
+    <term name="translator" form="verb">traduto da</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. da</term>
+    <term name="compiler" form="verb-short">realizz. da</term>
+    <term name="contributor" form="verb-short">con un contrib. de</term>
+    <term name="curator" form="verb-short">à c. de</term>
+    <term name="director" form="verb-short">dir. da</term>
+    <term name="editor" form="verb-short">à c. de</term>
+    <term name="editor-translator" form="verb-short">à c. de e trad. da</term>
+    <term name="editortranslator" form="verb-short">à c. de e trad. da</term>
+    <term name="editorial-director" form="verb-short">dir. ed. de</term>
+    <term name="executive-producer" form="verb-short">prod. exec. de</term>
+    <term name="guest" form="verb-short">con òsp.</term>
+    <term name="host" form="verb-short">cond. da</term>
+    <term name="illustrator" form="verb-short">inl. da</term>
+    <term name="narrator" form="verb-short">narr. da</term>
+    <term name="organizer" form="verb-short">org. da</term>
+    <term name="performer" form="verb-short">exec. de</term>
+    <term name="producer" form="verb-short">prod. da</term>
+    <term name="script-writer" form="verb-short">scr. da</term>
+    <term name="series-creator" form="verb-short">cre. da</term>
+    <term name="translator" form="verb-short">trad. da</term>
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01" gender="masculine">zenâ</term>
+    <term name="month-02" gender="masculine">frevâ</term>
+    <term name="month-03" gender="masculine">marso</term>
+    <term name="month-04" gender="masculine">avrî</term>
+    <term name="month-05" gender="masculine">mazzo</term>
+    <term name="month-06" gender="masculine">zugno</term>
+    <term name="month-07" gender="masculine">luggio</term>
+    <term name="month-08" gender="masculine">agosto</term>
+    <term name="month-09" gender="masculine">settembre</term>
+    <term name="month-10" gender="masculine">ottobre</term>
+    <term name="month-11" gender="masculine">novembre</term>
+    <term name="month-12" gender="masculine">dexembre</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">zen.</term>
+    <term name="month-02" form="short">fre.</term>
+    <term name="month-03" form="short">mar.</term>
+    <term name="month-04" form="short">avr.</term>
+    <term name="month-05" form="short">maz.</term>
+    <term name="month-06" form="short">zug.</term>
+    <term name="month-07" form="short">lug.</term>
+    <term name="month-08" form="short">ago.</term>
+    <term name="month-09" form="short">set.</term>
+    <term name="month-10" form="short">ott.</term>
+    <term name="month-11" form="short">nov.</term>
+    <term name="month-12" form="short">dex.</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">primmaveia</term>
+    <term name="season-02">estæ</term>
+    <term name="season-03">ötunno</term>
+    <term name="season-04">inverno</term>
+  </terms>
+</locale>
diff --git a/locales/locales.json b/locales/locales.json
--- a/locales/locales.json
+++ b/locales/locales.json
@@ -1,51 +1,59 @@
 {
     "primary-dialects": {
-        "af": "af-ZA",
-        "ar": "ar",
-        "bg": "bg-BG",
-        "ca": "ca-AD",
-        "cs": "cs-CZ",
-        "cy": "cy-GB",
-        "da": "da-DK",
-        "de": "de-DE",
-        "el": "el-GR",
-        "en": "en-US",
-        "es": "es-ES",
-        "et": "et-EE",
-        "eu": "eu",
-        "fa": "fa-IR",
-        "fi": "fi-FI",
-        "fr": "fr-FR",
-        "he": "he-IL",
-        "hi": "hi-IN",
-        "hr": "hr-HR",
-        "hu": "hu-HU",
-        "id": "id-ID",
-        "is": "is-IS",
-        "it": "it-IT",
-        "ja": "ja-JP",
-        "km": "km-KH",
-        "ko": "ko-KR",
-        "la": "la",
-        "lt": "lt-LT",
-        "lv": "lv-LV",
-        "mn": "mn-MN",
-        "nb": "nb-NO",
-        "nl": "nl-NL",
-        "nn": "nn-NO",
-        "pl": "pl-PL",
-        "pt": "pt-PT",
-        "ro": "ro-RO",
-        "ru": "ru-RU",
-        "sk": "sk-SK",
-        "sl": "sl-SI",
-        "sr": "sr-RS",
-        "sv": "sv-SE",
-        "th": "th-TH",
-        "tr": "tr-TR",
-        "uk": "uk-UA",
-        "vi": "vi-VN",
-        "zh": "zh-CN"
+        "af":  "af-ZA",
+        "ar":  "ar",
+        "bal": "bal-PK",
+        "bg":  "bg-BG",
+        "brh": "brh-PK",
+        "ca":  "ca-AD",
+        "cs":  "cs-CZ",
+        "cy":  "cy-GB",
+        "da":  "da-DK",
+        "de":  "de-DE",
+        "el":  "el-GR",
+        "en":  "en-US",
+        "es":  "es-ES",
+        "et":  "et-EE",
+        "eu":  "eu",
+        "fa":  "fa-IR",
+        "fi":  "fi-FI",
+        "fr":  "fr-FR",
+        "gl":  "gl-ES",
+        "he":  "he-IL",
+        "hi":  "hi-IN",
+        "hr":  "hr-HR",
+        "hu":  "hu-HU",
+        "hy":  "hy-AM",
+        "id":  "id-ID",
+        "is":  "is-IS",
+        "it":  "it-IT",
+        "ja":  "ja-JP",
+        "km":  "km-KH",
+        "ko":  "ko-KR",
+        "la":  "la",
+        "lij": "lij-IT",
+        "lt":  "lt-LT",
+        "lv":  "lv-LV",
+        "mn":  "mn-MN",
+        "ms":  "ms-MY",
+        "nb":  "nb-NO",
+        "nl":  "nl-NL",
+        "nn":  "nn-NO",
+        "pa":  "pa-PK",
+        "pl":  "pl-PL",
+        "pt":  "pt-PT",
+        "ro":  "ro-RO",
+        "ru":  "ru-RU",
+        "sk":  "sk-SK",
+        "sl":  "sl-SI",
+        "sr":  "sr-Latn-RS",
+        "sv":  "sv-SE",
+        "th":  "th-TH",
+        "tl":  "tl-PH",
+        "tr":  "tr-TR",
+        "uk":  "uk-UA",
+        "vi":  "vi-VN",
+        "zh":  "zh-CN"
     },
     "language-names": {
         "af-ZA": [
@@ -56,10 +64,18 @@
             "العربية",
             "Arabic"
         ],
+        "bal-PK": [
+            "بلوچی (پاکستان)",
+            "Balochi (Pakistan)"
+        ],
         "bg-BG": [
             "Български",
             "Bulgarian"
         ],
+        "brh-PK": [
+            "براہوئی",
+            "Brahui"
+        ],
         "ca-AD": [
             "Català",
             "Catalan"
@@ -136,6 +152,10 @@
             "Français (France)",
             "French (France)"
         ],
+        "gl-ES": [
+            "Galego (Spain)",
+            "Galician (Spain)"
+        ],
         "he-IL": [
             "עברית",
             "Hebrew"
@@ -152,6 +172,10 @@
             "Magyar",
             "Hungarian"
         ],
+        "hy-AM": [
+            "Հայերեն",
+            "Armenian"
+        ],
         "id-ID": [
             "Bahasa Indonesia",
             "Indonesian"    
@@ -180,6 +204,10 @@
             "Latina",
             "Latin"
         ],
+        "lij-IT": [
+            "Lìgure",
+            "Ligurian"
+        ],
         "lt-LT": [
             "Lietuvių kalba",
             "Lithuanian"
@@ -192,6 +220,10 @@
             "Монгол",
             "Mongolian"
         ],
+        "ms-MY": [
+            "Bahasa Melayu",
+            "Malay"
+        ],
         "nb-NO": [
             "Norsk bokmål",
             "Norwegian (Bokmål)"
@@ -204,6 +236,10 @@
             "Norsk nynorsk",
             "Norwegian (Nynorsk)"
         ],
+        "pa-PK": [
+            "پنجابی (شاہ‌مکھی)",
+            "Punjabi (Shahmukhi)"
+        ],
         "pl-PL": [
             "Polski",
             "Polish"
@@ -232,10 +268,14 @@
             "Slovenščina",
             "Slovenian"
         ],
-        "sr-RS": [
-            "Српски / Srpski",
-            "Serbian"
+        "sr-Cyrl-RS": [
+            "Српски",
+            "Serbian (Cyrllic)"
         ],
+        "sr-Latn-RS": [
+            "Srpski",
+            "Serbian (Latin)"
+        ],
         "sv-SE": [
             "Svenska",
             "Swedish"
@@ -243,6 +283,10 @@
         "th-TH": [
             "ไทย",
             "Thai"
+        ],
+        "tl-PH": [
+            "Tagalog",
+            "Tagalog"
         ],
         "tr-TR": [
             "Türkçe",
diff --git a/locales/lt-LT.xml b/locales/lt-LT.xml
--- a/locales/lt-LT.xml
+++ b/locales/lt-LT.xml
@@ -5,7 +5,7 @@
       <name>Valdemaras Klumbys</name>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2017-01-18T10:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text" delimiter=" ">
@@ -21,26 +21,52 @@
     <date-part name="day" form="numeric-leading-zeros"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">žiūrėta</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">ir</term>
+    <term name="and others">ir kt.</term>
+    <term name="anonymous">anonimas</term>
+    <term name="at"/>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">adresas</term>
+    <term name="by"/>
+    <term name="circa">apie</term>
+    <term name="cited">žiūrėta</term>
+    <term name="et-al">ir kt.</term>
     <term name="film">film</term>
+    <term name="forthcoming">ruošiamas</term>
+    <term name="from"/>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ten pat</term>
+    <term name="in"/>
+    <term name="in press">priimta spaudai</term>
+    <term name="internet">prieiga per internetą</term>
+    <term name="letter">laiškas</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">sine anno</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">interaktyvus</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">communicationis personalis</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">pristatytas</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>nuoroda</single>
+      <multiple>nuorodos</multiple>
+    </term>
+    <term name="retrieved">gauta</term>
+    <term name="review-of">review of</term>
+    <term name="scale">mastelis</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -48,46 +74,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">žiūrėta</term>
-    <term name="and">ir</term>
-    <term name="and others">ir kt.</term>
-    <term name="anonymous">anonimas</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anon.</term>
-    <term name="at"></term>
-    <term name="available at">adresas</term>
-    <term name="by"></term>
-    <term name="circa">apie</term>
     <term name="circa" form="short">apie</term>
-    <term name="cited">žiūrėta</term>
-    <term name="edition" gender="masculine">
-      <single>leidimas</single>
-      <multiple>leidimai</multiple>
-    </term>
-    <term name="edition" form="short">leid.</term>
-    <term name="et-al">ir kt.</term>
-    <term name="forthcoming">ruošiamas</term>
-    <term name="from"></term>
-    <term name="ibid">ten pat</term>
-    <term name="in"></term>
-    <term name="in press">priimta spaudai</term>
-    <term name="internet">prieiga per internetą</term>
-    <term name="letter">laiškas</term>
-    <term name="no date">sine anno</term>
     <term name="no date" form="short">s.a.</term>
-    <term name="online">interaktyvus</term>
-    <term name="presented at">pristatytas</term>
-    <term name="reference">
-      <single>nuoroda</single>
-      <multiple>nuorodos</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>nuor.</single>
       <multiple>nuor.</multiple>
     </term>
-    <term name="retrieved">gauta</term>
-    <term name="scale">mastelis</term>
-    <term name="version">versija</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -152,6 +153,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">po Kr.</term>
     <term name="bc">pr. Kr.</term>
@@ -171,9 +180,9 @@
     <!-- ORDINALS -->
     <term name="ordinal">-asis</term>
     <term name="ordinal" gender-form="masculine">-asis</term>
-    <term name="ordinal" gender-form="feminine">-oji</term>
     <term name="ordinal-03" gender-form="masculine">-iasis</term>
     <term name="ordinal-13" gender-form="masculine">-asis</term>
+    <term name="ordinal" gender-form="feminine">-oji</term>
     <term name="ordinal-03" gender-form="feminine">-ioji</term>
     <term name="ordinal-13" gender-form="feminine">-oji</term>
 
@@ -188,7 +197,6 @@
     <term name="long-ordinal-08">aštuntasis</term>
     <term name="long-ordinal-09">devintasis</term>
     <term name="long-ordinal-10">dešimtasis</term>
-
     <term name="long-ordinal-01" gender-form="feminine">pirmoji</term>
     <term name="long-ordinal-02" gender-form="feminine">antroji</term>
     <term name="long-ordinal-03" gender-form="feminine">trečioji</term>
@@ -199,56 +207,28 @@
     <term name="long-ordinal-08" gender-form="feminine">aštuntoji</term>
     <term name="long-ordinal-09" gender-form="feminine">devintoji</term>
     <term name="long-ordinal-10" gender-form="feminine">dešimtoji</term>
-    
+
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>knyga</single>
       <multiple>knygos</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>skyrius</single>
       <multiple>skyriai</multiple>
@@ -257,6 +237,14 @@
       <single>skiltis</single>
       <multiple>skiltys</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>iliustracija</single>
       <multiple>iliustracijos</multiple>
@@ -285,10 +273,6 @@
       <single>puslapis</single>
       <multiple>puslapiai</multiple>
     </term>
-    <term name="number-of-pages" gender="masculine">
-      <single>puslapis</single>
-      <multiple>puslapiai</multiple>
-    </term>
     <term name="paragraph">
       <single>pastraipa</single>
       <multiple>pastraipos</multiple>
@@ -297,6 +281,14 @@
       <single>dalis</single>
       <multiple>dalys</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>poskyris</single>
       <multiple>poskyriai</multiple>
@@ -305,6 +297,22 @@
       <single>žiūrėk</single>
       <multiple>žiūrėk</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>eilėraštis</single>
       <multiple>eilėraščiai</multiple>
@@ -315,45 +323,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">kn.</term>
+    <term name="chapter" form="short">sk.</term>
+    <term name="column" form="short">skilt.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">kn.</term>
-    <term name="chapter" form="short">sk.</term>
-    <term name="column" form="short">skilt.</term>
     <term name="figure" form="short">il.</term>
     <term name="folio" form="short">l.</term>
     <term name="issue" form="short">nr.</term>
@@ -364,17 +352,37 @@
       <single>p.</single>
       <multiple>p.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>p.</multiple>
-    </term>
     <term name="paragraph" form="short">pastr.</term>
     <term name="part" form="short">d.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">posk.</term>
     <term name="sub-verbo" form="short">
       <single>žr.</single>
       <multiple>žr.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>eilėr.</single>
       <multiple>eilėr.</multiple>
@@ -384,7 +392,7 @@
       <multiple>t.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -394,15 +402,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>numeris</single>
+      <multiple>numeriai</multiple>
+    </term>
+    <term name="edition" gender="masculine">
+      <single>leidimas</single>
+      <multiple>leidimai</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>pastaba</single>
+      <multiple>pastabos</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages" gender="masculine">
+      <single>puslapis</single>
+      <multiple>puslapiai</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">versija</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">nr.</term>
+    <term name="edition" form="short">leid.</term>
+    <term name="first-reference-note-number" form="short">pstb.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>p.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -411,6 +502,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>vadovas</single>
+      <multiple>vadovai</multiple>
+    </term>
+    <term name="editor">
+      <single>sudarytojas</single>
+      <multiple>sudarytojai</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>sudarytojas ir vertėjas</single>
+      <multiple>sudarytojai ir vertėjai</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>sudarytojas ir vertėjas</single>
+      <multiple>sudarytojai ir vertėjai</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>atsakingasis redaktorius</single>
+      <multiple>atsakingieji redaktoriai</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -423,6 +534,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>iliustratorius</single>
+      <multiple>iliustratoriai</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -431,6 +547,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -439,6 +556,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -447,30 +566,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>vadovas</single>
-      <multiple>vadovai</multiple>
-    </term>
-    <term name="editor">
-      <single>sudarytojas</single>
-      <multiple>sudarytojai</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>atsakingasis redaktorius</single>
-      <multiple>atsakingieji redaktoriai</multiple>
-    </term>
-    <term name="illustrator">
-      <single>iliustratorius</single>
-      <multiple>iliustratoriai</multiple>
-    </term>
     <term name="translator">
       <single>vertėjas</single>
       <multiple>vertėjai</multiple>
     </term>
-    <term name="editortranslator">
-      <single>sudarytojas ir vertėjas</single>
-      <multiple>sudarytojai ir vertėjai</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -485,10 +584,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>vad.</single>
+      <multiple>vad.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>sud.</single>
+      <multiple>sud.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>sud. ir vert.</single>
+      <multiple>sud. ir vert.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>sud. ir vert.</single>
+      <multiple>sud. ir vert.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ats. red.</single>
+      <multiple>ats. red.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>iliustr.</single>
+      <multiple>iliustr.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -513,75 +636,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>vad.</single>
-      <multiple>vad.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>sud.</single>
-      <multiple>sud.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ats. red.</single>
-      <multiple>ats. red.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>iliustr.</single>
-      <multiple>iliustr.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>vert.</single>
       <multiple>vert.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>sud. ir vert.</single>
-      <multiple>sud. ir vert.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb"/>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">vadovavo</term>
+    <term name="editor" form="verb">sudarė</term>
+    <term name="editor-translator" form="verb">sudarė ir vertė</term>
+    <term name="editortranslator" form="verb">sudarė ir vertė</term>
+    <term name="editorial-director" form="verb">parengė</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">iliustravo</term>
+    <term name="interviewer" form="verb">interviu ėmė</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb"></term>
-    <term name="director" form="verb">vadovavo</term>
-    <term name="editor" form="verb">sudarė</term>
-    <term name="editorial-director" form="verb">parengė</term>
-    <term name="illustrator" form="verb">iliustravo</term>
-    <term name="interviewer" form="verb">interviu ėmė</term>
     <term name="recipient" form="verb">gavo</term>
     <term name="reviewed-author" form="verb">recenzavo</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">vertė</term>
-    <term name="editortranslator" form="verb">sudarė ir vertė</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">vad.</term>
+    <term name="editor" form="verb-short">sud.</term>
+    <term name="editor-translator" form="verb-short">sud. ir vert.</term>
+    <term name="editortranslator" form="verb-short">sud. ir vert.</term>
+    <term name="editorial-director" form="verb-short">pareng.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">iliustr.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">vad.</term>
-    <term name="editor" form="verb-short">sud.</term>
-    <term name="editorial-director" form="verb-short">pareng.</term>
-    <term name="illustrator" form="verb-short">iliustr.</term>
     <term name="translator" form="verb-short">vert.</term>
-    <term name="editortranslator" form="verb-short">sud. ir vert.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">sausio</term>
diff --git a/locales/lv-LV.xml b/locales/lv-LV.xml
--- a/locales/lv-LV.xml
+++ b/locales/lv-LV.xml
@@ -4,8 +4,15 @@
     <translator>
       <name>Andris Lupgins</name>
     </translator>
+    <translator>
+      <name>Kristiāns Francis Cagulis</name>
+    </translator>
+    <translator>
+      <name>Andrew Dunning</name>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-12-27T11:40:58+02:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text" delimiter=" ">
@@ -21,148 +28,157 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">personīga komunikācija</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">skatīts</term>
+    <term name="advance-online-publication">agrīna tiešsaistes publikācija</term>
+    <term name="album">albums</term>
     <term name="and">un</term>
     <term name="and others">un citi</term>
     <term name="anonymous">anonīms</term>
-    <term name="anonymous" form="short">anon.</term>
-    <term name="at"></term>
+    <term name="at"/>
+    <term name="audio-recording">audioieraksts</term>
     <term name="available at">pieejams</term>
-    <term name="by"></term>
+    <term name="by"/>
     <term name="circa">apmēram</term>
-    <term name="circa" form="short">apm.</term>
     <term name="cited">citēts</term>
-    <term name="edition" gender="feminine">
-      <single>redakcija</single>
-      <multiple>redakcijas</multiple>
-    </term>
-    <term name="edition" form="short">red.</term>
     <term name="et-al">u.c.</term>
+    <term name="film">films</term>
     <term name="forthcoming">gaidāms</term>
     <term name="from">no</term>
+    <term name="henceforth">turpmāk</term>
     <term name="ibid">turpat</term>
     <term name="in">no</term>
     <term name="in press">presē</term>
     <term name="internet">internets</term>
     <term name="letter">vēstule</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">bez datuma</term>
-    <term name="no date" form="short">b.g.</term>
+    <term name="no-place">bez vietas</term>
+    <term name="no-publisher">bez izdevēja</term> <!-- sine nomine -->
+    <term name="on">par</term>
     <term name="online">tiešsaiste</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">oriģināldarbs publicētājs</term>
+    <term name="personal-communication">personīga komunikācija</term>
+    <term name="podcast">podkāsts</term>
+    <term name="podcast-episode">podkāsta epizode</term>
+    <term name="preprint">pirmsdruka</term>
     <term name="presented at">iesniegts</term>
+    <term name="radio-broadcast">radio pārraide</term>
+    <term name="radio-series">radio seriāls</term>
+    <term name="radio-series-episode">radio seriāla epizode</term>
     <term name="reference">
       <single>atsauce</single>
       <multiple>atsauces</multiple>
     </term>
+    <term name="retrieved">iegūts</term>
+    <term name="review-of">recenzija par</term>
+    <term name="scale">mērogs</term>
+    <term name="special-issue">speciālizlaidums</term>
+    <term name="special-section">speciāllā sadaļa</term>
+    <term name="television-broadcast">televīzijas pārraide</term>
+    <term name="television-series">televīzijas seriāls</term>
+    <term name="television-series-episode">televīzijas seriāla epizode</term>
+    <term name="video">videoieraksts</term>
+    <term name="working-paper">darba dokuments</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">apm.</term>
+    <term name="no date" form="short">b.d.</term>
+    <term name="no-place" form="short">b.v.</term>
+    <term name="no-publisher" form="short">b.i.</term>
     <term name="reference" form="short">
       <single>ats.</single>
       <multiple>ats.</multiple>
     </term>
-    <term name="retrieved">iegūts</term>
-    <term name="scale">mērogs</term>
-    <term name="version">versija</term>
+    <term name="review-of" form="short">rec. par</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">raksts</term>
+    <term name="article-journal">žurnāla raksts</term>
+    <term name="article-magazine">žurnāla raksts</term>
+    <term name="article-newspaper">laikraksta raksts</term>
+    <term name="bill">likumprojekts</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">raidījums</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">klasisks darbs</term>
+    <term name="collection">krājums</term>
+    <term name="dataset">datu kopa</term>
+    <term name="document">dokuments</term>
+    <term name="entry">ieraksts</term>
+    <term name="entry-dictionary">vārdnīcas ieraksts</term>
+    <term name="entry-encyclopedia">enciklopēdijas ieraksts</term>
+    <term name="event">pasākums</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">attēls</term>
+    <term name="hearing">uzklausīšana</term>
     <term name="interview">intervija</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="legal_case">tiesas lieta</term>
+    <term name="legislation">tisību akts</term>
+    <term name="manuscript">manuskripts</term>
+    <term name="map">karte</term>
+    <term name="motion_picture">kinofilma</term>
+    <term name="musical_score">partitūra</term>
+    <term name="pamphlet">brošūra</term>
+    <term name="paper-conference">konferences referāts</term>
+    <term name="patent">patents</term>
+    <term name="performance">priekšnesums</term>
+    <term name="periodical">periodisks izdevums</term>
     <term name="personal_communication">personīga komunikācija</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">ieraksts</term>
+    <term name="post-weblog">bloga ieraksts</term>
+    <term name="regulation">regula</term>
+    <term name="report">pārskats</term>
+    <term name="review">recenzija</term>
+    <term name="review-book">grāmatas recenzija</term>
+    <term name="software">programmatūra</term>
+    <term name="song">dziesma</term>
+    <term name="speech">runa</term>
+    <term name="standard">standarts</term>
+    <term name="thesis">diplomdarbs</term>
+    <term name="treaty">līgums</term>
+    <term name="webpage">tīmekļa vietne</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">žurn. raksts</term>
+    <term name="article-magazine" form="short">mag. raksts</term>
+    <term name="article-newspaper" form="short">laikr. raksts</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">dok.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
+    <term name="graphic" form="short">att.</term>
     <term name="interview" form="short">interv.</term>
     <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="motion_picture" form="short">kinof.</term>
+    <term name="report" form="short">pārsk.</term>
+    <term name="review" form="short">rec.</term>
+    <term name="review-book" form="short">grām. rec.</term>
+    <term name="song" form="short">dz.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">liecība no</term>
+    <term name="review" form="verb">recenzija par</term>
+    <term name="review-book" form="verb">grāmatas recenzija</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">m.ē.</term>
     <term name="bc">p.m.ē.</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="bce">p.m.ē.</term>
+    <term name="ce">m.ē.</term>
 
     <!-- PUNCTUATION -->
-    <term name="open-quote">"</term>
-    <term name="close-quote">"</term>
-    <term name="open-inner-quote">"</term>
-    <term name="close-inner-quote">"</term>
+    <term name="open-quote">“</term>
+    <term name="close-quote">”</term>
+    <term name="open-inner-quote">“</term>
+    <term name="close-inner-quote">”</term>
     <term name="page-range-delimiter">–</term>
     <term name="colon">:</term>
     <term name="comma">,</term>
@@ -171,7 +187,7 @@
     <!-- ORDINALS -->
     <term name="ordinal">-ais</term>
     <term name="ordinal" gender-form="feminine">-ā</term>
-    
+
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">pirmais</term>
     <term name="long-ordinal-02">otrais</term>
@@ -183,7 +199,6 @@
     <term name="long-ordinal-08">astotais</term>
     <term name="long-ordinal-09">devītais</term>
     <term name="long-ordinal-10">desmitais</term>
-
     <term name="long-ordinal-01" gender-form="feminine">pirmā</term>
     <term name="long-ordinal-02" gender-form="feminine">otrā</term>
     <term name="long-ordinal-03" gender-form="feminine">trešā</term>
@@ -196,54 +211,26 @@
     <term name="long-ordinal-10" gender-form="feminine">desmitā</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>cēliens</single>
+      <multiple>cēlieni</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>pielikums</single>
+      <multiple>pielikumi</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>pants</single>
+      <multiple>panti</multiple>
     </term>
     <term name="book">
       <single>grāmata</single>
       <multiple>grāmatas</multiple>
     </term>
+    <term name="canon">
+      <single>kanons</single>
+      <multiple>kanoni</multiple>
+    </term>
     <term name="chapter">
       <single>nodaļa</single>
       <multiple>nodaļas</multiple>
@@ -252,6 +239,14 @@
       <single>sleja</single>
       <multiple>slejas</multiple>
     </term>
+    <term name="elocation">
+      <single>atrašanās vieta</single>
+      <multiple>atrašanās vietas</multiple>
+    </term>
+    <term name="equation">
+      <single>vienādojums</single>
+      <multiple>vienādojumi</multiple>
+    </term>
     <term name="figure">
       <single>ilustrācija</single>
       <multiple>ilustrācijas</multiple>
@@ -280,10 +275,6 @@
       <single>lappuse</single>
       <multiple>lappuses</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>lappuse</single>
-      <multiple>lappuses</multiple>
-    </term>
     <term name="paragraph">
       <single>rindkopa</single>
       <multiple>rindkopas</multiple>
@@ -292,6 +283,14 @@
       <single>daļa</single>
       <multiple>daļas</multiple>
     </term>
+    <term name="rule">
+      <single>noteikums</single>
+      <multiple>noteikumi</multiple>
+    </term>
+    <term name="scene">
+      <single>aina</single>
+      <multiple>ainas</multiple>
+    </term>
     <term name="section">
       <single>apakšnodaļa</single>
       <multiple>apakšnodaļas</multiple>
@@ -300,6 +299,22 @@
       <single>skatīt</single>
       <multiple>skatīt</multiple>
     </term>
+    <term name="supplement">
+      <single>papildinājums</single>
+      <multiple>papildinājumi</multiple>
+    </term>
+    <term name="table">
+      <single>tabula</single>
+      <multiple>tabulas</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>sadaļa</single>
+      <multiple>sadaļas</multiple>
+    </term>
     <term name="verse">
       <single>pants</single>
       <multiple>panti</multiple>
@@ -308,47 +323,27 @@
       <single>sējums</single>
       <multiple>sējumi</multiple>
     </term>
-    
+
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
-    </term>
-    <term name="article-locator" form="short">			 
-      <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix" form="short">
+      <single>piel.</single>
+      <multiple>piel.</multiple>
     </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="article-locator" form="short">
+      <single>p.</single>
+      <multiple>p.</multiple>
     </term>
     <term name="book" form="short">grām.</term>
     <term name="chapter" form="short">nod.</term>
     <term name="column" form="short">sl.</term>
+    <term name="elocation" form="short">
+      <single>atr. v.</single>
+      <multiple>atr. v.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>vien.</single>
+      <multiple>vien.</multiple>
+    </term>
     <term name="figure" form="short">il.</term>
     <term name="folio" form="short">fo.</term>
     <term name="issue" form="short">nr.</term>
@@ -359,17 +354,37 @@
       <single>lpp.</single>
       <multiple>lpp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>lpp.</single>
-      <multiple>lpp.</multiple>
-    </term>
     <term name="paragraph" form="short">rindk.</term>
     <term name="part" form="short">d.</term>
+    <term name="rule" form="short">
+      <single>not.</single>
+      <multiple>not.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>ain.</single>
+      <multiple>ain.</multiple>
+    </term>
     <term name="section" form="short">apakšnod.</term>
     <term name="sub-verbo" form="short">
       <single>sk.</single>
       <multiple>sk.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>papild.</single>
+      <multiple>papild.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tab.</single>
+      <multiple>tab.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>sad.</single>
+      <multiple>sad.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>p.</single>
       <multiple>p.</multiple>
@@ -379,7 +394,7 @@
       <multiple>sēj.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -389,71 +404,117 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>nodaļa</single>
+      <multiple>nodaļās</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>citāts</single>
+      <multiple>citāti</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>numurs</single>
+      <multiple>numuri</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition" gender="feminine">
+      <single>redakcija</single>
+      <multiple>redakcijas</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>atsauce</single>
+      <multiple>atsauces</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>numurs</single>
+      <multiple>numuri</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>lappuse</single>
+      <multiple>lappuses</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>sējums</single>
+      <multiple>sējumi</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>lappuse</single>
+      <multiple>lappuses</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>izdruka</single>
+      <multiple>izdrukas</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">versija</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>nod.</single>
+      <multiple>nod.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">nr.</term>
+    <term name="edition" form="short">red.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>ats.</single>
+      <multiple>ats.</multiple>
     </term>
+    <term name="number" form="short">
+      <single>nr.</single>
+      <multiple>nr.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>lpp.</single>
+      <multiple>lpp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>sēj.</single>
+      <multiple>sēj.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>lpp.</single>
+      <multiple>lpp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>izdr.</single>
+      <multiple>izdr.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>priekšsēdētājs</single>
+      <multiple>priekšsēdētāji</multiple>
+    </term>
     <term name="collection-editor">
       <single>krājuma redaktors</single>
       <multiple>krājuma redaktori</multiple>
     </term>
+    <term name="compiler">
+      <single>sastādītājs</single>
+      <multiple>sastādītāji</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
     <term name="composer">
       <single>sastādītājs</single>
       <multiple>sastādītāji</multiple>
     </term>
+    <term name="container-author"/> <!-- generally blank -->
     <term name="container-author">
       <single>pamatmateriāla autors</single>
       <multiple>pamatmateriāla autori</multiple>
     </term>
+    <term name="contributor">
+      <single>līdzautors</single>
+      <multiple>līdzautori</multiple>
+    </term>
+    <term name="curator">
+      <single>kurators</single>
+      <multiple>kuratori</multiple>
+    </term>
     <term name="director">
       <single>vadītājs</single>
       <multiple>vadītāji</multiple>
@@ -462,76 +523,84 @@
       <single>redaktors</single>
       <multiple>redaktors</multiple>
     </term>
-    <term name="editorial-director">
-      <single>galvenais redaktors</single>
-      <multiple>galvenie redaktori</multiple>
+    <term name="editor-translator">
+      <single>redaktors un tulkotājs</single>
+      <multiple>redaktors un tulkotājs</multiple>
     </term>
     <term name="editortranslator">
       <single>redaktors un tulkotājs</single>
       <multiple>redaktors un tulkotājs</multiple>
     </term>
+    <term name="editorial-director">
+      <single>galvenais redaktors</single>
+      <multiple>galvenie redaktori</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>izpildproducents</single>
+      <multiple>izpildproducenti</multiple>
+    </term>
+    <term name="guest">
+      <single>viesis</single>
+      <multiple>viesi</multiple>
+    </term>
+    <term name="host">
+      <single>vadītājs</single>
+      <multiple>vadītāji</multiple>
+    </term>
     <term name="illustrator">
       <single>ilustrators</single>
       <multiple>ilustratori</multiple>
     </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="interviewer">
       <single>intervētājs</single>
       <multiple>intervētāji</multiple>
     </term>
+    <term name="narrator">
+      <single>stāstītājs</single>
+      <multiple>stāstītāji</multiple>
+    </term>
+    <term name="organizer">
+      <single>organizators</single>
+      <multiple>organizatori</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>izpildītājs</single>
+      <multiple>izpildītāji</multiple>
+    </term>
+    <term name="producer">
+      <single>producents</single>
+      <multiple>producenti</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
     <term name="recipient">
       <single>saņēmējs</single>
       <multiple>saņēmēji</multiple>
     </term>
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>scenārists</single>
+      <multiple>scenāristi</multiple>
+    </term>
+    <term name="series-creator">
+      <single>seriāla veidotājs</single>
+      <multiple>seriāla veidotāji</multiple>
+    </term>
     <term name="translator">
       <single>tulkotājs</single>
       <multiple>tulkotāji</multiple>
     </term>
 
     <!-- SHORT ROLE FORMS -->
-    <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
-    </term>
-    <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
-    </term>
-    <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
-    </term>
-    <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
-    </term>
-    <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
-    </term>
-    <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
-    </term>
-    <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
-    </term>
-    <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
-    </term>
-    <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
-    </term>
-    <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
     <term name="collection-editor" form="short">
       <single>kr. red.</single>
       <multiple>kr. red.</multiple>
     </term>
+    <term name="compiler" form="short">
+      <single>sast.</single>
+      <multiple>sast.</multiple>
+    </term>
     <term name="composer" form="short">
       <single>sast.</single>
       <multiple>sast.</multiple>
@@ -540,6 +609,14 @@
       <single>pamatmat. aut.</single>
       <multiple>pamatmat. aut.</multiple>
     </term>
+    <term name="contributor" form="short">
+      <single>līdzaut.</single>
+      <multiple>līdzaut.</multiple>
+    </term>
+    <term name="curator" form="short">
+      <single>kur.</single>
+      <multiple>kurs.</multiple>
+    </term>
     <term name="director" form="short">
       <single>vad.</single>
       <multiple>vad.</multiple>
@@ -548,14 +625,22 @@
       <single>red.</single>
       <multiple>red.</multiple>
     </term>
-    <term name="editorial-director" form="short">
-      <single>galv. red.</single>
-      <multiple>galv. red.</multiple>
+    <term name="editor-translator" form="short">
+      <single>red. un tulk.</single>
+      <multiple>red. un tulk.</multiple>
     </term>
     <term name="editortranslator" form="short">
       <single>red. un tulk.</single>
       <multiple>red. un tulk.</multiple>
     </term>
+    <term name="editorial-director" form="short">
+      <single>galv. red.</single>
+      <multiple>galv. red.</multiple>
+    </term>
+    <term name="executive-producer" form="short">
+      <single>izpildprod.</single>
+      <multiple>izpildprod.</multiple>
+    </term>
     <term name="illustrator" form="short">
       <single>ilustr.</single>
       <multiple>ilustr.</multiple>
@@ -564,73 +649,99 @@
       <single>interv.</single>
       <multiple>interv.</multiple>
     </term>
+    <term name="narrator" form="short">
+      <single>stāst.</single>
+      <multiple>stāst.</multiple>
+    </term>
+    <term name="organizer" form="short">
+      <single>org.</single>
+      <multiple>orgs.</multiple>
+    </term>
+    <term name="performer" form="short">
+      <single>izp.</single>
+      <multiple>izp.</multiple>
+    </term>
+    <term name="producer" form="short">
+      <single>prod.</single>
+      <multiple>prod.</multiple>
+    </term>
     <term name="recipient" form="short">
       <single>saņ.</single>
       <multiple>saņ.</multiple>
     </term>
+    <term name="script-writer" form="short">
+      <single>scen.</single>
+      <multiple>scen.</multiple>
+    </term>
+    <term name="series-creator" form="short">
+      <single>ser. veid.</single>
+      <multiple>ser. veid.</multiple>
+    </term>
     <term name="translator" form="short">
       <single>tulk.</single>
       <multiple>tulk.</multiple>
     </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb"></term>
+    <term name="chair" form="verb">priekšsēdētājs:</term>
+    <term name="compiler" form="verb">sastādīja</term>
     <term name="composer" form="verb">sastādīja</term>
+    <term name="container-author" form="verb"/>
+    <term name="contributor" form="verb">piedaloties</term>
+    <term name="curator" form="verb">kurators:</term>
     <term name="director" form="verb">vadīja</term>
     <term name="editor" form="verb">sagatavoja</term>
-    <term name="editorial-director" form="verb">sagatavoja</term>
+    <term name="editor-translator" form="verb">sagatavoja un tulkoja</term>
     <term name="editortranslator" form="verb">sagatavoja un tulkoja</term>
+    <term name="editorial-director" form="verb">sagatavoja</term>
+    <term name="executive-producer" form="verb">izpildproducents:</term>
+    <term name="guest" form="verb">ar viesi</term>
+    <term name="host" form="verb">vadīja</term>
     <term name="illustrator" form="verb">ilustrēja</term>
     <term name="interviewer" form="verb">intervēja</term>
+    <term name="narrator" form="verb">stāstīja</term>
+    <term name="organizer" form="verb">organizēja</term>
+    <term name="performer" form="verb">izpildīja</term>
+    <term name="producer" form="verb">producēja</term>
     <term name="recipient" form="verb">saņēma</term>
+    <term name="script-writer" form="verb">scenārija autors:</term>
+    <term name="series-creator" form="verb">izveidoja</term>
     <term name="translator" form="verb">tulkoja</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="compiler" form="verb-short">sast.</term>
+    <term name="contributor" form="verb-short">pied.</term>
+    <term name="curator" form="verb-short">kur.</term>
     <term name="director" form="verb-short">sast.</term>
     <term name="editor" form="verb-short">sag.</term>
+    <term name="editor-translator" form="verb-short">sag. un tulk.</term>
+    <term name="editortranslator" form="verb-short">sag. un tulk.</term>
     <term name="editorial-director" form="verb-short">sag.</term>
+    <term name="executive-producer" form="verb-short">izpildprod.</term>
+    <term name="guest" form="verb-short">ar viesi</term>
+    <term name="host" form="verb-short">vad.</term>
     <term name="illustrator" form="verb-short">ilustr.</term>
+    <term name="narrator" form="verb-short">stāst.</term>
+    <term name="organizer" form="verb-short">org.</term>
+    <term name="performer" form="verb-short">izp.</term>
+    <term name="producer" form="verb-short">prod.</term>
+    <term name="script-writer" form="verb-short">scen. aut.</term>
+    <term name="series-creator" form="verb-short">izv.</term>
     <term name="translator" form="verb-short">tulk.</term>
-    <term name="editortranslator" form="verb-short">sag. un tulk.</term>
 
     <!-- LONG MONTH FORMS -->
-    <term name="month-01">janvārī</term>
-    <term name="month-02">februārī</term>
-    <term name="month-03">martā</term>
-    <term name="month-04">aprīlī</term>
-    <term name="month-05">maijā</term>
-    <term name="month-06">jūnijā</term>
-    <term name="month-07">jūlijā</term>
-    <term name="month-08">augustā</term>
-    <term name="month-09">septembrī</term>
-    <term name="month-10">oktobrī</term>
-    <term name="month-11">novembrī</term>
-    <term name="month-12">decembrī</term>
+    <term name="month-01">janvāris</term>
+    <term name="month-02">februāris</term>
+    <term name="month-03">marts</term>
+    <term name="month-04">aprīlis</term>
+    <term name="month-05">maijs</term>
+    <term name="month-06">jūnijs</term>
+    <term name="month-07">jūlijs</term>
+    <term name="month-08">augusts</term>
+    <term name="month-09">septembris</term>
+    <term name="month-10">oktobris</term>
+    <term name="month-11">novembris</term>
+    <term name="month-12">decembris</term>
 
     <!-- SHORT MONTH FORMS -->
     <term name="month-01" form="short">janv.</term>
diff --git a/locales/mn-MN.xml b/locales/mn-MN.xml
--- a/locales/mn-MN.xml
+++ b/locales/mn-MN.xml
@@ -2,7 +2,7 @@
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="mn-MN">
   <info>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -16,26 +16,52 @@
     <date-part name="day" form="numeric-leading-zeros" prefix="."/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">accessed</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">and</term>
+    <term name="and others">and others</term>
+    <term name="anonymous">anonymous</term>
+    <term name="at">at</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">available at</term>
+    <term name="by">by</term>
+    <term name="circa">circa</term>
+    <term name="cited">cited</term>
+    <term name="et-al">et al.</term>
     <term name="film">film</term>
+    <term name="forthcoming">forthcoming</term>
+    <term name="from">from</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">in</term>
+    <term name="in press">in press</term>
+    <term name="internet">internet</term>
+    <term name="letter">захиа</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">no date</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">online</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">хувийн харилцаа холбоо</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">presented at the</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>reference</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="retrieved">retrieved</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scale</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -43,46 +69,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">accessed</term>
-    <term name="and">and</term>
-    <term name="and others">and others</term>
-    <term name="anonymous">anonymous</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anon</term>
-    <term name="at">at</term>
-    <term name="available at">available at</term>
-    <term name="by">by</term>
-    <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
-    <term name="cited">cited</term>
-    <term name="edition">
-      <single>edition</single>
-      <multiple>editions</multiple>
-    </term>
-    <term name="edition" form="short">ed</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">forthcoming</term>
-    <term name="from">from</term>
-    <term name="ibid">ibid.</term>
-    <term name="in">in</term>
-    <term name="in press">in press</term>
-    <term name="internet">internet</term>
-    <term name="letter">захиа</term>
-    <term name="no date">no date</term>
     <term name="no date" form="short">n.d.</term>
-    <term name="online">online</term>
-    <term name="presented at">presented at the</term>
-    <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">retrieved</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -147,6 +148,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">AD</term>
     <term name="bc">BC</term>
@@ -179,54 +188,26 @@
     <term name="long-ordinal-10">аравдугаар</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>ном</single>
       <multiple>номнууд</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>chapter</single>
       <multiple>chapters</multiple>
@@ -235,6 +216,14 @@
       <single>багана</single>
       <multiple>баганууд</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figure</single>
       <multiple>figures</multiple>
@@ -263,10 +252,6 @@
       <single>хуудас</single>
       <multiple>хуудаснууд</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>хуудас</single>
-      <multiple>хуудаснууд</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraph</single>
       <multiple>paragraph</multiple>
@@ -275,6 +260,14 @@
       <single>part</single>
       <multiple>parts</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>section</single>
       <multiple>sections</multiple>
@@ -283,6 +276,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verse</single>
       <multiple>verses</multiple>
@@ -293,45 +302,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">bk</term>
+    <term name="chapter" form="short">chap</term>
+    <term name="column" form="short">col</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">bk</term>
-    <term name="chapter" form="short">chap</term>
-    <term name="column" form="short">col</term>
     <term name="figure" form="short">fig</term>
     <term name="folio" form="short">f</term>
     <term name="issue" form="short">no</term>
@@ -342,17 +331,37 @@
       <single>p</single>
       <multiple>pp</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p</single>
-      <multiple>pp</multiple>
-    </term>
     <term name="paragraph" form="short">para</term>
     <term name="part" form="short">pt</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sec</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v</single>
       <multiple>vv</multiple>
@@ -362,7 +371,7 @@
       <multiple>vols</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -372,15 +381,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>тоо</single>
+      <multiple>тоонууд</multiple>
+    </term>
+    <term name="edition">
+      <single>edition</single>
+      <multiple>editions</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>note</single>
+      <multiple>notes</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>хуудас</single>
+      <multiple>хуудаснууд</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">no</term>
+    <term name="edition" form="short">ed</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p</single>
+      <multiple>pp</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -389,6 +481,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>редактор</single>
+      <multiple>редакторууд</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>редактор ба орчуулагч</single>
+      <multiple>редакторууд ба орчуулагчид</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>редактор ба орчуулагч</single>
+      <multiple>редакторууд ба орчуулагчид</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>редактор</single>
+      <multiple>редакторууд</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -401,6 +513,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -409,6 +526,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -417,6 +535,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -425,30 +545,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>редактор</single>
-      <multiple>редакторууд</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>редактор</single>
-      <multiple>редакторууд</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
-    </term>
     <term name="translator">
       <single>орчуулагч</single>
       <multiple>орчуулагчид</multiple>
     </term>
-    <term name="editortranslator">
-      <single>редактор ба орчуулагч</single>
-      <multiple>редакторууд ба орчуулагчид</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -463,10 +563,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ред.</single>
+      <multiple>ред.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ред. ба орч.</single>
+      <multiple>ред. ба орч.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ред. ба орч.</single>
+      <multiple>ред. ба орч.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ред.</single>
+      <multiple>ред.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -491,75 +615,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ред.</single>
-      <multiple>ред.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ред.</single>
-      <multiple>ред.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>орч</single>
       <multiple>орч</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ред. ба орч.</single>
-      <multiple>ред. ба орч.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">by</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">directed by</term>
+    <term name="editor" form="verb">edited by</term>
+    <term name="editor-translator" form="verb">edited &amp; translated by</term>
+    <term name="editortranslator" form="verb">edited &amp; translated by</term>
+    <term name="editorial-director" form="verb">edited by</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="interviewer" form="verb">interview by</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">edited by</term>
-    <term name="editorial-director" form="verb">edited by</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">interview by</term>
     <term name="recipient" form="verb">to</term>
     <term name="reviewed-author" form="verb">by</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">translated by</term>
-    <term name="editortranslator" form="verb">edited &amp; translated by</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ed</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editorial-director" form="verb-short">ed.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
     <term name="translator" form="verb-short">trans</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Нэгдүгээр сар</term>
diff --git a/locales/ms-MY.xml b/locales/ms-MY.xml
new file mode 100644
--- /dev/null
+++ b/locales/ms-MY.xml
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="ms-MY">
+ <info>
+  <translator>
+    <name>Fareed Sairi</name>
+    <email>fareed@ukm.edu.my</email>
+  </translator>
+  <translator>
+    <name>Farah Diba Abu Bakar</name>
+  </translator>
+  <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  <updated>2025-10-16T03:24:00+00:00</updated>
+</info>
+  <style-options punctuation-in-quote="true"/>
+  <date form="text">
+    <date-part name="day" suffix=" "/>
+    <date-part name="month" suffix=" "/>
+    <date-part name="year"/>
+  </date>
+  <date form="numeric">
+    <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+    <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+    <date-part name="year"/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">diakses</term>
+    <term name="and">dan</term>
+    <term name="and others">dan lainnya</term>
+    <term name="anonymous">anon</term>
+    <term name="at">pada</term>
+    <term name="available at">tersedia pada</term>
+    <term name="by">oleh</term>
+    <term name="circa">lebih kurang</term>
+    <term name="cited">disitasi</term>
+    <term name="et-al">et al.</term>
+    <term name="forthcoming">mendatang</term>
+    <term name="from">dari</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">dalam</term>
+    <term name="in press">dalam proses cetakan</term>
+    <term name="internet">internet</term>
+    <term name="letter">surat</term>
+    <term name="no date">tiada tarikh</term>
+    <term name="online">dalam talian</term>
+    <term name="presented at">dibentangkan pada</term>
+    <term name="reference">
+      <single>rujukan</single>
+      <multiple>rujukan</multiple>
+    </term>
+    <term name="retrieved">diambil</term>
+    <term name="scale">skala</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">ca.</term>
+    <term name="no date" form="short">t.th.</term>
+    <term name="reference" form="short">
+      <single>ruj.</single>
+      <multiple>ruj.</multiple>
+    </term>
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="interview">wawancara</term>
+
+    <!-- SHORT ITEM TYPE FORMS -->
+
+    <!-- LONG VERB ITEM TYPE FORMS -->
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad">M</term>
+    <term name="bc">SM</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">“</term>
+    <term name="close-quote">”</term>
+    <term name="open-inner-quote">‘</term>
+    <term name="close-inner-quote">’</term>
+    <term name="page-range-delimiter">–</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal"/>
+    <term name="ordinal-01"/>
+    <term name="ordinal-02"/>
+    <term name="ordinal-03"/>
+    <term name="ordinal-11"/>
+    <term name="ordinal-12"/>
+    <term name="ordinal-13"/>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01">pertama</term>
+    <term name="long-ordinal-02">kedua</term>
+    <term name="long-ordinal-03">ketiga</term>
+    <term name="long-ordinal-04">keempat</term>
+    <term name="long-ordinal-05">kelima</term>
+    <term name="long-ordinal-06">keenam</term>
+    <term name="long-ordinal-07">ketujuh</term>
+    <term name="long-ordinal-08">kelapan</term>
+    <term name="long-ordinal-09">kesembilan</term>
+    <term name="long-ordinal-10">kesepuluh</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="book">
+      <single>buku</single>
+      <multiple>buku</multiple>
+    </term>
+    <term name="chapter">
+      <single>bab</single>
+      <multiple>bab</multiple>
+    </term>
+    <term name="column">
+      <single>ruang</single>
+      <multiple>ruang</multiple>
+    </term>
+    <term name="figure">
+      <single>rajah</single>
+      <multiple>rajah</multiple>
+    </term>
+    <term name="folio">
+      <single>folio</single>
+      <multiple>folio</multiple>
+    </term>
+    <term name="issue">
+      <single>isu</single>
+      <multiple>isu</multiple>
+    </term>
+    <term name="line">
+      <single>baris</single>
+      <multiple>baris</multiple>
+    </term>
+    <term name="note">
+      <single>catatan</single>
+      <multiple>catatan</multiple>
+    </term>
+    <term name="opus">
+      <single>opus</single>
+      <multiple>opus</multiple>
+    </term>
+    <term name="page">
+      <single>halaman</single>
+      <multiple>halaman</multiple>
+    </term>
+    <term name="paragraph">
+      <single>perenggan</single>
+      <multiple>perenggan</multiple>
+    </term>
+    <term name="part">
+      <single>fasal</single>
+      <multiple>fasal</multiple>
+    </term>
+    <term name="section">
+      <single>bahagian</single>
+      <multiple>bahagian</multiple>
+    </term>
+    <term name="sub-verbo">
+      <single>sub verbo</single>
+      <multiple>sub verbis</multiple>
+    </term>
+    <term name="verse">
+      <single>ayat</single>
+      <multiple>ayat</multiple>
+    </term>
+    <term name="volume">
+      <single>jilid</single>
+      <multiple>jilid</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+    <term name="book" form="short">bk.</term>
+    <term name="chapter" form="short">bab</term>
+    <term name="column" form="short">kol.</term>
+    <term name="figure" form="short">raj.</term>
+    <term name="folio" form="short">fol.</term>
+    <term name="issue" form="short">no.</term>
+    <term name="line" form="short">brs.</term>
+    <term name="note" form="short">ctt.</term>
+    <term name="opus" form="short">op.</term>
+    <term name="page" form="short">
+      <single>hlm.</single>
+      <multiple>hlm.</multiple>
+    </term>
+    <term name="paragraph" form="short">pgn.</term>
+    <term name="part" form="short">fs.</term>
+    <term name="section" form="short">bag.</term>
+    <term name="sub-verbo" form="short">
+      <single>s.v.</single>
+      <multiple>s.vv.</multiple>
+    </term>
+    <term name="verse" form="short">
+      <single>ayat</single>
+      <multiple>ayat</multiple>
+    </term>
+    <term name="volume" form="short">
+      <single>jil.</single>
+      <multiple>jil.</multiple>
+    </term>
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="edition">
+      <single>edisi</single>
+      <multiple>edisi</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>halaman</single>
+      <multiple>halaman</multiple>
+    </term>
+    <term name="version">versi</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="edition" form="short">ed.</term>
+    <term name="number-of-pages" form="short">
+      <single>hlm.</single>
+      <multiple>hlm.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="director">
+      <single>pengarah</single>
+      <multiple>pengarah</multiple>
+    </term>
+    <term name="editor">
+      <single>penyunting</single>
+      <multiple>penyunting</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor &amp; penterjemah</single>
+      <multiple>editor &amp; penterjemah</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor &amp; penterjemah</single>
+      <multiple>editor &amp; penterjemah</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>pengarah penyuntingan</single>
+      <multiple>pengarah penyuntingan</multiple>
+    </term>
+    <term name="illustrator">
+      <single>ilustrator</single>
+      <multiple>ilustrator</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="translator">
+      <single>penterjemah</single>
+      <multiple>penterjemah</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dir.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>pnyt.</single>
+      <multiple>pnyt.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>pnyt. &amp; ptrj.</single>
+      <multiple>pnyt. &amp; ptrj.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>pnyt. &amp; ptrj.</single>
+      <multiple>pnyt. &amp; ptrj.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>ed.</multiple>
+    </term>
+    <term name="illustrator" form="short">
+      <single>il.</single>
+      <multiple>il.</multiple>
+    </term>
+    <term name="translator" form="short">
+      <single>ptrj.</single>
+      <multiple>ptrj.</multiple>
+    </term>
+
+    <!-- VERB ROLE FORMS -->
+    <term name="container-author" form="verb">oleh</term>
+    <term name="director" form="verb">diarahkan oleh</term>
+    <term name="editor" form="verb">disunting oleh</term>
+    <term name="editor-translator" form="verb">disunting &amp; diterjemahkan oleh</term>
+    <term name="editortranslator" form="verb">disunting &amp; diterjemahkan oleh</term>
+    <term name="editorial-director" form="verb">disunting oleh</term>
+    <term name="illustrator" form="verb">diilustrasi oleh</term>
+    <term name="interviewer" form="verb">diwawancara oleh</term>
+    <term name="recipient" form="verb">kepada</term>
+    <term name="reviewed-author" form="verb">oleh</term>
+    <term name="translator" form="verb">diterjemahkan oleh</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+    <term name="director" form="verb-short">dir. oleh</term>
+    <term name="editor" form="verb-short">ed. oleh</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; penerj. oleh</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; penerj. oleh</term>
+    <term name="editorial-director" form="verb-short">ed. oleh</term>
+    <term name="illustrator" form="verb-short">illus. oleh</term>
+    <term name="translator" form="verb-short">trans. oleh</term>
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">Januari</term>
+    <term name="month-02">Februari</term>
+    <term name="month-03">Mac</term>
+    <term name="month-04">April</term>
+    <term name="month-05">Mei</term>
+    <term name="month-06">Jun</term>
+    <term name="month-07">Julai</term>
+    <term name="month-08">Ogoss</term>
+    <term name="month-09">September</term>
+    <term name="month-10">Oktober</term>
+    <term name="month-11">November</term>
+    <term name="month-12">Disember</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">Jan</term>
+    <term name="month-02" form="short">Feb</term>
+    <term name="month-03" form="short">Mac</term>
+    <term name="month-04" form="short">Apr</term>
+    <term name="month-05" form="short">Mei</term>
+    <term name="month-06" form="short">Jun</term>
+    <term name="month-07" form="short">Jul</term>
+    <term name="month-08" form="short">Ogo</term>
+    <term name="month-09" form="short">Sep</term>
+    <term name="month-10" form="short">Okt</term>
+    <term name="month-11" form="short">Nov</term>
+    <term name="month-12" form="short">Dis</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">Bunga</term>
+    <term name="season-02">Panas</term>
+    <term name="season-03">Luruh</term>
+    <term name="season-04">Sejuk</term>
+  </terms>
+</locale>
diff --git a/locales/nb-NO.xml b/locales/nb-NO.xml
--- a/locales/nb-NO.xml
+++ b/locales/nb-NO.xml
@@ -4,8 +4,11 @@
     <translator>
       <name>Guttorm Flatabø</name>
     </translator>
+    <translator>
+      <name>Stian Øby Johansen</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2013-03-01T12:20:00+01:00</updated>
+    <updated>2026-02-04T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,137 +22,137 @@
     <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">personlig kommunikasjon</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">åpnet</term>
+    <term name="advance-online-publication">forhåndspublisert på nett</term>
+    <term name="album">album</term>
     <term name="and">og</term>
     <term name="and others">med flere</term>
     <term name="anonymous">anonym</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">på</term>
+    <term name="audio-recording">lydopptak</term>
     <term name="available at">tilgjengelig på</term>
     <term name="by">av</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">ca.</term>
     <term name="cited">sitert</term>
-    <term name="edition">
-      <single>utgave</single>
-      <multiple>utgaver</multiple>
-    </term>
-    <term name="edition" form="short">utg.</term>
     <term name="et-al">mfl.</term>
+    <term name="film">film</term>
     <term name="forthcoming">kommende</term>
     <term name="from">fra</term>
+    <term name="henceforth">heretter</term>
     <term name="ibid">ibid.</term>
     <term name="in">i</term>
     <term name="in press">i trykk</term>
     <term name="internet">Internett</term>
     <term name="letter">brev</term>
-    <term name="no date">ingen dato</term>
-    <term name="no date" form="short">u.å.</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">uten dato</term>
+    <term name="no-place">mangler sted</term>
+    <term name="no-publisher">mangler utgiver</term> <!-- sine nomine -->
+    <term name="on">om</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">opprinnelig verk utgitt</term>
+    <term name="personal-communication">personlig kommunikasjon</term>
+    <term name="podcast">podkast</term>
+    <term name="podcast-episode">podkastepisode</term>
+    <term name="preprint">innsendt manuskript</term>
     <term name="presented at">presentert på</term>
+    <term name="radio-broadcast">radiosending</term>
+    <term name="radio-series">radioserie</term>
+    <term name="radio-series-episode">radioserieepisode</term>
     <term name="reference">
       <single>referanse</single>
       <multiple>referanser</multiple>
     </term>
+    <term name="retrieved">hentet</term>
+    <term name="review-of">anmeldelse av</term>
+    <term name="scale">målestokk</term>
+    <term name="special-issue">spesialutgave</term>
+    <term name="special-section">spesialseksjon</term>
+    <term name="television-broadcast">fjernsynssending</term>
+    <term name="television-series">fjernsynsserie</term>
+    <term name="television-series-episode">fjernsynsserieepisode</term>
+    <term name="video">video</term>
+    <term name="working-paper">notat</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">ca.</term>
+    <term name="no date" form="short">u.å.</term>
+    <term name="no-publisher" form="short">s.n.</term>
     <term name="reference" form="short">
       <single>ref.</single>
-      <multiple>refr.</multiple>
+      <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">hentet</term>
-    <term name="scale">målestokk</term>
-    <term name="version">versjon</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">innsendt manuskript</term>
+    <term name="article-journal">tidsskriftartikkel</term>
+    <term name="article-magazine">magasinartikkel</term>
+    <term name="article-newspaper">avisartikkel</term>
+    <term name="bill">proposisjon</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">kringkasting</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">klassiker</term>
+    <term name="collection">samling</term>
+    <term name="dataset">datasett</term>
+    <term name="document">dokument</term>
+    <term name="entry">oppføring</term>
+    <term name="entry-dictionary">ordbokoppføring</term>
+    <term name="entry-encyclopedia">leksikonoppføring</term>
+    <term name="event">begivenhet</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">grafikk</term>
+    <term name="hearing">høring</term>
     <term name="interview">intervju</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="legal_case">rettssak</term>
+    <term name="legislation">lovgiving</term>
+    <term name="manuscript">manuskript</term>
+    <term name="map">kart</term>
+    <term name="motion_picture">videoopptak</term>
+    <term name="musical_score">partitur</term>
+    <term name="pamphlet">pamflett</term>
+    <term name="paper-conference">konferanseartikkel</term>
     <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="performance">fremføring</term>
+    <term name="periodical">tidsskrift</term>
     <term name="personal_communication">personlig kommunikasjon</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
+    <term name="post">innlegg</term>
+    <term name="post-weblog">blogginnlegg</term>
+    <term name="regulation">forskrift</term>
+    <term name="report">rapport</term>
+    <term name="review">anmeldelse</term>
+    <term name="review-book">bokanmeldelse</term>
+    <term name="software">programvare</term>
+    <term name="song">lydopptak</term>
+    <term name="speech">presentasjon</term>
     <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="thesis">avhandling</term>
+    <term name="treaty">traktat</term>
+    <term name="webpage">nettside</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">tidsskriftart.</term>
+    <term name="article-newspaper" form="short">avisart.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">dok.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="manuscript" form="short">ms.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">høring av</term>
+    <term name="review" form="verb">anmeldelse av</term>
+    <term name="review-book" form="verb">anmeldelse av boken</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">e.Kr.</term>
     <term name="bc">f.Kr.</term>
@@ -182,81 +185,61 @@
     <term name="long-ordinal-10">tiende</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>akt</single>
+      <multiple>akt</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>appendiks</single>
+      <multiple>appendiks</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>artikkel</single>
+      <multiple>artikkel</multiple>
     </term>
     <term name="book">
       <single>bok</single>
-      <multiple>bøker</multiple>
+      <multiple>bok</multiple>
     </term>
+    <term name="canon">
+      <single>kanon</single>
+      <multiple>kanon</multiple>
+    </term>
     <term name="chapter">
       <single>kapittel</single>
-      <multiple>kapitler</multiple>
+      <multiple>kapittel</multiple>
     </term>
     <term name="column">
       <single>kolonne</single>
-      <multiple>kolonner</multiple>
+      <multiple>kolonne</multiple>
     </term>
+    <term name="elocation">
+      <single>sted</single>
+      <multiple>sted</multiple>
+    </term>
+    <term name="equation">
+      <single>ligning</single>
+      <multiple>ligning</multiple>
+    </term>
     <term name="figure">
       <single>figur</single>
-      <multiple>figurer</multiple>
+      <multiple>figur</multiple>
     </term>
     <term name="folio">
       <single>folio</single>
-      <multiple>folioer</multiple>
+      <multiple>folio</multiple>
     </term>
     <term name="issue">
       <single>nummer</single>
-      <multiple>numre</multiple>
+      <multiple>nummer</multiple>
     </term>
     <term name="line">
       <single>linje</single>
-      <multiple>linjer</multiple>
+      <multiple>linje</multiple>
     </term>
     <term name="note">
       <single>note</single>
-      <multiple>noter</multiple>
+      <multiple>note</multiple>
     </term>
     <term name="opus">
       <single>opus</single>
@@ -266,26 +249,46 @@
       <single>side</single>
       <multiple>side</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>side</single>
-      <multiple>sider</multiple>
-    </term>
     <term name="paragraph">
       <single>avsnitt</single>
       <multiple>avsnitt</multiple>
     </term>
     <term name="part">
       <single>del</single>
-      <multiple>deler</multiple>
+      <multiple>del</multiple>
     </term>
+    <term name="rule">
+      <single>regel</single>
+      <multiple>regel</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scene</multiple>
+    </term>
     <term name="section">
       <single>paragraf</single>
-      <multiple>paragrafer</multiple>
+      <multiple>paragraf</multiple>
     </term>
     <term name="sub-verbo">
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>tabell</single>
+      <multiple>tabell</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>tittel</single>
+      <multiple>tittel</multiple>
+    </term>
     <term name="verse">
       <single>vers</single>
       <multiple>vers</multiple>
@@ -296,66 +299,38 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
-    </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+      <multiple>art.</multiple>
     </term>
-    <term name="book" form="short">b.</term>
     <term name="chapter" form="short">kap.</term>
     <term name="column" form="short">kol.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">nr.</term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
     <term name="opus" form="short">op.</term>
     <term name="page" form="short">
       <single>s.</single>
       <multiple>s.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>s.</single>
-      <multiple>s.</multiple>
-    </term>
     <term name="paragraph" form="short">avsn.</term>
-    <term name="part" form="short">d.</term>
     <term name="section" form="short">pargr.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tab.</single>
+      <multiple>tab.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
@@ -365,7 +340,7 @@
       <multiple>bd.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -375,59 +350,105 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>kapittel</single>
+      <multiple>kapitler</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>note</single>
+      <multiple>noter</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>nummer</single>
+      <multiple>nummer</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>utgave</single>
+      <multiple>utgave</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>note</single>
+      <multiple>note</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>nummer</single>
+      <multiple>nummer</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>side</single>
+      <multiple>sider</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>bind</single>
+      <multiple>bind</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>side</single>
+      <multiple>sider</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>opplag</single>
+      <multiple>opplag</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">versjon</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>kap.</single>
+      <multiple>kap.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>note</single>
+      <multiple>note</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">nr.</term>
+    <term name="edition" form="short">utg.</term>
+    <term name="number" form="short">
+      <single>nr.</single>
+      <multiple>nr.</multiple>
     </term>
+    <term name="number-of-pages" form="short">
+      <single>s.</single>
+      <multiple>s.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>bind</single>
+      <multiple>bind</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>s.</single>
+      <multiple>s.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>oppl.</single>
+      <multiple>oppl.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>leder</single>
+      <multiple>ledere</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>red.</single>
+      <multiple>red.</multiple>
+    </term>
+    <term name="compiler">
+      <single>kompilator</single>
+      <multiple>kompilatorer</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>bidragsyter</single>
+      <multiple>bidragsytere</multiple>
+    </term>
+    <term name="curator">
+      <single>kurator</single>
+      <multiple>kuratorer</multiple>
+    </term>
     <term name="director">
       <single>regissør</single>
       <multiple>regissører</multiple>
@@ -436,64 +457,68 @@
       <single>redaktør</single>
       <multiple>redaktører</multiple>
     </term>
+    <term name="editor-translator">
+      <single>redaktør og oversetter</single>
+      <multiple>redaktører og oversettere</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>redaktør og oversetter</single>
+      <multiple>redaktører og oversettere</multiple>
+    </term>
     <term name="editorial-director">
       <single>redaktør</single>
       <multiple>redaktører</multiple>
     </term>
-    <term name="illustrator">
-      <single>illustratør</single>
-      <multiple>illustratører</multiple>
-    </term>
-    <term name="translator">
-      <single>oversetter</single>
-      <multiple>oversettere</multiple>
-    </term>
-    <term name="editortranslator">
-      <single>redaktør &amp; oversetter</single>
-      <multiple>redaktører &amp; oversettere</multiple>
+    <term name="executive-producer">
+      <single>utøvende produsent</single>
+      <multiple>utøvende produsenter</multiple>
     </term>
-
-    <!-- SHORT ROLE FORMS -->
-    <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+    <term name="guest">
+      <single>gjest</single>
+      <multiple>gjester</multiple>
     </term>
-    <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+    <term name="host">
+      <single>vert</single>
+      <multiple>verter</multiple>
     </term>
-    <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
+    <term name="illustrator">
+      <single>illustratør</single>
+      <multiple>illustratører</multiple>
     </term>
-    <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>forteller</single>
+      <multiple>fortellere</multiple>
     </term>
-    <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
+    <term name="organizer">
+      <single>organisator</single>
+      <multiple>organisatorer</multiple>
     </term>
-    <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>utøver</single>
+      <multiple>utøvere</multiple>
     </term>
-    <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+    <term name="producer">
+      <single>produsent</single>
+      <multiple>produsenter</multiple>
     </term>
-    <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>manusforfatter</single>
+      <multiple>manusforfattere</multiple>
     </term>
-    <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+    <term name="series-creator">
+      <single>serieskaper</single>
+      <multiple>serieskapere</multiple>
     </term>
-    <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
+    <term name="translator">
+      <single>oversetter</single>
+      <multiple>oversettere</multiple>
     </term>
+
+    <!-- SHORT ROLE FORMS -->
     <term name="director" form="short">
       <single>regi</single>
       <multiple>regi</multiple>
@@ -502,67 +527,78 @@
       <single>red.</single>
       <multiple>red.</multiple>
     </term>
+    <term name="editor-translator" form="short">
+      <single>red. og overs.</single>
+      <multiple>red. og overs.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>red. og overs.</single>
+      <multiple>red. og overs.</multiple>
+    </term>
     <term name="editorial-director" form="short">
       <single>red.</single>
       <multiple>red.</multiple>
     </term>
+    <term name="executive-producer" form="short">
+      <single>utøv. prod.</single>
+      <multiple>utøv. prod.</multiple>
+    </term>
     <term name="illustrator" form="short">
       <single>ill.</single>
-      <multiple>ills.</multiple>
+      <multiple>ill.</multiple>
     </term>
+    <term name="producer" form="short">
+      <single>prod.</single>
+      <multiple>prod.</multiple>
+    </term>
+    <term name="script-writer" form="short">
+      <single>forf.</single>
+      <multiple>forf.</multiple>
+    </term>
     <term name="translator" form="short">
       <single>overs.</single>
       <multiple>overs.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>red. &amp; overs.</single>
-      <multiple>red. &amp; overs.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">leda av</term>
+    <term name="collection-editor" form="verb">redigert av</term>
+    <term name="compiler" form="verb">kompilert av</term>
     <term name="container-author" form="verb">av</term>
+    <term name="contributor" form="verb">med</term>
+    <term name="curator" form="verb">kuratert av</term>
     <term name="director" form="verb">regissert av</term>
     <term name="editor" form="verb">redigert av</term>
+    <term name="editor-translator" form="verb">redigert og oversatt av</term>
+    <term name="editortranslator" form="verb">redigert og oversatt av</term>
     <term name="editorial-director" form="verb">redigert av</term>
+    <term name="executive-producer" form="verb">utøvende produsert av</term>
+    <term name="guest" form="verb">med gjest</term>
+    <term name="host" form="verb">vertskap av</term>
     <term name="illustrator" form="verb">illustrert av</term>
     <term name="interviewer" form="verb">intervjuet av</term>
+    <term name="narrator" form="verb">fortalt av</term>
+    <term name="organizer" form="verb">organisert av</term>
+    <term name="performer" form="verb">fremført av</term>
+    <term name="producer" form="verb">produsert av</term>
     <term name="recipient" form="verb">til</term>
     <term name="reviewed-author" form="verb">av</term>
+    <term name="script-writer" form="verb">forfatta av</term>
+    <term name="series-creator" form="verb">skapt av</term>
     <term name="translator" form="verb">oversatt av</term>
-    <term name="editortranslator" form="verb">redigert &amp; oversatt av</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">red. av</term>
     <term name="director" form="verb-short">regi</term>
     <term name="editor" form="verb-short">red.</term>
+    <term name="editor-translator" form="verb-short">red. og overs. av</term>
+    <term name="editortranslator" form="verb-short">red. og overs. av</term>
     <term name="editorial-director" form="verb-short">red.</term>
+    <term name="executive-producer" form="verb-short">utøv. prod. av</term>
     <term name="illustrator" form="verb-short">illus.</term>
+    <term name="producer" form="verb-short">prod. av</term>
+    <term name="script-writer" form="verb-short">forf. av</term>
     <term name="translator" form="verb-short">overs.</term>
-    <term name="editortranslator" form="verb-short">red. &amp; overs. av</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">januar</term>
diff --git a/locales/nl-NL.xml b/locales/nl-NL.xml
--- a/locales/nl-NL.xml
+++ b/locales/nl-NL.xml
@@ -5,8 +5,18 @@
       <name>Rintze M. Zelle</name>
       <uri>http://twitter.com/rintzezelle</uri>
     </translator>
+    <translator>
+      <name>K. Avonts</name>
+    </translator>
+	<translator>
+      <name>ZambiblasianOgre</name>
+      <uri>https://github.com/ZambiblasianOgre</uri>
+    </translator>
+    <translator>
+      <name>H. Stroom</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2017-04-01T12:00:00+00:00</updated>
+    <updated>2026-09-01T11:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -20,84 +30,85 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">geraadpleegd</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">persoonlijke communicatie</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
-    <term name="accessed">geraadpleegd</term>
     <term name="and">en</term>
     <term name="and others">en anderen</term>
     <term name="anonymous">anoniem</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">bij</term>
+    <term name="audio-recording">audio recording</term>
     <term name="available at">beschikbaar op</term>
     <term name="by">door</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">c.</term>
     <term name="cited">geciteerd</term>
-    <term name="edition">
-      <single>druk</single>
-      <multiple>drukken</multiple>
-    </term>
-    <term name="edition" form="short">dr.</term>
     <term name="et-al">e.a.</term>
+    <term name="film">film</term>
     <term name="forthcoming">in voorbereiding</term>
     <term name="from">van</term>
+    <term name="henceforth">henceforth</term>
     <term name="ibid">ibid.</term>
     <term name="in">in</term>
     <term name="in press">in druk</term>
     <term name="internet">internet</term>
     <term name="letter">brief</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">zonder datum</term>
-    <term name="no date" form="short">z.d.</term>
+    <term name="no-place">geen locatie</term>
+    <term name="no-publisher">geen uitgever</term> <!-- sine nomine -->
+    <term name="on">op</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">original work published</term>
+    <term name="personal-communication">persoonlijke communicatie</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcast episode</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">gepresenteerd bij</term>
+    <term name="radio-broadcast">radio uitzending</term>
+    <term name="radio-series">radio serie</term>
+    <term name="radio-series-episode">radio serie episode</term>
     <term name="reference">
       <single>referentie</single>
       <multiple>referenties</multiple>
     </term>
+    <term name="retrieved">geraadpleegd</term>
+    <term name="review-of">review of</term>
+    <term name="scale">schaal</term>
+    <term name="special-issue">speciale uitgave</term>
+    <term name="special-section">speciale sectie</term>
+    <term name="television-broadcast">television broadcast</term>
+    <term name="television-series">televisie serie</term>
+    <term name="television-series-episode">televisie serie episode</term>
+    <term name="video">video</term>
+    <term name="working-paper">werkdocument</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">ca.</term>
+    <term name="no date" form="short">z.d.</term>
+    <term name="no-place" form="short">g.p.</term>
+    <term name="no-publisher" form="short">g.ui.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">geraadpleegd</term>
-    <term name="scale">schaal</term>
-    <term name="version">versie</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
+    <term name="article-journal">wetenschappelijke publicatie</term>
+    <term name="article-magazine">tijdschriftpublicatie</term>
+    <term name="article-newspaper">krantenartikel</term>
     <term name="bill">bill</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">uitzending</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
+    <term name="classic">klassiek</term>
+    <term name="collection">collectie</term>
     <term name="dataset">dataset</term>
     <term name="document">document</term>
     <term name="entry">entry</term>
@@ -105,52 +116,60 @@
     <term name="entry-encyclopedia">encyclopedia entry</term>
     <term name="event">event</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">figuur</term>
+    <term name="hearing">hoorzitting</term>
     <term name="interview">interview</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
+    <term name="legal_case">juridische casus</term>
+    <term name="legislation">wetgeving</term>
     <term name="manuscript">manuscript</term>
     <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="motion_picture">video-opname</term>
+    <term name="musical_score">filmmuziek</term>
+    <term name="pamphlet">pamflet</term>
+    <term name="paper-conference">conferentieartikel</term>
     <term name="patent">patent</term>
-    <term name="performance">performance</term>
+    <term name="performance">uitvoering</term>
     <term name="periodical">periodical</term>
     <term name="personal_communication">persoonlijke communicatie</term>
     <term name="post">post</term>
     <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
+    <term name="regulation">regelgeving</term>
+    <term name="report">raport</term>
     <term name="review">review</term>
-    <term name="review-book">book review</term>
+    <term name="review-book">boek review</term>
     <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="song">audio-opname</term>
+    <term name="speech">presentatie</term>
+    <term name="standard">standaard</term>
+    <term name="thesis">scriptie</term>
+    <term name="treaty">overeenkomst</term>
+    <term name="webpage">webpagina</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
+    <term name="article-journal" form="short">wetensch. art.</term>
     <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-newspaper" form="short">krantenart.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
+    <term name="graphic" form="short">fig.</term>
     <term name="interview" form="short">interv.</term>
     <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
+    <term name="motion_picture" form="short">video-opn.</term>
+    <term name="report" form="short">rapp.</term>
     <term name="review" form="short">rev.</term>
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">hoorzitting van</term>
+    <term name="review" form="verb">review van</term>
+    <term name="review-book" form="verb">review van een boek</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">AD</term>
     <term name="bc">BC</term>
@@ -158,11 +177,11 @@
     <term name="ce">CE</term>
 
     <!-- PUNCTUATION -->
-    <term name="open-quote">‘</term>
-    <term name="close-quote">’</term>
-    <term name="open-inner-quote">“</term>
-    <term name="close-inner-quote">”</term>
-    <term name="page-range-delimiter">–</term>
+    <term name="open-quote">“</term>
+    <term name="close-quote">”</term>
+    <term name="open-inner-quote">‘</term>
+    <term name="close-inner-quote">’</term>
+    <term name="page-range-delimiter">-</term>
     <term name="colon">:</term>
     <term name="comma">,</term>
     <term name="semicolon">;</term>
@@ -201,54 +220,26 @@
     <term name="long-ordinal-10">tiende</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>artikel</single>
+      <multiple>artikelen</multiple>
     </term>
     <term name="book">
       <single>boek</single>
       <multiple>boeken</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>hoofdstuk</single>
       <multiple>hoofdstukken</multiple>
@@ -257,6 +248,14 @@
       <single>column</single>
       <multiple>columns</multiple>
     </term>
+    <term name="elocation">
+      <single>locatie</single>
+      <multiple>locaties</multiple>
+    </term>
+    <term name="equation">
+      <single>vergelijking</single>
+      <multiple>vergelijkingen</multiple>
+    </term>
     <term name="figure">
       <single>figuur</single>
       <multiple>figuren</multiple>
@@ -285,10 +284,6 @@
       <single>pagina</single>
       <multiple>pagina's</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>pagina</single>
-      <multiple>pagina's</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraaf</single>
       <multiple>paragrafen</multiple>
@@ -297,6 +292,14 @@
       <single>deel</single>
       <multiple>delen</multiple>
     </term>
+    <term name="rule">
+      <single>regel</single>
+      <multiple>regels</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>sectie</single>
       <multiple>secties</multiple>
@@ -305,6 +308,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplementen</multiple>
+    </term>
+    <term name="table">
+      <single>tabel</single>
+      <multiple>tabellen</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single>tijdstempel</single>
+      <multiple>tijdstempels</multiple>
+    </term>
+    <term name="title-locator">
+      <single>titel</single>
+      <multiple>titels</multiple>
+    </term>
     <term name="verse">
       <single>vers</single>
       <multiple>versen</multiple>
@@ -315,45 +334,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">bk.</term>
+    <term name="chapter" form="short">hfdst.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="equation" form="short">
+      <single>vgl.</single>
+      <multiple>vgln.</multiple>
     </term>
-    <term name="book" form="short">bk.</term>
-    <term name="chapter" form="short">hfdst.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">f.</term>
     <term name="issue" form="short">nr.</term>
@@ -364,17 +363,37 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">deel</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sec.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbln.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single>tijdstempel</single>
+      <multiple>tijdstempels</multiple>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -384,7 +403,7 @@
       <multiple>vols.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -394,83 +413,174 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>hoofdstuk</single>
+      <multiple>hoofdstukken</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citatie</single>
+      <multiple>citaties</multiple>
+    </term>
+    <term name="collection-number">
+      <single>collectienummer</single>
+      <multiple>collectienummers</multiple>
+    </term>
+    <term name="edition">
+      <single>druk</single>
+      <multiple>drukken</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>aantekening</single>
+      <multiple>aantekeningen</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>pagina</single>
+      <multiple>pagina's</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>eerste pagina</single>
+      <multiple>eerste pagina's</multiple>
+    </term>
+    <term name="printing">
+      <single>afdruk</single>
+      <multiple>afdrukken</multiple>
+    </term>
+    <term name="version">versie</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>hfdst.</single>
+      <multiple>hfdstn.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">nr.</term>
+    <term name="edition" form="short">dr.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+      <single>voorzitter</single>
+      <multiple>voorzitters</multiple>
     </term>
+    <term name="collection-editor">
+      <single>red.</single>
+      <multiple>redn.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+      <single>bijdrage</single>
+      <multiple>bijdragers</multiple>
     </term>
     <term name="curator">
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>regisseur</single>
+      <multiple>regisseurs</multiple>
+    </term>
+    <term name="editor">
+      <single>redacteur</single>
+      <multiple>redacteuren</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>redacteur &amp; vertaler</single>
+      <multiple>redacteuren &amp; vertalers</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>redacteur &amp; vertaler</single>
+      <multiple>redacteuren &amp; vertalers</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>redacteur</single>
+      <multiple>redacteuren</multiple>
+    </term>
     <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+      <single>uitvoerend producent</single>
+      <multiple>uitvoerend producenten</multiple>
     </term>
     <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+      <single>gast</single>
+      <multiple>gasten</multiple>
     </term>
     <term name="host">
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+      <single>verteller</single>
+      <multiple>vertellers</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>organisator</single>
+      <multiple>organisators</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>producent</single>
+      <multiple>producenten</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>scriptschrijver</single>
+      <multiple>scriptschrijvers</multiple>
     </term>
     <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
-    </term>
-    <term name="director">
-      <single>regisseur</single>
-      <multiple>regisseurs</multiple>
-    </term>
-    <term name="editor">
-      <single>redacteur</single>
-      <multiple>redacteuren</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>redacteur</single>
-      <multiple>redacteuren</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
+      <single>bedenker van de serie</single>
+      <multiple>bedenkers van de serie</multiple>
     </term>
     <term name="translator">
       <single>vertaler</single>
       <multiple>vertalers</multiple>
     </term>
-    <term name="editortranslator">
-      <single>redacteur &amp; vertaler</single>
-      <multiple>redacteuren &amp; vertalers</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -478,24 +588,48 @@
       <multiple>comps.</multiple>
     </term>
     <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <single>bijdr.</single>
+      <multiple>bijdrs.</multiple>
     </term>
     <term name="curator" form="short">
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>reg.</single>
+      <multiple>reg.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>red.</single>
+      <multiple>redn.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>red. &amp; vert.</single>
+      <multiple>redn. &amp; verts.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>red. &amp; vert.</single>
+      <multiple>redn. &amp; verts.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>red.</single>
+      <multiple>redn.</multiple>
+    </term>
     <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <single>uitv. produc.</single>
+      <multiple>uitv. producn.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ill.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
     </term>
     <term name="organizer" form="short">
       <single>org.</single>
-      <multiple>orgs.</multiple>
+      <multiple>orgn.</multiple>
     </term>
     <term name="performer" form="short">
       <single>perf.</single>
@@ -503,85 +637,69 @@
     </term>
     <term name="producer" form="short">
       <single>prod.</single>
-      <multiple>prods.</multiple>
+      <multiple>prodn.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>schr.</single>
+      <multiple>schrs.</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>reg.</single>
-      <multiple>reg.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>red.</single>
-      <multiple>red.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>red.</single>
-      <multiple>red.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ill.</multiple>
+      <single>crea.</single>
+      <multiple>crean.</multiple>
     </term>
     <term name="translator" form="short">
       <single>vert.</single>
-      <multiple>vert.</multiple>
-    </term>
-    <term name="editortranslator" form="short">
-      <single>red. &amp; vert.</single>
-      <multiple>red. &amp; vert.</multiple>
+      <multiple>verts.</multiple>
     </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">door</term>
+    <term name="chair" form="verb">voorgezeten door</term>
+    <term name="collection-editor" form="verb">geredigeerd door</term>
+    <term name="compiler" form="verb">gecompileerd door</term>
+    <term name="container-author" form="verb">geschreven door</term>
+    <term name="contributor" form="verb">door</term>
+    <term name="curator" form="verb">gecureerd door</term>
     <term name="director" form="verb">geregisseerd door</term>
     <term name="editor" form="verb">onder redactie van</term>
+    <term name="editor-translator" form="verb">redactie &amp; vertaald door</term>
+    <term name="editortranslator" form="verb">redactie &amp; vertaald door</term>
     <term name="editorial-director" form="verb">onder redactie van</term>
+    <term name="executive-producer" form="verb">uitvoerende productie door</term>
+    <term name="guest" form="verb">met gast</term>
+    <term name="host" form="verb">presentatie door</term>
     <term name="illustrator" form="verb">geïllustreerd door</term>
     <term name="interviewer" form="verb">geïnterviewd door</term>
+    <term name="narrator" form="verb">verteld door</term>
+    <term name="organizer" form="verb">georganiseerd door</term>
+    <term name="performer" form="verb">uitgevoerd door</term>
+    <term name="producer" form="verb">geproduceerd door</term>
     <term name="recipient" form="verb">ontvangen door</term>
     <term name="reviewed-author" form="verb">door</term>
+    <term name="script-writer" form="verb">script geschreven door</term>
+    <term name="series-creator" form="verb">serie gecreëerd door</term>
     <term name="translator" form="verb">vertaald door</term>
-    <term name="editortranslator" form="verb">bewerkt &amp; vertaald door</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">geregisseerd door</term>
-    <term name="editor" form="verb-short">onder redactie van</term>
+    <term name="collection-editor" form="verb-short">red. door</term>
+    <term name="compiler" form="verb-short">gecomp. door</term>
+    <term name="contributor" form="verb-short">bijdr.</term>
+    <term name="curator" form="verb-short">cur. door</term>
+    <term name="director" form="verb-short">gereg. door</term>
+    <term name="editor" form="verb-short">red. door</term>
+    <term name="editor-translator" form="verb-short">red. &amp; vert. door</term>
+    <term name="editortranslator" form="verb-short">red. &amp; vert. door</term>
     <term name="editorial-director" form="verb-short">bewerkt door</term>
-    <term name="illustrator" form="verb-short">geïllustreerd door</term>
-    <term name="translator" form="verb-short">vertaald door</term>
-    <term name="editortranslator" form="verb-short">bewerkt &amp; vertaald door</term>
+    <term name="executive-producer" form="verb-short">uitv. prod. door</term>
+    <term name="guest" form="verb-short">m. gast</term>
+    <term name="host" form="verb-short">pres. door</term>
+    <term name="illustrator" form="verb-short">illust. door</term>
+    <term name="narrator" form="verb-short">stem van</term>
+    <term name="organizer" form="verb-short">org. door</term>
+    <term name="performer" form="verb-short">uitv. door</term>
+    <term name="producer" form="verb-short">prod. door</term>
+    <term name="script-writer" form="verb-short">geschr. door</term>
+    <term name="series-creator" form="verb-short">cr.serie door</term>
+    <term name="translator" form="verb-short">vert. door</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">januari</term>
@@ -614,7 +732,7 @@
     <!-- SEASONS -->
     <term name="season-01">lente</term>
     <term name="season-02">zomer</term>
-    <term name="season-03">herst</term>
+    <term name="season-03">herfst</term>
     <term name="season-04">winter</term>
   </terms>
 </locale>
diff --git a/locales/nn-NO.xml b/locales/nn-NO.xml
--- a/locales/nn-NO.xml
+++ b/locales/nn-NO.xml
@@ -4,8 +4,11 @@
     <translator>
       <name>Guttorm Flatabø</name>
     </translator>
+    <translator>
+      <name>Stian Øby Johansen</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2013-03-01T12:20:00+01:00</updated>
+    <updated>2026-02-04T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,137 +22,137 @@
     <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">personlig kommunikasjon</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">vitja</term>
+    <term name="advance-online-publication">førehandspublisert på nett</term>
+    <term name="album">album</term>
     <term name="and">og</term>
     <term name="and others">med fleire</term>
     <term name="anonymous">anonym</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">på</term>
+    <term name="audio-recording">lydopptak</term>
     <term name="available at">tilgjengeleg på</term>
     <term name="by">av</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">ca.</term>
     <term name="cited">sitert</term>
-    <term name="edition">
-      <single>utgåve</single>
-      <multiple>utgåver</multiple>
-    </term>
-    <term name="edition" form="short">utg.</term>
     <term name="et-al">mfl.</term>
+    <term name="film">film</term>
     <term name="forthcoming">kommande</term>
     <term name="from">frå</term>
+    <term name="henceforth">heretter</term>
     <term name="ibid">ibid.</term>
     <term name="in">i</term>
     <term name="in press">i trykk</term>
     <term name="internet">Internett</term>
     <term name="letter">brev</term>
-    <term name="no date">ingen dato</term>
-    <term name="no date" form="short">u.å.</term>
-    <term name="online">online</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">utan dato</term>
+    <term name="no-place">manglar stad</term>
+    <term name="no-publisher">manglar utgjevar</term> <!-- sine nomine -->
+    <term name="on">om</term>
+    <term name="online">på nett</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">opphavleg verk utgitt</term>
+    <term name="personal-communication">personlig kommunikasjon</term>
+    <term name="podcast">podkast</term>
+    <term name="podcast-episode">podkast-episode</term>
+    <term name="preprint">innsendt manuskript</term>
     <term name="presented at">presentert på</term>
+    <term name="radio-broadcast">radiosending</term>
+    <term name="radio-series">radioserie</term>
+    <term name="radio-series-episode">radioserie-episode</term>
     <term name="reference">
       <single>referanse</single>
-      <multiple>referansar</multiple>
+      <multiple>referanse</multiple>
     </term>
+    <term name="retrieved">henta</term>
+    <term name="review-of">review of</term>
+    <term name="scale">målestokk</term>
+    <term name="special-issue">spesialutgåve</term>
+    <term name="special-section">spesialbolk</term>
+    <term name="television-broadcast">fjernsynssending</term>
+    <term name="television-series">fjernsynsserie</term>
+    <term name="television-series-episode">fjernsynsserie-episode</term>
+    <term name="video">video</term>
+    <term name="working-paper">notat</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">ca.</term>
+    <term name="no date" form="short">u.å.</term>
+    <term name="no-publisher" form="short">s.n.</term>
     <term name="reference" form="short">
       <single>ref.</single>
-      <multiple>refr.</multiple>
+      <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">henta</term>
-    <term name="scale">målestokk</term>
-    <term name="version">versjon</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">innsendt manuskript</term>
+    <term name="article-journal">tidsskriftartikkel</term>
+    <term name="article-magazine">magasinartikkel</term>
+    <term name="article-newspaper">avisartikkel</term>
+    <term name="bill">proposisjon</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">kringkasting</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">klassikar</term>
+    <term name="collection">samling</term>
+    <term name="dataset">datasett</term>
+    <term name="document">dokument</term>
+    <term name="entry">oppføring</term>
+    <term name="entry-dictionary">ordbokoppføring</term>
+    <term name="entry-encyclopedia">leksikonoppføring</term>
+    <term name="event">hending</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">grafikk</term>
+    <term name="hearing">høyring</term>
     <term name="interview">intervju</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="legal_case">rettssak</term>
+    <term name="legislation">lovgjeving</term>
+    <term name="manuscript">manuskript</term>
+    <term name="map">kart</term>
+    <term name="motion_picture">video-opptak</term>
+    <term name="musical_score">partitur</term>
+    <term name="pamphlet">pamflett</term>
+    <term name="paper-conference">konferanseartikkel</term>
     <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
-    <term name="personal_communication">personlig kommunikasjon</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
+    <term name="performance">framføring</term>
+    <term name="periodical">tidsskrift</term>
+    <term name="personal_communication">personleg kommunikasjon</term>
+    <term name="post">innlegg</term>
+    <term name="post-weblog">blogginnlegg</term>
+    <term name="regulation">forskrift</term>
+    <term name="report">rapport</term>
+    <term name="review">melding</term>
+    <term name="review-book">bokmelding</term>
+    <term name="software">programvare</term>
+    <term name="song">lydopptak</term>
+    <term name="speech">presentasjon</term>
     <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="thesis">avhandling</term>
+    <term name="treaty">traktat</term>
+    <term name="webpage">nettside</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">tidsskrift art.</term>
+    <term name="article-newspaper" form="short">avisart.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">dok.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="manuscript" form="short">ms.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">e.Kr.</term>
     <term name="bc">f.Kr.</term>
@@ -182,69 +185,49 @@
     <term name="long-ordinal-10">tiande</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>akt</single>
+      <multiple>akt</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>appendiks</single>
+      <multiple>appendiks</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>artikkel</single>
+      <multiple>artikkel</multiple>
     </term>
     <term name="book">
       <single>bok</single>
-      <multiple>bøker</multiple>
+      <multiple>bok</multiple>
     </term>
+    <term name="canon">
+      <single>kanon</single>
+      <multiple>kanon</multiple>
+    </term>
     <term name="chapter">
       <single>kapittel</single>
       <multiple>kapittel</multiple>
     </term>
     <term name="column">
       <single>kolonne</single>
-      <multiple>kolonner</multiple>
+      <multiple>kolonne</multiple>
     </term>
+    <term name="elocation">
+      <single>stad</single>
+      <multiple>stad</multiple>
+    </term>
+    <term name="equation">
+      <single>likning</single>
+      <multiple>likning</multiple>
+    </term>
     <term name="figure">
       <single>figur</single>
-      <multiple>figurar</multiple>
+      <multiple>figur</multiple>
     </term>
     <term name="folio">
       <single>folio</single>
-      <multiple>folioar</multiple>
+      <multiple>folio</multiple>
     </term>
     <term name="issue">
       <single>nummer</single>
@@ -252,11 +235,11 @@
     </term>
     <term name="line">
       <single>linje</single>
-      <multiple>linjer</multiple>
+      <multiple>linje</multiple>
     </term>
     <term name="note">
       <single>note</single>
-      <multiple>notar</multiple>
+      <multiple>note</multiple>
     </term>
     <term name="opus">
       <single>opus</single>
@@ -266,26 +249,46 @@
       <single>side</single>
       <multiple>side</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>side</single>
-      <multiple>sider</multiple>
-    </term>
     <term name="paragraph">
       <single>avsnitt</single>
       <multiple>avsnitt</multiple>
     </term>
     <term name="part">
       <single>del</single>
-      <multiple>deler</multiple>
+      <multiple>del</multiple>
     </term>
+    <term name="rule">
+      <single>regel</single>
+      <multiple>regel</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scene</multiple>
+    </term>
     <term name="section">
       <single>paragraf</single>
-      <multiple>paragrafar</multiple>
+      <multiple>paragraf</multiple>
     </term>
     <term name="sub-verbo">
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>tabell</single>
+      <multiple>tabell</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>tittel</single>
+      <multiple>tittel</multiple>
+    </term>
     <term name="verse">
       <single>vers</single>
       <multiple>vers</multiple>
@@ -296,66 +299,38 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
-    </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+      <multiple>art.</multiple>
     </term>
-    <term name="book" form="short">b.</term>
     <term name="chapter" form="short">kap.</term>
     <term name="column" form="short">kol.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">nr.</term>
-    <term name="line" form="short">l.</term>
-    <term name="note" form="short">n.</term>
     <term name="opus" form="short">op.</term>
     <term name="page" form="short">
       <single>s.</single>
       <multiple>s.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>s.</single>
-      <multiple>s.</multiple>
-    </term>
     <term name="paragraph" form="short">avsn.</term>
-    <term name="part" form="short">d.</term>
     <term name="section" form="short">par.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tab.</single>
+      <multiple>tab.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
@@ -365,7 +340,7 @@
       <multiple>bd.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -375,59 +350,105 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>kapittel</single>
+      <multiple>kapitler</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>nummer</single>
+      <multiple>nummer</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>utgåve</single>
+      <multiple>utgåve</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>note</single>
+      <multiple>note</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>side</single>
+      <multiple>sider</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">versjon</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>kap.</single>
+      <multiple>kap.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">nr.</term>
+    <term name="edition" form="short">utg.</term>
+    <term name="number" form="short">
+      <single>nr.</single>
+      <multiple>nr.</multiple>
     </term>
+    <term name="number-of-pages" form="short">
+      <single>s.</single>
+      <multiple>s.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>s.</single>
+      <multiple>s.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>leiar</single>
+      <multiple>leiarar</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="compiler">
+      <single>kompilator</single>
+      <multiple>kompilatorar</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>bidragsytar</single>
+      <multiple>bidragsytarar</multiple>
+    </term>
+    <term name="curator">
+      <single>kurator</single>
+      <multiple>kuratorar</multiple>
+    </term>
     <term name="director">
       <single>regissør</single>
       <multiple>regissørar</multiple>
@@ -436,64 +457,68 @@
       <single>redaktør</single>
       <multiple>redaktørar</multiple>
     </term>
-    <term name="editorial-director">
-      <single>redaktør</single>
-      <multiple>redaktørar</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustratør</single>
-      <multiple>illustratørar</multiple>
-    </term>
-    <term name="translator">
-      <single>omsetjar</single>
-      <multiple>omsetjarar</multiple>
+    <term name="editor-translator">
+      <single>redaktør &amp; omsetjar</single>
+      <multiple>redaktørar &amp; omsetjarar</multiple>
     </term>
     <term name="editortranslator">
       <single>redaktør &amp; omsetjar</single>
       <multiple>redaktørar &amp; omsetjarar</multiple>
     </term>
-
-    <!-- SHORT ROLE FORMS -->
-    <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+    <term name="editorial-director">
+      <single>redaktør</single>
+      <multiple>redaktørar</multiple>
     </term>
-    <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+    <term name="executive-producer">
+      <single>utøvande produsent</single>
+      <multiple>utøvande produsentar</multiple>
     </term>
-    <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
+    <term name="guest">
+      <single>gjest</single>
+      <multiple>gjester</multiple>
     </term>
-    <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+    <term name="host">
+      <single>vert</single>
+      <multiple>vertar</multiple>
     </term>
-    <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
+    <term name="illustrator">
+      <single>illustratør</single>
+      <multiple>illustratørar</multiple>
     </term>
-    <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>forteljar</single>
+      <multiple>forteljarar</multiple>
     </term>
-    <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+    <term name="organizer">
+      <single>organisator</single>
+      <multiple>organisatorar</multiple>
     </term>
-    <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>utøvar</single>
+      <multiple>utøvarar</multiple>
     </term>
-    <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+    <term name="producer">
+      <single>produsent</single>
+      <multiple>produsentar</multiple>
     </term>
-    <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>manusforfattar</single>
+      <multiple>manusforfattarar</multiple>
     </term>
+    <term name="series-creator">
+      <single>serieskapar</single>
+      <multiple>serieskaparar</multiple>
+    </term>
+    <term name="translator">
+      <single>omsetjar</single>
+      <multiple>omsetjarar</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
     <term name="director" form="short">
       <single>regi</single>
       <multiple>regi</multiple>
@@ -502,67 +527,78 @@
       <single>red.</single>
       <multiple>red.</multiple>
     </term>
+    <term name="editor-translator" form="short">
+      <single>red. &amp; oms.</single>
+      <multiple>red. &amp; oms.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>red. &amp; oms.</single>
+      <multiple>red. &amp; oms.</multiple>
+    </term>
     <term name="editorial-director" form="short">
       <single>red.</single>
       <multiple>red.</multiple>
     </term>
+    <term name="executive-producer" form="short">
+      <single>utøv. prod.</single>
+      <multiple>utøv. prod.</multiple>
+    </term>
     <term name="illustrator" form="short">
       <single>ill.</single>
-      <multiple>ills.</multiple>
+      <multiple>ill.</multiple>
     </term>
+    <term name="producer" form="short">
+      <single>prod.</single>
+      <multiple>prod.</multiple>
+    </term>
+    <term name="script-writer" form="short">
+      <single>forf.</single>
+      <multiple>forf.</multiple>
+    </term>
     <term name="translator" form="short">
       <single>oms.</single>
       <multiple>oms.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>red. &amp; oms.</single>
-      <multiple>red. &amp; oms.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">leia av</term>
+    <term name="collection-editor" form="verb">edited by</term>
+    <term name="compiler" form="verb">kompilert av</term>
     <term name="container-author" form="verb">av</term>
+    <term name="contributor" form="verb">med</term>
+    <term name="curator" form="verb">kuratert av</term>
     <term name="director" form="verb">regissert av</term>
     <term name="editor" form="verb">redigert av</term>
+    <term name="editor-translator" form="verb">redigert &amp; omsett av</term>
+    <term name="editortranslator" form="verb">redigert &amp; omsett av</term>
     <term name="editorial-director" form="verb">redigert av</term>
+    <term name="executive-producer" form="verb">utøvande produsert av</term>
+    <term name="guest" form="verb">med gjest</term>
+    <term name="host" form="verb">vertskap av</term>
     <term name="illustrator" form="verb">illustrert av</term>
     <term name="interviewer" form="verb">intervjua av</term>
+    <term name="narrator" form="verb">fortald av</term>
+    <term name="organizer" form="verb">organisert av</term>
+    <term name="performer" form="verb">utført av</term>
+    <term name="producer" form="verb">produsert av</term>
     <term name="recipient" form="verb">til</term>
     <term name="reviewed-author" form="verb">av</term>
+    <term name="script-writer" form="verb">forfatta av</term>
+    <term name="series-creator" form="verb">skapt av</term>
     <term name="translator" form="verb">omsett av</term>
-    <term name="editortranslator" form="verb">redigert &amp; omsett av</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="director" form="verb-short">regi</term>
     <term name="editor" form="verb-short">red.</term>
+    <term name="editor-translator" form="verb-short">red. &amp; oms. av</term>
+    <term name="editortranslator" form="verb-short">red. &amp; oms. av</term>
     <term name="editorial-director" form="verb-short">red.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
+    <term name="host" form="verb-short">vert</term>
+    <term name="illustrator" form="verb-short">ill.</term>
+    <term name="producer" form="verb-short">prod. av</term>
+    <term name="script-writer" form="verb-short">forf. av</term>
     <term name="translator" form="verb-short">oms.</term>
-    <term name="editortranslator" form="verb-short">red. &amp; oms. av</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">januar</term>
diff --git a/locales/pa-PK.xml b/locales/pa-PK.xml
new file mode 100644
--- /dev/null
+++ b/locales/pa-PK.xml
@@ -0,0 +1,529 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="pa-PK">
+  <info>
+    <translator>
+      <name>عثمان</name>
+    </translator>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2025-10-16T03:24:00+00:00</updated>
+  </info>
+  <style-options punctuation-in-quote="true"/>
+  <date form="text">
+    <date-part name="day" suffix="؍ "/>
+    <date-part name="month" suffix=" "/>
+    <date-part name="year" suffix="ء"/>
+  </date>
+  <date form="numeric">
+    <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+    <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+    <date-part name="year"/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">پہنچیا</term>
+    <term name="advance-online-publication">آن لائن اگاؤں دتی اشاعت</term>
+    <term name="album">البم</term>
+    <term name="and">تے</term>
+    <term name="and others">تے ہور</term>
+    <term name="anonymous">گم نام</term>
+    <term name="at">پر</term>
+    <term name="audio-recording">آدیو ریکارڈ</term>
+    <term name="available at">دستیابی دی پتا</term>
+    <term name="by">وسیلیوں</term>
+    <term name="circa">تقریباً</term>
+    <term name="cited">حوالہ دتا</term>
+    <term name="et-al">تے ہور</term>
+    <term name="film">فلم</term>
+    <term name="forthcoming">آوݨ والا</term>
+    <term name="from">از</term>
+    <term name="henceforth">ہݨ توں</term>
+    <term name="ibid">ایضاً</term>
+    <term name="in">در</term>
+    <term name="in press">پریس وچ</term>
+    <term name="internet">انٹرنیٹ</term>
+    <term name="letter">چٹھی</term>
+    <term name="loc-cit">ایضاً</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">بے تاریخ</term>
+    <term name="no-place">بے تھاں</term>
+    <term name="no-publisher">بے چھاپا خانہ</term> <!-- sine nomine -->
+    <term name="on">پر</term>
+    <term name="online">آن لائن</term>
+    <term name="op-cit">ایضاً</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">اصل کم چھاپیا</term>
+    <term name="personal-communication">نجی گل کرن</term>
+    <term name="podcast">پاڈ کاسٹ</term>
+    <term name="podcast-episode">پاڈ کاسٹ ایپیسوڈ</term>
+    <term name="preprint">پریپرنٹ</term>
+    <term name="presented at">کانفرنس</term>
+    <term name="radio-broadcast">ریڈیو براڈ کاسٹ</term>
+    <term name="radio-series">ریڈیو سلسلہ</term>
+    <term name="radio-series-episode">ریڈیو ایپیسوڈ</term>
+    <term name="reference">
+      <single>حوالہ</single>
+      <multiple>حوالے</multiple>
+    </term>
+    <term name="retrieved">حاصل کیتا</term>
+    <term name="review-of">ریویو از</term>
+    <term name="scale">سکیل</term>
+    <term name="special-issue">خاص شمارہ</term>
+    <term name="special-section">خاص جز</term>
+    <term name="television-broadcast">ٹیلی ویژن براڈ کاسٹ</term>
+    <term name="television-series">ٹیلی ویژن سلسلہ</term>
+    <term name="television-series-episode">ٹیلی ویژن ایپیسوڈ</term>
+    <term name="video">ویڈیو</term>
+    <term name="working-paper">ورکنگ پیپر</term>
+
+    <!-- SHORT GENERAL TERMS -->
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="article">پریپرنٹ</term>
+    <term name="article-journal">جرنل دا لیکھ</term>
+    <term name="article-magazine">میگزین دا لیکھ</term>
+    <term name="article-newspaper">اخبار دا لیکھ</term>
+    <term name="bill">بِل</term>
+    <!-- book is in the list of locator terms -->
+    <term name="broadcast">براڈ کاسٹ</term>
+    <!-- chapter is in the list of locator terms -->
+    <term name="classic">کلیسک</term>
+    <term name="collection">مجموعہ</term>
+    <term name="dataset">ڈیٹا سیٹ</term>
+    <term name="document">دستاویز</term>
+    <term name="entry">اندراج</term>
+    <term name="entry-dictionary">لغت وچ اندراج</term>
+    <term name="entry-encyclopedia">انسائیکلو پیڈیا وچ اندراج</term>
+    <term name="event">واقعہ</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic">نگاری</term>
+    <term name="hearing">سماعت</term>
+    <term name="interview">انٹرویو</term>
+    <term name="legal_case">مقدمہ</term>
+    <term name="legislation">قانون نامہ</term>
+    <term name="manuscript">مسودہ</term>
+    <term name="map">نقشہ</term>
+    <term name="motion_picture">ویڈیو ریکارڈ</term>
+    <term name="musical_score">موسیقار سکور</term>
+    <term name="pamphlet">پمفلٹ</term>
+    <term name="paper-conference">کانفرنس پیپر</term>
+    <term name="patent">پیٹنٹ</term>
+    <term name="performance">ناٹک</term>
+    <term name="periodical">رسالہ</term>
+    <term name="personal_communication">نجی گل کرن</term>
+    <term name="post">پوسٹ</term>
+    <term name="post-weblog">بلاگ پوسٹ</term>
+    <term name="regulation">ریگولیشن</term>
+    <term name="report">ریپورٹ</term>
+    <term name="review">ریویو</term>
+    <term name="review-book">کتابی ریویو</term>
+    <term name="software">سافٹویر</term>
+    <term name="song">آڈیو ریکارڈ</term>
+    <term name="speech">سپیچ</term>
+    <term name="standard">سٹینڈرڈ</term>
+    <term name="thesis">تھیسس</term>
+    <term name="treaty">معاہدہ</term>
+    <term name="webpage">ویب صفحہ</term>
+
+    <!-- SHORT ITEM TYPE FORMS -->
+
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">ثبوت دتا از</term>
+    <term name="review" form="verb">ریویو کیتا از</term>
+    <term name="review-book" form="verb">کتاب دا ریویو کیتا</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad">عیسوی</term>
+    <term name="bc">قبل مسیح</term>
+    <term name="bce">قبل عام زمانہ</term>
+    <term name="ce">عام زمانہ</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">”</term>
+    <term name="close-quote">“</term>
+    <term name="open-inner-quote">’</term>
+    <term name="close-inner-quote">‘</term>
+    <term name="page-range-delimiter">–</term>
+    <term name="colon">:</term>
+    <term name="comma">،</term>
+    <term name="semicolon">؛</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal" gender-form="masculine">واں</term>
+    <term name="ordinal-01" gender-form="masculine">لا</term>
+    <term name="ordinal-02" gender-form="masculine">جا</term>
+    <term name="ordinal-03" gender-form="masculine">جا</term>
+    <term name="ordinal-04" gender-form="masculine">تھا</term>
+    <term name="ordinal-11" gender-form="masculine">واں</term>
+    <term name="ordinal-12" gender-form="masculine">واں</term>
+    <term name="ordinal-13" gender-form="masculine">واں</term>
+    <term name="ordinal-14" gender-form="masculine">واں</term>
+    <term name="ordinal" gender-form="feminine">ویں</term>
+    <term name="ordinal-01" gender-form="feminine">لی</term>
+    <term name="ordinal-02" gender-form="feminine">جی</term>
+    <term name="ordinal-03" gender-form="feminine">جی</term>
+    <term name="ordinal-04" gender-form="feminine">تھی</term>
+    <term name="ordinal-11" gender-form="feminine">ویں</term>
+    <term name="ordinal-12" gender-form="feminine">ویں</term>
+    <term name="ordinal-13" gender-form="feminine">ویں</term>
+    <term name="ordinal-14" gender-form="feminine">ویں</term>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01" gender-form="masculine">پہلا</term>
+    <term name="long-ordinal-02" gender-form="masculine">دوجا</term>
+    <term name="long-ordinal-03" gender-form="masculine">تیجا</term>
+    <term name="long-ordinal-04" gender-form="masculine">چوتھا</term>
+    <term name="long-ordinal-05" gender-form="masculine">پنجواں</term>
+    <term name="long-ordinal-06" gender-form="masculine">چھیواں</term>
+    <term name="long-ordinal-07" gender-form="masculine">ستواں</term>
+    <term name="long-ordinal-08" gender-form="masculine">اٹھواں</term>
+    <term name="long-ordinal-09" gender-form="masculine">نوواں</term>
+    <term name="long-ordinal-10" gender-form="masculine">دسواں</term>
+    <term name="long-ordinal-01" gender-form="feminine">پہلی</term>
+    <term name="long-ordinal-02" gender-form="feminine">دوجی</term>
+    <term name="long-ordinal-03" gender-form="feminine">تیجی</term>
+    <term name="long-ordinal-04" gender-form="feminine">چوتھی</term>
+    <term name="long-ordinal-05" gender-form="feminine">پنجویں</term>
+    <term name="long-ordinal-06" gender-form="feminine">چھیویں</term>
+    <term name="long-ordinal-07" gender-form="feminine">ستویں</term>
+    <term name="long-ordinal-08" gender-form="feminine">اٹھویں</term>
+    <term name="long-ordinal-09" gender-form="feminine">نوویں</term>
+    <term name="long-ordinal-10" gender-form="feminine">دسویں</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="act">
+      <single>ایکٹ</single>
+      <multiple>ایکٹ</multiple>
+    </term>
+    <term name="appendix">
+      <single>ضمیمہ</single>
+      <multiple>ضمیمے</multiple>
+    </term>
+    <term name="article-locator">
+      <single>لیکھ</single>
+      <multiple>لیکھ</multiple>
+    </term>
+    <term name="book">
+      <single>کتاب</single>
+      <multiple>کتاباں</multiple>
+    </term>
+    <term name="canon">
+      <single>قانون</single>
+      <multiple>قانون</multiple>
+    </term>
+    <term name="chapter">
+      <single>کانڈ</single>
+      <multiple>کانڈ</multiple>
+    </term>
+    <term name="column">
+      <single>کالم</single>
+      <multiple>کالم</multiple>
+    </term>
+    <term name="elocation">
+      <single>تھاں</single>
+      <multiple>تھاواں</multiple>
+    </term>
+    <term name="equation">
+      <single>مساوات</single>
+      <multiple>مساواتاں</multiple>
+    </term>
+    <term name="figure">
+      <single>تصویر</single>
+      <multiple>تصویراں</multiple>
+    </term>
+    <term name="folio">
+      <single>فولیو</single>
+      <multiple>فولیو</multiple>
+    </term>
+    <term name="issue" gender="masculine">
+      <single>شمارہ</single>
+      <multiple>شمارے</multiple>
+    </term>
+    <term name="line">
+      <single>قطار</single>
+      <multiple>قطاراں</multiple>
+    </term>
+    <term name="note">
+      <single>نوٹ</single>
+      <multiple>نوٹ</multiple>
+    </term>
+    <term name="opus">
+      <single>کارنامہ</single>
+      <multiple>کارنامے</multiple>
+    </term>
+    <term name="page" gender="masculine">
+      <single>صفحہ</single>
+      <multiple>صفحے</multiple>
+    </term>
+    <term name="paragraph">
+      <single>پیرا</single>
+      <multiple>پیرے</multiple>
+    </term>
+    <term name="part" gender="masculine">
+      <single>حصہ</single>
+      <multiple>حصے</multiple>
+    </term>
+    <term name="rule">
+      <single>رول</single>
+      <multiple>رول</multiple>
+    </term>
+    <term name="scene">
+      <single>سین</single>
+      <multiple>سین</multiple>
+    </term>
+    <term name="section" gender="masculine">
+      <single>جز</single>
+      <multiple>جز</multiple>
+    </term>
+    <term name="sub-verbo">
+      <single>زیر کلمہ</single>
+      <multiple>زیر کلمے</multiple>
+    </term>
+    <term name="supplement">
+      <single>لاحق</single>
+      <multiple>لاحق</multiple>
+    </term>
+    <term name="table">
+      <single>ٹیبل</single>
+      <multiple>ٹیبل</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>عنوان</single>
+      <multiple>عنوان</multiple>
+    </term>
+    <term name="verse">
+      <single>شعر</single>
+      <multiple>شعر</multiple>
+    </term>
+    <term name="volume" gender="masculine">
+      <single>جلد</single>
+      <multiple>جلد</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" gender="masculine">
+      <single>کانڈ</single>
+      <multiple>کانڈ</multiple>
+    </term>
+    <term name="citation-number" gender="masculine">
+      <single>حوالہ</single>
+      <multiple>حوالے</multiple>
+    </term>
+    <term name="collection-number" gender="masculine">
+      <single>نمبر</single>
+      <multiple>نمبر</multiple>
+    </term>
+    <term name="edition" gender="feminine">
+      <single>چھپائی</single>
+      <multiple>چھپائیاں</multiple>
+    </term>
+    <term name="first-reference-note-number" gender="masculine">
+      <single>حوالہ</single>
+      <multiple>حوالے</multiple>
+    </term>
+    <term name="number" gender="masculine">
+      <single>نمبر</single>
+      <multiple>نمبر</multiple>
+    </term>
+    <term name="number-of-pages" gender="masculine">
+      <single>صفحہ</single>
+      <multiple>صفحے</multiple>
+    </term>
+    <term name="number-of-volumes" gender="masculine">
+      <single>جلد</single>
+      <multiple>جلد</multiple>
+    </term>
+    <term name="page-first" gender="masculine">
+      <single>صفحہ</single>
+      <multiple>صفحے</multiple>
+    </term>
+    <term name="printing" gender="feminine">
+      <single>چھاپ</single>
+      <multiple>چھاپاں</multiple>
+    </term>
+    <term name="version" gender="masculine">
+      <single>ورژن</single>
+      <multiple>ورژن</multiple>
+    </term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>چیر</single>
+      <multiple>چیر</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>سودھی</single>
+      <multiple>سودھی</multiple>
+    </term>
+    <term name="compiler">
+      <single>مرتب</single>
+      <multiple>مرتب</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>حصہ لاوݨ والا</single>
+      <multiple>حصہ لاوݨ والے</multiple>
+    </term>
+    <term name="curator">
+      <single>کیوریٹر</single>
+      <multiple>کیوریٹر</multiple>
+    </term>
+    <term name="director">
+      <single>ڈائریکٹر</single>
+      <multiple>ڈائریکٹر</multiple>
+    </term>
+    <term name="editor">
+      <single>سودھی</single>
+      <multiple>سودھی</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>سودھی &amp; مترجم</single>
+      <multiple>سودھی &amp; مترجم</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>سودھی &amp; مترجم</single>
+      <multiple>سودھی &amp; مترجم</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>سودھی</single>
+      <multiple>سودھی</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>انتظامیہ</single>
+      <multiple>انتظامیہ</multiple>
+    </term>
+    <term name="guest">
+      <single>مہمان</single>
+      <multiple>مہمان</multiple>
+    </term>
+    <term name="host">
+      <single>میزبان</single>
+      <multiple>میزبان</multiple>
+    </term>
+    <term name="illustrator">
+      <single>مصور</single>
+      <multiple>مصور</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>راوی</single>
+      <multiple>راوی</multiple>
+    </term>
+    <term name="organizer">
+      <single>تنظیم کرن والا</single>
+      <multiple>تنظیم کرن والے</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>کلاکار</single>
+      <multiple>کلاکار</multiple>
+    </term>
+    <term name="producer">
+      <single>پروڈیوسر</single>
+      <multiple>پروڈیوسر</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>لکھاری</single>
+      <multiple>لکھاری</multiple>
+    </term>
+    <term name="series-creator">
+      <single>سلسلہ بݨاوݨ والا</single>
+      <multiple>سلسلہ بݨاوݨ والے</multiple>
+    </term>
+    <term name="translator">
+      <single>مترجم</single>
+      <multiple>مترجم</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+
+    <!-- VERB ROLE FORMS -->
+    <term name="chair" form="verb">چیر نال</term>
+    <term name="collection-editor" form="verb">سودھی نال</term>
+    <term name="compiler" form="verb">مرتب نال</term>
+    <term name="composer" form="verb">رچنا کار نال</term>
+    <term name="container-author" form="verb">بقلم</term>
+    <term name="contributor" form="verb">تے حصہ لاوݨ والے نال</term>
+    <term name="curator" form="verb">کیوریٹر نال</term>
+    <term name="director" form="verb">ڈائریکٹر نال</term>
+    <term name="editor" form="verb">سودھی نال</term>
+    <term name="editor-translator" form="verb">سودھی &amp; مترجم نال</term>
+    <term name="editortranslator" form="verb">سودھی &amp; مترجم نال</term>
+    <term name="editorial-director" form="verb">سودھی نال</term>
+    <term name="executive-producer" form="verb">انتظامیے نال</term>
+    <term name="guest" form="verb">مہمان نال</term>
+    <term name="host" form="verb">میزبان نال</term>
+    <term name="illustrator" form="verb">مصور نال</term>
+    <term name="interviewer" form="verb">انٹرویو نال</term>
+    <term name="narrator" form="verb">راوی نال</term>
+    <term name="organizer" form="verb">تنظیم کرن والے نال</term>
+    <term name="original-author" form="verb">بقلم</term>
+    <term name="performer" form="verb">کلاکار نال</term>
+    <term name="producer" form="verb">پروڈیوسر نال</term>
+    <term name="recipient" form="verb">توں</term>
+    <term name="reviewed-author" form="verb">بقلم</term>
+    <term name="script-writer" form="verb">بقلم</term>
+    <term name="series-creator" form="verb">رچنا کار نال</term>
+    <term name="translator" form="verb">مترجم نال</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01" gender="masculine">جنوری</term>
+    <term name="month-02" gender="masculine">فروری</term>
+    <term name="month-03" gender="masculine">مارچ</term>
+    <term name="month-04" gender="masculine">اپریل</term>
+    <term name="month-05" gender="masculine">مئی</term>
+    <term name="month-06" gender="masculine">جون</term>
+    <term name="month-07" gender="masculine">جولئی</term>
+    <term name="month-08" gender="masculine">اگست</term>
+    <term name="month-09" gender="masculine">ستمبر</term>
+    <term name="month-10" gender="masculine">اکتوبر</term>
+    <term name="month-11" gender="masculine">نومبر</term>
+    <term name="month-12" gender="masculine">دسمبر</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">جنو</term>
+    <term name="month-02" form="short">فرو</term>
+    <term name="month-03" form="short">مار</term>
+    <term name="month-04" form="short">اپر</term>
+    <term name="month-05" form="short">مئی</term>
+    <term name="month-06" form="short">جون</term>
+    <term name="month-07" form="short">جول‍</term>
+    <term name="month-08" form="short">اگس‍</term>
+    <term name="month-09" form="short">ستم‍</term>
+    <term name="month-10" form="short">اکت‍</term>
+    <term name="month-11" form="short">نوم‍</term>
+    <term name="month-12" form="short">دسم‍</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">بہار</term>
+    <term name="season-02">گرمی</term>
+    <term name="season-03">پتجھڑ</term>
+    <term name="season-04">سردی</term>
+  </terms>
+</locale>
diff --git a/locales/pl-PL.xml b/locales/pl-PL.xml
--- a/locales/pl-PL.xml
+++ b/locales/pl-PL.xml
@@ -10,8 +10,14 @@
     <translator>
       <name>Pendzoncymisio</name>
     </translator>
+    <translator>
+      <name>Natalia L</name>
+    </translator>
+    <translator>
+      <name>Kacper Kłosowski</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -25,73 +31,74 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">dostęp</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">osobista komunikacja</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
-    <term name="accessed">dostęp</term>
     <term name="and">i</term>
     <term name="and others">i inni</term>
     <term name="anonymous">anonim</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">na</term>
+    <term name="audio-recording">nagranie dźwiękowe</term>
     <term name="available at">dostępne na</term>
     <term name="by">przez</term>
     <term name="circa">około</term>
-    <term name="circa" form="short">ok</term>
     <term name="cited">cytowane</term>
-    <term name="edition">
-      <single>wydanie</single>
-      <multiple>wydania</multiple>
-    </term>
-    <term name="edition" form="short">wyd.</term>
-    <term name="et-al">i in.</term>
+    <term name="et-al">et al.</term> <!-- Translated 'i in.' is used less commonly -->
+    <term name="film">film</term>
     <term name="forthcoming">w przygotowaniu</term>
     <term name="from">z</term>
+    <term name="henceforth">odtąd</term>
     <term name="ibid">ibid.</term>
     <term name="in">w</term>
     <term name="in press">w druku</term>
     <term name="internet">internet</term>
     <term name="letter">list</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">brak daty</term>
-    <term name="no date" form="short">b.d.</term>
+    <term name="no-place">brak miejsca wydania</term>
+    <term name="no-publisher">brak wydawcy</term> <!-- sine nomine -->
+    <term name="on">na</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">wydanie oryginalne</term>
+    <term name="personal-communication">korespondencja prywatna</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">odcinek podcastu</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">zaprezentowano na</term>
+    <term name="radio-broadcast">audycja radiowa</term>
+    <term name="radio-series">serial radiowy</term>
+    <term name="radio-series-episode">odcinek serialu radiowego</term>
     <term name="reference">
       <single>referencja</single>
       <multiple>referencje</multiple>
     </term>
+    <term name="retrieved">pobrano</term>
+    <term name="review-of">recenzja</term>
+    <term name="scale">skala</term>
+    <term name="special-issue">wydanie specjalne</term>
+    <term name="special-section">sekcja specjalna</term>
+    <term name="television-broadcast">transmisja telewizyjna</term>
+    <term name="television-series">serial telewizyjny</term>
+    <term name="television-series-episode">odcinek serialu telewizyjnego</term>
+    <term name="video">wideo</term>
+    <term name="working-paper">working paper</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">ok.</term>
+    <term name="no date" form="short">b.d.</term>
+    <term name="no-place" form="short">b.m.</term>
+    <term name="no-publisher" form="short">b.w.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">pobrano</term>
-    <term name="scale">skala</term>
-    <term name="version">wersja</term>
+    <term name="review-of" form="short">rec.</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -105,9 +112,9 @@
     <term name="collection">collection</term>
     <term name="dataset">dataset</term>
     <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
+    <term name="entry">hasło</term>
+    <term name="entry-dictionary">hasło w słowniku</term>
+    <term name="entry-encyclopedia">hasło w encyklopedii</term>
     <term name="event">event</term>
     <!-- figure is in the list of locator terms -->
     <term name="graphic">graphic</term>
@@ -156,6 +163,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">n.e.</term>
     <term name="bc">p.n.e.</term>
@@ -188,54 +203,26 @@
     <term name="long-ordinal-10">dziesiąty</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>akt</single>
+      <multiple>akty</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix"> <!--see: https://sjp.pwn.pl/poradnia/haslo/Aneks-a-apendyks;22723.html-->
+      <single>załącznik</single>
+      <multiple>załączniki</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>artykuł</single>
+      <multiple>artykuły</multiple>
     </term>
     <term name="book">
       <single>książka</single>
       <multiple>książki</multiple>
     </term>
+    <term name="canon">
+      <single>kanon</single>
+      <multiple>kanony</multiple>
+    </term>
     <term name="chapter">
       <single>rozdział</single>
       <multiple>rozdziały</multiple>
@@ -244,6 +231,14 @@
       <single>kolumna</single>
       <multiple>kolumny</multiple>
     </term>
+    <term name="elocation">
+      <single>lokalizacja</single>
+      <multiple>lokalizacje</multiple>
+    </term>
+    <term name="equation">
+      <single>równanie</single>
+      <multiple>równania</multiple>
+    </term>
     <term name="figure">
       <single>rycina</single>
       <multiple>ryciny</multiple>
@@ -272,10 +267,6 @@
       <single>strona</single>
       <multiple>strony</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>strona</single>
-      <multiple>strony</multiple>
-    </term>
     <term name="paragraph">
       <single>akapit</single>
       <multiple>akapity</multiple>
@@ -284,6 +275,14 @@
       <single>część</single>
       <multiple>części</multiple>
     </term>
+    <term name="rule">
+      <single>zasada</single>
+      <multiple>zasady</multiple>
+    </term>
+    <term name="scene">
+      <single>scena</single>
+      <multiple>sceny</multiple>
+    </term>
     <term name="section">
       <single>sekcja</single>
       <multiple>sekcje</multiple>
@@ -292,6 +291,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>suplement</single>
+      <multiple>suplementy</multiple>
+    </term>
+    <term name="table">
+      <single>tabela</single>
+      <multiple>tabele</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>tytuł</single>
+      <multiple>tytuły</multiple>
+    </term>
     <term name="verse">
       <single>wers</single>
       <multiple>wersy</multiple>
@@ -302,45 +317,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
+    <term name="appendix" form="short"> <!--see: https://sjp.pwn.pl/poradnia/haslo/Aneks-a-apendyks;22723.html-->
+      <single>zał.</single>
+      <multiple>zał.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+      <multiple>art.</multiple>
     </term>
     <term name="book" form="short">książka</term>
     <term name="chapter" form="short">rozdz.</term>
     <term name="column" form="short">kol.</term>
+    <term name="elocation" form="short">
+      <single>lok.</single>
+      <multiple>lok.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>równ.</single>
+      <multiple>równ.</multiple>
+    </term>
     <term name="figure" form="short">ryc.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">nr</term>
@@ -351,17 +346,37 @@
       <single>s.</single>
       <multiple>s.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>s.</single>
-      <multiple>ss.</multiple>
-    </term>
     <term name="paragraph" form="short">akap.</term>
     <term name="part" form="short">cz.</term>
+    <term name="rule" form="short">
+      <single>zas.</single>
+      <multiple>zas.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>sc.</multiple>
+    </term>
     <term name="section" form="short">sekc.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>sup.</single>
+      <multiple>sup.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tab.</single>
+      <multiple>tab.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tyt.</single>
+      <multiple>tyt.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>w.</single>
       <multiple>w.</multiple>
@@ -371,7 +386,7 @@
       <multiple>t.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -381,15 +396,101 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>rozdział</single>
+      <multiple>rozdziały</multiple>
+    </term>
+    <term name="citation-number">
+      <single>cytowanie</single>
+      <multiple>cytowania</multiple>
+    </term>
+    <term name="collection-number">
+      <single>numer</single>
+      <multiple>numery</multiple>
+    </term>
+    <term name="edition">
+      <single>wydanie</single>
+      <multiple>wydania</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>notatka</single>
+      <multiple>notatki</multiple>
+    </term>
+    <term name="number">
+      <single>numer</single>
+      <multiple>numery</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>strona</single>
+      <multiple>strony</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>tom</single>
+      <multiple>tomy</multiple>
+    </term>
+    <term name="page-first">
+      <single>strona</single>
+      <multiple>strony</multiple>
+    </term>
+    <term name="printing">
+      <single>druk</single>
+      <multiple>druki</multiple>
+    </term>
+    <term name="version">wersja</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>rozdz.</single>
+      <multiple>rozdz.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cyt.</single>
+      <multiple>cyt.</multiple>
+    </term>
+    <term name="collection-number" form="short">
+      <single>nr</single>
+      <multiple>nr.</multiple>
+    </term>
+    <term name="edition" form="short">wyd.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>nr</single>
+      <multiple>nr.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>s.</single>
+      <multiple>s.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>t.</single>
+      <multiple>t.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>s.</single>
+      <multiple>s.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>druk</single>
+      <multiple>druk.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -398,6 +499,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>reżyser</single>
+      <multiple>reżyserzy</multiple>
+    </term>
+    <term name="editor">
+      <single>redaktor</single>
+      <multiple>redaktorzy</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>redaktor &amp; tłumacz</single>
+      <multiple>redaktorzy &amp; tłumacze</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>redaktor &amp; tłumacz</single>
+      <multiple>redaktorzy &amp; tłumacze</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>edytor</single>
+      <multiple>edytorzy</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -410,6 +531,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>ilustrator</single>
+      <multiple>ilustratorzy</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -418,6 +544,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -426,6 +553,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -434,30 +563,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>reżyser</single>
-      <multiple>reżyserzy</multiple>
-    </term>
-    <term name="editor">
-      <single>redaktor</single>
-      <multiple>redaktorzy</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>edytor</single>
-      <multiple>edytorzy</multiple>
-    </term>
-    <term name="illustrator">
-      <single>ilustrator</single>
-      <multiple>ilustratorzy</multiple>
-    </term>
     <term name="translator">
       <single>tłumacz</single>
       <multiple>tłumacze</multiple>
     </term>
-    <term name="editortranslator">
-      <single>redaktor &amp; tłumacz</single>
-      <multiple>redaktorzy &amp; tłumacze</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -472,10 +581,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>reż.</single>
+      <multiple>reż.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>red.</single>
+      <multiple>red.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>red.tłum.</single>
+      <multiple>red.tłum.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>red.tłum.</single>
+      <multiple>red.tłum.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>red.</single>
+      <multiple>red.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>il.</single>
+      <multiple>il.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -500,103 +633,87 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>reż.</single>
-      <multiple>reż.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>red.</single>
-      <multiple>red.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>red.</single>
-      <multiple>red.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>il.</single>
-      <multiple>il.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>tłum.</single>
       <multiple>tłum.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>red.tłum.</single>
-      <multiple>red.tłum.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">przez</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">reżyserowane przez</term>
+    <term name="editor" form="verb">zredagowane przez</term>
+    <term name="editor-translator" form="verb">zredagowane i przetłumaczone przez</term>
+    <term name="editortranslator" form="verb">zredagowane i przetłumaczone przez</term>
+    <term name="editorial-director" form="verb">zredagowane przez</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">ilustrowane przez</term>
+    <term name="interviewer" form="verb">przeprowadzony przez</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">przez</term>
-    <term name="director" form="verb">reżyserowane przez</term>
-    <term name="editor" form="verb">zredagowane przez</term>
-    <term name="editorial-director" form="verb">zredagowane przez</term>
-    <term name="illustrator" form="verb">ilustrowane przez</term>
-    <term name="interviewer" form="verb">przeprowadzony przez</term>
     <term name="recipient" form="verb">dla</term>
     <term name="reviewed-author" form="verb">przez</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">przetłumaczone przez</term>
-    <term name="editortranslator" form="verb">zredagowane i przetłumaczone przez</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">reż.</term>
+    <term name="editor" form="verb-short">red.</term>
+    <term name="editor-translator" form="verb-short">red.tłum.</term>
+    <term name="editortranslator" form="verb-short">red.tłum.</term>
+    <term name="editorial-director" form="verb-short">red.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">il.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">reż.</term>
-    <term name="editor" form="verb-short">red.</term>
-    <term name="editorial-director" form="verb-short">red.</term>
-    <term name="illustrator" form="verb-short">il.</term>
     <term name="translator" form="verb-short">tłum.</term>
-    <term name="editortranslator" form="verb-short">red.tłum.</term>
 
     <!-- LONG MONTH FORMS -->
-    <term name="month-01">styczeń</term>
-    <term name="month-02">luty</term>
-    <term name="month-03">marzec</term>
-    <term name="month-04">kwiecień</term>
-    <term name="month-05">maj</term>
-    <term name="month-06">czerwiec</term>
-    <term name="month-07">lipiec</term>
-    <term name="month-08">sierpień</term>
-    <term name="month-09">wrzesień</term>
-    <term name="month-10">październik</term>
-    <term name="month-11">listopad</term>
-    <term name="month-12">grudzień</term>
+    <term name="month-01">stycznia</term>
+    <term name="month-02">lutego</term>
+    <term name="month-03">marca</term>
+    <term name="month-04">kwietnia</term>
+    <term name="month-05">maja</term>
+    <term name="month-06">czerwca</term>
+    <term name="month-07">lipca</term>
+    <term name="month-08">sierpnia</term>
+    <term name="month-09">września</term>
+    <term name="month-10">października</term>
+    <term name="month-11">listopada</term>
+    <term name="month-12">grudnia</term>
 
     <!-- SHORT MONTH FORMS -->
     <term name="month-01" form="short">sty.</term>
-    <term name="month-02" form="short">luty</term>
+    <term name="month-02" form="short">lut.</term>
     <term name="month-03" form="short">mar.</term>
     <term name="month-04" form="short">kwi.</term>
-    <term name="month-05" form="short">maj</term>
+    <term name="month-05" form="short">maja</term>
     <term name="month-06" form="short">cze.</term>
     <term name="month-07" form="short">lip.</term>
     <term name="month-08" form="short">sie.</term>
     <term name="month-09" form="short">wrz.</term>
     <term name="month-10" form="short">paź.</term>
     <term name="month-11" form="short">lis.</term>
-    <term name="month-12" form="short">grudz.</term>
+    <term name="month-12" form="short">grud.</term>
 
     <!-- SEASONS -->
     <term name="season-01">wiosna</term>
diff --git a/locales/pt-BR.xml b/locales/pt-BR.xml
--- a/locales/pt-BR.xml
+++ b/locales/pt-BR.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="pt-BR">
+  <!-- The terms and abbreviations in this file follow the recommendations of The Brazilian National Standards Association (ABNT), particularly the ones presented at standard ABNT NBR 6023:2025. -->
+  <!-- Additional abbreviations are from:
+        1. Reduções, Academia Brasileira de Letras (2025), https://www.academia.org.br/nossa-lingua/reducoes.
+  -->
   <info>
     <translator>
       <name>José Antonio Meira da Rocha</name>
@@ -7,8 +11,18 @@
     <translator>
       <name>Meira da Rocha</name>
     </translator>
+    <translator>
+      <name>Renato Cirino</name>
+    </translator>
+    <translator>
+      <name>André Luiz Appel</name>
+      <uri>https://orcid.org/0000-0002-9608-803X</uri>
+    </translator>
+    <translator>
+      <name>Isabelly Silva</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2016-05-16T00:00:00+03:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false" limit-day-ordinals-to-day-1="true"/>
   <date form="text">
@@ -22,139 +36,147 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">comunicação pessoal</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
-    <term name="accessed">acessado</term>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">acesso em</term>
+    <term name="advance-online-publication">publicação prévia em linha</term>
+    <term name="album">álbum</term>
     <term name="and">e</term>
     <term name="and others">e outros</term>
     <term name="anonymous">anônimo</term>
-    <term name="anonymous" form="short">anon</term>
     <term name="at">em</term>
+    <term name="audio-recording">gravação de áudio</term>
     <term name="available at">disponível em</term>
     <term name="by">por</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">c.</term>
     <term name="cited">citado</term>
-    <term name="edition">
-      <single>edição</single>
-      <multiple>edições</multiple>
-    </term>
-    <term name="edition" form="short">ed</term>
     <term name="et-al">et al.</term>
+    <term name="film">filme</term>
     <term name="forthcoming">a ser publicado</term>
     <term name="from">de</term>
+    <term name="henceforth">daqui em diante</term>
     <term name="ibid">ibidem</term>
     <term name="in">em</term>
     <term name="in press">no prelo</term>
     <term name="internet">internet</term>
     <term name="letter">carta</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">sem data</term>
-    <term name="no date" form="short">[s.d.]</term>
+    <term name="no-place">sem local</term> <!-- sine loco -->
+    <term name="no-publisher">sem editor</term> <!-- sine nomine -->
+    <term name="on">em</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">trabalho original publicado</term>
+    <term name="personal-communication">comunicação pessoal</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">episódio de podcast</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">apresentado em</term>
+    <term name="radio-broadcast">transmissão de rádio</term>
+    <term name="radio-series">série radiofônica</term>
+    <term name="radio-series-episode">episódio de série radiofônica</term>
     <term name="reference">
       <single>referência</single>
       <multiple>referências</multiple>
     </term>
+    <term name="retrieved">recuperado</term>
+    <term name="review-of">revisão de</term>
+    <term name="scale">escala</term>
+    <term name="special-issue">edição especial</term>
+    <term name="special-section">sessão especial</term>
+    <term name="television-broadcast">transmissão de tv</term>
+    <term name="television-series">série de tv</term>
+    <term name="television-series-episode">episódio de série de televisão</term>
+    <term name="video">vídeo</term>
+    <term name="working-paper">artigo inacabado</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anôn.</term>
+    <term name="circa" form="short">c.</term>
+    <term name="no date" form="short">s.d.</term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher" form="short">s.e.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">recuperado</term>
-    <term name="scale">escala</term>
-    <term name="version">versão</term>
+    <term name="review-of" form="short">rev. de</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">pré-impressão</term>
+    <term name="article-journal">artigo de periódico</term>
+    <term name="article-magazine">artigo de revista</term>
+    <term name="article-newspaper">artigo de jornal</term>
+    <term name="bill">lei</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">transmissão</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
-    <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="classic">clássico</term>
+    <term name="collection">coleção</term>
+    <term name="dataset">conjunto de dados</term>
+    <term name="document">documento</term>
+    <term name="entry">verbete</term>
+    <term name="entry-dictionary">verbete de dicionário</term>
+    <term name="entry-encyclopedia">verbete de enciclopédia</term>
+    <term name="event">evento</term>
+    <term name="graphic">iconográfico</term>
+    <term name="hearing">audiência</term>
     <term name="interview">entrevista</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
+    <term name="legal_case">jurisprudência</term>
+    <term name="legislation">legislação</term>
+    <term name="manuscript">manuscrito</term>
+    <term name="map">mapa</term>
+    <term name="motion_picture">gravação de vídeo</term>
+    <term name="musical_score">partitura musical</term>
+    <term name="pamphlet">panleto</term>
+    <term name="paper-conference">trabalho em evento</term>
+    <term name="patent">patente</term>
     <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="periodical">periódico</term>
     <term name="personal_communication">comunicação pessoal</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">publicação</term>
+    <term name="post-weblog">publicação de blog</term>
+    <term name="regulation">regulamento</term>
+    <term name="report">relatório</term>
+    <term name="review">resenha</term>
+    <term name="review-book">resenha de livro</term>
+    <term name="software">programa de computador</term>
+    <term name="song">gravação de áudio</term>
+    <term name="speech">apresentação</term>
+    <term name="standard">norma</term>
+    <term name="thesis">tese</term>
+    <term name="treaty">tratado</term>
+    <term name="webpage">página da web</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">art. periódico</term>
+    <term name="article-magazine" form="short">art. rev.</term>
+    <term name="article-newspaper" form="short">art. j.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
+    <term name="graphic" form="short">iconog.</term>
+    <term name="interview" form="short">entrev.</term>
+    <term name="manuscript" form="short">ms.</term>
+    <term name="motion_picture" form="short">grav. vídeo</term>
+    <term name="report" form="short">rel.</term>
     <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="review-book" form="short">resenha liv.</term>
+    <term name="song" form="short">gravação áudio</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">audiência de</term>
+    <term name="review" form="verb">revisão de</term>
+    <term name="review-book" form="verb">revisão do livro</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">DC</term>
+    <term name="ad">depois de Cristo</term>
     <term name="bc">AC</term>
     <term name="bce">BCE</term>
     <term name="ce">CE</term>
@@ -164,7 +186,7 @@
     <term name="close-quote">”</term>
     <term name="open-inner-quote">‘</term>
     <term name="close-inner-quote">’</term>
-    <term name="page-range-delimiter">&#8211;</term>
+    <term name="page-range-delimiter">–</term>
     <term name="colon">:</term>
     <term name="comma">,</term>
     <term name="semicolon">;</term>
@@ -175,16 +197,6 @@
     <term name="ordinal-01" gender-form="masculine" match="whole-number">º</term>
 
     <!-- LONG ORDINALS -->
-    <term name="long-ordinal-01" gender-form="masculine">primeiro</term>
-    <term name="long-ordinal-02" gender-form="masculine">segundo</term>
-    <term name="long-ordinal-03" gender-form="masculine">terceiro</term>
-    <term name="long-ordinal-04" gender-form="masculine">quarto</term>
-    <term name="long-ordinal-05" gender-form="masculine">quinto</term>
-    <term name="long-ordinal-06" gender-form="masculine">sexto</term>
-    <term name="long-ordinal-07" gender-form="masculine">sétimo</term>
-    <term name="long-ordinal-08" gender-form="masculine">oitavo</term>
-    <term name="long-ordinal-09" gender-form="masculine">nono</term>
-    <term name="long-ordinal-10" gender-form="masculine">décimo</term>
     <term name="long-ordinal-01" gender-form="feminine">primeira</term>
     <term name="long-ordinal-02" gender-form="feminine">segunda</term>
     <term name="long-ordinal-03" gender-form="feminine">terceira</term>
@@ -195,56 +207,38 @@
     <term name="long-ordinal-08" gender-form="feminine">oitava</term>
     <term name="long-ordinal-09" gender-form="feminine">nona</term>
     <term name="long-ordinal-10" gender-form="feminine">décima</term>
+    <term name="long-ordinal-01" gender-form="masculine">primeiro</term>
+    <term name="long-ordinal-02" gender-form="masculine">segundo</term>
+    <term name="long-ordinal-03" gender-form="masculine">terceiro</term>
+    <term name="long-ordinal-04" gender-form="masculine">quarto</term>
+    <term name="long-ordinal-05" gender-form="masculine">quinto</term>
+    <term name="long-ordinal-06" gender-form="masculine">sexto</term>
+    <term name="long-ordinal-07" gender-form="masculine">sétimo</term>
+    <term name="long-ordinal-08" gender-form="masculine">oitavo</term>
+    <term name="long-ordinal-09" gender-form="masculine">nono</term>
+    <term name="long-ordinal-10" gender-form="masculine">décimo</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>ato</single>
+      <multiple>atos</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>apêndice</single>
+      <multiple>apêndices</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>artigo</single>
+      <multiple>artigos</multiple>
     </term>
     <term name="book">
       <single>livro</single>
       <multiple>livros</multiple>
     </term>
+    <term name="canon">
+      <single>cânone</single>
+      <multiple>cânones</multiple>
+    </term>
     <term name="chapter">
       <single>capítulo</single>
       <multiple>capítulos</multiple>
@@ -253,13 +247,18 @@
       <single>coluna</single>
       <multiple>colunas</multiple>
     </term>
-    <term name="figure">
-      <single>figura</single>
-      <multiple>figuras</multiple>
+    <term name="elocation">
+      <single>localizador</single>
+      <multiple>localizadores</multiple>
     </term>
+    <term name="equation">
+      <single>equação</single>
+      <multiple>equações</multiple>
+    </term>
+    <term name="figure">figura</term>
     <term name="folio">
-      <single>folio</single>
-      <multiple>folios</multiple>
+      <single>fólio</single>
+      <multiple>fólios</multiple>
     </term>
     <term name="issue">
       <single>número</single>
@@ -281,10 +280,6 @@
       <single>página</single>
       <multiple>páginas</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>página</single>
-      <multiple>páginas</multiple>
-    </term>
     <term name="paragraph">
       <single>parágrafo</single>
       <multiple>parágrafos</multiple>
@@ -293,6 +288,14 @@
       <single>parte</single>
       <multiple>partes</multiple>
     </term>
+    <term name="rule">
+      <single>norma</single>
+      <multiple>normas</multiple>
+    </term>
+    <term name="scene">
+      <single>cena</single>
+      <multiple>cenas</multiple>
+    </term>
     <term name="section">
       <single>seção</single>
       <multiple>seções</multiple>
@@ -301,6 +304,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>tabela</single>
+      <multiple>tabelas</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>título</single>
+      <multiple>títulos</multiple>
+    </term>
     <term name="verse">
       <single>verso</single>
       <multiple>versos</multiple>
@@ -311,48 +330,28 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
+    <term name="book" form="short">liv.</term>
+    <term name="chapter" form="short">cap.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
+      <single>local.</single>
+      <multiple>locals.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">liv.</term>
-    <term name="chapter" form="short">cap.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">f.</term>
-    <term name="issue" form="short">nº</term>
+    <term name="issue" form="short">n.</term>
     <term name="line" form="short">l.</term>
     <term name="note" form="short">n.</term>
     <term name="opus" form="short">op.</term>
@@ -360,27 +359,50 @@
       <single>p.</single>
       <multiple>p.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>p.</multiple>
+    <term name="paragraph" form="short">par.</term>
+    <term name="part" form="short">
+      <single>pt.</single>
+      <multiple>pt.</multiple>
     </term>
-    <term name="paragraph" form="short">parag.</term>
-    <term name="part" form="short">pt.</term>
+    <term name="rule" form="short">
+      <single>norma</single>
+      <multiple>normas</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>c.</single>
+      <multiple>cns.</multiple>
+    </term>
     <term name="section" form="short">seç.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supl.</single>
+      <multiple>supl.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
-      <multiple>vv.</multiple>
+      <multiple>p.</multiple>
     </term>
     <term name="volume" form="short">
-      <single>vol.</single>
-      <multiple>vols.</multiple>
+      <single>v.</single>
+      <multiple>v.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -390,59 +412,106 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>número</single>
+      <multiple>números</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>edição</single>
+      <multiple>edições</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>nota</single>
+      <multiple>notas</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>página</single>
+      <multiple>páginas</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>página inicial</single>
+      <multiple>páginas iniciais</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>impressão</single>
+      <multiple>impressões</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">versão</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>cap.</single>
+      <multiple>cap.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cit.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">nº</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>n.</single>
+      <multiple>n.</multiple>
     </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>p.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>p.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>impr.</single>
+      <multiple>imprs.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>presidente</single>
+      <multiple>presidentes</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
+    <term name="compiler">
+      <single>compilador</single>
+      <multiple>compiladores</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>contribuidor</single>
+      <multiple>contribuidores</multiple>
+    </term>
+    <term name="curator">
+      <single>curador</single>
+      <multiple>curadores</multiple>
+    </term>
     <term name="director">
       <single>diretor</single>
       <multiple>diretores</multiple>
@@ -451,24 +520,76 @@
       <single>organizador</single>
       <multiple>organizadores</multiple>
     </term>
+    <term name="editor-translator">
+      <single>editor e tradutor</single>
+      <multiple>editores e tradutores</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor e tradutor</single>
+      <multiple>editores e tradutores</multiple>
+    </term>
     <term name="editorial-director">
       <single>editor</single>
       <multiple>editores</multiple>
     </term>
+    <term name="executive-producer">
+      <single>produtor executivo</single>
+      <multiple>produtores executivos</multiple>
+    </term>
+    <term name="guest">
+      <single>convidado</single>
+      <multiple>convidados</multiple>
+    </term>
+    <term name="host">
+      <single>anfitrião</single>
+      <multiple>anfitriões</multiple>
+    </term>
     <term name="illustrator">
       <single>ilustrador</single>
       <multiple>ilustradores</multiple>
     </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>narrador</single>
+      <multiple>narradores</multiple>
+    </term>
+    <term name="organizer">
+      <single>organizador</single>
+      <multiple>organizadores</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>intérprete</single>
+      <multiple>intérpretes</multiple>
+    </term>
+    <term name="producer">
+      <single>produtor</single>
+      <multiple>produtores</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>roteirista</single>
+      <multiple>roteiristas</multiple>
+    </term>
+    <term name="series-creator">
+      <single>criador da série</single>
+      <multiple>criadores da série</multiple>
+    </term>
     <term name="translator">
       <single>tradutor</single>
       <multiple>tradutores</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor e tradutor</single>
-      <multiple>editores e tradutores</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
+    <term name="chair" form="short">
+      <single>pres.</single>
+      <multiple>pres.</multiple>
+    </term>
+    <term name="collection-editor" form="short">
+      <single>ed.</single> <!-- no variation for ABNT -->
+      <multiple>ed.</multiple> <!-- no variation for ABNT -->
+    </term>
     <term name="compiler" form="short">
       <single>comp.</single>
       <multiple>comps.</multiple>
@@ -481,103 +602,109 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>org.</single> <!-- no variation for ABNT -->
+      <multiple>org.</multiple> <!-- no variation for ABNT -->
+    </term>
+    <term name="editor-translator" form="short">
+        <single>ed. e trad.</single>
+        <multiple>eds. e trads.</multiple>
+      </term>
+    <term name="editortranslator" form="short">
+        <single>ed. e trad.</single>
+        <multiple>eds. e trads.</multiple>
+      </term>
+    <term name="editorial-director" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
     <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <single>prod. exec.</single>
+      <multiple>prods. execs.</multiple>
     </term>
+    <term name="illustrator" form="short">
+        <single>il.</single>
+        <multiple>ils.</multiple>
+      </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
     </term>
     <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
+      <single>org.</single> <!-- no variation for ABNT -->
+      <multiple>org.</multiple> <!-- no variation for ABNT -->
     </term>
     <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+      <single>intérp.</single>
+      <multiple>intérps.</multiple>
     </term>
     <term name="producer" form="short">
       <single>prod.</single>
       <multiple>prods.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>roteir.</single>
+      <multiple>roteirs.</multiple>
     </term>
     <term name="series-creator" form="short">
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>il.</single>
-      <multiple>ils.</multiple>
-    </term>
     <term name="translator" form="short">
-      <single>trad.</single>
-      <multiple>trads.</multiple>
-    </term>
-    <term name="editortranslator" form="short">
-      <single>ed. e trad.</single>
-      <multiple>eds. e trads.</multiple>
-    </term>
+        <single>trad.</single>
+        <multiple>trads.</multiple>
+      </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">presidido por</term>
+    <term name="compiler" form="verb">compilado por</term>
     <term name="container-author" form="verb">por</term>
-    <term name="director" form="verb">dirigido por</term>
+    <term name="contributor" form="verb">contribuição de</term>
+    <term name="curator" form="verb">curadoria de</term>
     <term name="editor" form="verb">organizado por</term>
+    <term name="editor-translator" form="verb">editado e traduzido por</term>
+    <term name="editortranslator" form="verb">editado e traduzido por</term>
     <term name="editorial-director" form="verb">editado por</term>
+    <term name="executive-producer" form="verb">produção executiva de</term>
+    <term name="guest" form="verb">com participação de</term>
+    <term name="host" form="verb">apresentado por</term>
     <term name="illustrator" form="verb">ilustrado por</term>
-    <term name="interviewer" form="verb">entrevista de</term>
-    <term name="recipient" form="verb">para</term>
+    <term name="interviewer" form="verb">entrevista cedida a</term>
+    <term name="narrator" form="verb">narração de</term>
+    <term name="organizer" form="verb">organizado por</term>
+    <term name="performer" form="verb">interpretado por</term>
+    <term name="producer" form="verb">produzido por</term>
+    <term name="recipient" form="verb">destinado a</term>
     <term name="reviewed-author" form="verb">por</term>
+    <term name="script-writer" form="verb">escrito por</term>
+    <term name="series-creator" form="verb">criado por</term>
     <term name="translator" form="verb">traduzido por</term>
-    <term name="editortranslator" form="verb">editado e traduzido por</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">org.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">ilus.</term>
-    <term name="translator" form="verb-short">trad.</term>
+    <term name="collection-editor" form="verb-short">editorado por</term>
+    <term name="compiler" form="verb-short">comp. por</term>
+    <term name="contributor" form="verb-short">com contrib. de</term>
+    <term name="curator" form="verb-short">cur. de</term>
+    <term name="director" form="verb-short">dir. por</term>
+    <term name="editor" form="verb-short">org. por</term>
+    <term name="editor-translator" form="verb-short">ed. e trad. por</term>
     <term name="editortranslator" form="verb-short">ed. e trad. por</term>
+    <term name="editorial-director" form="verb-short">ed. por</term>
+    <term name="executive-producer" form="verb-short">prod. exec. de</term>
+    <term name="guest" form="verb-short">com part. de</term>
+    <term name="host" form="verb-short">apres. por</term>
+    <term name="illustrator" form="verb-short">ilus. por</term>
+    <term name="narrator" form="verb-short">narr. por</term>
+    <term name="organizer" form="verb-short">org. por</term>
+    <term name="performer" form="verb-short">interp. por</term>
+    <term name="producer" form="verb-short">prod. por</term>
+    <term name="script-writer" form="verb-short">escr. por</term>
+    <term name="series-creator" form="verb-short">criado por</term>
+    <term name="translator" form="verb-short">trad. por</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">janeiro</term>
diff --git a/locales/pt-PT.xml b/locales/pt-PT.xml
--- a/locales/pt-PT.xml
+++ b/locales/pt-PT.xml
@@ -2,10 +2,14 @@
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="pt-PT">
   <info>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2013-09-20T23:31:02+00:00</updated>
+    <updated>2025-10-16T03:24:00+00:00</updated>
     <translator>
       <name>Jonadabe PT</name>
     </translator>
+    <translator>
+      <name>André Luiz Appel</name>
+      <uri>https://orcid.org/0000-0002-9608-803X</uri>
+    </translator>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,87 +23,88 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">gravação áudio</term>
-    <term name="film">filme</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">sem local</term>
-    <term name="no-place" form="short">s.l.</term>
-    <term name="no-publisher">sem editor</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">s.e.</term>
-    <term name="on">em</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">trabalho original publicado</term>
-    <term name="personal-communication">comunicação pessoal</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">episódio podcast</term>
-    <term name="preprint">pré-impressão</term>
-    <term name="radio-broadcast">transmissão de rádio</term>
-    <term name="radio-series">série de rádio</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">transmissão televisiva</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">vídeo</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">acedido</term>
+    <term name="advance-online-publication">publicação prévia em linha</term>
+    <term name="album">álbum</term>
     <term name="and">e</term>
     <term name="and others">e outros</term>
     <term name="anonymous">anónimo</term>
-    <term name="anonymous" form="short">anón.</term>
     <term name="at">em</term>
+    <term name="audio-recording">gravação de áudio</term>
     <term name="available at">disponível em</term>
     <term name="by">por</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">c.</term>
     <term name="cited">citado</term>
-    <term name="edition">
-      <single>edição</single>
-      <multiple>edições</multiple>
-    </term>
-    <term name="edition" form="short">ed.</term>
     <term name="et-al">et al.</term>
+    <term name="film">filme</term>
     <term name="forthcoming">a publicar</term>
     <term name="from">de</term>
+    <term name="henceforth">daqui em diante</term>
     <term name="ibid">ibid.</term>
     <term name="in">em</term>
     <term name="in press">no prelo</term>
     <term name="internet">internet</term>
     <term name="letter">carta</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">sem data</term>
-    <term name="no date" form="short">sem data</term>
+    <term name="no-place">sem local</term>
+    <term name="no-publisher">sem editor</term> <!-- sine nomine -->
+    <term name="on">em</term>
     <term name="online">em linha</term>
-    <term name="presented at">apresentado na</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">trabalho original publicado</term>
+    <term name="personal-communication">comunicação pessoal</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">episódio de podcast</term>
+    <term name="preprint">preprint</term>
+    <term name="presented at">apresentado em</term>
+    <term name="radio-broadcast">transmissão de rádio</term>
+    <term name="radio-series">série de rádio</term>
+    <term name="radio-series-episode">episódio de série de rádio</term>
     <term name="reference">
       <single>referência</single>
       <multiple>referências</multiple>
     </term>
+    <term name="retrieved">obtido</term>
+    <term name="review-of">revisão de</term>
+    <term name="scale">escala</term>
+    <term name="special-issue">edição especial</term>
+    <term name="special-section">secção especial</term>
+    <term name="television-broadcast">transmissão televisiva</term>
+    <term name="television-series">série televisiva</term>
+    <term name="television-series-episode">episódio de série televisiva</term>
+    <term name="video">vídeo</term>
+    <term name="working-paper">trabalho em progresso</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anón.</term>
+    <term name="circa" form="short">c.</term>
+    <term name="no date" form="short">s.d.</term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher" form="short">s.e.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
-    <term name="retrieved">obtido</term>
-    <term name="scale">escala</term>
-    <term name="version">versão</term>
+    <term name="review-of" form="short">rev. de</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">pré-impressão</term>
-    <term name="article-journal">article journal</term>
+    <term name="article">preprint</term>
+    <term name="article-journal">artigo de revista</term>
     <term name="article-magazine">artigo de revista</term>
     <term name="article-newspaper">artigo de jornal</term>
-    <term name="bill">bill</term>
+    <term name="bill">fatura</term>
     <!-- book is in the list of locator terms -->
     <term name="broadcast">transmissão</term>
     <!-- chapter is in the list of locator terms -->
     <term name="classic">clássico</term>
     <term name="collection">coleção</term>
-    <term name="dataset">dataset</term>
+    <term name="dataset">conjunto de dados</term>
     <term name="document">documento</term>
-    <term name="entry">entry</term>
+    <term name="entry">entrada</term>
     <term name="entry-dictionary">entrada de dicionário</term>
     <term name="entry-encyclopedia">entrada de enciclopédia</term>
     <term name="event">evento</term>
@@ -107,36 +112,36 @@
     <term name="graphic">gráfico</term>
     <term name="hearing">audiência</term>
     <term name="interview">entrevista</term>
-    <term name="legal_case">legal case</term>
+    <term name="legal_case">jurisprudência</term>
     <term name="legislation">legislação</term>
     <term name="manuscript">manuscrito</term>
     <term name="map">mapa</term>
     <term name="motion_picture">gravação de vídeo</term>
-    <term name="musical_score">musical score</term>
+    <term name="musical_score">partitura</term>
     <term name="pamphlet">panfleto</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="paper-conference">artigo de conferência</term>
     <term name="patent">patente</term>
     <term name="performance">performance</term>
     <term name="periodical">periódico</term>
     <term name="personal_communication">comunicação pessoal</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
+    <term name="post">postagem</term>
+    <term name="post-weblog">postagem de blogue</term>
     <term name="regulation">regulamento</term>
     <term name="report">relatório</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
+    <term name="review">revisão</term>
+    <term name="review-book">revisão de livro</term>
+    <term name="software">programa de computador</term>
     <term name="song">gravação áudio</term>
     <term name="speech">discurso</term>
-    <term name="standard">padrão</term>
+    <term name="standard">norma</term>
     <term name="thesis">tése</term>
     <term name="treaty">tratado</term>
-    <term name="webpage">webpage</term>
+    <term name="webpage">página da internet</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">art. rev.</term>
+    <term name="article-magazine" form="short">art. rev.</term>
+    <term name="article-newspaper" form="short">art. j.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
@@ -144,12 +149,20 @@
     <term name="graphic" form="short">gráf.</term>
     <term name="interview" form="short">entrev.</term>
     <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">transm. vídeo</term>
+    <term name="motion_picture" form="short">grav. vídeo</term>
     <term name="report" form="short">rel.</term>
     <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
+    <term name="review-book" form="short">rev. l.</term>
     <term name="song" form="short">grav. áudio</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">audiência de</term>
+    <term name="review" form="verb">revisão de</term>
+    <term name="review-book" form="verb">revisão do livro</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">AD</term>
     <term name="bc">AC</term>
@@ -172,75 +185,47 @@
 
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01" gender-form="masculine">primeiro</term>
-    <term name="long-ordinal-01" gender-form="feminine">primeira</term>
     <term name="long-ordinal-02" gender-form="masculine">segundo</term>
-    <term name="long-ordinal-02" gender-form="feminine">segunda</term>    
     <term name="long-ordinal-03" gender-form="masculine">terceiro</term>
-    <term name="long-ordinal-03" gender-form="feminine">terceira</term>    
     <term name="long-ordinal-04" gender-form="masculine">quarto</term>
-    <term name="long-ordinal-04" gender-form="feminine">quarta</term>
     <term name="long-ordinal-05" gender-form="masculine">quinto</term>
-    <term name="long-ordinal-05" gender-form="feminine">quinta</term>
     <term name="long-ordinal-06" gender-form="masculine">sexto</term>
-    <term name="long-ordinal-06" gender-form="feminine">sexta</term>
     <term name="long-ordinal-07" gender-form="masculine">sétimo</term>
-    <term name="long-ordinal-07" gender-form="feminine">sétima</term>
     <term name="long-ordinal-08" gender-form="masculine">oitavo</term>
-    <term name="long-ordinal-08" gender-form="feminine">oitava</term>
     <term name="long-ordinal-09" gender-form="masculine">nono</term>
-    <term name="long-ordinal-09" gender-form="feminine">nona</term>
     <term name="long-ordinal-10" gender-form="masculine">décimo</term>
+    <term name="long-ordinal-01" gender-form="feminine">primeira</term>
+    <term name="long-ordinal-02" gender-form="feminine">segunda</term>
+    <term name="long-ordinal-03" gender-form="feminine">terceira</term>
+    <term name="long-ordinal-04" gender-form="feminine">quarta</term>
+    <term name="long-ordinal-05" gender-form="feminine">quinta</term>
+    <term name="long-ordinal-06" gender-form="feminine">sexta</term>
+    <term name="long-ordinal-07" gender-form="feminine">sétima</term>
+    <term name="long-ordinal-08" gender-form="feminine">oitava</term>
+    <term name="long-ordinal-09" gender-form="feminine">nona</term>
     <term name="long-ordinal-10" gender-form="feminine">décima</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>ata</single>
-      <multiple>atas</multiple>						 
+      <multiple>atas</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>apêndice</single>
-      <multiple>apêndices</multiple>						 
+      <multiple>apêndices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>artigo</single>
-      <multiple>artigos</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>localização</single>
-      <multiple>localizações</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equação</single>
-      <multiple>equações</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>regra</single>
-      <multiple>regras</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>cena</single>
-      <multiple>cenas</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>tabela</single>
-      <multiple>tabelas</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>título</single>
-      <multiple>títulos</multiple>						 
+      <multiple>artigos</multiple>
     </term>
     <term name="book">
       <single>livro</single>
       <multiple>livros</multiple>
     </term>
+    <term name="canon">
+      <single>cânone</single>
+      <multiple>cânones</multiple>
+    </term>
     <term name="chapter">
       <single>capítulo</single>
       <multiple>capítulos</multiple>
@@ -249,6 +234,14 @@
       <single>coluna</single>
       <multiple>colunas</multiple>
     </term>
+    <term name="elocation">
+      <single>localização</single>
+      <multiple>localizações</multiple>
+    </term>
+    <term name="equation">
+      <single>equação</single>
+      <multiple>equações</multiple>
+    </term>
     <term name="figure">
       <single>figura</single>
       <multiple>figuras</multiple>
@@ -277,10 +270,6 @@
       <single>página</single>
       <multiple>páginas</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>página</single>
-      <multiple>páginas</multiple>
-    </term>
     <term name="paragraph">
       <single>parágrafo</single>
       <multiple>parágrafos</multiple>
@@ -289,6 +278,14 @@
       <single>parte</single>
       <multiple>partes</multiple>
     </term>
+    <term name="rule">
+      <single>regra</single>
+      <multiple>regras</multiple>
+    </term>
+    <term name="scene">
+      <single>cena</single>
+      <multiple>cenas</multiple>
+    </term>
     <term name="section">
       <single>secção</single>
       <multiple>secções</multiple>
@@ -297,6 +294,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>suplemento</single>
+      <multiple>suplementos</multiple>
+    </term>
+    <term name="table">
+      <single>tabela</single>
+      <multiple>tabelas</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>título</single>
+      <multiple>títulos</multiple>
+    </term>
     <term name="verse">
       <single>versículo</single>
       <multiple>versículos</multiple>
@@ -307,45 +320,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">liv.</term>
+    <term name="chapter" form="short">cap.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tít.</single>
-      <multiple>títs.</multiple>
-    </term>
-    <term name="book" form="short">liv.</term>
-    <term name="chapter" form="short">cap.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">f.</term>
     <term name="issue" form="short">n.º</term>
@@ -356,17 +349,37 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">pt.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sec.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supl.</single>
+      <multiple>supls.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tít.</single>
+      <multiple>títs.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v</single>
       <multiple>vv</multiple>
@@ -376,7 +389,7 @@
       <multiple>vols.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -386,15 +399,101 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>capítulo</single>
+      <multiple>capítulos</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citação</single>
+      <multiple>citações</multiple>
+    </term>
+    <term name="collection-number">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="edition">
+      <single>edição</single>
+      <multiple>edições</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>referência</single>
+      <multiple>referências</multiple>
+    </term>
+    <term name="number">
+      <single>número</single>
+      <multiple>números</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>página</single>
+      <multiple>páginas</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>página</single>
+      <multiple>páginas</multiple>
+    </term>
+    <term name="printing">
+      <single>impressão</single>
+      <multiple>impressões</multiple>
+    </term>
+    <term name="version">versão</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>núm. cap.</single>
+      <multiple>núms. cáp.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">n.º</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>ref.</single>
+      <multiple>refs.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>n.</single>
+      <multiple>ns.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>impr.</single>
+      <multiple>imprs.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>cadeira</single>
       <multiple>cadeiras</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compilador</single>
       <multiple>compiladores</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contribuinte</single>
       <multiple>contribuintes</multiple>
@@ -403,6 +502,26 @@
       <single>curador</single>
       <multiple>curadores</multiple>
     </term>
+    <term name="director">
+      <single>diretor</single>
+      <multiple>diretores</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editores</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor e tradutor</single>
+      <multiple>editores e tradutores</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor e tradutor</single>
+      <multiple>editores e tradutores</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>diretor editorial</single>
+      <multiple>diretores editoriais</multiple>
+    </term>
     <term name="executive-producer">
       <single>produtor executivo</single>
       <multiple>produtores executivos</multiple>
@@ -415,6 +534,11 @@
       <single>anfitrião</single>
       <multiple>anfitriões</multiple>
     </term>
+    <term name="illustrator">
+      <single>ilustrador</single>
+      <multiple>ilustradores</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrador</single>
       <multiple>narradores</multiple>
@@ -423,6 +547,7 @@
       <single>organizador</single>
       <multiple>organizadores</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>ator</single>
       <multiple>atores</multiple>
@@ -431,6 +556,8 @@
       <single>produtor</single>
       <multiple>produtores</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>escritor</single>
       <multiple>escritores</multiple>
@@ -439,35 +566,15 @@
       <single>criador de séries</single>
       <multiple>criadores de séries</multiple>
     </term>
-    <term name="director">
-      <single>diretor</single>
-      <multiple>diretores</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editores</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>diretor editorial</single>
-      <multiple>diretores editoriais</multiple>
-    </term>
-    <term name="illustrator">
-      <single>ilustrador</single>
-      <multiple>ilustradores</multiple>
-    </term>
     <term name="translator">
       <single>tradutor</single>
       <multiple>tradutores</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor e tradutor</single>
-      <multiple>editores e tradutores</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+      <single>compil.</single>
+      <multiple>compils.</multiple>
     </term>
     <term name="contributor" form="short">
       <single>contrib.</single>
@@ -477,10 +584,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; trad.</single>
+      <multiple>eds. &amp; trads.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; trad.</single>
+      <multiple>eds. &amp; trads.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>prod. exec.</single>
       <multiple>prods. exec.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>il.</single>
+      <multiple>ils.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -498,110 +629,94 @@
       <multiple>prods.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>roteir.</single>
+      <multiple>roteirs.</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>il.</single>
-      <multiple>ils.</multiple>
+      <single>cri.</single>
+      <multiple>cris.</multiple>
     </term>
     <term name="translator" form="short">
       <single>trad.</single>
       <multiple>trads.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; trad.</single>
-      <multiple>eds. &amp; trads.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">presidido por</term>
+    <term name="collection-editor" form="verb">editado por</term>
     <term name="compiler" form="verb">compilado por</term>
+    <term name="container-author" form="verb">por</term>
     <term name="contributor" form="verb">com</term>
     <term name="curator" form="verb">curado por</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">com convidado</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrado por</term>
-    <term name="organizer" form="verb">organizado por</term>
-    <term name="performer" form="verb">atuado por</term>
-    <term name="producer" form="verb">produzido por</term>
-    <term name="script-writer" form="verb">escrito por</term>
-    <term name="series-creator" form="verb">criado por</term>
-    <term name="container-author" form="verb">por</term>
     <term name="director" form="verb">dirigido por</term>
     <term name="editor" form="verb">editado por</term>
+    <term name="editor-translator" form="verb">editado e traduzido por</term>
+    <term name="editortranslator" form="verb">editado e traduzido por</term>
     <term name="editorial-director" form="verb">editorial de</term>
+    <term name="executive-producer" form="verb">produção executiva de</term>
+    <term name="guest" form="verb">com convidado</term>
+    <term name="host" form="verb">apresentado por</term>
     <term name="illustrator" form="verb">ilustrado por</term>
     <term name="interviewer" form="verb">entrevistado por</term>
+    <term name="narrator" form="verb">narrado por</term>
+    <term name="organizer" form="verb">organizado por</term>
+    <term name="performer" form="verb">atuado por</term>
+    <term name="producer" form="verb">produzido por</term>
     <term name="recipient" form="verb">para</term>
     <term name="reviewed-author" form="verb">revisto por</term>
+    <term name="script-writer" form="verb">escrito por</term>
+    <term name="series-creator" form="verb">criado por</term>
     <term name="translator" form="verb">traduzido por</term>
-    <term name="editortranslator" form="verb">editado e traduzido por</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">ed. por</term>
+    <term name="compiler" form="verb-short">comp. por</term>
+    <term name="contributor" form="verb-short">c/</term>
+    <term name="curator" form="verb-short">cur. por</term>
     <term name="director" form="verb-short">dir.</term>
     <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trad. por</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trad. por</term>
     <term name="editorial-director" form="verb-short">ed.</term>
+    <term name="executive-producer" form="verb-short">prod. exec. de</term>
+    <term name="guest" form="verb-short">c/ convid.</term>
+    <term name="host" form="verb-short">apres. por</term>
     <term name="illustrator" form="verb-short">ilus.</term>
+    <term name="narrator" form="verb-short">narr. de</term>
+    <term name="organizer" form="verb-short">org. por</term>
+    <term name="performer" form="verb-short">perf. por</term>
+    <term name="producer" form="verb-short">prod. por</term>
+    <term name="script-writer" form="verb-short">escr. por</term>
+    <term name="series-creator" form="verb-short">criado por</term>
     <term name="translator" form="verb-short">trad.</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trad. por</term>
-      
-   <!-- LONG MONTH FORMS -->
-      <term name="month-01">janeiro</term>
-      <term name="month-02">fevereiro</term>
-      <term name="month-03">março</term>
-      <term name="month-04">abril</term>
-      <term name="month-05">maio</term>
-      <term name="month-06">junho</term>
-      <term name="month-07">julho</term>
-      <term name="month-08">agosto</term>
-      <term name="month-09">setembro</term>
-      <term name="month-10">outubro</term>
-      <term name="month-11">novembro</term>
-      <term name="month-12">dezembro</term>
-     
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">janeiro</term>
+    <term name="month-02">fevereiro</term>
+    <term name="month-03">março</term>
+    <term name="month-04">abril</term>
+    <term name="month-05">maio</term>
+    <term name="month-06">junho</term>
+    <term name="month-07">julho</term>
+    <term name="month-08">agosto</term>
+    <term name="month-09">setembro</term>
+    <term name="month-10">outubro</term>
+    <term name="month-11">novembro</term>
+    <term name="month-12">dezembro</term>
+
     <!-- SHORT MONTH FORMS -->
-      <term name="month-01" form="short">jan.</term>
-      <term name="month-02" form="short">fev.</term>
-      <term name="month-03" form="short">mar.</term>
-      <term name="month-04" form="short">abr.</term>
-      <term name="month-05" form="short">mai.</term>
-      <term name="month-06" form="short">jun.</term>
-      <term name="month-07" form="short">jul.</term>
-      <term name="month-08" form="short">ago.</term>
-      <term name="month-09" form="short">set.</term>
-      <term name="month-10" form="short">out.</term>
-      <term name="month-11" form="short">nov.</term>
-      <term name="month-12" form="short">dez.</term>
+    <term name="month-01" form="short">jan.</term>
+    <term name="month-02" form="short">fev.</term>
+    <term name="month-03" form="short">mar.</term>
+    <term name="month-04" form="short">abr.</term>
+    <term name="month-05" form="short">mai.</term>
+    <term name="month-06" form="short">jun.</term>
+    <term name="month-07" form="short">jul.</term>
+    <term name="month-08" form="short">ago.</term>
+    <term name="month-09" form="short">set.</term>
+    <term name="month-10" form="short">out.</term>
+    <term name="month-11" form="short">nov.</term>
+    <term name="month-12" form="short">dez.</term>
 
     <!-- SEASONS -->
     <term name="season-01">Primavera</term>
diff --git a/locales/ro-RO.xml b/locales/ro-RO.xml
--- a/locales/ro-RO.xml
+++ b/locales/ro-RO.xml
@@ -5,8 +5,16 @@
       <name>Nicolae Turcan</name>
       <email>nturcan@gmail.com</email>
     </translator>
+    <translator>
+      <name>Alin Andrei Bălașa</name>
+      <email>alin.andrei.balasa@blsalin.dev</email>
+    </translator>
+    <translator>
+      <name>Dorin Jorea</name>
+      <email>dorin.jorea@gmail.com</email>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2025-10-16T03:24:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -20,137 +28,146 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">comunicare personală</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">data accesării</term>
+    <term name="advance-online-publication">publicare online în avans</term>
+    <term name="album">album</term>
     <term name="and">și</term>
     <term name="and others">și alții</term>
     <term name="anonymous">anonim</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">la</term>
+    <term name="audio-recording">înregistrare audio</term>
     <term name="available at">disponibil la</term>
     <term name="by">de</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">cca.</term>
     <term name="cited">citat</term>
-    <term name="edition">
-      <single>ediția</single>
-      <multiple>edițiile</multiple>
-    </term>
-    <term name="edition" form="short">ed</term>
-    <term name="et-al">et al.</term>
+    <term name="et-al">et al.</term> <!-- Romanian translation of this Latin expression is never used in Romanian styles -->
+    <term name="film">film</term>
     <term name="forthcoming">în curs de apariție</term>
     <term name="from">din</term>
+    <term name="henceforth">de aici înainte</term>
     <term name="ibid">ibidem</term>
     <term name="in">în</term>
     <term name="in press">sub tipar</term>
     <term name="internet">internet</term>
     <term name="letter">scrisoare</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">fără dată</term>
-    <term name="no date" form="short">f.a.</term>
+    <term name="no-place">fără loc</term>
+    <term name="no-publisher">fără editor</term> <!-- sine nomine -->
+    <term name="on">pe</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">lucrare originală publicată</term>
+    <term name="personal-communication">comunicare personală</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">episod de podcast</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">prezentat la</term>
+    <term name="radio-broadcast">transmisie radio</term>
+    <term name="radio-series">serie radio</term>
+    <term name="radio-series-episode">episod de serie radio</term>
     <term name="reference">
       <single>referință</single>
       <multiple>referințe</multiple>
     </term>
+    <term name="retrieved">preluat în</term>
+    <term name="review-of">recenzie a</term>
+    <term name="scale">scală</term>
+    <term name="special-issue">număr special</term>
+    <term name="special-section">secțiune specială</term>
+    <term name="television-broadcast">emisiune de televiziune</term>
+    <term name="television-series">serial televizat</term>
+    <term name="television-series-episode">episod al serialului televizat</term>
+    <term name="video">înregistrare video</term>
+    <term name="working-paper">lucrare în curs de elaborare</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">cca.</term>
+    <term name="no date" form="short">f.a.</term>
+    <term name="no-place" form="short">f. l.</term>
+    <term name="no-publisher" form="short">f. e.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">preluat în</term>
-    <term name="scale">scală</term>
-    <term name="version">versiunea</term>
+    <term name="review-of" form="short">rec. a</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article-journal">articol de revistă</term>
+    <term name="article-magazine">articol de revistă</term>
+    <term name="article-newspaper">articol de ziar</term>
+    <term name="bill">proiect de lege</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">transmisie</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
+    <term name="classic">clasic</term>
+    <term name="collection">colecție</term>
+    <term name="dataset">set de date</term>
     <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="entry">intrare</term>
+    <term name="entry-dictionary">intrare în dicționar</term>
+    <term name="entry-encyclopedia">intrare în enciclopedie</term>
+    <term name="event">eveniment</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">grafică</term>
+    <term name="hearing">audiere</term>
     <term name="interview">interviu</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="legal_case">caz juridic</term>
+    <term name="legislation">legislație</term>
+    <term name="manuscript">manuscris</term>
+    <term name="map">hartă</term>
+    <term name="motion_picture">înregistrare video</term>
+    <term name="musical_score">partitură muzicală</term>
+    <term name="pamphlet">pamflet</term>
+    <term name="paper-conference">articol de conferință</term>
+    <term name="patent">brevet</term>
+    <term name="performance">interpretare</term>
+    <term name="periodical">periodic</term>
     <term name="personal_communication">comunicare personală</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
+    <term name="post">postare</term>
+    <term name="post-weblog">postare pe blog</term>
+    <term name="regulation">reglementare</term>
+    <term name="report">raport</term>
+    <term name="review">recenzie</term>
+    <term name="review-book">recenzie de carte</term>
     <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
+    <term name="song">înregistrare audio</term>
+    <term name="speech">prezentare</term>
     <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="thesis">teză</term>
+    <term name="treaty">tratat</term>
+    <term name="webpage">pagină Web</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">art. revistă</term>
+    <term name="article-magazine" form="short">art. revistă</term>
+    <term name="article-newspaper" form="short">art. ziar</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
+    <term name="graphic" form="short">graf.</term>
     <term name="interview" form="short">interv.</term>
     <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="motion_picture" form="short">înreg. video</term>
+    <term name="report" form="short">rap.</term>
+    <term name="review" form="short">rec.</term>
+    <term name="review-book" form="short">rec. carte</term>
+    <term name="song" form="short">înreg. audio</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">mărturie a</term>
+    <term name="review" form="verb">recenzie a</term>
+    <term name="review-book" form="verb">recenzie a cărții</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">d.Hr.</term>
     <term name="bc">î.Hr.</term>
@@ -162,14 +179,14 @@
     <term name="close-quote">”</term>
     <term name="open-inner-quote">«</term>
     <term name="close-inner-quote">»</term>
-    <term name="page-range-delimiter">–</term>
+    <term name="page-range-delimiter">-</term>
     <term name="colon">:</term>
     <term name="comma">,</term>
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
     <term name="ordinal">-lea</term>
-    <term name="ordinal-01" match="whole-number"></term>
+    <term name="ordinal-01" match="whole-number"/>
 
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">primul</term>
@@ -184,54 +201,26 @@
     <term name="long-ordinal-10">al zecelea</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>actul</single>
+      <multiple>actele</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>anexa</single>
+      <multiple>anexele</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>articolul</single>
+      <multiple>articolele</multiple>
     </term>
     <term name="book">
       <single>cartea</single>
       <multiple>cărțile</multiple>
     </term>
+    <term name="canon">
+      <single>canonul</single>
+      <multiple>canoanele</multiple>
+    </term>
     <term name="chapter">
       <single>capitolul</single>
       <multiple>capitolele</multiple>
@@ -240,13 +229,21 @@
       <single>coloana</single>
       <multiple>coloanele</multiple>
     </term>
+    <term name="elocation">
+      <single>locul</single>
+      <multiple>locurile</multiple>
+    </term>
+    <term name="equation">
+      <single>ecuația</single>
+      <multiple>ecuațiile</multiple>
+    </term>
     <term name="figure">
       <single>figura</single>
       <multiple>figurile</multiple>
     </term>
     <term name="folio">
-      <single>folio</single>
-      <multiple>folio</multiple>
+      <single>folioul</single>
+      <multiple>foliourile</multiple>
     </term>
     <term name="issue">
       <single>numărul</single>
@@ -268,10 +265,6 @@
       <single>pagina</single>
       <multiple>paginile</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>pagina</single>
-      <multiple>paginile</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraful</single>
       <multiple>paragrafele</multiple>
@@ -280,6 +273,14 @@
       <single>partea</single>
       <multiple>părțile</multiple>
     </term>
+    <term name="rule">
+      <single>regula</single>
+      <multiple>regulile</multiple>
+    </term>
+    <term name="scene">
+      <single>scena</single>
+      <multiple>scenele</multiple>
+    </term>
     <term name="section">
       <single>secțiunea</single>
       <multiple>secțiunile</multiple>
@@ -288,6 +289,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>suplimentul</single>
+      <multiple>suplimentele</multiple>
+    </term>
+    <term name="table">
+      <single>tabelul</single>
+      <multiple>tabelele</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>titlul</single>
+      <multiple>titlurile</multiple>
+    </term>
     <term name="verse">
       <single>versetul</single>
       <multiple>versetele</multiple>
@@ -298,45 +315,22 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
-    </term>
-    <term name="article-locator" form="short">			 
-      <single>art.</single>
-      <multiple>arts.</multiple>
+      <multiple>apps.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="article-locator" form="short">art.</term>
+    <term name="book" form="short">cart.</term>
+    <term name="chapter" form="short">cap.</term>
+    <term name="column" form="short">col.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="equation" form="short">
+      <single>ec.</single>
+      <multiple>ecs.</multiple>
     </term>
-    <term name="book" form="short">cart.</term>
-    <term name="chapter" form="short">cap.</term>
-    <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">nr.</term>
@@ -347,17 +341,37 @@
       <single>p.</single>
       <multiple>pp.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>p.</single>
-      <multiple>pp.</multiple>
-    </term>
     <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">part.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sec.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>suplim.</single>
+      <multiple>suplim.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>vv.</multiple>
@@ -367,7 +381,11 @@
       <multiple>vol.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="folio" form="symbol">
+      <single>ƒ</single>
+      <multiple>ƒƒ</multiple>
+    </term>
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -377,59 +395,103 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>capitolul</single>
+      <multiple>capitolele</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>citarea</single>
+      <multiple>citările</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>numărul</single>
+      <multiple>numerele</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>ediția</single>
+      <multiple>edițiile</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>referință</single>
+      <multiple>referințe</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>numărul</single>
+      <multiple>numerele</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>pagina</single>
+      <multiple>paginile</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>volumul</single>
+      <multiple>volumele</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>pagina</single>
+      <multiple>paginile</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>tiparul</single>
+      <multiple>tiparele</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">versiunea</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>cap.</single>
+      <multiple>chaps.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">nr.</term>
+    <term name="edition" form="short">ed.</term>
+    <term name="first-reference-note-number" form="short">cf.</term>
+    <term name="number" form="short">nr.</term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
     </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vol.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>print.</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>președinte</single>
+      <multiple>președinți</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>editorul seriei</single>
+      <multiple>editorii seriei</multiple>
+    </term>
+    <term name="compiler">
+      <single>compilator</single>
+      <multiple>compilatori</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>contributor</single>
+      <multiple>contributori</multiple>
+    </term>
+    <term name="curator">
+      <single>curator</single>
+      <multiple>curatori</multiple>
+    </term>
     <term name="director">
       <single>director</single>
       <multiple>directori</multiple>
@@ -438,63 +500,79 @@
       <single>editor</single>
       <multiple>editori</multiple>
     </term>
+    <term name="editor-translator">
+      <single>editor și traducător</single>
+      <multiple>editori și traducători</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor și traducător</single>
+      <multiple>editori și traducători</multiple>
+    </term>
     <term name="editorial-director">
       <single>coordonator</single>
       <multiple>coordonatori</multiple>
     </term>
+    <term name="executive-producer">
+      <single>producător executiv</single>
+      <multiple>producători executivi</multiple>
+    </term>
+    <term name="guest">
+      <single>invitat</single>
+      <multiple>invitați</multiple>
+    </term>
+    <term name="host">
+      <single>gazdă</single>
+      <multiple>gazde</multiple>
+    </term>
     <term name="illustrator">
       <single>ilustrator</single>
       <multiple>ilustratori</multiple>
     </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>narator</single>
+      <multiple>naratori</multiple>
+    </term>
+    <term name="organizer">
+      <single>organizator</single>
+      <multiple>organizatori</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>interpret</single>
+      <multiple>interpreți</multiple>
+    </term>
+    <term name="producer">
+      <single>producător</single>
+      <multiple>producători</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>scriitor</single>
+      <multiple>scriitori</multiple>
+    </term>
+    <term name="series-creator">
+      <single>creator de serie</single>
+      <multiple>creatori de serie</multiple>
+    </term>
     <term name="translator">
       <single>traducător</single>
       <multiple>traducători</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editor și traducător</single>
-      <multiple>editori și traducători</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
       <single>comp.</single>
-      <multiple>comps.</multiple>
+      <multiple>comp.</multiple>
     </term>
     <term name="contributor" form="short">
       <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <multiple>contrib.</multiple>
     </term>
     <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
-    </term>
-    <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
-    </term>
-    <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
-    </term>
-    <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
-    </term>
-    <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
-    </term>
-    <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
-    </term>
-    <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
-    </term>
-    <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
+      <single>curat.</single>
+      <multiple>curat.</multiple>
     </term>
     <term name="director" form="short">
       <single>dir.</single>
@@ -504,67 +582,103 @@
       <single>ed.</single>
       <multiple>ed.</multiple>
     </term>
+    <term name="editor-translator" form="short">
+      <single>ed. și trad.</single>
+      <multiple>ed. și trad.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. și trad.</single>
+      <multiple>ed. și trad.</multiple>
+    </term>
     <term name="editorial-director" form="short">
       <single>coord.</single>
       <multiple>coord.</multiple>
     </term>
+    <term name="executive-producer" form="short">
+      <single>prod. exec.</single>
+      <multiple>prod. exec.</multiple>
+    </term>
     <term name="illustrator" form="short">
       <single>ilustr.</single>
       <multiple>ilustr.</multiple>
     </term>
+    <term name="narrator" form="short">
+      <single>nar.</single>
+      <multiple>nar.</multiple>
+    </term>
+    <term name="organizer" form="short">
+      <single>org.</single>
+      <multiple>org.</multiple>
+    </term>
+    <term name="performer" form="short">
+      <single>interpr.</single>
+      <multiple>interpr..</multiple>
+    </term>
+    <term name="producer" form="short">
+      <single>prod.</single>
+      <multiple>prod.</multiple>
+    </term>
+    <term name="script-writer" form="short">
+      <single>scriit.</single>
+      <multiple>scriit.</multiple>
+    </term>
+    <term name="series-creator" form="short">
+      <single>ed. col.</single>
+      <multiple>ed. col.</multiple>
+    </term>
     <term name="translator" form="short">
       <single>trad.</single>
       <multiple>trad.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. și trad.</single>
-      <multiple>ed. și trad.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">condus de</term>
+    <term name="collection-editor" form="verb">editat de</term>
+    <term name="compiler" form="verb">compilat de</term>
     <term name="container-author" form="verb">de</term>
+    <term name="contributor" form="verb">cu contribuția</term>
+    <term name="curator" form="verb">curator</term>
     <term name="director" form="verb">coordonat de</term>
     <term name="editor" form="verb">ediție de</term>
-    <term name="editorial-director" form="verb">coordonator</term>
+    <term name="editor-translator" form="verb">ediție și traducere de</term>
+    <term name="editortranslator" form="verb">ediție și traducere de</term>
+    <term name="editorial-director" form="verb">coordonat de</term>
+    <term name="executive-producer" form="verb">produs executiv de</term>
+    <term name="guest" form="verb">cu invitatul</term>
+    <term name="host" form="verb">găzduit de</term>
     <term name="illustrator" form="verb">ilustrații de</term>
     <term name="interviewer" form="verb">interviu de</term>
+    <term name="narrator" form="verb">narat de</term>
+    <term name="organizer" form="verb">organizat de</term>
+    <term name="performer" form="verb">realizat de</term>
+    <term name="producer" form="verb">produs de</term>
     <term name="recipient" form="verb">în</term>
     <term name="reviewed-author" form="verb">de</term>
+    <term name="script-writer" form="verb">scris de</term>
+    <term name="series-creator" form="verb">colecție editată de</term>
     <term name="translator" form="verb">traducere de</term>
-    <term name="editortranslator" form="verb">ediție și traducere de</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">ed. de</term>
+    <term name="compiler" form="verb-short">comp. de</term>
+    <term name="contributor" form="verb-short">cu</term>
+    <term name="curator" form="verb-short">cur.</term>
     <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">coord.</term>
-    <term name="illustrator" form="verb-short">ilustr.</term>
-    <term name="translator" form="verb-short">trad.</term>
+    <term name="editor" form="verb-short">ed. de</term>
+    <term name="editor-translator" form="verb-short">ed. și trad. de</term>
     <term name="editortranslator" form="verb-short">ed. și trad. de</term>
+    <term name="editorial-director" form="verb-short">coord. de</term>
+    <term name="executive-producer" form="verb-short">prod. exec. de</term>
+    <term name="guest" form="verb-short">cu invit.</term>
+    <term name="host" form="verb-short">găzd. de</term>
+    <term name="illustrator" form="verb-short">ilustr. de</term>
+    <term name="narrator" form="verb-short">nar. de</term>
+    <term name="organizer" form="verb-short">org. de</term>
+    <term name="performer" form="verb-short">interpr. de</term>
+    <term name="producer" form="verb-short">prod. de</term>
+    <term name="script-writer" form="verb-short">scen. de</term>
+    <term name="series-creator" form="verb-short">ed. col. de</term>
+    <term name="translator" form="verb-short">trad. de</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">ianuarie</term>
diff --git a/locales/ru-RU.xml b/locales/ru-RU.xml
--- a/locales/ru-RU.xml
+++ b/locales/ru-RU.xml
@@ -6,7 +6,7 @@
       <email>alexei.kouprianov@gmail.com</email>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -20,26 +20,53 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">просмотрено</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">и</term>
+    <term name="and others">и др.</term>
+    <term name="anonymous">аноним</term>
+    <term name="at">на</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">доступно на</term>
+    <term name="by"/>
+    <term name="circa">около</term>
+    <term name="cited">цитируется по</term>
+    <term name="et-al">и др.</term>
     <term name="film">film</term>
+    <term name="forthcoming">ожидается</term>
+    <term name="from">от</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">там же</term>
+    <term name="in">в</term>
+    <term name="in press">в печати</term>
+    <term name="internet">Интернет</term>
+    <term name="letter">письмо</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">без даты</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">онлайн</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">личная переписка</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">представлено на</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <!-- Сложно подобрать один перевод для следующего термина. В зависимости от контекста это может быть "работа" или "источник" или вообще опускаться -->
+    <term name="reference">
+      <single>ссылка</single>
+      <multiple>ссылки</multiple>
+    </term>
+    <term name="retrieved">извлечено</term>
+    <term name="review-of">review of</term>
+    <term name="scale">масштаб</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -47,49 +74,23 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">просмотрено</term>
-    <term name="and">и</term>
-    <term name="and others">и др.</term>
-    <term name="anonymous">аноним</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">анон.</term>
-    <term name="at">на</term>
-    <term name="available at">доступно на</term>
-    <term name="by"></term>
-    <term name="circa">около</term>
     <term name="circa" form="short">ок.</term>
-    <term name="cited">цитируется по</term>
     <term name="cited" form="short">цит. по</term>
-    <term name="edition"> <!-- gender="neuter" -->
-      <single>издание</single>
-      <multiple>издания</multiple>
-    </term>
-    <term name="edition" form="short">изд.</term>
-    <term name="et-al">и др.</term>
-    <term name="forthcoming">ожидается</term>
-    <term name="from">от</term>
-    <term name="ibid">там же</term>
-    <term name="in">в</term>
-    <term name="in press">в печати</term>
-    <term name="internet">Интернет</term>
-    <term name="letter">письмо</term>
-    <term name="no date">без даты</term>
     <term name="no date" form="short">б. д.</term>
-    <term name="online">онлайн</term>
-    <term name="presented at">представлено на</term>
-    <!-- Сложно подобрать один перевод для следующего термина. В зависимости от контекста это может быть "работа" или "источник" или вообще опускаться -->
-    <term name="reference">
-      <single>ссылка</single>
-      <multiple>ссылки</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <!-- сокращения для "ссылка" не используются, но для некоторых случаев может подойти "ист." -->
     <term name="reference" form="short">
       <single>ссылка</single>
       <multiple>ссылки</multiple>
     </term>
-    <term name="retrieved">извлечено</term>
-    <term name="scale">масштаб</term>
-    <term name="version">версия</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -154,6 +155,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">н. э.</term>
     <term name="bc">до н. э.</term>
@@ -206,56 +215,29 @@
     <term name="long-ordinal-08" gender-form="feminine">восьмая</term>
     <term name="long-ordinal-09" gender-form="feminine">девятая</term>
     <term name="long-ordinal-10" gender-form="feminine">десятая</term>
+
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <!-- Currently only a few of locator terms are gender-assignable -->
     <term name="book">
       <single>книга</single>
       <multiple>книги</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>глава</single>
       <multiple>главы</multiple>
@@ -264,6 +246,14 @@
       <single>столбец</single>
       <multiple>столбцы</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>рисунок</single>
       <multiple>рисунки</multiple>
@@ -292,11 +282,6 @@
       <single>страница</single>
       <multiple>страницы</multiple>
     </term>
-    <!-- для однообразности здесь тоже указали род, но использование кол-ва страниц с порядковым числительным маловероятно -->
-    <term name="number-of-pages" gender="feminine">
-      <single>страница</single>
-      <multiple>страницы</multiple>
-    </term>
     <term name="paragraph">
       <single>параграф</single>
       <multiple>параграфы</multiple>
@@ -305,11 +290,35 @@
       <single>часть</single>
       <multiple>части</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>раздел</single>
       <multiple>разделы</multiple>
     </term>
     <term name="sub-verbo">смотри</term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>стих</single>
       <multiple>стихи</multiple>
@@ -320,46 +329,26 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <!-- Ниже для всех однобуквенных сокращений приведены двухбуквенные варианты множественного числа. Если последние нежелательны (например, по ГОСТу для библиографии "С. 23-35") то это должно определяться в самом стиле (plural="never") -->
+    <term name="book" form="short">кн.</term>
+    <term name="chapter" form="short">гл.</term>
+    <term name="column" form="short">стб.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <!-- Ниже для всех однобуквенных сокращений приведены двухбуквенные варианты множественного числа. Если последние нежелательны (например, по ГОСТу для библиографии "С. 23-35") то это должно определяться в самом стиле (plural="never") -->
-    <term name="book" form="short">кн.</term>
-    <term name="chapter" form="short">гл.</term>
-    <term name="column" form="short">стб.</term>
     <term name="figure" form="short">рис.</term>
     <term name="folio" form="short">
       <single>л.</single>
@@ -373,10 +362,6 @@
       <single>с.</single>
       <multiple>сс.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>с.</single>
-      <multiple>сс.</multiple>
-    </term>
     <term name="paragraph" form="short">
       <single>п.</single>
       <multiple>пп.</multiple>
@@ -385,15 +370,39 @@
       <single>ч.</single>
       <multiple>чч.</multiple>
     </term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">разд.</term>
     <term name="sub-verbo" form="short">см.</term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">ст.</term>
     <term name="volume" form="short">
       <single>т.</single>
       <multiple>тт.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -403,15 +412,99 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number" gender="masculine">
+      <single>выпуск</single>
+      <multiple>выпуски</multiple>
+    </term>
+    <term name="edition"> <!-- gender="neuter" -->
+      <single>издание</single>
+      <multiple>издания</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>примечание</single>
+      <multiple>примечания</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages" gender="feminine">
+      <single>страница</single>
+      <multiple>страницы</multiple>
+    </term>
+    <!-- для однообразности здесь тоже указали род, но использование кол-ва страниц с порядковым числительным маловероятно -->
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">версия</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">вып.</term>
+    <term name="edition" form="short">изд.</term>
+    <term name="first-reference-note-number" form="short">прим.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>с.</single>
+      <multiple>сс.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -420,6 +513,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>режиссер</single>
+      <multiple>режиссеры</multiple>
+    </term>
+    <term name="editor">
+      <single>редактор</single>
+      <multiple>редакторы</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>редактор и переводчик</single>
+      <multiple>редакторы и переводчики</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>редактор и переводчик</single>
+      <multiple>редакторы и переводчики</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>ответственный редактор</single>
+      <multiple>ответственные редакторы</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -432,6 +545,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>иллюстратор</single>
+      <multiple>иллюстраторы</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -440,6 +558,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -448,6 +567,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -456,30 +577,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>режиссер</single>
-      <multiple>режиссеры</multiple>
-    </term>
-    <term name="editor">
-      <single>редактор</single>
-      <multiple>редакторы</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>ответственный редактор</single>
-      <multiple>ответственные редакторы</multiple>
-    </term>
-    <term name="illustrator">
-      <single>иллюстратор</single>
-      <multiple>иллюстраторы</multiple>
-    </term>
     <term name="translator">
       <single>переводчик</single>
       <multiple>переводчики</multiple>
     </term>
-    <term name="editortranslator">
-      <single>редактор и переводчик</single>
-      <multiple>редакторы и переводчики</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -494,10 +595,16 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">реж.</term>
+    <term name="editor" form="short">ред.</term>
+    <term name="editor-translator" form="short">ред. и пер.</term>
+    <term name="editortranslator" form="short">ред. и пер.</term>
+    <term name="editorial-director" form="short">отв. ред.</term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">ил.</term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -522,58 +629,57 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">реж.</term>
-    <term name="editor" form="short">ред.</term>
-    <term name="editorial-director" form="short">отв. ред.</term>
-    <term name="illustrator" form="short">ил.</term>
     <term name="translator" form="short">пер.</term>
-    <term name="editortranslator" form="short">ред. и пер.</term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <!-- В этом и следующем разделе приведены наиболее широко используемые термины (например, "под редакцией" вместо "отредактировано"). Единственным недостатком является то, что разные термины требует разного падежа для последующих фамилий -->
+    <term name="container-author" form="verb"/>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">режиссировано</term>
+    <term name="editor" form="verb">под редакцией</term>
+    <term name="editor-translator" form="verb">под редакцией и переведено</term>
+    <term name="editortranslator" form="verb">под редакцией и переведено</term>
+    <term name="editorial-director" form="verb">под ответственной редакцией</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">иллюстрировано</term>
+    <term name="interviewer" form="verb">интервью проведено</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
+    <term name="recipient" form="verb">к</term>
+    <term name="reviewed-author" form="verb"/>
     <term name="script-writer" form="verb">written by</term>
     <term name="series-creator" form="verb">created by</term>
-    <!-- В этом и следующем разделе приведены наиболее широко используемые термины (например, "под редакцией" вместо "отредактировано"). Единственным недостатком является то, что разные термины требует разного падежа для последующих фамилий -->
-    <term name="container-author" form="verb"></term>
-    <term name="director" form="verb">режиссировано</term>
-    <term name="editor" form="verb">под редакцией</term>
-    <term name="editorial-director" form="verb">под ответственной редакцией</term>
-    <term name="illustrator" form="verb">иллюстрировано</term>
-    <term name="interviewer" form="verb">интервью проведено</term>
-    <term name="recipient" form="verb">к</term>
-    <term name="reviewed-author" form="verb"></term>
     <term name="translator" form="verb">переведено</term>
-    <term name="editortranslator" form="verb">под редакцией и переведено</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">реж.</term>
+    <term name="editor" form="verb-short">под ред.</term>
+    <term name="editor-translator" form="verb-short">под ред. и пер.</term>
+    <term name="editortranslator" form="verb-short">под ред. и пер.</term>
+    <term name="editorial-director" form="verb-short">под отв. ред.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">ил.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">реж.</term>
-    <term name="editor" form="verb-short">под ред.</term>
-    <term name="editorial-director" form="verb-short">под отв. ред.</term>
-    <term name="illustrator" form="verb-short">ил.</term>
     <term name="translator" form="verb-short">пер.</term>
-    <term name="editortranslator" form="verb-short">под ред. и пер.</term>
 
     <!-- LONG MONTH FORMS -->
     <!-- род месяцев не указываем, поскольку даже если использовать порядковые числительные в дате, то они должны соответствовать среднему роду, например "второе февраля" -->
diff --git a/locales/sk-SK.xml b/locales/sk-SK.xml
--- a/locales/sk-SK.xml
+++ b/locales/sk-SK.xml
@@ -7,8 +7,11 @@
     <translator>
       <name>kohafan</name>
     </translator>
+    <translator>
+      <name>Peter Kubala</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2014-03-09T22:23:31+00:00</updated>
+    <updated>2025-10-16T03:24:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -22,119 +25,120 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">cit</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">osobná komunikácia</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
-    <term name="accessed">cit</term>
     <term name="and">a</term>
     <term name="and others">a ďalší</term>
     <term name="anonymous">anonym</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">v</term>
-    <term name="available at">available at</term>
+    <term name="audio-recording">zvukový záznam</term>
+    <term name="available at">dostupné na</term>
     <term name="by">by</term>
     <term name="circa">circa</term>
-    <term name="circa" form="short">cca.</term>
     <term name="cited">cit</term>
-    <term name="edition">
-      <single>vydanie</single>
-      <multiple>vydania</multiple>
-    </term>
-    <term name="edition" form="short">vyd.</term>
     <term name="et-al">et al.</term>
+    <term name="film">film</term>
     <term name="forthcoming">nadchádzajúci</term>
     <term name="from">z</term>
+    <term name="henceforth">ďalej</term>
     <term name="ibid">ibid.</term>
     <term name="in">v</term>
     <term name="in press">v tlači</term>
     <term name="internet">internet</term>
     <term name="letter">list</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">no date</term>
-    <term name="no date" form="short">n.d.</term>
+    <term name="no-place">sine loco</term>
+    <term name="no-publisher">sine nomine</term> <!-- sine nomine -->
+    <term name="on">na</term>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">pôvodné dielo publikované</term>
+    <term name="personal-communication">osobná komunikácia</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">epizóda podcastu</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">prezentované na</term>
+    <term name="radio-broadcast">rozhlasové vysielanie</term>
+    <term name="radio-series">rozhlasový seriál</term>
+    <term name="radio-series-episode">epizóda rozhlasového seriálu</term>
     <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
+      <single>referencia</single>
+      <multiple>referencie</multiple>
     </term>
+    <term name="retrieved">cit</term>
+    <term name="review-of">recenzia</term>
+    <term name="scale">mierka</term>
+    <term name="special-issue">osobitné vydanie</term>
+    <term name="special-section">osobitná sekcia</term>
+    <term name="television-broadcast">televízne vysielanie</term>
+    <term name="television-series">televízny seriál</term>
+    <term name="television-series-episode">epizóda televízneho seriálu</term>
+    <term name="video">video</term>
+    <term name="working-paper">pracovný dokument</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="circa" form="short">cca.</term>
+    <term name="no date" form="short">n.d.</term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher" form="short">s.n.</term>
     <term name="reference" form="short">
       <single>ref.</single>
-      <multiple>refs.</multiple>
+      <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">cit</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">rec.</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">článok</term>
+    <term name="article-journal">vedecký článok</term>
+    <term name="article-magazine">článok v časopise</term>
+    <term name="article-newspaper">článok v novinách</term>
+    <term name="bill">účet</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">vysielanie</term>
     <!-- chapter is in the list of locator terms -->
     <term name="classic">classic</term>
-    <term name="collection">collection</term>
+    <term name="collection">zborník</term>
     <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="document">dokument</term>
+    <term name="entry">záznam</term>
+    <term name="entry-dictionary">slovníkové heslo</term>
+    <term name="entry-encyclopedia">encyklopedický záznam</term>
+    <term name="event">udalosť</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">grafika</term>
+    <term name="hearing">pojednávanie</term>
     <term name="interview">osobná komunikácia</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
+    <term name="legal_case">právny prípad</term>
+    <term name="legislation">legislatíva</term>
+    <term name="manuscript">rukopis</term>
+    <term name="map">mapa</term>
+    <term name="motion_picture">videonahrávka</term>
     <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="pamphlet">brožúra</term>
+    <term name="paper-conference">konferečný príspevok</term>
     <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="performance">vystúpenie</term>
+    <term name="periodical">periodikum</term>
     <term name="personal_communication">osobná komunikácia</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">príspevok</term>
+    <term name="post-weblog">príspevok na blogu</term>
+    <term name="regulation">smernica</term>
+    <term name="report">správa</term>
+    <term name="review">recenzia</term>
+    <term name="review-book">recenzia knihy</term>
+    <term name="software">softvér</term>
+    <term name="song">pieseň</term>
+    <term name="speech">prejav</term>
+    <term name="standard">štandard</term>
+    <term name="thesis">téza</term>
+    <term name="treaty">zmluva</term>
+    <term name="webpage">webová stránka</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
     <term name="article-journal" form="short">journal art.</term>
@@ -148,11 +152,19 @@
     <term name="interview" form="short">interv.</term>
     <term name="manuscript" form="short">MS</term>
     <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
+    <term name="report" form="short">spr.</term>
     <term name="review" form="short">rev.</term>
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">po Kr.</term>
     <term name="bc">pred Kr.</term>
@@ -191,54 +203,26 @@
     <term name="long-ordinal-10">tenth</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>kniha</single>
       <multiple>knihy</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>kapitola</single>
       <multiple>kapitoly</multiple>
@@ -247,6 +231,14 @@
       <single>stĺpec</single>
       <multiple>stĺpce</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>rovnica</single>
+      <multiple>rovnice</multiple>
+    </term>
     <term name="figure">
       <single>obrázok</single>
       <multiple>obrázky</multiple>
@@ -275,10 +267,6 @@
       <single>strana</single>
       <multiple>strany</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>strana</single>
-      <multiple>strany</multiple>
-    </term>
     <term name="paragraph">
       <single>odstavec</single>
       <multiple>odstavce</multiple>
@@ -287,6 +275,14 @@
       <single>časť</single>
       <multiple>časti</multiple>
     </term>
+    <term name="rule">
+      <single>pravidlo</single>
+      <multiple>pravidlá</multiple>
+    </term>
+    <term name="scene">
+      <single>scéna</single>
+      <multiple>scény</multiple>
+    </term>
     <term name="section">
       <single>sekcia</single>
       <multiple>sekcie</multiple>
@@ -295,55 +291,51 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>tabuľka</single>
+      <multiple>tabuľky</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>názov</single>
+      <multiple>názvy</multiple>
+    </term>
     <term name="verse">
       <single>verš</single>
       <multiple>verše</multiple>
     </term>
     <term name="volume">
-      <single>ročník</single>
-      <multiple>ročníky</multiple>
+      <single>zväzok</single>
+      <multiple>zväzky</multiple>
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">k.</term>
+    <term name="chapter" form="short">kap.</term>
+    <term name="column" form="short">stĺp.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="equation" form="short">
+      <single>rov.</single>
+      <multiple>rov.</multiple>
     </term>
-    <term name="book" form="short">k.</term>
-    <term name="chapter" form="short">kap.</term>
-    <term name="column" form="short">stĺp.</term>
     <term name="figure" form="short">obr.</term>
     <term name="folio" form="short">l.</term>
     <term name="issue" form="short">č.</term>
@@ -354,27 +346,47 @@
       <single>s.</single>
       <multiple>s.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>s.</single>
-      <multiple>s.</multiple>
-    </term>
-    <term name="paragraph" form="short">par.</term>
+    <term name="paragraph" form="short">ods.</term>
     <term name="part" form="short">č.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">sek.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tab.</single>
+      <multiple>tab.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
     </term>
     <term name="volume" form="short">
-      <single>roč.</single>
-      <multiple>roč.</multiple>
+      <single>zv.</single>
+      <multiple>zv.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶</multiple>
@@ -384,15 +396,101 @@
       <multiple>§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>kapitola</single>
+      <multiple>kapitoly</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>číslo</single>
+      <multiple>čísla</multiple>
+    </term>
+    <term name="edition">
+      <single>vydanie</single>
+      <multiple>vydania</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>referencia</single>
+      <multiple>referencie</multiple>
+    </term>
+    <term name="number">
+      <single>číslo</single>
+      <multiple>čísla</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>strana</single>
+      <multiple>strany</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>zväzok</single>
+      <multiple>zväzky</multiple>
+    </term>
+    <term name="page-first">
+      <single>strana</single>
+      <multiple>strany</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">verzia</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>kap.</single>
+      <multiple>kap.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">č.</term>
+    <term name="edition" form="short">vyd.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>ref.</single>
+      <multiple>refs.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>č.</single>
+      <multiple>č.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>s.</single>
+      <multiple>s.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>zv.</single>
+      <multiple>zv.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -401,6 +499,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>editori</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>zostavovateľ &amp; prekladateľ</single>
+      <multiple>zostavovatelia &amp; prekladatelia</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>zostavovateľ &amp; prekladateľ</single>
+      <multiple>zostavovatelia &amp; prekladatelia</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>zostavovateľ</single>
+      <multiple>zostavovatelia</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -413,54 +531,42 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrátor</single>
+      <multiple>illustrátori</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>organizátor</single>
+      <multiple>organizátori</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>producent</single>
+      <multiple>producenti</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>scenárista</single>
+      <multiple>scenáristi</multiple>
     </term>
     <term name="series-creator">
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>editor</single>
-      <multiple>editori</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>zostavovateľ</single>
-      <multiple>zostavovatelia</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
-    </term>
     <term name="translator">
       <single>prekladateľ</single>
       <multiple>prekladatelia</multiple>
     </term>
-    <term name="editortranslator">
-      <single>zostavovateľ &amp; prekladateľ</single>
-      <multiple>zostavovatelia &amp; prekladatelia</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -475,17 +581,41 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>ed.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; tran.</single>
+      <multiple>eds. &amp; trans.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>zost.</single>
+      <multiple>zost.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
     </term>
     <term name="organizer" form="short">
       <single>org.</single>
-      <multiple>orgs.</multiple>
+      <multiple>org.</multiple>
     </term>
     <term name="performer" form="short">
       <single>perf.</single>
@@ -493,7 +623,7 @@
     </term>
     <term name="producer" form="short">
       <single>prod.</single>
-      <multiple>prods.</multiple>
+      <multiple>prod.</multiple>
     </term>
     <term name="script-writer" form="short">
       <single>writ.</single>
@@ -503,75 +633,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>ed.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>zost.</single>
-      <multiple>zost.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>prel.</single>
       <multiple>prel.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; tran.</single>
-      <multiple>eds. &amp; trans.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">by</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">directed by</term>
+    <term name="editor" form="verb">zostavil</term>
+    <term name="editor-translator" form="verb">zostavil &amp; preložil</term>
+    <term name="editortranslator" form="verb">zostavil &amp; preložil</term>
+    <term name="editorial-director" form="verb">zostavil</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="interviewer" form="verb">rozhovor urobil</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">zostavil</term>
-    <term name="editorial-director" form="verb">zostavil</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">rozhovor urobil</term>
     <term name="recipient" form="verb">adresát</term>
     <term name="reviewed-author" form="verb">by</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">preložil</term>
-    <term name="editortranslator" form="verb">zostavil &amp; preložil</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">zost. &amp; prel.</term>
+    <term name="editortranslator" form="verb-short">zost. &amp; prel.</term>
+    <term name="editorial-director" form="verb-short">ed.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
     <term name="translator" form="verb-short">prel.</term>
-    <term name="editortranslator" form="verb-short">zost. &amp; prel.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">január</term>
diff --git a/locales/sl-SI.xml b/locales/sl-SI.xml
--- a/locales/sl-SI.xml
+++ b/locales/sl-SI.xml
@@ -7,8 +7,11 @@
     <translator>
       <name>ratek1</name>
     </translator>
+    <translator>
+      <name>Uroš Mikanovič</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2014-11-06T09:41:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -22,26 +25,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">pridobljeno</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">in</term>
+    <term name="and others">in drugi</term>
+    <term name="anonymous">anonimni</term>
+    <term name="at">pri</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">dostopno na</term>
+    <term name="by"/>
+    <term name="circa">približno</term>
+    <term name="cited">citirano</term>
+    <term name="et-al">idr.</term>
     <term name="film">film</term>
+    <term name="forthcoming">pred izidom</term>
+    <term name="from">s</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">isto</term>
+    <term name="in">v</term>
+    <term name="in press">v tisku</term>
+    <term name="internet">internet</term>
+    <term name="letter">pismo</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">brez datuma</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">na spletu</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">osebna komunikacija</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">predstavljeno na</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>referenca</single>
+      <multiple>reference</multiple>
+    </term>
+    <term name="retrieved">pridobljeno</term>
+    <term name="review-of">review of</term>
+    <term name="scale">merilo</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -49,46 +78,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">pridobljeno</term>
-    <term name="and">in</term>
-    <term name="and others">in drugi</term>
-    <term name="anonymous">anonimni</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">anon.</term>
-    <term name="at">pri</term>
-    <term name="available at">dostopno na</term>
-    <term name="by"></term>
-    <term name="circa">približno</term>
     <term name="circa" form="short">prib.</term>
-    <term name="cited">citirano</term>
-    <term name="edition">
-      <single>izdaja</single>
-      <multiple>izdaje</multiple>
-    </term>
-    <term name="edition" form="short">izd.</term>
-    <term name="et-al">idr.</term>
-    <term name="forthcoming">pred izidom</term>
-    <term name="from">s</term>
-    <term name="ibid">isto</term>
-    <term name="in">v</term>
-    <term name="in press">v tisku</term>
-    <term name="internet">internet</term>
-    <term name="letter">pismo</term>
-    <term name="no date">brez datuma</term>
     <term name="no date" form="short">b. d.</term>
-    <term name="online">na spletu</term>
-    <term name="presented at">predstavljeno na</term>
-    <term name="reference">
-      <single>referenca</single>
-      <multiple>reference</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>ref.</single>
       <multiple>ref.</multiple>
     </term>
-    <term name="retrieved">pridobljeno</term>
-    <term name="scale">merilo</term>
-    <term name="version">različica</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -153,6 +157,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">n. št.</term>
     <term name="bc">pr. n. št.</term>
@@ -160,10 +172,10 @@
     <term name="ce">CE</term>
 
     <!-- PUNCTUATION -->
-    <term name="open-quote">„</term>
-    <term name="close-quote">“</term>
-    <term name="open-inner-quote">‚</term>
-    <term name="close-inner-quote">‘</term>
+    <term name="open-quote">»</term>
+    <term name="close-quote">«</term>
+    <term name="open-inner-quote">„</term>
+    <term name="close-inner-quote">“</term>
     <term name="page-range-delimiter">–</term>
     <term name="colon">:</term>
     <term name="comma">,</term>
@@ -185,54 +197,26 @@
     <term name="long-ordinal-10">deseta</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>knjiga</single>
       <multiple>knjige</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>poglavje</single>
       <multiple>poglavja</multiple>
@@ -241,6 +225,14 @@
       <single>stolpec</single>
       <multiple>stolpci</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>slika</single>
       <multiple>slike</multiple>
@@ -269,10 +261,6 @@
       <single>stran</single>
       <multiple>strani</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>stran</single>
-      <multiple>strani</multiple>
-    </term>
     <term name="paragraph">
       <single>odstavek</single>
       <multiple>odstavki</multiple>
@@ -281,6 +269,14 @@
       <single>del</single>
       <multiple>deli</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>odsek</single>
       <multiple>odseki</multiple>
@@ -289,6 +285,22 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>verz</single>
       <multiple>verzi</multiple>
@@ -299,45 +311,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">knj.</term>
+    <term name="chapter" form="short">pogl.</term>
+    <term name="column" form="short">stolp.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">knj.</term>
-    <term name="chapter" form="short">pogl.</term>
-    <term name="column" form="short">stolp.</term>
     <term name="figure" form="short">sl.</term>
     <term name="folio" form="short">fol.</term>
     <term name="issue" form="short">št.</term>
@@ -348,17 +340,37 @@
       <single>str.</single>
       <multiple>str.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>str.</single>
-      <multiple>str.</multiple>
-    </term>
     <term name="paragraph" form="short">odst.</term>
     <term name="part" form="short">del</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">ods.</term>
     <term name="sub-verbo" form="short">
       <single>s. v.</single>
       <multiple>s. v.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v.</single>
       <multiple>v.</multiple>
@@ -368,7 +380,7 @@
       <multiple>let.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -378,15 +390,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>številka</single>
+      <multiple>številke</multiple>
+    </term>
+    <term name="edition">
+      <single>izdaja</single>
+      <multiple>izdaje</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>opomba</single>
+      <multiple>opombe</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>stran</single>
+      <multiple>strani</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">različica</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">št.</term>
+    <term name="edition" form="short">izd.</term>
+    <term name="first-reference-note-number" form="short">op.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>str.</single>
+      <multiple>str.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -395,6 +490,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>režiser</single>
+      <multiple>režiserji</multiple>
+    </term>
+    <term name="editor">
+      <single>urednik</single>
+      <multiple>uredniki</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>urednik &amp; prevajalec</single>
+      <multiple>uredniki &amp; prevajalci</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>urednik &amp; prevajalec</single>
+      <multiple>uredniki &amp; prevajalci</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>glavni urednik</single>
+      <multiple>glavni uredniki</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -407,6 +522,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>ilustrator</single>
+      <multiple>ilustratorji</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -415,6 +535,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -423,6 +544,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -431,30 +554,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>režiser</single>
-      <multiple>režiserji</multiple>
-    </term>
-    <term name="editor">
-      <single>urednik</single>
-      <multiple>uredniki</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>glavni urednik</single>
-      <multiple>glavni uredniki</multiple>
-    </term>
-    <term name="illustrator">
-      <single>ilustrator</single>
-      <multiple>ilustratorji</multiple>
-    </term>
     <term name="translator">
       <single>prevajalec</single>
       <multiple>prevajalci</multiple>
     </term>
-    <term name="editortranslator">
-      <single>urednik &amp; prevajalec</single>
-      <multiple>uredniki &amp; prevajalci</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -469,10 +572,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>rež.</single>
+      <multiple>rež.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ur.</single>
+      <multiple>ur.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ur. &amp; prev.</single>
+      <multiple>ur. &amp; prev.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ur. &amp; prev.</single>
+      <multiple>ur. &amp; prev.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>gl. ur.</single>
+      <multiple>gl. ur.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ilus.</single>
+      <multiple>ilus.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -497,75 +624,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>rež.</single>
-      <multiple>rež.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ur.</single>
-      <multiple>ur.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>gl. ur.</single>
-      <multiple>gl. ur.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ilus.</single>
-      <multiple>ilus.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>prev.</single>
       <multiple>prev.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ur. &amp; prev.</single>
-      <multiple>ur. &amp; prev.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb"/>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">režiral</term>
+    <term name="editor" form="verb">uredil</term>
+    <term name="editor-translator" form="verb">uredil &amp; prevedel</term>
+    <term name="editortranslator" form="verb">uredil &amp; prevedel</term>
+    <term name="editorial-director" form="verb">uredil</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">ilustriral</term>
+    <term name="interviewer" form="verb">intervjuval</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb"></term>
-    <term name="director" form="verb">režiral</term>
-    <term name="editor" form="verb">uredil</term>
-    <term name="editorial-director" form="verb">uredil</term>
-    <term name="illustrator" form="verb">ilustriral</term>
-    <term name="interviewer" form="verb">intervjuval</term>
     <term name="recipient" form="verb">za</term>
     <term name="reviewed-author" form="verb">od</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">prevedel</term>
-    <term name="editortranslator" form="verb">uredil &amp; prevedel</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">rež.</term>
+    <term name="editor" form="verb-short">ured.</term>
+    <term name="editor-translator" form="verb-short">ured. &amp; prev. by</term>
+    <term name="editortranslator" form="verb-short">ured. &amp; prev. by</term>
+    <term name="editorial-director" form="verb-short">ured.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">ilus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">rež.</term>
-    <term name="editor" form="verb-short">ured.</term>
-    <term name="editorial-director" form="verb-short">ured.</term>
-    <term name="illustrator" form="verb-short">ilus.</term>
     <term name="translator" form="verb-short">prev.</term>
-    <term name="editortranslator" form="verb-short">ured. &amp; prev. by</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">januar</term>
diff --git a/locales/sr-Cyrl-RS.xml b/locales/sr-Cyrl-RS.xml
new file mode 100644
--- /dev/null
+++ b/locales/sr-Cyrl-RS.xml
@@ -0,0 +1,775 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="sr-Cyrl-RS">
+  <info>
+    <translator>
+      <name>Nikola N. Grubor</name>
+      <email>nikola.n.grubor@med.bg.ac.rs</email>
+      <uri>https://nikola-grubor.github.io/</uri>
+    </translator>
+    <translator>
+      <name>Marko Galjak</name>
+      <email>galjak@gmail.com</email>
+      <uri>https://galjak.com/</uri>
+    </translator>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2026-10-19T07:40:19+00:00</updated>
+  </info>
+  <style-options punctuation-in-quote="false"/>
+  <date form="text">
+    <date-part name="day" form="numeric" suffix=". "/>
+    <date-part name="month" suffix=" "/>
+    <date-part name="year" suffix="."/>
+  </date>
+  <date form="numeric">
+    <date-part name="year"/>
+    <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+    <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">приступљено</term>
+    <term name="advance-online-publication">претходно електронско објављивање</term>
+    <term name="album">албум</term>
+    <term name="and">и</term>
+    <term name="and others">и остали</term>
+    <term name="anonymous">анонимно</term>
+    <term name="at">на</term>
+    <term name="audio-recording">аудио-запис</term>
+    <term name="available at">доступно на</term>
+    <term name="by">ауторство:</term>
+    <term name="circa">око</term>
+    <term name="cited">цитирано</term>
+    <term name="et-al">и др.</term>
+    <term name="film">филм</term>
+    <term name="forthcoming">у припреми</term>
+    <term name="from">са</term>
+    <term name="henceforth">у даљем тексту</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">у</term>
+    <term name="in press">у штампи</term>
+    <term name="internet">интернет</term>
+    <term name="letter">писмо</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">без датума</term>
+    <term name="no-place">без места издања</term>
+    <term name="no-publisher">без издавача</term> <!-- sine nomine -->
+    <term name="on">на</term>
+    <term name="online">на интернету</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">оригинално дело објављено</term>
+    <term name="personal-communication">лична комуникација</term>
+    <term name="podcast">подкаст</term>
+    <term name="podcast-episode">епизода подкаста</term>
+    <term name="preprint">препринт</term>
+    <term name="presented at">представљено на</term>
+    <term name="radio-broadcast">радио-емисија</term>
+    <term name="radio-series">радио-серијал</term>
+    <term name="radio-series-episode">епизода радио-серијала</term>
+    <term name="reference">
+      <single>референца</single>
+      <multiple>референце</multiple>
+    </term>
+    <term name="retrieved">преузето</term>
+    <term name="review-of">приказ</term>
+    <term name="scale">размер</term>
+    <term name="special-issue">тематски број</term>
+    <term name="special-section">тематски одељак</term>
+    <term name="television-broadcast">телевизијска емисија</term>
+    <term name="television-series">телевизијска серија</term>
+    <term name="television-series-episode">епизода телевизијске серије</term>
+    <term name="video">видео</term>
+    <term name="working-paper">радна верзија рада</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="advance-online-publication" form="short">претходно електронско објављивање</term>
+    <term name="anonymous" form="short">анон.</term>
+    <term name="audio-recording" form="short">аудио-запис</term>
+    <term name="available at" form="short">доступно на</term>
+    <term name="circa" form="short">око</term>
+    <term name="cited" form="short">цит.</term>
+    <term name="film" form="short">филм</term>
+    <term name="from" form="short">са</term>
+    <term name="letter" form="short">писмо</term>
+    <term name="no date" form="short">б. д.</term>
+    <term name="no-place" form="short">б. м.</term>
+    <term name="no-publisher" form="short">б. и.</term>
+    <term name="original-work-published" form="short">оригинално дело објављено</term>
+    <term name="personal-communication" form="short">лична комуникација</term>
+    <term name="podcast-episode" form="short">еп. подкаста</term>
+    <term name="radio-broadcast" form="short">радио-емисија</term>
+    <term name="radio-series" form="short">радио-серијал</term>
+    <term name="radio-series-episode" form="short">еп. радио-серијала</term>
+    <term name="reference" form="short">
+      <single>реф.</single>
+      <multiple>реф.</multiple>
+    </term>
+    <term name="retrieved" form="short">преузето</term>
+    <term name="review-of" form="short">прик.</term>
+    <term name="scale" form="short">размер</term>
+    <term name="special-issue" form="short">тем. број</term>
+    <term name="special-section" form="short">тем. одељак</term>
+    <term name="television-broadcast" form="short">ТВ емисија</term>
+    <term name="television-series" form="short">ТВ серија</term>
+    <term name="television-series-episode" form="short">еп. ТВ серије</term>
+    <term name="video" form="short">видео</term>
+    <term name="working-paper" form="short">радна верзија рада</term>
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="article">препринт</term>
+    <term name="article-journal">чланак из часописа</term>
+    <term name="article-magazine">чланак из магазина</term>
+    <term name="article-newspaper">новински чланак</term>
+    <term name="bill">предлог закона</term>
+    <!-- book is in the list of locator terms -->
+    <term name="broadcast">емисија</term>
+    <!-- chapter is in the list of locator terms -->
+    <term name="classic">класично дело</term>
+    <term name="collection">архивска збирка</term>
+    <term name="dataset">скуп података</term>
+    <term name="document">документ</term>
+    <term name="entry">одредница</term>
+    <term name="entry-dictionary">речничка одредница</term>
+    <term name="entry-encyclopedia">енциклопедијска одредница</term>
+    <term name="event">догађај</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic">графички приказ</term>
+    <term name="hearing">саслушање</term>
+    <term name="interview">интервју</term>
+    <term name="legal_case">судски предмет</term>
+    <term name="legislation">закон</term>
+    <term name="manuscript">рукопис</term>
+    <term name="map">карта</term>
+    <term name="motion_picture">видео-запис</term>
+    <term name="musical_score">партитура</term>
+    <term name="pamphlet">брошура</term>
+    <term name="paper-conference">конференцијски рад</term>
+    <term name="patent">патент</term>
+    <term name="performance">извођење</term>
+    <term name="periodical">периодична публикација</term>
+    <term name="personal_communication">лична комуникација</term>
+    <term name="post">објава</term>
+    <term name="post-weblog">објава на блогу</term>
+    <term name="regulation">пропис</term>
+    <term name="report">извештај</term>
+    <term name="review">приказ</term>
+    <term name="review-book">приказ књиге</term>
+    <term name="software">софтвер</term>
+    <term name="song">аудио-запис</term>
+    <term name="speech">излагање</term>
+    <term name="standard">стандард</term>
+    <term name="thesis">теза</term>
+    <term name="treaty">међународни уговор</term>
+    <term name="webpage">веб-страница</term>
+
+    <!-- SHORT ITEM TYPE FORMS -->
+    <term name="article-journal" form="short">чл. из часописа</term>
+    <term name="article-magazine" form="short">чл. из магазина</term>
+    <term name="article-newspaper" form="short">новински чл.</term>
+    <term name="broadcast" form="short">емисија</term>
+    <term name="classic" form="short">клас. дело</term>
+    <term name="collection" form="short">арх. збирка</term>
+    <!-- book is in the list of locator terms -->
+    <!-- chapter is in the list of locator terms -->
+    <term name="document" form="short">док.</term>
+    <term name="entry-dictionary" form="short">речн. одредница</term>
+    <term name="entry-encyclopedia" form="short">енцикл. одредница</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic" form="short">граф. приказ</term>
+    <term name="interview" form="short">интервју</term>
+    <term name="legal_case" form="short">суд. предмет</term>
+    <term name="legislation" form="short">закон</term>
+    <term name="manuscript" form="short">рук.</term>
+    <term name="motion_picture" form="short">видео-запис</term>
+    <term name="musical_score" form="short">партитура</term>
+    <term name="pamphlet" form="short">брошура</term>
+    <term name="paper-conference" form="short">конф. рад</term>
+    <term name="patent" form="short">патент</term>
+    <term name="performance" form="short">извођење</term>
+    <term name="personal_communication" form="short">лична комуникација</term>
+    <term name="regulation" form="short">пропис</term>
+    <term name="report" form="short">изв.</term>
+    <term name="review" form="short">прик.</term>
+    <term name="review-book" form="short">прик. књ.</term>
+    <term name="software" form="short">софтвер</term>
+    <term name="song" form="short">аудио-запис</term>
+    <term name="standard" form="short">стандард</term>
+    <term name="thesis" form="short">теза</term>
+    <term name="webpage" form="short">веб-страница</term>
+
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <term name="hearing" form="verb">сведочење:</term>
+    <term name="review" form="verb">приказ:</term>
+    <term name="review-book" form="verb">приказ књиге:</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+    <term name="hearing" form="verb-short">сведоч.</term>
+    <term name="review" form="verb-short">прик.</term>
+    <term name="review-book" form="verb-short">прик. књ.</term>
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad"> н. е.</term>
+    <term name="bc"> п. н. е.</term>
+    <term name="bce"> п. н. е.</term>
+    <term name="ce"> н. е.</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">„</term>
+    <term name="close-quote">“</term>
+    <term name="open-inner-quote">‚</term>
+    <term name="close-inner-quote">‘</term>
+    <term name="page-range-delimiter">–</term>
+    <term name="colon">:</term>
+    <term name="comma">,</term>
+    <term name="semicolon">;</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal">.</term>
+    <term name="ordinal-01">.</term>
+    <term name="ordinal-02">.</term>
+    <term name="ordinal-03">.</term>
+    <term name="ordinal-11">.</term>
+    <term name="ordinal-12">.</term>
+    <term name="ordinal-13">.</term>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01">први</term>
+    <term name="long-ordinal-02">други</term>
+    <term name="long-ordinal-03">трећи</term>
+    <term name="long-ordinal-04">четврти</term>
+    <term name="long-ordinal-05">пети</term>
+    <term name="long-ordinal-06">шести</term>
+    <term name="long-ordinal-07">седми</term>
+    <term name="long-ordinal-08">осми</term>
+    <term name="long-ordinal-09">девети</term>
+    <term name="long-ordinal-10">десети</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="act">
+      <single>чин</single>
+      <multiple>чинови</multiple>
+    </term>
+    <term name="appendix">
+      <single>прилог</single>
+      <multiple>прилози</multiple>
+    </term>
+    <term name="article-locator">
+      <single>члан</single>
+      <multiple>чланови</multiple>
+    </term>
+    <term name="book">
+      <single>књига</single>
+      <multiple>књиге</multiple>
+    </term>
+    <term name="canon">
+      <single>канон</single>
+      <multiple>канони</multiple>
+    </term>
+    <term name="chapter">
+      <single>поглавље</single>
+      <multiple>поглавља</multiple>
+    </term>
+    <term name="column">
+      <single>стубац</single>
+      <multiple>ступци</multiple>
+    </term>
+    <term name="elocation">
+      <single>локација</single>
+      <multiple>локације</multiple>
+    </term>
+    <term name="equation">
+      <single>једначина</single>
+      <multiple>једначине</multiple>
+    </term>
+    <term name="figure">
+      <single>слика</single>
+      <multiple>слике</multiple>
+    </term>
+    <term name="folio">
+      <single>фолио</single>
+      <multiple>фолији</multiple>
+    </term>
+    <term name="issue">
+      <single>број</single>
+      <multiple>бројеви</multiple>
+    </term>
+    <term name="line">
+      <single>ред</single>
+      <multiple>редови</multiple>
+    </term>
+    <term name="note">
+      <single>напомена</single>
+      <multiple>напомене</multiple>
+    </term>
+    <term name="opus">
+      <single>опус</single>
+      <multiple>опуси</multiple>
+    </term>
+    <term name="page">
+      <single>страница</single>
+      <multiple>странице</multiple>
+    </term>
+    <term name="paragraph">
+      <single>параграф</single>
+      <multiple>параграфи</multiple>
+    </term>
+    <term name="part">
+      <single>део</single>
+      <multiple>делови</multiple>
+    </term>
+    <term name="rule">
+      <single>правило</single>
+      <multiple>правила</multiple>
+    </term>
+    <term name="scene">
+      <single>сцена</single>
+      <multiple>сцене</multiple>
+    </term>
+    <term name="section">
+      <single>одељак</single>
+      <multiple>одељци</multiple>
+    </term>
+    <term name="sub-verbo">
+      <single>sub verbo</single>
+      <multiple>sub verbis</multiple>
+    </term>
+    <term name="supplement">
+      <single>суплемент</single>
+      <multiple>суплементи</multiple>
+    </term>
+    <term name="table">
+      <single>табела</single>
+      <multiple>табеле</multiple>
+    </term>
+    <term name="timestamp">
+      <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>наслов</single>
+      <multiple>наслови</multiple>
+    </term>
+    <term name="verse">
+      <single>стих</single>
+      <multiple>стихови</multiple>
+    </term>
+    <term name="volume">
+      <single>том</single>
+      <multiple>томови</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+    <term name="appendix" form="short">
+      <single>прил.</single>
+      <multiple>прил.</multiple>
+    </term>
+    <term name="article-locator" form="short">
+      <single>чл.</single>
+      <multiple>чл.</multiple>
+    </term>
+    <term name="book" form="short">књ.</term>
+    <term name="canon" form="short">
+      <single>кан.</single>
+      <multiple>кан.</multiple>
+    </term>
+    <term name="chapter" form="short">погл.</term>
+    <term name="column" form="short">ступ.</term>
+    <term name="elocation" form="short">
+      <single>лок.</single>
+      <multiple>лок.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>једн.</single>
+      <multiple>једн.</multiple>
+    </term>
+    <term name="figure" form="short">сл.</term>
+    <term name="folio" form="short">фол.</term>
+    <term name="issue" form="short">бр.</term>
+    <term name="line" form="short">р.</term>
+    <term name="note" form="short">нап.</term>
+    <term name="opus" form="short">оп.</term>
+    <term name="page" form="short">
+      <single>стр.</single>
+      <multiple>стр.</multiple>
+    </term>
+    <term name="paragraph" form="short">пар.</term>
+    <term name="part" form="short">део</term>
+    <term name="rule" form="short">
+      <single>прав.</single>
+      <multiple>прав.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>сц.</single>
+      <multiple>сц.</multiple>
+    </term>
+    <term name="section" form="short">од.</term>
+    <term name="sub-verbo" form="short">
+      <single>s.v.</single>
+      <multiple>s.vv.</multiple>
+    </term>
+    <term name="supplement" form="short">
+      <single>супл.</single>
+      <multiple>супл.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>таб.</single>
+      <multiple>таб.</multiple>
+    </term>
+    <term name="title-locator" form="short">
+      <single>насл.</single>
+      <multiple>насл.</multiple>
+    </term>
+    <term name="verse" form="short">
+      <single>ст.</single>
+      <multiple>ст.</multiple>
+    </term>
+    <term name="volume" form="short">
+      <single>том</single>
+      <multiple>том</multiple>
+    </term>
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>поглавље</single>
+      <multiple>поглавља</multiple>
+    </term>
+    <term name="citation-number">
+      <single>цитат</single>
+      <multiple>цитати</multiple>
+    </term>
+    <term name="collection-number">
+      <single>број</single>
+      <multiple>бројеви</multiple>
+    </term>
+    <term name="edition">
+      <single>издање</single>
+      <multiple>издања</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>напомена</single>
+      <multiple>напомене</multiple>
+    </term>
+    <term name="number">
+      <single>број</single>
+      <multiple>бројеви</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>страница</single>
+      <multiple>страница</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>том</single>
+      <multiple>томова</multiple>
+    </term>
+    <term name="page-first">
+      <single>страница</single>
+      <multiple>странице</multiple>
+    </term>
+    <term name="printing">
+      <single>доштампавање</single>
+      <multiple>доштампавања</multiple>
+    </term>
+    <term name="version">верзија</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>погл.</single>
+      <multiple>погл.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>цит.</single>
+      <multiple>цит.</multiple>
+    </term>
+    <term name="collection-number" form="short">
+      <single>бр.</single>
+      <multiple>бр.</multiple>
+    </term>
+    <term name="edition" form="short">изд.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>нап.</single>
+      <multiple>нап.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>бр.</single>
+      <multiple>бр.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>стр.</single>
+      <multiple>стр.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>т.</single>
+      <multiple>т.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>стр.</single>
+      <multiple>стр.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>дошт.</single>
+      <multiple>дошт.</multiple>
+    </term>
+    <term name="version" form="short">верз.</term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>председавајући</single>
+      <multiple>председавајући</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>уредник</single>
+      <multiple>уредници</multiple>
+    </term>
+    <term name="compiler">
+      <single>приређивач</single>
+      <multiple>приређивачи</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>сарадник</single>
+      <multiple>сарадници</multiple>
+    </term>
+    <term name="curator">
+      <single>кустос</single>
+      <multiple>кустоси</multiple>
+    </term>
+    <term name="director">
+      <single>редитељ</single>
+      <multiple>редитељи</multiple>
+    </term>
+    <term name="editor">
+      <single>уредник</single>
+      <multiple>уредници</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>уредник и преводилац</single>
+      <multiple>уредници и преводиоци</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>уредник и преводилац</single>
+      <multiple>уредници и преводиоци</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>уредник</single>
+      <multiple>уредници</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>извршни продуцент</single>
+      <multiple>извршни продуценти</multiple>
+    </term>
+    <term name="guest">
+      <single>гост</single>
+      <multiple>гости</multiple>
+    </term>
+    <term name="host">
+      <single>водитељ</single>
+      <multiple>водитељи</multiple>
+    </term>
+    <term name="illustrator">
+      <single>илустратор</single>
+      <multiple>илустратори</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>наратор</single>
+      <multiple>наратори</multiple>
+    </term>
+    <term name="organizer">
+      <single>организатор</single>
+      <multiple>организатори</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>извођач</single>
+      <multiple>извођачи</multiple>
+    </term>
+    <term name="producer">
+      <single>продуцент</single>
+      <multiple>продуценти</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>сценариста</single>
+      <multiple>сценаристи</multiple>
+    </term>
+    <term name="series-creator">
+      <single>аутор серије</single>
+      <multiple>аутори серије</multiple>
+    </term>
+    <term name="translator">
+      <single>преводилац</single>
+      <multiple>преводиоци</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+    <term name="collection-editor" form="short">
+      <single>ур.</single>
+      <multiple>ур.</multiple>
+    </term>
+    <term name="compiler" form="short">
+      <single>прир.</single>
+      <multiple>прир.</multiple>
+    </term>
+    <term name="contributor" form="short">
+      <single>сарад.</single>
+      <multiple>сарад.</multiple>
+    </term>
+    <term name="curator" form="short">
+      <single>куст.</single>
+      <multiple>куст.</multiple>
+    </term>
+    <term name="director" form="short">
+      <single>ред.</single>
+      <multiple>ред.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ур.</single>
+      <multiple>ур.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ур. и прев.</single>
+      <multiple>ур. и прев.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ур. и прев.</single>
+      <multiple>ур. и прев.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ур.</single>
+      <multiple>ур.</multiple>
+    </term>
+    <term name="executive-producer" form="short">
+      <single>извр. прод.</single>
+      <multiple>извр. прод.</multiple>
+    </term>
+    <term name="illustrator" form="short">
+      <single>илус.</single>
+      <multiple>илус.</multiple>
+    </term>
+    <term name="narrator" form="short">
+      <single>нар.</single>
+      <multiple>нар.</multiple>
+    </term>
+    <term name="organizer" form="short">
+      <single>орг.</single>
+      <multiple>орг.</multiple>
+    </term>
+    <term name="performer" form="short">
+      <single>изв.</single>
+      <multiple>изв.</multiple>
+    </term>
+    <term name="producer" form="short">
+      <single>прод.</single>
+      <multiple>прод.</multiple>
+    </term>
+    <term name="script-writer" form="short">
+      <single>сцен.</single>
+      <multiple>сцен.</multiple>
+    </term>
+    <term name="series-creator" form="short">
+      <single>аутор сер.</single>
+      <multiple>аутори сер.</multiple>
+    </term>
+    <term name="translator" form="short">
+      <single>прев.</single>
+      <multiple>прев.</multiple>
+    </term>
+
+    <!-- VERB ROLE FORMS -->
+    <term name="chair" form="verb">председавање:</term>
+    <term name="collection-editor" form="verb">уредништво:</term>
+    <term name="compiler" form="verb">приређивање:</term>
+    <term name="composer" form="verb">музика:</term>
+    <term name="container-author" form="verb">ауторство:</term>
+    <term name="contributor" form="verb">сарадња:</term>
+    <term name="curator" form="verb">кустоски рад:</term>
+    <term name="director" form="verb">режија:</term>
+    <term name="editor" form="verb">уредништво:</term>
+    <term name="editor-translator" form="verb">уредништво и превод:</term>
+    <term name="editortranslator" form="verb">уредништво и превод:</term>
+    <term name="editorial-director" form="verb">уредништво:</term>
+    <term name="executive-producer" form="verb">извршна продукција:</term>
+    <term name="guest" form="verb">гостовање:</term>
+    <term name="host" form="verb">вођење:</term>
+    <term name="illustrator" form="verb">илустрације:</term>
+    <term name="interviewer" form="verb">интервјуисање:</term>
+    <term name="narrator" form="verb">нарација:</term>
+    <term name="organizer" form="verb">организација:</term>
+    <term name="original-author" form="verb">ауторство:</term>
+    <term name="performer" form="verb">извођење:</term>
+    <term name="producer" form="verb">продукција:</term>
+    <term name="recipient" form="verb">прималац:</term>
+    <term name="reviewed-author" form="verb">ауторство:</term>
+    <term name="script-writer" form="verb">сценарио:</term>
+    <term name="series-creator" form="verb">ауторство серије:</term>
+    <term name="translator" form="verb">превод:</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ур.</term>
+    <term name="compiler" form="verb-short">прир.</term>
+    <term name="composer" form="verb-short">муз.</term>
+    <term name="curator" form="verb-short">куст.</term>
+    <term name="director" form="verb-short">реж.</term>
+    <term name="editor" form="verb-short">ур.</term>
+    <term name="editor-translator" form="verb-short">ур. и прев.</term>
+    <term name="editortranslator" form="verb-short">ур. и прев.</term>
+    <term name="editorial-director" form="verb-short">ур.</term>
+    <term name="executive-producer" form="verb-short">извр. прод.</term>
+    <term name="illustrator" form="verb-short">илус.</term>
+    <term name="narrator" form="verb-short">нар.</term>
+    <term name="organizer" form="verb-short">орг.</term>
+    <term name="performer" form="verb-short">изв.</term>
+    <term name="producer" form="verb-short">прод.</term>
+    <term name="script-writer" form="verb-short">сцен.</term>
+    <term name="translator" form="verb-short">прев.</term>
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">јануар</term>
+    <term name="month-02">фебруар</term>
+    <term name="month-03">март</term>
+    <term name="month-04">април</term>
+    <term name="month-05">мај</term>
+    <term name="month-06">јун</term>
+    <term name="month-07">јул</term>
+    <term name="month-08">август</term>
+    <term name="month-09">септембар</term>
+    <term name="month-10">октобар</term>
+    <term name="month-11">новембар</term>
+    <term name="month-12">децембар</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">јан.</term>
+    <term name="month-02" form="short">феб.</term>
+    <term name="month-03" form="short">март</term>
+    <term name="month-04" form="short">апр.</term>
+    <term name="month-05" form="short">мај</term>
+    <term name="month-06" form="short">јун</term>
+    <term name="month-07" form="short">јул</term>
+    <term name="month-08" form="short">авг.</term>
+    <term name="month-09" form="short">сеп.</term>
+    <term name="month-10" form="short">окт.</term>
+    <term name="month-11" form="short">нов.</term>
+    <term name="month-12" form="short">дец.</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">пролеће</term>
+    <term name="season-02">лето</term>
+    <term name="season-03">јесен</term>
+    <term name="season-04">зима</term>
+  </terms>
+</locale>
diff --git a/locales/sr-Latn-RS.xml b/locales/sr-Latn-RS.xml
new file mode 100644
--- /dev/null
+++ b/locales/sr-Latn-RS.xml
@@ -0,0 +1,775 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="sr-Latn-RS">
+  <info>
+    <translator>
+      <name>Nikola N. Grubor</name>
+      <email>nikola.n.grubor@med.bg.ac.rs</email>
+      <uri>https://nikola-grubor.github.io/</uri>
+    </translator>
+    <translator>
+      <name>Marko Galjak</name>
+      <email>galjak@gmail.com</email>
+      <uri>https://galjak.com/</uri>
+    </translator>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2026-10-19T07:40:19+00:00</updated>
+  </info>
+  <style-options punctuation-in-quote="false"/>
+  <date form="text">
+    <date-part name="day" form="numeric" suffix=". "/>
+    <date-part name="month" suffix=" "/>
+    <date-part name="year" suffix="."/>
+  </date>
+  <date form="numeric">
+    <date-part name="year"/>
+    <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+    <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">pristupljeno</term>
+    <term name="advance-online-publication">prethodno elektronsko objavljivanje</term>
+    <term name="album">album</term>
+    <term name="and">i</term>
+    <term name="and others">i ostali</term>
+    <term name="anonymous">anonimno</term>
+    <term name="at">na</term>
+    <term name="audio-recording">audio-zapis</term>
+    <term name="available at">dostupno na</term>
+    <term name="by">autorstvo:</term>
+    <term name="circa">oko</term>
+    <term name="cited">citirano</term>
+    <term name="et-al">i dr.</term>
+    <term name="film">film</term>
+    <term name="forthcoming">u pripremi</term>
+    <term name="from">sa</term>
+    <term name="henceforth">u daljem tekstu</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">u</term>
+    <term name="in press">u štampi</term>
+    <term name="internet">internet</term>
+    <term name="letter">pismo</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">bez datuma</term>
+    <term name="no-place">bez mesta izdanja</term>
+    <term name="no-publisher">bez izdavača</term> <!-- sine nomine -->
+    <term name="on">na</term>
+    <term name="online">na internetu</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">originalno delo objavljeno</term>
+    <term name="personal-communication">lična komunikacija</term>
+    <term name="podcast">podkast</term>
+    <term name="podcast-episode">epizoda podkasta</term>
+    <term name="preprint">preprint</term>
+    <term name="presented at">predstavljeno na</term>
+    <term name="radio-broadcast">radio-emisija</term>
+    <term name="radio-series">radio-serijal</term>
+    <term name="radio-series-episode">epizoda radio-serijala</term>
+    <term name="reference">
+      <single>referenca</single>
+      <multiple>reference</multiple>
+    </term>
+    <term name="retrieved">preuzeto</term>
+    <term name="review-of">prikaz</term>
+    <term name="scale">razmer</term>
+    <term name="special-issue">tematski broj</term>
+    <term name="special-section">tematski odeljak</term>
+    <term name="television-broadcast">televizijska emisija</term>
+    <term name="television-series">televizijska serija</term>
+    <term name="television-series-episode">epizoda televizijske serije</term>
+    <term name="video">video</term>
+    <term name="working-paper">radna verzija rada</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <term name="advance-online-publication" form="short">prethodno elektronsko objavljivanje</term>
+    <term name="anonymous" form="short">anon.</term>
+    <term name="audio-recording" form="short">audio-zapis</term>
+    <term name="available at" form="short">dostupno na</term>
+    <term name="circa" form="short">oko</term>
+    <term name="cited" form="short">cit.</term>
+    <term name="film" form="short">film</term>
+    <term name="from" form="short">sa</term>
+    <term name="letter" form="short">pismo</term>
+    <term name="no date" form="short">b. d.</term>
+    <term name="no-place" form="short">b. m.</term>
+    <term name="no-publisher" form="short">b. i.</term>
+    <term name="original-work-published" form="short">originalno delo objavljeno</term>
+    <term name="personal-communication" form="short">lična komunikacija</term>
+    <term name="podcast-episode" form="short">ep. podkasta</term>
+    <term name="radio-broadcast" form="short">radio-emisija</term>
+    <term name="radio-series" form="short">radio-serijal</term>
+    <term name="radio-series-episode" form="short">ep. radio-serijala</term>
+    <term name="reference" form="short">
+      <single>ref.</single>
+      <multiple>ref.</multiple>
+    </term>
+    <term name="retrieved" form="short">preuzeto</term>
+    <term name="review-of" form="short">prik.</term>
+    <term name="scale" form="short">razmer</term>
+    <term name="special-issue" form="short">tem. broj</term>
+    <term name="special-section" form="short">tem. odeljak</term>
+    <term name="television-broadcast" form="short">TV emisija</term>
+    <term name="television-series" form="short">TV serija</term>
+    <term name="television-series-episode" form="short">ep. TV serije</term>
+    <term name="video" form="short">video</term>
+    <term name="working-paper" form="short">radna verzija rada</term>
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="article">preprint</term>
+    <term name="article-journal">članak iz časopisa</term>
+    <term name="article-magazine">članak iz magazina</term>
+    <term name="article-newspaper">novinski članak</term>
+    <term name="bill">predlog zakona</term>
+    <!-- book is in the list of locator terms -->
+    <term name="broadcast">emisija</term>
+    <!-- chapter is in the list of locator terms -->
+    <term name="classic">klasično delo</term>
+    <term name="collection">arhivska zbirka</term>
+    <term name="dataset">skup podataka</term>
+    <term name="document">dokument</term>
+    <term name="entry">odrednica</term>
+    <term name="entry-dictionary">rečnička odrednica</term>
+    <term name="entry-encyclopedia">enciklopedijska odrednica</term>
+    <term name="event">događaj</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic">grafički prikaz</term>
+    <term name="hearing">saslušanje</term>
+    <term name="interview">intervju</term>
+    <term name="legal_case">sudski predmet</term>
+    <term name="legislation">zakon</term>
+    <term name="manuscript">rukopis</term>
+    <term name="map">karta</term>
+    <term name="motion_picture">video-zapis</term>
+    <term name="musical_score">partitura</term>
+    <term name="pamphlet">brošura</term>
+    <term name="paper-conference">konferencijski rad</term>
+    <term name="patent">patent</term>
+    <term name="performance">izvođenje</term>
+    <term name="periodical">periodična publikacija</term>
+    <term name="personal_communication">lična komunikacija</term>
+    <term name="post">objava</term>
+    <term name="post-weblog">objava na blogu</term>
+    <term name="regulation">propis</term>
+    <term name="report">izveštaj</term>
+    <term name="review">prikaz</term>
+    <term name="review-book">prikaz knjige</term>
+    <term name="software">softver</term>
+    <term name="song">audio-zapis</term>
+    <term name="speech">izlaganje</term>
+    <term name="standard">standard</term>
+    <term name="thesis">teza</term>
+    <term name="treaty">međunarodni ugovor</term>
+    <term name="webpage">veb-stranica</term>
+
+    <!-- SHORT ITEM TYPE FORMS -->
+    <term name="article-journal" form="short">čl. iz časopisa</term>
+    <term name="article-magazine" form="short">čl. iz magazina</term>
+    <term name="article-newspaper" form="short">novinski čl.</term>
+    <term name="broadcast" form="short">emisija</term>
+    <term name="classic" form="short">klas. delo</term>
+    <term name="collection" form="short">arh. zbirka</term>
+    <!-- book is in the list of locator terms -->
+    <!-- chapter is in the list of locator terms -->
+    <term name="document" form="short">dok.</term>
+    <term name="entry-dictionary" form="short">rečn. odrednica</term>
+    <term name="entry-encyclopedia" form="short">encikl. odrednica</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic" form="short">graf. prikaz</term>
+    <term name="interview" form="short">intervju</term>
+    <term name="legal_case" form="short">sud. predmet</term>
+    <term name="legislation" form="short">zakon</term>
+    <term name="manuscript" form="short">ruk.</term>
+    <term name="motion_picture" form="short">video-zapis</term>
+    <term name="musical_score" form="short">partitura</term>
+    <term name="pamphlet" form="short">brošura</term>
+    <term name="paper-conference" form="short">konf. rad</term>
+    <term name="patent" form="short">patent</term>
+    <term name="performance" form="short">izvođenje</term>
+    <term name="personal_communication" form="short">lična komunikacija</term>
+    <term name="regulation" form="short">propis</term>
+    <term name="report" form="short">izv.</term>
+    <term name="review" form="short">prik.</term>
+    <term name="review-book" form="short">prik. knj.</term>
+    <term name="software" form="short">softver</term>
+    <term name="song" form="short">audio-zapis</term>
+    <term name="standard" form="short">standard</term>
+    <term name="thesis" form="short">teza</term>
+    <term name="webpage" form="short">veb-stranica</term>
+
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <term name="hearing" form="verb">svedočenje:</term>
+    <term name="review" form="verb">prikaz:</term>
+    <term name="review-book" form="verb">prikaz knjige:</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+    <term name="hearing" form="verb-short">svedoč.</term>
+    <term name="review" form="verb-short">prik.</term>
+    <term name="review-book" form="verb-short">prik. knj.</term>
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad"> n. e.</term>
+    <term name="bc"> p. n. e.</term>
+    <term name="bce"> p. n. e.</term>
+    <term name="ce"> n. e.</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">„</term>
+    <term name="close-quote">“</term>
+    <term name="open-inner-quote">‚</term>
+    <term name="close-inner-quote">‘</term>
+    <term name="page-range-delimiter">–</term>
+    <term name="colon">:</term>
+    <term name="comma">,</term>
+    <term name="semicolon">;</term>
+
+    <!-- ORDINALS -->
+    <term name="ordinal">.</term>
+    <term name="ordinal-01">.</term>
+    <term name="ordinal-02">.</term>
+    <term name="ordinal-03">.</term>
+    <term name="ordinal-11">.</term>
+    <term name="ordinal-12">.</term>
+    <term name="ordinal-13">.</term>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01">prvi</term>
+    <term name="long-ordinal-02">drugi</term>
+    <term name="long-ordinal-03">treći</term>
+    <term name="long-ordinal-04">četvrti</term>
+    <term name="long-ordinal-05">peti</term>
+    <term name="long-ordinal-06">šesti</term>
+    <term name="long-ordinal-07">sedmi</term>
+    <term name="long-ordinal-08">osmi</term>
+    <term name="long-ordinal-09">deveti</term>
+    <term name="long-ordinal-10">deseti</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="act">
+      <single>čin</single>
+      <multiple>činovi</multiple>
+    </term>
+    <term name="appendix">
+      <single>prilog</single>
+      <multiple>prilozi</multiple>
+    </term>
+    <term name="article-locator">
+      <single>član</single>
+      <multiple>članovi</multiple>
+    </term>
+    <term name="book">
+      <single>knjiga</single>
+      <multiple>knjige</multiple>
+    </term>
+    <term name="canon">
+      <single>kanon</single>
+      <multiple>kanoni</multiple>
+    </term>
+    <term name="chapter">
+      <single>poglavlje</single>
+      <multiple>poglavlja</multiple>
+    </term>
+    <term name="column">
+      <single>stubac</single>
+      <multiple>stupci</multiple>
+    </term>
+    <term name="elocation">
+      <single>lokacija</single>
+      <multiple>lokacije</multiple>
+    </term>
+    <term name="equation">
+      <single>jednačina</single>
+      <multiple>jednačine</multiple>
+    </term>
+    <term name="figure">
+      <single>slika</single>
+      <multiple>slike</multiple>
+    </term>
+    <term name="folio">
+      <single>folio</single>
+      <multiple>foliji</multiple>
+    </term>
+    <term name="issue">
+      <single>broj</single>
+      <multiple>brojevi</multiple>
+    </term>
+    <term name="line">
+      <single>red</single>
+      <multiple>redovi</multiple>
+    </term>
+    <term name="note">
+      <single>napomena</single>
+      <multiple>napomene</multiple>
+    </term>
+    <term name="opus">
+      <single>opus</single>
+      <multiple>opusi</multiple>
+    </term>
+    <term name="page">
+      <single>stranica</single>
+      <multiple>stranice</multiple>
+    </term>
+    <term name="paragraph">
+      <single>paragraf</single>
+      <multiple>paragrafi</multiple>
+    </term>
+    <term name="part">
+      <single>deo</single>
+      <multiple>delovi</multiple>
+    </term>
+    <term name="rule">
+      <single>pravilo</single>
+      <multiple>pravila</multiple>
+    </term>
+    <term name="scene">
+      <single>scena</single>
+      <multiple>scene</multiple>
+    </term>
+    <term name="section">
+      <single>odeljak</single>
+      <multiple>odeljci</multiple>
+    </term>
+    <term name="sub-verbo">
+      <single>sub verbo</single>
+      <multiple>sub verbis</multiple>
+    </term>
+    <term name="supplement">
+      <single>suplement</single>
+      <multiple>suplementi</multiple>
+    </term>
+    <term name="table">
+      <single>tabela</single>
+      <multiple>tabele</multiple>
+    </term>
+    <term name="timestamp">
+      <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>naslov</single>
+      <multiple>naslovi</multiple>
+    </term>
+    <term name="verse">
+      <single>stih</single>
+      <multiple>stihovi</multiple>
+    </term>
+    <term name="volume">
+      <single>tom</single>
+      <multiple>tomovi</multiple>
+    </term>
+
+    <!-- SHORT LOCATOR FORMS -->
+    <term name="appendix" form="short">
+      <single>pril.</single>
+      <multiple>pril.</multiple>
+    </term>
+    <term name="article-locator" form="short">
+      <single>čl.</single>
+      <multiple>čl.</multiple>
+    </term>
+    <term name="book" form="short">knj.</term>
+    <term name="canon" form="short">
+      <single>kan.</single>
+      <multiple>kan.</multiple>
+    </term>
+    <term name="chapter" form="short">pogl.</term>
+    <term name="column" form="short">stup.</term>
+    <term name="elocation" form="short">
+      <single>lok.</single>
+      <multiple>lok.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>jedn.</single>
+      <multiple>jedn.</multiple>
+    </term>
+    <term name="figure" form="short">sl.</term>
+    <term name="folio" form="short">fol.</term>
+    <term name="issue" form="short">br.</term>
+    <term name="line" form="short">r.</term>
+    <term name="note" form="short">nap.</term>
+    <term name="opus" form="short">op.</term>
+    <term name="page" form="short">
+      <single>str.</single>
+      <multiple>str.</multiple>
+    </term>
+    <term name="paragraph" form="short">par.</term>
+    <term name="part" form="short">deo</term>
+    <term name="rule" form="short">
+      <single>prav.</single>
+      <multiple>prav.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>sc.</multiple>
+    </term>
+    <term name="section" form="short">od.</term>
+    <term name="sub-verbo" form="short">
+      <single>s.v.</single>
+      <multiple>s.vv.</multiple>
+    </term>
+    <term name="supplement" form="short">
+      <single>supl.</single>
+      <multiple>supl.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tab.</single>
+      <multiple>tab.</multiple>
+    </term>
+    <term name="title-locator" form="short">
+      <single>nasl.</single>
+      <multiple>nasl.</multiple>
+    </term>
+    <term name="verse" form="short">
+      <single>st.</single>
+      <multiple>st.</multiple>
+    </term>
+    <term name="volume" form="short">
+      <single>tom</single>
+      <multiple>tom</multiple>
+    </term>
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>poglavlje</single>
+      <multiple>poglavlja</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citat</single>
+      <multiple>citati</multiple>
+    </term>
+    <term name="collection-number">
+      <single>broj</single>
+      <multiple>brojevi</multiple>
+    </term>
+    <term name="edition">
+      <single>izdanje</single>
+      <multiple>izdanja</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>napomena</single>
+      <multiple>napomene</multiple>
+    </term>
+    <term name="number">
+      <single>broj</single>
+      <multiple>brojevi</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>stranica</single>
+      <multiple>stranica</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>tom</single>
+      <multiple>tomova</multiple>
+    </term>
+    <term name="page-first">
+      <single>stranica</single>
+      <multiple>stranice</multiple>
+    </term>
+    <term name="printing">
+      <single>doštampavanje</single>
+      <multiple>doštampavanja</multiple>
+    </term>
+    <term name="version">verzija</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>pogl.</single>
+      <multiple>pogl.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cit.</multiple>
+    </term>
+    <term name="collection-number" form="short">
+      <single>br.</single>
+      <multiple>br.</multiple>
+    </term>
+    <term name="edition" form="short">izd.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>nap.</single>
+      <multiple>nap.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>br.</single>
+      <multiple>br.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>str.</single>
+      <multiple>str.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>t.</single>
+      <multiple>t.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>str.</single>
+      <multiple>str.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>došt.</single>
+      <multiple>došt.</multiple>
+    </term>
+    <term name="version" form="short">verz.</term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>predsedavajući</single>
+      <multiple>predsedavajući</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>urednik</single>
+      <multiple>urednici</multiple>
+    </term>
+    <term name="compiler">
+      <single>priređivač</single>
+      <multiple>priređivači</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>saradnik</single>
+      <multiple>saradnici</multiple>
+    </term>
+    <term name="curator">
+      <single>kustos</single>
+      <multiple>kustosi</multiple>
+    </term>
+    <term name="director">
+      <single>reditelj</single>
+      <multiple>reditelji</multiple>
+    </term>
+    <term name="editor">
+      <single>urednik</single>
+      <multiple>urednici</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>urednik i prevodilac</single>
+      <multiple>urednici i prevodioci</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>urednik i prevodilac</single>
+      <multiple>urednici i prevodioci</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>urednik</single>
+      <multiple>urednici</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>izvršni producent</single>
+      <multiple>izvršni producenti</multiple>
+    </term>
+    <term name="guest">
+      <single>gost</single>
+      <multiple>gosti</multiple>
+    </term>
+    <term name="host">
+      <single>voditelj</single>
+      <multiple>voditelji</multiple>
+    </term>
+    <term name="illustrator">
+      <single>ilustrator</single>
+      <multiple>ilustratori</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>narator</single>
+      <multiple>naratori</multiple>
+    </term>
+    <term name="organizer">
+      <single>organizator</single>
+      <multiple>organizatori</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>izvođač</single>
+      <multiple>izvođači</multiple>
+    </term>
+    <term name="producer">
+      <single>producent</single>
+      <multiple>producenti</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>scenarista</single>
+      <multiple>scenaristi</multiple>
+    </term>
+    <term name="series-creator">
+      <single>autor serije</single>
+      <multiple>autori serije</multiple>
+    </term>
+    <term name="translator">
+      <single>prevodilac</single>
+      <multiple>prevodioci</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+    <term name="collection-editor" form="short">
+      <single>ur.</single>
+      <multiple>ur.</multiple>
+    </term>
+    <term name="compiler" form="short">
+      <single>prir.</single>
+      <multiple>prir.</multiple>
+    </term>
+    <term name="contributor" form="short">
+      <single>sarad.</single>
+      <multiple>sarad.</multiple>
+    </term>
+    <term name="curator" form="short">
+      <single>kust.</single>
+      <multiple>kust.</multiple>
+    </term>
+    <term name="director" form="short">
+      <single>red.</single>
+      <multiple>red.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ur.</single>
+      <multiple>ur.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ur. i prev.</single>
+      <multiple>ur. i prev.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ur. i prev.</single>
+      <multiple>ur. i prev.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ur.</single>
+      <multiple>ur.</multiple>
+    </term>
+    <term name="executive-producer" form="short">
+      <single>izvr. prod.</single>
+      <multiple>izvr. prod.</multiple>
+    </term>
+    <term name="illustrator" form="short">
+      <single>ilus.</single>
+      <multiple>ilus.</multiple>
+    </term>
+    <term name="narrator" form="short">
+      <single>nar.</single>
+      <multiple>nar.</multiple>
+    </term>
+    <term name="organizer" form="short">
+      <single>org.</single>
+      <multiple>org.</multiple>
+    </term>
+    <term name="performer" form="short">
+      <single>izv.</single>
+      <multiple>izv.</multiple>
+    </term>
+    <term name="producer" form="short">
+      <single>prod.</single>
+      <multiple>prod.</multiple>
+    </term>
+    <term name="script-writer" form="short">
+      <single>scen.</single>
+      <multiple>scen.</multiple>
+    </term>
+    <term name="series-creator" form="short">
+      <single>autor ser.</single>
+      <multiple>autori ser.</multiple>
+    </term>
+    <term name="translator" form="short">
+      <single>prev.</single>
+      <multiple>prev.</multiple>
+    </term>
+
+    <!-- VERB ROLE FORMS -->
+    <term name="chair" form="verb">predsedavanje:</term>
+    <term name="collection-editor" form="verb">uredništvo:</term>
+    <term name="compiler" form="verb">priređivanje:</term>
+    <term name="composer" form="verb">muzika:</term>
+    <term name="container-author" form="verb">autorstvo:</term>
+    <term name="contributor" form="verb">saradnja:</term>
+    <term name="curator" form="verb">kustoski rad:</term>
+    <term name="director" form="verb">režija:</term>
+    <term name="editor" form="verb">uredništvo:</term>
+    <term name="editor-translator" form="verb">uredništvo i prevod:</term>
+    <term name="editortranslator" form="verb">uredništvo i prevod:</term>
+    <term name="editorial-director" form="verb">uredništvo:</term>
+    <term name="executive-producer" form="verb">izvršna produkcija:</term>
+    <term name="guest" form="verb">gostovanje:</term>
+    <term name="host" form="verb">vođenje:</term>
+    <term name="illustrator" form="verb">ilustracije:</term>
+    <term name="interviewer" form="verb">intervjuisanje:</term>
+    <term name="narrator" form="verb">naracija:</term>
+    <term name="organizer" form="verb">organizacija:</term>
+    <term name="original-author" form="verb">autorstvo:</term>
+    <term name="performer" form="verb">izvođenje:</term>
+    <term name="producer" form="verb">produkcija:</term>
+    <term name="recipient" form="verb">primalac:</term>
+    <term name="reviewed-author" form="verb">autorstvo:</term>
+    <term name="script-writer" form="verb">scenario:</term>
+    <term name="series-creator" form="verb">autorstvo serije:</term>
+    <term name="translator" form="verb">prevod:</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ur.</term>
+    <term name="compiler" form="verb-short">prir.</term>
+    <term name="composer" form="verb-short">muz.</term>
+    <term name="curator" form="verb-short">kust.</term>
+    <term name="director" form="verb-short">rež.</term>
+    <term name="editor" form="verb-short">ur.</term>
+    <term name="editor-translator" form="verb-short">ur. i prev.</term>
+    <term name="editortranslator" form="verb-short">ur. i prev.</term>
+    <term name="editorial-director" form="verb-short">ur.</term>
+    <term name="executive-producer" form="verb-short">izvr. prod.</term>
+    <term name="illustrator" form="verb-short">ilus.</term>
+    <term name="narrator" form="verb-short">nar.</term>
+    <term name="organizer" form="verb-short">org.</term>
+    <term name="performer" form="verb-short">izv.</term>
+    <term name="producer" form="verb-short">prod.</term>
+    <term name="script-writer" form="verb-short">scen.</term>
+    <term name="translator" form="verb-short">prev.</term>
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">januar</term>
+    <term name="month-02">februar</term>
+    <term name="month-03">mart</term>
+    <term name="month-04">april</term>
+    <term name="month-05">maj</term>
+    <term name="month-06">jun</term>
+    <term name="month-07">jul</term>
+    <term name="month-08">avgust</term>
+    <term name="month-09">septembar</term>
+    <term name="month-10">oktobar</term>
+    <term name="month-11">novembar</term>
+    <term name="month-12">decembar</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <term name="month-01" form="short">jan.</term>
+    <term name="month-02" form="short">feb.</term>
+    <term name="month-03" form="short">mart</term>
+    <term name="month-04" form="short">apr.</term>
+    <term name="month-05" form="short">maj</term>
+    <term name="month-06" form="short">jun</term>
+    <term name="month-07" form="short">jul</term>
+    <term name="month-08" form="short">avg.</term>
+    <term name="month-09" form="short">sep.</term>
+    <term name="month-10" form="short">okt.</term>
+    <term name="month-11" form="short">nov.</term>
+    <term name="month-12" form="short">dec.</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">proleće</term>
+    <term name="season-02">leto</term>
+    <term name="season-03">jesen</term>
+    <term name="season-04">zima</term>
+  </terms>
+</locale>
diff --git a/locales/sr-RS.xml b/locales/sr-RS.xml
--- a/locales/sr-RS.xml
+++ b/locales/sr-RS.xml
@@ -54,10 +54,26 @@
     <term name="circa">circa</term>
     <term name="circa" form="short">c.</term>
     <term name="cited">цитирано</term>
+    <term name="first-reference-note-number">
+      <single>reference</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
     <term name="edition">
       <single>издање</single>
       <multiple>издања</multiple>
     </term>
+    <term name="first-reference-note-number" form="short">
+      <single>ref.</single>
+      <multiple>refs.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
     <term name="edition" form="short">изд.</term>
     <term name="et-al">и остали</term>
     <term name="forthcoming">долазећи</term>
@@ -79,6 +95,8 @@
       <single>ref.</single>
       <multiple>refs.</multiple>
     </term>
+    <term name="review-of">review of</term>
+    <term name="review-of" form="short">rev. of</term>
     <term name="retrieved">преузето</term>
     <term name="scale">scale</term>
     <term name="version">version</term>
@@ -147,6 +165,12 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">AD</term>
     <term name="bc">BC</term>
@@ -269,6 +293,28 @@
       <single>страница</single>
       <multiple>странице</multiple>
     </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">изд.</term>
     <term name="number-of-pages">
       <single>страница</single>
       <multiple>странице</multiple>
@@ -285,6 +331,10 @@
       <single>одељак</single>
       <multiple>одељака</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
     <term name="sub-verbo">
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
@@ -348,6 +398,20 @@
       <single>стр.</single>
       <multiple>стр.</multiple>
     </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+    
+
     <term name="number-of-pages" form="short">
       <single>стр.</single>
       <multiple>стр.</multiple>
@@ -355,6 +419,10 @@
     <term name="paragraph" form="short">пар.</term>
     <term name="part" form="short">део</term>
     <term name="section" form="short">од.</term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
@@ -373,12 +441,28 @@
       <single>¶</single>
       <multiple>¶¶</multiple>
     </term>
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>број</single>
+      <multiple>бројеви</multiple>
+    </term>
     <term name="section" form="symbol">
       <single>§</single>
       <multiple>§§</multiple>
     </term>
 
     <!-- LONG ROLE FORMS -->
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
@@ -523,6 +607,7 @@
     </term>
 
     <!-- VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="chair" form="verb">chaired by</term>
     <term name="compiler" form="verb">compiled by</term>
     <term name="contributor" form="verb">with</term>
@@ -544,6 +629,7 @@
     <term name="interviewer" form="verb">интервјуисао</term>
     <term name="recipient" form="verb">прима</term>
     <term name="reviewed-author" form="verb">by</term>
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="translator" form="verb">превео</term>
     <term name="editortranslator" form="verb">edited &amp; translated by</term>
 
diff --git a/locales/sv-SE.xml b/locales/sv-SE.xml
--- a/locales/sv-SE.xml
+++ b/locales/sv-SE.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="sv-SE">
+<!-- Abbreviations are from: 1. https://kib.ki.se/skriva-referera/skriva-referenser-att-ange-kalla/referensguider/referensguide-apa-7 (cited hereafter as KIBa) -->
+<!--                         2. https://kib.ki.se/skriva-referera/skriva-referenser-att-ange-kalla/referensguider/referensguide-vancouver (cited hereafter as KIBv) -->
+<!--                         3. https://www.isof.se/namn/personnamn/sveriges-medeltida-personnamn/projektet-sveriges-medeltida-personnamn-smp/forkortningsordlista-smp (cited hereafter as ISOF) -->
+<!--                         4. https://www.dansk-og-svensk.dk/danskt_lexikon2/almindelige_svenske_forkortelser/forkortelser.htm (cited hereafter as DASV) -->
+<!-- in that order, with KIBa and KIBv taking precedence over ISOF where there are conflicts -->
+<!-- Note: ISOF (3) is published by the government Institute for Language and Folklore and should be a reputable source for common abbreviations -->
+<!-- Note: DASV (4) is least credible but has large selection of common abbreviations -->
+
   <info>
     <translator>
       <name>torfeur</name>
@@ -13,8 +21,11 @@
     <translator>
       <name>Ulf Harnhammar</name>
     </translator>
+    <translator>
+      <name>Julian Lenell</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-06-01T22:29:02+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -28,140 +39,138 @@
     <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">åtkomstdatum</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">personlig kommunikation</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
-    <term name="accessed">åtkomstdatum</term>
     <term name="and">och</term>
     <term name="and others">och andra</term>
     <term name="anonymous">anonym</term>
-    <term name="anonymous" form="short">anon.</term>
     <term name="at">vid</term>
-    <term name="available at">tillgänglig vid</term>
+    <term name="audio-recording">ljudinspelning</term>
+    <term name="available at">tillgänglig vid</term> <!-- https://libguides.ub.uu.se/vancouver/webbsidor -->
     <term name="by">av</term>
     <term name="circa">cirka</term>
-    <term name="circa" form="short">ca</term>
     <term name="cited">citerad</term>
-    <term name="edition">
-      <single>upplaga</single>
-      <multiple>upplagor</multiple>
-    </term>
-    <term name="edition" form="short">uppl.</term>
-    <term name="et-al">m.fl.</term>
+    <term name="et-al">m.fl.</term> <!-- https://frageladan.isof.se/faqs/22965" "et al." is used but most commonly replaced by "m.fl." -->
+    <term name="film">film</term>
     <term name="forthcoming">kommande</term>
     <term name="from">från</term>
+    <term name="henceforth">hädanefter</term>
     <term name="ibid">ibid.</term>
     <term name="in">i</term>
-    <term name="in press">i tryck</term>
+    <term name="in press">under utgivning</term> <!--KIBv-->
     <term name="internet">internet</term>
     <term name="letter">brev</term>
-    <term name="no date">utan årtal</term>
-    <term name="no date" form="short">u.å.</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">utan årtal</term> <!--KIBa-->
+    <term name="no-place">utan ort</term> <!--ISOF-->
+    <term name="no-publisher">utan utgivare</term>
+    <term name="on"/>
     <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">originalarbete publicerat</term>
+    <term name="personal-communication">personlig kommunikation</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcastavsnitt</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">presenterad vid</term>
+    <term name="radio-broadcast">radiosändning</term>
+    <term name="radio-series">radioföljetång</term>
+    <term name="radio-series-episode">avsnitt ur radioföljetång</term>
     <term name="reference">
       <single>referens</single>
       <multiple>referenser</multiple>
     </term>
-    <term name="reference" form="short">
-      <single>ref.</single>
-      <multiple>ref.</multiple>
-    </term>
     <term name="retrieved">hämtad</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of">recension av</term>
+    <term name="scale">skala</term>
+    <term name="special-issue">specialutgåva</term>
+    <term name="special-section">specialavsnitt</term>
+    <term name="television-broadcast">tv-sändning</term>
+    <term name="television-series">tv-serie</term>
+    <term name="television-series-episode">tv-serieavsnitt</term>
+    <term name="video">video</term>
+    <term name="working-paper">working paper</term>
 
+    <!-- SHORT GENERAL TERMS -->
+    <term name="circa" form="short">ca</term> <!-- https://frageladan.isof.se/faqs/22140 -->
+    <term name="no date" form="short">u.å.</term> <!-- KIBa -->
+    <term name="no-place" form="short">u.o.</term> <!-- ISOF -->
+    <term name="reference" form="short">ref.</term> <!-- KIBa -->
+    <term name="review-of" form="short">rec. av</term> <!-- DASV -->
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article-journal">tidskriftsartikel</term>
+    <term name="article-magazine">tidningsartikel</term>
+    <term name="article-newspaper">dagstidningsartikel</term>
+    <term name="bill">lagförslag</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">sändning</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
+    <term name="classic">klassiker</term>
+    <term name="collection">samling</term>
     <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
+    <term name="document">dokument</term>
+    <term name="entry">post</term>
+    <term name="entry-dictionary">uppslagsord</term>
+    <term name="entry-encyclopedia">artikel i uppslagsverk</term>
     <term name="event">event</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">bild</term>
+    <term name="hearing">utfrågning</term>
     <term name="interview">intervju</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="legal_case">rättsfall</term>
+    <term name="legislation">lagstiftning</term>
+    <term name="manuscript">manuskript</term>
+    <term name="map">karta</term>
+    <term name="motion_picture">videoinspelning</term>
+    <term name="musical_score">partitur</term>
+    <term name="pamphlet">broschyr</term>
+    <term name="paper-conference">konferensbidrag</term>
     <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="performance">framförande</term>
+    <term name="periodical">tidskrift</term>
     <term name="personal_communication">personlig kommunikation</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
+    <term name="post">inlägg</term>
+    <term name="post-weblog">blogginlägg</term>
+    <term name="regulation">förordning</term>
+    <term name="report">rapport</term>
+    <term name="review">recension</term>
+    <term name="review-book">bokrecension</term>
+    <term name="software">mjukvara</term>
+    <term name="song">ljudinspelning</term>
     <term name="speech">presentation</term>
     <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="thesis">avhandling</term>
+    <term name="treaty">fördrag</term>
+    <term name="webpage">webbsida</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">tidskriftsart.</term>
+    <term name="article-magazine" form="short">tidningsart.</term>
+    <term name="article-newspaper" form="short">dagstidningsart.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">dok.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="motion_picture" form="short">videoinsp.</term>
+    <term name="song" form="short">ljudinsp.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">utfrågning av</term>
+    <term name="review" form="verb">recension av</term>
+    <term name="review-book" form="verb">bokrecension av</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">e.Kr.</term>
-    <term name="bc">f.Kr.</term>
+    <term name="ad">e.Kr.</term> <!-- DASV -->
+    <term name="bc">f.Kr.</term> <!-- DASV -->
     <term name="bce">BCE</term>
     <term name="ce">CE</term>
 
@@ -195,54 +204,26 @@
     <term name="long-ordinal-10">tionde</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>lag</single>
+      <multiple>lagar</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>bilaga</single>
+      <multiple>bilagor</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>artikel</single>
+      <multiple>artiklar</multiple>
     </term>
     <term name="book">
       <single>bok</single>
       <multiple>böcker</multiple>
     </term>
+    <term name="canon">
+      <single>kanon</single>
+      <multiple>kanones</multiple>
+    </term>
     <term name="chapter">
       <single>kapitel</single>
       <multiple>kapitel</multiple>
@@ -251,13 +232,21 @@
       <single>kolumn</single>
       <multiple>kolumner</multiple>
     </term>
+    <term name="elocation">
+      <single>plats</single>
+      <multiple>platser</multiple>
+    </term>
+    <term name="equation">
+      <single>ekvation</single>
+      <multiple>ekvationer</multiple>
+    </term>
     <term name="figure">
       <single>figur</single>
       <multiple>figurer</multiple>
     </term>
     <term name="folio">
       <single>folio</single>
-      <multiple>folios</multiple>
+      <multiple>folion</multiple>
     </term>
     <term name="issue">
       <single>nummer</single>
@@ -279,10 +268,6 @@
       <single>sida</single>
       <multiple>sidor</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>sida</single>
-      <multiple>sidor</multiple>
-    </term>
     <term name="paragraph">
       <single>stycke</single>
       <multiple>stycken</multiple>
@@ -291,6 +276,14 @@
       <single>del</single>
       <multiple>delar</multiple>
     </term>
+    <term name="rule">
+      <single>regel</single>
+      <multiple>regler</multiple>
+    </term>
+    <term name="scene">
+      <single>scen</single>
+      <multiple>scener</multiple>
+    </term>
     <term name="section">
       <single>avsnitt</single>
       <multiple>avsnitt</multiple>
@@ -299,6 +292,19 @@
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">supplement</term>
+    <term name="table">
+      <single>tabell</single>
+      <multiple>tabeller</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>titel</single>
+      <multiple>titlar</multiple>
+    </term>
     <term name="verse">
       <single>vers</single>
       <multiple>verser</multiple>
@@ -309,76 +315,37 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
-    </term>
-    <term name="article-locator" form="short">			 
-      <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
+    <term name="appendix" form="short">bil.</term> <!-- ISOF -->
+    <term name="article-locator" form="short">art.</term>
     <term name="book" form="short">bok</term>
-    <term name="chapter" form="short">kap.</term>
+    <term name="chapter" form="short">kap.</term> <!-- DASV -->
     <term name="column" form="short">kol.</term>
-    <term name="figure" form="short">fig.</term>
+    <term name="elocation" form="short"/>
+    <term name="equation" form="short">ekv.</term>
+    <term name="figure" form="short">fig.</term> <!-- DASV -->
     <term name="folio" form="short">f.</term>
-    <term name="issue" form="short">nr</term>
-    <term name="line" form="short">l.</term>
+    <term name="issue" form="short">nr</term> <!-- DASV -->
+    <term name="line" form="short">rad</term>
     <term name="note" form="short">n.</term>
-    <term name="opus" form="short">op.</term>
-    <term name="page" form="short">
-      <single>s.</single>
-      <multiple>s.</multiple>
-    </term>
-    <term name="number-of-pages" form="short">
-      <single>s.</single>
-      <multiple>s.</multiple>
-    </term>
-    <term name="paragraph" form="short">st.</term>
+    <term name="opus" form="short">op.</term> <!-- DASV -->
+    <term name="page" form="short">s.</term> <!-- KIBa -->
+    <term name="paragraph" form="short">st.</term> <!-- DASV -->
     <term name="part" form="short">del</term>
     <term name="section" form="short">avs.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">suppl.</term> <!-- ISOF -->
+    <term name="table" form="short">tab.</term> <!-- DASV -->
+    <term name="timestamp" form="short"/> <!-- generally blank -->
     <term name="verse" form="short">
       <single>vers</single>
       <multiple>verser</multiple>
     </term>
-    <term name="volume" form="short">
-      <single>vol.</single>
-      <multiple>vol.</multiple>
-    </term>
+    <term name="volume" form="short">vol.</term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -388,194 +355,174 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
-    </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
-    </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
-    </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
-    </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
-    </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
-    </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">kapitel</term>
+    <term name="citation-number">citat</term>
+    <term name="collection-number">nummer</term>
+    <term name="edition">
+      <single>upplaga</single>
+      <multiple>upplagor</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="first-reference-note-number">
+      <single>not</single>
+      <multiple>noter</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="number">nummer</term>
+    <term name="number-of-pages">
+      <single>sida</single>
+      <multiple>sidor</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="number-of-volumes">
+      <single>volym</single>
+      <multiple>volymer</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="page-first">
+      <single>sida</single>
+      <multiple>sidor</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="printing">
+      <single>tryckning</single>
+      <multiple>tryckningar</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="version">version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">kap.</term>
+    <term name="citation-number" form="short">ref.</term>
+    <term name="collection-number" form="short">nr</term>
+    <term name="edition" form="short">uppl.</term>
+    <term name="number" form="short">nr</term>
+    <term name="number-of-pages" form="short">s.</term>
+    <term name="number-of-volumes" form="short">vol.</term>
+    <term name="page-first" form="short">s.</term>
+    <term name="printing" form="short">tr.</term> <!-- DASV -->
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">ordförande</term>
+    <term name="collection-editor">red.</term>
+    <term name="compiler">sammanställare</term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">medverkande</term>
+    <term name="curator">
+      <single>kurator</single>
+      <multiple>kuratorer</multiple>
     </term>
     <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
+      <single>regissör</single>
+      <multiple>regissörer</multiple>
     </term>
     <term name="editor">
       <single>redaktör</single>
       <multiple>redaktörer</multiple>
     </term>
-    <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editors</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustratör</single>
-      <multiple>illustratörer</multiple>
-    </term>
-    <term name="translator">
-      <single>översättare</single>
-      <multiple>översättare</multiple>
+    <term name="editor-translator">
+      <single>redaktör &amp; översättare</single>
+      <multiple>redaktörer &amp; översättare</multiple>
     </term>
     <term name="editortranslator">
       <single>redaktör &amp; översättare</single>
       <multiple>redaktörer &amp; översättare</multiple>
     </term>
-
-    <!-- SHORT ROLE FORMS -->
-    <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
-    </term>
-    <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
-    </term>
-    <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
-    </term>
-    <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
-    </term>
-    <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
-    </term>
-    <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
-    </term>
-    <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
-    </term>
-    <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
-    </term>
-    <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
-    </term>
-    <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
+    <term name="editorial-director">ansvarig utgivare</term>
+    <term name="executive-producer">
+      <single>exekutiv producent</single>
+      <multiple>exekutiva producenter</multiple>
     </term>
-    <term name="editor" form="short">
-      <single>red.</single>
-      <multiple>red.</multiple>
+    <term name="guest">
+      <single>gäst</single>
+      <multiple>gäster</multiple>
     </term>
-    <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>eds.</multiple>
+    <term name="host">programledare</term>
+    <term name="illustrator">
+      <single>illustratör</single>
+      <multiple>illustratörer</multiple>
     </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ill.</multiple>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">berättare</term>
+    <term name="organizer">
+      <single>organisatör</single>
+      <multiple>organisatörer</multiple>
     </term>
-    <term name="translator" form="short">
-      <single>övers.</single>
-      <multiple>övers.</multiple>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>artist</single>
+      <multiple>artister</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>red. &amp; övers.</single>
-      <multiple>red. &amp; övers.</multiple>
+    <term name="producer">
+      <single>producent</single>
+      <multiple>producenter</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">manusförfattare</term>
+    <term name="series-creator">serieskapare</term>
+    <term name="translator">översättare</term>
 
+    <!-- SHORT ROLE FORMS -->
+    <term name="compiler" form="short">sammanst.</term>
+    <term name="contributor" form="short">medv.</term>
+    <term name="director" form="short">reg.</term>
+    <term name="editor" form="short">red.</term>
+    <term name="editor-translator" form="short">red. &amp; övers.</term>
+    <term name="editortranslator" form="short">red. &amp; övers.</term>
+    <term name="editorial-director" form="short">ansv. utg.</term>
+    <term name="executive-producer" form="short">exek. prod.</term>
+    <term name="illustrator" form="short">ill.</term>
+    <term name="narrator" form="short">uppl.</term>
+    <term name="organizer" form="short">org.</term>
+    <term name="producer" form="short">prod.</term>
+    <term name="script-writer" form="short">manus</term>
+    <term name="series-creator" form="short">av</term>
+    <term name="translator" form="short">övers.</term>
+
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">under ordförandeskap av</term>
+    <term name="collection-editor" form="verb">redigerad av</term>
+    <term name="compiler" form="verb">sammanställd av</term>
     <term name="container-author" form="verb">av</term>
-    <term name="director" form="verb">directed by</term>
+    <term name="contributor" form="verb">med</term>
+    <term name="curator" form="verb">kurerad av</term>
+    <term name="director" form="verb">regisserad av</term>
     <term name="editor" form="verb">redigerad av</term>
-    <term name="editorial-director" form="verb">edited by</term>
+    <term name="editor-translator" form="verb">redigerad &amp; översatt av</term>
+    <term name="editortranslator" form="verb">redigerad &amp; översatt av</term>
+    <term name="editorial-director" form="verb">redigerad av</term>
+    <term name="executive-producer" form="verb">exekutivt producerad av</term>
+    <term name="guest" form="verb">med gäst</term>
+    <term name="host" form="verb">ledd av</term>
     <term name="illustrator" form="verb">illustrerad av</term>
     <term name="interviewer" form="verb">intervjuad av</term>
+    <term name="narrator" form="verb">berättad av</term>
+    <term name="organizer" form="verb">organiserad av</term>
+    <term name="performer" form="verb">framförd av</term>
+    <term name="producer" form="verb">producerad av</term>
     <term name="recipient" form="verb">till</term>
-    <term name="reviewed-author" form="verb">by</term>
+    <term name="reviewed-author" form="verb">av</term>
+    <term name="script-writer" form="verb">skriven av</term>
+    <term name="series-creator" form="verb">skapad av</term>
     <term name="translator" form="verb">översatt av</term>
-    <term name="editortranslator" form="verb">redigerad &amp; översatt av</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">red.</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
+    <term name="collection-editor" form="verb-short">red. av</term>
+    <term name="compiler" form="verb-short">sammanst. av</term>
+    <term name="contributor" form="verb-short">medv.</term>
+    <term name="curator" form="verb-short">kurerad av</term>
+    <term name="director" form="verb-short">regi av</term>
+    <term name="editor" form="verb-short">red. av</term>
+    <term name="editor-translator" form="verb-short">red. &amp; övers. av</term>
+    <term name="editortranslator" form="verb-short">red. &amp; övers. av</term>
+    <term name="editorial-director" form="verb-short">red. av</term>
+    <term name="executive-producer" form="verb-short">exek. prod. av</term>
+    <term name="guest" form="verb-short">m. gäst</term>
+    <term name="host" form="verb-short">ledd av</term>
     <term name="illustrator" form="verb-short">illus.</term>
+    <term name="narrator" form="verb-short">uppl. av</term>
+    <term name="organizer" form="verb-short">org. av</term>
+    <term name="performer" form="verb-short">framf. av</term>
+    <term name="producer" form="verb-short">prod. av</term>
     <term name="translator" form="verb-short">övers.</term>
-    <term name="editortranslator" form="verb-short">red. &amp; övers. av</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">januari</term>
diff --git a/locales/th-TH.xml b/locales/th-TH.xml
--- a/locales/th-TH.xml
+++ b/locales/th-TH.xml
@@ -4,8 +4,11 @@
     <translator>
       <name>Dusit Laohasinnarong</name>
     </translator>
+    <translator>
+      <name>Watcharakorn Kaobath</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,26 +22,52 @@
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">สืบค้น</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">และ</term>
+    <term name="and others">และคณะ</term>
+    <term name="anonymous">นิรนาม</term>
+    <term name="at">ที่</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">เข้าถึงได้จาก</term>
+    <term name="by">โดย</term>
+    <term name="circa">โดยประมาณ</term>
+    <term name="cited">อ้างถึง</term>
+    <term name="et-al">และคณะ</term>
     <term name="film">film</term>
+    <term name="forthcoming">เต็มใจให้ข้อมูล</term>
+    <term name="from">จาก</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid"> ในที่เดียวกัน</term>
+    <term name="in">ใน</term>
+    <term name="in press">กำลังรอตีพิมพ์</term>
+    <term name="internet">อินเทอร์เน็ต</term>
+    <term name="letter">จดหมาย</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">ไม่ปรากฏปีที่พิมพ์</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">ออนไลน์</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">การสื่อสารส่วนบุคคล</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">นำเสนอที่</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">
+      <single>เอกสารอ้างอิง</single>
+      <multiple>เอกสารอ้างอิง</multiple>
+    </term>
+    <term name="retrieved">สืบค้น</term>
+    <term name="review-of">review of</term>
+    <term name="scale">scale</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -46,46 +75,21 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">สืบค้น</term>
-    <term name="and">และ</term>
-    <term name="and others">และคณะ</term>
-    <term name="anonymous">นิรนาม</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">นิรนาม</term>
-    <term name="at">ที่</term>
-    <term name="available at">available at</term>
-    <term name="by">โดย</term>
-    <term name="circa">โดยประมาณ</term>
     <term name="circa" form="short">ประมาณ</term>
-    <term name="cited">อ้างถึง</term>
-    <term name="edition">
-      <single>พิมพ์ครั้งที่</single>
-      <multiple>พิมพ์ครั้งที่</multiple>
-    </term>
-    <term name="edition" form="short">พิมพ์ครั้งที่</term>
-    <term name="et-al">และคณะ</term>
-    <term name="forthcoming">เต็มใจให้ข้อมูล</term>
-    <term name="from">จาก</term>
-    <term name="ibid"> ในที่เดียวกัน</term>
-    <term name="in">ใน</term>
-    <term name="in press">กำลังรอตีพิมพ์</term>
-    <term name="internet">อินเทอร์เน็ต</term>
-    <term name="letter">จดหมาย</term>
-    <term name="no date">ไม่ปรากฏปีที่พิมพ์</term>
     <term name="no date" form="short">ม.ป.ป.</term>
-    <term name="online">ออนไลน์</term>
-    <term name="presented at">นำเสนอที่</term>
-    <term name="reference">
-      <single>เอกสารอ้างอิง</single>
-      <multiple>เอกสารอ้างอิง</multiple>
-    </term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">
       <single>อ้างอิง</single>
       <multiple>อ้างอิง</multiple>
     </term>
-    <term name="retrieved">สืบค้น</term>
-    <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -150,6 +154,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">ค.ศ.</term>
     <term name="bc">พ.ศ.</term>
@@ -167,7 +179,7 @@
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal"></term>
+    <term name="ordinal"/>
 
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">หนึ่ง</term>
@@ -182,54 +194,26 @@
     <term name="long-ordinal-10">สิบ</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>หนังสือ</single>
       <multiple>หนังสือ</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>บทที่</single>
       <multiple>บทที่</multiple>
@@ -238,6 +222,14 @@
       <single>สดมภ์</single>
       <multiple>สดมภ์</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>รูปภาพ</single>
       <multiple>รูปภาพ</multiple>
@@ -266,10 +258,6 @@
       <single>หน้า</single>
       <multiple>หน้า</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>หน้า</single>
-      <multiple>หน้า</multiple>
-    </term>
     <term name="paragraph">
       <single>ย่อหน้า</single>
       <multiple>ย่อหน้า</multiple>
@@ -278,6 +266,14 @@
       <single>ส่วนย่อย</single>
       <multiple>ส่วนย่อย</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
       <single>หมวด</single>
       <multiple>หมวด</multiple>
@@ -286,6 +282,22 @@
       <single>ใต้คำ</single>
       <multiple>ใต้คำ</multiple>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>ร้อยกรอง</single>
       <multiple>ร้อยกรอง</multiple>
@@ -296,45 +308,25 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">หนังสือ</term>
+    <term name="chapter" form="short">บทที่</term>
+    <term name="column" form="short">สดมภ์</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">หนังสือ</term>
-    <term name="chapter" form="short">บทที่</term>
-    <term name="column" form="short">สดมภ์</term>
     <term name="figure" form="short">รูปภาพ</term>
     <term name="folio" form="short">หน้า</term>
     <term name="issue" form="short">ฉบับที่</term>
@@ -345,17 +337,37 @@
       <single>น.</single>
       <multiple>น.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>น.</single>
-      <multiple>น.</multiple>
-    </term>
     <term name="paragraph" form="short">ย่อหน้า</term>
     <term name="part" form="short">ส่วนย่อย</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
     <term name="section" form="short">หมวด</term>
     <term name="sub-verbo" form="short">
       <single>ใต้คำ</single>
       <multiple>ใต้คำ</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>ร้อยกรอง</single>
       <multiple>ร้อยกรอง</multiple>
@@ -365,7 +377,7 @@
       <multiple>ปี</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -375,15 +387,98 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>ฉบับที่</single>
+      <multiple>ฉบับที่</multiple>
+    </term>
+    <term name="edition">
+      <single>พิมพ์ครั้งที่</single>
+      <multiple>พิมพ์ครั้งที่</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>บันทึก</single>
+      <multiple>บันทึก</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>หน้า</single>
+      <multiple>หน้า</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">version</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">ฉบับที่</term>
+    <term name="edition" form="short">พิมพ์ครั้งที่</term>
+    <term name="first-reference-note-number" form="short">n.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>น.</single>
+      <multiple>น.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -392,6 +487,26 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>director</single>
+      <multiple>directors</multiple>
+    </term>
+    <term name="editor">
+      <single>บรรณาธิการ</single>
+      <multiple>บรรณาธิการ</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>บรรณาธิการและผู้แปล</single>
+      <multiple>บรรณาธิการและผู้แปล</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>บรรณาธิการและผู้แปล</single>
+      <multiple>บรรณาธิการและผู้แปล</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>ผู้อำนวยการบทบรรณาธิการ</single>
+      <multiple>ผู้อำนวยการบทบรรณาธิการ</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -404,6 +519,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>illustrators</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -412,6 +532,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -420,6 +541,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -428,30 +551,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>บรรณาธิการ</single>
-      <multiple>บรรณาธิการ</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>ผู้อำนวยการบทบรรณาธิการ</single>
-      <multiple>ผู้อำนวยการบทบรรณาธิการ</multiple>
-    </term>
-    <term name="illustrator">
-      <single>illustrator</single>
-      <multiple>illustrators</multiple>
-    </term>
     <term name="translator">
       <single>ผู้แปล</single>
       <multiple>ผู้แปล</multiple>
     </term>
-    <term name="editortranslator">
-      <single>บรรณาธิการและผู้แปล</single>
-      <multiple>บรรณาธิการและผู้แปล</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -466,10 +569,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dirs.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>บ.ก.</single>
+      <multiple>บ.ก.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>บ.ก.</single>
+      <multiple>บ.ก.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>บ.ก.</single>
+      <multiple>บ.ก.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>ผอ.บทบรรณาธิการ</single>
+      <multiple>ผอ.บทบรรณาธิการ</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -494,75 +621,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>บ.ก.</single>
-      <multiple>บ.ก.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>ผอ.บทบรรณาธิการ</single>
-      <multiple>ผอ.บทบรรณาธิการ</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>ill.</single>
-      <multiple>ills.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>ผู้แปล</single>
       <multiple>ผู้แปล</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>บ.ก.</single>
-      <multiple>บ.ก.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">โดย</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">directed by</term>
+    <term name="editor" form="verb">เรียบเรียงโดย</term>
+    <term name="editor-translator" form="verb">แปลและเรียบเรียงโดย</term>
+    <term name="editortranslator" form="verb">แปลและเรียบเรียงโดย</term>
+    <term name="editorial-director" form="verb">เรียบเรียงโดย</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">illustrated by</term>
+    <term name="interviewer" form="verb">สัมภาษณ์โดย</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">โดย</term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">เรียบเรียงโดย</term>
-    <term name="editorial-director" form="verb">เรียบเรียงโดย</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">สัมภาษณ์โดย</term>
     <term name="recipient" form="verb">ถึง</term>
     <term name="reviewed-author" form="verb">by</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">แปลโดย</term>
-    <term name="editortranslator" form="verb">แปลและเรียบเรียงโดย</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">โดย</term>
+    <term name="editor-translator" form="verb-short">แปลและเรียบเรียงโดย</term>
+    <term name="editortranslator" form="verb-short">แปลและเรียบเรียงโดย</term>
+    <term name="editorial-director" form="verb-short">โดย</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">illus.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">โดย</term>
-    <term name="editorial-director" form="verb-short">โดย</term>
-    <term name="illustrator" form="verb-short">illus.</term>
     <term name="translator" form="verb-short">แปล</term>
-    <term name="editortranslator" form="verb-short">แปลและเรียบเรียงโดย</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">มกราคม</term>
diff --git a/locales/tl-PH.xml b/locales/tl-PH.xml
new file mode 100644
--- /dev/null
+++ b/locales/tl-PH.xml
@@ -0,0 +1,893 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="tl-PH">
+  <!-- Mainly referred to the following for translations:
+        1. Komisyon sa Wikang Filipino, Manwal sa Masinop na Pagsulat, pp. 116-132
+        2. Komisyon ng Wikang Filipino, Diksiyonaryo ng Wikang Filipino, https://www.kwfdiksiyonaryo.ph/
+        3. Sentro ng Wikang Filipino, Glosaring English-Filipino, https://sentrofilipino.upd.edu.ph/glosaring-english-filipino/
+  -->  
+  <info>
+    <translator>
+      <name>leen p</name>
+    </translator>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+    <updated>2026-02-01T00:00:00+00:00</updated> 
+  </info>
+  <style-options punctuation-in-quote="true"/>
+  <date form="text">
+    <date-part name="day" prefix="ika-" suffix=" ng "/>
+	<date-part name="month" suffix=" "/>
+    <date-part name="year"/>
+  </date>
+  <date form="numeric">
+    <date-part name="month" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="day" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="year"/>
+  </date>
+  <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">inakses noong</term>
+    <term name="advance-online-publication">advance online publication</term>
+    <term name="album">album</term>
+    <term name="and">at</term>
+    <term name="and others">at iba pa</term>
+    <term name="anonymous">anonymous</term>
+    <term name="at">sa</term>
+    <term name="audio-recording">audio recording</term>
+    <term name="available at">available sa</term>
+    <term name="by">
+	  <single>ni</single>
+	  <multiple>nina</multiple>
+	</term>
+    <term name="circa">circa</term>
+    <term name="cited">sinipi</term>
+    <term name="et-al">et al.</term>
+    <term name="film">pelikula</term>
+    <term name="forthcoming">forthcoming</term>
+    <term name="from">mula sa</term>
+    <term name="henceforth">henceforth</term>
+    <term name="ibid">ibid.</term>
+    <term name="in">nasa</term>
+    <term name="in press">in press</term>
+    <term name="internet">internet</term>
+    <term name="letter">liham</term>
+    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">walang petsa</term>
+    <term name="no-place">no place</term>
+    <term name="no-publisher">walang tagalimbag</term>
+    <term name="on">sa</term>
+    <term name="online">online</term>
+    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">original work published</term>
+    <term name="personal-communication">personal communication</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcast episode</term>
+    <term name="preprint">preprint</term>
+    <term name="presented at">iprinisenta sa</term>
+    <term name="radio-broadcast">radio broadcast</term>
+    <term name="radio-series">radyo serye</term>
+    <term name="radio-series-episode">episode ng radyo serye</term>
+    <term name="reference">
+      <single>reference</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="retrieved">retrieved</term>
+    <term name="review-of">review ng</term>
+    <term name="scale">scale</term>
+    <term name="special-issue">special issue</term>
+    <term name="special-section">special section</term>
+    <term name="television-broadcast">television broadcast</term>
+    <term name="television-series">teleserye</term>
+    <term name="television-series-episode">episode ng teleserye</term>
+    <term name="video">video</term>
+    <term name="working-paper">working paper</term>
+
+    <!-- SHORT GENERAL TERMS -->
+    <!-- Omitted short forms: accessed, album, and (symbol), and others, at (symbol), forthcoming, henceforth, ibid, in, in press, internet, loc-cit, on, online, op-cit, podcast, preprint, presented at -->
+    <term name="advance-online-publication" form="short">adv. online pub.</term> <!-- ODA -->
+    <term name="anonymous" form="short">anon.</term>
+    <term name="audio-recording" form="short">au. rec.</term> <!-- ODA -->
+    <term name="available at" form="short">avail. sa</term> <!-- ODA -->
+    <term name="circa" form="short">c.</term>
+    <!-- CMOS 10.48 recommends "ca." for "circa" but also allows "c.", which CSL has used historically -->
+    <term name="cited" form="short">cit.</term> <!-- ODA -->
+    <term name="film" form="short">flm.</term> <!-- ODA -->
+    <term name="from" form="short">fr.</term>
+    <term name="letter" form="short">let.</term> <!-- ODA -->
+    <term name="no date" form="short">w.p.</term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">w.l.</term>
+    <term name="original-work-published" form="short">orig. pub.</term> <!-- Oxford Guide to Style -->
+    <term name="personal-communication" form="short">pers. comm.</term>
+    <term name="podcast-episode" form="short">podcast ep.</term>
+    <term name="radio-broadcast" form="short">radio bdcst.</term> <!-- ODA -->
+    <term name="radio-series" form="short">radio ser.</term> <!-- ODA -->
+    <term name="radio-series-episode" form="short">radio ser. ep.</term> <!-- ODA -->
+    <term name="reference" form="short">
+      <single>ref.</single>
+      <multiple>refs.</multiple>
+    </term>
+    <term name="retrieved" form="short">rtvd.</term> <!-- ODA -->
+    <term name="review-of" form="short">rev. of</term>
+    <term name="scale" form="short">sc.</term> <!-- ODA -->
+    <term name="special-issue" form="short">spec. iss.</term> <!-- ODA -->
+    <term name="special-section" form="short">spec. sec.</term> <!-- ODA/CMOS -->
+    <term name="television-broadcast" form="short">TV bdcst.</term> <!-- ODA -->
+    <term name="television-series" form="short">TV ser.</term> <!-- ODA -->
+    <term name="television-series-episode" form="short">TV ser. ep.</term> <!-- ODA -->
+    <term name="video" form="short">vid.</term> <!-- ODA -->
+    <term name="working-paper" form="short">wkg. paper</term> <!-- ODA -->
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+    <term name="and" form="symbol">&amp;</term>
+    <term name="at" form="symbol">@</term>
+
+    <!-- LONG ITEM TYPE FORMS -->
+    <term name="article">preprint</term>
+    <term name="article-journal">artikulo sa journal</term>
+    <term name="article-magazine">artikulo sa magasin</term>
+    <term name="article-newspaper">artikulo sa pahayagan</term>
+    <term name="bill">bill</term>
+    <!-- book is in the list of locator terms -->
+    <term name="broadcast">brodkast</term>
+    <!-- chapter is in the list of locator terms -->
+    <term name="classic">classical work</term>
+    <term name="collection">archival collection</term>
+    <term name="dataset">dataset</term>
+    <term name="document">dokumento</term>
+    <term name="entry">entry</term>
+    <term name="entry-dictionary">entry sa diksiyonaryo</term>
+    <term name="entry-encyclopedia">entry sa ensayklopidya</term>
+    <term name="event">event</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic">graphic</term>
+    <term name="hearing">pagdinig</term>
+    <term name="interview">interbiyu</term>
+    <term name="legal_case">kaso</term>
+    <term name="legislation">batas</term>
+    <term name="manuscript">manuskrito</term>
+    <term name="map">mapa</term>
+    <term name="motion_picture">video recording</term>
+    <term name="musical_score">musical score</term>
+    <term name="pamphlet">pamphlet</term>
+    <term name="paper-conference">conference paper</term>
+    <term name="patent">patent</term>
+    <term name="performance">performance</term>
+    <term name="periodical">peryodiko</term>
+    <term name="personal_communication">personal na komunikasyon</term>
+    <term name="post">post</term>
+    <term name="post-weblog">blog post</term>
+    <term name="regulation">regulation</term>
+    <term name="report">ulat</term>
+    <term name="review">review</term>
+    <term name="review-book">book review</term>
+    <term name="software">software</term>
+    <term name="song">audio recording</term>
+    <term name="speech">talumpati</term>
+    <term name="standard">standard</term>
+    <term name="thesis">tesis</term>
+    <term name="treaty">treaty</term>
+    <term name="webpage">webpage</term>
+
+    <!-- SHORT ITEM TYPE FORMS -->
+    <!-- Omitted short forms: article, bill, entry, event, hearing, map, periodical, speech, treaty -->
+    <term name="article-journal" form="short">jour. art.</term> <!-- ODWE -->
+    <term name="article-magazine" form="short">mag. art.</term> <!-- ODWE -->
+    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="broadcast" form="short">bdcst.</term> <!-- ODA -->
+    <!-- book is in the list of locator terms -->
+    <!-- chapter is in the list of locator terms -->
+    <term name="classic" form="short">class. wk.</term> <!-- ODWE -->
+    <term name="collection" form="short">arch. coll.</term> <!-- ODA -->
+    <term name="document" form="short">doc.</term>
+    <term name="entry-dictionary" form="short">dict. entry</term>
+    <term name="entry-encyclopedia" form="short">ency. entry</term>
+    <!-- figure is in the list of locator terms -->
+    <term name="graphic" form="short">gr.</term> <!-- ODA -->
+    <term name="interview" form="short">int.</term> <!-- ODA -->
+    <term name="legal_case" form="short">leg. case</term> <!-- ODA -->
+    <term name="legislation" form="short">legis.</term> <!-- ODA -->
+    <term name="manuscript" form="short">
+      <single>MS</single>
+      <multiple>MSS</multiple>
+    </term>
+    <term name="motion_picture" form="short">vid. rec.</term> <!-- ODA -->
+    <term name="musical_score" form="short">mus. score</term> <!-- ODWE -->
+    <term name="pamphlet" form="short">pam.</term> <!-- ODWE -->
+    <term name="paper-conference" form="short">conf. paper</term> <!-- ODA -->
+    <term name="patent" form="short">pat.</term> <!-- ODWE -->
+    <term name="performance" form="short">prfm.</term> <!-- ODA -->
+    <term name="personal_communication" form="short">pers. comm.</term>
+    <term name="regulation" form="short">reg.</term> <!-- ODA -->
+    <term name="report" form="short">rep.</term> <!-- ODWE -->
+    <term name="review" form="short">rev.</term>
+    <term name="review-book" form="short">bk. rev.</term>
+    <term name="software" form="short">sftw.</term> <!-- ODA -->
+    <term name="song" form="short">au. rec.</term> <!-- ODA -->
+    <term name="standard" form="short">std.</term> <!-- ODA -->
+    <term name="thesis" form="short">thes.</term> <!-- ODA -->
+    <term name="webpage" form="short">webpg.</term> <!-- ODA -->
+
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimonyo ni</term>
+    <term name="review" form="verb">review ng</term>
+    <term name="review-book" form="verb">review ng librong</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb-short">test. of</term> <!-- ODA -->
+    <term name="review" form="verb-short">rev. of</term>
+    <term name="review-book" form="verb-short">rev. of the bk.</term>
+
+    <!-- HISTORICAL ERA TERMS -->
+    <term name="ad"> AD</term>
+    <term name="bc"> BC</term>
+    <term name="bce"> BCE</term>
+    <term name="ce"> CE</term>
+
+    <!-- PUNCTUATION -->
+    <term name="open-quote">“</term>
+    <term name="close-quote">”</term>
+    <term name="open-inner-quote">‘</term>
+    <term name="close-inner-quote">’</term>
+    <term name="page-range-delimiter">–</term>
+    <term name="colon">:</term>
+    <term name="comma">,</term>
+    <term name="semicolon">;</term>
+
+    <!-- ORDINALS -->
+	<!-- Tagalog uses the prefix ika- followed by 'na'(e.g. ika-1 na edisyon) for all numeric ordinals.-->
+    <term name="ordinal">th</term>
+    <term name="ordinal-01">st</term>
+    <term name="ordinal-02">nd</term>
+    <term name="ordinal-03">rd</term>
+    <term name="ordinal-11">th</term>
+    <term name="ordinal-12">th</term>
+    <term name="ordinal-13">th</term>
+
+    <!-- LONG ORDINALS -->
+    <term name="long-ordinal-01">unang</term>
+    <term name="long-ordinal-02">ikalawang</term>
+    <term name="long-ordinal-03">ikatlong</term>
+    <term name="long-ordinal-04">ikaapat na</term>
+    <term name="long-ordinal-05">ikalimang</term>
+    <term name="long-ordinal-06">ikaanim na</term>
+    <term name="long-ordinal-07">ikapitong</term>
+    <term name="long-ordinal-08">ikawalong</term>
+    <term name="long-ordinal-09">ikasiyam na</term>
+    <term name="long-ordinal-10">ikasampung</term>
+
+    <!-- LONG LOCATOR FORMS -->
+    <term name="act">
+	  <single>yugto</single>
+	  <multiple>mga yugto</multiple>
+	</term>
+    <term name="appendix">
+      <single>apendiks</single>
+      <multiple>mga apendiks</multiple>
+    </term>
+    <term name="article-locator">
+	  <single>artikulo</single>
+	  <multiple>mga artikulo</multiple>
+	</term>
+    <term name="book">
+	  <single>tomo</single>
+	  <multiple>mga tomo</multiple>
+	</term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
+    <term name="chapter">
+	  <single>kabanata</single>
+	  <multiple>mga kabanata</multiple>
+	</term>
+    <term name="column">
+	  <single>kolum</single>
+	  <multiple>mga kolum</multiple>
+	</term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
+    <term name="figure">
+	  <single>pigura</single>
+	  <multiple>mga pigura</multiple>	
+	</term>
+    <term name="folio">
+      <single>folio</single>
+      <multiple>folios</multiple>
+    </term>
+    <term name="issue">
+	  <single>isyu</single>
+	  <multiple>mga isyu</multiple>	
+	</term>
+    <term name="line">
+	  <single>linya</single>
+	  <multiple>mga linya</multiple>	
+	</term>
+    <term name="note">
+      <single>talâ</single>
+      <multiple>mga talâ</multiple>
+    </term>
+    <term name="opus">
+      <single>opus</single>
+      <multiple>opera</multiple>
+    </term>
+    <term name="page">
+	  <single>pahina</single>
+	  <multiple>mga pahina</multiple>	
+	</term>
+    <term name="paragraph">
+	  <single>talata</single>
+	  <multiple>mga talata</multiple>	
+	</term>
+    <term name="part">
+      <single>bahagi</single>
+      <multiple>mga bahagi</multiple>
+    </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+	  <single>eksena</single>
+	  <multiple>mga eksena</multiple>	
+	</term>
+    <term name="section">
+	  <single>seksiyon</single>
+	  <multiple>mga seksiyon</multiple>	
+	</term>
+    <term name="sub-verbo">
+      <single>sub verbo</single>
+      <multiple>sub verbis</multiple>
+    </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">talahanayan</term>
+    <!-- A timestamp is a composite of hours, minutes, etc. and therefore has no default label. -->
+    <term name="timestamp"/>
+    <term name="title-locator">
+      <single>pamagat</single>
+      <multiple>mga pamagat</multiple>
+    </term>
+    <term name="verse">
+	  <single>berso</single>
+	  <multiple>mga berso</multiple>	
+	</term>
+    <term name="volume">
+	  <single>tomo</single>
+	  <multiple>mga tomo</multiple>	
+	</term>
+
+    <!-- SHORT LOCATOR FORMS -->
+    <!-- Omitted short forms: act, timestamp -->
+    <term name="appendix" form="short">
+      <single>app.</single>
+      <multiple>apps.</multiple>
+    </term>
+    <term name="article-locator" form="short">
+      <single>art.</single>
+      <multiple>arts.</multiple>
+    </term>
+    <term name="book" form="short">
+      <single>bk.</single>
+      <multiple>bks.</multiple>
+    </term>
+    <term name="canon" form="short">
+      <!-- Oxford Dictionary for Writers and Editors -->
+      <single>can.</single>
+      <multiple>cann.</multiple>
+    </term>
+    <term name="chapter" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="column" form="short">
+      <single>col.</single>
+      <multiple>cols.</multiple>
+    </term>
+    <term name="elocation" form="short">
+      <single>loc.</single>
+      <multiple>locs.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>eq.</single>
+      <multiple>eqq.</multiple>
+    </term>
+    <term name="figure" form="short">
+      <single>pig.</single>
+      <multiple>figs.</multiple>
+    </term>
+    <term name="folio" form="short">
+      <single>fol.</single>
+      <multiple>fols.</multiple>
+    </term>
+    <term name="issue" form="short">
+      <single>blg.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="line" form="short">
+      <single>l.</single>
+      <multiple>ll.</multiple>
+    </term>
+    <term name="note" form="short">
+      <single>n.</single>
+      <multiple>nn.</multiple>
+    </term>
+    <term name="opus" form="short">
+      <single>op.</single>
+      <multiple>opp.</multiple>
+    </term>
+    <term name="page" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="paragraph" form="short">
+      <single>para.</single>
+      <multiple>paras.</multiple>
+    </term>
+    <term name="part" form="short">
+      <single>pt.</single>
+      <multiple>pts.</multiple>
+    </term>
+    <term name="rule" form="short">
+      <!-- legal abbreviations in the Oxford Guide to Style, sec. 13.2.1 -->
+      <single>r.</single>
+      <multiple>rr.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
+    <term name="section" form="short">
+      <single>sek.</single>
+      <multiple>secs.</multiple>
+    </term>
+    <term name="sub-verbo" form="short">
+      <single>s.v.</single>
+      <multiple>s.vv.</multiple>
+    </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="title-locator" form="short">
+      <!-- Oxford Dictionary for Writers and Editors -->
+      <single>tit.</single>
+      <multiple>titt.</multiple>
+    </term>
+    <term name="verse" form="short">
+      <single>v.</single>
+      <multiple>vv.</multiple>
+    </term>
+    <term name="volume" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
+    <term name="chapter" form="symbol">
+      <!-- caput/capita, esp. in legal works; cf. CMOS 14.196 -->
+      <single>c.</single>
+      <multiple>cc.</multiple>
+    </term>
+    <term name="paragraph" form="symbol">
+      <single>¶</single>
+      <multiple>¶¶</multiple>
+    </term>
+    <term name="section" form="symbol">
+      <single>§</single>
+      <multiple>§§</multiple>
+    </term>
+
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">kabanata</term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">
+      <single>bilang</single>
+      <multiple>mga bilang</multiple>
+    </term>
+    <term name="edition">edisyon</term>
+    <term name="first-reference-note-number">
+      <single>reference</single>
+      <multiple>references</multiple>
+    </term>
+    <term name="number">bilang</term>
+    <term name="number-of-pages">pahina</term>
+    <term name="number-of-volumes">tomo</term>
+    <term name="page-first">pahina</term>
+    <term name="printing">limbag</term>
+    <term name="version">bersiyon</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="edition" form="short">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
+    <term name="first-reference-note-number" form="short">
+      <single>ref.</single>
+      <multiple>refs.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <!-- Oxford Dictionary for Writers and Editors -->
+      <single>ptg.</single>
+      <multiple>ptgs.</multiple>
+    </term>
+    <term name="version" form="short">v.</term> <!-- no plural -->
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>tagapangulo</single>
+      <multiple>mga tagapangulo</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>editor</single>
+      <multiple>mga editor</multiple>
+    </term>
+    <term name="compiler">
+      <single>tagatipon</single>
+      <multiple>mga tagatipon</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>kontributor</single>
+      <multiple>mga kontributor</multiple>
+    </term>
+    <term name="curator">
+      <single>curator</single>
+      <multiple>mga curator</multiple>
+    </term>
+    <term name="director">
+      <single>direktor</single>
+      <multiple>mga direktor</multiple>
+    </term>
+    <term name="editor">
+      <single>editor</single>
+      <multiple>mga editor</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>editor at tagasalin</single>
+      <multiple>mga editor at tagasalin</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editor at tagasalin</single>
+      <multiple>mga editor at tagasalin</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>editor</single>
+      <multiple>mga editor</multiple>
+    </term>
+    <term name="executive-producer">
+      <single>ehekutibong prodyuser</single>
+      <multiple>mga ehekutibong prodyuser</multiple>
+    </term>
+    <term name="guest">
+      <single>panauhin</single>
+      <multiple>mga panauhin</multiple>
+    </term>
+    <term name="host">
+      <single>tagapangasiwa</single>
+      <multiple>mga tagapangasiwa</multiple>
+    </term>
+    <term name="illustrator">
+      <single>illustrator</single>
+      <multiple>mga illustrator</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>tagapagsalaysay</single>
+      <multiple>mga tagapagsalaysay</multiple>
+    </term>
+    <term name="organizer">
+      <single>organisador</single>
+      <multiple>mga organisador</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>performer</single>
+      <multiple>mga performer</multiple>
+    </term>
+    <term name="producer">
+      <single>prodyuser</single>
+      <multiple>mga prodyuser</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>manunulat</single>
+      <multiple>mga manunulat</multiple>
+    </term>
+    <term name="series-creator">
+      <single>series creator</single>
+      <multiple>mga series creator</multiple>
+    </term>
+    <term name="translator">
+      <single>tagasalin</single>
+      <multiple>mga tagasalin</multiple>
+    </term>
+
+    <!-- SHORT ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, composer, container-author, guest, host, interviewer, original-author, recipient, reviewed-author
+    -->
+    <term name="collection-editor" form="short">
+	  <single>ed.</single>
+	  <multiple>mga ed.</multiple>
+	</term>
+    <term name="compiler" form="short">
+      <single>comp.</single>
+      <multiple>comps.</multiple>
+    </term>
+    <term name="contributor" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>contrib.</single>
+      <multiple>contribs.</multiple>
+    </term>
+    <term name="curator" form="short">
+      <!-- Oxford Art Online <https://www.oxfordartonline.com/page/1661> -->
+      <single>cur.</single>
+      <multiple>curs.</multiple>
+    </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>mga dir.</multiple>
+    </term>
+    <term name="editor" form="short">pat.</term>
+    <term name="editor-translator" form="short">
+      <single>ed. at salin</single>
+      <multiple>mga ed. at salin</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. at salin</single>
+      <multiple>mga ed. at salin</multiple>
+    </term>
+    <term name="editorial-director" form="short">pat.</term>
+    <term name="executive-producer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>exec. prod.</single>
+      <multiple>exec. prods.</multiple>
+    </term>
+    <term name="illustrator" form="short">
+      <single>ill.</single>
+      <multiple>ills.</multiple>
+    </term>
+    <term name="narrator" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>narr.</single>
+      <multiple>narrs.</multiple>
+    </term>
+    <term name="organizer" form="short">
+      <!-- possibly misleading: Oxford Dictionary of Abbreviations only defines this as organization or organized -->
+      <single>org.</single>
+      <multiple>orgs.</multiple>
+    </term>
+    <term name="performer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>perf.</single>
+      <multiple>perfs.</multiple>
+    </term>
+    <term name="producer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>prod.</single>
+      <multiple>mga prod.</multiple>
+    </term>
+    <term name="script-writer" form="short">
+      <!-- Oxford Dictionary of Abbreviations -->
+      <single>wrtr.</single>
+      <multiple>wrtrs.</multiple>
+    </term>
+    <term name="series-creator" form="short">
+      <single>ser. creator</single>
+      <multiple>ser. creators</multiple>
+    </term>
+    <term name="translator" form="short">trans.</term> <!-- no plural -->
+
+    <!-- VERB ROLE FORMS -->
+    <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">
+	  <single>inedit ni</single>
+	  <multiple>inedit nina</multiple>
+	</term>
+    <term name="compiler" form="verb">compiled by</term>
+    <term name="composer" form="verb">composed by</term>
+    <term name="container-author" form="verb">
+	  <single>ni</single>
+	  <multiple>nina</multiple>
+	</term>
+    <term name="contributor" form="verb">
+	  <single>kasama si</single>
+	  <multiple>kasama sina</multiple>
+	</term>
+    <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">
+	  <single>sa direksyon ni</single>
+	  <multiple>sa direksyon nina</multiple>
+	</term>
+    <term name="editor" form="verb">
+	  <single>inedit ni</single>
+	  <multiple>inedit nina</multiple>
+	</term>
+    <term name="editor-translator" form="verb">
+	  <single>edit at salin ni</single>
+	  <multiple>edit at salin nina</multiple>
+	</term>
+    <term name="editortranslator" form="verb">
+	  <single>edit at salin ni</single>
+	  <multiple>edit at salin nina</multiple>
+	</term>
+    <term name="editorial-director" form="verb">
+	  <single>inedit ni</single>
+	  <multiple>inedit nina</multiple>
+	</term>
+    <term name="executive-producer" form="verb">executive produced by</term>
+    <term form="verb" name="guest">
+      <single>kasama si</single>
+      <multiple>kasama sina</multiple>
+    </term>
+    <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">
+	  <single>guhit ni</single>
+	  <multiple>guhit nina</multiple>
+	</term>
+    <term name="interviewer" form="verb">
+	  <single>panayam ni</single>
+	  <multiple>panayam nina</multiple>
+	</term>
+    <term name="narrator" form="verb">
+	  <single>isinalaysay ni</single>
+	  <multiple>isinalaysay nina</multiple>
+	</term>
+    <term name="organizer" form="verb">
+	  <single>inorganisa ni</single>
+	  <multiple>inorganisa nina</multiple>
+	</term>
+    <term name="original-author" form="verb">
+	  <single>ni</single>
+	  <multiple>nina</multiple>
+	</term>
+    <term name="performer" form="verb">
+	  <single>itinanghal ni</single>
+	  <multiple>itinanghal nina</multiple>
+	</term>
+    <term name="producer" form="verb">produced by</term>
+    <term name="recipient" form="verb">para kay</term>
+    <term name="reviewed-author" form="verb">
+	  <single>ni</single>
+	  <multiple>nina</multiple></term>
+    <term name="script-writer" form="verb">
+	  <single>isinulat ni</single>
+	  <multiple>isinulat nina</multiple>
+	</term>
+    <term name="series-creator" form="verb">
+	  <single>katha ni</single>
+	  <multiple>katha nina</multiple>
+	</term>
+    <term name="translator" form="verb">
+	  <single>salin ni</single>
+	  <multiple>salin nina</multiple>
+	</term>
+
+    <!-- SHORT VERB ROLE FORMS -->
+    <!-- Omitted roles:
+         author, chair, container-author, contributor, guest, host, interviewer, original-author, recipient, reviewed-author, series-creator
+    -->
+    <term name="collection-editor" form="verb-short">
+	  <single>ed. ni</single>
+	  <multiple>ed. nina</multiple>
+	</term>
+    <term name="compiler" form="verb-short">comp. by</term>
+    <term name="composer" form="verb-short">comp. by</term> <!-- ODWE -->
+    <term name="curator" form="verb-short">cur. by</term> <!-- Oxford Art Online -->
+    <term name="director" form="verb-short">
+	  <single>dir. ni</single>
+	  <multiple>dir. nina</multiple>	
+	</term>
+    <term name="editor" form="verb-short">
+	  <single>ed. ni</single>
+	  <multiple>ed. nina</multiple>		
+	</term>
+    <term name="editor-translator" form="verb-short">
+	  <single>ed. at salin ni</single>
+	  <multiple>ed. at salin nina</multiple>		
+	</term>
+    <term name="editortranslator" form="verb-short">
+	  <single>ed. at salin ni</single>
+	  <multiple>ed. at salin nina</multiple>		
+	</term>
+    <term name="editorial-director" form="verb-short">
+	  <single>ed. ni</single>
+	  <multiple>ed. nina</multiple>		
+	</term>
+    <term name="executive-producer" form="verb-short">exec. prod. by</term> <!-- ODA -->
+    <term name="illustrator" form="verb-short">ill. by</term>
+    <term name="narrator" form="verb-short">narr. by</term> <!-- ODA -->
+    <term name="organizer" form="verb-short">org. by</term> <!-- ODA -->
+    <term name="performer" form="verb-short">perf. by</term> <!-- ODA -->
+    <term name="producer" form="verb-short">prod. by</term> <!-- ODA -->
+    <term name="script-writer" form="verb-short">writ. by</term> <!-- ODA -->
+    <term name="translator" form="verb-short">
+	  <single>salin ni</single>
+	  <multiple>salin nina</multiple>		
+	</term>
+
+    <!-- LONG MONTH FORMS -->
+    <term name="month-01">Enero</term>
+    <term name="month-02">Pebrero</term>
+    <term name="month-03">Marso</term>
+    <term name="month-04">Abril</term>
+    <term name="month-05">Mayo</term>
+    <term name="month-06">Hunyo</term>
+    <term name="month-07">Hulyo</term>
+    <term name="month-08">Agosto</term>
+    <term name="month-09">Setyembre</term>
+    <term name="month-10">Oktubre</term>
+    <term name="month-11">Nobyembre</term>
+    <term name="month-12">Disyembre</term>
+
+    <!-- SHORT MONTH FORMS -->
+    <!-- Chicago Manual of Style, 18th ed., sec. 10.44 (identical to New Hart's Rules, 2nd ed., sec. 10.2.6) -->
+    <term name="month-01" form="short">Ene.</term>
+    <term name="month-02" form="short">Peb.</term>
+    <term name="month-03" form="short">Mar.</term>
+    <term name="month-04" form="short">Abr.</term>
+    <term name="month-05" form="short">May.</term>
+    <term name="month-06" form="short">Hun.</term>
+    <term name="month-07" form="short">Hul.</term>
+    <term name="month-08" form="short">Ago.</term>
+    <term name="month-09" form="short">Set.</term>
+    <term name="month-10" form="short">Okt.</term>
+    <term name="month-11" form="short">Nob.</term>
+    <term name="month-12" form="short">Dis.</term>
+
+    <!-- SEASONS -->
+    <term name="season-01">Tagsibol</term>
+    <term name="season-02">Tag-araw</term>
+    <term name="season-03">Taglagas</term>
+    <term name="season-04">Taglamig</term>
+  </terms>
+</locale>
diff --git a/locales/tr-TR.xml b/locales/tr-TR.xml
--- a/locales/tr-TR.xml
+++ b/locales/tr-TR.xml
@@ -14,8 +14,12 @@
       <name>Muhammet Tarakçı</name>
       <email>muhammettarakci@gmail.com</email>
     </translator>
+    <translator>
+      <name>A. Harun Korkmaz</name>
+      <email>korkmazaharun@gmail.com</email>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2025-10-16T03:24:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -29,137 +33,146 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">kişisel iletişim</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">erişim</term>
+    <term name="advance-online-publication">çevrimiçi erken görünüm</term>
+    <term name="album">albüm</term>
     <term name="and">ve</term>
     <term name="and others">ve diğerleri</term>
     <term name="anonymous">anonim</term>
-    <term name="anonymous" form="short">anonim</term>
     <term name="at">de</term>
+    <term name="audio-recording">ses kaydı</term>
     <term name="available at">erişim adresi</term>
-    <term name="by">by</term>
+    <term name="by">tarafından</term>
     <term name="circa">yaklaşık</term>
-    <term name="circa" form="short">yakl.</term>
     <term name="cited">a.yer</term>
-    <term name="edition">
-      <single>baskı</single>
-      <multiple>baskı</multiple>
-    </term>
-    <term name="edition" form="short">bs</term>
     <term name="et-al">vd.</term>
+    <term name="film">film</term>
     <term name="forthcoming">gelecek</term>
     <term name="from">gönderen</term>
+    <term name="henceforth">bundan sonra</term>
     <term name="ibid">a.g.e.</term>
     <term name="in">içinde</term>
     <term name="in press">basımda</term>
     <term name="internet">internet</term>
     <term name="letter">mektup</term>
+    <term name="loc-cit">a.e.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="no date">tarih yok</term>
-    <term name="no date" form="short">t.y.</term>
+    <term name="no-place">yer yok</term>
+    <term name="no-publisher">yayıncı yok</term> <!-- sine nomine -->
+    <term name="on">üzerinde</term>
     <term name="online">çevrimiçi</term>
+    <term name="op-cit">a.g.e.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">yayınlanan asıl eser</term>
+    <term name="personal-communication">kişisel iletişim</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">podcast bölümü</term>
+    <term name="preprint">önbasım</term>
     <term name="presented at">program adı:</term>
+    <term name="radio-broadcast">radyo yayını</term>
+    <term name="radio-series">radyo dizisi</term>
+    <term name="radio-series-episode">radyo dizi bölümü</term>
     <term name="reference">
-      <single>kaynak</single>
-      <multiple>kaynaklar</multiple>
-    </term>
-    <term name="reference" form="short">
-      <single>kay.</single>
-      <multiple>kay.</multiple>
+      <single>atıf</single>
+      <multiple>atıflar</multiple>
     </term>
     <term name="retrieved">geliş tarihi</term>
+    <term name="review-of">gözden geçirme</term>
     <term name="scale">ölçek</term>
-    <term name="version">versiyon</term>
+    <term name="special-issue">özel sayı</term>
+    <term name="special-section">özel bölüm</term>
+    <term name="television-broadcast">televizyon yayını</term>
+    <term name="television-series">televizyon dizisi</term>
+    <term name="television-series-episode">televizyon dizisi bölümü</term>
+    <term name="video">video</term>
+    <term name="working-paper">ön makale</term>
 
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">anonim</term>
+    <term name="circa" form="short">yakl.</term>
+    <term name="no date" form="short">t.y.</term>
+    <term name="no-place" form="short">y.y.</term>
+    <term name="no-publisher" form="short">y.y.</term>
+    <term name="reference" form="short">
+      <single>atf.</single>
+      <multiple>atf.</multiple>
+    </term>
+    <term name="review-of" form="short">g.g.</term>
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">önbasım</term>
+    <term name="article-journal">dergi makalesi</term>
+    <term name="article-magazine">dergi makalesi</term>
+    <term name="article-newspaper">gazete yazısı</term>
+    <term name="bill">kanun taslağı</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">yayın</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">klasik</term>
+    <term name="collection">koleksiyon</term>
+    <term name="dataset">veri kümesi</term>
+    <term name="document">belge</term>
+    <term name="entry">girdi</term>
+    <term name="entry-dictionary">sözlük maddesi</term>
+    <term name="entry-encyclopedia">ansiklopedi maddesi</term>
+    <term name="event">etkinlik</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">grafik</term>
+    <term name="hearing">duruşma</term>
     <term name="interview">mülakat</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
+    <term name="legal_case">dava</term>
+    <term name="legislation">mevzuat</term>
+    <term name="manuscript">el yazması</term>
+    <term name="map">harita</term>
+    <term name="motion_picture">video kaydı</term>
+    <term name="musical_score">müzik notaları</term>
+    <term name="pamphlet">broşür</term>
+    <term name="paper-conference">konferans bildirisi</term>
     <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="performance">performans</term>
+    <term name="periodical">süreli</term>
     <term name="personal_communication">kişisel iletişim</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">gönderi</term>
+    <term name="post-weblog">blog gönderisi</term>
+    <term name="regulation">düzenleme</term>
+    <term name="report">rapor</term>
+    <term name="review">inceleme</term>
+    <term name="review-book">kitap incelemesi</term>
+    <term name="software">yazılım</term>
+    <term name="song">ses kaydı</term>
+    <term name="speech">sunum</term>
+    <term name="standard">standart</term>
+    <term name="thesis">tez</term>
+    <term name="treaty">antlaşma</term>
+    <term name="webpage">web sayfası</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">dergi mak.</term>
+    <term name="article-magazine" form="short">derg. mak.</term>
+    <term name="article-newspaper" form="short">gazete yzs.</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">belg.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="graphic" form="short">graf.</term>
+    <term name="interview" form="short">mülak.</term>
+    <term name="manuscript" form="short">el yazm.</term>
+    <term name="motion_picture" form="short">video kyd.</term>
+    <term name="report" form="short">rap.</term>
+    <term name="review" form="short">inc.</term>
+    <term name="review-book" form="short">kit. inc.</term>
+    <term name="song" form="short">ses kyd.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">ifadesi</term>
+    <term name="review" form="verb">incelemesi</term>
+    <term name="review-book" form="verb">kitabın incelemesi</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">M.S.</term>
     <term name="bc">M.Ö.</term>
@@ -192,54 +205,26 @@
     <term name="long-ordinal-10">onuncu</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="act">
+      <single>perde</single>
+      <multiple>perdeler</multiple>
     </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix">
+      <single>ek</single>
+      <multiple>ekler</multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="article-locator">
+      <single>makale</single>
+      <multiple>makaleler</multiple>
     </term>
     <term name="book">
       <single>kitap</single>
       <multiple>kitaplar</multiple>
     </term>
+    <term name="canon">
+      <single>kitap</single>
+      <multiple>kitaplar</multiple>
+    </term>
     <term name="chapter">
       <single>bölüm</single>
       <multiple>bölümler</multiple>
@@ -248,6 +233,14 @@
       <single>sütun</single>
       <multiple>sütunlar</multiple>
     </term>
+    <term name="elocation">
+      <single>konum</single>
+      <multiple>konumlar</multiple>
+    </term>
+    <term name="equation">
+      <single>eşitlik</single>
+      <multiple>eşitlikler</multiple>
+    </term>
     <term name="figure">
       <single>şekil</single>
       <multiple>şekiller</multiple>
@@ -258,7 +251,7 @@
     </term>
     <term name="issue">
       <single>sayı</single>
-      <multiple>sayı</multiple>
+      <multiple>sayılar</multiple>
     </term>
     <term name="line">
       <single>satır</single>
@@ -276,10 +269,6 @@
       <single>sayfa</single>
       <multiple>sayfalar</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>sayfa sayısı</single>
-      <multiple>sayfa sayıları</multiple>
-    </term>
     <term name="paragraph">
       <single>paragraf</single>
       <multiple>paragraflar</multiple>
@@ -288,6 +277,14 @@
       <single>kısım</single>
       <multiple>kısımlar</multiple>
     </term>
+    <term name="rule">
+      <single>kural</single>
+      <multiple>kurallar</multiple>
+    </term>
+    <term name="scene">
+      <single>sahne</single>
+      <multiple>sahneler</multiple>
+    </term>
     <term name="section">
       <single>bölüm</single>
       <multiple>bölümler</multiple>
@@ -296,6 +293,22 @@
       <single>madde</single>
       <multiple>maddeler</multiple>
     </term>
+    <term name="supplement">
+      <single>zeyil</single>
+      <multiple>zeyil</multiple>
+    </term>
+    <term name="table">
+      <single>masa</single>
+      <multiple>masalar</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>başlık</single>
+      <multiple>başlıklar</multiple>
+    </term>
     <term name="verse">
       <single>ayet</single>
       <multiple>ayetler</multiple>
@@ -306,138 +319,188 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
-    </term>
-    <term name="article-locator" form="short">			 
-      <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+    <term name="appendix" form="short">
+      <single>ek.</single>
+      <multiple>eklr.</multiple>
     </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+    <term name="article-locator" form="short">
+      <single>mak.</single>
+      <multiple>mak.</multiple>
     </term>
     <term name="book" form="short">kit.</term>
     <term name="chapter" form="short">böl.</term>
     <term name="column" form="short">süt.</term>
+    <term name="elocation" form="short">
+      <single>kon.</single>
+      <multiple>kon.</multiple>
+    </term>
+    <term name="equation" form="short">
+      <single>eşt.</single>
+      <multiple>eşt.</multiple>
+    </term>
     <term name="figure" form="short">şek.</term>
     <term name="folio" form="short">fl.</term>
-    <term name="issue" form="short">sy</term>
+    <term name="issue" form="short">sy.</term>
     <term name="line" form="short">satır</term>
     <term name="note" form="short">n.</term>
-    <term name="opus" form="short">a.yer</term>
+    <term name="opus" form="short">eser</term>
     <term name="page" form="short">
       <single>s.</single>
       <multiple>ss.</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>s.</single>
-      <multiple>ss.</multiple>
-    </term>
     <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">ksm.</term>
+    <term name="rule" form="short">
+      <single>kur.</single>
+      <multiple>kur.</multiple>
+    </term>
+    <term name="scene" form="short">
+      <single>sahn.</single>
+      <multiple>sahn.</multiple>
+    </term>
     <term name="section" form="short">blm.</term>
     <term name="sub-verbo" form="short">
       <single>md.</single>
       <multiple>md.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>mas.</single>
+      <multiple>mas.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>başl.</single>
+      <multiple>başl.</multiple>
+    </term>
     <term name="verse" form="short">
-      <single>v.</single>
-      <multiple>vv.</multiple>
+      <single>ay.</single>
+      <multiple>ay.</multiple>
     </term>
     <term name="volume" form="short">
       <single>c.</single>
       <multiple>c.</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
-      <single>¶</single>
-      <multiple>¶¶</multiple>
+      <single>par.</single>
+      <multiple>par.</multiple>
     </term>
     <term name="section" form="symbol">
-      <single>§</single>
-      <multiple>§§</multiple>
+      <single>kısım</single>
+      <multiple>kısımlar</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>bölüm numarası</single>
+      <multiple>bölümler numarası</multiple>
     </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+    <term name="citation-number">
+      <single>atıf</single>
+      <multiple>atıflar</multiple>
     </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+    <term name="collection-number">
+      <single>sayı</single>
+      <multiple>sayı</multiple>
     </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+    <term name="edition">
+      <single>baskı</single>
+      <multiple>baskılar</multiple>
     </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+    <term name="first-reference-note-number">
+      <single>atıf</single>
+      <multiple>atıflar</multiple>
     </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+    <term name="number">
+      <single>sayı</single>
+      <multiple>sayılar</multiple>
     </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+    <term name="number-of-pages">
+      <single>sayfa sayısı</single>
+      <multiple>sayfa sayıları</multiple>
     </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+    <term name="number-of-volumes">
+      <single>cilt</single>
+      <multiple>ciltler</multiple>
     </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+    <term name="page-first">
+      <single>ilk sayfa</single>
+      <multiple>ilk sayfa</multiple>
     </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+    <term name="printing">
+      <single>çıktı</single>
+      <multiple>çıktılar</multiple>
     </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+    <term name="version">versiyon</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>böl. num.</single>
+      <multiple>böl. num.</multiple>
     </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
     </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <term name="collection-number" form="short">sy</term>
+    <term name="edition" form="short">bs.</term>
+    <term name="first-reference-note-number" form="short">
+      <single>atf.</single>
+      <multiple>atf.</multiple>
     </term>
+    <term name="number" form="short">
+      <single>sy.</single>
+      <multiple>sy.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>s.</single>
+      <multiple>ss.</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>cilt</single>
+      <multiple>ciltler</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>i.s.</single>
+      <multiple>i.s.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>çıktı</single>
+      <multiple>çıktılar</multiple>
+    </term>
+
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">
+      <single>başkan</single>
+      <multiple>başkanlar</multiple>
+    </term>
+    <term name="collection-editor">
+      <single>editör</single>
+      <multiple>editörler</multiple>
+    </term>
+    <term name="compiler">
+      <single>derleye</single>
+      <multiple>derleyenler</multiple>
+    </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">
+      <single>katkıda bulunan</single>
+      <multiple>katkıda bulunanlar</multiple>
+    </term>
+    <term name="curator">
+      <single>küratör</single>
+      <multiple>küratörler</multiple>
+    </term>
     <term name="director">
       <single>direktör</single>
       <multiple>direktörler</multiple>
@@ -446,22 +509,66 @@
       <single>editör</single>
       <multiple>editörler</multiple>
     </term>
+    <term name="editor-translator">
+      <single>editör &amp; çeviren</single>
+      <multiple>editörler &amp; çevirenler</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>editör &amp; çeviren</single>
+      <multiple>editörler &amp; çevirenler</multiple>
+    </term>
     <term name="editorial-director">
       <single>sorumlu editör</single>
       <multiple>sorumlu editörler</multiple>
     </term>
+    <term name="executive-producer">
+      <single>baş yapımcı</single>
+      <multiple>baş yapımcılar</multiple>
+    </term>
+    <term name="guest">
+      <single>misafir</single>
+      <multiple>misafirler</multiple>
+    </term>
+    <term name="host">
+      <single>ev sahibi</single>
+      <multiple>ev sahipleri</multiple>
+    </term>
     <term name="illustrator">
       <single>çizen</single>
       <multiple>çizenler</multiple>
     </term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">
+      <single>anlatıcı</single>
+      <multiple>anlatıcılar</multiple>
+    </term>
+    <term name="organizer">
+      <single>düzenleyen</single>
+      <multiple>düzenleyenler</multiple>
+    </term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">
+      <single>icra eden</single>
+      <multiple>icra edenler</multiple>
+    </term>
+    <term name="producer">
+      <single>yapımcı</single>
+      <multiple>yapımcılar</multiple>
+    </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">
+      <single>metin yazarı</single>
+      <multiple>metin yazarları</multiple>
+    </term>
+    <term name="series-creator">
+      <single>dizi yapımcısı</single>
+      <multiple>dizi yapımcıları</multiple>
+    </term>
     <term name="translator">
       <single>çeviren</single>
       <multiple>çevirenler</multiple>
     </term>
-    <term name="editortranslator">
-      <single>editör &amp; çeviren</single>
-      <multiple>editörler &amp; çevirenler</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -476,10 +583,34 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>dir.</single>
+      <multiple>dir.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>ed.</single>
+      <multiple>ed.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>ed. &amp; çev.</single>
+      <multiple>ed. &amp; çev.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>ed. &amp; çev.</single>
+      <multiple>ed. &amp; çev.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>sor.ed.</single>
+      <multiple>sor.ed.</multiple>
+    </term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>çzm.</single>
+      <multiple>çzm.</multiple>
+    </term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -504,75 +635,59 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dir.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>ed.</single>
-      <multiple>ed.</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>sor.ed.</single>
-      <multiple>sor.ed.</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>çzm.</single>
-      <multiple>çzm.</multiple>
-    </term>
     <term name="translator" form="short">
       <single>çev.</single>
       <multiple>çev.</multiple>
     </term>
-    <term name="editortranslator" form="short">
-      <single>ed. &amp; çev.</single>
-      <multiple>ed. &amp; çev.</multiple>
-    </term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">kitap editörü</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">direktör</term>
+    <term name="editor" form="verb">editör</term>
+    <term name="editor-translator" form="verb">düzenleyen &amp; çeviren by</term>
+    <term name="editortranslator" form="verb">düzenleyen &amp; çeviren by</term>
+    <term name="editorial-director" form="verb">sorumlu editör</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">çizen</term>
+    <term name="interviewer" form="verb">röportaj yapan</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">kitap editörü</term>
-    <term name="director" form="verb">direktör</term>
-    <term name="editor" form="verb">editör</term>
-    <term name="editorial-director" form="verb">sorumlu editör</term>
-    <term name="illustrator" form="verb">çizen</term>
-    <term name="interviewer" form="verb">röportaj yapan</term>
     <term name="recipient" form="verb">alıcı</term>
     <term name="reviewed-author" form="verb">tanıtım yazarı</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">çeviren</term>
-    <term name="editortranslator" form="verb">düzenleyen &amp; çeviren by</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">dir.</term>
+    <term name="editor" form="verb-short">ed.</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; çev.</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; çev.</term>
+    <term name="editorial-director" form="verb-short">sor.ed.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">çizen</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="editorial-director" form="verb-short">sor.ed.</term>
-    <term name="illustrator" form="verb-short">çizen</term>
     <term name="translator" form="verb-short">çev.</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; çev.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Ocak</term>
diff --git a/locales/uk-UA.xml b/locales/uk-UA.xml
--- a/locales/uk-UA.xml
+++ b/locales/uk-UA.xml
@@ -1,41 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="uk-UA">
   <info>
+    <translator>
+      <name>Bohdana Ivahnenko</name>
+      <email>ivahnenko.bohdana@knu.ua</email>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2018-09-17T21:00:00+02:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
-    <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
-    <date-part name="month" suffix=" "/>
-    <date-part name="year"/>
+    <date-part name="year" suffix=". "/>
+    <date-part name="day" form="numeric-leading-zeros" suffix=" "/>
+    <date-part name="month" form="short"/>
   </date>
   <date form="numeric">
-    <date-part name="day" form="numeric-leading-zeros" suffix="/"/>
-    <date-part name="month" form="numeric-leading-zeros" suffix="/"/>
+    <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+    <date-part name="month" form="numeric-leading-zeros" suffix="."/>
     <date-part name="year"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">дата звернення</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">і</term>
+    <term name="and others">та інші</term>
+    <term name="anonymous">анонімний</term>
+    <term name="at">на</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">доступний у</term>
+    <term name="by">відповідно до</term>
+    <term name="circa">близько</term>
+    <term name="cited">цит. за</term>
+    <term name="et-al">та ін.</term>
     <term name="film">film</term>
+    <term name="forthcoming">майбутній</term>
+    <term name="from">із</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">там само</term>
+    <term name="in">у</term>
+    <term name="in press">у пресі</term>
+    <term name="internet">інтернет</term>
+    <term name="letter">лист</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">без дати</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">URL</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">особисте спілкування</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">представлений у</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">список використаних джерел</term>
+    <term name="retrieved">вилучено</term>
+    <term name="review-of">review of</term>
+    <term name="scale">масштаб</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -43,37 +70,18 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">дата звернення</term>
-    <term name="and">і</term>
-    <term name="and others">та інші</term>
-    <term name="anonymous">анонімний</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">анон.</term>
-    <term name="at">на</term>
-    <term name="available at">доступний у</term>
-    <term name="by">відповідно до</term>
-    <term name="circa">близько</term>
-    <term name="circa" form="short">c.</term>
-    <term name="cited">цит. за</term>
-    <term name="edition">видання</term>
-    <term name="edition" form="short">вид.</term>
-    <term name="et-al">et al.</term>
-    <term name="forthcoming">майбутній</term>
-    <term name="from">із</term>
-    <term name="ibid">там само</term>
-    <term name="in">в</term>
-    <term name="in press">у пресі</term>
-    <term name="internet">інтернет</term>
-    <term name="letter">лист</term>
-    <term name="no date">без дати</term>
+    <term name="circa" form="short">бл.</term>
     <term name="no date" form="short">б. д.</term>
-    <term name="online">online</term>
-    <term name="presented at">представлена на</term>
-    <term name="reference">список використаних джерел</term>
-    <term name="reference" form="short">джерела</term>
-    <term name="retrieved">вилучено</term>
-    <term name="scale">масштаб</term>
-    <term name="version">версія</term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
+    <term name="reference" form="short">дж.</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -94,7 +102,7 @@
     <!-- figure is in the list of locator terms -->
     <term name="graphic">graphic</term>
     <term name="hearing">hearing</term>
-    <term name="interview">інтервю</term>
+    <term name="interview">інтерв'ю</term>
     <term name="legal_case">legal case</term>
     <term name="legislation">legislation</term>
     <term name="manuscript">manuscript</term>
@@ -138,6 +146,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">н. е.</term>
     <term name="bc">до н. е.</term>
@@ -147,77 +163,71 @@
     <!-- PUNCTUATION -->
     <term name="open-quote">«</term>
     <term name="close-quote">»</term>
-    <term name="open-inner-quote">‘</term>
-    <term name="close-inner-quote">’</term>
-    <term name="page-range-delimiter">–</term>
+    <term name="open-inner-quote">“</term> <!-- following 2019 orthography rules given at https://uk.wikipedia.org/wiki/%D0%9B%D0%B0%D0%BF%D0%BA%D0%B8 -->
+    <term name="close-inner-quote">”</term>
+    <term name="page-range-delimiter">&#8212;</term> <!-- Following 2019 orthography rules at https://uk.wikipedia.org/wiki/%D0%9F%D1%83%D0%BD%D0%BA%D1%82%D1%83%D0%B0%D1%86%D1%96%D1%8F -->
     <term name="colon">:</term>
     <term name="comma">,</term>
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal">ий</term>
+    <term name="ordinal">е</term>
+    <term name="ordinal" gender-form="masculine">ий</term>
+    <term name="ordinal" gender-form="feminine">а</term>
 
     <!-- LONG ORDINALS -->
-    <term name="long-ordinal-01">перший</term>
-    <term name="long-ordinal-02">другий</term>
-    <term name="long-ordinal-03">третій</term>
-    <term name="long-ordinal-04">четвертий</term>
-    <term name="long-ordinal-05">п'ятий</term>
-    <term name="long-ordinal-06">шостий</term>
-    <term name="long-ordinal-07">сьомий</term>
-    <term name="long-ordinal-08">восьмий</term>
-    <term name="long-ordinal-09">дев'ятий</term>
-    <term name="long-ordinal-10">десятий</term>
+    <term name="long-ordinal-01">перше</term>
+    <term name="long-ordinal-02">друге</term>
+    <term name="long-ordinal-03">третє</term>
+    <term name="long-ordinal-04">четверте</term>
+    <term name="long-ordinal-05">п'яте</term>
+    <term name="long-ordinal-06">шосте</term>
+    <term name="long-ordinal-07">сьоме</term>
+    <term name="long-ordinal-08">восьме</term>
+    <term name="long-ordinal-09">дев'яте</term>
+    <term name="long-ordinal-10">десяте</term>
+    <term name="long-ordinal-01" gender-form="masculine">перший</term>
+    <term name="long-ordinal-02" gender-form="masculine">другий</term>
+    <term name="long-ordinal-03" gender-form="masculine">третій</term>
+    <term name="long-ordinal-04" gender-form="masculine">четвертий</term>
+    <term name="long-ordinal-05" gender-form="masculine">п'ятий</term>
+    <term name="long-ordinal-06" gender-form="masculine">шостий</term>
+    <term name="long-ordinal-07" gender-form="masculine">сьомий</term>
+    <term name="long-ordinal-08" gender-form="masculine">восьмий</term>
+    <term name="long-ordinal-09" gender-form="masculine">дев'ятий</term>
+    <term name="long-ordinal-10" gender-form="masculine">десятий</term>
+    <term name="long-ordinal-01" gender-form="feminine">перша</term>
+    <term name="long-ordinal-02" gender-form="feminine">друга</term>
+    <term name="long-ordinal-03" gender-form="feminine">третя</term>
+    <term name="long-ordinal-04" gender-form="feminine">четверта</term>
+    <term name="long-ordinal-05" gender-form="feminine">п'ята</term>
+    <term name="long-ordinal-06" gender-form="feminine">шоста</term>
+    <term name="long-ordinal-07" gender-form="feminine">сьома</term>
+    <term name="long-ordinal-08" gender-form="feminine">восьма</term>
+    <term name="long-ordinal-09" gender-form="feminine">дев'ята</term>
+    <term name="long-ordinal-10" gender-form="feminine">десята</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>книга</single>
       <multiple>книги</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>розділ</single>
       <multiple>розділи</multiple>
@@ -226,6 +236,14 @@
       <single>графа</single>
       <multiple>графи</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>рисунок</single>
       <multiple>рисунки</multiple>
@@ -236,103 +254,132 @@
     </term>
     <term name="issue">випуск</term>
     <term name="line">
-      <single>Рядок</single>
-      <multiple>Рядки</multiple>
+      <single>рядок</single>
+      <multiple>рядки</multiple>
     </term>
     <term name="note">
       <single>примітка</single>
       <multiple>примітки</multiple>
     </term>
     <term name="opus">
-      <single>opus</single>
-      <multiple>opera</multiple>
+      <single>опус</single>
+      <multiple>опуси</multiple>
     </term>
-    <term name="page">С.</term>
-    <term name="number-of-pages">с.</term>
+    <term name="page">
+      <single>С.</single>
+      <multiple>С.</multiple>
+    </term>
     <term name="paragraph">
-      <single>параграф</single>
-      <multiple>параграфи</multiple>
+      <single>абзац</single>
+      <multiple>абзаци</multiple>
     </term>
     <term name="part">
       <single>частина</single>
       <multiple>частини</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
-      <single>розділ</single>
-      <multiple>розділи</multiple>
+      <single>параграф</single>
+      <multiple>параграфи</multiple>
     </term>
     <term name="sub-verbo">
-      <single>sub verbo</single>
-      <multiple>sub verbis</multiple>
+      <single>див.</single>
+      <multiple/>
     </term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
-      <single>verse</single>
-      <multiple>verses</multiple>
+      <single>вірш</single>
+      <multiple>вірші</multiple>
     </term>
     <term name="volume">
-      <single>Том</single>
-      <multiple>Томи</multiple>
+      <single>том</single>
+      <multiple>томи</multiple>
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">кн.</term>
+    <term name="chapter" form="short">розд.</term>
+    <term name="column" form="short">гр.</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
+    <term name="figure" form="short">рис.</term>
+    <term name="folio" form="short">ф.</term>
+    <term name="issue" form="short">вип.</term>
+    <term name="line" form="short">ряд.</term>
+    <term name="note" form="short">прим.</term>
+    <term name="opus" form="short">оп.</term>
+    <term name="page" form="short">С.</term>
+    <term name="paragraph" form="short">абз.</term>
+    <term name="part" form="short">ч.</term>
+    <term name="rule" form="short">
       <single>r.</single>
-      <multiple>rr.</multiple>						 
+      <multiple>rr.</multiple>
     </term>
-    <term name="scene" form="short">			 
+    <term name="scene" form="short">
       <single>sc.</single>
-      <multiple>scs.</multiple>						 
+      <multiple>scs.</multiple>
     </term>
-    <term name="table" form="short">			 
+    <term name="section" form="short">пар.</term>
+    <term name="sub-verbo" form="short">
+      <single>s.v.</single>
+      <multiple>s.vv.</multiple>
+    </term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
       <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
+      <multiple>tbls.</multiple>
     </term>
     <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+      <single/>
+      <multiple/>
     </term>
-    <term name="title-locator" form="short">			 
+    <term name="title-locator" form="short">
       <single>tit.</single>
       <multiple>tits.</multiple>
     </term>
-    <term name="book" form="short">кн.</term>
-    <term name="chapter" form="short">розд.</term>
-    <term name="column" form="short">ряд.</term>
-    <term name="figure" form="short">рис.</term>
-    <term name="folio" form="short">ф.</term>
-    <term name="issue" form="short">вип.</term>
-    <term name="line" form="short">л.</term>
-    <term name="note" form="short">прим.</term>
-    <term name="opus" form="short">оп.</term>
-    <term name="page" form="short">с.</term>
-    <term name="number-of-pages" form="short">с.</term>
-    <term name="paragraph" form="short">пар.</term>
-    <term name="part" form="short">ч.</term>
-    <term name="section" form="short">сек.</term>
-    <term name="sub-verbo" form="short">
-      <single>s.v.</single>
-      <multiple>s.vv.</multiple>
-    </term>
-    <term name="verse" form="short">с.</term>
-    <term name="volume" form="short">вип.</term>
+    <term name="verse" form="short">в.</term>
+    <term name="volume" form="short">т.</term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -342,15 +389,90 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">випуск</term>
+    <term name="edition">видання</term>
+    <term name="first-reference-note-number">
+      <single>примітка</single>
+      <multiple>примітки</multiple>
+    </term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>с.</single>
+      <multiple>с.</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">версія</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">вип.</term>
+    <term name="edition" form="short">вид.</term>
+    <term name="first-reference-note-number" form="short">прим.</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">с.</term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+    <term name="version" form="short">вер.</term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -359,6 +481,20 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">
+      <single>режисер</single>
+      <multiple>режисери</multiple>
+    </term>
+    <term name="editor">
+      <single>редактор</single>
+      <multiple>редактори</multiple>
+    </term>
+    <term name="editor-translator">редактор і перекладач</term>
+    <term name="editortranslator">редактор і перекладач</term>
+    <term name="editorial-director">
+      <single>відповідальний редактор</single>
+      <multiple>відповідальні редактори</multiple>
+    </term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -371,6 +507,11 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">
+      <single>ілюстратор</single>
+      <multiple>ілюстратори</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -379,6 +520,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -387,6 +529,8 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -395,21 +539,10 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="director">
-      <single>режисер</single>
-      <multiple>режисери</multiple>
-    </term>
-    <term name="editor">за ред.</term>
-    <term name="editorial-director">за ред.</term>
-    <term name="illustrator">
-      <single>ілюстратор</single>
-      <multiple>ілюстратори</multiple>
-    </term>
     <term name="translator">
       <single>перекладач</single>
       <multiple>перекладачі</multiple>
     </term>
-    <term name="editortranslator">За ред. &amp; переклад</term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -424,10 +557,16 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">реж.</term>
+    <term name="editor" form="short">ред.</term>
+    <term name="editor-translator" form="short">за ред. і пер.</term>
+    <term name="editortranslator" form="short">за ред. і пер.</term>
+    <term name="editorial-director" form="short">відповідальний редактор</term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">іл.</term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -452,90 +591,89 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="director" form="short">реж.</term>
-    <term name="editor" form="short">ред.</term>
-    <term name="editorial-director" form="short">ред.</term>
-    <term name="illustrator" form="short">іл.</term>
     <term name="translator" form="short">пер.</term>
-    <term name="editortranslator" form="short">ред. &amp; пер.</term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">edited by</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">написано</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">зрежисовано</term>
+    <term name="editor" form="verb">за редакцією</term>
+    <term name="editor-translator" form="verb">відредаговано й перекладено</term>
+    <term name="editortranslator" form="verb">відредаговано й перекладено</term>
+    <term name="editorial-director" form="verb">за загальною редакцією</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">ілюстровано</term>
+    <term name="interviewer" form="verb">інтерв'ю</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
+    <term name="recipient" form="verb">для</term>
+    <term name="reviewed-author" form="verb">рецензія від</term>
     <term name="script-writer" form="verb">written by</term>
     <term name="series-creator" form="verb">created by</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="director" form="verb">directed by</term>
-    <term name="editor" form="verb">edited by</term>
-    <term name="editorial-director" form="verb">edited by</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">interview by</term>
-    <term name="recipient" form="verb">to</term>
-    <term name="reviewed-author" form="verb">by</term>
-    <term name="translator" form="verb">translated by</term>
-    <term name="editortranslator" form="verb">edited &amp; translated by</term>
+    <term name="translator" form="verb">перекладено</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">ed. by</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">реж.</term>
+    <term name="editor" form="verb-short">зе ред.</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editorial-director" form="verb-short">за заг. ред.</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">іл.</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">ed</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
-    <term name="illustrator" form="verb-short">illus.</term>
-    <term name="translator" form="verb-short">trans</term>
-    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="translator" form="verb-short">пер.</term>
 
     <!-- LONG MONTH FORMS -->
-    <term name="month-01">Січень</term>
-    <term name="month-02">Лютий</term>
-    <term name="month-03">Березень</term>
-    <term name="month-04">Квітень</term>
-    <term name="month-05">Травень</term>
-    <term name="month-06">Червень</term>
-    <term name="month-07">Липень</term>
-    <term name="month-08">Серпень</term>
-    <term name="month-09">Вересень</term>
-    <term name="month-10">Жовтень</term>
-    <term name="month-11">Листопад</term>
-    <term name="month-12">Грудень</term>
+    <term name="month-01">січень</term>
+    <term name="month-02">лютий</term>
+    <term name="month-03">березень</term>
+    <term name="month-04">квітень</term>
+    <term name="month-05">травень</term>
+    <term name="month-06">червень</term>
+    <term name="month-07">липень</term>
+    <term name="month-08">серпень</term>
+    <term name="month-09">вересень</term>
+    <term name="month-10">жовтень</term>
+    <term name="month-11">листопад</term>
+    <term name="month-12">грудень</term>
 
     <!-- SHORT MONTH FORMS -->
-    <term name="month-01" form="short">Січ</term>
-    <term name="month-02" form="short">Лют</term>
-    <term name="month-03" form="short">Бер</term>
-    <term name="month-04" form="short">Квіт</term>
-    <term name="month-05" form="short">Трав</term>
-    <term name="month-06" form="short">Чер</term>
-    <term name="month-07" form="short">Лип</term>
-    <term name="month-08" form="short">Сер</term>
-    <term name="month-09" form="short">Вер</term>
-    <term name="month-10" form="short">Жов</term>
-    <term name="month-11" form="short">Лис</term>
-    <term name="month-12" form="short">Груд</term>
+    <term name="month-01" form="short">січ.</term>
+    <term name="month-02" form="short">лют.</term>
+    <term name="month-03" form="short">берез.</term>
+    <term name="month-04" form="short">квіт.</term>
+    <term name="month-05" form="short">трав.</term>
+    <term name="month-06" form="short">чер.</term>
+    <term name="month-07" form="short">лип.</term>
+    <term name="month-08" form="short">серп.</term>
+    <term name="month-09" form="short">верес.</term>
+    <term name="month-10" form="short">жовт.</term>
+    <term name="month-11" form="short">листоп.</term>
+    <term name="month-12" form="short">груд.</term>
 
     <!-- SEASONS -->
-    <term name="season-01">Spring</term>
-    <term name="season-02">Summer</term>
-    <term name="season-03">Autumn</term>
-    <term name="season-04">Winter</term>
+    <term name="season-01">весна</term>
+    <term name="season-02">літо</term>
+    <term name="season-03">осінь</term>
+    <term name="season-04">зима</term>
   </terms>
 </locale>
diff --git a/locales/vi-VN.xml b/locales/vi-VN.xml
--- a/locales/vi-VN.xml
+++ b/locales/vi-VN.xml
@@ -4,8 +4,14 @@
     <translator>
       <name>dowens76</name>
     </translator>
+    <translator>
+      <name>Hung Quoc Vo</name>
+    </translator>
+    <translator>
+      <name>Tran Quang Cuong</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2025-10-16T03:24:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,124 +25,125 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">giao tiếp cá nhân</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">truy cập</term>
+    <term name="advance-online-publication">tiền bản trực tuyến</term>  <!-- đã chấp nhận đăng, có DOI, được xuất bản online, nhưng chưa có tập, số, trang  -->
+    <term name="album">album</term>
     <term name="and">và</term>
-    <term name="and others">and others</term>
-    <term name="anonymous">vô danh</term>
-    <term name="anonymous" form="short">v.d</term>
+    <term name="and others">và những người khác</term>
+    <term name="anonymous">khuyết danh</term>
     <term name="at">tại</term>
-    <term name="available at">available at</term>
+    <term name="audio-recording">bản ghi âm</term>
+    <term name="available at">có tại</term>
     <term name="by">bởi</term>
-    <term name="circa">circa</term>
-    <term name="circa" form="short">c.</term>
-    <term name="cited">cited</term>
-    <term name="edition">
-      <single>ấn bản</single>
-      <multiple>ấn bản</multiple>
-    </term>
-    <term name="edition" form="short">a.b</term>
+    <term name="circa">khoảng</term>
+    <term name="cited">được trích dẫn</term>
     <term name="et-al">và c.s.</term>
+    <term name="film">phim</term>
     <term name="forthcoming">sắp tới</term>
     <term name="from">từ</term>
+    <term name="henceforth">kể từ đây</term>
     <term name="ibid">n.t.</term>
     <term name="in">trong</term>
     <term name="in press">in press</term>
     <term name="internet">internet</term>
     <term name="letter">thư</term>
+    <term name="loc-cit">n.t.</term> <!-- như trên, cùng nguồn đã dẫn trước đó; like ibid., the abbreviated form is the regular form  -->
     <term name="no date">không ngày</term>
-    <term name="no date" form="short">không ngày</term>
+    <term name="no-place">không rõ địa điểm</term>
+    <term name="no-publisher">không rõ nhà xuất bản</term> <!-- sine nomine -->
+    <term name="on">vào</term>
     <term name="online">online</term>
+    <term name="op-cit">đ.d.</term> <!-- đã dẫn; like ibid., the abbreviated form is the regular form -->
+    <term name="original-work-published">nguyên bản</term>
+    <term name="personal-communication">giao tiếp cá nhân</term>
+    <term name="podcast">podcast</term>
+    <term name="podcast-episode">tập podcast</term>
+    <term name="preprint">preprint</term>
     <term name="presented at">được trình bày tại</term>
+    <term name="radio-broadcast">phát thanh</term>
+    <term name="radio-series">xê-ri phát thanh</term>
+    <term name="radio-series-episode">tập của xê-ri phát thanh</term>
     <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
-    </term>
-    <term name="reference" form="short">
-      <single>ref.</single>
-      <multiple>refs.</multiple>
+      <single>tài liệu tham khảo</single>
+      <multiple>tài liệu tham khảo</multiple>
     </term>
     <term name="retrieved">truy vấn</term>
+    <term name="review-of">bài đánh giá về</term>
     <term name="scale">scale</term>
-    <term name="version">version</term>
+    <term name="special-issue">số đặc biệt</term>
+    <term name="special-section">mục đặc biệt</term>
+    <term name="television-broadcast">truyền hình</term>
+    <term name="television-series">xê-ri truyền hình</term>
+    <term name="television-series-episode">tập của xê-ri truyền hình</term>
+    <term name="video">video</term>
+    <term name="working-paper">bản thảo nghiên cứu</term>
 
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">k.d</term>
+    <term name="circa" form="short">k.</term>
+    <term name="no date" form="short">không ngày</term>
+    <term name="no-place" form="short">k.r.đ.đ.</term>
+    <term name="no-publisher" form="short">k.r.n.x.b.</term>
+    <term name="reference" form="short">
+      <single>t.l.t.k.</single>
+      <multiple>t.l.t.k.</multiple>
+    </term>
+    <term name="review-of" form="short">b.đ.g. về</term>
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article-journal">bài báo khoa học</term>
+    <term name="article-magazine">bài báo tạp chí</term>
+    <term name="article-newspaper">bài báo báo chí</term>
+    <term name="bill">dự luật</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">phát sóng</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">tác phẩm kinh điển</term>
+    <term name="collection">tuyển tập</term>
+    <term name="dataset">tập dữ liệu</term>
+    <term name="document">tài liệu</term>
+    <term name="entry">mục</term>
+    <term name="entry-dictionary">mục từ điển</term>
+    <term name="entry-encyclopedia">mục bách khoa</term>
+    <term name="event">sự kiện</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
-    <term name="interview">interview</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="graphic">hình ảnh</term>
+    <term name="hearing">phiên điều trần</term>
+    <term name="interview">phỏng vấn</term>
+    <term name="legal_case">vụ án pháp lý</term>
+    <term name="legislation">văn bản pháp luật</term>
+    <term name="manuscript">bản thảo</term>
+    <term name="map">bản đồ</term>
+    <term name="motion_picture">phim điện ảnh</term>
+    <term name="musical_score">bản nhạc</term>
+    <term name="pamphlet">tờ rơi or sách mỏng</term>
+    <term name="paper-conference">báo cáo hội nghị</term>
+    <term name="patent">bằng sáng chế</term>
+    <term name="performance">buổi biểu diễn</term>
+    <term name="periodical">định kỳ or tạp chí định kỳ</term>
     <term name="personal_communication">giao tiếp cá nhân</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">bài đăng</term>
+    <term name="post-weblog">bài đăng blog</term>
+    <term name="regulation">quy định</term>
+    <term name="report">báo cáo</term>
+    <term name="review">đánh giá</term>
+    <term name="review-book">đánh giá sách</term>
+    <term name="software">phần mềm</term>
+    <term name="song">bản ghi âm</term>
+    <term name="speech">bài trình chiếu</term>
+    <term name="standard">chuẩn</term>
+    <term name="thesis">luận văn</term>
+    <term name="treaty">hiệp ước</term>
+    <term name="webpage">trang web</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">b.b. k.h.</term>
+    <term name="article-magazine" form="short">báo tc.</term>
+    <term name="article-newspaper" form="short">báo</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
     <term name="document" form="short">doc.</term>
@@ -144,17 +151,25 @@
     <term name="graphic" form="short">graph.</term>
     <term name="interview" form="short">interv.</term>
     <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
+    <term name="motion_picture" form="short">phim</term>
     <term name="report" form="short">rep.</term>
     <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="review-book" form="short">đ.g. s.</term>
+    <term name="song" form="short">b.h.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">lời khai của</term>
+    <term name="review" form="verb">bài đánh giá về</term>
+    <term name="review-book" form="verb">đánh giá sách</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">AD</term>
-    <term name="bc">BC</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="ad">SCN</term>
+    <term name="bc">TCN</term>
+    <term name="bce">TCN</term>
+    <term name="ce">SCN</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">“</term>
@@ -167,13 +182,13 @@
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal">th</term>
-    <term name="ordinal-01">st</term>
-    <term name="ordinal-02">nd</term>
-    <term name="ordinal-03">rd</term>
-    <term name="ordinal-11">th</term>
-    <term name="ordinal-12">th</term>
-    <term name="ordinal-13">th</term>
+    <term name="ordinal"/> <!-- In Vietnamse: "the first" = "thứ nhất" (not 1st), the second = thứ nhì/thứ hai -->
+    <term name="ordinal-01"/>
+    <term name="ordinal-02"/>
+    <term name="ordinal-03"/>
+    <term name="ordinal-11"/>
+    <term name="ordinal-12"/>
+    <term name="ordinal-13"/>
 
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">thứ nhất</term>
@@ -184,66 +199,46 @@
     <term name="long-ordinal-06">thứ sáu</term>
     <term name="long-ordinal-07">thứ bảy</term>
     <term name="long-ordinal-08">thứ tám</term>
-    <term name="long-ordinal-09">thứ chính</term>
+    <term name="long-ordinal-09">thứ chín</term>
     <term name="long-ordinal-10">thứ mười</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>articles</multiple>
     </term>
     <term name="book">
       <single>sách</single>
       <multiple>sách</multiple>
     </term>
+    <term name="canon">
+      <single>canon</single>
+      <multiple>canons</multiple>
+    </term>
     <term name="chapter">
       <single>chương</single>
       <multiple>chương</multiple>
     </term>
     <term name="column">
-      <single>column</single>
-      <multiple>columns</multiple>
+      <single>cột</single>
+      <multiple>cột</multiple>
     </term>
+    <term name="elocation">
+      <single>location</single>
+      <multiple>locations</multiple>
+    </term>
+    <term name="equation">
+      <single>equation</single>
+      <multiple>equations</multiple>
+    </term>
     <term name="figure">
       <single>figure</single>
       <multiple>figures</multiple>
@@ -272,26 +267,46 @@
       <single>trang</single>
       <multiple>trang</multiple>
     </term>
-    <term name="number-of-pages">
-      <single>trang</single>
-      <multiple>trang</multiple>
-    </term>
     <term name="paragraph">
-      <single>đoạn văn</single>
-      <multiple>đoạn văn</multiple>
+      <single>đoạn</single>
+      <multiple>đoạn</multiple>
     </term>
     <term name="part">
       <single>phần</single>
       <multiple>phần</multiple>
     </term>
+    <term name="rule">
+      <single>rule</single>
+      <multiple>rules</multiple>
+    </term>
+    <term name="scene">
+      <single>scene</single>
+      <multiple>scenes</multiple>
+    </term>
     <term name="section">
-      <single>section</single>
-      <multiple>sections</multiple>
+      <single>mục</single>
+      <multiple>mục</multiple>
     </term>
     <term name="sub-verbo">
       <single>sub verbo</single>
       <multiple>sub verbis</multiple>
     </term>
+    <term name="supplement">
+      <single>phụ lục</single>
+      <multiple>phụ lục</multiple>
+    </term>
+    <term name="table">
+      <single>table</single>
+      <multiple>tables</multiple>
+    </term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">
+      <single>title</single>
+      <multiple>titles</multiple>
+    </term>
     <term name="verse">
       <single>câu</single>
       <multiple>câu</multiple>
@@ -302,76 +317,75 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
+    <term name="appendix" form="short">
+      <single>p.l.</single>
+      <multiple>p.l.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">sách</term>
+    <term name="chapter" form="short">ch.</term>
+    <term name="column" form="short">cột</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
-    <term name="book" form="short">sách</term>
-    <term name="chapter" form="short">ch</term>
-    <term name="column" form="short">col</term>
-    <term name="figure" form="short">fig</term>
+    <term name="figure" form="short">hình</term>
     <term name="folio" form="short">f</term>
-    <term name="issue" form="short">số p.h</term>
+    <term name="issue" form="short">số</term>
     <term name="line" form="short">d.</term>
-    <term name="note" form="short">gc.</term>
+    <term name="note" form="short">g.c.</term>
     <term name="opus" form="short">op</term>
     <term name="page" form="short">
       <single>tr</single>
       <multiple>tr</multiple>
     </term>
-    <term name="number-of-pages" form="short">
-      <single>tr</single>
-      <multiple>tr</multiple>
+    <term name="paragraph" form="short">đ.</term>
+    <term name="rule" form="short">
+      <single>r.</single>
+      <multiple>rr.</multiple>
     </term>
-    <term name="paragraph" form="short">para</term>
-    <term name="part" form="short">ph</term>
-    <term name="section" form="short">sec</term>
+    <term name="scene" form="short">
+      <single>sc.</single>
+      <multiple>scs.</multiple>
+    </term>
+    <term name="section" form="short">m.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
     </term>
+    <term name="supplement" form="short">
+      <single>p.l.</single>
+      <multiple>p.l.</multiple>
+    </term>
+    <term name="table" form="short">
+      <single>tbl.</single>
+      <multiple>tbls.</multiple>
+    </term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">
+      <single>tit.</single>
+      <multiple>tits.</multiple>
+    </term>
     <term name="verse" form="short">
       <single>v</single>
       <multiple>vv</multiple>
     </term>
     <term name="volume" form="short">
-      <single>vol</single>
-      <multiple>vols</multiple>
+      <single>tập</single>
+      <multiple>tập</multiple>
     </term>
 
-    <!-- SYMBOL LOCATOR FORMS -->
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -381,194 +395,296 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chương</single>
+      <multiple>chương</multiple>
+    </term>
+    <term name="citation-number">
+      <single>tài liệu</single>
+      <multiple>tài liệu</multiple>
+    </term>
+    <term name="collection-number">
+      <single>số</single>
+      <multiple>số</multiple>
+    </term>
+    <term name="edition">
+      <single>ấn bản</single>
+      <multiple>ấn bản</multiple>
+    </term>
+    <term name="first-reference-note-number">
+      <single>tài liệu</single>
+      <multiple>tài liệu</multiple>
+    </term>
+    <term name="number">
+      <single>số</single>
+      <multiple>số</multiple>
+    </term>
+    <term name="number-of-pages">
+      <single>trang</single>
+      <multiple>trang</multiple>
+    </term>
+    <term name="number-of-volumes">
+      <single>tập</single>
+      <multiple>tập</multiple>
+    </term>
+    <term name="page-first">
+      <single>trang</single>
+      <multiple>trang</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">phiên bản</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>ch.</single>
+      <multiple>ch.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>tl.</single> <!-- Tài liệu -->
+      <multiple>tl.</multiple>
+    </term>
+    <term name="collection-number" form="short">số p.h</term>
+    <term name="edition" form="short">a.b</term>
+    <term name="first-reference-note-number" form="short">
+      <single>t.l.</single>
+      <multiple>t.l.</multiple>
+    </term>
+    <term name="number" form="short">
+      <single>số</single>
+      <multiple>số</multiple>
+    </term>
+    <term name="number-of-pages" form="short">
+      <single>tr</single>
+      <multiple>tr</multiple>
+    </term>
+    <term name="number-of-volumes" form="short">
+      <single>t.</single>
+      <multiple>t.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>tr.</single>
+      <multiple>tr.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+      <single>chủ tọa</single>
+      <multiple>chủ tọa</multiple>
     </term>
+    <term name="collection-editor">
+      <single>b.t.</single>
+      <multiple>b.t.</multiple>
+    </term>
     <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+      <single>người tổng hợp</single>
+      <multiple>người tổng hợp</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+      <single>cộng tác viên</single>
+      <multiple>cộng tác viên</multiple>
     </term>
     <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+      <single>người giám tuyển</single>
+      <multiple>người giám tuyển</multiple>
     </term>
+    <term name="director">
+      <single>chủ biênr</single>
+      <multiple>chủ biên</multiple>
+    </term>
+    <term name="editor">
+      <single>biên tập viên</single>
+      <multiple>biên tập viên</multiple>
+    </term>
+    <term name="editor-translator">
+      <single>biên tập viên &amp; biên dịch viên</single>
+      <multiple>biên tập viên &amp; biên dịch viên</multiple>
+    </term>
+    <term name="editortranslator">
+      <single>biên tập viên &amp; biên dịch viên</single>
+      <multiple>biên tập viên &amp; biên dịch viên</multiple>
+    </term>
+    <term name="editorial-director">
+      <single>tổng biên tập</single>
+      <multiple>tổng biên tập</multiple>
+    </term>
     <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+      <single>sản xuất - điều hành</single>
+      <multiple>esản xuất - điều hành</multiple>
     </term>
     <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+      <single>khách</single>
+      <multiple>khách</multiple>
     </term>
     <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+      <single>người dẫn</single>
+      <multiple>người dẫn</multiple>
     </term>
+    <term name="illustrator">
+      <single>họa sĩ</single>
+      <multiple>họa sĩ</multiple>
+    </term>
+    <term name="interviewer"/> <!-- generally blank -->
     <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+      <single>tường thuật viên</single>
+      <multiple>tường thuật viên</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>người tổ chức</single>
+      <multiple>người tổ chức</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+      <single>nghệ sĩ</single>
+      <multiple>nghệ sĩ</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>nhà sản xuất</single>
+      <multiple>nhà sản xuất</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>người biên soạn</single>
+      <multiple>người biên soạn</multiple>
     </term>
     <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
-    </term>
-    <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
-    </term>
-    <term name="editor">
-      <single>biên tập viên</single>
-      <multiple>biên tập viên</multiple>
-    </term>
-    <term name="editorial-director">
-      <single>biên tập viên</single>
-      <multiple>biên tập viên</multiple>
-    </term>
-    <term name="illustrator">
-      <single>họa sĩ</single>
-      <multiple>họa sĩ</multiple>
+      <single>người biên soạn xê-ri</single>
+      <multiple>người biên soạn xê-ri</multiple>
     </term>
     <term name="translator">
       <single>biên dịch viên</single>
       <multiple>biên dịch viên</multiple>
     </term>
-    <term name="editortranslator">
-      <single>biên tập viên &amp; biên dịch viên</single>
-      <multiple>biên tập viên &amp; biên dịch viên</multiple>
-    </term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+      <single>n.t.h.</single>
+      <multiple>n.t.h.</multiple>
     </term>
     <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <single>c.t.v.</single>
+      <multiple>c.t.v.</multiple>
     </term>
     <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
+      <single>g.t.v.</single>
+      <multiple>g.t.v.</multiple>
     </term>
+    <term name="director" form="short">
+      <single>đ.d.</single>
+      <multiple>đ.d.</multiple>
+    </term>
+    <term name="editor" form="short">
+      <single>b.t.v.</single>
+      <multiple>b.t.v.</multiple>
+    </term>
+    <term name="editor-translator" form="short">
+      <single>b.t.v. &amp; b.d.v.</single>
+      <multiple>b.t.v. &amp; b.d.v.</multiple>
+    </term>
+    <term name="editortranslator" form="short">
+      <single>b.t.v. &amp; b.d.v.</single>
+      <multiple>b.t.v. &amp; b.d.v.</multiple>
+    </term>
+    <term name="editorial-director" form="short">
+      <single>b.t.v.</single>
+      <multiple>b.t.v.</multiple>
+    </term>
     <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <single>s.x.&amp;đ.h.</single>
+      <multiple>s.x.&amp;đ.h.</multiple>
     </term>
+    <term name="illustrator" form="short">
+      <single>h.s.</single>
+      <multiple>h.s.</multiple>
+    </term>
     <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
+      <single>t.t.v.</single>
+      <multiple>t.t.v.</multiple>
     </term>
     <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
+      <single>n.t.c.</single>
+      <multiple>n.t.c.</multiple>
     </term>
     <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+      <single>n.s.</single>
+      <multiple>n.s.</multiple>
     </term>
     <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
+      <single>n.s.x.</single>
+      <multiple>n.s.x.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>n.b.s.</single>
+      <multiple>n.b.s.</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dirs.</multiple>
-    </term>
-    <term name="editor" form="short">
-      <single>b.t.v</single>
-      <multiple>b.t.v</multiple>
-    </term>
-    <term name="editorial-director" form="short">
-      <single>b.t.v</single>
-      <multiple>b.t.v</multiple>
-    </term>
-    <term name="illustrator" form="short">
-      <single>h.s</single>
-      <multiple>h.s</multiple>
+      <single>n.b.s. xê-ri</single>
+      <multiple>n.b.s. xê-ri</multiple>
     </term>
     <term name="translator" form="short">
-      <single>b.d.v</single>
-      <multiple>b.d.v</multiple>
-    </term>
-    <term name="editortranslator" form="short">
-      <single>b.t.v &amp; b.d.v</single>
-      <multiple>b.t.v &amp; b.d.v</multiple>
+      <single>b.d.v.</single>
+      <multiple>b.d.v.</multiple>
     </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">chủ trì bởi</term>
+    <term name="collection-editor" form="verb">biên tập</term>
+    <term name="compiler" form="verb">tổng hợp bởi</term>
     <term name="container-author" form="verb">bởi</term>
-    <term name="director" form="verb">directed by</term>
+    <term name="contributor" form="verb">với</term>
+    <term name="curator" form="verb">giám tuyển bởi</term>
+    <term name="director" form="verb">đạo diễn bởi</term>
     <term name="editor" form="verb">biên tập bởi</term>
+    <term name="editor-translator" form="verb">biên tập &amp; biên dịch bởi</term>
+    <term name="editortranslator" form="verb">biên tập &amp; biên dịch bởi</term>
     <term name="editorial-director" form="verb">biên tập bởi</term>
-    <term name="illustrator" form="verb">illustrated by</term>
-    <term name="interviewer" form="verb">interview by</term>
-    <term name="recipient" form="verb">to</term>
+    <term name="executive-producer" form="verb">sản xuất-điều hành bởi</term>
+    <term name="guest" form="verb">với khách mời</term>
+    <term name="host" form="verb">dẫn bởi</term>
+    <term name="illustrator" form="verb">minh họa bởi</term>
+    <term name="interviewer" form="verb">phỏng vấn bởi</term>
+    <term name="narrator" form="verb">thuật lại bởi</term>
+    <term name="organizer" form="verb">tổ chức bởi</term>
+    <term name="performer" form="verb">biểu diễn bởi</term>
+    <term name="producer" form="verb">sản xuất bởi</term>
+    <term name="recipient" form="verb">đến</term>
     <term name="reviewed-author" form="verb">bởi</term>
+    <term name="script-writer" form="verb">viết bởi</term>
+    <term name="series-creator" form="verb">viết bởi</term>
     <term name="translator" form="verb">biên dịch bởi</term>
-    <term name="editortranslator" form="verb">biên tập &amp; biên dịch bởi</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">dir.</term>
-    <term name="editor" form="verb-short">b.t</term>
-    <term name="editorial-director" form="verb-short">b.t</term>
-    <term name="illustrator" form="verb-short">h.s</term>
-    <term name="translator" form="verb-short">b.d</term>
-    <term name="editortranslator" form="verb-short">b.t &amp; b.d bởi</term>
+    <term name="collection-editor" form="verb-short">b.t. bởi</term>
+    <term name="compiler" form="verb-short">t.h. bởi</term>
+    <term name="contributor" form="verb-short">với</term>
+    <term name="curator" form="verb-short">g.t. bởi</term>
+    <term name="director" form="verb-short">đ.d.</term>
+    <term name="editor" form="verb-short">b.t.</term>
+    <term name="editor-translator" form="verb-short">b.t. &amp; b.d. bởi</term>
+    <term name="editortranslator" form="verb-short">b.t. &amp; b.d. bởi</term>
+    <term name="editorial-director" form="verb-short">b.t.</term>
+    <term name="executive-producer" form="verb-short">s.x.; đ.h. bởi</term>
+    <term name="guest" form="verb-short">với khách mời</term>
+    <term name="host" form="verb-short">dẫn bởi</term>
+    <term name="illustrator" form="verb-short">h.s.</term>
+    <term name="narrator" form="verb-short">thuật lại bởi</term>
+    <term name="organizer" form="verb-short">tổ chức bởi</term>
+    <term name="performer" form="verb-short">biểu diễn bởi</term>
+    <term name="producer" form="verb-short">s.x. bởi</term>
+    <term name="script-writer" form="verb-short">viết bởi</term>
+    <term name="series-creator" form="verb-short">viết bởi</term>
+    <term name="translator" form="verb-short">b.d.</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">Tháng Giêng</term>
@@ -581,22 +697,22 @@
     <term name="month-08">Tháng Tám</term>
     <term name="month-09">Tháng Chín</term>
     <term name="month-10">Tháng Mười</term>
-    <term name="month-11">Tháng Mười-Một</term>
-    <term name="month-12">Tháng Chạp</term>
+    <term name="month-11">Tháng Mười Một</term>
+    <term name="month-12">Tháng Mười Hai</term>
 
     <!-- SHORT MONTH FORMS -->
-    <term name="month-01" form="short">tháng 1</term>
-    <term name="month-02" form="short">tháng 2</term>
-    <term name="month-03" form="short">tháng 3</term>
-    <term name="month-04" form="short">tháng 4</term>
-    <term name="month-05" form="short">tháng 5</term>
-    <term name="month-06" form="short">tháng 6</term>
-    <term name="month-07" form="short">tháng 7</term>
-    <term name="month-08" form="short">tháng 8</term>
-    <term name="month-09" form="short">tháng 9</term>
-    <term name="month-10" form="short">tháng 10</term>
-    <term name="month-11" form="short">tháng 11</term>
-    <term name="month-12" form="short">tháng 12</term>
+    <term name="month-01" form="short">thg. 1</term>
+    <term name="month-02" form="short">thg. 2</term>
+    <term name="month-03" form="short">thg. 3</term>
+    <term name="month-04" form="short">thg. 4</term>
+    <term name="month-05" form="short">thg. 5</term>
+    <term name="month-06" form="short">thg. 6</term>
+    <term name="month-07" form="short">thg. 7</term>
+    <term name="month-08" form="short">thg. 8</term>
+    <term name="month-09" form="short">thg. 9</term>
+    <term name="month-10" form="short">thg. 10</term>
+    <term name="month-11" form="short">thg. 11</term>
+    <term name="month-12" form="short">thg. 12</term>
 
     <!-- SEASONS -->
     <term name="season-01">Mùa Xuân</term>
diff --git a/locales/zh-CN.xml b/locales/zh-CN.xml
--- a/locales/zh-CN.xml
+++ b/locales/zh-CN.xml
@@ -10,162 +10,183 @@
     <translator>
       <name>Heromyth</name>
     </translator>
+    <translator>
+      <name>Zeping Lee</name>
+    </translator>
+    <translator>
+      <name>韩小土</name>
+    </translator>
+    <translator>
+      <name>韩敏义</name>
+    </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2014-05-15T23:31:02+00:00</updated>
+    <updated>2025-10-16T11:24:00+08:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
-    <date-part name="year" suffix="年"/>
-    <date-part name="month" form="numeric" suffix="月"/>
-    <date-part name="day" suffix="日"/>
+    <date-part name="year" suffix="年" range-delimiter="&#8212;"/>
+    <date-part name="month" form="numeric" suffix="月" range-delimiter="&#8212;"/>
+    <date-part name="day" suffix="日" range-delimiter="&#8212;"/>
   </date>
   <date form="numeric">
-    <date-part name="year"/>
-    <date-part name="month" form="numeric-leading-zeros" prefix="/"/>
-    <date-part name="day" form="numeric-leading-zeros" prefix="/"/>
+    <date-part name="year" range-delimiter="/"/>
+    <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+    <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
-    <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
-    <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
-    <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
-    <term name="personal-communication">的私人交流</term>
-    <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <!-- LONG GENERAL TERMS -->
     <term name="accessed">见于</term>
+    <term name="advance-online-publication">网络首发</term>
+    <term name="album">专辑</term>
     <term name="and">和</term>
     <term name="and others">及其他</term>
     <term name="anonymous">作者不详</term>
-    <term name="anonymous" form="short">无名氏</term>
     <term name="at">于</term>
+    <term name="audio-recording">录音</term>
     <term name="available at">载于</term>
     <term name="by">著</term>
     <term name="circa">介于</term>
-    <term name="circa" form="short">约</term>
     <term name="cited">见引于</term>
-    <term name="edition">版本</term>
-    <term name="edition" form="short">本</term>
     <term name="et-al">等</term>
+    <term name="film">电影</term>
     <term name="forthcoming">即将出版</term>
     <term name="from">从</term>
+    <term name="henceforth">从此以后</term>
     <term name="ibid">同上</term>
     <term name="in">收入</term>
     <term name="in press">送印中</term>
     <term name="internet">网际网络</term>
     <term name="letter">信函</term>
+    <term name="loc-cit">同前注</term>
     <term name="no date">日期不详</term>
-    <term name="no date" form="short">不详</term>
+    <term name="no-place">出版地不详</term>
+    <term name="no-publisher">出版者不详</term> <!-- sine nomine -->
+    <term name="on">在</term>
     <term name="online">在线</term>
+    <term name="op-cit">同前注</term>
+    <term name="original-work-published">原著出版于</term>
+    <term name="personal-communication">的私人交流</term>
+    <term name="podcast">播客</term>
+    <term name="podcast-episode">播客集</term>
+    <term name="preprint">预印本</term>
     <term name="presented at">发表于</term>
+    <term name="radio-broadcast">电台广播</term>
+    <term name="radio-series">广播剧</term>
+    <term name="radio-series-episode">广播剧集</term>
     <term name="reference">参考</term>
-    <term name="reference" form="short">参</term>
     <term name="retrieved">取读于</term>
+    <term name="review-of">评论</term>
     <term name="scale">比例</term>
-    <term name="version">版</term>
+    <term name="special-issue">特刊</term>
+    <term name="special-section">特稿</term>
+    <term name="television-broadcast">电视广播</term>
+    <term name="television-series">电视剧</term>
+    <term name="television-series-episode">电视剧集</term>
+    <term name="video">视频</term>
+    <term name="working-paper">工作论文</term>
 
+    <!-- SHORT GENERAL TERMS -->
+    <term name="anonymous" form="short">无名氏</term>
+    <term name="circa" form="short">约</term>
+    <term name="no date" form="short">不详</term>
+    <term name="no-place" form="short">出版地不详</term>
+    <term name="no-publisher" form="short">出版者不详</term>
+    <term name="reference" form="short">参</term>
+    <term name="review-of" form="short">评</term>
+
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
+    <term name="article">预印本</term>
+    <term name="article-journal">期刊文章</term>
+    <term name="article-magazine">杂志文章</term>
+    <term name="article-newspaper">报纸文章</term>
+    <term name="bill">法案</term>
     <!-- book is in the list of locator terms -->
-    <term name="broadcast">broadcast</term>
+    <term name="broadcast">广播</term>
     <!-- chapter is in the list of locator terms -->
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="classic">古籍</term>
+    <term name="collection">馆藏</term>
+    <term name="dataset">数据集</term>
+    <term name="document">文档</term>
+    <term name="entry">词条</term>
+    <term name="entry-dictionary">字典词条</term>
+    <term name="entry-encyclopedia">百科词条</term>
+    <term name="event">活动</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">视觉作品</term>
+    <term name="hearing">听证会</term>
     <term name="interview">访谈</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="legal_case">司法案例</term>
+    <term name="legislation">法律</term>
+    <term name="manuscript">手稿</term>
+    <term name="map">地图</term>
+    <term name="motion_picture">录像</term>
+    <term name="musical_score">乐谱</term>
+    <term name="pamphlet">小册子</term>
+    <term name="paper-conference">会议论文</term>
+    <term name="patent">专利</term>
+    <term name="performance">演出</term>
+    <term name="periodical">期刊</term>
     <term name="personal_communication">的私人交流</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
-    <term name="review">review</term>
-    <term name="review-book">book review</term>
-    <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="post">帖子</term>
+    <term name="post-weblog">博客帖子</term>
+    <term name="regulation">法规</term>
+    <term name="report">报告</term>
+    <term name="review">评论</term>
+    <term name="review-book">书评</term>
+    <term name="software">软件</term>
+    <term name="song">录音</term>
+    <term name="speech">演讲</term>
+    <term name="standard">标准</term>
+    <term name="thesis">学位论文</term>
+    <term name="treaty">条约</term>
+    <term name="webpage">网页</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
+    <term name="article-journal" form="short">期刊文章</term>
+    <term name="article-magazine" form="short">杂志文章</term>
+    <term name="article-newspaper" form="short">报纸文章</term>
     <!-- book is in the list of locator terms -->
     <!-- chapter is in the list of locator terms -->
-    <term name="document" form="short">doc.</term>
+    <term name="document" form="short">文档</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
-    <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="graphic" form="short">视觉作品</term>
+    <term name="interview" form="short">采访</term>
+    <term name="manuscript" form="short">手稿</term>
+    <term name="motion_picture" form="short">录像</term>
+    <term name="report" form="short">报告</term>
+    <term name="review" form="short">评论</term>
+    <term name="review-book" form="short">书评</term>
+    <term name="song" form="short">录音</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">听证会</term>
+    <term name="review" form="verb">评论</term>
+    <term name="review-book" form="verb">书评</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">公元</term>
     <term name="bc">公元前</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="bce">公元前</term>
+    <term name="ce">公元</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">《</term>
     <term name="close-quote">》</term>
     <term name="open-inner-quote">〈</term>
     <term name="close-inner-quote">〉</term>
-    <term name="page-range-delimiter">–</term>
-    <term name="colon">:</term>
-    <term name="comma">,</term>
-    <term name="semicolon">;</term>
+    <term name="page-range-delimiter">～</term>
+    <term name="colon">：</term>
+    <term name="comma">，</term>
+    <term name="semicolon">；</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal"></term>
-  
+    <term name="ordinal"/>
+
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">一</term>
     <term name="long-ordinal-02">二</term>
@@ -179,124 +200,70 @@
     <term name="long-ordinal-10">十</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
-    </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
-    </term>
-    <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
-    </term>
-    <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
-    </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
-    </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
-    </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
-    </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
-    </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
-    </term>
-    <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
-    </term>
+    <term name="act">幕</term>
+    <term name="appendix">附录</term>
+    <term name="article-locator">条</term> <!-- 用于法律，如“《公司法》第 16 条” -->
     <term name="book">册</term>
+    <term name="canon">准则</term>
     <term name="chapter">章</term>
     <term name="column">栏</term>
-    <term name="figure">图表</term>       
+    <term name="elocation">位置</term>
+    <term name="equation">公式</term>
+    <term name="figure">图表</term>
     <term name="folio">版</term>
     <term name="issue">期</term>
     <term name="line">行</term>
     <term name="note">注脚</term>
-    <term name="opus">作品</term>      
+    <term name="opus">作品</term>
     <term name="page">页</term>
-    <term name="number-of-pages"> 总页数</term>      
     <term name="paragraph">段落</term>
-    <term name="part">部分</term>     
-    <term name="section">节</term>         
-    <term name="sub-verbo">另见</term>    
-    <term name="verse">篇</term>    
+    <term name="part">部分</term>
+    <term name="rule">规则</term>
+    <term name="scene">场</term>
+    <term name="section">节</term>
+    <term name="sub-verbo">另见</term>
+    <term name="supplement">补充</term>
+    <term name="table">表格</term>
+    <term name="timestamp"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator">编</term> <!-- 用于法律，如“《美国法典》第19编” -->
+    <term name="verse">篇</term>
     <term name="volume">卷</term>
-    
+
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
-    </term>
-    <term name="article-locator" form="short">			 
-      <single>art.</single>
-      <multiple>arts.</multiple>
-    </term>
-    <term name="elocation" form="short">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
-    </term>
-    <term name="equation" form="short">			 
-      <single>eq.</single>
-      <multiple>eqs.</multiple>
-    </term>
-    <term name="rule" form="short">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
-    </term>
-    <term name="scene" form="short">			 
-      <single>sc.</single>
-      <multiple>scs.</multiple>						 
-    </term>
-    <term name="table" form="short">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
-    </term>
-    <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
-    </term>
-    <term name="title-locator" form="short">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
-    </term>
+    <term name="appendix" form="short">附录</term>
+    <term name="article-locator" form="short">条</term>
     <term name="book" form="short">册</term>
     <term name="chapter" form="short">章</term>
     <term name="column" form="short">栏</term>
+    <term name="elocation" form="short">位置</term>
+    <term name="equation" form="short">式</term>
     <term name="figure" form="short">图</term>
     <term name="folio" form="short">版</term>
     <term name="issue" form="short">期</term>
     <term name="line" form="short">行</term>
     <term name="note" form="short">注</term>
     <term name="opus" form="short">op.</term>
-    <term name="page" form="short">页</term>   
-    <term name="number-of-pages" form="short">共</term>    
+    <term name="page" form="short">页</term>
     <term name="paragraph" form="short">段</term>
     <term name="part" form="short">部</term>
+    <term name="rule" form="short">规则</term>
+    <term name="scene" form="short">场</term>
     <term name="section" form="short">节</term>
-    <term name="sub-verbo" form="short">另见</term>   
-    <term name="verse" form="short">篇</term>      
+    <term name="sub-verbo" form="short">另见</term>
+    <term name="supplement" form="short">补充</term>
+    <term name="table" form="short">表</term>
+    <term name="timestamp" form="short"> <!-- generally blank -->
+      <single/>
+      <multiple/>
+    </term>
+    <term name="title-locator" form="short">编</term>
+    <term name="verse" form="short">篇</term>
     <term name="volume" form="short">卷</term>
-    
-    <!-- SYMBOL LOCATOR FORMS -->
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -306,159 +273,132 @@
       <multiple>§§</multiple>
     </term>
 
-    <!-- LONG ROLE FORMS -->
-    <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
-    </term>
-    <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
-    </term>
-    <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
-    </term>
-    <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
-    </term>
-    <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
-    </term>
-    <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
-    </term>
-    <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
-    </term>
-    <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
-    </term>
-    <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
-    </term>
-    <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
-    </term>
-    <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
-    </term>
-    <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
-    </term>
-    <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">章</term>
+    <term name="citation-number">引用</term>
+    <term name="collection-number">册</term>
+    <term name="edition">版本</term>
+    <term name="first-reference-note-number">前注</term>
+    <term name="number">编号</term>
+    <term name="number-of-pages"> 总页数</term>
+    <term name="number-of-volumes">卷</term>
+    <term name="page-first">页</term>
+    <term name="printing">编号</term>
+    <term name="version">版</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">章</term>
+    <term name="citation-number" form="short">引用</term>
+    <term name="collection-number" form="short">册</term>
+    <term name="edition" form="short">版</term>
+    <term name="first-reference-note-number" form="short">前注</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
     </term>
-    <term name="director">导演</term>     
-    <term name="editor">编辑</term> 
-    <term name="editorial-director">主编</term>     
-    <term name="illustrator">绘图</term>     
-    <term name="translator">翻译</term>      
-    <term name="editortranslator">编译</term>     
+    <term name="number-of-pages" form="short">共</term>
+    <term name="number-of-volumes" form="short">卷</term>
+    <term name="page-first" form="short">页</term>
+    <term name="printing" form="short">编号</term>
 
+    <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
+    <term name="chair">主席</term>
+    <term name="collection-editor">总编辑</term>
+    <term name="compiler">编撰</term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
+    <term name="contributor">贡献者</term>
+    <term name="curator">策展人</term>
+    <term name="director">导演</term>
+    <term name="editor">编辑</term>
+    <term name="editor-translator">编译</term>
+    <term name="editortranslator">编译</term>
+    <term name="editorial-director">主编</term>
+    <term name="executive-producer">监制</term>
+    <term name="guest">嘉宾</term>
+    <term name="host">主持</term>
+    <term name="illustrator">绘图</term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="narrator">朗读者</term>
+    <term name="organizer">组织者</term>
+    <term name="original-author"/> <!-- generally blank -->
+    <term name="performer">表演</term>
+    <term name="producer">制片人</term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="script-writer">编剧</term>
+    <term name="series-creator">创作</term>
+    <term name="translator">翻译</term>
+
     <!-- SHORT ROLE FORMS -->
-    <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
-    </term>
-    <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
-    </term>
-    <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
-    </term>
-    <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
-    </term>
-    <term name="narrator" form="short">
-      <single>narr.</single>
-      <multiple>narrs.</multiple>
-    </term>
-    <term name="organizer" form="short">
-      <single>org.</single>
-      <multiple>orgs.</multiple>
-    </term>
-    <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
-    </term>
-    <term name="producer" form="short">
-      <single>prod.</single>
-      <multiple>prods.</multiple>
-    </term>
-    <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
-    </term>
-    <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
-    </term>
-    <term name="director" form="short">导演</term>     
-    <term name="editor" form="short">编</term>     
-    <term name="editorial-director" form="short">主编</term>     
-    <term name="illustrator" form="short">绘</term>   
-    <term name="translator" form="short">译</term>     
-    <term name="editortranslator" form="short">编译</term>    
+    <term name="compiler" form="short">编</term>
+    <term name="contributor" form="short">贡献</term>
+    <term name="curator" form="short">策展</term>
+    <term name="director" form="short">导演</term>
+    <term name="editor" form="short">编</term>
+    <term name="editor-translator" form="short">编译</term>
+    <term name="editortranslator" form="short">编译</term>
+    <term name="editorial-director" form="short">主编</term>
+    <term name="executive-producer" form="short">监制</term>
+    <term name="illustrator" form="short">绘</term>
+    <term name="narrator" form="short">朗读</term>
+    <term name="organizer" form="short">组织</term>
+    <term name="performer" form="short">表演</term>
+    <term name="producer" form="short">制片人</term>
+    <term name="script-writer" form="short">编剧</term>
+    <term name="series-creator" form="short">创作</term>
+    <term name="translator" form="short">译</term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">主席</term>
+    <term name="collection-editor" form="verb">总编辑</term>
+    <term name="compiler" form="verb">编撰</term>
     <term name="container-author" form="verb">著</term>
+    <term name="contributor" form="verb">贡献</term>
+    <term name="curator" form="verb">策展</term>
     <term name="director" form="verb">指导</term>
     <term name="editor" form="verb">编辑</term>
+    <term name="editor-translator" form="verb">编译</term>
+    <term name="editortranslator" form="verb">编译</term>
     <term name="editorial-director" form="verb">主编</term>
+    <term name="executive-producer" form="verb">监制</term>
+    <term name="guest" form="verb">嘉宾</term>
+    <term name="host" form="verb">主持</term>
     <term name="illustrator" form="verb">绘图</term>
     <term name="interviewer" form="verb">采访</term>
+    <term name="narrator" form="verb">朗读</term>
+    <term name="organizer" form="verb">组织</term>
+    <term name="performer" form="verb">表演</term>
+    <term name="producer" form="verb">制片</term>
     <term name="recipient" form="verb">受函</term>
     <term name="reviewed-author" form="verb">校订</term>
+    <term name="script-writer" form="verb">编剧</term>
+    <term name="series-creator" form="verb">创作</term>
     <term name="translator" form="verb">翻译</term>
-    <term name="editortranslator" form="verb">编译</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="collection-editor" form="verb-short">总编</term>
+    <term name="compiler" form="verb-short">编</term>
+    <term name="contributor" form="verb-short">贡献</term>
+    <term name="curator" form="verb-short">策展</term>
     <term name="director" form="verb-short">导</term>
     <term name="editor" form="verb-short">编</term>
+    <term name="editor-translator" form="verb-short">编译</term>
+    <term name="editortranslator" form="verb-short">编译</term>
     <term name="editorial-director" form="verb-short">主编</term>
+    <term name="executive-producer" form="verb-short">监制</term>
+    <term name="guest" form="verb-short">嘉宾</term>
+    <term name="host" form="verb-short">主持</term>
     <term name="illustrator" form="verb-short">绘</term>
-    <term name="translator" form="verb-short">译</term>
-    <term name="editortranslator" form="verb-short">编译</term>
+    <term name="narrator" form="verb-short">朗读</term>
+    <term name="organizer" form="verb-short">组织</term>
+    <term name="performer" form="verb-short">表演</term>
+    <term name="producer" form="verb-short">制片</term>
     <term name="reviewed-author" form="verb-short">校</term>
+    <term name="script-writer" form="verb-short">编剧</term>
+    <term name="series-creator" form="verb-short">创作</term>
+    <term name="translator" form="verb-short">译</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">一月</term>
diff --git a/locales/zh-TW.xml b/locales/zh-TW.xml
--- a/locales/zh-TW.xml
+++ b/locales/zh-TW.xml
@@ -5,7 +5,7 @@
       <name>sati-bodhi</name>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2014-05-15T23:31:02+00:00</updated>
+    <updated>2026-01-10T00:00:00+00:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -19,26 +19,49 @@
     <date-part name="day" form="numeric-leading-zeros" prefix="/"/>
   </date>
   <terms>
+    <!-- LONG GENERAL TERMS -->
+    <term name="accessed">引見於</term>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
+    <term name="and">及</term>
+    <term name="and others">及其他</term>
+    <term name="anonymous">作者不詳</term>
+    <term name="at">於</term>
     <term name="audio-recording">audio recording</term>
+    <term name="available at">載於</term>
+    <term name="by">著</term>
+    <term name="circa">介於</term>
+    <term name="cited">見引於</term>
+    <term name="et-al">等</term>
     <term name="film">film</term>
+    <term name="forthcoming">即將出版</term>
+    <term name="from">從</term>
     <term name="henceforth">henceforth</term>
+    <term name="ibid">同上</term>
+    <term name="in">收入</term>
+    <term name="in press">印行中</term>
+    <term name="internet">互聯網</term>
+    <term name="letter">信函</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no date">日期不詳</term>
     <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
     <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
     <term name="on">on</term>
+    <term name="online">線上</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
     <term name="original-work-published">original work published</term>
     <term name="personal-communication">私人通訊</term>
     <term name="podcast">podcast</term>
     <term name="podcast-episode">podcast episode</term>
     <term name="preprint">preprint</term>
+    <term name="presented at">發表於</term>
     <term name="radio-broadcast">radio broadcast</term>
     <term name="radio-series">radio series</term>
     <term name="radio-series-episode">radio series episode</term>
+    <term name="reference">參考</term>
+    <term name="retrieved">讀取於</term>
+    <term name="review-of">review of</term>
+    <term name="scale">比例</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
     <term name="television-broadcast">television broadcast</term>
@@ -46,37 +69,18 @@
     <term name="television-series-episode">television series episode</term>
     <term name="video">video</term>
     <term name="working-paper">working paper</term>
-    <term name="accessed">引見於</term>
-    <term name="and">及</term>
-    <term name="and others">及其他</term>
-    <term name="anonymous">作者不詳</term>
+
+    <!-- SHORT GENERAL TERMS -->
     <term name="anonymous" form="short">無名氏</term>
-    <term name="at">於</term>
-    <term name="available at">載於</term>
-    <term name="by">著</term>
-    <term name="circa">介於</term>
     <term name="circa" form="short">約</term>
-    <term name="cited">見引於</term>
-    <term name="edition">版本</term>
-    <term name="edition" form="short">本</term>
-    <term name="et-al">等</term>
-    <term name="forthcoming">即將出版</term>
-    <term name="from">從</term>
-    <term name="ibid">同上</term>
-    <term name="in">收入</term>
-    <term name="in press">印行中</term>
-    <term name="internet">互聯網</term>
-    <term name="letter">信函</term>
-    <term name="no date">日期不詳</term>
     <term name="no date" form="short">不詳</term>
-    <term name="online">線上</term>
-    <term name="presented at">發表於</term>
-    <term name="reference">參考</term>
+    <term name="no-place" form="short">n.p.</term>
+    <term name="no-publisher" form="short">n.p.</term>
     <term name="reference" form="short">參</term>
-    <term name="retrieved">讀取於</term>
-    <term name="scale">比例</term>
-    <term name="version">版</term>
+    <term name="review-of" form="short">rev. of</term>
 
+    <!-- SYMBOLIC GENERAL FORMS -->
+
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
     <term name="article-journal">journal article</term>
@@ -141,6 +145,14 @@
     <term name="review-book" form="short">bk. rev.</term>
     <term name="song" form="short">audio rec.</term>
 
+    <!-- LONG VERB ITEM TYPE FORMS -->
+    <!-- Only where applicable -->
+    <term name="hearing" form="verb">testimony of</term>
+    <term name="review" form="verb">review of</term>
+    <term name="review-book" form="verb">review of the book</term>
+
+    <!-- SHORT VERB ITEM TYPE FORMS -->
+
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">西元</term>
     <term name="bc">西元前</term>
@@ -158,8 +170,8 @@
     <term name="semicolon">;</term>
 
     <!-- ORDINALS -->
-    <term name="ordinal"></term>
-  
+    <term name="ordinal"/>
+
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">一</term>
     <term name="long-ordinal-02">二</term>
@@ -173,123 +185,129 @@
     <term name="long-ordinal-10">十</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
+    <term name="act">
       <single>act</single>
-      <multiple>acts</multiple>						 
+      <multiple>acts</multiple>
     </term>
-    <term name="appendix">			 
+    <term name="appendix">
       <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
+      <multiple>articles</multiple>
     </term>
-    <term name="canon">			 
+    <term name="book">冊</term>
+    <term name="canon">
       <single>canon</single>
-      <multiple>canons</multiple>						 
+      <multiple>canons</multiple>
     </term>
-    <term name="elocation">			 
+    <term name="chapter">章</term>
+    <term name="column">欄</term>
+    <term name="elocation">
       <single>location</single>
-      <multiple>locations</multiple>						 
+      <multiple>locations</multiple>
     </term>
-    <term name="equation">			 
+    <term name="equation">
       <single>equation</single>
-      <multiple>equations</multiple>						 
+      <multiple>equations</multiple>
     </term>
-    <term name="rule">			 
+    <term name="figure">圖表</term>
+    <term name="folio">版</term>
+    <term name="issue">期</term>
+    <term name="line">行</term>
+    <term name="note">註腳</term>
+    <term name="opus">作品</term>
+    <term name="page">頁</term>
+    <term name="paragraph">段落</term>
+    <term name="part">部分</term>
+    <term name="rule">
       <single>rule</single>
-      <multiple>rules</multiple>						 
+      <multiple>rules</multiple>
     </term>
-    <term name="scene">			 
+    <term name="scene">
       <single>scene</single>
-      <multiple>scenes</multiple>						 
+      <multiple>scenes</multiple>
     </term>
-    <term name="table">			 
+    <term name="section">節</term>
+    <term name="sub-verbo">另見</term>
+    <term name="supplement">
+      <single>supplement</single>
+      <multiple>supplements</multiple>
+    </term>
+    <term name="table">
       <single>table</single>
-      <multiple>tables</multiple>						 
+      <multiple>tables</multiple>
     </term>
     <term name="timestamp"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+      <single/>
+      <multiple/>
     </term>
-    <term name="title-locator">			 
+    <term name="title-locator">
       <single>title</single>
-      <multiple>titles</multiple>						 
+      <multiple>titles</multiple>
     </term>
-    <term name="book">冊</term>
-    <term name="chapter">章</term>
-    <term name="column">欄</term>
-    <term name="figure">圖表</term>       
-    <term name="folio">版</term>
-    <term name="issue">期</term>
-    <term name="line">行</term>
-    <term name="note">註腳</term>
-    <term name="opus">作品</term>      
-    <term name="page">頁</term>
-    <term name="number-of-pages">總頁數</term>      
-    <term name="paragraph">段落</term>
-    <term name="part">部分</term>     
-    <term name="section">節</term>         
-    <term name="sub-verbo">另見</term>    
-    <term name="verse">篇</term>    
+    <term name="verse">篇</term>
     <term name="volume">卷</term>
-    
+
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix" form="short">			 
+    <term name="appendix" form="short">
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>apps.</multiple>
     </term>
-    <term name="article-locator" form="short">			 
+    <term name="article-locator" form="short">
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation" form="short">			 
+    <term name="book" form="short">冊</term>
+    <term name="chapter" form="short">章</term>
+    <term name="column" form="short">欄</term>
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation" form="short">			 
+    <term name="equation" form="short">
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule" form="short">			 
+    <term name="figure" form="short">圖</term>
+    <term name="issue" form="short">期</term>
+    <term name="line" form="short">行</term>
+    <term name="note" form="short">註</term>
+    <term name="opus" form="short">op.</term>
+    <term name="page" form="short">頁</term>
+    <term name="paragraph" form="short">段</term>
+    <term name="part" form="short">部</term>
+    <term name="rule" form="short">
       <single>r.</single>
-      <multiple>rr.</multiple>						 
+      <multiple>rr.</multiple>
     </term>
-    <term name="scene" form="short">			 
+    <term name="scene" form="short">
       <single>sc.</single>
-      <multiple>scs.</multiple>						 
+      <multiple>scs.</multiple>
     </term>
-    <term name="table" form="short">			 
+    <term name="section" form="short">節</term>
+    <term name="sub-verbo" form="short">另見</term>
+    <term name="supplement" form="short">
+      <single>supp.</single>
+      <multiple>supps.</multiple>
+    </term>
+    <term name="table" form="short">
       <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
+      <multiple>tbls.</multiple>
     </term>
     <term name="timestamp" form="short"> <!-- generally blank -->
-      <single></single>
-      <multiple></multiple>						 
+      <single/>
+      <multiple/>
     </term>
-    <term name="title-locator" form="short">			 
+    <term name="title-locator" form="short">
       <single>tit.</single>
       <multiple>tits.</multiple>
     </term>
-    <term name="book" form="short">冊</term>
-    <term name="chapter" form="short">章</term>
-    <term name="column" form="short">欄</term>
-    <term name="figure" form="short">圖</term>
-    <term name="issue" form="short">期</term>
-    <term name="line" form="short">行</term>
-    <term name="note" form="short">註</term>
-    <term name="opus" form="short">op.</term>
-    <term name="page" form="short">頁</term>   
-    <term name="number-of-pages" form="short">共</term>    
-    <term name="paragraph" form="short">段</term>
-    <term name="part" form="short">部</term>
-    <term name="section" form="short">節</term>
-    <term name="sub-verbo" form="short">另見</term>   
-    <term name="verse" form="short">篇</term>      
+    <term name="verse" form="short">篇</term>
     <term name="volume" form="short">卷</term>
-    
-    <!-- SYMBOL LOCATOR FORMS -->
+
+    <!-- SYMBOLIC LOCATOR FORMS -->
     <term name="paragraph" form="symbol">
       <single>¶</single>
       <multiple>¶¶</multiple>
@@ -299,15 +317,83 @@
       <multiple>§§</multiple>
     </term>
 
+    <!-- LONG NUMBER VARIABLE FORMS -->
+    <term name="chapter-number">
+      <single>chapter</single>
+      <multiple>chapters</multiple>
+    </term>
+    <term name="citation-number">
+      <single>citation</single>
+      <multiple>citations</multiple>
+    </term>
+    <term name="collection-number">期</term>
+    <term name="edition">版本</term>
+    <term name="first-reference-note-number">註腳</term>
+    <term name="number">
+      <single>number</single>
+      <multiple>numbers</multiple>
+    </term>
+    <term name="number-of-pages">總頁數</term>
+    <term name="number-of-volumes">
+      <single>volume</single>
+      <multiple>volumes</multiple>
+    </term>
+    <term name="page-first">
+      <single>page</single>
+      <multiple>pages</multiple>
+    </term>
+    <term name="printing">
+      <single>printing</single>
+      <multiple>printings</multiple>
+    </term>
+    <term name="version">版</term>
+
+    <!-- SHORT NUMBER VARIABLE FORMS -->
+    <term name="chapter-number" form="short">
+      <single>chap.</single>
+      <multiple>chaps.</multiple>
+    </term>
+    <term name="citation-number" form="short">
+      <single>cit.</single>
+      <multiple>cits.</multiple>
+    </term>
+    <term name="collection-number" form="short">期</term>
+    <term name="edition" form="short">本</term>
+    <term name="first-reference-note-number" form="short">註</term>
+    <term name="number" form="short">
+      <single>no.</single>
+      <multiple>nos.</multiple>
+    </term>
+    <term name="number-of-pages" form="short">共</term>
+    <term name="number-of-volumes" form="short">
+      <single>vol.</single>
+      <multiple>vols.</multiple>
+    </term>
+    <term name="page-first" form="short">
+      <single>p.</single>
+      <multiple>pp.</multiple>
+    </term>
+    <term name="printing" form="short">
+      <single>print.</single>
+      <multiple>prints.</multiple>
+    </term>
+
     <!-- LONG ROLE FORMS -->
+    <term name="author"/> <!-- generally blank -->
     <term name="chair">
       <single>chair</single>
       <multiple>chairs</multiple>
     </term>
+    <term name="collection-editor">
+      <single>ed.</single>
+      <multiple>eds.</multiple>
+    </term>
     <term name="compiler">
       <single>compiler</single>
       <multiple>compilers</multiple>
     </term>
+    <term name="composer"/> <!-- generally blank -->
+    <term name="container-author"/> <!-- generally blank -->
     <term name="contributor">
       <single>contributor</single>
       <multiple>contributors</multiple>
@@ -316,6 +402,11 @@
       <single>curator</single>
       <multiple>curators</multiple>
     </term>
+    <term name="director">導演</term>
+    <term name="editor">編輯</term>
+    <term name="editor-translator">編譯員</term>
+    <term name="editortranslator">編譯員</term>
+    <term name="editorial-director">主編</term>
     <term name="executive-producer">
       <single>executive producer</single>
       <multiple>executive producers</multiple>
@@ -328,6 +419,9 @@
       <single>host</single>
       <multiple>hosts</multiple>
     </term>
+    <term name="illustrator">繪圖師</term>
+    <term name="interviewer"/> <!-- generally blank -->
+    <term name="interviewer">採訪員</term>
     <term name="narrator">
       <single>narrator</single>
       <multiple>narrators</multiple>
@@ -336,6 +430,7 @@
       <single>organizer</single>
       <multiple>organizers</multiple>
     </term>
+    <term name="original-author"/> <!-- generally blank -->
     <term name="performer">
       <single>performer</single>
       <multiple>performers</multiple>
@@ -344,6 +439,10 @@
       <single>producer</single>
       <multiple>producers</multiple>
     </term>
+    <term name="recipient"/> <!-- generally blank -->
+    <term name="recipient">收信人</term>
+    <term name="reviewed-author"/> <!-- generally blank -->
+    <term name="reviewed-author">評論人</term>
     <term name="script-writer">
       <single>writer</single>
       <multiple>writers</multiple>
@@ -352,16 +451,7 @@
       <single>series creator</single>
       <multiple>series creators</multiple>
     </term>
-    <term name="author">作者</term>     
-    <term name="director">導演</term>     
-    <term name="editor">編輯</term> 
-    <term name="editorial-director">主編</term>     
-    <term name="illustrator">繪圖師</term>
-    <term name="interviewer">採訪員</term>
-    <term name="recipient">收信人</term>     
-    <term name="translator">翻譯員</term>      
-    <term name="editortranslator">編譯員</term>
-    <term name="reviewed-author">評論人</term>
+    <term name="translator">翻譯員</term>
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
@@ -376,10 +466,17 @@
       <single>cur.</single>
       <multiple>curs.</multiple>
     </term>
+    <term name="director" form="short">導演</term>
+    <term name="editor" form="short">編輯</term>
+    <term name="editor-translator" form="short">編譯員</term>
+    <term name="editortranslator" form="short">編譯員</term>
+    <term name="editorial-director" form="short">主編</term>
     <term name="executive-producer" form="short">
       <single>exec. prod.</single>
       <multiple>exec. prods.</multiple>
     </term>
+    <term name="illustrator" form="short">繪圖師</term>
+    <term name="interviewer" form="short">採訪員</term>
     <term name="narrator" form="short">
       <single>narr.</single>
       <multiple>narrs.</multiple>
@@ -396,6 +493,8 @@
       <single>prod.</single>
       <multiple>prods.</multiple>
     </term>
+    <term name="recipient" form="short">收信人</term>
+    <term name="reviewed-author" form="short">評論人</term>
     <term name="script-writer" form="short">
       <single>writ.</single>
       <multiple>writs.</multiple>
@@ -404,65 +503,57 @@
       <single>cre.</single>
       <multiple>cres.</multiple>
     </term>
-    <term name="author" form="short">作者</term>     
-    <term name="director" form="short">導演</term>     
-    <term name="editor" form="short">編輯</term> 
-    <term name="editorial-director" form="short">主編</term>     
-    <term name="illustrator" form="short">繪圖師</term>
-    <term name="interviewer" form="short">採訪員</term>
-    <term name="recipient" form="short">收信人</term>     
-    <term name="translator" form="short">翻譯員</term>      
-    <term name="editortranslator" form="short">編譯員</term>
-    <term name="reviewed-author" form="short">評論人</term>
-
+    <term name="translator" form="short">翻譯員</term>
 
     <!-- VERB ROLE FORMS -->
     <term name="chair" form="verb">chaired by</term>
+    <term name="collection-editor" form="verb">點校</term>
     <term name="compiler" form="verb">compiled by</term>
+    <term name="container-author" form="verb">著</term>
     <term name="contributor" form="verb">with</term>
     <term name="curator" form="verb">curated by</term>
+    <term name="director" form="verb">指導</term>
+    <term name="editor" form="verb">編輯</term>
+    <term name="editor-translator" form="verb">編譯</term>
+    <term name="editortranslator" form="verb">編譯</term>
+    <term name="editorial-director" form="verb">主編</term>
     <term name="executive-producer" form="verb">executive produced by</term>
     <term name="guest" form="verb">with guest</term>
     <term name="host" form="verb">hosted by</term>
+    <term name="illustrator" form="verb">繪圖</term>
+    <term name="interviewer" form="verb">採訪</term>
     <term name="narrator" form="verb">narrated by</term>
     <term name="organizer" form="verb">organized by</term>
     <term name="performer" form="verb">performed by</term>
     <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
-    <term name="author" form="verb">著</term>
-    <term name="container-author" form="verb">著</term>
-    <term name="director" form="verb">指導</term>
-    <term name="editor" form="verb">編輯</term>
-    <term name="collection-editor" form="verb">點校</term>
-    <term name="editorial-director" form="verb">主編</term>
-    <term name="illustrator" form="verb">繪圖</term>
-    <term name="interviewer" form="verb">採訪</term>
     <term name="recipient" form="verb">受函</term>
     <term name="reviewed-author" form="verb">點評</term>
+    <term name="script-writer" form="verb">written by</term>
+    <term name="series-creator" form="verb">created by</term>
     <term name="translator" form="verb">翻譯</term>
-    <term name="editortranslator" form="verb">編譯</term>
 
     <!-- SHORT VERB ROLE FORMS -->
+    <term name="collection-editor" form="verb-short">校</term>
     <term name="compiler" form="verb-short">comp. by</term>
     <term name="contributor" form="verb-short">w.</term>
     <term name="curator" form="verb-short">cur. by</term>
+    <term name="director" form="verb-short">導</term>
+    <term name="editor" form="verb-short">編</term>
+    <term name="editor-translator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editortranslator" form="verb-short">ed. &amp; trans. by</term>
+    <term name="editorial-director" form="verb-short">編</term>
     <term name="executive-producer" form="verb-short">exec. prod. by</term>
     <term name="guest" form="verb-short">w. guest</term>
     <term name="host" form="verb-short">hosted by</term>
+    <term name="illustrator" form="verb-short">繪</term>
     <term name="narrator" form="verb-short">narr. by</term>
     <term name="organizer" form="verb-short">org. by</term>
     <term name="performer" form="verb-short">perf. by</term>
     <term name="producer" form="verb-short">prod. by</term>
+    <term name="reviewed-author" form="verb-short">評</term>
     <term name="script-writer" form="verb-short">writ. by</term>
     <term name="series-creator" form="verb-short">cre. by</term>
-    <term name="director" form="verb-short">導</term>
-    <term name="editor" form="verb-short">編</term>
-    <term name="collection-editor" form="verb-short">校</term>
-    <term name="editorial-director" form="verb-short">編</term>
-    <term name="illustrator" form="verb-short">繪</term>
     <term name="translator" form="verb-short">譯</term>
-    <term name="reviewed-author" form="verb-short">評</term>
 
     <!-- LONG MONTH FORMS -->
     <term name="month-01">一月</term>
diff --git a/man/citeproc.1 b/man/citeproc.1
--- a/man/citeproc.1
+++ b/man/citeproc.1
@@ -1,216 +1,211 @@
-.\" Automatically generated by Pandoc 2.13
+.\" Automatically generated by Pandoc 3.8.3
 .\"
-.TH "citeproc" "1" "" "citeproc 0.6" ""
-.hy
+.TH "citeproc" "1" "" "citeproc 0.12"
 .SH NAME
-.PP
-citeproc - process citations using a CSL stylesheet.
+citeproc \- process citations using a CSL stylesheet.
 .SH SYNOPSIS
-.PP
-\f[C]citeproc [options] [file]\f[R]
+\f[CR]citeproc [options] [file]\f[R]
 .SH DESCRIPTION
-.PP
-\f[C]citeproc\f[R] reads a JSON-encoded \f[C]Inputs\f[R] object from
-\f[C]stdin\f[R] (or from a file if a filename is provided) and writes a
-JSON-encoded \f[C]Result\f[R] object to \f[C]stdout\f[R].
-This executable can be used to add citation processing to non-Haskell
+\f[CR]citeproc\f[R] reads a JSON\-encoded \f[CR]Inputs\f[R] object from
+\f[CR]stdin\f[R] (or from a file if a filename is provided) and writes a
+JSON\-encoded \f[CR]Result\f[R] object to \f[CR]stdout\f[R].
+This executable can be used to add citation processing to non\-Haskell
 projects.
 .SH OPTIONS
 .TP
-\f[B]\f[CB]-s\f[B]\f[R] \f[I]FILE\f[R], \f[B]\f[CB]--style=\f[B]\f[R]\f[I]FILE\f[R]
+\f[CR]\-s\f[R] \f[I]FILE\f[R], \f[CR]\-\-style=\f[R]\f[I]FILE\f[R]
 Specify a CSL style to be used.
 .TP
-\f[B]\f[CB]-r\f[B]\f[R] \f[I]FILE\f[R], \f[B]\f[CB]--references=\f[B]\f[R]\f[I]FILE\f[R]
+\f[CR]\-r\f[R] \f[I]FILE\f[R], \f[CR]\-\-references=\f[R]\f[I]FILE\f[R]
 Specify a CSL JSON bibliography to be used as a source for references.
 .TP
-\f[B]\f[CB]a\f[B]\f[R] \f[I]FILE\f[R], \f[B]\f[CB]--abbreviations=\f[B]\f[R]\f[I]FILE\f[R]
+\f[CR]a\f[R] \f[I]FILE\f[R], \f[CR]\-\-abbreviations=\f[R]\f[I]FILE\f[R]
 Specify a CSL abbreviations file.
 .TP
-\f[B]\f[CB]l\f[B]\f[R] \f[I]LANG\f[R], \f[B]\f[CB]--lang=\f[B]\f[R]\f[I]LANG\f[R]
-Specify a locale to override the style\[cq]s default.
-A BCP 47 language tag is expected: for example, \f[C]en\f[R],
-\f[C]de\f[R], \f[C]en-US\f[R], \f[C]fr-CA\f[R], \f[C]ug-Cyrl\f[R].
-The unicode extension syntax (after \f[C]-u-\f[R]) may be used to
+\f[CR]l\f[R] \f[I]LANG\f[R], \f[CR]\-\-lang=\f[R]\f[I]LANG\f[R]
+Specify a locale to override the style\(cqs default.
+A BCP 47 language tag is expected: for example, \f[CR]en\f[R],
+\f[CR]de\f[R], \f[CR]en\-US\f[R], \f[CR]fr\-CA\f[R],
+\f[CR]ug\-Cyrl\f[R].
+The unicode extension syntax (after \f[CR]\-u\-\f[R]) may be used to
 specify options for collation.
 Here are some examples:
 .RS
-.IP \[bu] 2
-\f[C]zh-u-co-pinyin\f[R] \[en] Chinese with the Pinyin collation.
-.IP \[bu] 2
-\f[C]es-u-co-trad\f[R] \[en] Spanish with the traditional collation
-(with \f[C]Ch\f[R] sorting after \f[C]C\f[R]).
-.IP \[bu] 2
-\f[C]fr-u-kb\f[R] \[en] French with \[lq]backwards\[rq] accent sorting
-(with \f[C]cot\['e]\f[R] sorting after \f[C]c\[^o]te\f[R]).
-.IP \[bu] 2
-\f[C]en-US-u-kf-upper\f[R] \[en] English with uppercase letters sorting
-before lower (default is lower before upper).
+.IP \(bu 2
+\f[CR]zh\-u\-co\-pinyin\f[R] \(en Chinese with the Pinyin collation.
+.IP \(bu 2
+\f[CR]es\-u\-co\-trad\f[R] \(en Spanish with the traditional collation
+(with \f[CR]Ch\f[R] sorting after \f[CR]C\f[R]).
+.IP \(bu 2
+\f[CR]fr\-u\-kb\f[R] \(en French with \(lqbackwards\(rq accent sorting
+(with \f[CR]coté\f[R] sorting after \f[CR]côte\f[R]).
+.IP \(bu 2
+\f[CR]en\-US\-u\-kf\-upper\f[R] \(en English with uppercase letters
+sorting before lower (default is lower before upper).
 .RE
 .TP
-\f[B]\f[CB]f\f[B]\f[R] \f[I]html|json\f[R], \f[B]\f[CB]--format=\f[B]\f[R]\f[I]html|json\f[R]
+\f[CR]f\f[R] \f[I]html|json\f[R], \f[CR]\-\-format=\f[R]\f[I]html|json\f[R]
 Specify the format to be used for the entries.
-\f[C]html\f[R] (the default) uses HTML tags and entities for formatting.
-\f[C]json\f[R] creates a structured JSON representation of a formatted
+\f[CR]html\f[R] (the default) uses HTML tags and entities for
+formatting.
+\f[CR]json\f[R] creates a structured JSON representation of a formatted
 document.
 .TP
-\f[B]\f[CB]-h, --help\f[B]\f[R]
+\f[CR]\-\-link\-citations\f[R]
+Enable hyperlinking of citations to the bibliography.
+.TP
+\f[CR]\-\-link\-bibliography\f[R]
+Enable automatic linkification of any identifiers (DOI, PMCID, PMID, or
+URL) appearing in a bibliography entry.
+When an entry has a DOI, PMCID, PMID, or URL available but none of these
+are rendered by the style, add a link to the title (or, if no title is
+present, the whole entry), using the URL for the DOI, PMCID, PMID, or
+URL (in that order of priority).
+.TP
+\f[CR]\-h, \-\-help\f[R]
 Print usage information.
 .TP
-\f[B]\f[CB]-V, --version\f[B]\f[R]
+\f[CR]\-V, \-\-version\f[R]
 Print version.
 .SH NOTES
-.PP
 The input JSON should have the structure:
 .IP
-.nf
-\f[C]
-{ \[dq]citations\[dq]:     [ ...list of citations... ],
-  \[dq]references\[dq]:    [ ...list of references... ],
-  \[dq]style\[dq]:         \[dq]<style>...</style>\[dq],
-  \[dq]abbreviations\[dq]: { ...abbreviations... },
-  \[dq]lang\[dq]:          \[dq]fr-FR\[dq] }
-\f[R]
-.fi
+.EX
+{ \(dqcitations\(dq:     [ \f[B]...list\f[R] \f[B]of\f[R] \f[B]citations...\f[R] ],
+  \(dqreferences\(dq:    [ \f[B]...list\f[R] \f[B]of\f[R] \f[B]references...\f[R] ],
+  \(dqstyle\(dq:         \(dq<style>...</style>\(dq,
+  \(dqabbreviations\(dq: { \f[B]...abbreviations...\f[R] },
+  \(dqlang\(dq:          \(dqfr\-FR\(dq }
+.EE
 .PP
 None of these fields is mandatory.
-Instead of providing \f[C]references\f[R] in the input JSON, one can
+Instead of providing \f[CR]references\f[R] in the input JSON, one can
 specify a file containing a CSL JSON bibliography, using the
-\f[C]--references\f[R] option on the command line.
+\f[CR]\-\-references\f[R] option on the command line.
 Instead of providing a CSL stylesheet in the JSON, one can specify a
-file using the \f[C]--style\f[R] option.
-\f[C]--abbreviations\f[R] and \f[C]--lang\f[R] may also be used on the
-command line to specify an abbreviations file or a locale.
-(Command-line options always override any values given in the JSON
+file using the \f[CR]\-\-style\f[R] option.
+\f[CR]\-\-abbreviations\f[R] and \f[CR]\-\-lang\f[R] may also be used on
+the command line to specify an abbreviations file or a locale.
+(Command\-line options always override any values given in the JSON
 file.)
 .PP
 A citation is structured like this:
 .IP
-.nf
-\f[C]
-{ \[dq]citationID\[dq]: \[dq]foo\[dq],
-  \[dq]citationItems\[dq]: [ ...list of citationItems... ],
-  \[dq]citationNoteNumber\[dq]: 3 }
-\f[R]
-.fi
+.EX
+{ \(dqcitationID\(dq: \(dqfoo\(dq,
+  \(dqcitationResetPosition\(dq: \f[B]false\f[R],
+  \(dqcitationItems\(dq: [ \f[B]...list\f[R] \f[B]of\f[R] \f[B]citationItems...\f[R] ],
+  \(dqcitationNoteNumber\(dq: 3 }
+.EE
 .PP
-Only \f[C]citationItems\f[R] is necessary.
+Only \f[CR]citationItems\f[R] is necessary.
+.PP
+\f[CR]citationResetPosition\f[R] controls whether position information
+is to be reset before the citation is processed (which affects whether
+full citations or abbreviated forms are used, in some styles).
+.PP
 Alternatively, instead of
 .IP
-.nf
-\f[C]
-{ \[dq]citationItems\[dq]: [ ... ] }
-\f[R]
-.fi
+.EX
+{ \(dqcitationItems\(dq: [ \f[B]...\f[R] ] }
+.EE
 .PP
 one can just specify an array of items directly:
 .IP
-.nf
-\f[C]
-[ ... ]
-\f[R]
-.fi
+.EX
+[ \f[B]...\f[R] ]
+.EE
 .PP
 A citation item is structured like this:
 .IP
-.nf
-\f[C]
-{ \[dq]id\[dq]:       \[dq]foo\[dq],
-  \[dq]type\[dq]:     \[dq]suppress-author\[dq],
-  \[dq]label\[dq]:    \[dq]page\[dq],
-  \[dq]locator\[dq]:  \[dq]45\[dq],
-  \[dq]prefix\[dq]:   \[dq]see \[dq],
-  \[dq]suffix\[dq]:   \[dq] and others\[dq] }
-\f[R]
-.fi
+.EX
+{ \(dqid\(dq:       \(dqfoo\(dq,
+  \(dqtype\(dq:     \(dqsuppress\-author\(dq,
+  \(dqlabel\(dq:    \(dqpage\(dq,
+  \(dqlocator\(dq:  \(dq45\(dq,
+  \(dqprefix\(dq:   \(dqsee \(dq,
+  \(dqsuffix\(dq:   \(dq and others\(dq }
+.EE
 .PP
-Only \f[C]id\f[R] is mandatory.
-If \f[C]type\f[R] is omitted, it will be assumed to be
-\f[C]normal-cite\f[R] (other values are \f[C]suppress-author\f[R] and
-\f[C]author-only\f[R]).
+Only \f[CR]id\f[R] is mandatory.
+If \f[CR]type\f[R] is omitted, it will be assumed to be
+\f[CR]normal\-cite\f[R] (other values are \f[CR]suppress\-author\f[R]
+and \f[CR]author\-only\f[R]).
 .PP
 A reference is structured like this:
 .IP
-.nf
-\f[C]
+.EX
 {
-  \[dq]author\[dq]: [
+  \(dqauthor\(dq: [
     {
-      \[dq]family\[dq]: \[dq]Aristotle\[dq]
+      \(dqfamily\(dq: \(dqAristotle\(dq
     }
   ],
-  \[dq]id\[dq]: \[dq]aristotle:prior\[dq],
-  \[dq]issued\[dq]: {
-    \[dq]date-parts\[dq]: [
+  \(dqid\(dq: \(dqaristotle:prior\(dq,
+  \(dqissued\(dq: {
+    \(dqdate\-parts\(dq: [
       [
         1989
       ]
     ]
   },
-  \[dq]publisher\[dq]: \[dq]Hackett\[dq],
-  \[dq]publisher-place\[dq]: \[dq]Indianapolis\[dq],
-  \[dq]title\[dq]: \[dq]Prior analytics\[dq],
-  \[dq]translator\[dq]: [
+  \(dqpublisher\(dq: \(dqHackett\(dq,
+  \(dqpublisher\-place\(dq: \(dqIndianapolis\(dq,
+  \(dqtitle\(dq: \(dqPrior analytics\(dq,
+  \(dqtranslator\(dq: [
     {
-      \[dq]family\[dq]: \[dq]Smith\[dq],
-      \[dq]given\[dq]: \[dq]Robin\[dq]
+      \(dqfamily\(dq: \(dqSmith\(dq,
+      \(dqgiven\(dq: \(dqRobin\(dq
     }
   ],
-  \[dq]type\[dq]: \[dq]book\[dq]
+  \(dqtype\(dq: \(dqbook\(dq
 }
-\f[R]
-.fi
+.EE
 .PP
 An abbreviations object has this form:
 .IP
-.nf
-\f[C]
-{ \[dq]default\[dq]: {
-    \[dq]container-title\[dq]: {
-            \[dq]Lloyd\[aq]s Law Reports\[dq]: \[dq]Lloyd\[aq]s Rep\[dq],
-            \[dq]Estates Gazette\[dq]: \[dq]EG\[dq],
-            \[dq]Scots Law Times\[dq]: \[dq]SLT\[dq]
+.EX
+{ \(dqdefault\(dq: {
+    \(dqcontainer\-title\(dq: {
+            \(dqLloyd\(aqs Law Reports\(dq: \(dqLloyd\(aqs Rep\(dq,
+            \(dqEstates Gazette\(dq: \(dqEG\(dq,
+            \(dqScots Law Times\(dq: \(dqSLT\(dq
     }
   }
 }
-\f[R]
-.fi
+.EE
 .PP
 The abbreviations will be substituted in the output only when the
-\f[C]form\f[R] attribute for the style element that renders the variable
-is set to \f[C]short\f[R].
+\f[CR]form\f[R] attribute for the style element that renders the
+variable is set to \f[CR]short\f[R].
 .PP
 The output JSON will have the structure:
 .IP
-.nf
-\f[C]
-{ \[dq]citations\[dq]:    [ ...list of strings... ],
-  \[dq]bibliography\[dq]: [ ...list of arrays: item id and a string... ],
-  \[dq]warnings\[dq]:     [ ...list of warnings... ]
+.EX
+{ \(dqcitations\(dq:    [ \f[B]...list\f[R] \f[B]of\f[R] \f[B]strings...\f[R] ],
+  \(dqbibliography\(dq: [ \f[B]...list\f[R] \f[B]of\f[R] \f[B]arrays:\f[R] \f[B]item\f[R] \f[B]id\f[R] \f[B]and\f[R] \f[B]a\f[R] \f[B]string...\f[R] ],
+  \(dqwarnings\(dq:     [ \f[B]...list\f[R] \f[B]of\f[R] \f[B]warnings...\f[R] ]
 }
-\f[R]
-.fi
+.EE
 .PP
 The contents of the entries will be HTML by default, but if
-\f[C]--format=json\f[R] is specified, it will be a structured
+\f[CR]\-\-format=json\f[R] is specified, it will be a structured
 representation of formatted text.
 .IP
-.nf
-\f[C]
+.EX
 [
-  \[dq]\[em]\[em]\[em]. 1983b. \[lq]The Concept of Truth in Formalized Languages.\[rq] In \[dq],
+  \(dq\(em\(em\(em. 1983b. \(lqThe Concept of Truth in Formalized Languages.\(rq In \(dq,
   {
-    \[dq]format\[dq]: \[dq]italics\[dq],
-    \[dq]contents\[dq]: [
-      \[dq]Logic, Semantics, Metamathematics\[dq]
+    \(dqformat\(dq: \(dqitalics\(dq,
+    \(dqcontents\(dq: [
+      \(dqLogic, Semantics, Metamathematics\(dq
     ]
   },
-  \[dq], edited by John Corcoran, 152\[en]278. Indianapolis: Hackett.\[dq]
+  \(dq, edited by John Corcoran, 152\(en278. Indianapolis: Hackett.\(dq
 ]
-\f[R]
-.fi
+.EE
 .PP
 This representation can be used if you want to convert the result to a
 format other than HTML.
 .SH AUTHORS
-.PP
 John MacFarlane
diff --git a/man/citeproc.1.md b/man/citeproc.1.md
--- a/man/citeproc.1.md
+++ b/man/citeproc.1.md
@@ -50,6 +50,17 @@
     default) uses HTML tags and entities for formatting.  `json`
     creates a structured JSON representation of a formatted document.
 
+`--link-citations`
+:   Enable hyperlinking of citations to the bibliography.
+
+`--link-bibliography`
+:   Enable automatic linkification of any identifiers (DOI, PMCID,
+    PMID, or URL) appearing in a bibliography entry.  When an entry
+    has a DOI, PMCID, PMID, or URL available but none of these are
+    rendered by the style, add a link to the title (or, if no title
+    is present, the whole entry), using the URL for the DOI, PMCID,
+    PMID, or URL (in that order of priority).
+
 `-h, --help`
 :   Print usage information.
 
@@ -82,12 +93,19 @@
 
 ``` json
 { "citationID": "foo",
+  "citationResetPosition": false,
   "citationItems": [ ...list of citationItems... ],
   "citationNoteNumber": 3 }
 ```
 
-Only `citationItems` is necessary.  Alternatively,
-instead of
+Only `citationItems` is necessary.
+
+`citationResetPosition` controls whether position information
+is to be reset before the citation is processed (which affects
+whether full citations or abbreviated forms are used, in some
+styles).
+
+Alternatively, instead of
 
 ``` json
 { "citationItems": [ ... ] }
diff --git a/src/Citeproc.hs b/src/Citeproc.hs
--- a/src/Citeproc.hs
+++ b/src/Citeproc.hs
@@ -37,13 +37,13 @@
   rCitations = map ( trimR
                    . localizeQuotes locale
                    . movePunct
-                   . renderOutput opts
+                   . renderOutput opts locale
                    ) citationOs
   rBibliography = map (second
                          ( trimR
                          . localizeQuotes locale
                          . movePunct
-                         . renderOutput opts{ linkCitations = False } ))
+                         . renderOutput opts{ linkCitations = False } locale ))
                       bibliographyOs
   locale = mergeLocales mblang style
   trimR = dropTextWhileEnd (== ' ')
diff --git a/src/Citeproc/CaseTransform.hs b/src/Citeproc/CaseTransform.hs
--- a/src/Citeproc/CaseTransform.hs
+++ b/src/Citeproc/CaseTransform.hs
@@ -120,39 +120,113 @@
     Just (c,x') -> Unicode.toUpper mblang (T.singleton c) <> x'
     Nothing     -> x
 
+-- Source: https://raw.githubusercontent.com/citation-style-language/schema/master/schemas/styles/stop-words.json .
+-- We have omitted the ones containing spaces, like "ahead of".
 isStopWord :: Text -> Bool
 isStopWord "a" = True
+isStopWord "across" = True
+isStopWord "afore" = True
+isStopWord "after" = True
+isStopWord "against" = True
+isStopWord "along" = True
+isStopWord "alongside" = True
+isStopWord "amid" = True
+isStopWord "amidst" = True
+isStopWord "among" = True
+isStopWord "amongst" = True
 isStopWord "an" = True
 isStopWord "and" = True
+isStopWord "anenst" = True
+isStopWord "apropos" = True
+isStopWord "apud" = True
+isStopWord "around" = True
 isStopWord "as" = True
+isStopWord "aside" = True
+isStopWord "astride" = True
 isStopWord "at" = True
+isStopWord "athwart" = True
+isStopWord "atop" = True
+isStopWord "barring" = True
+isStopWord "before" = True
+isStopWord "behind" = True
+isStopWord "below" = True
+isStopWord "beneath" = True
+isStopWord "beside" = True
+isStopWord "besides" = True
+isStopWord "between" = True
+isStopWord "beyond" = True
 isStopWord "but" = True
 isStopWord "by" = True
+isStopWord "c" = True
+isStopWord "ca" = True
+isStopWord "circa" = True
+isStopWord "close to" = True
+isStopWord "d'" = True
+isStopWord "de" = True
+isStopWord "despite" = True
 isStopWord "down" = True
+isStopWord "during" = True
+isStopWord "et" = True
+isStopWord "except" = True
 isStopWord "for" = True
+isStopWord "forenenst" = True
 isStopWord "from" = True
+isStopWord "given" = True
 isStopWord "in" = True
+isStopWord "inside" = True
 isStopWord "into" = True
+isStopWord "lest" = True
+isStopWord "like" = True
+isStopWord "modulo" = True
+isStopWord "near" = True
+isStopWord "next" = True
 isStopWord "nor" = True
+isStopWord "notwithstanding" = True
 isStopWord "of" = True
+isStopWord "off" = True
 isStopWord "on" = True
 isStopWord "onto" = True
 isStopWord "or" = True
+isStopWord "out" = True
 isStopWord "over" = True
+isStopWord "per" = True
+isStopWord "plus" = True
+isStopWord "pro" = True
+isStopWord "qua" = True
+isStopWord "sans" = True
+isStopWord "since" = True
 isStopWord "so" = True
+isStopWord "than" = True
 isStopWord "the" = True
+isStopWord "through" = True
+isStopWord "throughout" = True
+isStopWord "thru" = True
+isStopWord "thruout" = True
 isStopWord "till" = True
 isStopWord "to" = True
+isStopWord "toward" = True
+isStopWord "towards" = True
+isStopWord "under" = True
+isStopWord "underneath" = True
+isStopWord "until" = True
+isStopWord "unto" = True
 isStopWord "up" = True
+isStopWord "upon" = True
+isStopWord "v." = True
+isStopWord "van" = True
+isStopWord "versus" = True
 isStopWord "via" = True
+isStopWord "vis-à-vis" = True
+isStopWord "von" = True
+isStopWord "vs." = True
+isStopWord "where as" = True
 isStopWord "with" = True
+isStopWord "within" = True
+isStopWord "without" = True
 isStopWord "yet" = True
 -- not in original list but seems required by test flipflop_Apostrophes
 -- and textcase_SkipNameParticlesInTitleCase
 isStopWord "about" = True
-isStopWord "van" = True
-isStopWord "von" = True
-isStopWord "de" = True
 isStopWord "d" = True
 isStopWord "l" = True
 isStopWord _ = False
diff --git a/src/Citeproc/CslJson.hs b/src/Citeproc/CslJson.hs
--- a/src/Citeproc/CslJson.hs
+++ b/src/Citeproc/CslJson.hs
@@ -30,19 +30,17 @@
 
 
 import Citeproc.Types
-import Citeproc.Locale (lookupQuotes)
 import Citeproc.CaseTransform
 import Data.Ord ()
-import Data.Char (isAlphaNum, isSpace, isAscii, isPunctuation)
+import qualified Data.Map as M
+import Data.Char (isAlphaNum, isSpace, isPunctuation)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Foldable (fold)
 import Data.Functor.Identity
-import Data.Attoparsec.Text as P
 import Data.Aeson (FromJSON(..), ToJSON(..), Value(..), object)
 import Control.Monad.Trans.State
-import Control.Monad (guard, when)
-import Control.Applicative ((<|>))
+import Control.Monad (when)
 import Data.Generics.Uniplate.Direct
 
 data CslJson a =
@@ -102,8 +100,16 @@
   biplate = plateSelf
 
 instance CiteprocOutput (CslJson Text) where
+  isEmpty               = \x ->
+     case x of
+       CslEmpty -> True
+       CslText "" -> True
+       CslConcat y z -> isEmpty y && isEmpty z
+       _ -> False
   toText                = fold
-  fromText              = parseCslJson mempty
+  fromText              = \t -> if T.null t
+                                   then CslEmpty
+                                   else CslText t
   dropTextWhile         = dropTextWhile'
   dropTextWhileEnd      = dropTextWhileEnd'
   addFontVariant x      =
@@ -137,6 +143,7 @@
       CapitalizeAll    -> caseTransform mblang withCapitalizeWords
       SentenceCase     -> caseTransform mblang withSentenceCase
       TitleCase        -> caseTransform mblang withTitleCase
+      PreserveCase     -> CslNoCase
   addDisplay x          =
     case x of
       DisplayBlock       -> CslDiv "block"
@@ -182,106 +189,6 @@
      CslDiv t x -> CslDiv t (dropTextWhileEnd' f x)
      CslLink t x -> CslLink t (dropTextWhileEnd' f x)
 
-parseCslJson :: Locale -> Text -> CslJson Text
-parseCslJson locale t =
-  case P.parseOnly
-         (P.many' (pCslJson locale) <* P.endOfInput) t of
-    Left _   -> CslText t
-    Right xs -> mconcat xs
-
-pCslJson :: Locale -> P.Parser (CslJson Text)
-pCslJson locale = P.choice
-  [ pCslText
-  , pCslQuoted
-  , pCslItalic
-  , pCslBold
-  , pCslUnderline
-  , pCslNoDecoration
-  , pCslSmallCaps
-  , pCslSup
-  , pCslSub
-  , pCslBaseline
-  , pCslNoCase
-  , pCslSymbol
-  ]
- where
-  ((outerOpenQuote, outerCloseQuote), (innerOpenQuote, innerCloseQuote)) =
-     lookupQuotes locale
-  isSpecialChar c = c == '<' || c == '>' || c == '\'' || c == '"' ||
-       c == '’' || (not (isAscii c) && (isSuperscriptChar c || isQuoteChar c))
-  isQuoteChar = P.inClass
-       (T.unpack (outerOpenQuote <> outerCloseQuote <>
-                 innerOpenQuote <> innerCloseQuote))
-  isSuperscriptChar = P.inClass superscriptChars
-  isApostrophe '\'' = True
-  isApostrophe '’'  = True
-  isApostrophe _    = False
-  pCsl = pCslJson locale
-  notFollowedBySpace =
-    P.peekChar' >>= guard . not . isSpaceChar
-  isSpaceChar = P.inClass [' ','\t','\n','\r']
-  pOpenQuote = (("\"" <$ P.char '"')
-                <|> ("'" <$ P.char '\'')
-                <|> (outerCloseQuote <$ P.string outerOpenQuote)
-                <|> (innerCloseQuote <$ P.string innerOpenQuote))
-                 <* notFollowedBySpace
-  pSpace = P.skipWhile isSpaceChar
-  pCslText = CslText . addNarrowSpace <$>
-    (  do t <- P.takeWhile1 (\c -> isAlphaNum c && not (isSpecialChar c))
-          -- apostrophe
-          P.option t $ do _ <- P.satisfy isApostrophe
-                          t' <- P.takeWhile1 isAlphaNum
-                          return (t <> "’" <> t')
-    <|>
-      (P.takeWhile1 (\c -> not (isAlphaNum c || isSpecialChar c))) )
-  pCslQuoted = CslQuoted <$>
-    do cl <- pOpenQuote
-       mbc <- peekChar
-       case mbc of
-         Just c  | T.singleton c == cl -> fail "unexpected close quote"
-         _ -> return ()
-       mconcat <$> P.manyTill' pCsl (P.string cl)
-  pCslSymbol = do
-    c <- P.satisfy isSpecialChar
-    return $
-       if isApostrophe c
-          then CslText "’"
-          else charToSup c
-  pCslItalic = CslItalic . mconcat <$>
-    (P.string "<i>" *> P.manyTill' pCsl (P.string "</i>"))
-  pCslBold = CslBold . mconcat <$>
-    (P.string "<b>" *> P.manyTill' pCsl (P.string "</b>"))
-  pCslUnderline = CslUnderline . mconcat <$>
-    (P.string "<u>" *> P.manyTill' pCsl (P.string "</u>"))
-  pCslNoDecoration = CslNoDecoration . mconcat <$>
-    (P.string "<span" *> pSpace *>
-     P.string "class=\"nodecor\"" *> pSpace *> P.char '>' *>
-     P.manyTill' pCsl (P.string "</span>"))
-  pCslSup = CslSup . mconcat <$>
-    (P.string "<sup>" *> P.manyTill' pCsl (P.string "</sup>"))
-  pCslSub = CslSub . mconcat <$>
-    (P.string "<sub>" *> P.manyTill' pCsl (P.string "</sub>"))
-  pCslBaseline = CslBaseline . mconcat <$>
-    (P.string "<span" *> pSpace *> P.string "style=\"baseline\">" *>
-      P.manyTill' pCsl (P.string "</span>"))
-  pCslSmallCaps = CslSmallCaps . mconcat <$>
-    ((P.string "<span" *> pSpace *>
-      P.string "style=\"font-variant:" *> pSpace *>
-      P.string "small-caps;" *> pSpace *> P.char '"' *>
-      pSpace *> P.char '>' *> P.manyTill' pCsl (P.string "</span>"))
-    <|>
-     (P.string "<sc>" *> P.manyTill' pCsl (P.string "</sc>")))
-  pCslNoCase = CslNoCase . mconcat <$>
-    (P.string "<span" *> pSpace *>
-     P.string "class=\"nocase\"" *> pSpace *> P.char '>' *>
-     P.manyTill' pCsl (P.string "</span>"))
-  addNarrowSpace =
-    T.replace " ;" "\x202F;" .
-    T.replace " ?" "\x202F?" .
-    T.replace " !" "\x202F!" .
-    T.replace " »" "\x202F»" .
-    T.replace "« " "«\x202F"
-
 data RenderContext =
   RenderContext
   { useOuterQuotes  :: Bool
@@ -304,7 +211,11 @@
   go :: RenderContext -> CslJson Text -> Text
   go ctx el =
     case el of
-      CslText t -> escape t
+      CslText t
+        | Just (c, "") <- T.uncons t
+        , Just t' <- M.lookup c superscriptChars
+          -> "<sup>" <> t' <> "</sup>"
+        | otherwise -> escape t
       CslEmpty -> mempty
       CslConcat x y -> go ctx x <> go ctx y
       CslQuoted x
@@ -348,7 +259,7 @@
                           go ctx{ useSmallCaps = True } x <> "</span>"
       CslSup x -> "<sup>" <> go ctx x <> "</sup>"
       CslSub x -> "<sub>" <> go ctx x <> "</sub>"
-      CslBaseline x -> "<span style=\"baseline\">" <> go ctx x <> "</span>"
+      CslBaseline x -> "<span class=\"baseline\">" <> go ctx x <> "</span>"
       CslDiv t x -> "<div class=\"csl-" <> t <> "\">" <> go ctx x <> "</div>"
       CslLink t x -> "<a href=\"" <> t <> "\">" <> go ctx x <> "</a>"
       CslNoCase x -> go ctx x -- nocase is just for internal purposes
@@ -432,11 +343,11 @@
         | otherwise      -> [ object
                                [ ("format", "no-italics")
                                , ("contents", toJSON $
-                                    go ctx{ useItalics = False } x)
+                                    go ctx{ useItalics = True } x)
                                ]
                             ]
       CslBold x
-        | useItalics ctx -> [ object
+        | useBold ctx    -> [ object
                                [ ("format", "bold")
                                , ("contents", toJSON $
                                     go ctx{ useBold = False } x)
@@ -445,7 +356,7 @@
         | otherwise      -> [ object
                                [ ("format", "no-bold")
                                , ("contents", toJSON $
-                                    go ctx{ useBold = False } x)
+                                    go ctx{ useBold = True } x)
                                ]
                             ]
       CslUnderline x     -> [ object
@@ -468,7 +379,7 @@
         | otherwise      -> [ object
                                [ ("format", "no-small-caps")
                                , ("contents", toJSON $
-                                    go ctx{ useSmallCaps = False } x)
+                                    go ctx{ useSmallCaps = True } x)
                                ]
                             ]
       CslSup x           -> [ object
@@ -583,15 +494,15 @@
     case el of
       CslConcat CslEmpty x -> go x
       CslConcat x CslEmpty -> go x
-      CslConcat (CslQuoted x) y ->
+      CslConcat x y | Just (wrap, quoted) <- endingQuote x ->
          case go y of
            (CslText t) | startsWithMovable t
-             -> CslQuoted (go (x <> CslText (T.take 1 t)))
+             -> wrap (go (quoted <> CslText (T.take 1 t)))
                <> CslText (T.drop 1 t)
            (CslConcat (CslText t) z) | startsWithMovable t
-             -> CslQuoted (go (x <> CslText (T.take 1 t))) <>
+             -> wrap (go (quoted <> CslText (T.take 1 t))) <>
                  CslText (T.drop 1 t) <> z
-           z                      -> CslQuoted x <> z
+           z                      -> wrap (go quoted) <> z
       CslConcat (CslConcat x y) z -> go (CslConcat x (CslConcat y z))
       CslConcat x y               -> go x <> go y
       CslQuoted x                 -> CslQuoted (go x)
@@ -609,220 +520,14 @@
       CslLink t x                 -> CslLink t (go x)
       CslText t                   -> CslText t
       CslEmpty                    -> CslEmpty
-
-superscriptChars :: [Char]
-superscriptChars =
-  [ '\x00AA'
-  , '\x00B2'
-  , '\x00B3'
-  , '\x00B9'
-  , '\x00BA'
-  , '\x02B0'
-  , '\x02B1'
-  , '\x02B2'
-  , '\x02B3'
-  , '\x02B4'
-  , '\x02B5'
-  , '\x02B6'
-  , '\x02B7'
-  , '\x02B8'
-  , '\x02E0'
-  , '\x02E1'
-  , '\x02E2'
-  , '\x02E3'
-  , '\x02E4'
-  , '\x1D2C'
-  , '\x1D2D'
-  , '\x1D2E'
-  , '\x1D30'
-  , '\x1D31'
-  , '\x1D32'
-  , '\x1D33'
-  , '\x1D34'
-  , '\x1D35'
-  , '\x1D36'
-  , '\x1D37'
-  , '\x1D38'
-  , '\x1D39'
-  , '\x1D3A'
-  , '\x1D3C'
-  , '\x1D3D'
-  , '\x1D3E'
-  , '\x1D3F'
-  , '\x1D40'
-  , '\x1D41'
-  , '\x1D42'
-  , '\x1D43'
-  , '\x1D44'
-  , '\x1D45'
-  , '\x1D46'
-  , '\x1D47'
-  , '\x1D48'
-  , '\x1D49'
-  , '\x1D4A'
-  , '\x1D4B'
-  , '\x1D4C'
-  , '\x1D4D'
-  , '\x1D4F'
-  , '\x1D50'
-  , '\x1D51'
-  , '\x1D52'
-  , '\x1D53'
-  , '\x1D54'
-  , '\x1D55'
-  , '\x1D56'
-  , '\x1D57'
-  , '\x1D58'
-  , '\x1D59'
-  , '\x1D5A'
-  , '\x1D5B'
-  , '\x1D5C'
-  , '\x1D5D'
-  , '\x1D5E'
-  , '\x1D5F'
-  , '\x1D60'
-  , '\x1D61'
-  , '\x2070'
-  , '\x2071'
-  , '\x2074'
-  , '\x2075'
-  , '\x2076'
-  , '\x2077'
-  , '\x2078'
-  , '\x2079'
-  , '\x207A'
-  , '\x207B'
-  , '\x207C'
-  , '\x207D'
-  , '\x207E'
-  , '\x207F'
-  , '\x2120'
-  , '\x2122'
-  , '\x3192'
-  , '\x3193'
-  , '\x3194'
-  , '\x3195'
-  , '\x3196'
-  , '\x3197'
-  , '\x3198'
-  , '\x3199'
-  , '\x319A'
-  , '\x319B'
-  , '\x319C'
-  , '\x319D'
-  , '\x319E'
-  , '\x319F'
-  , '\x02C0'
-  , '\x02C1'
-  , '\x06E5'
-  , '\x06E6'
-  ]
+  endingQuote (CslQuoted x) = Just (CslQuoted, x)
+  endingQuote (CslConcat x y) = do
+    (wrap, quoted) <- endingQuote y
+    return ((go x <>) . wrap, quoted)
+  endingQuote x =
+    case children x of
+      [child] -> do
+        (wrap, quoted) <- endingQuote child
+        return (\ys -> descend (const (wrap ys)) x, quoted)
+      _ -> Nothing
 
-charToSup :: Char -> CslJson Text
-charToSup c =
-  case c of
-    '\x00AA' -> CslSup (CslText "\x0061")
-    '\x00B2' -> CslSup (CslText "\x0032")
-    '\x00B3' -> CslSup (CslText "\x0033")
-    '\x00B9' -> CslSup (CslText "\x0031")
-    '\x00BA' -> CslSup (CslText "\x006F")
-    '\x02B0' -> CslSup (CslText "\x0068")
-    '\x02B1' -> CslSup (CslText "\x0266")
-    '\x02B2' -> CslSup (CslText "\x006A")
-    '\x02B3' -> CslSup (CslText "\x0072")
-    '\x02B4' -> CslSup (CslText "\x0279")
-    '\x02B5' -> CslSup (CslText "\x027B")
-    '\x02B6' -> CslSup (CslText "\x0281")
-    '\x02B7' -> CslSup (CslText "\x0077")
-    '\x02B8' -> CslSup (CslText "\x0079")
-    '\x02E0' -> CslSup (CslText "\x0263")
-    '\x02E1' -> CslSup (CslText "\x006C")
-    '\x02E2' -> CslSup (CslText "\x0073")
-    '\x02E3' -> CslSup (CslText "\x0078")
-    '\x02E4' -> CslSup (CslText "\x0295")
-    '\x1D2C' -> CslSup (CslText "\x0041")
-    '\x1D2D' -> CslSup (CslText "\x00C6")
-    '\x1D2E' -> CslSup (CslText "\x0042")
-    '\x1D30' -> CslSup (CslText "\x0044")
-    '\x1D31' -> CslSup (CslText "\x0045")
-    '\x1D32' -> CslSup (CslText "\x018E")
-    '\x1D33' -> CslSup (CslText "\x0047")
-    '\x1D34' -> CslSup (CslText "\x0048")
-    '\x1D35' -> CslSup (CslText "\x0049")
-    '\x1D36' -> CslSup (CslText "\x004A")
-    '\x1D37' -> CslSup (CslText "\x004B")
-    '\x1D38' -> CslSup (CslText "\x004C")
-    '\x1D39' -> CslSup (CslText "\x004D")
-    '\x1D3A' -> CslSup (CslText "\x004E")
-    '\x1D3C' -> CslSup (CslText "\x004F")
-    '\x1D3D' -> CslSup (CslText "\x0222")
-    '\x1D3E' -> CslSup (CslText "\x0050")
-    '\x1D3F' -> CslSup (CslText "\x0052")
-    '\x1D40' -> CslSup (CslText "\x0054")
-    '\x1D41' -> CslSup (CslText "\x0055")
-    '\x1D42' -> CslSup (CslText "\x0057")
-    '\x1D43' -> CslSup (CslText "\x0061")
-    '\x1D44' -> CslSup (CslText "\x0250")
-    '\x1D45' -> CslSup (CslText "\x0251")
-    '\x1D46' -> CslSup (CslText "\x1D02")
-    '\x1D47' -> CslSup (CslText "\x0062")
-    '\x1D48' -> CslSup (CslText "\x0064")
-    '\x1D49' -> CslSup (CslText "\x0065")
-    '\x1D4A' -> CslSup (CslText "\x0259")
-    '\x1D4B' -> CslSup (CslText "\x025B")
-    '\x1D4C' -> CslSup (CslText "\x025C")
-    '\x1D4D' -> CslSup (CslText "\x0067")
-    '\x1D4F' -> CslSup (CslText "\x006B")
-    '\x1D50' -> CslSup (CslText "\x006D")
-    '\x1D51' -> CslSup (CslText "\x014B")
-    '\x1D52' -> CslSup (CslText "\x006F")
-    '\x1D53' -> CslSup (CslText "\x0254")
-    '\x1D54' -> CslSup (CslText "\x1D16")
-    '\x1D55' -> CslSup (CslText "\x1D17")
-    '\x1D56' -> CslSup (CslText "\x0070")
-    '\x1D57' -> CslSup (CslText "\x0074")
-    '\x1D58' -> CslSup (CslText "\x0075")
-    '\x1D59' -> CslSup (CslText "\x1D1D")
-    '\x1D5A' -> CslSup (CslText "\x026F")
-    '\x1D5B' -> CslSup (CslText "\x0076")
-    '\x1D5C' -> CslSup (CslText "\x1D25")
-    '\x1D5D' -> CslSup (CslText "\x03B2")
-    '\x1D5E' -> CslSup (CslText "\x03B3")
-    '\x1D5F' -> CslSup (CslText "\x03B4")
-    '\x1D60' -> CslSup (CslText "\x03C6")
-    '\x1D61' -> CslSup (CslText "\x03C7")
-    '\x2070' -> CslSup (CslText "\x0030")
-    '\x2071' -> CslSup (CslText "\x0069")
-    '\x2074' -> CslSup (CslText "\x0034")
-    '\x2075' -> CslSup (CslText "\x0035")
-    '\x2076' -> CslSup (CslText "\x0036")
-    '\x2077' -> CslSup (CslText "\x0037")
-    '\x2078' -> CslSup (CslText "\x0038")
-    '\x2079' -> CslSup (CslText "\x0039")
-    '\x207A' -> CslSup (CslText "\x002B")
-    '\x207B' -> CslSup (CslText "\x2212")
-    '\x207C' -> CslSup (CslText "\x003D")
-    '\x207D' -> CslSup (CslText "\x0028")
-    '\x207E' -> CslSup (CslText "\x0029")
-    '\x207F' -> CslSup (CslText "\x006E")
-    '\x2120' -> CslSup (CslText "\x0053\x004D")
-    '\x2122' -> CslSup (CslText "\x0054\x004D")
-    '\x3192' -> CslSup (CslText "\x4E00")
-    '\x3193' -> CslSup (CslText "\x4E8C")
-    '\x3194' -> CslSup (CslText "\x4E09")
-    '\x3195' -> CslSup (CslText "\x56DB")
-    '\x3196' -> CslSup (CslText "\x4E0A")
-    '\x3197' -> CslSup (CslText "\x4E2D")
-    '\x3198' -> CslSup (CslText "\x4E0B")
-    '\x3199' -> CslSup (CslText "\x7532")
-    '\x319A' -> CslSup (CslText "\x4E59")
-    '\x319B' -> CslSup (CslText "\x4E19")
-    '\x319C' -> CslSup (CslText "\x4E01")
-    '\x319D' -> CslSup (CslText "\x5929")
-    '\x319E' -> CslSup (CslText "\x5730")
-    '\x319F' -> CslSup (CslText "\x4EBA")
-    '\x02C0' -> CslSup (CslText "\x0294")
-    '\x02C1' -> CslSup (CslText "\x0295")
-    '\x06E5' -> CslSup (CslText "\x0648")
-    '\x06E6' -> CslSup (CslText "\x064A")
-    _        -> CslText $ T.singleton c
diff --git a/src/Citeproc/Element.hs b/src/Citeproc/Element.hs
--- a/src/Citeproc/Element.hs
+++ b/src/Citeproc/Element.hs
@@ -11,7 +11,6 @@
   , getChildren
   , allChildren
   , getAttributes
-  , getNameAttributes
   , getFormatting
   , getTextContent
   )
@@ -23,9 +22,7 @@
 import qualified Text.XML as X
 import Data.Text (Text)
 import qualified Data.Text as T
-import Control.Monad.Trans.Reader
 import Control.Monad.Trans.Except
-import Control.Monad.Trans.Class (lift)
 
 newtype Attributes = Attributes (M.Map Text Text)
   deriving (Show, Semigroup, Monoid, Eq)
@@ -33,13 +30,13 @@
 lookupAttribute :: Text -> Attributes -> Maybe Text
 lookupAttribute key (Attributes kvs) = M.lookup key kvs
 
-type ElementParser = ReaderT (M.Map X.Name Text) (Except CiteprocError)
+type ElementParser = Except CiteprocError
 
 runElementParser :: ElementParser a -> Either CiteprocError a
-runElementParser p = runExcept (runReaderT p mempty)
+runElementParser = runExcept
 
 parseFailure :: String -> ElementParser a
-parseFailure s = lift $ throwE (CiteprocParseError $ T.pack s)
+parseFailure s = throwE (CiteprocParseError $ T.pack s)
 
 getChildren :: Text -> X.Element -> [X.Element]
 getChildren name el = [e | X.NodeElement e <- X.elementNodes el
@@ -52,13 +49,6 @@
 getAttributes =
   Attributes . M.mapKeys X.nameLocalName . X.elementAttributes
 
--- Like getAttributes but incorporates inheritable attributes.
-getNameAttributes :: X.Element -> ElementParser Attributes
-getNameAttributes node = do
-  nameattr <- ask
-  let xattr = X.elementAttributes node <> nameattr
-  return $ Attributes $ M.mapKeys X.nameLocalName xattr
-
 getFormatting :: Attributes -> Formatting
 getFormatting attr =
    Formatting
@@ -155,9 +145,16 @@
   name <- case lookupAttribute "name" attr of
                 Just n   -> return n
                 Nothing  -> parseFailure "Text node has no name attribute"
-  let single = mconcat $ map getTextContent $ getChildren "single" node
-  let multiple = mconcat $ map getTextContent $ getChildren "multiple" node
-  let txt = getTextContent node
+  -- Whitespace-only content (e.g. <term name="and others">
+  -- </term> in a pretty-printed style) defines an empty term;
+  -- but leading/trailing whitespace in an otherwise nonempty term
+  -- is significant (e.g. <term name="ad"> AD</term>).
+  let unlessBlank t = if T.null (T.strip t) then mempty else t
+  let single = unlessBlank $ mconcat $ map getTextContent $
+                 getChildren "single" node
+  let multiple = unlessBlank $ mconcat $ map getTextContent $
+                   getChildren "multiple" node
+  let txt = unlessBlank $ getTextContent node
   let form = case lookupAttribute "form" attr of
                Just "short"      -> Short
                Just "verb"       -> Verb
diff --git a/src/Citeproc/Eval.hs b/src/Citeproc/Eval.hs
--- a/src/Citeproc/Eval.hs
+++ b/src/Citeproc/Eval.hs
@@ -12,2758 +12,3111 @@
 import qualified Citeproc.Unicode as Unicode
 import Control.Monad.Trans.RWS.CPS
 import Data.Containers.ListUtils (nubOrdOn, nubOrd)
-import Safe (headMay, headDef, lastMay, initSafe, tailSafe, maximumMay)
-import Data.Maybe
-import Control.Monad (foldM, foldM_, zipWithM, when, unless)
-import qualified Data.Map as M
-import qualified Data.Set as Set
-import Data.Coerce (coerce)
-import Data.List (find, intersperse, sortBy, sortOn, groupBy, foldl', transpose,
-                  sort, (\\))
-import Data.Text (Text)
-import qualified Data.Text as T
-import Data.Char (isSpace, isDigit, isUpper, isLower, isLetter,
-                  ord, chr)
-import Text.Printf (printf)
-import Control.Applicative
-import Data.Generics.Uniplate.Operations (universe, transform)
-
--- import Debug.Trace (trace)
--- traceShowIdLabeled :: Show a => String -> a -> a
--- traceShowIdLabeled label x =
---   trace (label ++ ": " ++ show x) x
--- import Text.Show.Pretty (ppShow)
--- ppTrace :: Show a => a -> a
--- ppTrace x = trace (ppShow x) x
-
-data Context a =
-  Context
-  { contextLocale              :: Locale
-  , contextCollate             :: [SortKeyValue] -> [SortKeyValue] -> Ordering
-  , contextAbbreviations       :: Maybe Abbreviations
-  , contextStyleOptions        :: StyleOptions
-  , contextLocator             :: Maybe Text
-  , contextLabel               :: Maybe Text
-  , contextPosition            :: [Position]
-  , contextInSubstitute        :: Bool
-  , contextInSortKey           :: Bool
-  , contextInBibliography      :: Bool
-  , contextSubstituteNamesForm :: Maybe NamesFormat
-  }
-
--- used internally for group elements, which
--- are skipped if (a) the group calls a variable
--- but (b) all of the variables called are empty.
-data VarCount =
-  VarCount
-  { variablesAccessed :: Int
-  , variablesNonempty :: Int
-  } deriving (Show)
-
-data EvalState a =
-  EvalState
-  { stateVarCount       :: VarCount
-  , stateLastCitedMap   :: M.Map ItemId (Int, Maybe Int, Int,
-                                          Bool, Maybe Text, Maybe Text)
-                        -- (citegroup, noteNum, posInGroup,
-                        --      aloneInCitation, label, locator)
-  , stateNoteMap        :: M.Map Int (Set.Set ItemId) -- ids cited in note
-  , stateRefMap         :: ReferenceMap a
-  , stateReference      :: Reference a
-  , stateUsedYearSuffix :: Bool
-  , stateUsedIdentifier :: Bool
-  -- ^ tracks whether an identifier (DOI,PMCID,PMID,URL) has yet been used
-  , stateUsedTitle      :: Bool
-  -- ^ tracks whether the item title has yet been used
-  } deriving (Show)
-
-
-type Eval a = RWS (Context a) (Set.Set Text) (EvalState a)
-
-updateVarCount :: Int -> Int -> Eval a ()
-updateVarCount total' nonempty' =
-  modify $ \st ->
-    let VarCount{ variablesAccessed = total
-                , variablesNonempty = nonempty } = stateVarCount st
-     in st{ stateVarCount =
-              VarCount { variablesAccessed = total + total',
-                         variablesNonempty = nonempty + nonempty' } }
-
-evalStyle  :: CiteprocOutput a
-           => Style a          -- ^ Parsed CSL style.
-           -> Maybe Lang       -- ^ Override style default locale.
-           -> [Reference a]    -- ^ List of references (bibliographic data).
-           -> [Citation a]     -- ^ List of citations.
-           -> ([Output a], [(Text, Output a)], [Text])
-                       -- ^ (citations, (id, bibentry) pairs, warnings)
-evalStyle style mblang refs' citations =
-  (citationOs, bibliographyOs, Set.toList warnings)
- where
-  refs'' = refs' ++ extractItemData citations
-  (refs, refmap) = makeReferenceMap refs''
-
-  ((citationOs, bibliographyOs), warnings) = evalRWS go
-     Context
-      { contextLocale              = mergeLocales mblang style
-      , contextCollate             = \xs ys ->
-                                       compSortKeyValues (Unicode.comp mblang)
-                                       xs ys
-      , contextAbbreviations       = styleAbbreviations style
-      , contextStyleOptions        = styleOptions style
-      , contextLocator             = Nothing
-      , contextLabel               = Nothing
-      , contextPosition            = []
-      , contextInSubstitute        = False
-      , contextInSortKey           = False
-      , contextInBibliography      = False
-      , contextSubstituteNamesForm = Nothing
-      }
-      EvalState
-      { stateVarCount = VarCount 0 0
-      , stateLastCitedMap = mempty
-      , stateNoteMap = mempty
-      , stateRefMap = refmap
-      , stateReference = Reference mempty mempty Nothing mempty
-      , stateUsedYearSuffix = False
-      , stateUsedIdentifier = False
-      , stateUsedTitle = False
-      }
-
-  assignCitationNumbers sortedIds =
-    modify $ \st ->
-              st{ stateRefMap = ReferenceMap $ foldl'
-                     (\m (citeId, num) ->
-                         M.adjust (\ref ->
-                           ref{ referenceVariables =
-                                 M.insert "citation-number"
-                                    (NumVal num) .
-                                 M.insert "citation-key"
-                                     (TextVal (unItemId citeId)) .
-                                 M.alter (addIfMissing (citationLabel ref))
-                                    "citation-label"
-                                 $ referenceVariables ref
-                              }) citeId m)
-                     (unReferenceMap (stateRefMap st))
-                     (zip sortedIds [1..]) }
-
-  addIfMissing x Nothing  = Just x
-  addIfMissing _ (Just x) = Just x
-
-  go = do
-      -- list of citationItemIds that are actually cited
-      let citationOrder = M.fromList $ reverse $ zip
-            (concatMap (map citationItemId . citationItems) citations)
-            [(1 :: Int)..]
-      let citeIds = M.keysSet citationOrder
-      let sortedCiteIds = sortOn
-              (fromMaybe maxBound . (`M.lookup` citationOrder))
-              (map referenceId refs)
-      let layoutOpts = layoutOptions $ styleCitation style
-      let mbcgDelim =
-            case styleCiteGroupDelimiter (styleOptions style) of
-              Just x -> Just x
-              Nothing
-                -- grouping is activated whenever there is
-                -- collapsing; this is the default
-                -- cite-group-delimiter
-                | isJust (layoutCollapse layoutOpts) -> Just ", "
-                | otherwise -> Nothing
-
-      assignCitationNumbers sortedCiteIds
-      -- sorting of bibliography, insertion of citation-number
-      collate <- asks contextCollate
-
-      (bibCitations, bibSortKeyMap) <-
-        case styleBibliography style of
-          Nothing -> return ([], mempty)
-          Just biblayout -> do
-            bibSortKeyMap <- M.fromList
-                      <$> mapM
-                          ((\citeId ->
-                             (citeId,) <$> evalSortKeys biblayout citeId)
-                             . referenceId)
-                          refs
-            let sortedIds =
-                  if null (layoutSortKeys biblayout)
-                     then sortedCiteIds
-                     else sortBy
-                       (\x y -> collate
-                                  (fromMaybe [] $ M.lookup x bibSortKeyMap)
-                                  (fromMaybe [] $ M.lookup y bibSortKeyMap))
-                            (map referenceId refs)
-            assignCitationNumbers $
-              case layoutSortKeys biblayout of
-                (SortKeyVariable Descending "citation-number":_)
-                  -> reverse sortedIds
-                (SortKeyMacro Descending
-                  (Element (ENumber "citation-number" _) _:_) : _)
-                  -> reverse sortedIds
-                (SortKeyMacro Descending
-                  (Element (EText (TextVariable _ "citation-number")) _:_): _)
-                  -> reverse sortedIds
-                _ -> sortedIds
-            let bibCitations = map (\ident ->
-                  Citation (Just $ unItemId ident) Nothing
-                   [CitationItem ident Nothing Nothing
-                      NormalCite Nothing Nothing Nothing]) sortedIds
-            return (bibCitations, bibSortKeyMap)
-      -- styling of citations
-      sortKeyMap <-
-        foldM (\m citeId -> do
-                  sk <- evalSortKeys (styleCitation style) citeId
-                  return $ M.insert citeId sk m)
-               M.empty
-               citeIds
-      -- We can't just sort all the citations, because
-      -- this can make a hash out of prefixes and suffixes.
-      -- See e.g. pandoc-citeproc issue #292.
-      -- we need to first break into groups so that any
-      -- suffix ends a group and any prefix begins a group;
-      -- then sort the groups; then combine again:
-      let canGroup i1 i2
-           =   isNothing (citationItemSuffix i1) &&
-               isNothing (citationItemPrefix i2)
-      let sortCitationItems citation' =
-            citation'{ citationItems =
-                          concatMap
-                           (sortBy
-                             (\item1 item2 ->
-                               collate
-                                (fromMaybe [] $ M.lookup
-                                   (citationItemId item1) sortKeyMap)
-                                (fromMaybe [] $ M.lookup
-                                   (citationItemId item2) sortKeyMap)))
-                        $ groupBy canGroup
-                        $ citationItems citation' }
-      let citCitations = map sortCitationItems citations
-      cs <- disambiguateCitations style bibSortKeyMap citCitations
-      let cs' = case mbcgDelim of
-                   Nothing -> cs
-                   Just citeGroupDelim -> map
-                      (groupAndCollapseCitations citeGroupDelim
-                       (layoutYearSuffixDelimiter layoutOpts)
-                       (layoutAfterCollapseDelimiter layoutOpts)
-                       (layoutCollapse layoutOpts))
-                      cs
-
-      let removeIfEqual x y
-           | x == y    = NullOutput
-           | otherwise = y
-      let removeNamesIfSuppressAuthor
-           (Tagged (TagItem SuppressAuthor cid') x)
-             = let y = getAuthors x
-                in Tagged (TagItem SuppressAuthor cid')
-                     (transform (removeIfEqual y) x)
-          removeNamesIfSuppressAuthor x = x
-
-      -- we need to do this after disambiguation and collapsing
-      let handleSuppressAuthors = transform removeNamesIfSuppressAuthor
-
-      let isNoteCitation = styleIsNoteStyle (styleOptions style)
-
-      -- if we have an author-only citation at the beginning
-      -- separate it out:
-      let handleAuthorOnly formattedCit =
-            case formattedCit of
-              Formatted f
-                (x@(Tagged (TagItem AuthorOnly _) _):xs)
-                  | isNoteCitation
-                    -> formatted mempty
-                        (x : [InNote (formatted f xs) | not (null xs)])
-                  | otherwise
-                    -> formatted mempty
-                        (x :
-                         if null xs
-                            then []
-                            else [Literal (fromText " "),
-                                  formatted f xs])
-              Formatted f
-                (Formatted f'
-                  (x@(Tagged (TagItem AuthorOnly _) _):xs) : ys)
-                  | isNoteCitation
-                    -> formatted mempty
-                        (x :
-                         if null xs && null ys
-                            then []
-                            else [InNote (formatted f
-                                           (formatted f' xs : ys))])
-                  | otherwise
-                    -> Formatted mempty
-                        (x :
-                         if null xs && null ys
-                            then []
-                            else [Literal (fromText " "),
-                                  formatted f (formatted f' xs : ys)])
-              _ | isNoteCitation -> InNote formattedCit
-                | otherwise      -> formattedCit
-
-      let cs'' = map (handleSuppressAuthors . handleAuthorOnly) cs'
-
-      -- styling of bibliography (this needs to go here to take account
-      -- of year suffixes added in disambiguation)
-      bs <- case styleBibliography style of
-               Just biblayout
-                 -> local (\context ->
-                             context{ contextInBibliography = True }) $
-                    mapM (evalLayout biblayout) (zip [1..] bibCitations)
-                    >>= \bs ->
-                      case styleSubsequentAuthorSubstitute
-                            (styleOptions style) of
-                        Nothing -> return bs
-                        Just subs -> subsequentAuthorSubstitutes subs bs
-               Nothing -> return []
-      return (cs'', case styleBibliography style of
-                     Nothing -> []
-                     Just _  ->
-                       zip (map (fromMaybe "" . citationId) bibCitations) bs)
-
-extractItemData :: [Citation a] -> [Reference a]
-extractItemData = concatMap (mapMaybe citationItemData . citationItems)
-
-subsequentAuthorSubstitutes :: CiteprocOutput a
-                            => SubsequentAuthorSubstitute
-                            -> [Output a]
-                            -> Eval a [Output a]
-subsequentAuthorSubstitutes (SubsequentAuthorSubstitute t rule) =
-  return . groupCitesByNames
- where
-  groupCitesByNames [] = []
-  groupCitesByNames (x:xs) =
-    let xnames = fromMaybe ([],NullOutput) $ getNames x
-        samenames = replaceMatch rule (fromText t) xnames xs
-        rest = drop (length samenames) xs
-    in  (x : samenames) ++ groupCitesByNames rest
-  getNames (Formatted _ (x:_)) =
-    case [(ns,r) | (Tagged (TagNames _ _ ns) r) <- universe x] of
-      ((ns,r) : _) -> Just (ns,r)
-      []           -> Nothing
-  getNames _ = Nothing
-
-replaceMatch :: CiteprocOutput a
-             => SubsequentAuthorSubstituteRule
-             -> a
-             -> ([Name], Output a)
-             -> [Output a]
-             -> [Output a]
-replaceMatch _ _ _ [] = []
-replaceMatch rule replacement (names, raw) (z:zs) =
-  case go z of
-    Nothing -> []
-    Just z' -> z' : replaceMatch rule replacement (names, raw) zs
- where
-  go (Tagged t@TagItem{} y) =
-    Tagged t <$> go y
-  go (Formatted f (y:ys)) =
-    Formatted f . (: ys) <$> go y
-  go y@(Tagged (TagNames _ _ ns) r) =
-    case (if null names then CompleteAll else rule) of
-        CompleteAll ->
-          if ns == names && (not (null names) || r == raw)
-             then Just $ replaceAll y
-             else Nothing
-        CompleteEach ->
-          if ns == names
-             then Just $ transform replaceEach y
-             else Nothing
-        PartialEach ->
-          case numberOfMatches ns names of
-            num | num >= 1 -> Just $ transform (replaceFirst num) y
-            _ -> Nothing
-        PartialFirst ->
-          case numberOfMatches ns names of
-            num | num >= (1 :: Int) -> Just $ transform (replaceFirst 1) y
-            _ -> Nothing
-  go _ = Nothing
-  replaceAll (Tagged (TagNames t' nf ns') x)
-     = Tagged (TagNames t' nf ns') $
-       -- removeName will leave label "ed."
-       -- which we want, but it will also leave the substituted
-       -- title when there is no name, which we do not want.
-       -- So, if ns' is null, then we just remove everything.
-       if null ns'
-          then Literal replacement
-          else
-            case transform removeName x of
-              Formatted f' xs -> Formatted f' (Literal replacement : xs)
-              _               -> Literal replacement
-  replaceAll x = x
-  removeName (Tagged (TagName _) _) = NullOutput
-  removeName x = x
-  replaceEach (Tagged (TagName n) _)
-    | n `elem` names
-     = Tagged (TagName n) (Literal replacement)
-  replaceEach x = x
-  replaceFirst num x@(Tagged (TagNames _ _ ns') _)
-    = foldr (transform . replaceName) x $ take num ns'
-  replaceFirst _num x = x
-  replaceName name (Tagged (TagName n) _)
-    | n == name = Tagged (TagName n) (Literal replacement)
-  replaceName _ x = x
-  numberOfMatches (a:as) (b:bs)
-    | a == b    = 1 + numberOfMatches as bs
-    | otherwise = 0
-  numberOfMatches _ _ = 0
-
---
--- Disambiguation
---
-
-data DisambData =
-  DisambData
-  { ddItem       :: ItemId
-  , ddNames      :: [Name]
-  , ddDates      :: [Date]
-  , ddRendered   :: Text
-  } deriving (Eq, Ord, Show)
-
-disambiguateCitations :: forall a . CiteprocOutput a
-                      => Style a
-                      -> M.Map ItemId [SortKeyValue]
-                      -> [Citation a]
-                      -> Eval a [Output a]
-disambiguateCitations style bibSortKeyMap citations = do
-  refs <- unReferenceMap <$> gets stateRefMap
-  let refIds = M.keys refs
-  let ghostItems = [ ident
-                   | ident <- refIds
-                   ]
-                   -- we add additional references for EVERY citation,
-                   -- even those we have already, to handle cases like #116
-
-  -- for purposes of disambiguation, we remove prefixes and
-  -- suffixes and locators, and we convert author-in-text to normal citation.
-  let removeAffix item = item{ citationItemLabel = Nothing
-                             , citationItemLocator = Nothing
-                             , citationItemPrefix = Nothing
-                             , citationItemSuffix = Nothing }
-  let cleanCitation (Citation a b (i1:i2:is))
-       | citationItemType i1 == AuthorOnly
-       , citationItemType i2 == SuppressAuthor
-        = Citation a b
-            (map removeAffix (i2{ citationItemType = NormalCite }:is))
-      cleanCitation (Citation a b is)
-        = Citation a b (map removeAffix is)
-
-  -- note that citations must go first, and order must be preserved:
-  -- we use a "basic item" that strips off prefixes, suffixes, locators
-  let citations' = map cleanCitation citations ++
-                   [Citation Nothing Nothing (map basicItem ghostItems)]
-  allCites <- renderCitations citations'
-
-  mblang <- asks (localeLanguage . contextLocale)
-  styleOpts <- asks contextStyleOptions
-  let strategy = styleDisambiguation styleOpts
-  let allNameGroups = [ns | Tagged (TagNames _ _ ns) _ <-
-                              concatMap universe allCites]
-  let allNames = nubOrd $ concat allNameGroups
-  let primaryNames = nubOrd $ concatMap (take 1) allNameGroups
-  allCites' <-
-    case disambiguateAddGivenNames strategy of
-         Nothing     -> return allCites
-         Just ByCite -> return allCites -- do this later
-         Just rule   -> do -- disambiguate names, not just citations
-           let relevantNames =
-                 case rule of
-                   PrimaryNameWithInitials -> primaryNames
-                   PrimaryName -> primaryNames
-                   _ -> allNames
-           let familyNames = nubOrd $ mapMaybe nameFamily relevantNames
-           let grps = map (\name ->
-                             [v | v <- relevantNames
-                                , nameFamily v == Just name])
-                          familyNames
-           let toHint names name =
-                  if any (initialsMatch mblang name) (filter (/= name) names)
-                     then
-                       case rule of
-                         AllNamesWithInitials    -> Nothing
-                         PrimaryNameWithInitials -> Nothing
-                         PrimaryName             -> Just AddGivenNameIfPrimary
-                         _                       -> Just AddGivenName
-                     else
-                       case rule of
-                         PrimaryNameWithInitials -> Just AddInitialsIfPrimary
-                         PrimaryName             -> Just AddInitialsIfPrimary
-                         _                       -> Just AddInitials
-           let namesMap = mconcat $ map
-                  (\names -> if length names > 1
-                                 then foldr
-                                    (\name ->
-                                        case toHint names name of
-                                          Just x -> M.insert name x
-                                          Nothing -> id)
-                                    mempty
-                                    names
-                                 else mempty) grps
-           -- use this same names map for every citation
-           modify $ \st ->
-              st{ stateRefMap = ReferenceMap $
-                   foldr
-                     (M.adjust (alterReferenceDisambiguation
-                       (\d -> d{ disambNameMap = namesMap })))
-                     (unReferenceMap $ stateRefMap st)
-                     refIds }
-           -- redo citations
-           renderCitations citations'
-
-  case getAmbiguities allCites' of
-    []          -> return ()
-    ambiguities -> analyzeAmbiguities mblang strategy citations' ambiguities
-  renderCitations citations
-
- where
-
-  renderCitations :: [Citation a] -> Eval a [Output a]
-  renderCitations cs =
-    withRWST (\ctx st -> (ctx,
-                          st { stateLastCitedMap = mempty
-                             , stateNoteMap = mempty })) $
-     mapM (evalLayout (styleCitation style)) (zip [1..] cs)
-
-  refreshAmbiguities :: [Citation a] -> Eval a [[DisambData]]
-  refreshAmbiguities = fmap getAmbiguities . renderCitations
-
-  analyzeAmbiguities :: Maybe Lang
-                     -> DisambiguationStrategy
-                     -> [Citation a]
-                     -> [[DisambData]]
-                     -> Eval a ()
-  analyzeAmbiguities mblang strategy cs ambiguities = do
-    -- add names to et al.
-    return ambiguities
-      >>= (\as ->
-           (if not (null as) && disambiguateAddNames strategy
-               then do
-                 mapM_ (tryAddNames mblang (disambiguateAddGivenNames strategy)) as
-                 refreshAmbiguities cs
-               else
-                 return as))
-      >>= (\as ->
-           (case disambiguateAddGivenNames strategy of
-                  Just ByCite | not (null as) -> do
-                     mapM_ (tryAddGivenNames mblang) as
-                     refreshAmbiguities cs
-                  _           -> return as))
-      >>= (\as ->
-           (if not (null as) && disambiguateAddYearSuffix strategy
-               then do
-                 addYearSuffixes bibSortKeyMap as
-                 refreshAmbiguities cs
-               else return as))
-      >>= mapM_ tryDisambiguateCondition
-
-basicItem :: ItemId -> CitationItem a
-basicItem iid = CitationItem
-  { citationItemId      = iid
-  , citationItemLabel   = Nothing
-  , citationItemLocator = Nothing
-  , citationItemType    = NormalCite
-  , citationItemPrefix  = Nothing
-  , citationItemSuffix  = Nothing
-  , citationItemData    = Nothing
-  }
-
-isDisambiguated :: Maybe Lang
-                -> Maybe GivenNameDisambiguationRule
-                -> Int -- et al min
-                -> [DisambData]
-                -> DisambData
-                -> Bool
-isDisambiguated mblang mbrule etAlMin xs x =
-  all (\y -> x == y || disambiguatedName y /= disambiguatedName x) xs
- where
-  disambiguatedName = nameParts . take etAlMin . ddNames
-  nameParts =
-    case mbrule of
-      Just AllNames -> id
-      Just AllNamesWithInitials ->
-           map (\name -> name{ nameGiven = initialize mblang True False ""
-                                            <$> nameGiven name })
-      Just PrimaryName ->
-        \case
-          [] -> []
-          (z:zs) -> z : map (\name -> name{ nameGiven = Nothing }) zs
-      Just PrimaryNameWithInitials ->
-        \case
-          [] -> []
-          (z:zs) -> z{ nameGiven =
-                     initialize mblang True False "" <$> nameGiven z } :
-                     map (\name -> name{ nameGiven = Nothing }) zs
-      Just ByCite -> id -- hints will be added later
-      _ -> map (\name -> name{ nameGiven = Nothing })
-
-tryAddNames :: Maybe Lang
-            -> Maybe GivenNameDisambiguationRule
-            -> [DisambData]
-            -> Eval a ()
-tryAddNames mblang mbrule bs =
-                     (case mbrule of
-                          Just ByCite -> bs <$ tryAddGivenNames mblang bs
-                          _ -> return bs) >>= go 1
-                        -- if ByCite, we want to make sure that
-                        -- tryAddGivenNames is still applied, as
-                        -- calculation of "add names" assumes this.
- where
-   maxnames = fromMaybe 0 . maximumMay . map (length . ddNames)
-   go n as
-     | n > maxnames as = return ()
-     | otherwise = do
-         let ds = filter (isDisambiguated mblang mbrule n as) as
-         if null ds
-            then go (n + 1) as
-            else do
-              modify $ \st ->
-                st{ stateRefMap = ReferenceMap
-                      $ foldr (setEtAlNames (Just n) . ddItem)
-                        (unReferenceMap $ stateRefMap st) as }
-              go (n + 1) (as \\ ds)
-
-tryAddGivenNames :: Maybe Lang
-                 -> [DisambData]
-                 -> Eval a ()
-tryAddGivenNames mblang as = do
-  let correspondingNames =
-         map (zip (map ddItem as)) $ transpose $ map ddNames as
-      go [] _ = return []
-      go (as' :: [DisambData]) (ns :: [(ItemId, Name)]) = do
-        hintedIds <- Set.fromList . catMaybes <$>
-                        mapM (addNameHint mblang (map snd ns)) ns
-        return $ filter (\x -> ddItem x `Set.notMember` hintedIds) as'
-  foldM_ go as correspondingNames
-
-addYearSuffixes :: M.Map ItemId [SortKeyValue]
-                -> [[DisambData]]
-                -> Eval a ()
-addYearSuffixes bibSortKeyMap' as = do
-  let allitems = concat as
-  collate <- asks contextCollate
-  let companions a =
-        sortBy
-        (\item1 item2 ->
-          collate
-            (fromMaybe [] $ M.lookup (ddItem item1) bibSortKeyMap')
-            (fromMaybe [] $ M.lookup (ddItem item2) bibSortKeyMap'))
-        (concat [ x | x <- as, a `elem` x ])
-  let groups = Set.map companions $ Set.fromList allitems
-  let addYearSuffix item suff =
-        modify $ \st ->
-          st{ stateRefMap = ReferenceMap
-               $ setYearSuffix suff item
-               $ unReferenceMap
-               $ stateRefMap st }
-  mapM_ (\xs -> zipWithM addYearSuffix (map ddItem xs) [1..]) groups
-
-tryDisambiguateCondition :: [DisambData] -> Eval a ()
-tryDisambiguateCondition as =
-  case as of
-    [] -> return ()
-    xs -> modify $ \st ->
-            st{ stateRefMap = ReferenceMap
-                $ foldr (setDisambCondition True . ddItem)
-                  (unReferenceMap (stateRefMap st))
-                  xs }
-
-alterReferenceDisambiguation :: (DisambiguationData -> DisambiguationData)
-                             -> Reference a
-                             -> Reference a
-alterReferenceDisambiguation f r =
-      r{ referenceDisambiguation = f <$>
-           case referenceDisambiguation r of
-             Nothing -> Just
-               DisambiguationData
-                 { disambYearSuffix  = Nothing
-                 , disambNameMap     = mempty
-                 , disambEtAlNames   = Nothing
-                 , disambCondition   = False
-               }
-             Just x  -> Just x }
-
-initialsMatch :: Maybe Lang -> Name -> Name -> Bool
-initialsMatch mblang x y =
-  case (nameGiven x, nameGiven y) of
-    (Just x', Just y') ->
-      initialize mblang True False "" x' ==
-        initialize mblang True False "" y'
-    _ -> False
-
-addNameHint :: Maybe Lang -> [Name] -> (ItemId, Name) -> Eval a (Maybe ItemId)
-addNameHint mblang names (item, name) = do
-  let familyMatches = [n | n <- names
-                         , n /= name
-                         , nameFamily n == nameFamily name]
-  case familyMatches of
-    [] -> return Nothing
-    _  -> do
-      let hint = if any (initialsMatch mblang name) familyMatches
-                    then AddGivenName
-                    else AddInitials
-      modify $ \st ->
-        st{ stateRefMap = ReferenceMap
-            $ setNameHint hint name item
-            $ unReferenceMap (stateRefMap st) }
-      return $ Just item
-
-setNameHint :: NameHints -> Name -> ItemId
-            -> M.Map ItemId (Reference a) -> M.Map ItemId (Reference a)
-setNameHint hint name = M.adjust
-       (alterReferenceDisambiguation
-         (\d -> d{ disambNameMap =
-                     M.insert name hint
-                     (disambNameMap d) }))
-
-setEtAlNames :: Maybe Int -> ItemId
-             -> M.Map ItemId (Reference a) -> M.Map ItemId (Reference a)
-setEtAlNames x = M.adjust
-       (alterReferenceDisambiguation
-         (\d -> d{ disambEtAlNames = x }))
-
-setYearSuffix :: Int -> ItemId
-              -> M.Map ItemId (Reference a) -> M.Map ItemId (Reference a)
-setYearSuffix x = M.adjust
-       (alterReferenceDisambiguation
-         (\d -> d{ disambYearSuffix = Just x }))
-
-setDisambCondition :: Bool -> ItemId
-                   -> M.Map ItemId (Reference a) -> M.Map ItemId (Reference a)
-setDisambCondition x = M.adjust
-       (alterReferenceDisambiguation
-         (\d -> d{ disambCondition = x }))
-
-getAmbiguities :: CiteprocOutput a => [Output a] -> [[DisambData]]
-getAmbiguities =
-        mapMaybe
-           (\zs ->
-               case zs of
-                 []     -> Nothing
-                 [_]    -> Nothing
-                 (z:_) ->
-                   case ddRendered z of
-                     "" -> Nothing
-                     _  -> case nubOrdOn ddItem zs of
-                             ys@(_:_:_) -> Just ys -- > 1 ambiguous entry
-                             _          -> Nothing)
-      . groupBy (\x y -> ddRendered x == ddRendered y)
-      . sortOn ddRendered
-      . map toDisambData
-      . extractTagItems
-
-extractTagItems :: [Output a] -> [(ItemId, Output a)]
-extractTagItems xs =
-  [(iid, x) | Tagged (TagItem NormalCite iid) x <- concatMap universe xs
-            , not (hasIbid x)]
- where -- we don't want two "ibid" entries to be treated as ambiguous.
-  hasIbid x = not $ null [ trm | Tagged (TagTerm trm) _ <- universe x
-                               , termName trm == "ibid" ]
-
-
-toDisambData :: CiteprocOutput a => (ItemId, Output a) -> DisambData
-toDisambData (iid, x) =
-  let xs = universe x
-      ns' = getNames xs
-      ds' = getDates xs
-      t   = outputToText x
-   in DisambData { ddItem = iid
-                 , ddNames = ns'
-                 , ddDates = ds'
-                 , ddRendered = t }
- where
-  getNames :: [Output a] -> [Name]
-  getNames (Tagged (TagNames _ _ ns) _ : xs)
-                  = ns ++ getNames xs
-  getNames (_ : xs)   = getNames xs
-  getNames []         = []
-
-  getDates :: [Output a] -> [Date]
-  getDates (Tagged (TagDate d) _ : xs)
-                  = d : getDates xs
-  getDates (_ : xs)   = getDates xs
-  getDates []         = []
-
-
---
--- Grouping and collapsing
---
-
-groupAndCollapseCitations :: forall a . CiteprocOutput a
-                          => Text
-                          -> Maybe Text
-                          -> Maybe Text
-                          -> Maybe Collapsing
-                          -> Output a
-                          -> Output a
-groupAndCollapseCitations citeGroupDelim yearSuffixDelim afterCollapseDelim
-  collapsing (Formatted f xs) =
-   case collapsing of
-      Just CollapseCitationNumber ->
-        Formatted f{ formatDelimiter = Nothing } $
-            foldr collapseRange []
-                  (groupSuccessive isAdjacentCitationNumber xs)
-      Just collapseType ->
-          Formatted f{ formatDelimiter = Nothing } $
-            foldr (collapseGroup collapseType) [] (groupWith sameNames xs)
-      Nothing ->
-          Formatted f $
-             map (Formatted mempty{ formatDelimiter = Just citeGroupDelim })
-                 (groupWith sameNames xs)
- where
-  --   Note that we cannot assume we've sorted by name,
-  --   so we can't just use Data.ListgroupBy.  We also
-  --   take care not to move anything past a prefix or suffix.
-  groupWith :: (Output a -> Output a -> Bool)
-            -> [Output a]
-            -> [[Output a]]
-  groupWith _ [] = []
-  groupWith isMatched (z:zs)
-   | hasSuffix z = [z] : groupWith isMatched zs
-   | otherwise =  -- we allow a prefix on first item in collapsed group
-    case span hasNoPrefixOrSuffix zs of
-      ([],ys) -> [z] : groupWith isMatched ys
-      (ws,ys) ->
-        (z : filter (isMatched z) ws) :
-          groupWith isMatched (filter (not . isMatched z) ws ++ ys)
-
-  hasNoPrefixOrSuffix :: Output a -> Bool
-  hasNoPrefixOrSuffix x = not (hasPrefix x) && not (hasSuffix x)
-
-  hasPrefix :: Output a -> Bool
-  hasPrefix x = not $ null [y | y@(Tagged TagPrefix _) <- universe x]
-
-  hasSuffix :: Output a -> Bool
-  hasSuffix x = not $ null [y | y@(Tagged TagSuffix _) <- universe x]
-
-  collapseRange :: [Output a] -> [Output a] -> [Output a]
-  collapseRange ys zs
-    | length ys >= 3
-    , Just yhead <- headMay ys
-    , Just ylast <- lastMay ys
-      = Formatted mempty{ formatDelimiter = Just $ T.singleton enDash }
-                  [yhead, ylast] :
-                  if null zs
-                     then []
-                     else maybe NullOutput literal afterCollapseDelim : zs
-  collapseRange ys zs =
-    Formatted mempty{ formatDelimiter = formatDelimiter f } ys :
-      if null zs
-         then []
-         else maybe NullOutput literal (formatDelimiter f) : zs
-
-  collapseGroup :: Collapsing -> [Output a] -> [Output a] -> [Output a]
-  collapseGroup _ [] zs = zs
-  collapseGroup collapseType (y:ys) zs =
-    let ys' = y : map (transform removeNames) ys
-        ws = collapseYearSuffix collapseType ys'
-        noCollapse = ws == y:ys
-        noYearSuffixCollapse = ws == ys'
-        hasLocator u = not $ null [x | x@(Tagged TagLocator _) <- universe u]
-        anyHasLocator = any hasLocator ws
-        -- https://github.com/citation-style-language/test-suite/issues/36 :
-        flippedAfterCollapseDelim = collapseType == CollapseYear
-        addCGDelim u [] = [u]
-        addCGDelim u us =
-          Formatted mempty{ formatSuffix =
-                              if noCollapse || noYearSuffixCollapse &&
-                                 not (flippedAfterCollapseDelim &&
-                                      anyHasLocator)
-                                 then Just citeGroupDelim
-                                 else afterCollapseDelim <|>
-                                      formatDelimiter f } [u] : us
-     in Formatted mempty{ formatDelimiter = Nothing
-                        , formatSuffix =
-                            if null zs
-                               then Nothing
-                               else if noCollapse &&
-                                          not flippedAfterCollapseDelim
-                                       then formatDelimiter f
-                                       else afterCollapseDelim <|>
-                                            formatDelimiter f }
-                               (foldr addCGDelim [] ws) : zs
-  collapseRanges = map rangifyGroup . groupSuccessive isSuccessive
-  isSuccessive x y
-    = case ([c | Tagged (TagYearSuffix c) _ <- universe x],
-            [d | Tagged (TagYearSuffix d) _ <- universe y]) of
-        ([c],[d]) -> d == c + 1
-        _   -> False
-
-  rangifyGroup :: [Output a] -> Output a
-  rangifyGroup zs
-    | length zs >= 3
-    , Just zhead <- headMay zs
-    , Just zlast <- lastMay zs
-    = Formatted mempty{ formatDelimiter = Just (T.singleton enDash) }
-                [zhead, zlast]
-  rangifyGroup [z] = z
-  rangifyGroup zs = Formatted mempty{ formatDelimiter = yearSuffixDelim
-                                    } zs
-
-  yearSuffixGroup :: Bool -> [Output a] -> Output a
-  yearSuffixGroup _ [x] = x
-  yearSuffixGroup useRanges zs  =
-    Formatted mempty{ formatDelimiter = yearSuffixDelim }
-      $ if useRanges then collapseRanges zs else zs
-
-  collapseYearSuffix :: Collapsing -> [Output a] -> [Output a]
-  collapseYearSuffix CollapseYearSuffix zs =
-    reverse $ yearSuffixGroup False cur : items
-   where
-     (cur, items) = foldl' (goYearSuffix False) ([], []) zs
-  collapseYearSuffix CollapseYearSuffixRanged zs =
-    reverse $ yearSuffixGroup True cur : items
-   where
-     (cur, items) = foldl' (goYearSuffix True) ([], []) zs
-  collapseYearSuffix _ zs = zs
-
-  getDates :: Output a -> [Date]
-  getDates x = [d | Tagged (TagDate d) _ <- universe x]
-
-  getYears :: Output a -> [[Maybe Int]]
-  getYears x = [map (\case
-                        DateParts (y:_) -> Just y
-                        _               -> Nothing) (dateParts d)
-                | d <- getDates x
-                , isNothing (dateLiteral d)]
-
-  goYearSuffix :: Bool -> ([Output a], [Output a]) -> Output a
-               -> ([Output a], [Output a])
-  goYearSuffix useRanges (cur, items) item =
-    case cur of
-      []     -> ([item], items)
-      (z:zs)
-        | getYears z == getYears item
-          -> (z:zs ++ [transform removeYear item], items)
-        | otherwise -> ([item], yearSuffixGroup useRanges (z:zs) : items)
-
-  removeYear :: Output a -> Output a
-  removeYear (Tagged (TagDate d) x) =
-    Tagged (TagDate d) (extractYearSuffix x)
-  removeYear x = x
-
-  extractYearSuffix :: Output a -> Output a
-  extractYearSuffix x =
-    case [z | z@(Tagged (TagYearSuffix _) _) <- universe x] of
-      (y:_) -> y
-      _     -> NullOutput
-
-  isAdjacentCitationNumber :: Output a -> Output a -> Bool
-  isAdjacentCitationNumber
-     (Tagged (TagItem _ _)
-       (Formatted _f1 [Tagged (TagCitationNumber n1) _xs1]))
-     (Tagged (TagItem _ _)
-       (Formatted _f2 [Tagged (TagCitationNumber n2) _xs2]))
-    = n2 == n1 + 1
-  isAdjacentCitationNumber
-     (Tagged (TagItem _ _) (Tagged (TagCitationNumber n1) _xs1))
-     (Tagged (TagItem _ _) (Tagged (TagCitationNumber n2) _xs2))
-    = n2 == n1 + 1
-  isAdjacentCitationNumber _ _ = False
-
-  sameNames :: Output a -> Output a -> Bool
-  sameNames x y =
-    case (extractTagged x, extractTagged y) of
-      (Just (Tagged (TagNames t1 _nf1 ns1) ws1),
-       Just (Tagged (TagNames t2 _nf2 ns2) ws2))
-        -> t1 == t2 && (if ns1 == ns2
-                           then not (null ns1) || ws1 == ws2
-                           else ws1 == ws2)
-      -- case where it's just a date with no name or anything;
-      -- we treat this as same name e.g. (1955a,b)
-      (Just (Tagged TagDate{} _), Just (Tagged TagDate{} _))
-        -> True
-          -- case where title is substituted
-      _ -> False
-
-  extractTagged :: Output a -> Maybe (Output a)
-  extractTagged x =
-    let items = [y | y@(Tagged (TagItem ty _) _) <- universe x
-                   , ty /= AuthorOnly]
-        names = [y | y@(Tagged TagNames{} _) <- concatMap universe items]
-        dates = [y | y@(Tagged TagDate{} _) <- concatMap universe items]
-    in  if null items
-           then Nothing
-           else listToMaybe names <|> listToMaybe dates
-
-groupAndCollapseCitations _ _ _ _ x = x
-
-takeSeq :: Show a => (a -> a -> Bool) -> [a] -> ([a], [a])
-takeSeq isAdjacent (x1 : x2 : rest)
-  | isAdjacent x1 x2 = (x1:ys, zs)
-  where (ys, zs) = takeSeq isAdjacent (x2:rest)
-takeSeq _ (y:ys) = ([y], ys)
-takeSeq _ []     = ([], [])
-
-groupSuccessive :: Show a => (a -> a -> Bool) -> [a] -> [[a]]
-groupSuccessive isAdjacent zs =
-  case takeSeq isAdjacent zs of
-    ([],_)  -> []
-    (xs,ys) -> xs : groupSuccessive isAdjacent ys
-
---
--- Sorting
---
-
-evalSortKeys :: CiteprocOutput a
-             => Layout a
-             -> ItemId
-             -> Eval a [SortKeyValue]
-evalSortKeys layout citeId =
-  withRWST (\ctx st -> (ctx{ contextInSortKey = True }, st)) $
-    mapM (evalSortKey citeId) (layoutSortKeys layout)
-
-evalSortKey :: CiteprocOutput a
-            => ItemId
-            -> SortKey a
-            -> Eval a SortKeyValue
-evalSortKey citeId (SortKeyMacro sortdir elts) = do
-  refmap <- gets stateRefMap
-  case lookupReference citeId refmap of
-    Nothing  -> return $ SortKeyValue sortdir Nothing
-    Just ref -> do
-        k <- normalizeSortKey . toText .
-              renderOutput defaultCiteprocOptions . grouped
-              <$> withRWS newContext (mconcat <$> mapM eElement elts)
-        return $ SortKeyValue sortdir (Just k)
-     where
-      newContext oldContext s =
-        (oldContext, s{ stateReference = ref })
-evalSortKey citeId (SortKeyVariable sortdir var) = do
-  refmap <- gets stateRefMap
-  SortKeyValue sortdir <$>
-    case lookupReference citeId refmap >>= lookupVariable var of
-      Nothing           -> return Nothing
-      Just (TextVal t)  -> return $ Just $ normalizeSortKey t
-      Just (NumVal  i)  -> return $ Just [T.pack $ printf "%09d" i]
-      Just (FancyVal x) -> return $ Just $ normalizeSortKey $ toText x
-      Just (NamesVal ns) ->
-        Just . normalizeSortKey . mconcat . intersperse "," . map T.unwords
-             <$> mapM getNamePartSortOrder ns
-      Just (DateVal d)  -> return $ Just [T.toLower $ dateToText d]
-      Just SubstitutedVal -> return Nothing
-
--- Note: we do a case-insensitive sort (using toCaseFold):
-normalizeSortKey :: Text -> [Text]
-normalizeSortKey = filter (not . T.null) . T.split isWordSep . T.toCaseFold
- where
-  isWordSep c = isSpace c || c == '\'' || c == '’' || c == ',' ||
-                c == 'ʾ' || c == 'ʿ' -- ayn/hamza in transliterated arabic
-
--- absence should sort AFTER all values
--- see sort_StatusFieldAscending.txt, sort_StatusFieldDescending.txt
-compSortKeyValue :: (Text -> Text -> Ordering)
-                 -> SortKeyValue
-                 -> SortKeyValue
-                 -> Ordering
-compSortKeyValue collate sk1 sk2 =
-  case (sk1, sk2) of
-    (SortKeyValue _ Nothing, SortKeyValue _ Nothing) -> EQ
-    (SortKeyValue _ Nothing, SortKeyValue _ (Just _)) -> GT
-    (SortKeyValue _ (Just _), SortKeyValue _ Nothing) -> LT
-    (SortKeyValue Ascending (Just t1), SortKeyValue Ascending (Just t2)) ->
-      collateKey t1 t2
-    (SortKeyValue Descending (Just t1), SortKeyValue Descending (Just t2))->
-      collateKey t2 t1
-    _ -> EQ
- where
-  collateKey :: [Text] -> [Text] -> Ordering
-  collateKey [] [] = EQ
-  collateKey [] (_:_) = LT
-  collateKey (_:_) [] = GT
-  collateKey (x:xs) (y:ys) =
-    case collate x y of
-      EQ -> collateKey xs ys
-      GT -> GT
-      LT -> LT
-
-compSortKeyValues :: (Text -> Text -> Ordering)
-                  -> [SortKeyValue]
-                  -> [SortKeyValue]
-                  -> Ordering
-compSortKeyValues _ [] [] = EQ
-compSortKeyValues _ [] (_:_) = LT
-compSortKeyValues _ (_:_) [] = GT
-compSortKeyValues collate (x:xs) (y:ys) =
-  case compSortKeyValue collate x y of
-    EQ -> compSortKeyValues collate xs ys
-    GT -> GT
-    LT -> LT
-
--- Note!  This prints negative (BC) dates as N(999,999,999 + y)
--- and positive (AD) dates as Py so they sort properly.  (Note that
--- our unicode sorting ignores punctuation, so we use a letter
--- rather than -.) Do not use out of context of sort keys.
-dateToText :: Date -> Text
-dateToText = mconcat . map (T.pack . go . coerce) . dateParts
- where
-  go :: [Int] -> String
-  go [] = ""
-  go [y] = toYear y <> "0000"
-  go [y,m] = toYear y <> printf "%02d" m <> "00"
-  go (y:m:d:_) = toYear y <> printf "%02d" m <> printf "%02d" d
-  toYear :: Int -> String
-  toYear y
-    | y < 0     = printf "N%09d" (999999999 + y)
-    | otherwise = printf "P%09d" y
-
-
-evalLayout :: CiteprocOutput a
-            => Layout a
-            -> (Int, Citation a)
-            -> Eval a (Output a)
-evalLayout layout (citationGroupNumber, citation) = do
-  -- this is a hack to ensure that "ibid" detection will work
-  -- correctly in a citation starting with an author-only:
-  -- the combination AuthorOnly [SuppressAuthor] should not
-  -- count against a later Ibid citation.
-  let positionsInCitation =
-        case citationItems citation of
-          (c:_) | citationItemType c == AuthorOnly -> [0..]
-          _ -> [1..]
-
-  items <- mapM evalItem' (zip positionsInCitation (citationItems citation))
-
-  -- see display_SecondFieldAlignMigratePunctuation.txt
-  let moveSuffixInsideDisplay zs =
-        case (lastMay zs, formatSuffix formatting) of
-          (Just (Tagged (TagItem ct id') (Formatted f ys)), Just _) ->
-            (\ys' -> initSafe zs ++
-                      [Tagged (TagItem ct id') (Formatted f ys')]) <$>
-                        moveSuffixInsideDisplay ys
-          (Just (Formatted f ys), Just suff)
-            | isJust (formatDisplay f) ->
-                Just $ initSafe zs ++
-                     [Formatted f{ formatSuffix = Just
-                          (fromMaybe "" (formatSuffix f) <> suff) } ys]
-            | otherwise -> (\ys' -> initSafe zs ++ [Formatted f ys']) <$>
-                             moveSuffixInsideDisplay ys
-          _ -> Nothing
-  return $
-    case moveSuffixInsideDisplay items of
-      Nothing     -> formatted formatting items
-      Just items' -> formatted formatting{ formatSuffix = Nothing } items'
- where
-  formatting = layoutFormatting layout
-
-  secondFieldAlign [Linked t (x:xs)] =
-    secondFieldAlign [x, Linked t xs]
-  secondFieldAlign (x:xs) =
-    formatted mempty{ formatDisplay = Just DisplayLeftMargin } [x]
-    : [formatted mempty{ formatDisplay = Just DisplayRightInline } xs]
-  secondFieldAlign [] = []
-
-  evalItem' (positionInCitation :: Int, item) = do
-    isBibliography  <- asks contextInBibliography
-
-    styleOpts <- asks contextStyleOptions
-    let isNote = styleIsNoteStyle styleOpts
-    position <- getPosition citationGroupNumber (citationNoteNumber citation)
-                     item positionInCitation
-
-    xs <- evalItem layout (position, item)
-    -- we only update the map in the citations section
-    unless isBibliography $ do
-      updateRefMap citationGroupNumber citation item
-      updateLastCitedMap citationGroupNumber positionInCitation citation item
-
-    return $
-          maybe id (\pref x -> Tagged TagPrefix (grouped [Literal pref, x]))
-                (citationItemPrefix item)
-        . maybe id (\suff x -> Tagged TagSuffix (grouped [x, Literal suff]))
-                   (citationItemSuffix item)
-        . (\x -> case x of
-                   NullOutput -> x
-                   _          -> Tagged (TagItem (citationItemType item)
-                                                  (citationItemId item)) x)
-        . formatted mempty
-        . (if citationItemType item == AuthorOnly
-              then (:[]) . getAuthors . formatted mempty
-              else id)
-        . (case citationItemPrefix item of
-             Just t | isNote
-                    , ". " `T.isSuffixOf` toText t
-                    , T.count " " (toText t) > 1 -- exclude single word
-                                 -> capitalizeInitialTerm
-             _                   -> id)
-        . (if isBibliography
-              then
-                case styleSecondFieldAlign styleOpts of
-                  Just SecondFieldAlignFlush  -> secondFieldAlign
-                  Just SecondFieldAlignMargin -> secondFieldAlign -- TODO?
-                  Nothing -> id
-              else id)
-        $ xs
-
-evalItem :: CiteprocOutput a
-         => Layout a -> ([Position], CitationItem a) -> Eval a [Output a]
-evalItem layout (position, item) = do
-  refmap <- gets stateRefMap
-
-  let addLangToFormatting lang (Formatted f xs) =
-        Formatted f{ formatLang = Just lang } xs
-      addLangToFormatting _ x = x
-
-  case lookupReference (citationItemId item) refmap of
-    Just ref -> withRWST
-      (\ctx st ->
-       (ctx{ contextLocator = citationItemLocator item
-           , contextLabel = citationItemLabel item
-           , contextPosition = position
-           },
-        st{ stateReference = ref
-          , stateUsedYearSuffix = False
-          , stateUsedIdentifier = False
-          , stateUsedTitle = False
-          }))
-        $ do xs <- mconcat <$> mapM eElement (layoutElements layout)
-
-             -- find identifiers that can be used to hyperlink the title
-             let mbident =
-                    foldl (<|>) Nothing
-                      [ IdentDOI   <$> (valToText =<< lookupVariable "DOI" ref)
-                      , IdentPMCID <$> (valToText =<< lookupVariable "PMCID" ref)
-                      , IdentPMID  <$> (valToText =<< lookupVariable "PMID" ref)
-                      , IdentURL   <$> (valToText =<< lookupVariable "URL" ref)
-                      ]
-             let mburl = identifierToURL <$> mbident
-
-             -- hyperlink any titles in the output
-             let linkTitle url (Tagged TagTitle x) = Linked url [Tagged TagTitle x]
-                 linkTitle _ x = x
-
-             usedLink  <- gets stateUsedIdentifier
-             usedTitle <- gets stateUsedTitle
-             inBiblio  <- asks contextInBibliography
-
-             -- when no links were rendered for a bibliography item, hyperlink
-             -- the title, if it exists, otherwise hyperlink the whole item
-             let xs' =
-                   if usedLink || not inBiblio
-                     then xs
-                   else case mburl of
-                         Nothing  -> xs
-                         Just url -> if usedTitle
-                                        -- hyperlink the title
-                                        then fmap (transform (linkTitle url)) xs
-                                        -- hyperlink the entire bib item
-                                        else [Linked url xs]
-
-             let mblang = lookupVariable "language" ref
-                          >>= valToText
-                          >>= either (const Nothing) Just . parseLang
-             return $
-               case mblang of
-                 Nothing   -> xs'
-                 Just lang -> map
-                     (transform (addLangToFormatting lang)) xs'
-    Nothing -> do
-      warn $ "citation " <> unItemId (citationItemId item) <>
-             " not found"
-      return [Literal $ addFontWeight BoldWeight
-         $ fromText $ unItemId (citationItemId item) <> "?"]
-
-
-
-updateRefMap :: Int -> Citation a -> CitationItem a -> Eval a ()
-updateRefMap citationGroupNumber citation item = do
-  isNote <- asks (styleIsNoteStyle . contextStyleOptions)
-  lastCitedMap <- gets stateLastCitedMap
-  let notenum = NumVal $ fromMaybe citationGroupNumber (citationNoteNumber citation)
-  -- keep track of how many citations in each note.
-  -- two citations from the same note don't count as "alone"
-  -- for ibid purposes. See citation-style-language/documentation#121
-  case citationNoteNumber citation of
-    Nothing -> return ()
-    Just n  -> modify $ \st ->
-                   st{ stateNoteMap = M.alter
-                        (maybe
-                          (Just (Set.singleton (citationItemId item)))
-                          (Just . Set.insert (citationItemId item)))
-                        n
-                        (stateNoteMap st) }
-  case M.lookup (citationItemId item) lastCitedMap of
-    Nothing | isNote -> -- first citation
-      modify $ \st ->
-        st{ stateRefMap = ReferenceMap $
-                M.adjust (\ref -> ref{ referenceVariables =
-                  M.insert "first-reference-note-number" notenum
-                             (referenceVariables ref)})
-                  (citationItemId item)
-               (unReferenceMap $ stateRefMap st) }
-    _  -> return ()
-
-updateLastCitedMap :: Int -> Int -> Citation a -> CitationItem a -> Eval a ()
-updateLastCitedMap citationGroupNumber positionInCitation citation item = do
-  unless (citationItemType item == AuthorOnly) $
-    modify $ \st ->
-      st{ stateLastCitedMap =
-        M.insert (citationItemId item)
-          (citationGroupNumber, citationNoteNumber citation,
-           positionInCitation,
-           (case citationItems citation of
-              [_]   -> True
-              [x,y] -> citationItemId x == citationItemId y
-                      && citationItemType x == AuthorOnly
-                      && citationItemType y == SuppressAuthor
-              _     -> False),
-           citationItemLabel item,
-           citationItemLocator item)
-        $ stateLastCitedMap st }
-
-
--- | The first-occurring element tagged as Names will be
--- treated as the "author"; generally that is the author
--- but it might be the editor if it's an edited volume.
-getAuthors :: Output a -> Output a
-getAuthors x =
-  headDef NullOutput [y | y@(Tagged TagNames{} _) <- universe x]
-
-removeNames :: Output a -> Output a
-removeNames (Tagged TagNames{} _) = NullOutput
-removeNames x = x
-
-capitalizeInitialTerm :: [Output a] -> [Output a]
-capitalizeInitialTerm [] = []
-capitalizeInitialTerm (z:zs) = go z : zs
- where
-  go (Tagged (TagTerm t) x) =
-    Tagged (TagTerm t)
-      (formatted mempty{ formatTextCase = Just CapitalizeFirst } [x])
-  go (Formatted f xs) = Formatted f (capitalizeInitialTerm xs)
-  go (Tagged tg x) = Tagged tg (go x)
-  go x = x
-
-getPosition :: Int -> Maybe Int -> CitationItem a -> Int -> Eval a [Position]
-getPosition groupNum mbNoteNum item posInGroup = do
-  inBibliography <- asks contextInBibliography
-  if inBibliography
-     then return []
-     else getPosition'
- where
-  getPosition' = do
-    lastCitedMap <- gets stateLastCitedMap
-    noteMap <- gets stateNoteMap
-    case M.lookup (citationItemId item) lastCitedMap of
-      Nothing -> return [FirstPosition]
-      Just (prevGroupNum, mbPrevNoteNum,
-             prevPosInGroup, prevAloneInGroup,
-             prevLabel, prevLoc) -> do
-        isNote <- asks (styleIsNoteStyle . contextStyleOptions)
-        nearNoteDistance <- fromMaybe 5 <$>
-                asks (styleNearNoteDistance . contextStyleOptions)
-        let noteNum = fromMaybe groupNum mbNoteNum
-        let prevNoteNum = fromMaybe prevGroupNum mbPrevNoteNum
-        let prevAloneInNote =
-              case M.lookup prevNoteNum noteMap of
-                Nothing -> True
-                Just s  -> Set.size s <= 1
-        let prevAlone = prevAloneInGroup && prevAloneInNote
-        return $
-          (if isNote && noteNum - prevNoteNum < nearNoteDistance
-              then (NearNote :)
-              else id) .
-          (if (groupNum == prevGroupNum &&
-               posInGroup == prevPosInGroup + 1) ||
-              (groupNum == prevGroupNum + 1 &&
-                (((-) <$> mbNoteNum <*> mbPrevNoteNum) <= Just 1) &&
-               posInGroup == 1 &&
-               prevAlone)
-               then case (prevLoc, citationItemLocator item) of
-                      (Nothing, Just _)
-                        -> (IbidWithLocator :) . (Ibid :)
-                      (Nothing, Nothing) -> (Ibid :)
-                      (Just _, Nothing)   -> id
-                      (Just l1, Just l2)
-                        | l1 == l2
-                        , citationItemLabel item == prevLabel
-                          -> (Ibid :)
-                        | otherwise
-                          -> (IbidWithLocator :) . (Ibid :)
-               else id)
-          $ [Subsequent]
-
-eElement :: CiteprocOutput a => Element a -> Eval a [Output a]
-eElement (Element etype formatting) =
-  case etype of
-    EText textType ->
-      (:[]) <$> withFormatting formatting (eText textType)
-    ENumber var nform ->
-      (:[]) <$> withFormatting formatting (eNumber var nform)
-    EGroup isMacro els ->
-      (:[]) <$> eGroup isMacro formatting els
-    EChoose chooseParts -> eChoose chooseParts
-    ELabel var termform pluralize ->
-      (:[]) <$> eLabel var termform pluralize formatting
-    EDate var dateType mbShowDateParts dps ->
-      (:[]) <$> eDate var dateType mbShowDateParts dps formatting
-    ENames vars namesFormat subst ->
-      (:[]) <$> eNames vars namesFormat subst formatting
-
-withFormatting :: CiteprocOutput a
-               => Formatting -> Eval a (Output a) -> Eval a (Output a)
-withFormatting (Formatting Nothing Nothing Nothing Nothing Nothing Nothing
-                           Nothing Nothing Nothing Nothing Nothing
-                           False False False) p
-                          = p
-withFormatting formatting p = do
-  -- Title case conversion only affects English-language items.
-  lang <- asks (localeLanguage . contextLocale)
-  ref <- gets stateReference
-  let reflang = case M.lookup "language" (referenceVariables ref) of
-                  Just (TextVal t)  ->
-                    either (const Nothing) Just $ parseLang t
-                  Just (FancyVal x) ->
-                    either (const Nothing) Just $ parseLang $ toText x
-                  _                 -> Nothing
-  let mainLangIsEn Nothing = False
-      mainLangIsEn (Just l) = langLanguage l == "en"
-  let isEnglish = case reflang of
-                    Just l  -> mainLangIsEn (Just l)
-                    Nothing -> mainLangIsEn lang
-  let formatting' = if formatTextCase formatting == Just TitleCase &&
-                       not isEnglish
-                       then formatting{ formatTextCase = Nothing }
-                       else formatting
-  res <- p
-  return $ formatted formatting' [res]
-
-lookupTerm :: Term -> Eval a [(Term, Text)]
-lookupTerm term = do
-  terms <- asks (localeTerms . contextLocale)
-  let term' = if termName term == "sub verbo"
-                 then term{ termName = "sub-verbo" }
-                 else term
-  case M.lookup (termName term') terms of
-     Just ts -> return $ [ (term'',t)
-                         | (term'',t) <- ts
-                         , term' <= term''
-                         ]
-     Nothing -> return []
-
-lookupTerm' :: CiteprocOutput a => Term -> Eval a (Output a)
-lookupTerm' term = lookupTerm term >>= f
- where
-   f []  =
-     --  “verb-short” first falls back to “verb”, “symbol”
-     --  first falls back to “short”, and “verb” and “short”
-     --  both fall back to “long”.
-     case termForm term of
-       VerbShort -> lookupTerm' term{ termForm = Verb }
-       Symbol    -> lookupTerm' term{ termForm = Short }
-       Verb      -> lookupTerm' term{ termForm = Long }
-       Short     -> lookupTerm' term{ termForm = Long }
-       _         -> return NullOutput
-   f ((_,t):_) = return $ if T.null t
-                             then NullOutput
-                             else Literal $ fromText t
-
-pageRange :: CiteprocOutput a => Text -> Eval a (Output a)
-pageRange x = do
-  pageDelim <- lookupTerm'
-                  emptyTerm{ termName = "page-range-delimiter" }
-  mbPageRangeFormat <- asks (stylePageRangeFormat . contextStyleOptions)
-  let ranges = map T.strip $ T.groupBy
-               (\c d -> not (c == ',' || c == '&' || d == ',' || d == '&'))
-               x
-  return $ formatted mempty{ formatDelimiter = Just " " }
-         $ map (formatPageRange mbPageRangeFormat
-            (case pageDelim of
-               NullOutput -> literal $ T.singleton enDash
-               delim      -> delim)) ranges
-
-enDash :: Char
-enDash = '\x2013'
-
-formatPageRange :: CiteprocOutput a
-                => Maybe PageRangeFormat
-                -> Output a
-                -> Text
-                -> Output a
-formatPageRange _ _ "&" = literal "&"
-formatPageRange _ _ "," = literal ","
-formatPageRange mbPageRangeFormat delim t =
-  let isDash '-' = True
-      isDash '\x2013' = True
-      isDash _ = False
-      rangeParts = if "\\-" `T.isInfixOf` t
-                      then [T.replace "\\-" "-" t]
-                      else map T.strip $ T.split isDash t
-      inRange pref xs
-        | T.null pref = grouped (intersperse delim (map literal xs))
-        | otherwise = grouped
-            (literal pref : intersperse delim (map literal xs))
-      changedDigits xs ys =
-        length $ filter not $ zipWith (==) (xs ++ repeat ' ') ys
-      minimal threshold pref x y =
-        case T.commonPrefixes x y of
-             Just (_comm, restx, resty) | T.length restx == T.length resty ->
-                 if T.length resty < threshold && T.length y >= threshold
-                    then inRange pref [x, T.takeEnd threshold y]
-                    else inRange pref [x, resty]
-             _ -> inRange pref [x, y]
-   in case rangeParts of
-        []     -> NullOutput
-        [w]    -> literal w
-        [w,v]
-          | Nothing <- mbPageRangeFormat -> inRange mempty [w,v]
-          | Just fmt <- mbPageRangeFormat -> do
-            let wPrefix = T.dropWhileEnd isDigit w
-            let vPrefix = T.dropWhileEnd isDigit v
-            if wPrefix == vPrefix
-               then do
-                 let pref = wPrefix
-                 let x = T.drop (T.length wPrefix) w
-                 let y = T.drop (T.length vPrefix) v
-                 let xlen = T.length x
-                 let ylen = T.length y
-                 let y'   = if ylen < xlen
-                               then T.take (xlen - ylen) x <> y
-                               else y
-                 case fmt of
-                   PageRangeChicago15
-                       | xlen < 3  -> inRange pref [x, y']
-                       | "00" `T.isSuffixOf` x -> inRange pref [x, y']
-                       | T.take 1 (T.takeEnd 2 x) == "0"
-                       , T.take 1 (T.takeEnd 2 y') == "0"
-                         -> minimal 1 pref x y'
-                       | xlen == 4
-                       , changedDigits (T.unpack x) (T.unpack y') >= 3
-                         -> inRange pref [x, y']
-                       | otherwise -> minimal 2 pref x y'
-                   PageRangeChicago16
-                       | xlen < 3  -> inRange pref [x, y']
-                       | "00" `T.isSuffixOf` x -> inRange pref [x, y']
-                       | T.take 1 (T.takeEnd 2 x) == "0"
-                       , T.take 1 (T.takeEnd 2 y') == "0"
-                         -> minimal 1 pref x y'
-                       | otherwise -> minimal 2 pref x y'
-                   PageRangeExpanded ->
-                       inRange mempty [pref <> x, pref <> y']
-                   PageRangeMinimal -> minimal 1 pref x y'
-                   PageRangeMinimalTwo -> minimal 2 pref x y'
-               else inRange mempty [w,v]
-        _ -> literal t
-
-eText :: CiteprocOutput a => TextType -> Eval a (Output a)
-eText (TextVariable varForm v) = do
-  ref <- gets stateReference
-  -- Note: we do book keeping on how many variables
-  -- have been accessed and how many are nonempty,
-  -- in order to properly handle the group element,
-  -- which is implicitly conditional.
-  case v of
-    "id"   -> do
-      updateVarCount 1 1
-      return $ Literal $ fromText $ coerce $ referenceId ref
-    "type" -> do
-      updateVarCount 1 1
-      return $ Literal $ fromText  $ referenceType ref
-    "locator" -> do
-        let handleAmpersands (Just t) | T.any (=='&') t = do
-              ts <- lookupTerm emptyTerm { termName = "and"
-                                         , termForm = Symbol }
-              case ts of
-                (_,x):_ -> return (Just $ T.replace "&" x t)
-                []      -> return (Just t)
-            handleAmpersands x = return x
-
-        mbv <- asks contextLocator >>= handleAmpersands
-        mbl <- asks contextLabel
-        case mbv of
-          Just x | isNothing mbl || mbl == Just "page" -> do
-                      updateVarCount 1 1
-                      Tagged TagLocator <$> pageRange x
-                 | otherwise -> do
-                      updateVarCount 1 1
-                      return $ Tagged TagLocator $
-                                formatPageRange Nothing
-                                (literal $ T.singleton enDash) x
-          Nothing -> NullOutput <$ updateVarCount 1 0
-
-    "year-suffix" -> do
-        disamb <- gets (referenceDisambiguation . stateReference)
-        case disamb >>= disambYearSuffix of
-          Just x ->
-            -- we don't update var count here; this doesn't
-            -- count as a variable
-            return $ Tagged (TagYearSuffix x)
-                            (Literal (fromText (showYearSuffix x)))
-          Nothing -> return NullOutput
-
-    "citation-number" -> do
-        mbv <- askVariable v
-        case mbv of
-          Just (NumVal x)  -> return $
-                              Tagged (TagCitationNumber x) $
-                              Literal $ fromText (T.pack (show x))
-          _ -> do
-            warn $ "citation-number not defined for " <>
-                      coerce (referenceId ref)
-            return NullOutput
-
-    "citation-label" -> do  -- these need year suffix too
-        mbv <- askVariable v
-        mbsuff <- getYearSuffix
-        case mbv of
-          Just (TextVal t)  -> return $
-                                Tagged TagCitationLabel $
-                                  grouped $
-                                  Literal (fromText t)
-                                  : maybeToList mbsuff
-          Just (FancyVal x) -> return $
-                                 Tagged TagCitationLabel $
-                                  grouped $
-                                  Literal x
-                                  : maybeToList mbsuff
-          _ -> do
-            warn $ "citation-label of unknown type for " <>
-                      coerce (referenceId ref)
-            return NullOutput
-
-    "DOI"   -> handleIdent id IdentDOI
-    "PMCID" -> handleIdent id IdentPMCID
-    "PMID"  -> handleIdent id IdentPMID
-    "URL"   -> handleIdent id IdentURL
-
-    _ -> do
-        mbv <- if varForm == ShortForm
-                  then do
-                    mbval <- (<|>) <$> askVariable (v <> "-short")
-                                   <*> askVariable v
-                    case mbval of
-                      Nothing -> return Nothing
-                      Just val -> do
-                        mbAbbrevs <- asks contextAbbreviations
-                        return $ Just $ fromMaybe val
-                               $ mbAbbrevs >>= lookupAbbreviation v val
-                  else askVariable v
-        res <- case mbv of
-                 Just (TextVal x)
-                   | v == "page" -> pageRange x
-                   | otherwise   -> return $ Literal $ fromText x
-                 Just (FancyVal x)
-                   | v == "page" -> pageRange (toText x)
-                   | otherwise   -> return $ Literal x
-                 Just (NumVal x) -> return $ Literal
-                                           $ fromText (T.pack (show x))
-                 _ -> return NullOutput
-        unless (isNothing mbv) $ deleteSubstitutedVariables [v]
-        if v == "title" && res /= NullOutput
-            then do
-              modify (\st -> st { stateUsedTitle = True })
-              -- tag title so we can hyperlink it later
-              return $ Tagged TagTitle res
-            else return res
-    where
-      handleIdent :: CiteprocOutput b => (Text -> Text) -> (Text -> Identifier) -> Eval b (Output b)
-      handleIdent f identConstr = do
-        mbv <- askVariable v
-        deleteSubstitutedVariables [v]
-        case f <$> (valToText =<< mbv) of
-          Nothing -> return NullOutput
-          Just t  -> do
-            -- create link and remember that we've done so far
-            modify (\st -> st { stateUsedIdentifier = True })
-            let url = identifierToURL (identConstr t)
-            return $ Linked url [Literal $ fromText t]
-eText (TextMacro name) = do
-  warn $ "encountered unexpanded macro " <> name
-  return NullOutput
-eText (TextValue t) = return $ Literal $ fromText t
-eText (TextTerm term) = do
-  t' <- lookupTerm' term
-  t'' <- if termName term == "no date"
-            then do
-              mbsuff <- getYearSuffix
-              case mbsuff of
-                Nothing  -> return t'
-                Just suff
-                  | termForm term == Long
-                    -> return $ grouped [t', Literal (fromText " "), suff]
-                  | otherwise -> return $ grouped [t', suff]
-            else return t'
-  return $ Tagged (TagTerm term) t''
-
-
--- | Delete substituted variables so they aren't used again.
-deleteSubstitutedVariables :: [Variable] -> Eval a ()
-deleteSubstitutedVariables vars = do
-  inSubst <- asks contextInSubstitute
-  when inSubst $
-    modify $ \st -> -- delete variables so they aren't used again...
-      st{ stateReference =
-                  let Reference id' type' d' m' = stateReference st
-                   in Reference id' type' d' (foldr (\v -> M.insert v SubstitutedVal) m' vars) }
-
--- Numbers with prefixes or suffixes are never ordinalized
--- or rendered in roman numerals (e.g. “2E” remains “2E).
--- Numbers without affixes are individually transformed
--- (“2, 3” can become “2nd, 3rd”, “second, third” or “ii, iii”).
--- So, first we split on punctuation and spaces:
-splitNums :: Text -> [Val a]
-splitNums = map go . T.groupBy sameClass
- where
-  go t = case readAsInt t of
-           Just i  -> NumVal i
-           Nothing -> TextVal $ if t == "-"
-                                   then T.singleton enDash
-                                   else t
-  sameClass c d = (isSepPunct c || isSpace c) ==
-                  (isSepPunct d || isSpace d)
-
---- punctuation that separates pages in a range
-isSepPunct :: Char -> Bool
-isSepPunct ',' = True
-isSepPunct ';' = True
-isSepPunct '-' = True
-isSepPunct '\x2013' = True
-isSepPunct _   = False
-
-eLabel :: CiteprocOutput a
-       => Variable
-       -> TermForm
-       -> Pluralize
-       -> Formatting
-       -> Eval a (Output a)
-eLabel var termform pluralize formatting = do
-  ref <- gets stateReference
-  let getTerm :: CiteprocOutput a
-              => Text -> Val a -> Eval a (Output a)
-      getTerm termname x = do
-        let determinePlural t
-             | var == "number-of-volumes"
-             , t /= "1" && t /= "0"      = Plural
-             | "\\-" `T.isInfixOf` t     = Singular
-             | length (splitNums t) > 1  = Plural
-               -- see label_CollapsedPageNumberPluralDetection.txt
-             | otherwise                 = Singular
-        let number = case pluralize of
-                         AlwaysPluralize     -> Plural
-                         NeverPluralize      -> Singular
-                         ContextualPluralize ->
-                          case x of
-                            TextVal t   -> determinePlural t
-                            FancyVal w  -> determinePlural (toText w)
-                            NamesVal ns -> if length ns > 1
-                                              then Plural
-                                              else Singular
-                            _ -> Singular
-        let term = emptyTerm{ termName = termname
-                            , termForm = termform
-                            , termNumber = Just number }
-        lookupTerm' term
-  locator <- asks contextLocator
-  label <- asks contextLabel
-  let var' = if var == "editortranslator" then "editor" else var
-  term' <- case (var, locator, label) of
-             ("locator", Just loc, Just lab) -> getTerm lab (TextVal loc)
-             ("locator", Just loc, Nothing)
-                | beginsWithSpace loc -> return NullOutput
-                | ". " `T.isPrefixOf` T.dropWhile isLetter loc
-                                         -> return NullOutput
-                | otherwise              -> getTerm "page" (TextVal loc)
-             _ -> case lookupVariable var' ref of
-                         Nothing -> return NullOutput
-                         Just x  -> getTerm (fromVariable var) x
-
-  return $
-    case formatSuffix formatting of
-      Just suff
-        | "." `T.isPrefixOf` suff
-          -> case term' of
-               Literal x
-                 | "." `T.isSuffixOf` toText x
-                 , not (formatStripPeriods formatting)
-                 -> formatted
-                     formatting{ formatSuffix =
-                        if T.length suff <= 1
-                           then Nothing
-                           else Just (T.drop 1 suff) }
-                     [term']
-               _ -> formatted formatting [term']
-      _ -> formatted formatting [term']
-
-eDate :: CiteprocOutput a
-       => Variable
-       -> DateType
-       -> Maybe ShowDateParts
-       -> [DP]
-       -> Formatting
-       -> Eval a (Output a)
-eDate var dateType mbShowDateParts dps formatting
-  | var == mempty = do
-    warn "skipping date element with no variable attribute set"
-    return NullOutput
-  | otherwise = do
-    datevar <- askVariable var
-    localeDateElt <- M.lookup dateType <$> asks (localeDate . contextLocale)
-    let addOverride newdps olddp accum =
-          case find ((== dpName olddp) . dpName) newdps of
-            Just x  -> x{ dpFormatting =
-                            dpFormatting olddp <> dpFormatting x } : accum
-            Nothing -> olddp : accum
-    let useDatePart dp =
-          case mbShowDateParts of
-            Just Year      -> dpName dp == DPYear
-            Just YearMonth -> dpName dp == DPYear || dpName dp == DPMonth
-            _              -> True
-    let (dps', formatting') =
-          case localeDateElt of
-            Just (Element (EDate _ _ _ edps) f)
-              -> (filter useDatePart $ foldr (addOverride dps) [] edps,
-                   formatting <> f)
-            _ -> (filter useDatePart dps, formatting)
-    case datevar of
-      Nothing ->
-        -- warn $ "date element for empty variable " <> var
-        return NullOutput
-      Just (DateVal date) ->
-        case dateLiteral date of
-          Just t -> return $ formatted formatting' [Literal $ fromText t]
-          Nothing -> do
-            let dateparts = case dateSeason date of
-                              Just i  ->
-                                case dateParts date of
-                                  [DateParts [y]] ->
-                                    [DateParts [y, 12 + i]] -- pseudo-mo
-                                  xs    -> xs
-                              Nothing -> dateParts date
-            xs <- formatDateParts dps'
-                    $ case dateparts of
-                        [] -> (DateParts [], Nothing)
-                        [d] -> (d, Nothing)
-                        (d:e:_) -> (d, Just e)
-            when (all (== NullOutput) xs) $
-              -- back off on the claim to nonemptiness
-              -- when the only match are in date parts that
-              -- we aren't printing; see
-              -- group_SuppressTermWhenNoOutputFromPartialDate.txt
-              updateVarCount 0 (-1)
-
-            yearSuffix <- getYearSuffix
-            return $ Tagged (TagDate date) $ formatted formatting'
-                      (xs ++ maybeToList yearSuffix)
-      Just _ -> do
-        warn $ "date element for variable with non-date value " <>
-                fromVariable var
-        return NullOutput
-
-
-getYearSuffix :: CiteprocOutput a => Eval a (Maybe (Output a))
-getYearSuffix = do
-  disamb <- gets (referenceDisambiguation . stateReference)
-  sopts <- asks contextStyleOptions
-  -- we only want year suffix on first occurence of year
-  -- in a reference:
-  usedYearSuffix <- gets stateUsedYearSuffix
-  case disamb >>= disambYearSuffix of
-    Just c
-      | not (styleUsesYearSuffixVariable sopts)
-      , not usedYearSuffix
-      -> do
-        modify $ \st -> st{ stateUsedYearSuffix = True }
-        return $ Just $ Tagged (TagYearSuffix c)
-                         (Literal (fromText (showYearSuffix c)))
-      | otherwise -> return Nothing
-    Nothing  -> return Nothing
-
-formatSortDate :: CiteprocOutput a
-               => [DP] -> (Maybe Int, Maybe Int, Maybe Int) -> Output a
-formatSortDate dpSpecs (mbyr, mbmo, mbda) =
-  Literal $ fromText $ T.pack $  sortyr <> sortmo <> sortda
- where
-  sortyr = case mbyr of
-             Just yr | any ((== DPYear) . dpName) dpSpecs
-                -> printf "%04d" (yr + 5000) -- to work with BC and AD
-             _  -> ""
-  sortmo = case mbmo of
-             Just mo | any ((== DPMonth) . dpName) dpSpecs
-                -> printf "%02d" mo
-             _  -> ""
-  sortda = case mbda of
-             Just da | any ((== DPDay) . dpName) dpSpecs
-                -> printf "%02d" da
-             _  -> ""
-
-formatDateParts :: CiteprocOutput a
-          => [DP] -> (DateParts, Maybe DateParts) -> Eval a [Output a]
-formatDateParts dpSpecs (date, mbNextDate) = do
-  inSortKey <- asks contextInSortKey
-  let (yr,mo,da) = bindDateParts date
-  case bindDateParts <$> mbNextDate of
-    Nothing
-      | inSortKey -> return [formatSortDate dpSpecs (yr, mo, da)]
-      | otherwise -> mapM (eDP (yr,mo,da)) dpSpecs
-    Just (nextyr, nextmo, nextda)
-      | inSortKey -> return [formatSortDate dpSpecs (yr, mo, da),
-                             Literal (fromText "-"),
-                             formatSortDate dpSpecs (nextyr, nextmo, nextda)]
-      | otherwise -> do
-        let isOpenRange = nextyr == Just 0 &&
-                          isNothing nextmo &&
-                          isNothing nextda
-        -- figure out where the range goes:
-        -- first to differ out of the items selected by dpSpecs, in order y->m->d
-        let dpToNs DPYear  = (yr, nextyr)
-            dpToNs DPMonth = (mo, nextmo)
-            dpToNs DPDay   = (da, nextda)
-        let areSame = takeWhile (uncurry (==) . dpToNs) $
-                        sort $ map dpName dpSpecs
-        let (sames1, rest) = span (\dp -> dpName dp `elem` areSame) dpSpecs
-        let (diffs, sames2) = span (\dp -> dpName dp `notElem` areSame) rest
-        let cleanup = filter (/= NullOutput)
-        sames1' <- cleanup <$> mapM (eDP (yr,mo,da)) sames1
-        diffsLeft' <- cleanup <$> mapM (eDP (yr,mo,da)) diffs
-        diffsRight' <- cleanup <$> mapM (eDP (nextyr,nextmo,nextda)) diffs
-        sames2' <- cleanup <$> mapM (eDP (yr,mo,da)) sames2
-        let rangeDelim = case sortOn dpName diffs of
-                                []     -> Nothing
-                                (dp:_) -> Just $ dpRangeDelimiter dp
-        let toRange xs ys =
-              case lastMay xs of
-                Just xlast ->
-                     initSafe xs ++
-                       [Formatted mempty{ formatDelimiter = rangeDelim }
-                       [xlast, headDef (Literal mempty) ys]] ++
-                     tailSafe ys
-                _ -> xs ++ ys
-
-        return $
-          if isOpenRange
-             then [Formatted mempty{ formatSuffix = rangeDelim }
-                      (removeLastSuffix $ sames1' ++ diffsLeft')]
-             else removeLastSuffix $
-                   sames1' ++
-                   toRange (removeLastSuffix diffsLeft')
-                           (removeFirstPrefix diffsRight') ++
-                   sames2'
-
-removeFirstPrefix :: [Output a] -> [Output a]
-removeFirstPrefix (Formatted f xs : rest) =
-  Formatted f{ formatPrefix = Nothing } xs : rest
-removeFirstPrefix xs = xs
-
-removeLastSuffix :: [Output a] -> [Output a]
-removeLastSuffix [] = []
-removeLastSuffix [Formatted f xs] =
-  [Formatted f{ formatSuffix = Nothing } xs ]
-removeLastSuffix (x:xs) = x : removeLastSuffix xs
-
-eDP :: CiteprocOutput a
-    => (Maybe Int, Maybe Int, Maybe Int) ->  DP -> Eval a (Output a)
-eDP (yr,mo,da) dp = do
-  let mbn = case dpName dp of
-               DPDay   -> da
-               DPMonth -> mo
-               DPYear  -> yr
-  case mbn of
-    Nothing -> return NullOutput
-    Just 0 | dpName dp == DPYear
-            -> return $ Literal mempty -- open date range
-    Just n  -> do
-      let litStr = return . Literal . fromText . T.pack
-      suffix <- case dpName dp of
-                  DPYear
-                    | n < 0
-                      -> (:[]) <$> lookupTerm' emptyTerm{ termName = "bc" }
-                    | n > 0
-                    , n < 1000
-                      -> (:[]) <$> lookupTerm' emptyTerm{ termName = "ad" }
-                    | otherwise -> return []
-                  _ -> return []
-      let n' = case dpName dp of
-                 DPYear -> abs n
-                 _      -> n
-      formatted (dpFormatting dp) . (:suffix) <$>
-          case dpForm dp of
-            DPNumeric             -> litStr (show n')
-            DPNumericLeadingZeros -> litStr (printf "%02d" n')
-            DPOrdinal             -> do
-              locale <- asks contextLocale
-              if localeLimitDayOrdinalsToDay1 locale == Just True && n' /= 1
-                 then litStr (show n')
-                 else evalNumber NumberOrdinal Nothing (NumVal n')
-            form -> do
-              let termForMonth s = emptyTerm{ termName = T.pack s
-                                            , termForm = if form == DPShort
-                                                            then Short
-                                                            else Long }
-
-              case dpName dp of
-                DPMonth | n <= 0 -> return NullOutput
-                        | n <= 12 ->
-                  lookupTerm' $ termForMonth (printf "month-%02d" n)
-                        | n <= 16 -> -- season pseudo-month
-                  lookupTerm' $ termForMonth (printf "season-%02d" (n - 12))
-                        | n <= 20 -> -- season pseudo-month
-                  lookupTerm' $ termForMonth (printf "season-%02d" (n - 16))
-                        | otherwise -> -- season pseudo-month
-                  lookupTerm' $ termForMonth (printf "season-%02d" (n - 20))
-                _                 -> litStr (show n')
-
-
-bindDateParts :: DateParts -> (Maybe Int, Maybe Int, Maybe Int)
-bindDateParts date =
-      case date of
-        DateParts (y:m:d:_) -> (Just y,Just m,Just d)
-        DateParts [y,m]     -> (Just y,Just m,Nothing)
-        DateParts [y]       -> (Just y,Nothing,Nothing)
-        _                   -> (Nothing,Nothing,Nothing)
-
-eNames :: CiteprocOutput a
-        => [Variable]
-        -> NamesFormat
-        -> [Element a]
-        -> Formatting
-        -> Eval a (Output a)
-eNames vars namesFormat' subst formatting = do
-  substituteNamesForm <- asks contextSubstituteNamesForm
-  inSortKey <- asks contextInSortKey
-  let namesFormat =
-        case substituteNamesForm of
-          Nothing -> namesFormat'
-          Just subs ->
-            NamesFormat
-            { namesLabel           =
-                if inSortKey -- see test/csl/sort_DropNameLabelInSort.txt
-                   -- though this doesn't seem to be in the spec
-                   then Nothing
-                   else namesLabel namesFormat' <|> namesLabel subs
-            , namesEtAl            = namesEtAl namesFormat' <|>
-                                       namesEtAl subs
-            , namesName            = namesName namesFormat' <|>
-                                       namesName subs
-            , namesLabelBeforeName =
-                if isJust (namesName namesFormat') &&
-                   isJust (namesLabel namesFormat')
-                   then namesLabelBeforeName namesFormat'
-                   else namesLabelBeforeName subs
-            }
-
-  vars' <- if "editor" `elem` vars && "translator" `elem` vars
-              then do
-                ed <- askVariable "editor"
-                tr <- askVariable "translator"
-                let termform =
-                      case namesLabel namesFormat of
-                        Just (termform', _, _) -> termform'
-                        _ -> Long
-                mbterm <- lookupTerm'
-                            emptyTerm{ termName = "editortranslator"
-                                     , termForm = termform }
-                if ed == tr && mbterm /= NullOutput
-                   then return $ "editortranslator" :
-                        [v | v <- vars
-                           , v /= "editor"
-                           , v /= "translator"]
-                   else return vars
-              else return vars
-  inSubstitute <- asks contextInSubstitute
-  let (nameFormat, nameFormatting') =
-        fromMaybe (defaultNameFormat, mempty) (namesName namesFormat)
-  let nameFormatting = nameFormatting' <>
-                       formatting{ formatPrefix = Nothing
-                                 , formatSuffix = Nothing
-                                 , formatDelimiter = Nothing }
-  rawContribs <- mapM (\var -> (var,) <$>
-                       askVariable
-                       (if var == "editortranslator"
-                           then "editor"
-                           else var)) vars'
-  if all (isNothing . snd) rawContribs
-     then
-       case subst of
-         els@(_:_) | not inSubstitute -> do
-           res <- withRWST
-                  (\ctx st -> (ctx{ contextInSubstitute = True
-                                  , contextSubstituteNamesForm =
-                                      Just namesFormat },
-                               st)) $ eSubstitute els
-           return $
-             case res of
-               (Tagged TagNames{} _:_) -> formatted formatting res
-               -- important to have title (or whatever) tagged as
-               -- substituting for Names, for purposes of
-               -- disambiguation:
-               _ -> formatted formatting
-                    [Tagged (TagNames "" namesFormat []) $ grouped res]
-         _ -> return NullOutput
-     else do
-        xs <- mapM (formatNames namesFormat nameFormat nameFormatting)
-               rawContribs
-        deleteSubstitutedVariables [v | (v, Just _) <- rawContribs ]
-
-        return $
-          case nameForm nameFormat of
-             CountName -> Literal $ fromText $ T.pack $ show $ length
-               [name
-                 | Tagged (TagName name) _ <- concatMap universe xs]
-             _ -> formatted mempty{ formatPrefix = formatPrefix formatting
-                                  , formatSuffix = formatSuffix formatting
-                                  , formatDelimiter =
-                                    formatDelimiter formatting } xs
-
-eSubstitute :: CiteprocOutput a
-            => [Element a]
-            -> Eval a [Output a]
-eSubstitute els =
-  case els of
-    [] -> return []
-    (e:es) -> do
-      res <- eElement e
-      case filter (/= NullOutput) res of
-        [] -> eSubstitute es
-        xs -> return xs
-
-formatNames :: CiteprocOutput a
-            => NamesFormat
-            -> NameFormat
-            -> Formatting
-            -> (Variable, Maybe (Val a))
-            -> Eval a (Output a)
-formatNames namesFormat nameFormat formatting (var, Just (NamesVal names)) =
-  do
-  isSubsequent <- (Subsequent `elem`) <$> asks contextPosition
-  isInBibliography <- asks contextInBibliography
-  let (etAlMin, etAlUseFirst) =
-        if not isInBibliography && isSubsequent
-           then (nameEtAlSubsequentMin nameFormat <|> nameEtAlMin nameFormat,
-                 nameEtAlSubsequentUseFirst nameFormat <|>
-                    nameEtAlUseFirst nameFormat)
-           else (nameEtAlMin nameFormat, nameEtAlUseFirst nameFormat)
-  inSortKey <- asks contextInSortKey
-  disamb <- gets (referenceDisambiguation . stateReference)
-  names' <- zipWithM (formatName nameFormat formatting) [1..] names
-  let delim' = fromMaybe (nameDelimiter nameFormat) $
-                 formatDelimiter formatting
-  let delim = case (beginsWithSpace <$> formatSuffix formatting,
-                    endsWithSpace <$> formatPrefix formatting) of
-                    (Just True, Just True) -> T.strip delim'
-                    (Just True, _)         -> T.stripStart delim'
-                    (_, Just True)         -> T.stripEnd delim'
-                    _                      -> delim'
-  let numnames = length names'
-  label <- case namesLabel namesFormat of
-             Just (termform, pluralize, lf) | not inSortKey ->
-               (:[]) <$> eLabel var termform pluralize lf
-             _ -> return []
-  mbAndTerm <- case nameAndStyle nameFormat of
-                  Just Symbol -> do
-                    ts <- lookupTerm emptyTerm { termName = "and"
-                                               , termForm = Symbol }
-                    case ts of
-                      (_,x):_ -> return $ Just x
-                      []      -> return $ Just "&"
-                  Just _ -> fmap snd . listToMaybe <$>
-                              lookupTerm emptyTerm { termName = "and"
-                                                   , termForm = Long }
-                  Nothing -> return Nothing
-  let finalNameIsOthers = (lastMay names >>= nameLiteral) == Just "others"
-        -- bibtex conversions often have this, and we want to render it "et al"
-  let etAlUseLast = nameEtAlUseLast nameFormat
-  let etAlThreshold = case etAlMin of
-                        Just x | numnames >= x
-                          -> case (disamb >>= disambEtAlNames, etAlUseFirst) of
-                               (Just n, Just m) -> Just (max m n)
-                               (_, y) -> y
-                               | numnames < x
-                               , finalNameIsOthers -> Just (numnames - 1)
-                        _ -> Nothing
-  let beforeLastDelim =
-        case mbAndTerm of
-          Nothing -> delim
-          Just _ ->
-             case nameDelimiterPrecedesLast nameFormat of
-                PrecedesContextual
-                  | numnames > 2          -> delim
-                  | otherwise             -> ""
-                PrecedesAfterInvertedName
-                  -> case nameAsSortOrder nameFormat of
-                       Just NameAsSortOrderAll -> delim
-                       Just NameAsSortOrderFirst
-                         | numnames < 3        -> delim
-                       _                       -> ""
-                PrecedesAlways            -> delim
-                PrecedesNever             -> ""
-  let andPreSpace = case beforeLastDelim of
-        "" -> case formatSuffix formatting of
-                Just t | endsWithSpace t -> ""
-                _ -> " "
-        t | endsWithSpace t -> ""
-        _  -> " "
-  let andPostSpace = case formatPrefix formatting of
-                       Just t | beginsWithSpace t -> ""
-                       _ -> " "
-  let mbAndDelim = case mbAndTerm of
-                         Nothing -> Nothing
-                         Just t  -> Just (andPreSpace <> t <> andPostSpace)
-  let etAlPreSpace = case formatSuffix formatting of
-                       Just t | endsWithSpace t -> ""
-                       _ -> " "
-  let beforeEtAl =
-        case nameDelimiterPrecedesEtAl nameFormat of
-            PrecedesContextual
-              | numnames > 2
-              , etAlThreshold > Just 1 -> delim
-              | otherwise              -> etAlPreSpace
-            PrecedesAfterInvertedName
-                  -> case nameAsSortOrder nameFormat of
-                       Just NameAsSortOrderAll  -> delim
-                       Just NameAsSortOrderFirst
-                         | etAlThreshold < Just 2 -> delim
-                       _                          -> etAlPreSpace
-            PrecedesAlways            -> delim
-            PrecedesNever             -> etAlPreSpace
-  etAl <- case namesEtAl namesFormat of
-                Just (term, f) -> withFormatting f{
-                    formatPrefix = removeDoubleSpaces <$>
-                      Just beforeEtAl <> formatPrefix f } $
-                 lookupTerm' emptyTerm{ termName = term }
-                Nothing
-                  | etAlUseLast && not finalNameIsOthers ->
-                    return $
-                      Formatted mempty{ formatPrefix = Just beforeEtAl }
-                        [literal "\x2026 "] -- ellipses
-                  | otherwise   ->
-                      Formatted mempty{ formatPrefix = Just beforeEtAl }
-                      . (:[]) <$> lookupTerm' emptyTerm{ termName = "et-al" }
-  let addNameAndDelim name idx
-       | etAlThreshold == Just 0 = NullOutput
-       | idx == 1    = name
-       | maybe False (idx - 1 ==) etAlThreshold =
-         if inSortKey
-            then NullOutput
-            else etAl
-       | idx == numnames
-       , etAlUseLast
-       , maybe False (idx - 1 >=) etAlThreshold
-         = name
-       | maybe False (idx - 1 >) etAlThreshold = NullOutput
-       | inSortKey = name
-       | idx == numnames
-         = formatted mempty{ formatPrefix =
-                       Just (beforeLastDelim <> fromMaybe "" mbAndDelim) }
-            [name]
-       | otherwise = formatted mempty{ formatPrefix = Just delim } [name]
-  let names'' = zipWith addNameAndDelim names' [1..]
-  -- we set delimiter to Nothing because we're handling delim
-  -- manually, to allow for things like "and" and no final comma
-  return $ Tagged (TagNames var namesFormat names)
-         $ grouped $
-           if namesLabelBeforeName namesFormat
-              then label ++ names''
-              else names'' ++ label
-
-formatNames _ _ _ (var, Just x) = do
-  when (x /= SubstitutedVal) $
-    warn $ "ignoring non-name value for variable " <> fromVariable var
-  return NullOutput
-formatNames _ _ _ (_, Nothing) = return NullOutput
-
-formatName :: CiteprocOutput a
-           => NameFormat -> Formatting -> Int -> Name -> Eval a (Output a)
-formatName nameFormat formatting order name = do
-  disamb <- gets (referenceDisambiguation . stateReference)
-  let nameFormat' =
-        case M.lookup name . disambNameMap =<< disamb of
-          Nothing -> nameFormat
-          Just AddInitials
-            -> nameFormat{ nameForm = LongName }
-          Just AddInitialsIfPrimary
-            | order == 1  -> nameFormat{ nameForm = LongName }
-            | otherwise -> nameFormat
-          Just AddGivenName ->
-            nameFormat{ nameForm = LongName
-                      , nameInitialize = False
-                      }
-          Just AddGivenNameIfPrimary
-            | order == 1 ->
-               nameFormat{ nameForm = LongName
-                         , nameInitialize = False
-                         }
-            | otherwise -> nameFormat
-  Tagged (TagName name) <$>
-    case nameLiteral name of
-      Just t  -> return $ formatted formatting
-                        $ maybe [literal t]
-                          (\f -> [Formatted f [literal t]])
-                          (nameFamilyFormatting nameFormat)
-      Nothing -> getDisplayName nameFormat' formatting order name
-
-
-getNamePartSortOrder :: Name -> Eval a [Text]
-getNamePartSortOrder name = do
-  demoteNonDroppingParticle <-
-    asks (styleDemoteNonDroppingParticle . contextStyleOptions)
-  map (fromMaybe mempty) <$>
-    case nameLiteral name of
-      Nothing
-        | isByzantineName name
-           -> return $
-                   case demoteNonDroppingParticle of
-                     DemoteNever ->
-                           [nameNonDroppingParticle name <> nameFamily name,
-                            nameDroppingParticle name,
-                            nameGiven name,
-                            nameSuffix name]
-                     _ ->  [nameFamily name,
-                            nameDroppingParticle name <>
-                              nameNonDroppingParticle name,
-                            nameGiven name,
-                            nameSuffix name]
-        | otherwise
-           -> return [nameFamily name,
-                      nameGiven name]
-      Just n -> return [Just n]
-
-literal :: CiteprocOutput a => Text -> Output a
-literal = Literal . fromText
-
-showYearSuffix :: Int -> Text
-showYearSuffix x
-  | x < 27    = T.singleton $ chr $ ord 'a' + (x - 1)
-  | otherwise =
-      let x' = x - 1
-       in T.pack [chr (ord 'a' - 1 + (x' `div` 26)),
-                  chr (ord 'a' + (x' `mod` 26))]
-
-initialize :: Maybe Lang
-           -> Bool       -- ^ initialize
-           -> Bool       -- ^ with hyphen
-           -> Text       -- ^ initialize with (suffix)
-           -> Text
-           -> Text
-initialize mblang makeInitials useHyphen initializeWith =
-   stripSpaces . T.replace " -" "-" . mconcat . map initializeWord . splitWords
-  where
-   stripSpaces = T.dropWhile (==' ') . T.dropWhileEnd (==' ') -- preserve nbsp
-   -- Left values are already initials
-   -- Right values are not
-   splitWords =
-     reverse . (\(ws,cs) ->
-                  case cs of
-                    [] -> ws
-                    [d] -> Left (T.singleton d) : ws
-                    _   -> Right (T.pack (reverse cs)) : ws) .
-     T.foldl'
-     (\(ws, cs) c ->
-       case c of
-         '.' | null cs   -> (ws, [])
-             | otherwise -> (Left (T.pack (reverse cs)) : ws, [])
-         '-' | null cs   -> (ws, ['-'])
-             | otherwise -> (Right (T.pack (reverse cs)) : ws, ['-'])
-         ' ' -> case cs of
-                  []  -> (ws, cs)
-                  [d] -> (Left (T.singleton d) : ws, [])
-                  _   -> (Right (T.pack (reverse cs)) : ws, [])
-         _   -> (ws, c:cs))
-     ([], mempty)
-   addSuffix t
-     | T.null t  = mempty
-     | otherwise = t <> initializeWith
-   toInitial t =
-       case T.uncons t of
-         Just ('-', t') ->
-           case T.uncons t' of
-             Just (c, _)
-               | isUpper c
-               , useHyphen -> "-" <> Unicode.toUpper mblang (T.singleton c)
-               | isUpper c -> Unicode.toUpper mblang (T.singleton c)
-             _ -> mempty  -- e.g. Ji-ping -> J. not J.-p.
-         Just (c, t')
-           | isUpper c ->
-             case T.uncons t' of
-               Just (d, t'')
-                 | isUpper d  -- see test/csl/name_LongAbbreviation.txt
-                 , not (T.null t'')
-                 , T.all isLower t''
-                 -> T.singleton c <> T.toLower (T.singleton d)
-               _ -> T.singleton c
-         _ -> t
-   initializeWord (Left t) -- Left values already initialized
-     = addSuffix t
-   initializeWord (Right t) -- Right values not already initialized
-     | T.all isLower t = if endsWithSpace initializeWith
-                            then t <> " "
-                            else " " <> t <> " "
-     | makeInitials    = (addSuffix . toInitial) t
-     | otherwise       = t <> " "
-
-getDisplayName :: CiteprocOutput a
-               => NameFormat -> Formatting -> Int -> Name -> Eval a (Output a)
-getDisplayName nameFormat formatting order name = do
-  inSortKey <- asks contextInSortKey
-  demoteNonDroppingParticle <-
-    asks (styleDemoteNonDroppingParticle . contextStyleOptions)
-  initializeWithHyphen <-
-    asks (styleInitializeWithHyphen . contextStyleOptions)
-  mblang <- asks (localeLanguage . contextLocale)
-  let initialize' =
-        case nameFamily name of
-          Nothing -> id
-          Just _ ->
-            case nameInitializeWith nameFormat of
-              Just initializeWith ->
-                initialize
-                mblang
-                (nameInitialize nameFormat)
-                initializeWithHyphen
-                initializeWith
-              Nothing -> id
-  let separator = nameSortSeparator nameFormat
-  let x <+> NullOutput = x
-      NullOutput <+> x = x
-      Literal x <+> y =
-        case T.unsnoc (toText x) of
-          Just (_, c) | c == '’' || c == '\'' || c == '-' || c == '\x2013' ||
-                        c == '\xa0' ->
-               formatted mempty [Literal x, y]
-          _ | isByzantineName name ->
-               formatted mempty{ formatDelimiter = Just " " } [Literal x, y]
-            | otherwise -> formatted mempty [Literal x, y]
-      Formatted f x <+> y =
-        formatted mempty{ formatDelimiter =
-                            case formatSuffix f of
-                              Just t | endsWithSpace t -> Nothing
-                              _ -> Just " " } [formatted f x, y]
-      Linked i x <+> y =
-        formatted mempty{ formatDelimiter = Just " " } [Linked i x, y]
-      Tagged _ x <+> y = x <+> y
-      InNote x <+> y = x <+> y
-  let x <:> NullOutput = x
-      NullOutput <:> x = x
-      Literal x <:> y =
-        formatted mempty{ formatDelimiter = Just separator } [Literal x, y]
-      Formatted f x <:> y = formatted
-        (mempty{ formatDelimiter = Just separator }) [Formatted f x, y]
-      Linked i x <:> y = formatted
-        (mempty{ formatDelimiter = Just separator }) [Linked i x, y]
-      Tagged _ x <:> y = x <:> y
-      InNote x <:> y = x <:> y
-
-  let familyAffixes = formatted
-          (case nameFamilyFormatting nameFormat of
-             Nothing -> mempty
-             Just f  -> mempty{ formatSuffix = formatSuffix f
-                              , formatPrefix = formatPrefix f })
-  let givenAffixes = formatted
-          (case nameGivenFormatting nameFormat of
-             Nothing -> mempty
-             Just f  -> mempty{ formatSuffix = formatSuffix f
-                              , formatPrefix = formatPrefix f })
-  let familyFormatting = formatted
-          (case nameFamilyFormatting nameFormat of
-             Nothing -> mempty
-             Just f  -> f{ formatSuffix = Nothing
-                         , formatPrefix = Nothing })
-  let givenFormatting = formatted
-          (case nameGivenFormatting nameFormat of
-             Nothing -> mempty
-             Just f  -> f{ formatSuffix = Nothing
-                         , formatPrefix = Nothing })
-  let nonDroppingParticle =
-        maybe NullOutput (familyFormatting . (:[]) . literal) $
-          nameNonDroppingParticle name
-  let droppingParticle =
-        maybe NullOutput (givenFormatting . (:[]) . literal) $
-          nameDroppingParticle name
-  let given =
-        maybe NullOutput (givenFormatting . (:[]) . literal . initialize') $
-          nameGiven name
-  let family =
-        maybe NullOutput (familyFormatting . (:[]) . literal) $
-          nameFamily name
-  let suffix = maybe NullOutput literal $ nameSuffix name
-  let nameAsSort = case nameAsSortOrder nameFormat of
-                          Just NameAsSortOrderAll -> True
-                          Just NameAsSortOrderFirst -> order == 1
-                          _ -> False
-  return $ formatted formatting . (:[]) $
-    if isByzantineName name
-       then
-         case nameForm nameFormat of
-              LongName
-                | demoteNonDroppingParticle == DemoteNever
-                , inSortKey || nameAsSort ->
-                      familyAffixes
-                      [ nonDroppingParticle <+>
-                        family ] <:>
-                      givenAffixes
-                      [ given <+>
-                        droppingParticle ] <:>
-                      suffix
-                | demoteNonDroppingParticle == DemoteSortOnly
-                , inSortKey ->
-                      familyAffixes
-                      [ family ] <:>
-                      givenAffixes
-                      [ given <+>
-                        droppingParticle <+>
-                        nonDroppingParticle ] <:>
-                      suffix
-                | demoteNonDroppingParticle == DemoteSortOnly
-                , nameAsSort ->
-                      familyAffixes
-                      [ nonDroppingParticle <+>
-                        family ] <:>
-                      givenAffixes
-                      [ given <+>
-                        droppingParticle ] <:>
-                      suffix
-                | demoteNonDroppingParticle == DemoteDisplayAndSort
-                , inSortKey || nameAsSort ->
-                      familyAffixes
-                      [ family ] <:>
-                      givenAffixes
-                      [ given <+>
-                        droppingParticle <+>
-                        nonDroppingParticle ] <:>
-                      suffix
-                | nameCommaSuffix name ->
-                      givenAffixes
-                      [ given ] <+>
-                      familyAffixes
-                      [ droppingParticle <+>
-                        nonDroppingParticle <+>
-                        family <:>
-                        suffix ]
-                | otherwise ->
-                      givenAffixes
-                      [ given ] <+>
-                      familyAffixes
-                      [ droppingParticle <+>
-                        nonDroppingParticle <+>
-                        family <+>
-                        suffix ]
-              ShortName ->
-                      familyAffixes
-                      [ nonDroppingParticle <+>
-                        family ]
-              CountName -> NullOutput
-       else
-         case nameForm nameFormat of
-              LongName  -> grouped
-                [ familyAffixes
-                  [ family ]
-                , givenAffixes
-                  [ given ] ]
-              ShortName -> familyAffixes
-                             [ family ]
-              CountName -> NullOutput
-
-
-eGroup :: CiteprocOutput a
-          => Bool -> Formatting -> [Element a] -> Eval a (Output a)
-eGroup isMacro formatting els = do
-  -- A group is suppressed if it directly or indirectly
-  -- calls at least one variable but all of the variables
-  -- it calls are empty.
-  VarCount oldVars oldNonempty <- gets stateVarCount
-  xs <- mconcat <$> mapM eElement els
-  VarCount newVars newNonempty <- gets stateVarCount
-  let isempty = newVars /= oldVars && newNonempty == oldNonempty
-
-  -- see
-  -- https://github.com/citation-style-language/documentation/blob/master/specification.rst#group
-  -- "When a cs:group contains a child cs:macro, if the cs:macro is
-  -- non-empty, it is treated as a non-empty variable for the purposes of
-  -- determining suppression of the outer cs:group."
-  when (isMacro && not isempty) $ updateVarCount 1 1
-  return $ if not isempty
-              then formatted formatting xs
-              else NullOutput
-
-eChoose :: CiteprocOutput a
-        => [(Match, [Condition], [Element a])] -> Eval a [Output a]
-eChoose [] = return []
-eChoose ((match, conditions, els):rest) = do
-  ref <- gets stateReference
-  label <- asks contextLabel
-  let disambiguate = maybe False
-                      disambCondition (referenceDisambiguation ref)
-  positions <- asks contextPosition
-  hasLocator <- isJust <$> asks contextLocator
-  let isNumeric t = all
-        (\chunk -> T.any isDigit chunk && not (T.any isSpace chunk)) $
-        T.split (\c -> c == ',' || c == '-' || c == '&')
-         (T.replace ", " "," . T.replace "& " "&" . T.replace ", " "," $ t)
-  let testCondition cond =
-        case cond of
-           HasVariable "locator" -> hasLocator
-           HasVariable t ->
-             case lookupVariable t ref of
-               Just x  -> isNonEmpty x
-               Nothing -> False
-           HasType t -> lookupVariable "type" ref == Just (TextVal t)
-           IsUncertainDate t -> case lookupVariable t ref of
-                                  Just (DateVal d) -> dateCirca d
-                                  _                -> False
-           IsNumeric t -> case lookupVariable t ref of
-                            Just (NumVal _)   -> True
-                            Just (TextVal x)  -> isNumeric x
-                            Just (FancyVal x) -> isNumeric (toText x)
-                            _                 -> False
-           HasLocatorType t -> case label of
-                                 Just "sub verbo" -> t == "sub-verbo"
-                                 Just x -> toVariable x == t
-                                 Nothing -> t == "page"
-           HasPosition pos -> pos `elem` positions
-           WouldDisambiguate -> disambiguate
-  let matched = (case match of
-                   MatchAll  -> all testCondition
-                   MatchAny  -> any testCondition
-                   MatchNone -> not . any testCondition) conditions
-  if matched
-     then mconcat <$> mapM eElement els
-     else eChoose rest
-
-
-eNumber :: CiteprocOutput a => Variable -> NumberForm -> Eval a (Output a)
-eNumber var nform = do
-  mbv <- askVariable var
-  varTerms <- lookupTerm emptyTerm { termName = fromVariable var }
-  let mbGender = case varTerms of
-                   [] -> Nothing
-                   ((t,_):_) -> termGender t
-  let nparts = case mbv of
-                 Just x@NumVal{}   -> [x]
-                 Just (FancyVal x) -> splitNums (toText x)
-                 Just (TextVal t)  -> splitNums t
-                 _                 -> []
-  grouped <$> mapM (evalNumber nform mbGender) nparts
-
-evalNumber :: CiteprocOutput a
-           => NumberForm -> Maybe TermGender -> Val a -> Eval a (Output a)
-evalNumber form mbGender (NumVal i) = do
-  let numterm s x = emptyTerm { termName = T.pack $ printf s x
-                              , termGenderForm = mbGender }
-  let dectext = T.pack (show i)
-  let twomatch = numterm "ordinal-%02d" (i `mod` 100)
-  let onematch = numterm "ordinal-%02d" (i `mod` 10)
-  let fallback = emptyTerm { termName = "ordinal" }
-  case form of
-    NumberNumeric -> return $ Literal $ fromText dectext
-    NumberOrdinal -> do
-      res <- (if i > 99
-                 then filter (\(t,_) -> termMatch t /= Just WholeNumber)
-                 else id) <$> lookupTerm twomatch
-      case res of
-        ((_,suff):_) ->
-          return $ Literal $ fromText (dectext <> suff)
-        [] -> do -- not an exact match
-          res' <- (if i > 10
-                      then filter (\(t,_) ->
-                             isNothing (termMatch t) ||
-                             termMatch t == Just LastDigit)
-                      else id) <$> lookupTerm onematch
-          case res' of
-            ((_,suff):_) ->
-              return $ Literal $ fromText (dectext <> suff)
-            [] -> do
-              res'' <- lookupTerm fallback
-              case res'' of
-                ((_,suff):_) ->
-                  return $ Literal $ fromText (dectext <> suff)
-                [] -> do
-                  warn $ "no ordinal suffix found for " <> dectext
-                  return $ Literal $ fromText (T.pack (show i))
-    NumberLongOrdinal
-      | i >= 1
-      , i <= 10 -> do
-        res <- lookupTerm (numterm "long-ordinal-%02d" i)
-        case res of
-          ((_,t):_) -> return $ Literal $ fromText t
-          []        -> evalNumber NumberOrdinal mbGender (NumVal i)
-      | otherwise -> evalNumber NumberOrdinal mbGender (NumVal i)
-    NumberRoman -> return $ Literal $ fromText $ toRomanNumeral i
-evalNumber _ _ (TextVal t) = return $ Literal $ fromText t
-evalNumber _ _ (FancyVal t) = return $ Literal t
-evalNumber _ _ _ = return NullOutput
-
-
-warn :: Text -> Eval a ()
-warn t = tell $ Set.singleton t
-
--- | Convert number < 4000 to lowercase roman numeral.
-toRomanNumeral :: Int -> Text
-toRomanNumeral x
-  | x >= 4000 || x < 0 = T.pack (show x)
-  | x >= 1000 = "m" <> toRomanNumeral (x - 1000)
-  | x >= 900  = "cm" <> toRomanNumeral (x - 900)
-  | x >= 500  = "d" <> toRomanNumeral (x - 500)
-  | x >= 400  = "cd" <> toRomanNumeral (x - 400)
-  | x >= 100  = "c" <> toRomanNumeral (x - 100)
-  | x >= 90   = "xc" <> toRomanNumeral (x - 90)
-  | x >= 50   = "l"  <> toRomanNumeral (x - 50)
-  | x >= 40   = "xl" <> toRomanNumeral (x - 40)
-  | x >= 10   = "x" <> toRomanNumeral (x - 10)
-  | x == 9    = "ix"
-  | x >= 5    = "v" <> toRomanNumeral (x - 5)
-  | x == 4    = "iv"
-  | x >= 1    = "i" <> toRomanNumeral (x - 1)
-  | x == 0    = ""
-  | otherwise = T.pack (show x)
-
--- Gets variable while updating var count.
-askVariable :: CiteprocOutput a => Variable -> Eval a (Maybe (Val a))
-askVariable "page-first" = do
-  res <- askVariable "page"
-  case res of
-    Just (TextVal t)  ->
-      return $ Just $ TextVal $ T.takeWhile (not . isSepPunct) t
-    Just (FancyVal x) ->
-      return $ Just $ TextVal $ T.takeWhile (not . isSepPunct) $ toText x
-    Just (NumVal n)   -> return $ Just $ NumVal n
-    _                 -> return Nothing
-askVariable v = do
-  ref <- gets stateReference
-  case lookupVariable v ref of
-    Just x | isNonEmpty x && x /= SubstitutedVal -> do
-      updateVarCount 1 1
-      return $ Just x
-    _ -> do
-      updateVarCount 1 0
-      return Nothing
-
-isNonEmpty :: CiteprocOutput a => Val a -> Bool
-isNonEmpty (TextVal t) = not (T.null t)
-isNonEmpty (FancyVal x) = x /= mempty
-isNonEmpty (NamesVal []) = False
-isNonEmpty (DateVal (Date [] _ Nothing Nothing)) = False
-isNonEmpty _       = True
-
-citationLabel :: Reference a -> Val a
-citationLabel ref = TextVal trigraph
- where
-  trigraph = namepart <> datepart
-  datepart = case M.lookup "issued" varmap of
-               Just (DateVal d) -> getYear d
-               _ -> ""
-  namepart = if "author" `elem` namevars
-                then getNames "author"
-                else case namevars of
-                       (n:_) -> getNames n
-                       _     -> "Xyz"
-  varmap = referenceVariables ref
-  vars = M.keys varmap
-  namevars = [v | v <- vars, variableType v == NameVariable]
-  getNames var = case M.lookup var varmap of
-                   Just (NamesVal ns) ->
-                     let x = case length ns of
-                               1  -> 4
-                               n | n >= 4 -> 1
-                                 | otherwise -> 2
-                     in mconcat $
-                        map (T.take x . fromMaybe "" .  nameFamily)
-                        (take 4 ns)
-                   _ -> ""
-  getYear d = case dateParts d of
-                (DateParts (x:_):_) ->
-                  T.pack (printf "%02d" $ x `mod` 100)
-                _ -> ""
-
-removeDoubleSpaces :: Text -> Text
-removeDoubleSpaces = T.replace "  " " "
-
-endsWithSpace :: Text -> Bool
-endsWithSpace t = not (T.null t) && isSpace (T.last t)
-
-beginsWithSpace :: Text -> Bool
-beginsWithSpace t = not (T.null t) && isSpace (T.head t)
+import Safe (atMay, headMay, headDef, lastMay, initSafe, tailSafe, maximumMay)
+import Data.Maybe
+import Control.Monad (foldM, foldM_, zipWithM, when, unless)
+import qualified Data.Map as M
+import qualified Data.Set as Set
+import Data.Coerce (coerce)
+import Data.List (find, intersperse, sortBy, sortOn, groupBy, foldl', transpose,
+                  partition, sort, (\\))
+import Data.Text (Text)
+import qualified Data.Text as T
+import Data.Char (isSpace, isDigit, isUpper, isLower, isLetter,
+                  ord, chr)
+import Text.Printf (printf)
+import Control.Applicative
+import Data.Generics.Uniplate.Operations (universe, transform)
+
+-- import Debug.Trace (trace)
+-- traceShowIdLabeled :: Show a => String -> a -> a
+-- traceShowIdLabeled label x =
+--   trace (label ++ ": " ++ show x) x
+-- import Text.Show.Pretty (ppShow)
+-- ppTrace :: Show a => a -> a
+-- ppTrace x = trace (ppShow x) x
+
+data Context a =
+  Context
+  { contextLocale              :: Locale
+  , contextCollate             :: [SortKeyValue] -> [SortKeyValue] -> Ordering
+  , contextAbbreviations       :: Maybe Abbreviations
+  , contextStyleOptions        :: StyleOptions
+  , contextMacros              :: M.Map Text [Element a]
+  , contextLocator             :: Maybe Text
+  , contextLabel               :: Maybe Text
+  , contextPosition            :: [Position]
+  , contextInSubstitute        :: Bool
+  , contextInSortKey           :: Bool
+  , contextInBibliography      :: Bool
+  , contextSubstituteNamesForm :: Maybe NamesFormat
+  , contextNameFormat          :: NameFormat
+  }
+
+-- used internally for group elements, which
+-- are skipped if (a) the group calls a variable
+-- but (b) all of the variables called are empty.
+data VarCount =
+  VarCount
+  { variablesAccessed :: Int
+  , variablesNonempty :: Int
+  } deriving (Show)
+
+data EvalState a =
+  EvalState
+  { stateVarCount       :: VarCount
+  , stateLastCitedMap   :: M.Map ItemId (Int, Maybe Int, Int,
+                                          Bool, Maybe Text, Maybe Text)
+                        -- (citegroup, noteNum, posInGroup,
+                        --      aloneInCitation, label, locator)
+  , stateNoteMap        :: M.Map Int (Set.Set ItemId) -- ids cited in note
+  , stateRefMap         :: ReferenceMap a
+  , stateReference      :: Reference a
+  , stateReferenceLang  :: Maybe Lang
+  , stateUsedYearSuffix :: Bool
+  , stateUsedIdentifier :: Bool
+  -- ^ tracks whether an identifier (DOI,PMCID,PMID,URL) has yet been used
+  , stateUsedTitle      :: Bool
+  -- ^ tracks whether the item title has yet been used
+  } deriving (Show)
+
+
+type Eval a = RWS (Context a) (Set.Set Text) (EvalState a)
+
+updateVarCount :: Int -> Int -> Eval a ()
+updateVarCount total' nonempty' =
+  modify $ \st ->
+    let VarCount{ variablesAccessed = total
+                , variablesNonempty = nonempty } = stateVarCount st
+     in st{ stateVarCount =
+              VarCount { variablesAccessed = total + total',
+                         variablesNonempty = nonempty + nonempty' } }
+
+evalStyle  :: CiteprocOutput a
+           => Style a          -- ^ Parsed CSL style.
+           -> Maybe Lang       -- ^ Override style default locale.
+           -> [Reference a]    -- ^ List of references (bibliographic data).
+           -> [Citation a]     -- ^ List of citations.
+           -> ([Output a], [(Text, Output a)], [Text])
+                       -- ^ (citations, (id, bibentry) pairs, warnings)
+evalStyle style mblang refs' citations =
+  (citationOs, bibliographyOs, Set.toList warnings)
+ where
+  (refs, refmap) = makeReferenceMap (refs' ++ extractItemData citations)
+  ((citationOs, bibliographyOs), warnings) =
+    evalRWS (evalCitationsAndBibliography style refs citations)
+      (initialContext style mblang)
+      (initialState refmap)
+
+initialContext :: Style a -> Maybe Lang -> Context a
+initialContext style mblang =
+  Context
+  { contextLocale              = mergeLocales mblang style
+  , contextCollate             = compSortKeyValues (Unicode.comp mblang)
+  , contextAbbreviations       = styleAbbreviations style
+  , contextStyleOptions        = styleOptions style
+  , contextMacros              = styleMacros style
+  , contextLocator             = Nothing
+  , contextLabel               = Nothing
+  , contextPosition            = []
+  , contextInSubstitute        = False
+  , contextInSortKey           = False
+  , contextInBibliography      = False
+  , contextSubstituteNamesForm = Nothing
+  , contextNameFormat          = styleNameFormat (styleOptions style)
+  }
+
+initialState :: ReferenceMap a -> EvalState a
+initialState refmap =
+  EvalState
+  { stateVarCount = VarCount 0 0
+  , stateLastCitedMap = mempty
+  , stateNoteMap = mempty
+  , stateRefMap = refmap
+  , stateReference = Reference mempty mempty Nothing mempty
+  , stateReferenceLang = Nothing
+  , stateUsedYearSuffix = False
+  , stateUsedIdentifier = False
+  , stateUsedTitle = False
+  }
+
+-- | The main processing pipeline.  The order of the phases matters:
+-- sort keys may depend on citation numbers, citation numbers depend
+-- on bibliography sorting, and the bibliography must be rendered
+-- after disambiguation so that it reflects added year suffixes.
+evalCitationsAndBibliography :: CiteprocOutput a
+                             => Style a
+                             -> [Reference a]
+                             -> [Citation a]
+                             -> Eval a ([Output a], [(Text, Output a)])
+evalCitationsAndBibliography style refs citations = do
+  let citeOrderIds = idsInCitationOrder refs citations
+  assignCitationNumbers citeOrderIds
+  (bibIds, bibSortKeyMap) <- sortBibliography style refs citeOrderIds
+  sortedCitations <- sortCitationItems style citations
+  cs <- disambiguateCitations style bibSortKeyMap sortedCitations
+  let cs' = map (finalizeCitation style) (collapseCitations style cs)
+  bs <- evalBibliography style bibIds
+  return (cs', bs)
+
+-- | Reference ids ordered by first citation; uncited references
+-- follow in their original order.
+idsInCitationOrder :: [Reference a] -> [Citation a] -> [ItemId]
+idsInCitationOrder refs citations =
+  sortOn (fromMaybe maxBound . (`M.lookup` firstCited)) (map referenceId refs)
+ where
+  firstCited = M.fromList $ reverse $ zip
+    (concatMap (map citationItemId . citationItems) citations)
+    [(1 :: Int)..]
+
+-- | Set citation-number (and citation-key, citation-label) on
+-- references, numbering them in the order given.
+assignCitationNumbers :: [ItemId] -> Eval a ()
+assignCitationNumbers sortedIds =
+  modify $ \st ->
+            st{ stateRefMap = ReferenceMap $ Data.List.foldl'
+                   (\m (citeId, num) ->
+                       M.adjust (\ref ->
+                         ref{ referenceVariables =
+                               M.insert "citation-number"
+                                  (NumVal num) .
+                               M.insert "citation-key"
+                                   (TextVal (unItemId citeId)) .
+                               M.alter (addIfMissing (citationLabel ref))
+                                  "citation-label"
+                               $ referenceVariables ref
+                            }) citeId m)
+                   (unReferenceMap (stateRefMap st))
+                   (zip sortedIds [1..]) }
+ where
+  addIfMissing x Nothing  = Just x
+  addIfMissing _ (Just x) = Just x
+
+-- | Sort the bibliography and renumber references to match.  Returns
+-- the sorted ids and the bibliography sort keys (which are also
+-- used in disambiguation).
+sortBibliography :: CiteprocOutput a
+                 => Style a
+                 -> [Reference a]
+                 -> [ItemId]  -- ^ ids in citation order
+                 -> Eval a ([ItemId], M.Map ItemId [SortKeyValue])
+sortBibliography style refs citeOrderIds =
+  case styleBibliography style of
+    Nothing -> return ([], mempty)
+    Just biblayout -> do
+      collate <- asks contextCollate
+      let refIds = map referenceId refs
+      bibSortKeyMap <- M.fromList
+                <$> mapM (\citeId ->
+                            (citeId,) <$> evalSortKeys biblayout citeId)
+                         refIds
+      let sortedIds =
+            if null (layoutSortKeys biblayout)
+               then citeOrderIds
+               else sortBy
+                 (\x y -> collate
+                            (fromMaybe [] $ M.lookup x bibSortKeyMap)
+                            (fromMaybe [] $ M.lookup y bibSortKeyMap))
+                      refIds
+      assignCitationNumbers $
+        case layoutSortKeys biblayout of
+          (SortKeyVariable Descending "citation-number":_)
+            -> reverse sortedIds
+          (SortKeyMacro Descending _ _:_)
+            -> reverse sortedIds
+          _ -> sortedIds
+      return (sortedIds, bibSortKeyMap)
+
+-- | Sort the items within each citation.
+-- We can't just sort all the citations, because
+-- this can make a hash out of prefixes and suffixes.
+-- See e.g. pandoc-citeproc issue #292.
+-- We need to first break into groups so that any item
+-- with a prefix or suffix is insulated from sorting.
+-- We sort the groups, then combine again.
+sortCitationItems :: CiteprocOutput a
+                  => Style a
+                  -> [Citation a]
+                  -> Eval a [Citation a]
+sortCitationItems style citations = do
+  collate <- asks contextCollate
+  let citeIds = Set.fromList $
+        concatMap (map citationItemId . citationItems) citations
+  sortKeyMap <-
+    foldM (\m citeId -> do
+              sk <- evalSortKeys (styleCitation style) citeId
+              return $ M.insert citeId sk m)
+           M.empty
+           citeIds
+  let canGroup i1 i2
+       =   isNothing (citationItemSuffix i1) &&
+           isNothing (citationItemPrefix i2) &&
+           isNothing (citationItemSuffix i2) &&
+           isNothing (citationItemPrefix i1)
+  let sortItems citation' =
+        citation'{ citationItems =
+                      concatMap
+                       (sortBy
+                         (\item1 item2 ->
+                           collate
+                            (fromMaybe [] $ M.lookup
+                               (citationItemId item1) sortKeyMap)
+                            (fromMaybe [] $ M.lookup
+                               (citationItemId item2) sortKeyMap)))
+                    $ groupBy canGroup
+                    $ citationItems citation' }
+  return $ map sortItems citations
+
+-- | Group and collapse items in rendered citations, if the
+-- style calls for it.
+collapseCitations :: CiteprocOutput a
+                  => Style a -> [Output a] -> [Output a]
+collapseCitations style =
+  case mbcgDelim of
+    Nothing -> id
+    Just citeGroupDelim -> map
+       (groupAndCollapseCitations citeGroupDelim
+        (layoutYearSuffixDelimiter layoutOpts)
+        (layoutAfterCollapseDelimiter layoutOpts)
+        (layoutCollapse layoutOpts))
+ where
+  layoutOpts = layoutOptions $ styleCitation style
+  mbcgDelim =
+    case styleCiteGroupDelimiter (styleOptions style) of
+      Just x -> Just x
+      Nothing
+        -- grouping is activated whenever there is
+        -- collapsing; this is the default
+        -- cite-group-delimiter
+        | isJust (layoutCollapse layoutOpts) -> Just ", "
+        | otherwise -> Nothing
+
+-- | Final adjustments to a rendered citation for author-only and
+-- suppress-author items.  These need to happen after disambiguation
+-- and collapsing.
+finalizeCitation :: CiteprocOutput a => Style a -> Output a -> Output a
+finalizeCitation style =
+  handleSuppressAuthors . handleAuthorOnly (styleIsNoteStyle (styleOptions style))
+
+handleSuppressAuthors :: CiteprocOutput a => Output a -> Output a
+handleSuppressAuthors = transform removeNamesIfSuppressAuthor
+ where
+  removeIfEqual x y
+    | x == y    = NullOutput
+    | otherwise = y
+  removeNamesIfSuppressAuthor (Tagged (TagItem SuppressAuthor cid') x)
+    = let y = getAuthors x
+       in Tagged (TagItem SuppressAuthor cid')
+            (transform (removeIfEqual y) x)
+  removeNamesIfSuppressAuthor x = x
+
+-- | If we have an author-only citation at the beginning,
+-- separate it out.  In note styles, the rest of the citation
+-- goes in a note.
+handleAuthorOnly :: CiteprocOutput a => Bool -> Output a -> Output a
+handleAuthorOnly isNoteCitation formattedCit =
+  case formattedCit of
+    Formatted f
+      (x@(Tagged (TagItem AuthorOnly _) _):xs)
+        | isNoteCitation
+          -> formatted mempty
+              (x : [InNote (formatted f xs) | not (null xs)])
+        | otherwise
+          -> formatted mempty
+              (x :
+               if null xs
+                  then []
+                  else [Literal (fromText " "),
+                        formatted f xs])
+    Formatted f
+      (Formatted f'
+        (x@(Tagged (TagItem AuthorOnly _) _):xs) : ys)
+        | isNoteCitation
+          -> formatted mempty
+              (x :
+               if null xs && null ys
+                  then []
+                  else [InNote (formatted f
+                                 (formatted f' xs : ys))])
+        | otherwise
+          -> Formatted mempty
+              (x :
+               if null xs && null ys
+                  then []
+                  else [Literal (fromText " "),
+                        formatted f (formatted f' xs : ys)])
+    _ | isNoteCitation -> InNote formattedCit
+      | otherwise      -> formattedCit
+
+-- | Render bibliography entries, in the order given, paired with
+-- their ids.
+evalBibliography :: CiteprocOutput a
+                 => Style a
+                 -> [ItemId]
+                 -> Eval a [(Text, Output a)]
+evalBibliography style bibIds =
+  case styleBibliography style of
+    Nothing -> return []
+    Just biblayout -> do
+      bs <- local (\context -> context{ contextInBibliography = True }) $
+              mapM (evalLayout biblayout) (zip [1..] (map bibCitation bibIds))
+      bs' <- case styleSubsequentAuthorSubstitute (styleOptions style) of
+               Nothing -> return bs
+               Just subs -> subsequentAuthorSubstitutes subs bs
+      return $ zip (map unItemId bibIds) bs'
+ where
+  bibCitation ident =
+    Citation (Just $ unItemId ident) False Nothing Nothing Nothing
+      [CitationItem ident Nothing Nothing NormalCite Nothing Nothing Nothing]
+
+extractItemData :: [Citation a] -> [Reference a]
+extractItemData = concatMap (mapMaybe citationItemData . citationItems)
+
+subsequentAuthorSubstitutes :: CiteprocOutput a
+                            => SubsequentAuthorSubstitute
+                            -> [Output a]
+                            -> Eval a [Output a]
+subsequentAuthorSubstitutes (SubsequentAuthorSubstitute t rule) =
+  return . groupCitesByNames
+ where
+  groupCitesByNames [] = []
+  groupCitesByNames (x:xs) =
+    let xnames = fromMaybe ([],NullOutput) $ getNames x
+        samenames = replaceMatch rule (fromText t) xnames xs
+        rest = drop (length samenames) xs
+    in  (x : samenames) ++ groupCitesByNames rest
+  getNames (Formatted _ (x:_)) =
+    case [(ns,r) | (Tagged (TagNames _ _ ns) r) <- universe x] of
+      ((ns,r) : _) -> Just (ns,r)
+      []           -> Nothing
+  getNames _ = Nothing
+
+replaceMatch :: CiteprocOutput a
+             => SubsequentAuthorSubstituteRule
+             -> a
+             -> ([Name], Output a)
+             -> [Output a]
+             -> [Output a]
+replaceMatch _ _ _ [] = []
+replaceMatch rule replacement (names, raw) (z:zs) =
+  case go z of
+    Nothing -> []
+    Just z' -> z' : replaceMatch rule replacement (names, raw) zs
+ where
+  go (Tagged t@TagItem{} y) =
+    Tagged t <$> go y
+  go (Formatted f (y:ys)) =
+    Formatted f . (: ys) <$> go y
+  go y@(Tagged (TagNames _ _ ns) r) =
+    case (if null names then CompleteAll else rule) of
+        CompleteAll ->
+          -- Compare names as rendered, not name data: name lists that
+          -- differ in data can render identically (e.g. names
+          -- truncated by et-al, or a one-part family name vs. the
+          -- same name as a literal), and the substitution exists to
+          -- avoid exactly this kind of visible repetition.
+          if sameRenderedNames r
+             then Just $ replaceAll y
+             else Nothing
+        CompleteEach ->
+          if ns == names
+             then Just $ transform replaceEach y
+             else Nothing
+        PartialEach ->
+          case numberOfMatches ns names of
+            num | num >= 1 -> Just $ transform (replaceFirst num) y
+            _ -> Nothing
+        PartialFirst ->
+          case numberOfMatches ns names of
+            num | num >= (1 :: Int) -> Just $ transform (replaceFirst 1) y
+            _ -> Nothing
+  go _ = Nothing
+  -- The rendered text of the individual names, in order (ignoring
+  -- the label and the "et al" marker).
+  renderedNames x = [outputToText o | Tagged (TagName _) o <- universe x]
+  sameRenderedNames r =
+    case (renderedNames raw, renderedNames r) of
+      -- no names rendered on either side (e.g. a substituted title):
+      -- compare the whole rendered output
+      ([], []) -> outputToText r == outputToText raw
+      (xs, ys) -> xs == ys
+  replaceAll (Tagged (TagNames t' nf ns') x)
+     = Tagged (TagNames t' nf ns') $
+       -- removeName will leave label "ed."
+       -- which we want, but it will also leave the substituted
+       -- title when there is no name, which we do not want.
+       -- So, if ns' is null, then we just remove everything.
+       if null ns'
+          then Literal replacement
+          else
+            case transform removeName x of
+              Formatted f' xs -> Formatted f' (Literal replacement : xs)
+              _               -> Literal replacement
+  replaceAll x = x
+  removeName (Tagged (TagName _) _) = NullOutput
+  removeName (Tagged (TagTerm _) _) = NullOutput -- the "et al" marker
+  removeName x = x
+  replaceEach (Tagged (TagName n) _)
+    | n `elem` names
+     = Tagged (TagName n) (Literal replacement)
+  replaceEach x = x
+  replaceFirst num x@(Tagged (TagNames _ _ ns') _)
+    = foldr (transform . replaceName) x $ take num ns'
+  replaceFirst _num x = x
+  replaceName name (Tagged (TagName n) _)
+    | n == name = Tagged (TagName n) (Literal replacement)
+  replaceName _ x = x
+  numberOfMatches (a:as) (b:bs)
+    | a == b    = 1 + numberOfMatches as bs
+    | otherwise = 0
+  numberOfMatches _ _ = 0
+
+--
+-- Disambiguation
+--
+
+data DisambData =
+  DisambData
+  { ddItem       :: ItemId
+  , ddNames      :: [Name]
+  , ddDates      :: [Date]
+  , ddRendered   :: Text
+  } deriving (Eq, Ord, Show)
+
+-- | Position-tracking state ('stateLastCitedMap', 'stateNoteMap') in
+-- effect just before a citation is rendered.
+type PositionState =
+  ( M.Map ItemId (Int, Maybe Int, Int, Bool, Maybe Text, Maybe Text)
+  , M.Map Int (Set.Set ItemId) )
+
+-- | A rendered citation, together with the position-tracking state in
+-- effect just before it was rendered (which allows re-rendering it in
+-- isolation) and the disambiguation-relevant data extracted from the
+-- rendering (lazily, so it is only computed when needed).
+data RenderedCitation a =
+  RenderedCitation
+  { rcPositionState :: PositionState
+  , rcOutput        :: Output a
+  , rcDisambData    :: [DisambData]
+  }
+
+disambiguateCitations :: forall a . CiteprocOutput a
+                      => Style a
+                      -> M.Map ItemId [SortKeyValue]
+                      -> [Citation a]
+                      -> Eval a [Output a]
+disambiguateCitations style bibSortKeyMap citations = do
+  refs <- unReferenceMap <$> gets stateRefMap
+  let refIds = M.keys refs
+  -- we add "ghost" citations for EVERY reference in the database,
+  -- even those we have already cited, to handle cases like #116.
+  -- Each ghost is a separate citation so that it can be re-rendered
+  -- individually when its reference's disambiguation data changes.
+  let ghostCitations =
+        [ Citation Nothing False Nothing Nothing Nothing [basicItem ident]
+        | ident <- refIds ]
+
+  -- for purposes of disambiguation, we remove prefixes and
+  -- suffixes and locators, and we convert author-in-text to normal citation.
+  let removeAffix item = item{ citationItemLabel = Nothing
+                             , citationItemLocator = Nothing
+                             , citationItemPrefix = Nothing
+                             , citationItemSuffix = Nothing }
+  let cleanCitation (Citation a b c d e (i1:i2:is))
+       | citationItemType i1 == AuthorOnly
+       , citationItemType i2 == SuppressAuthor
+        = Citation a b c d e
+            (map removeAffix (i2{ citationItemType = NormalCite }:is))
+      cleanCitation (Citation a b c d e is)
+        = Citation a b c d e (map removeAffix is)
+
+  -- note that citations must go first, and order must be preserved:
+  -- we use a "basic item" that strips off prefixes, suffixes, locators
+  let citations' = map cleanCitation citations ++ ghostCitations
+  allCites <- renderAll citations'
+
+  mblang <- asks (localeLanguage . contextLocale)
+  styleOpts <- asks contextStyleOptions
+  let strategy = styleDisambiguation styleOpts
+  let allNameGroups = [ns | Tagged (TagNames _ _ ns) _ <-
+                              concatMap (universe . rcOutput) allCites]
+  let allNames = nubOrd $ concat allNameGroups
+  let primaryNames = nubOrd $ concatMap (take 1) allNameGroups
+  allCites' <-
+    case disambiguateAddGivenNames strategy of
+         Nothing     -> return allCites
+         Just ByCite -> return allCites -- do this later
+         Just rule   -> do -- disambiguate names, not just citations
+           let relevantNames =
+                 case rule of
+                   PrimaryNameWithInitials -> primaryNames
+                   PrimaryName -> primaryNames
+                   _ -> allNames
+           -- The short form of a name includes the non-dropping
+           -- particle, so e.g. "dos Santos" and "Santos" are not
+           -- ambiguous with each other.  See
+           -- disambiguate_PrimaryNameWithNonDroppingParticle.txt.
+           let shortName v = (nameNonDroppingParticle v, nameFamily v)
+           let familyNames = nubOrd [shortName v | v <- relevantNames
+                                                 , isJust (nameFamily v)]
+           let grps = map (\name ->
+                             [v | v <- relevantNames
+                                , shortName v == name])
+                          familyNames
+           let toHint names name =
+                  if any (initialsMatch mblang name) (filter (/= name) names)
+                     then
+                       case rule of
+                         AllNamesWithInitials    -> Nothing
+                         PrimaryNameWithInitials -> Nothing
+                         PrimaryName             -> Just AddGivenNameIfPrimary
+                         _                       -> Just AddGivenName
+                     else
+                       case rule of
+                         PrimaryNameWithInitials -> Just AddInitialsIfPrimary
+                         PrimaryName             -> Just AddInitialsIfPrimary
+                         _                       -> Just AddInitials
+           let namesMap = mconcat $ map
+                  (\names -> if length names > 1
+                                 then foldr
+                                    (\name ->
+                                        case toHint names name of
+                                          Just x -> M.insert name x
+                                          Nothing -> id)
+                                    mempty
+                                    names
+                                 else mempty) grps
+           -- use this same names map for every citation
+           modify $ \st ->
+              st{ stateRefMap = ReferenceMap $
+                   foldr
+                     (M.adjust (alterReferenceDisambiguation
+                       (\d -> d{ disambNameMap = namesMap })))
+                     (unReferenceMap $ stateRefMap st)
+                     refIds }
+           -- redo citations
+           renderAll citations'
+
+  disambStates <- getDisambStates
+  case groupAmbiguities (concatMap rcDisambData allCites') of
+    []          -> return ()
+    ambiguities -> analyzeAmbiguities mblang strategy citations' allCites'
+                      disambStates ambiguities
+  renderCitations citations
+
+ where
+
+  renderCitations :: [Citation a] -> Eval a [Output a]
+  renderCitations cs = map rcOutput <$> renderAll cs
+
+  renderedCitation :: PositionState -> Output a -> RenderedCitation a
+  renderedCitation posState result =
+    RenderedCitation posState result
+      (map toDisambData (extractTagItems [result]))
+
+  -- Render citations, capturing for each one the position-tracking
+  -- state in effect just before it is rendered.  This state depends
+  -- only on the citation structure, which never changes during
+  -- disambiguation, so a captured snapshot allows the citation to be
+  -- re-rendered individually in a later pass (see refreshCitations).
+  renderAll :: [Citation a] -> Eval a [RenderedCitation a]
+  renderAll cs =
+    withRWST (\ctx st -> (ctx,
+                          st { stateLastCitedMap = mempty
+                             , stateNoteMap = mempty })) $
+     mapM (\(num, citation) -> do
+             posState <- gets $ \st -> (stateLastCitedMap st,
+                                        stateNoteMap st)
+             result <- evalLayout (styleCitation style) (num, citation)
+             return $ renderedCitation posState result)
+          (zip [1..] cs)
+
+  -- referenceDisambiguation for each reference; a change in these is
+  -- the only thing that can alter how a citation is rendered from one
+  -- disambiguation pass to the next.
+  getDisambStates :: Eval a (M.Map ItemId (Maybe DisambiguationData))
+  getDisambStates =
+    gets (M.map referenceDisambiguation . unReferenceMap . stateRefMap)
+
+  -- Re-render only the citations containing an item whose
+  -- disambiguation data changed since the last rendering (whose
+  -- disambiguation states are given by prevDisambs); for the rest,
+  -- reuse the cached rendering.
+  refreshCitations :: [Citation a]
+                   -> [RenderedCitation a]
+                   -> M.Map ItemId (Maybe DisambiguationData)
+                   -> Eval a ([RenderedCitation a],
+                              M.Map ItemId (Maybe DisambiguationData))
+  refreshCitations cs rendered prevDisambs = do
+    newDisambs <- getDisambStates
+    let changed = M.keysSet $
+          M.differenceWith
+            (\new old -> if new == old then Nothing else Just new)
+            newDisambs prevDisambs
+    let isAffected = any ((`Set.member` changed) . citationItemId)
+                      . citationItems
+    let rerender (num, citation, cached)
+          | isAffected citation = do
+              let posState@(lastCited, noteMap) = rcPositionState cached
+              result <- withRWST
+                (\ctx st -> (ctx, st{ stateLastCitedMap = lastCited
+                                    , stateNoteMap = noteMap })) $
+                evalLayout (styleCitation style) (num, citation)
+              return $ renderedCitation posState result
+          | otherwise = return cached
+    rendered' <- mapM rerender (zip3 [1..] cs rendered)
+    return (rendered', newDisambs)
+
+  refreshAmbiguities :: [Citation a]
+                     -> [RenderedCitation a]
+                     -> M.Map ItemId (Maybe DisambiguationData)
+                     -> Eval a ([[DisambData]],
+                                [RenderedCitation a],
+                                M.Map ItemId (Maybe DisambiguationData))
+  refreshAmbiguities cs rendered prevDisambs = do
+    (rendered', disambs') <- refreshCitations cs rendered prevDisambs
+    return (groupAmbiguities (concatMap rcDisambData rendered'),
+            rendered', disambs')
+
+  analyzeAmbiguities :: Maybe Lang
+                     -> DisambiguationStrategy
+                     -> [Citation a]
+                     -> [RenderedCitation a]
+                     -> M.Map ItemId (Maybe DisambiguationData)
+                     -> [[DisambData]]
+                     -> Eval a ()
+  analyzeAmbiguities mblang strategy cs rendered0 disambs0 ambiguities = do
+    -- add names to et al.
+    (as1, rendered1, disambs1) <-
+      if not (null ambiguities) && disambiguateAddNames strategy
+         then do
+           mapM_ (tryAddNames mblang (disambiguateAddGivenNames strategy))
+                 ambiguities
+           refreshAmbiguities cs rendered0 disambs0
+         else return (ambiguities, rendered0, disambs0)
+    (as2, rendered2, disambs2) <-
+      case disambiguateAddGivenNames strategy of
+        Just ByCite | not (null as1) -> do
+          mapM_ (tryAddGivenNames mblang) as1
+          refreshAmbiguities cs rendered1 disambs1
+        _ -> return (as1, rendered1, disambs1)
+    (as3, _, _) <-
+      if not (null as2) && disambiguateAddYearSuffix strategy
+         then do
+           addYearSuffixes bibSortKeyMap as2
+           refreshAmbiguities cs rendered2 disambs2
+         else return (as2, rendered2, disambs2)
+    mapM_ tryDisambiguateCondition as3
+
+basicItem :: ItemId -> CitationItem a
+basicItem iid = CitationItem
+  { citationItemId      = iid
+  , citationItemLabel   = Nothing
+  , citationItemLocator = Nothing
+  , citationItemType    = NormalCite
+  , citationItemPrefix  = Nothing
+  , citationItemSuffix  = Nothing
+  , citationItemData    = Nothing
+  }
+
+isDisambiguated :: Maybe Lang
+                -> Maybe GivenNameDisambiguationRule
+                -> Int -- et al min
+                -> [DisambData]
+                -> DisambData
+                -> Bool
+isDisambiguated mblang mbrule etAlMin xs x =
+  all (\y -> x == y || disambiguatedName y /= disambiguatedName x) xs
+ where
+  disambiguatedName = nameParts . take etAlMin . ddNames
+  nameParts =
+    case mbrule of
+      Just AllNames -> id
+      Just AllNamesWithInitials ->
+           map (\name -> name{ nameGiven = initialize mblang True False ""
+                                            <$> nameGiven name })
+      Just PrimaryName ->
+        \case
+          [] -> []
+          (z:zs) -> z : map (\name -> name{ nameGiven = Nothing }) zs
+      Just PrimaryNameWithInitials ->
+        \case
+          [] -> []
+          (z:zs) -> z{ nameGiven =
+                     initialize mblang True False "" <$> nameGiven z } :
+                     map (\name -> name{ nameGiven = Nothing }) zs
+      Just ByCite -> id -- hints will be added later
+      _ -> map (\name -> name{ nameGiven = Nothing })
+
+tryAddNames :: Maybe Lang
+            -> Maybe GivenNameDisambiguationRule
+            -> [DisambData]
+            -> Eval a ()
+tryAddNames mblang mbrule bs =
+                     (case mbrule of
+                          Just ByCite -> bs <$ tryAddGivenNames mblang bs
+                          _ -> return bs) >>= go 1
+                        -- if ByCite, we want to make sure that
+                        -- tryAddGivenNames is still applied, as
+                        -- calculation of "add names" assumes this.
+ where
+   maxnames = fromMaybe 0 . maximumMay . map (length . ddNames)
+   go n as
+     | n > maxnames as = return ()
+     | otherwise = do
+         let ds = filter (isDisambiguated mblang mbrule n as) as
+         if null ds
+            then go (n + 1) as
+            else do
+              modify $ \st ->
+                st{ stateRefMap = ReferenceMap
+                      $ foldr (setEtAlNames (Just n) . ddItem)
+                        (unReferenceMap $ stateRefMap st) as }
+              go (n + 1) (as \\ ds)
+
+tryAddGivenNames :: Maybe Lang
+                 -> [DisambData]
+                 -> Eval a ()
+tryAddGivenNames mblang as = do
+  let correspondingNames =
+         map (zip (map ddItem as)) $ transpose $ map ddNames as
+      go [] _ = return []
+      go (as' :: [DisambData]) (ns :: [(ItemId, Name)]) = do
+        hintedIds <- Set.fromList . catMaybes <$>
+                        mapM (addNameHint mblang (map snd ns)) ns
+        return $ filter (\x -> ddItem x `Set.notMember` hintedIds) as'
+  foldM_ go as correspondingNames
+
+addYearSuffixes :: M.Map ItemId [SortKeyValue]
+                -> [[DisambData]]
+                -> Eval a ()
+addYearSuffixes bibSortKeyMap' as = do
+  let allitems = concat as
+  collate <- asks contextCollate
+  let companions a =
+        sortBy
+        (\item1 item2 ->
+          collate
+            (fromMaybe [] $ M.lookup (ddItem item1) bibSortKeyMap')
+            (fromMaybe [] $ M.lookup (ddItem item2) bibSortKeyMap'))
+        (concat [ x | x <- as, a `elem` x ])
+  let groups = Set.map companions $ Set.fromList allitems
+  let addYearSuffix item suff =
+        modify $ \st ->
+          st{ stateRefMap = ReferenceMap
+               $ setYearSuffix suff item
+               $ unReferenceMap
+               $ stateRefMap st }
+  mapM_ (\xs -> zipWithM addYearSuffix (map ddItem xs) [1..]) groups
+
+tryDisambiguateCondition :: [DisambData] -> Eval a ()
+tryDisambiguateCondition as =
+  case as of
+    [] -> return ()
+    xs -> modify $ \st ->
+            st{ stateRefMap = ReferenceMap
+                $ foldr (setDisambCondition True . ddItem)
+                  (unReferenceMap (stateRefMap st))
+                  xs }
+
+alterReferenceDisambiguation :: (DisambiguationData -> DisambiguationData)
+                             -> Reference a
+                             -> Reference a
+alterReferenceDisambiguation f r =
+      r{ referenceDisambiguation = f <$>
+           case referenceDisambiguation r of
+             Nothing -> Just
+               DisambiguationData
+                 { disambYearSuffix  = Nothing
+                 , disambNameMap     = mempty
+                 , disambEtAlNames   = Nothing
+                 , disambCondition   = False
+               }
+             Just x  -> Just x }
+
+initialsMatch :: Maybe Lang -> Name -> Name -> Bool
+initialsMatch mblang x y =
+  case (nameGiven x, nameGiven y) of
+    (Just x', Just y') ->
+      initialize mblang True False "" x' ==
+        initialize mblang True False "" y'
+    _ -> False
+
+addNameHint :: Maybe Lang -> [Name] -> (ItemId, Name) -> Eval a (Maybe ItemId)
+addNameHint mblang names (item, name) = do
+  let familyMatches = [n | n <- names
+                         , n /= name
+                         , nameFamily n == nameFamily name
+                         , nameNonDroppingParticle n ==
+                           nameNonDroppingParticle name]
+  case familyMatches of
+    [] -> return Nothing
+    _  -> do
+      let hint = if any (initialsMatch mblang name) familyMatches
+                    then AddGivenName
+                    else AddInitials
+      modify $ \st ->
+        st{ stateRefMap = ReferenceMap
+            $ setNameHint hint name item
+            $ unReferenceMap (stateRefMap st) }
+      return $ Just item
+
+setNameHint :: NameHints -> Name -> ItemId
+            -> M.Map ItemId (Reference a) -> M.Map ItemId (Reference a)
+setNameHint hint name = M.adjust
+       (alterReferenceDisambiguation
+         (\d -> d{ disambNameMap =
+                     M.insert name hint
+                     (disambNameMap d) }))
+
+setEtAlNames :: Maybe Int -> ItemId
+             -> M.Map ItemId (Reference a) -> M.Map ItemId (Reference a)
+setEtAlNames x = M.adjust
+       (alterReferenceDisambiguation
+         (\d -> d{ disambEtAlNames = x }))
+
+setYearSuffix :: Int -> ItemId
+              -> M.Map ItemId (Reference a) -> M.Map ItemId (Reference a)
+setYearSuffix x = M.adjust
+       (alterReferenceDisambiguation
+         (\d -> d{ disambYearSuffix = Just x }))
+
+setDisambCondition :: Bool -> ItemId
+                   -> M.Map ItemId (Reference a) -> M.Map ItemId (Reference a)
+setDisambCondition x = M.adjust
+       (alterReferenceDisambiguation
+         (\d -> d{ disambCondition = x }))
+
+groupAmbiguities :: [DisambData] -> [[DisambData]]
+groupAmbiguities =
+        mapMaybe
+           (\zs ->
+               case zs of
+                 []     -> Nothing
+                 [_]    -> Nothing
+                 (z:_) ->
+                   case ddRendered z of
+                     "" -> Nothing
+                     _  -> case nubOrdOn ddItem zs of
+                             ys@(_:_:_) -> Just ys -- > 1 ambiguous entry
+                             _          -> Nothing)
+      . groupBy (\x y -> ddRendered x == ddRendered y)
+      . sortOn ddRendered
+
+extractTagItems :: [Output a] -> [(ItemId, Output a)]
+extractTagItems xs =
+  [(iid, x) | Tagged (TagItem NormalCite iid) x <- concatMap universe xs
+            , not (hasIbid x)]
+ where -- we don't want two "ibid" entries to be treated as ambiguous.
+  hasIbid x = not $ null [ trm | Tagged (TagTerm trm) _ <- universe x
+                               , termName trm == "ibid" ]
+
+
+toDisambData :: CiteprocOutput a => (ItemId, Output a) -> DisambData
+toDisambData (iid, x) =
+  let xs = universe x
+      ns' = getNames xs
+      ds' = getDates xs
+      t   = outputToText x
+   in DisambData { ddItem = iid
+                 , ddNames = ns'
+                 , ddDates = ds'
+                 , ddRendered = t }
+ where
+  getNames :: [Output a] -> [Name]
+  getNames (Tagged (TagNames _ _ ns) _ : xs)
+                  = ns ++ getNames xs
+  getNames (_ : xs)   = getNames xs
+  getNames []         = []
+
+  getDates :: [Output a] -> [Date]
+  getDates (Tagged (TagDate d) _ : xs)
+                  = d : getDates xs
+  getDates (_ : xs)   = getDates xs
+  getDates []         = []
+
+
+--
+-- Grouping and collapsing
+--
+
+-- | A rendered citation item, annotated with precomputed properties
+-- that grouping consults repeatedly (so that they are not recomputed
+-- once per pair of items): whether the item has a prefix or suffix,
+-- and the names (or date) used to determine whether two items can be
+-- grouped ('extractTagged').
+data GroupingItem a =
+  GroupingItem
+  { giOutput    :: Output a
+  , giHasPrefix :: Bool
+  , giHasSuffix :: Bool
+  , giTagged    :: Maybe (Output a)
+  , giLead      :: Text
+    -- ^ the text the item renders before its first date (prefix
+    -- excluded); without names it stands in the names' place
+  }
+
+groupAndCollapseCitations :: forall a . CiteprocOutput a
+                          => Text
+                          -> Maybe Text
+                          -> Maybe Text
+                          -> Maybe Collapsing
+                          -> Output a
+                          -> Output a
+groupAndCollapseCitations citeGroupDelim yearSuffixDelim afterCollapseDelim
+  collapsing (Formatted f xs) =
+   case collapsing of
+      Just CollapseCitationNumber ->
+        Formatted f{ formatDelimiter = Nothing } $
+            foldr collapseRange []
+                  (groupSuccessive isAdjacentCitationNumber xs)
+      Just collapseType ->
+          Formatted f{ formatDelimiter = Nothing } $
+            foldr (collapseGroup collapseType) [] groupedItems
+      Nothing ->
+          Formatted f $
+             map (Formatted mempty{ formatDelimiter = Just citeGroupDelim })
+                 groupedItems
+ where
+  -- To avoid traversing each rendered item once per PAIR of items,
+  -- we annotate every item up front with the data the grouping
+  -- functions consult repeatedly (see 'GroupingItem').
+  groupedItems :: [[Output a]]
+  groupedItems = map (map giOutput) $ groupWith $ map annotate xs
+
+  annotate :: Output a -> GroupingItem a
+  annotate x = GroupingItem
+    { giOutput    = x
+    , giHasPrefix = hasPrefix x
+    , giHasSuffix = hasSuffix x
+    , giTagged    = extractTagged x
+    , giLead      = leadingText x
+    }
+
+  --   Note that we cannot assume we've sorted by name,
+  --   so we can't just use Data.List.groupBy.  We also
+  --   take care not to move anything past a prefix or suffix.
+  groupWith :: [GroupingItem a] -> [[GroupingItem a]]
+  groupWith [] = []
+  groupWith (z:zs)
+   | giHasSuffix z = [z] : groupWith zs
+   | otherwise =  -- we allow a prefix on first item in collapsed group
+    case span hasNoPrefixOrSuffix zs of
+      ([],ys) -> [z] : groupWith ys
+      (ws,ys) ->
+        case partition (sameNames z) ws of
+          (matched, unmatched) ->
+            (z : matched) : groupWith (unmatched ++ ys)
+
+  hasNoPrefixOrSuffix :: GroupingItem a -> Bool
+  hasNoPrefixOrSuffix x = not (giHasPrefix x) && not (giHasSuffix x)
+
+  hasPrefix :: Output a -> Bool
+  hasPrefix x = not $ null [y | y@(Tagged TagPrefix _) <- universe x]
+
+  hasSuffix :: Output a -> Bool
+  hasSuffix x = not $ null [y | y@(Tagged TagSuffix _) <- universe x]
+
+  collapseRange :: [Output a] -> [Output a] -> [Output a]
+  collapseRange ys zs
+    | length ys >= 3
+    , Just yhead <- headMay ys
+    , Just ylast <- lastMay ys
+      = Formatted mempty{ formatDelimiter = Just $ T.singleton enDash }
+                  [yhead, ylast] :
+                  if null zs
+                     then []
+                     else maybe NullOutput literal afterCollapseDelim : zs
+  collapseRange ys zs =
+    Formatted mempty{ formatDelimiter = formatDelimiter f } ys :
+      if null zs
+         then []
+         else maybe NullOutput literal (formatDelimiter f) : zs
+
+  collapseGroup :: Collapsing -> [Output a] -> [Output a] -> [Output a]
+  collapseGroup _ [] zs = zs
+  collapseGroup collapseType (y:ys) zs =
+        -- After removing the names, a cite with no date renders empty
+        -- (e.g. a cite with no issued date under collapse="year");
+        -- drop it so we don't emit a stray delimiter.  See
+        -- collapse_AuthorCollapseNoDateSorted.txt.
+    let removeNamesFromCite u =
+          let u' = transform removeNames u
+           in if outputToText u' == mempty then Nothing else Just u'
+        ys' = y : mapMaybe removeNamesFromCite ys
+        ws = collapseYearSuffix collapseType ys'
+        noCollapse = ws == y:ys
+        noYearSuffixCollapse = ws == ys'
+        hasLocator u = not $ null [x | x@(Tagged TagLocator _) <- universe u]
+        anyHasLocator = any hasLocator ws
+        -- https://github.com/citation-style-language/test-suite/issues/36 :
+        flippedAfterCollapseDelim = collapseType == CollapseYear
+        addCGDelim u [] = [u]
+        addCGDelim u us =
+          Formatted mempty{ formatSuffix =
+                              if noCollapse || noYearSuffixCollapse &&
+                                 not (flippedAfterCollapseDelim &&
+                                      anyHasLocator)
+                                 then Just citeGroupDelim
+                                 else afterCollapseDelim <|>
+                                      formatDelimiter f } [u] : us
+     in Formatted mempty{ formatDelimiter = Nothing
+                        , formatSuffix =
+                            if null zs
+                               then Nothing
+                               else if noCollapse &&
+                                          not flippedAfterCollapseDelim
+                                       then formatDelimiter f
+                                       else afterCollapseDelim <|>
+                                            formatDelimiter f }
+                               (foldr addCGDelim [] ws) : zs
+  collapseRanges = map rangifyGroup . groupSuccessive isSuccessive
+  isSuccessive x y
+    = case ([c | Tagged (TagYearSuffix c) _ <- universe x],
+            [d | Tagged (TagYearSuffix d) _ <- universe y]) of
+        ([c],[d]) -> d == c + 1
+        _   -> False
+
+  rangifyGroup :: [Output a] -> Output a
+  rangifyGroup zs
+    | length zs >= 3
+    , Just zhead <- headMay zs
+    , Just zlast <- lastMay zs
+    = Formatted mempty{ formatDelimiter = Just (T.singleton enDash) }
+                [zhead, zlast]
+  rangifyGroup [z] = z
+  rangifyGroup zs = Formatted mempty{ formatDelimiter = yearSuffixDelim
+                                    } zs
+
+  yearSuffixGroup :: Bool -> [Output a] -> Output a
+  yearSuffixGroup _ [x] = x
+  yearSuffixGroup useRanges zs  =
+    Formatted mempty{ formatDelimiter = yearSuffixDelim }
+      $ if useRanges then collapseRanges zs else zs
+
+  collapseYearSuffix :: Collapsing -> [Output a] -> [Output a]
+  collapseYearSuffix CollapseYearSuffix zs =
+    reverse $ yearSuffixGroup False cur : items
+   where
+     (cur, items) = Data.List.foldl' (goYearSuffix False) ([], []) zs
+  collapseYearSuffix CollapseYearSuffixRanged zs =
+    reverse $ yearSuffixGroup True cur : items
+   where
+     (cur, items) = Data.List.foldl' (goYearSuffix True) ([], []) zs
+  collapseYearSuffix _ zs = zs
+
+  getDates :: Output a -> [Date]
+  getDates x = [d | Tagged (TagDate d) _ <- universe x]
+
+  getYears :: Output a -> [[Maybe Int]]
+  getYears x = [map (\case
+                        DateParts (y:_) -> Just y
+                        _               -> Nothing) (dateParts d)
+                | d <- getDates x
+                , isNothing (dateLiteral d)]
+
+  goYearSuffix :: Bool -> ([Output a], [Output a]) -> Output a
+               -> ([Output a], [Output a])
+  goYearSuffix useRanges (cur, items) item =
+    case cur of
+      []     -> ([item], items)
+      (z:zs)
+        | getYears z == getYears item
+          -> (z:zs ++ [transform removeYear item], items)
+        | otherwise -> ([item], yearSuffixGroup useRanges (z:zs) : items)
+
+  removeYear :: Output a -> Output a
+  removeYear (Tagged (TagDate d) x) =
+    Tagged (TagDate d) (extractYearSuffix x)
+  removeYear x = x
+
+  extractYearSuffix :: Output a -> Output a
+  extractYearSuffix x =
+    case [z | z@(Tagged (TagYearSuffix _) _) <- universe x] of
+      (y:_) -> y
+      _     -> NullOutput
+
+  isAdjacentCitationNumber :: Output a -> Output a -> Bool
+  isAdjacentCitationNumber
+     (Tagged (TagItem _ _)
+       (Formatted _f1 [Tagged (TagCitationNumber n1) _xs1]))
+     (Tagged (TagItem _ _)
+       (Formatted _f2 [Tagged (TagCitationNumber n2) _xs2]))
+    = n2 == n1 + 1
+  isAdjacentCitationNumber
+     (Tagged (TagItem _ _) (Tagged (TagCitationNumber n1) _xs1))
+     (Tagged (TagItem _ _) (Tagged (TagCitationNumber n2) _xs2))
+    = n2 == n1 + 1
+  isAdjacentCitationNumber _ _ = False
+
+  sameNames :: GroupingItem a -> GroupingItem a -> Bool
+  sameNames x y =
+    case (giTagged x, giTagged y) of
+      (Just (Tagged (TagNames t1 _nf1 ns1) ws1),
+       Just (Tagged (TagNames t2 _nf2 ns2) ws2))
+        -> t1 == t2 && (if ns1 == ns2
+                           then not (null ns1) || ws1 == ws2
+                           else ws1 == ws2)
+      -- case where it's just a date with no name or anything;
+      -- we treat this as same name e.g. (1955a,b), but only when
+      -- whatever precedes the dates (e.g. a title standing in for
+      -- the author) is the same
+      (Just (Tagged TagDate{} _), Just (Tagged TagDate{} _))
+        -> giLead x == giLead y
+          -- case where title is substituted
+      _ -> False
+
+  -- the text an item renders before its first date, prefix excluded
+  leadingText :: Output a -> Text
+  leadingText = T.unwords . fst . leading
+   where
+    leading :: Output a -> ([Text], Bool)
+    leading (Tagged TagDate{} _) = ([], True)
+    leading (Tagged TagPrefix _) = ([], False)
+    leading (Tagged _ y)         = leading y
+    leading (Formatted _ ys)     = leadingList ys
+    leading (Linked _ ys)        = leadingList ys
+    leading (InNote y)           = leading y
+    leading (Literal t)          = ([toText t], False)
+    leading NullOutput           = ([], False)
+    leadingList [] = ([], False)
+    leadingList (y:ys) =
+      case leading y of
+        (ts, True)  -> (ts, True)
+        (ts, False) -> let (us, d) = leadingList ys in (ts ++ us, d)
+
+  extractTagged :: Output a -> Maybe (Output a)
+  extractTagged x =
+    let items = [y | y@(Tagged (TagItem ty _) _) <- universe x
+                   , ty /= AuthorOnly]
+        names = [y | y@(Tagged TagNames{} _) <- concatMap universe items]
+        dates = [y | y@(Tagged TagDate{} _) <- concatMap universe items]
+    in  if null items
+           then Nothing
+           else listToMaybe names <|> listToMaybe dates
+
+groupAndCollapseCitations _ _ _ _ x = x
+
+takeSeq :: Show a => (a -> a -> Bool) -> [a] -> ([a], [a])
+takeSeq isAdjacent (x1 : x2 : rest)
+  | isAdjacent x1 x2 = (x1:ys, zs)
+  where (ys, zs) = takeSeq isAdjacent (x2:rest)
+takeSeq _ (y:ys) = ([y], ys)
+takeSeq _ []     = ([], [])
+
+groupSuccessive :: Show a => (a -> a -> Bool) -> [a] -> [[a]]
+groupSuccessive isAdjacent zs =
+  case takeSeq isAdjacent zs of
+    ([],_)  -> []
+    (xs,ys) -> xs : groupSuccessive isAdjacent ys
+
+--
+-- Sorting
+--
+
+evalSortKeys :: CiteprocOutput a
+             => Layout a
+             -> ItemId
+             -> Eval a [SortKeyValue]
+evalSortKeys layout citeId =
+  withRWST (\ctx st -> (ctx{ contextInSortKey = True
+                           , contextNameFormat =
+                               layoutNameFormat (layoutOptions layout)
+                            }, st)) $
+    mapM (evalSortKey citeId) (layoutSortKeys layout)
+
+evalSortKey :: CiteprocOutput a
+            => ItemId
+            -> SortKey a
+            -> Eval a SortKeyValue
+evalSortKey citeId (SortKeyMacro sortdir nameformat macroname) = do
+  macros <- asks contextMacros
+  elts <- case M.lookup macroname macros of
+            Nothing -> [] <$ warn ("undefined macro " <> macroname)
+            Just els -> pure els
+  refmap <- gets stateRefMap
+  case lookupReference citeId refmap of
+    Nothing  -> return $ SortKeyValue sortdir Nothing
+    Just ref -> do
+        locale <- asks contextLocale
+        k <- normalizeSortKey . toText .
+              renderOutput defaultCiteprocOptions locale . grouped
+              <$> withRWS newContext (eElements elts)
+        return $ SortKeyValue sortdir (Just k)
+     where
+      newContext oldContext s =
+        (oldContext{ contextNameFormat = combineNameFormat
+                       nameformat (contextNameFormat oldContext)},
+         s{ stateReference = ref
+          , stateReferenceLang =
+              M.lookup "language" (referenceVariables ref) >>=
+                 valToText >>= eitherToMaybe . parseLang
+          })
+evalSortKey citeId (SortKeyVariable sortdir var) = do
+  refmap <- gets stateRefMap
+  SortKeyValue sortdir <$>
+    case lookupReference citeId refmap >>= lookupVariable var of
+      Nothing           -> return Nothing
+      Just (TextVal t)  -> return $ Just $ normalizeSortKey t
+      Just (NumVal  i)  -> return $ Just [T.pack $ printf "%09d" i]
+      Just (FancyVal x) -> return $ Just $ normalizeSortKey $ toText x
+      Just (NamesVal ns) ->
+        Just . normalizeSortKey . mconcat . intersperse "," . map T.unwords
+             <$> mapM getNamePartSortOrder ns
+      Just (DateVal d)  -> return $ Just [T.toLower $ dateToText d]
+      Just SubstitutedVal -> return Nothing
+
+-- Note: we do a case-insensitive sort (using toCaseFold):
+normalizeSortKey :: Text -> [Text]
+normalizeSortKey = filter (not . T.null) . T.split isWordSep . T.toCaseFold
+ where
+  isWordSep c = isSpace c || c == '\'' || c == '’' || c == ',' ||
+                c == 'ʾ' || c == 'ʿ' -- ayn/hamza in transliterated arabic
+
+-- absence should sort AFTER all values
+-- see sort_StatusFieldAscending.txt, sort_StatusFieldDescending.txt
+compSortKeyValue :: (Text -> Text -> Ordering)
+                 -> SortKeyValue
+                 -> SortKeyValue
+                 -> Ordering
+compSortKeyValue collate sk1 sk2 =
+  case (sk1, sk2) of
+    (SortKeyValue _ Nothing, SortKeyValue _ Nothing) -> EQ
+    (SortKeyValue _ Nothing, SortKeyValue _ (Just _)) -> GT
+    (SortKeyValue _ (Just _), SortKeyValue _ Nothing) -> LT
+    (SortKeyValue Ascending (Just t1), SortKeyValue Ascending (Just t2)) ->
+      collateKey t1 t2
+    (SortKeyValue Descending (Just t1), SortKeyValue Descending (Just t2))->
+      collateKey t2 t1
+    _ -> EQ
+ where
+  collateKey :: [Text] -> [Text] -> Ordering
+  collateKey [] [] = EQ
+  collateKey [] (_:_) = LT
+  collateKey (_:_) [] = GT
+  collateKey (x:xs) (y:ys) =
+    case collate x y of
+      EQ -> collateKey xs ys
+      GT -> GT
+      LT -> LT
+
+compSortKeyValues :: (Text -> Text -> Ordering)
+                  -> [SortKeyValue]
+                  -> [SortKeyValue]
+                  -> Ordering
+compSortKeyValues _ [] [] = EQ
+compSortKeyValues _ [] (_:_) = LT
+compSortKeyValues _ (_:_) [] = GT
+compSortKeyValues collate (x:xs) (y:ys) =
+  case compSortKeyValue collate x y of
+    EQ -> compSortKeyValues collate xs ys
+    GT -> GT
+    LT -> LT
+
+-- Note!  This prints negative (BC) dates as N(999,999,999 + y)
+-- and positive (AD) dates as Py so they sort properly.  (Note that
+-- our unicode sorting ignores punctuation, so we use a letter
+-- rather than -.) Do not use out of context of sort keys.
+dateToText :: Date -> Text
+dateToText = mconcat . map (T.pack . go . coerce) . dateParts
+ where
+  go :: [Int] -> String
+  go [] = ""
+  go [y] = toYear y <> "0000"
+  go [y,m] = toYear y <> printf "%02d" m <> "00"
+  go (y:m:d:_) = toYear y <> printf "%02d" m <> printf "%02d" d
+  toYear :: Int -> String
+  toYear y
+    | y < 0     = printf "N%09d" (999999999 + y)
+    | otherwise = printf "P%09d" y
+
+
+evalLayout :: CiteprocOutput a
+            => Layout a
+            -> (Int, Citation a)
+            -> Eval a (Output a)
+evalLayout layout (citationGroupNumber, citation) = local
+               (\ctx -> ctx{ contextNameFormat =
+                             combineNameFormat
+                              (layoutNameFormat (layoutOptions layout))
+                              (contextNameFormat ctx) } ) $ do
+  -- this is a hack to ensure that "ibid" detection will work
+  -- correctly in a citation starting with an author-only:
+  -- the combination AuthorOnly [SuppressAuthor] should not
+  -- count against a later Ibid citation.
+  let positionsInCitation =
+        case citationItems citation of
+          (c:_) | citationItemType c == AuthorOnly -> [0..]
+          _ -> [1..]
+
+  let addCitationAffixes =
+          maybe id (\pref xs ->
+                      case xs of
+                        [] -> []
+                        (x:rest) -> x{ citationItemPrefix = Just $ pref <>
+                                         fromMaybe mempty (citationItemPrefix x) }
+                                          : rest)
+                (citationPrefix citation) .
+          maybe id (\suff xs ->
+                      case reverse xs of
+                        [] -> []
+                        (x:rest) -> reverse rest ++ [x{ citationItemSuffix = Just $
+                                                        fromMaybe mempty (citationItemSuffix x)
+                                                        <> suff }])
+                (citationSuffix citation)
+
+  when (citationResetPosition citation) $
+    modify $ \st -> st{ stateLastCitedMap = mempty
+                      , stateNoteMap = mempty }
+
+  items <- mapM evalItem' (zip positionsInCitation
+                            (addCitationAffixes (citationItems citation)))
+
+  -- see display_SecondFieldAlignMigratePunctuation.txt
+  let moveSuffixInsideDisplay zs =
+        case (lastMay zs, formatSuffix formatting) of
+          (Just (Tagged (TagItem ct id') (Formatted f ys)), Just _) ->
+            (\ys' -> initSafe zs ++
+                      [Tagged (TagItem ct id') (Formatted f ys')]) <$>
+                        moveSuffixInsideDisplay ys
+          (Just (Formatted f ys), Just suff)
+            | isJust (formatDisplay f) ->
+                Just $ initSafe zs ++
+                     [Formatted f{ formatSuffix = Just
+                          (fromMaybe "" (formatSuffix f) <> suff) } ys]
+            | otherwise -> (\ys' -> initSafe zs ++ [Formatted f ys']) <$>
+                             moveSuffixInsideDisplay ys
+          _ -> Nothing
+
+  return $
+    case moveSuffixInsideDisplay items of
+      Nothing     -> formatted formatting items
+      Just items' -> formatted formatting{ formatSuffix = Nothing } items'
+ where
+  formatting = layoutFormatting layout
+
+  secondFieldAlign [Linked t (x:xs)] =
+    secondFieldAlign [x, Linked t xs]
+  secondFieldAlign (x:xs) =
+    formatted mempty{ formatDisplay = Just DisplayLeftMargin } [x]
+    : [formatted mempty{ formatDisplay = Just DisplayRightInline } xs]
+  secondFieldAlign [] = []
+
+  evalItem' (positionInCitation :: Int, item) = do
+    isBibliography  <- asks contextInBibliography
+
+    styleOpts <- asks contextStyleOptions
+    let isNote = styleIsNoteStyle styleOpts
+    position <- getPosition citationGroupNumber (citationNoteNumber citation)
+                     item positionInCitation
+
+    xs <- evalItem layout (position, item)
+    -- we only update the map in the citations section
+    unless isBibliography $ do
+      updateRefMap citationGroupNumber citation item
+      updateLastCitedMap citationGroupNumber positionInCitation citation item
+
+    return $
+          maybe id (\pref x -> grouped [Tagged TagPrefix (Literal pref), x])
+                (citationItemPrefix item)
+        . maybe id (\suff x -> grouped [x, Tagged TagSuffix (Literal suff)])
+                   (citationItemSuffix item)
+        . (\x -> case x of
+                   NullOutput -> x
+                   _          -> Tagged (TagItem (citationItemType item)
+                                                  (citationItemId item)) x)
+        . formatted mempty
+        . (if citationItemType item == AuthorOnly
+              then (:[]) . getAuthors . formatted mempty
+              else id)
+        . (case citationItemPrefix item of
+             -- this handles the case where the prefix is a whole sentence:
+             Just t | isNote
+                    , ". " `T.isSuffixOf` toText t
+                    , T.count " " (toText t) > 1 -- exclude single word
+                                 -> capitalizeInitialTerm
+             _                   -> id)
+        . (if isBibliography
+              then
+                case styleSecondFieldAlign styleOpts of
+                  Just SecondFieldAlignFlush  -> secondFieldAlign
+                  Just SecondFieldAlignMargin -> secondFieldAlign -- TODO?
+                  Nothing -> id
+              else id)
+        $ xs
+
+evalItem :: CiteprocOutput a
+         => Layout a -> ([Position], CitationItem a) -> Eval a [Output a]
+evalItem layout (position, item) = do
+  refmap <- gets stateRefMap
+
+  let addLangToFormatting lang (Formatted f xs) =
+        Formatted f{ formatLang = Just lang } xs
+      addLangToFormatting _ x = x
+
+  case lookupReference (citationItemId item) refmap of
+    Just ref -> withRWST
+      (\ctx st ->
+       (ctx{ contextLocator = citationItemLocator item
+           , contextLabel = citationItemLabel item
+           , contextPosition = position
+           },
+        st{ stateReference = ref
+          , stateReferenceLang = 
+              M.lookup "language" (referenceVariables ref) >>=
+                 valToText >>= eitherToMaybe . parseLang
+          , stateUsedYearSuffix = False
+          , stateUsedIdentifier = False
+          , stateUsedTitle = False
+          }))
+        $ do xs <- eElements (layoutElements layout)
+
+             -- find identifiers that can be used to hyperlink the title
+             let mbident =
+                    foldl (<|>) Nothing
+                      [ IdentDOI   <$> (valToText =<< lookupVariable "DOI" ref)
+                      , IdentPMCID <$> (valToText =<< lookupVariable "PMCID" ref)
+                      , IdentPMID  <$> (valToText =<< lookupVariable "PMID" ref)
+                      , IdentURL   <$> (valToText =<< lookupVariable "URL" ref)
+                      ]
+             let mburl = identifierToURL <$> mbident
+
+             -- hyperlink any titles in the output
+             let linkTitle url (Tagged TagTitle x) = Linked url [Tagged TagTitle x]
+                 linkTitle _ x = x
+
+             usedLink  <- gets stateUsedIdentifier
+             usedTitle <- gets stateUsedTitle
+             inBiblio  <- asks contextInBibliography
+
+             -- when no links were rendered for a bibliography item, hyperlink
+             -- the title, if it exists, otherwise hyperlink the whole item
+             let xs' =
+                   if usedLink || not inBiblio
+                     then xs
+                   else case mburl of
+                         Nothing  -> xs
+                         Just url -> if usedTitle
+                                        -- hyperlink the title
+                                        then fmap (transform (linkTitle url)) xs
+                                        -- hyperlink the entire bib item
+                                        else [Linked url xs]
+
+             let mblang = lookupVariable "language" ref
+                          >>= valToText
+                          >>= either (const Nothing) Just . parseLang
+             return $
+               case mblang of
+                 Nothing   -> xs'
+                 Just lang -> map
+                     (transform (addLangToFormatting lang)) xs'
+    Nothing -> do
+      warn $ "citation " <> unItemId (citationItemId item) <>
+             " not found"
+      return [Literal $ addFontWeight BoldWeight
+         $ fromText $ unItemId (citationItemId item) <> "?"]
+
+
+
+updateRefMap :: Int -> Citation a -> CitationItem a -> Eval a ()
+updateRefMap citationGroupNumber citation item = do
+  isNote <- asks (styleIsNoteStyle . contextStyleOptions)
+  lastCitedMap <- gets stateLastCitedMap
+  let notenum = NumVal $ fromMaybe citationGroupNumber (citationNoteNumber citation)
+  -- keep track of how many citations in each note.
+  -- two citations from the same note don't count as "alone"
+  -- for ibid purposes. See citation-style-language/documentation#121
+  case citationNoteNumber citation of
+    Nothing -> return ()
+    Just n  -> modify $ \st ->
+                   st{ stateNoteMap = M.alter
+                        (maybe
+                          (Just (Set.singleton (citationItemId item)))
+                          (Just . Set.insert (citationItemId item)))
+                        n
+                        (stateNoteMap st) }
+  case M.lookup (citationItemId item) lastCitedMap of
+    Nothing | isNote -> -- first citation
+      modify $ \st ->
+        st{ stateRefMap = ReferenceMap $
+                M.adjust (\ref -> ref{ referenceVariables =
+                  M.insert "first-reference-note-number" notenum
+                             (referenceVariables ref)})
+                  (citationItemId item)
+               (unReferenceMap $ stateRefMap st) }
+    _  -> return ()
+
+updateLastCitedMap :: Int -> Int -> Citation a -> CitationItem a -> Eval a ()
+updateLastCitedMap citationGroupNumber positionInCitation citation item = do
+  unless (citationItemType item == AuthorOnly) $
+    modify $ \st ->
+      st{ stateLastCitedMap =
+        M.insert (citationItemId item)
+          (citationGroupNumber, citationNoteNumber citation,
+           positionInCitation,
+           (case citationItems citation of
+              [_]   -> True
+              [x,y] -> citationItemId x == citationItemId y
+                      && citationItemType x == AuthorOnly
+                      && citationItemType y == SuppressAuthor
+              _     -> False),
+           citationItemLabel item,
+           citationItemLocator item)
+        $ stateLastCitedMap st }
+
+
+-- | The first-occurring element tagged as Names will be
+-- treated as the "author"; generally that is the author
+-- but it might be the editor if it's an edited volume.
+getAuthors :: Output a -> Output a
+getAuthors x =
+  headDef NullOutput [y | y@(Tagged TagNames{} _) <- universe x]
+
+removeNames :: Output a -> Output a
+removeNames (Tagged TagNames{} _) = NullOutput
+removeNames x = x
+
+capitalizeInitialTerm :: [Output a] -> [Output a]
+capitalizeInitialTerm [] = []
+capitalizeInitialTerm (z:zs) = go z : zs
+ where
+  go (Tagged (TagTerm t) x) =
+    Tagged (TagTerm t)
+      (formatted mempty{ formatTextCase = Just CapitalizeFirst } [x])
+  go (Formatted f xs) = Formatted f (capitalizeInitialTerm xs)
+  go (Tagged tg x) = Tagged tg (go x)
+  go x = x
+
+getPosition :: Int -> Maybe Int -> CitationItem a -> Int -> Eval a [Position]
+getPosition groupNum mbNoteNum item posInGroup = do
+  inBibliography <- asks contextInBibliography
+  if inBibliography
+     then return []
+     else getPosition'
+ where
+  getPosition' = do
+    lastCitedMap <- gets stateLastCitedMap
+    noteMap <- gets stateNoteMap
+    case M.lookup (citationItemId item) lastCitedMap of
+      Nothing -> return [FirstPosition]
+      Just (prevGroupNum, mbPrevNoteNum,
+             prevPosInGroup, prevAloneInGroup,
+             prevLabel, prevLoc) -> do
+        isNote <- asks (styleIsNoteStyle . contextStyleOptions)
+        nearNoteDistance <- fromMaybe 5 <$>
+                asks (styleNearNoteDistance . contextStyleOptions)
+        let noteNum = fromMaybe groupNum mbNoteNum
+        let prevNoteNum = fromMaybe prevGroupNum mbPrevNoteNum
+        let prevAloneInNote =
+              case M.lookup prevNoteNum noteMap of
+                Nothing -> True
+                Just s  -> Set.size s <= 1
+        let prevAlone = prevAloneInGroup && prevAloneInNote
+        return $
+          (if isNote && noteNum - prevNoteNum < nearNoteDistance
+              then (NearNote :)
+              else id) .
+          (if (groupNum == prevGroupNum &&
+               posInGroup == prevPosInGroup + 1) ||
+              (groupNum == prevGroupNum + 1 &&
+                (((-) <$> mbNoteNum <*> mbPrevNoteNum) <= Just 1) &&
+               posInGroup == 1 &&
+               prevAlone)
+               then case (prevLoc, citationItemLocator item) of
+                      (Nothing, Just _)
+                        -> (IbidWithLocator :) . (Ibid :)
+                      (Nothing, Nothing) -> (Ibid :)
+                      (Just _, Nothing)   -> id
+                      (Just l1, Just l2)
+                        | l1 == l2
+                        , citationItemLabel item == prevLabel
+                          -> (Ibid :)
+                        | otherwise
+                          -> (IbidWithLocator :) . (Ibid :)
+               else id)
+          $ [Subsequent]
+
+eElements :: CiteprocOutput a => [Element a] -> Eval a [Output a]
+eElements els = mconcat <$> mapM eElement els
+
+eElement :: CiteprocOutput a => Element a -> Eval a [Output a]
+eElement (Element etype formatting) =
+  case etype of
+    EText (TextMacro name) -> do
+      macros <- asks contextMacros
+      case M.lookup name macros of
+        Nothing -> [] <$ warn ("undefined macro " <> name)
+        Just els -> eElement (Element (EGroup True els) formatting)
+    EText textType ->
+      (:[]) <$> withFormatting formatting (eText textType)
+    ENumber var nform ->
+      (:[]) <$> withFormatting formatting (eNumber var nform)
+    EGroup isMacro els ->
+      (:[]) <$> eGroup isMacro formatting els
+    EChoose chooseParts -> eChoose chooseParts
+    ELabel var termform pluralize ->
+      (:[]) <$> eLabel var termform pluralize formatting
+    EDate var dateType mbShowDateParts dps ->
+      (:[]) <$> eDate var dateType mbShowDateParts dps formatting
+    ENames vars namesFormat subst ->
+      (:[]) <$> eNames vars namesFormat subst formatting
+
+withFormatting :: Formatting -> Eval a (Output a) -> Eval a (Output a)
+withFormatting (Formatting Nothing Nothing Nothing Nothing Nothing Nothing
+                           Nothing Nothing Nothing Nothing Nothing
+                           False False False) p
+                          = p
+withFormatting formatting p = do
+  -- Title case conversion only affects English-language items.
+  lang <- asks (localeLanguage . contextLocale)
+  reflang <- gets stateReferenceLang
+  let mainLangIsEn Nothing = False
+      mainLangIsEn (Just l) = langLanguage l == "en"
+  let isEnglish = case reflang of
+                    Just l  -> mainLangIsEn (Just l)
+                    Nothing -> mainLangIsEn lang
+  let formatting' = if formatTextCase formatting == Just TitleCase &&
+                       not isEnglish
+                       then formatting{ formatTextCase = Nothing }
+                       else formatting
+  res <- p
+  return $ formatted formatting' [res]
+
+lookupTerm :: Term -> Eval a [(Term, Text)]
+lookupTerm term = do
+  terms <- asks (localeTerms . contextLocale)
+  let term' = if termName term == "sub verbo"
+                 then term{ termName = "sub-verbo" }
+                 else term
+  case M.lookup (termName term') terms of
+     Just ts -> return $ [ (term'',t)
+                         | (term'',t) <- ts
+                         , term' `termMatches` term''
+                         ]
+     Nothing -> return []
+
+lookupTerm' :: CiteprocOutput a => Term -> Eval a (Output a)
+lookupTerm' term = lookupTerm term >>= f
+ where
+   f []  =
+     --  “verb-short” first falls back to “verb”, “symbol”
+     --  first falls back to “short”, and “verb” and “short”
+     --  both fall back to “long”.
+     case termForm term of
+       VerbShort -> lookupTerm' term{ termForm = Verb }
+       Symbol    -> lookupTerm' term{ termForm = Short }
+       Verb      -> lookupTerm' term{ termForm = Long }
+       Short     -> lookupTerm' term{ termForm = Long }
+       _         -> return NullOutput
+   f ((_,t):_) = if T.null t
+                    then return NullOutput
+                    else do
+                      locale <- asks contextLocale
+                      return $ Literal $ parseCslJson locale t
+
+pageRange :: CiteprocOutput a => Text -> Eval a (Output a)
+pageRange x = do
+  delimTerms <- lookupTerm emptyTerm{ termName = "page-range-delimiter" }
+  let pageDelim = case delimTerms of
+                         (_,d):_ -> d
+                         _ -> ""
+  mbPageRangeFormat <- asks (stylePageRangeFormat . contextStyleOptions)
+  let ranges = map T.strip $ T.groupBy
+               (\c d -> not (c == ',' || c == '&' || d == ',' || d == '&'))
+               x
+  return $ formatted mempty{ formatDelimiter = Just " " }
+         $ map (literal . formatPageRange mbPageRangeFormat pageDelim) ranges
+
+enDash :: Char
+enDash = '\x2013'
+
+formatPageRange :: Maybe PageRangeFormat
+                -> Text
+                -> Text
+                -> Text
+formatPageRange _ _ "&" = "&"
+formatPageRange _ _ "," = ","
+formatPageRange mbPageRangeFormat delim t =
+  let isDash '-' = True
+      isDash '\x2013' = True
+      isDash _ = False
+      rangeParts = if "\\-" `T.isInfixOf` t
+                      then [T.replace "\\-" "-" t]
+                      else map T.strip $ T.split isDash t
+      inRange pref xs
+        | T.null pref = mconcat (intersperse delim xs)
+        | otherwise = mconcat
+            (pref : intersperse delim xs)
+      changedDigits xs ys =
+        length $ filter not $ zipWith (==) (xs ++ repeat ' ') ys
+      minimal threshold pref x y =
+        case T.commonPrefixes x y of
+             Just (_comm, restx, resty) | T.length restx == T.length resty ->
+                 if T.length resty < threshold && T.length y >= threshold
+                    then inRange pref [x, T.takeEnd threshold y]
+                    else inRange pref [x, resty]
+             _ -> inRange pref [x, y]
+   in case rangeParts of
+        []     -> ""
+        [w]    -> w
+        [w,v]
+          | Nothing <- mbPageRangeFormat -> inRange mempty [w,v]
+          | Just fmt <- mbPageRangeFormat -> do
+            let wPrefix = T.dropWhileEnd isDigit w
+            let vPrefix = T.dropWhileEnd isDigit v
+            if wPrefix == vPrefix
+               then do
+                 let pref = wPrefix
+                 let x = T.drop (T.length wPrefix) w
+                 let y = T.drop (T.length vPrefix) v
+                 let xlen = T.length x
+                 let ylen = T.length y
+                 let y'   = if ylen < xlen
+                               then T.take (xlen - ylen) x <> y
+                               else y
+                 case fmt of
+                   PageRangeChicago15
+                       | xlen < 3  -> inRange pref [x, y']
+                       | "00" `T.isSuffixOf` x -> inRange pref [x, y']
+                       | T.take 1 (T.takeEnd 2 x) == "0"
+                       , T.take 1 (T.takeEnd 2 y') == "0"
+                         -> minimal 1 pref x y'
+                       | xlen == 4
+                       , changedDigits (T.unpack x) (T.unpack y') >= 3
+                         -> inRange pref [x, y']
+                       | otherwise -> minimal 2 pref x y'
+                   PageRangeChicago16
+                       | xlen < 3  -> inRange pref [x, y']
+                       | "00" `T.isSuffixOf` x -> inRange pref [x, y']
+                       | T.take 1 (T.takeEnd 2 x) == "0"
+                       , T.take 1 (T.takeEnd 2 y') == "0"
+                         -> minimal 1 pref x y'
+                       | otherwise -> minimal 2 pref x y'
+                   PageRangeExpanded ->
+                       inRange mempty [pref <> x, pref <> y']
+                   PageRangeMinimal -> minimal 1 pref x y'
+                   PageRangeMinimalTwo -> minimal 2 pref x y'
+               else inRange mempty [w,v]
+        _ -> t
+
+eText :: CiteprocOutput a => TextType -> Eval a (Output a)
+eText (TextVariable varForm v) = do
+  ref <- gets stateReference
+  -- Note: we do book keeping on how many variables
+  -- have been accessed and how many are nonempty,
+  -- in order to properly handle the group element,
+  -- which is implicitly conditional.
+  case v of
+    "id"   -> do
+      updateVarCount 1 1
+      return $ Literal $ fromText $ coerce $ referenceId ref
+    "type" -> do
+      updateVarCount 1 1
+      return $ Literal $ fromText  $ referenceType ref
+    "locator" -> do
+        let handleAmpersands (Just t) | T.any (=='&') t = do
+              ts <- lookupTerm emptyTerm { termName = "and"
+                                         , termForm = Symbol }
+              case ts of
+                (_,x):_ -> return (Just $ T.replace "&" x t)
+                []      -> return (Just t)
+            handleAmpersands x = return x
+
+        mbv <- asks contextLocator >>= handleAmpersands
+        mbl <- asks contextLabel
+        case mbv of
+          Just x | isNothing mbl || mbl == Just "page" -> do
+                      updateVarCount 1 1
+                      Tagged TagLocator <$> pageRange x
+                 | otherwise -> do
+                      updateVarCount 1 1
+                      locale <- asks contextLocale
+                      return $ Tagged TagLocator $
+                                Literal . parseCslJson locale $
+                                formatPageRange Nothing (T.singleton enDash) x
+          Nothing -> NullOutput <$ updateVarCount 1 0
+
+    "year-suffix" -> do
+        disamb <- gets (referenceDisambiguation . stateReference)
+        case disamb >>= disambYearSuffix of
+          Just x -> do
+            -- we don't update var count here; this doesn't
+            -- count as a variable
+            return $ Tagged (TagYearSuffix x)
+                            (Literal (fromText (showYearSuffix x)))
+          Nothing -> return NullOutput
+
+    "citation-number" -> do
+        mbv <- askVariable v
+        case mbv of
+          Just (NumVal x)  -> return $
+                              Tagged (TagCitationNumber x) $
+                              Literal $ fromText (T.pack (show x))
+          _ -> do
+            warn $ "citation-number not defined for " <>
+                      coerce (referenceId ref)
+            return NullOutput
+
+    "citation-label" -> do  -- these need year suffix too
+        mbv <- askVariable v
+        mbsuff <- getYearSuffix
+        case mbv of
+          Just (TextVal t)  -> return $
+                                Tagged TagCitationLabel $
+                                  grouped $
+                                  Literal (fromText t)
+                                  : maybeToList mbsuff
+          Just (FancyVal x) -> return $
+                                 Tagged TagCitationLabel $
+                                  grouped $
+                                  Literal x
+                                  : maybeToList mbsuff
+          _ -> do
+            warn $ "citation-label of unknown type for " <>
+                      coerce (referenceId ref)
+            return NullOutput
+
+    "DOI"   -> handleIdent id IdentDOI
+    "PMCID" -> handleIdent id IdentPMCID
+    "PMID"  -> handleIdent id IdentPMID
+    "URL"   -> handleIdent id IdentURL
+
+    _ -> do
+        mbv <- if varForm == ShortForm
+                  then do
+                    mbval <- (<|>) <$> askVariable (v <> "-short")
+                                   <*> askVariable v
+                    case mbval of
+                      Nothing -> return Nothing
+                      Just val -> do
+                        mbAbbrevs <- asks contextAbbreviations
+                        return $ Just $ fromMaybe val
+                               $ mbAbbrevs >>= lookupAbbreviation v val
+                  else askVariable v
+        res <- case mbv of
+                 Just (TextVal x)
+                   | v == "page" -> pageRange x
+                   | otherwise   -> return $ Literal $ fromText x
+                 Just (FancyVal x)
+                   | v == "page" -> pageRange (toText x)
+                   | otherwise   -> return $ Literal x
+                 Just (NumVal x) -> return $ Literal
+                                           $ fromText (T.pack (show x))
+                 _ -> return NullOutput
+        unless (isNothing mbv) $ deleteSubstitutedVariables
+             (v : if varForm == ShortForm -- see #174
+                     then [v <> "-short"]
+                     else [])
+        if v == "title" && res /= NullOutput
+            then do
+              modify (\st -> st { stateUsedTitle = True })
+              -- tag title so we can hyperlink it later
+              return $ Tagged TagTitle res
+            else return res
+    where
+      handleIdent :: CiteprocOutput b => (Text -> Text) -> (Text -> Identifier) -> Eval b (Output b)
+      handleIdent f identConstr = do
+        mbv <- askVariable v
+        deleteSubstitutedVariables [v]
+        case f <$> (valToText =<< mbv) of
+          Nothing -> return NullOutput
+          Just t  -> do
+            -- create link and remember that we've done so far
+            modify (\st -> st { stateUsedIdentifier = True })
+            let url = identifierToURL (identConstr t)
+            return $ Linked url [Literal $ fromText t]
+eText (TextMacro name) = do
+  warn ("unexpanded macro " <> name)
+  return NullOutput
+eText (TextValue t) = do
+  locale <- asks contextLocale
+  return . Literal $ parseCslJson locale t
+eText (TextTerm term) = do
+  t' <- lookupTerm' term
+  t'' <- if termName term == "no date"
+            then do
+              mbsuff <- getYearSuffix
+              case mbsuff of
+                Nothing  -> return t'
+                Just suff
+                  | termForm term == Long
+                    -> return $ grouped [t', Literal (fromText " "), suff]
+                  | otherwise -> return $ grouped [t', suff]
+            else return t'
+  return $ Tagged (TagTerm term) t''
+
+
+-- | Delete substituted variables so they aren't used again.
+deleteSubstitutedVariables :: [Variable] -> Eval a ()
+deleteSubstitutedVariables vars = do
+  inSubst <- asks contextInSubstitute
+  when inSubst $
+    modify $ \st -> -- delete variables so they aren't used again...
+      st{ stateReference =
+                  let Reference id' type' d' m' = stateReference st
+                   in Reference id' type' d' (foldr (\v -> M.insert v SubstitutedVal) m' vars) }
+
+-- Numbers with prefixes or suffixes are never ordinalized
+-- or rendered in roman numerals (e.g. “2E” remains “2E).
+-- Numbers without affixes are individually transformed
+-- (“2, 3” can become “2nd, 3rd”, “second, third” or “ii, iii”).
+-- So, first we split on punctuation and spaces:
+splitNums :: Text -> [Val a]
+splitNums = map go . T.groupBy sameClass
+ where
+  go t = case readAsInt t of
+           Just i  -> NumVal i
+           Nothing -> TextVal $ if t == "-"
+                                   then T.singleton enDash
+                                   else t
+  sameClass c d = (isSepPunct c || isSpace c) ==
+                  (isSepPunct d || isSpace d)
+
+--- punctuation that separates pages in a range
+isSepPunct :: Char -> Bool
+isSepPunct ',' = True
+isSepPunct ';' = True
+isSepPunct '-' = True
+isSepPunct '\x2013' = True
+isSepPunct _   = False
+
+-- | One number, possibly with a word around it ("US 9876543"): no
+-- separator punctuation, no "&" or "and", and exactly one word that
+-- holds a digit.  CSL pluralizes a label only for a range or several
+-- numbers.
+isOneIdentifier :: Text -> Bool
+isOneIdentifier t =
+  not (T.any isSepPunct t) &&
+  not (T.any (== '&') t) &&
+  "and" `notElem` ws &&
+  length (filter (T.any isDigit) ws) == 1
+ where
+  ws = T.words t
+
+-- | Drop the commas of thousands grouping ("9,876,543" -> "9876543"):
+-- a comma between a digit and exactly three digits not followed by
+-- another digit.
+dropDigitGrouping :: Text -> Text
+dropDigitGrouping = T.pack . go . T.unpack
+ where
+  go (a:',':b:c:d:rest)
+    | isDigit a, isDigit b, isDigit c, isDigit d
+    , not (startsWithDigit rest) = a : go (b:c:d:rest)
+  go (x:xs) = x : go xs
+  go [] = []
+  startsWithDigit (e:_) = isDigit e
+  startsWithDigit [] = False
+
+eLabel :: CiteprocOutput a
+       => Variable
+       -> TermForm
+       -> Pluralize
+       -> Formatting
+       -> Eval a (Output a)
+eLabel var termform pluralize formatting = do
+  ref <- gets stateReference
+  let getTerm :: CiteprocOutput a
+              => Text -> Val a -> Eval a (Output a)
+      getTerm termname x = do
+        let determinePlural t
+             | var == "number-of-volumes"
+             , t /= "1" && t /= "0"      = Plural
+             | "\\-" `T.isInfixOf` t     = Singular
+             | isOneIdentifier (ungroup t) = Singular
+             | length (splitNums t) > 1  = Plural
+               -- see label_CollapsedPageNumberPluralDetection.txt
+             | otherwise                 = Singular
+            -- a digit-grouped number ("US 9,876,543") is one number,
+            -- not a list; pages and locators keep the comma-list reading
+            ungroup t
+             | var == "page" || var == "locator" = t
+             | otherwise = dropDigitGrouping t
+        let number = case pluralize of
+                         AlwaysPluralize     -> Plural
+                         NeverPluralize      -> Singular
+                         ContextualPluralize ->
+                          case x of
+                            TextVal t   -> determinePlural t
+                            NumVal n   -> determinePlural (T.pack (show n))
+                            FancyVal w  -> determinePlural (toText w)
+                            NamesVal ns -> if length ns > 1
+                                              then Plural
+                                              else Singular
+                            _ -> Singular
+        let term = emptyTerm{ termName = termname
+                            , termForm = termform
+                            , termNumber = Just number }
+        lookupTerm' term
+  locator <- asks contextLocator
+  label <- asks contextLabel
+  let var' = if var == "editortranslator" then "editor" else var
+  term' <- case (var, locator, label) of
+             ("locator", Just loc, Just lab) -> getTerm lab (TextVal loc)
+             ("locator", Just loc, Nothing)
+                | beginsWithSpace loc -> return NullOutput
+                | ". " `T.isPrefixOf` T.dropWhile isLetter loc
+                                         -> return NullOutput
+                | otherwise              -> getTerm "page" (TextVal loc)
+             _ -> case lookupVariable var' ref of
+                         Nothing -> return NullOutput
+                         Just x  -> getTerm (fromVariable var) x
+
+  return $
+    case formatSuffix formatting of
+      Just suff
+        | "." `T.isPrefixOf` suff
+          -> case term' of
+               Literal x
+                 | "." `T.isSuffixOf` toText x
+                 , not (formatStripPeriods formatting)
+                 -> formatted
+                     formatting{ formatSuffix =
+                        if T.length suff <= 1
+                           then Nothing
+                           else Just (T.drop 1 suff) }
+                     [term']
+               _ -> formatted formatting [term']
+      _ -> formatted formatting [term']
+
+eDate :: CiteprocOutput a
+       => Variable
+       -> DateType
+       -> Maybe ShowDateParts
+       -> [DP]
+       -> Formatting
+       -> Eval a (Output a)
+eDate var dateType mbShowDateParts dps formatting
+  | var == mempty = do
+    warn "skipping date element with no variable attribute set"
+    return NullOutput
+  | otherwise = do
+    datevar <- askVariable var
+    unless (isNothing datevar) $ deleteSubstitutedVariables [var]
+    localeDateElt <- M.lookup dateType <$> asks (localeDate . contextLocale)
+    let addOverride newdps olddp accum =
+          case find ((== dpName olddp) . dpName) newdps of
+            Just x  -> x{ dpFormatting =
+                            dpFormatting olddp <> dpFormatting x } : accum
+            Nothing -> olddp : accum
+    let useDatePart dp =
+          case mbShowDateParts of
+            Just Year      -> dpName dp == DPYear
+            Just YearMonth -> dpName dp == DPYear || dpName dp == DPMonth
+            _              -> True
+    let (dps', formatting') =
+          case localeDateElt of
+            Just (Element (EDate _ _ _ edps) f)
+              -> (filter useDatePart $ foldr (addOverride dps) [] edps,
+                   formatting <> f)
+            _ -> (filter useDatePart dps, formatting)
+    case datevar of
+      Nothing ->
+        -- warn $ "date element for empty variable " <> var
+        return NullOutput
+      Just (DateVal date) ->
+        case dateLiteral date of
+          -- a literal stands in for the year: a date element that
+          -- prints only month or day leaves it out (as citeproc-js)
+          Just t
+            | null dps' || any ((== DPYear) . dpName) dps'
+              -> return $ formatted formatting' [Literal $ fromText t]
+            | otherwise -> do
+              updateVarCount 0 (-1)
+              return NullOutput
+          Nothing -> do
+            let dateparts = case dateSeason date of
+                              Just i  ->
+                                case dateParts date of
+                                  [DateParts [y]] ->
+                                    [DateParts [y, 12 + i]] -- pseudo-mo
+                                  xs    -> xs
+                              Nothing -> dateParts date
+            xs <- formatDateParts dps'
+                    $ case dateparts of
+                        [] -> (DateParts [], Nothing)
+                        [d] -> (d, Nothing)
+                        (d:e:_) -> (d, Just e)
+            when (all (== NullOutput) xs) $
+              -- back off on the claim to nonemptiness
+              -- when the only match are in date parts that
+              -- we aren't printing; see
+              -- group_SuppressTermWhenNoOutputFromPartialDate.txt
+              updateVarCount 0 (-1)
+
+            yearSuffix <- getYearSuffix
+            return $ Tagged (TagDate date) $ formatted formatting'
+                      (xs ++ maybeToList yearSuffix)
+      Just _ -> do
+        warn $ "date element for variable with non-date value " <>
+                fromVariable var
+        return NullOutput
+
+
+getYearSuffix :: CiteprocOutput a => Eval a (Maybe (Output a))
+getYearSuffix = do
+  disamb <- gets (referenceDisambiguation . stateReference)
+  sopts <- asks contextStyleOptions
+  -- we only want year suffix on first occurence of year
+  -- in a reference:
+  usedYearSuffix <- gets stateUsedYearSuffix
+  case disamb >>= disambYearSuffix of
+    Just c
+      | not (styleUsesYearSuffixVariable sopts)
+      , not usedYearSuffix
+      -> do
+        modify $ \st -> st{ stateUsedYearSuffix = True }
+        return $ Just $ Tagged (TagYearSuffix c)
+                         (Literal (fromText (showYearSuffix c)))
+      | otherwise -> return Nothing
+    Nothing  -> return Nothing
+
+formatSortDate :: CiteprocOutput a
+               => [DP] -> (Maybe Int, Maybe Int, Maybe Int) -> Output a
+formatSortDate dpSpecs (mbyr, mbmo, mbda) =
+  Literal $ fromText $ T.pack $  sortyr <> sortmo <> sortda
+ where
+  sortyr = case mbyr of
+             Just yr | any ((== DPYear) . dpName) dpSpecs
+                -> printf "%04d" (yr + 5000) -- to work with BC and AD
+             _  -> ""
+  sortmo = case mbmo of
+             Just mo | any ((== DPMonth) . dpName) dpSpecs
+                -> printf "%02d" mo
+             _  -> ""
+  sortda = case mbda of
+             Just da | any ((== DPDay) . dpName) dpSpecs
+                -> printf "%02d" da
+             _  -> ""
+
+formatDateParts :: CiteprocOutput a
+          => [DP] -> (DateParts, Maybe DateParts) -> Eval a [Output a]
+formatDateParts dpSpecs (date, mbNextDate) = do
+  inSortKey <- asks contextInSortKey
+  let (yr,mo,da) = bindDateParts date
+  case bindDateParts <$> mbNextDate of
+    Nothing
+      | inSortKey -> return [formatSortDate dpSpecs (yr, mo, da)]
+      | otherwise -> mapM (eDP (yr,mo,da)) dpSpecs
+    Just (nextyr, nextmo, nextda)
+      | inSortKey -> return [formatSortDate dpSpecs (yr, mo, da),
+                             Literal (fromText "-"),
+                             formatSortDate dpSpecs (nextyr, nextmo, nextda)]
+      | otherwise -> do
+        let isOpenRange = nextyr == Just 0 &&
+                          isNothing nextmo &&
+                          isNothing nextda
+        -- figure out where the range goes:
+        -- first to differ out of the items selected by dpSpecs, in order y->m->d
+        let dpToNs DPYear  = (yr, nextyr)
+            dpToNs DPMonth = (mo, nextmo)
+            dpToNs DPDay   = (da, nextda)
+        let areSame = takeWhile (uncurry (==) . dpToNs) $
+                        sort $ map dpName dpSpecs
+        let (sames1, rest) = span (\dp -> dpName dp `elem` areSame) dpSpecs
+        let (diffs, sames2) = span (\dp -> dpName dp `notElem` areSame) rest
+        let cleanup = filter (/= NullOutput)
+        sames1' <- cleanup <$> mapM (eDP (yr,mo,da)) sames1
+        diffsLeft' <- cleanup <$> mapM (eDP (yr,mo,da)) diffs
+        diffsRight' <- cleanup <$> mapM (eDP (nextyr,nextmo,nextda)) diffs
+        sames2' <- cleanup <$> mapM (eDP (yr,mo,da)) sames2
+        let rangeDelim = case sortOn dpName diffs of
+                                []     -> Nothing
+                                (dp:_) -> Just $ dpRangeDelimiter dp
+        let toRange xs ys =
+              case lastMay xs of
+                Just xlast ->
+                     initSafe xs ++
+                       [Formatted mempty{ formatDelimiter = rangeDelim }
+                       [xlast, headDef (Literal mempty) ys]] ++
+                     tailSafe ys
+                _ -> xs ++ ys
+
+        return $
+          if isOpenRange
+             then [Formatted mempty{ formatSuffix = rangeDelim }
+                      (removeLastSuffix $ sames1' ++ diffsLeft')]
+             else removeLastSuffix $
+                   sames1' ++
+                   toRange (removeLastSuffix diffsLeft')
+                           (removeFirstPrefix diffsRight') ++
+                   sames2'
+
+removeFirstPrefix :: [Output a] -> [Output a]
+removeFirstPrefix (Formatted f xs : rest) =
+  Formatted f{ formatPrefix = Nothing } xs : rest
+removeFirstPrefix xs = xs
+
+removeLastSuffix :: [Output a] -> [Output a]
+removeLastSuffix [] = []
+removeLastSuffix [Formatted f xs] =
+  [Formatted f{ formatSuffix = Nothing } xs ]
+removeLastSuffix (x:xs) = x : removeLastSuffix xs
+
+eDP :: CiteprocOutput a
+    => (Maybe Int, Maybe Int, Maybe Int) ->  DP -> Eval a (Output a)
+eDP (yr,mo,da) dp = do
+  let mbn = case dpName dp of
+               DPDay   -> da
+               DPMonth -> mo
+               DPYear  -> yr
+  case mbn of
+    Nothing -> return NullOutput
+    Just 0 | dpName dp == DPYear
+            -> return $ Literal mempty -- open date range
+    Just n  -> do
+      let litStr = return . Literal . fromText . T.pack
+      suffix <- case dpName dp of
+                  DPYear
+                    | n < 0
+                      -> (:[]) <$> lookupTerm' emptyTerm{ termName = "bc" }
+                    | n > 0
+                    , n < 1000
+                      -> (:[]) <$> lookupTerm' emptyTerm{ termName = "ad" }
+                    | otherwise -> return []
+                  _ -> return []
+      let n' = case dpName dp of
+                 DPYear -> abs n
+                 _      -> n
+      formatted (dpFormatting dp) . (:suffix) <$>
+          case dpForm dp of
+            DPNumeric             -> litStr (show n')
+            DPNumericLeadingZeros -> litStr (printf "%02d" n')
+            DPOrdinal             -> do
+              locale <- asks contextLocale
+              if localeLimitDayOrdinalsToDay1 locale == Just True && n' /= 1
+                 then litStr (show n')
+                 else evalNumber NumberOrdinal Nothing (NumVal n')
+            form -> do
+              let termForMonth s = emptyTerm{ termName = T.pack s
+                                            , termForm = if form == DPShort
+                                                            then Short
+                                                            else Long }
+
+              case dpName dp of
+                DPMonth | n <= 0 -> return NullOutput
+                        | n <= 12 ->
+                  lookupTerm' $ termForMonth (printf "month-%02d" n)
+                        | n <= 16 -> -- season pseudo-month
+                  lookupTerm' $ termForMonth (printf "season-%02d" (n - 12))
+                        | n <= 20 -> -- season pseudo-month
+                  lookupTerm' $ termForMonth (printf "season-%02d" (n - 16))
+                        | otherwise -> -- season pseudo-month
+                  lookupTerm' $ termForMonth (printf "season-%02d" (n - 20))
+                _                 -> litStr (show n')
+
+
+bindDateParts :: DateParts -> (Maybe Int, Maybe Int, Maybe Int)
+bindDateParts date =
+      case date of
+        DateParts (y:m:d:_) -> (Just y,Just m,Just d)
+        DateParts [y,m]     -> (Just y,Just m,Nothing)
+        DateParts [y]       -> (Just y,Nothing,Nothing)
+        _                   -> (Nothing,Nothing,Nothing)
+
+eNames :: CiteprocOutput a
+        => [Variable]
+        -> NamesFormat
+        -> [Element a]
+        -> Formatting
+        -> Eval a (Output a)
+eNames vars namesFormat' subst formatting' = do
+  substituteNamesForm <- asks contextSubstituteNamesForm
+  cNameFormat <- asks contextNameFormat
+  let formatting = formatting'{ formatDelimiter =
+                                formatDelimiter formatting' <|>
+                                nameDelimiter cNameFormat }
+  inSortKey <- asks contextInSortKey
+  let namesFormat =
+        case substituteNamesForm of
+          Nothing -> namesFormat'
+          Just subs ->
+            NamesFormat
+            { namesLabel           =
+                if inSortKey -- see test/csl/sort_DropNameLabelInSort.txt
+                   -- though this doesn't seem to be in the spec
+                   then Nothing
+                   else namesLabel namesFormat' <|> namesLabel subs
+            , namesEtAl            = namesEtAl namesFormat' <|>
+                                       namesEtAl subs
+            , namesName            = namesName namesFormat' <|>
+                                       namesName subs
+            , namesLabelBeforeName =
+                if isJust (namesName namesFormat') &&
+                   isJust (namesLabel namesFormat')
+                   then namesLabelBeforeName namesFormat'
+                   else namesLabelBeforeName subs
+            }
+
+  vars' <- if "editor" `elem` vars && "translator" `elem` vars
+              then do
+                ed <- askVariable "editor"
+                tr <- askVariable "translator"
+                let termform =
+                      case namesLabel namesFormat of
+                        Just (termform', _, _) -> termform'
+                        _ -> Long
+                mbterm <- lookupTerm'
+                            emptyTerm{ termName = "editortranslator"
+                                     , termForm = termform }
+                if ed == tr && mbterm /= NullOutput
+                   then return $ "editortranslator" :
+                        [v | v <- vars
+                           , v /= "editor"
+                           , v /= "translator"]
+                   else return vars
+              else return vars
+  inSubstitute <- asks contextInSubstitute
+  let (nameFormat, nameFormatting') =
+         case namesName namesFormat of
+           Nothing -> (cNameFormat, mempty)
+           Just (nf,f) -> (combineNameFormat nf cNameFormat, f)
+  let nameFormatting = nameFormatting' <>
+                       formatting{ formatPrefix = Nothing
+                                 , formatSuffix = Nothing
+                                 , formatDelimiter = Nothing }
+  rawContribs <- mapM (\var -> (var,) <$>
+                       askVariable
+                       (if var == "editortranslator"
+                           then "editor"
+                           else var)) vars'
+  if all (isNothing . snd) rawContribs
+     then
+       case subst of
+         els@(_:_) | not inSubstitute -> do
+           res <- withRWST
+                  (\ctx st -> (ctx{ contextInSubstitute = True
+                                  , contextSubstituteNamesForm =
+                                      Just namesFormat },
+                               st)) $ eSubstitute els
+           return $
+             case res of
+               (Tagged TagNames{} _:_) -> formatted formatting res
+               -- important to have title (or whatever) tagged as
+               -- substituting for Names, for purposes of
+               -- disambiguation:
+               _ -> formatted formatting
+                    [Tagged (TagNames "" namesFormat []) $ grouped res]
+         _ -> return NullOutput
+     else do
+        xs <- mapM (formatNames namesFormat nameFormat nameFormatting)
+               rawContribs
+        deleteSubstitutedVariables [v | (v, Just _) <- rawContribs ]
+
+        return $
+          case nameForm nameFormat of
+             Just CountName -> Literal $ fromText $ T.pack $ show $ length
+               [name
+                 | Tagged (TagName name) _ <- concatMap universe xs]
+             _ -> formatted mempty{ formatPrefix = formatPrefix formatting
+                                  , formatSuffix = formatSuffix formatting
+                                  , formatDelimiter =
+                                    formatDelimiter formatting } xs
+
+eSubstitute :: CiteprocOutput a
+            => [Element a]
+            -> Eval a [Output a]
+eSubstitute els =
+  case els of
+    [] -> return []
+    (e:es) -> do
+      res <- eElement e
+      case dropWhile (== NullOutput) res of
+        [] -> eSubstitute es
+        (x:_) -> return [x]
+
+formatNames :: CiteprocOutput a
+            => NamesFormat
+            -> NameFormat
+            -> Formatting
+            -> (Variable, Maybe (Val a))
+            -> Eval a (Output a)
+formatNames namesFormat nameFormat formatting (var, Just (NamesVal names)) =
+  do
+  isSubsequent <- (Subsequent `elem`) <$> asks contextPosition
+  isInBibliography <- asks contextInBibliography
+  let (etAlMin, etAlUseFirst) =
+        if not isInBibliography && isSubsequent
+           then (nameEtAlSubsequentMin nameFormat <|> nameEtAlMin nameFormat,
+                 nameEtAlSubsequentUseFirst nameFormat <|>
+                    nameEtAlUseFirst nameFormat)
+           else (nameEtAlMin nameFormat, nameEtAlUseFirst nameFormat)
+  inSortKey <- asks contextInSortKey
+  disamb <- gets (referenceDisambiguation . stateReference)
+  names' <- zipWithM (formatName nameFormat formatting) [1..] names
+  let delim' = fromMaybe ", " $
+                 (formatDelimiter formatting <|> nameDelimiter nameFormat)
+  let delim = case (beginsWithSpace <$> formatSuffix formatting,
+                    endsWithSpace <$> formatPrefix formatting) of
+                    (Just True, Just True) -> T.strip delim'
+                    (Just True, _)         -> T.stripStart delim'
+                    (_, Just True)         -> T.stripEnd delim'
+                    _                      -> delim'
+  let numnames = length names'
+  label <- case namesLabel namesFormat of
+             Just (termform, pluralize, lf) | not inSortKey ->
+               (:[]) <$> eLabel var termform pluralize lf
+             _ -> return []
+  mbAndTerm <- case nameAndStyle nameFormat of
+                  Just Symbol -> do
+                    ts <- lookupTerm emptyTerm { termName = "and"
+                                               , termForm = Symbol }
+                    case ts of
+                      (_,x):_ -> return $ Just x
+                      []      -> return $ Just "&"
+                  Just _ -> fmap snd . listToMaybe <$>
+                              lookupTerm emptyTerm { termName = "and"
+                                                   , termForm = Long }
+                  Nothing -> return Nothing
+  let finalNameIsOthers = (lastMay names >>= nameLiteral) == Just "others"
+        -- bibtex conversions often have this, and we want to render it "et al"
+  let etAlUseLast = fromMaybe False $ nameEtAlUseLast nameFormat
+  let etAlThreshold = case etAlMin of
+                        Just x | numnames >= x
+                          -> case (disamb >>= disambEtAlNames, etAlUseFirst) of
+                               (Just n, Just m) -> Just (max m n)
+                               (_, y) -> y
+                               | numnames < x
+                               , finalNameIsOthers -> Just (numnames - 1)
+                        _ -> Nothing
+  -- Is the name at (1-based) index i rendered inverted (family name
+  -- first)?  Only personal names can be inverted; literal names
+  -- cannot.  See name_DelimiterAfterInverted.txt.
+  let nameIsInverted i = maybe False (isJust . nameFamily)
+                           (atMay names (i - 1)) &&
+                         case nameAsSortOrder nameFormat of
+                           Just NameAsSortOrderAll   -> True
+                           Just NameAsSortOrderFirst -> i == 1
+                           Nothing                   -> False
+  let beforeLastDelim =
+        case mbAndTerm of
+          Nothing -> delim
+          Just _ ->
+             case fromMaybe PrecedesContextual
+                    (nameDelimiterPrecedesLast nameFormat) of
+                PrecedesContextual
+                  | numnames > 2          -> delim
+                  | otherwise             -> ""
+                PrecedesAfterInvertedName
+                  | nameIsInverted (numnames - 1) -> delim
+                  | otherwise                     -> ""
+                PrecedesAlways            -> delim
+                PrecedesNever             -> ""
+  let andPreSpace = case beforeLastDelim of
+        "" -> case formatSuffix formatting of
+                Just t | endsWithSpace t -> ""
+                _ -> " "
+        t | endsWithSpace t -> ""
+        _  -> " "
+  let andPostSpace = case formatPrefix formatting of
+                       Just t | beginsWithSpace t -> ""
+                       _ -> " "
+  let mbAndDelim = case mbAndTerm of
+                         Nothing -> Nothing
+                         Just t  -> Just (andPreSpace <> t <> andPostSpace)
+  let etAlPreSpace = case formatSuffix formatting of
+                       Just t | endsWithSpace t -> ""
+                       _ -> " "
+  let beforeEtAl =
+        case fromMaybe PrecedesContextual
+               (nameDelimiterPrecedesEtAl nameFormat) of
+            PrecedesContextual
+              | numnames > 2
+              , etAlThreshold > Just 1 -> delim
+              | otherwise              -> etAlPreSpace
+            PrecedesAfterInvertedName
+                  -> case etAlThreshold of
+                       Just t | nameIsInverted t -> delim
+                       _                         -> etAlPreSpace
+            PrecedesAlways            -> delim
+            PrecedesNever             -> etAlPreSpace
+  -- The "et al" marker is tagged so that subsequent-author-substitute
+  -- can identify and remove it (see 'replaceMatch').
+  let tagEtAl term = Tagged (TagTerm emptyTerm{ termName = term })
+  etAl <- case namesEtAl namesFormat of
+                Just (term, f) -> tagEtAl term <$>
+                 (withFormatting f{
+                    formatPrefix = removeDoubleSpaces <$>
+                      Just beforeEtAl <> formatPrefix f } $
+                  lookupTerm' emptyTerm{ termName = term })
+                Nothing
+                  | etAlUseLast && not finalNameIsOthers ->
+                    return $ tagEtAl "et-al" $
+                      Formatted mempty{ formatPrefix = Just beforeEtAl }
+                        [literal "\x2026 "] -- ellipses
+                  | otherwise   ->
+                      tagEtAl "et-al"
+                      . Formatted mempty{ formatPrefix = Just beforeEtAl }
+                      . (:[]) <$> lookupTerm' emptyTerm{ termName = "et-al" }
+  let addNameAndDelim name idx
+       | etAlThreshold == Just 0 = NullOutput
+       | idx == 1    = name
+       | maybe False (idx - 1 ==) etAlThreshold =
+         if inSortKey
+            then NullOutput
+            else etAl
+       | idx == numnames
+       , etAlUseLast
+       , not finalNameIsOthers
+       , maybe False (idx - 1 >=) etAlThreshold
+         = name
+       | maybe False (idx - 1 >) etAlThreshold = NullOutput
+       | inSortKey = name
+       | idx == numnames
+         = formatted mempty{ formatPrefix =
+                       Just (beforeLastDelim <> fromMaybe "" mbAndDelim) }
+            [name]
+       | otherwise = formatted mempty{ formatPrefix = Just delim } [name]
+  let names'' = zipWith addNameAndDelim names' [1..]
+  -- we set delimiter to Nothing because we're handling delim
+  -- manually, to allow for things like "and" and no final comma
+  return $ Tagged (TagNames var namesFormat names)
+         $ grouped $
+           if namesLabelBeforeName namesFormat
+              then label ++ names''
+              else names'' ++ label
+
+formatNames _ _ _ (var, Just x) = do
+  when (x /= SubstitutedVal) $
+    warn $ "ignoring non-name value for variable " <> fromVariable var
+  return NullOutput
+formatNames _ _ _ (_, Nothing) = return NullOutput
+
+formatName :: CiteprocOutput a
+           => NameFormat -> Formatting -> Int -> Name -> Eval a (Output a)
+formatName nameFormat formatting order name = do
+  disamb <- gets (referenceDisambiguation . stateReference)
+  let nameFormat' =
+        case M.lookup name . disambNameMap =<< disamb of
+          Nothing -> nameFormat
+          Just AddInitials
+            -> nameFormat{ nameForm = Just LongName }
+          Just AddInitialsIfPrimary
+            | order == 1  -> nameFormat{ nameForm = Just LongName }
+            | otherwise -> nameFormat
+          Just AddGivenName ->
+            nameFormat{ nameForm = Just LongName
+                      , nameInitialize = Just False
+                      }
+          Just AddGivenNameIfPrimary
+            | order == 1 ->
+               nameFormat{ nameForm = Just LongName
+                         , nameInitialize = Just False
+                         }
+            | otherwise -> nameFormat
+  Tagged (TagName name) <$>
+    case nameLiteral name of
+      Just t  -> return $ formatted formatting
+                        $ maybe [literal t]
+                          (\f -> [Formatted f [literal t]])
+                          (nameFamilyFormatting nameFormat)
+      Nothing -> getDisplayName nameFormat' formatting order name
+
+
+getNamePartSortOrder :: Name -> Eval a [Text]
+getNamePartSortOrder name = do
+  demoteNonDroppingParticle <-
+    asks (styleDemoteNonDroppingParticle . contextStyleOptions)
+  map (fromMaybe mempty) <$>
+    case nameLiteral name of
+      Nothing
+        | isByzantineName name
+           -> return $
+                   case demoteNonDroppingParticle of
+                     DemoteNever ->
+                           [nameNonDroppingParticle name <> nameFamily name,
+                            nameDroppingParticle name,
+                            nameGiven name,
+                            nameSuffix name]
+                     _ ->  [nameFamily name,
+                            nameDroppingParticle name <>
+                              nameNonDroppingParticle name,
+                            nameGiven name,
+                            nameSuffix name]
+        | otherwise
+           -> return [nameFamily name,
+                      nameGiven name]
+      Just n -> return [Just n]
+
+literal :: CiteprocOutput a => Text -> Output a
+literal = Literal . fromText
+
+-- 1 = a, 26 = z, 27 = aa, 702 = zz, 703 = aaa, ... (bijective base 26)
+showYearSuffix :: Int -> Text
+showYearSuffix = T.pack . go ""
+ where
+  go s x
+    | x < 1     = s
+    | otherwise = let (q, r) = (x - 1) `divMod` 26
+                   in go (chr (ord 'a' + r) : s) q
+
+initialize :: Maybe Lang
+           -> Bool       -- ^ initialize
+           -> Bool       -- ^ with hyphen
+           -> Text       -- ^ initialize with (suffix)
+           -> Text
+           -> Text
+initialize mblang makeInitials useHyphen initializeWith =
+   stripSpaces . T.replace " -" "-" . mconcat . map initializeWord . splitWords
+  where
+   stripSpaces = T.dropWhile (==' ') . T.dropWhileEnd (==' ') -- preserve nbsp
+   -- Left values are already initials
+   -- Right values are not
+   splitWords =
+     reverse . (\(ws,cs) ->
+                  case cs of
+                    [] -> ws
+                    [d] -> Left (T.singleton d) : ws
+                    _   -> Right (T.pack (reverse cs)) : ws) .
+     T.foldl'
+     (\(ws, cs) c ->
+       case c of
+         '.' | null cs   -> (ws, [])
+             | otherwise -> (Left (T.pack (reverse cs)) : ws, [])
+         '-' | null cs   -> (ws, ['-'])
+             | otherwise -> (Right (T.pack (reverse cs)) : ws, ['-'])
+         ' ' -> case cs of
+                  []  -> (ws, cs)
+                  [d] -> (Left (T.singleton d) : ws, [])
+                  _   -> (Right (T.pack (reverse cs)) : ws, [])
+         _   -> (ws, c:cs))
+     ([], mempty)
+   addSuffix t
+     | T.null t  = mempty
+     | otherwise = t <> initializeWith
+   toInitial t =
+       case T.uncons t of
+         Just ('-', t') ->
+           case T.uncons t' of
+             Just (c, _)
+               | isUpper c
+               , useHyphen -> "-" <> Unicode.toUpper mblang (T.singleton c)
+               | isUpper c -> Unicode.toUpper mblang (T.singleton c)
+             _ -> mempty  -- e.g. Ji-ping -> J. not J.-p.
+         Just (c, t')
+           -- a caseless romanesque script (Arabic, Hebrew, Thai)
+           | isCaseless c -> T.singleton c
+           | isUpper c ->
+             case T.uncons t' of
+               Just (d, t'')
+                 | isUpper d  -- see test/csl/name_LongAbbreviation.txt
+                 , not (T.null t'')
+                 , T.all isLower t''
+                 -> T.singleton c <> Unicode.toLower mblang (T.singleton d)
+               _ -> T.singleton c
+         _ -> t
+   isCaseless c = isLetter c && not (isUpper c) && not (isLower c)
+                  && isByzantine (T.singleton c)
+   initializeWord (Left t) -- Left values already initialized
+     = addSuffix t
+   initializeWord (Right t) -- Right values not already initialized
+     | T.all isLower t = if endsWithSpace initializeWith
+                            then t <> " "
+                            else " " <> t <> " "
+       -- a word in a non-romanesque script (e.g. CJK) is not
+       -- initialized, and takes no initialize-with suffix
+     | not (isByzantine t) = t <> " "
+     | makeInitials    = (addSuffix . toInitial) t
+     | otherwise       = t <> " "
+
+getDisplayName :: CiteprocOutput a
+               => NameFormat -> Formatting -> Int -> Name -> Eval a (Output a)
+getDisplayName nameFormat formatting order name = do
+  inSortKey <- asks contextInSortKey
+  demoteNonDroppingParticle <-
+    asks (styleDemoteNonDroppingParticle . contextStyleOptions)
+  initializeWithHyphen <-
+    asks (styleInitializeWithHyphen . contextStyleOptions)
+  mblang <- asks (localeLanguage . contextLocale)
+  let initialize' =
+        case nameFamily name of
+          Nothing -> id
+          Just _ ->
+            case nameInitializeWith nameFormat of
+              Just initializeWith ->
+                initialize
+                mblang
+                (fromMaybe True (nameInitialize nameFormat))
+                initializeWithHyphen
+                initializeWith
+              Nothing -> id
+  let separator = fromMaybe ", " $ nameSortSeparator nameFormat
+  let x <+> NullOutput = x
+      NullOutput <+> x = x
+      Literal x <+> y =
+        case T.unsnoc (toText x) of
+          Just (_, c) | c == '’' || c == '\'' || c == '-' || c == '\x2013' ||
+                        c == '\xa0' ->
+               formatted mempty [Literal x, y]
+          _ | isByzantineName name ->
+               formatted mempty{ formatDelimiter = Just " " } [Literal x, y]
+            | otherwise -> formatted mempty [Literal x, y]
+      Formatted f x <+> y =
+        formatted mempty{ formatDelimiter =
+                            case formatSuffix f of
+                              Just t | endsWithSpace t -> Nothing
+                              _ -> Just " " } [formatted f x, y]
+      Linked i x <+> y =
+        formatted mempty{ formatDelimiter = Just " " } [Linked i x, y]
+      Tagged _ x <+> y = x <+> y
+      InNote x <+> y = x <+> y
+  let x <:> NullOutput = x
+      NullOutput <:> x = x
+      Literal x <:> y =
+        formatted mempty{ formatDelimiter = Just separator } [Literal x, y]
+      Formatted f x <:> y = formatted
+        (mempty{ formatDelimiter = Just separator }) [Formatted f x, y]
+      Linked i x <:> y = formatted
+        (mempty{ formatDelimiter = Just separator }) [Linked i x, y]
+      Tagged _ x <:> y = x <:> y
+      InNote x <:> y = x <:> y
+
+  let familyAffixes = formatted
+          (case nameFamilyFormatting nameFormat of
+             Nothing -> mempty
+             Just f  -> mempty{ formatSuffix = formatSuffix f
+                              , formatPrefix = formatPrefix f })
+  let givenAffixes = formatted
+          (case nameGivenFormatting nameFormat of
+             Nothing -> mempty
+             Just f  -> mempty{ formatSuffix = formatSuffix f
+                              , formatPrefix = formatPrefix f })
+  let familyFormatting = formatted
+          (case nameFamilyFormatting nameFormat of
+             Nothing -> mempty
+             Just f  -> f{ formatSuffix = Nothing
+                         , formatPrefix = Nothing })
+  let givenFormatting = formatted
+          (case nameGivenFormatting nameFormat of
+             Nothing -> mempty
+             Just f  -> f{ formatSuffix = Nothing
+                         , formatPrefix = Nothing })
+  let nonDroppingParticle =
+        maybe NullOutput (familyFormatting . (:[]) . literal) $
+          nameNonDroppingParticle name
+  let droppingParticle =
+        maybe NullOutput (givenFormatting . (:[]) . literal) $
+          nameDroppingParticle name
+  let given =
+        maybe NullOutput (givenFormatting . (:[]) . literal . initialize') $
+          nameGiven name
+  let family =
+        maybe NullOutput (familyFormatting . (:[]) . literal) $
+          nameFamily name
+  let suffix = maybe NullOutput literal $ nameSuffix name
+  let nameAsSort = case nameAsSortOrder nameFormat of
+                          Just NameAsSortOrderAll -> True
+                          Just NameAsSortOrderFirst -> order == 1
+                          _ -> False
+  return $ formatted formatting . (:[]) $
+    if isByzantineName name
+       then
+         case fromMaybe LongName (nameForm nameFormat) of
+              LongName
+                | demoteNonDroppingParticle == DemoteNever
+                , inSortKey || nameAsSort ->
+                      familyAffixes
+                      [ nonDroppingParticle <+>
+                        family ] <:>
+                      givenAffixes
+                      [ given <+>
+                        droppingParticle ] <:>
+                      suffix
+                | demoteNonDroppingParticle == DemoteSortOnly
+                , inSortKey ->
+                      familyAffixes
+                      [ family ] <:>
+                      givenAffixes
+                      [ given <+>
+                        droppingParticle <+>
+                        nonDroppingParticle ] <:>
+                      suffix
+                | demoteNonDroppingParticle == DemoteSortOnly
+                , nameAsSort ->
+                      familyAffixes
+                      [ nonDroppingParticle <+>
+                        family ] <:>
+                      givenAffixes
+                      [ given <+>
+                        droppingParticle ] <:>
+                      suffix
+                | demoteNonDroppingParticle == DemoteDisplayAndSort
+                , inSortKey || nameAsSort ->
+                      familyAffixes
+                      [ family ] <:>
+                      givenAffixes
+                      [ given <+>
+                        droppingParticle <+>
+                        nonDroppingParticle ] <:>
+                      suffix
+                | nameCommaSuffix name ->
+                      givenAffixes
+                      [ given ] <+>
+                      familyAffixes
+                      [ droppingParticle <+>
+                        nonDroppingParticle <+>
+                        family <:>
+                        suffix ]
+                | otherwise ->
+                      givenAffixes
+                      [ given ] <+>
+                      familyAffixes
+                      [ droppingParticle <+>
+                        nonDroppingParticle <+>
+                        family <+>
+                        suffix ]
+              ShortName ->
+                      familyAffixes
+                      [ nonDroppingParticle <+>
+                        family ]
+              CountName -> NullOutput
+       else
+         case fromMaybe LongName (nameForm nameFormat) of
+              LongName  -> grouped
+                [ familyAffixes
+                  [ family ]
+                , givenAffixes
+                  [ given ] ]
+              ShortName -> familyAffixes
+                             [ family ]
+              CountName -> NullOutput
+
+
+eGroup :: CiteprocOutput a
+          => Bool -> Formatting -> [Element a] -> Eval a (Output a)
+eGroup isMacro formatting els = do
+  -- A group is suppressed if it directly or indirectly
+  -- calls at least one variable but all of the variables
+  -- it calls are empty.
+  VarCount oldVars oldNonempty <- gets stateVarCount
+  xs <- eElements els
+  VarCount newVars newNonempty <- gets stateVarCount
+  let isempty = newVars /= oldVars && newNonempty == oldNonempty
+
+  -- see
+  -- https://github.com/citation-style-language/documentation/blob/master/specification.rst#group
+  -- "When a cs:group contains a child cs:macro, if the cs:macro is
+  -- non-empty, it is treated as a non-empty variable for the purposes of
+  -- determining suppression of the outer cs:group."
+  when (isMacro && not isempty) $ updateVarCount 1 1
+  return $ if not isempty
+              then formatted formatting xs
+              else NullOutput
+
+eChoose :: CiteprocOutput a
+        => [(Match, [Condition], [Element a])] -> Eval a [Output a]
+eChoose [] = return []
+eChoose ((match, conditions, els):rest) = do
+  ref <- gets stateReference
+  label <- asks contextLabel
+  let disambiguate = maybe False
+                      disambCondition (referenceDisambiguation ref)
+  positions <- asks contextPosition
+  locator <- asks contextLocator
+  let hasLocator = isJust locator
+  let isNumericChunk t =
+        case T.dropWhile isLetter (T.dropWhileEnd isLetter (T.strip t)) of
+          t' | T.null t' -> False
+             | T.all isDigit t' -> True
+             | otherwise -> False
+  let isNumeric t = all isNumericChunk
+        (T.split (\c -> c == ',' || c == '-' || c == '&' || c == '\x2013') t)
+  let testCondition cond =
+        case cond of
+           HasVariable "locator" -> hasLocator
+           HasVariable t ->
+             case lookupVariable t ref of
+               Just x  -> isNonEmpty x
+               Nothing -> False
+           HasType ts ->
+             case lookupVariable "type" ref of
+               Just (TextVal ty) -> ty `elem` ts
+               _ -> False
+           IsUncertainDate t -> case lookupVariable t ref of
+                                  Just (DateVal d) -> dateCirca d
+                                  _                -> False
+           IsNumeric t
+             | t == "locator" -> maybe False isNumeric locator
+             | otherwise -> case lookupVariable t ref of
+                              Just (NumVal _)   -> True
+                              Just (TextVal x)  -> isNumeric x
+                              Just (FancyVal x) -> isNumeric (toText x)
+                              _                 -> False
+           HasLocatorType t -> case label of
+                                 Just "sub verbo" -> t == "sub-verbo"
+                                 Just x -> toVariable x == t
+                                 Nothing -> t == "page" && hasLocator
+           HasPosition pos -> pos `elem` positions
+           WouldDisambiguate -> disambiguate
+  let matched = (case match of
+                   MatchAll  -> all testCondition
+                   MatchAny  -> any testCondition
+                   MatchNone -> not . any testCondition) conditions
+  if matched
+     then eElements els
+     else eChoose rest
+
+
+eNumber :: CiteprocOutput a => Variable -> NumberForm -> Eval a (Output a)
+eNumber var nform = do
+  mbv <- askVariable var
+  varTerms <- lookupTerm emptyTerm { termName = fromVariable var }
+  let mbGender = case varTerms of
+                   [] -> Nothing
+                   ((t,_):_) -> termGender t
+  let nparts = case mbv of
+                 Just x@NumVal{}   -> [x]
+                 Just (FancyVal x) -> splitNums (toText x)
+                 Just (TextVal t)  -> splitNums t
+                 _                 -> []
+  unless (isNothing mbv) $ deleteSubstitutedVariables [var]
+  grouped <$> mapM (evalNumber nform mbGender) nparts
+
+evalNumber :: CiteprocOutput a
+           => NumberForm -> Maybe TermGender -> Val a -> Eval a (Output a)
+evalNumber form mbGender (NumVal i) = do
+  let numterm s x = emptyTerm { termName = T.pack $ printf s x
+                              , termGenderForm = mbGender }
+  let dectext = T.pack (show i)
+  let twomatch = numterm "ordinal-%02d" (i `mod` 100)
+  let onematch = numterm "ordinal-%02d" (i `mod` 10)
+  let fallback = emptyTerm { termName = "ordinal" }
+  case form of
+    NumberNumeric -> return $ Literal $ fromText dectext
+    NumberOrdinal -> do
+      res <- (if i > 99
+                 then filter (\(t,_) -> termMatch t /= Just WholeNumber)
+                 else id) <$> lookupTerm twomatch
+      locale <- asks contextLocale
+      case res of
+        ((_,suff):_) ->
+          return $ Literal $ fromText dectext <> parseCslJson locale suff
+        [] -> do -- not an exact match
+          res' <- (if i > 10
+                      then filter (\(t,_) ->
+                             isNothing (termMatch t) ||
+                             termMatch t == Just LastDigit)
+                      else id) <$> lookupTerm onematch
+          case res' of
+            ((_,suff):_) ->
+              return $ Literal $ fromText dectext <> parseCslJson locale suff
+            [] -> do
+              res'' <- lookupTerm fallback
+              case res'' of
+                ((_,suff):_) ->
+                  return $ Literal $ fromText dectext <> parseCslJson locale suff
+                [] -> do
+                  warn $ "no ordinal suffix found for " <> dectext
+                  return $ Literal $ fromText (T.pack (show i))
+    NumberLongOrdinal
+      | i >= 1
+      , i <= 10 -> do
+        res <- lookupTerm (numterm "long-ordinal-%02d" i)
+        case res of
+          ((_,t):_) -> return $ Literal $ fromText t
+          []        -> evalNumber NumberOrdinal mbGender (NumVal i)
+      | otherwise -> evalNumber NumberOrdinal mbGender (NumVal i)
+    NumberRoman -> return $ Literal $ fromText $ toRomanNumeral i
+evalNumber _ _ (TextVal t) = return $ Literal $ fromText t
+evalNumber _ _ (FancyVal t) = return $ Literal t
+evalNumber _ _ _ = return NullOutput
+
+
+warn :: Text -> Eval a ()
+warn t = tell $ Set.singleton t
+
+-- | Convert number < 4000 to lowercase roman numeral.
+toRomanNumeral :: Int -> Text
+toRomanNumeral x
+  | x >= 4000 || x < 0 = T.pack (show x)
+  | x >= 1000 = "m" <> toRomanNumeral (x - 1000)
+  | x >= 900  = "cm" <> toRomanNumeral (x - 900)
+  | x >= 500  = "d" <> toRomanNumeral (x - 500)
+  | x >= 400  = "cd" <> toRomanNumeral (x - 400)
+  | x >= 100  = "c" <> toRomanNumeral (x - 100)
+  | x >= 90   = "xc" <> toRomanNumeral (x - 90)
+  | x >= 50   = "l"  <> toRomanNumeral (x - 50)
+  | x >= 40   = "xl" <> toRomanNumeral (x - 40)
+  | x >= 10   = "x" <> toRomanNumeral (x - 10)
+  | x == 9    = "ix"
+  | x >= 5    = "v" <> toRomanNumeral (x - 5)
+  | x == 4    = "iv"
+  | x >= 1    = "i" <> toRomanNumeral (x - 1)
+  | x == 0    = ""
+  | otherwise = T.pack (show x)
+
+-- Gets variable while updating var count.
+askVariable :: CiteprocOutput a => Variable -> Eval a (Maybe (Val a))
+askVariable "page-first" = do
+  res <- askVariable "page"
+  case res of
+    Just (TextVal t)  ->
+      return $ Just $ TextVal $ T.takeWhile (not . isSepPunct) t
+    Just (FancyVal x) ->
+      return $ Just $ TextVal $ T.takeWhile (not . isSepPunct) $ toText x
+    Just (NumVal n)   -> return $ Just $ NumVal n
+    _                 -> return Nothing
+askVariable v = do
+  ref <- gets stateReference
+  case lookupVariable v ref of
+    Just x | isNonEmpty x && x /= SubstitutedVal -> do
+      updateVarCount 1 1
+      return $ Just x
+    _ -> do
+      updateVarCount 1 0
+      return Nothing
+
+isNonEmpty :: CiteprocOutput a => Val a -> Bool
+isNonEmpty (TextVal t) = not (T.null t)
+isNonEmpty (FancyVal x) = x /= mempty
+isNonEmpty (NamesVal []) = False
+isNonEmpty (DateVal (Date [] _ Nothing Nothing)) = False
+isNonEmpty _       = True
+
+citationLabel :: Reference a -> Val a
+citationLabel ref = TextVal trigraph
+ where
+  trigraph = namepart <> datepart
+  datepart = case M.lookup "issued" varmap of
+               Just (DateVal d) -> getYear d
+               _ -> ""
+  namepart = if "author" `elem` namevars
+                then getNames "author"
+                else case namevars of
+                       (n:_) -> getNames n
+                       _     -> "Xyz"
+  varmap = referenceVariables ref
+  vars = M.keys varmap
+  namevars = [v | v <- vars, variableType v == NameVariable]
+  getNames var = case M.lookup var varmap of
+                   Just (NamesVal ns) ->
+                     let x = case length ns of
+                               1  -> 4
+                               n | n >= 4 -> 1
+                                 | otherwise -> 2
+                     in mconcat $
+                        map (T.take x . fromMaybe "" .  nameFamily)
+                        (take 4 ns)
+                   _ -> ""
+  getYear d = case dateParts d of
+                (DateParts (x:_):_) ->
+                  T.pack (printf "%02d" $ x `mod` 100)
+                _ -> ""
+
+-- | Collapse each run of spaces to a single space.
+removeDoubleSpaces :: Text -> Text
+removeDoubleSpaces t =
+  let t' = T.replace "  " " " t
+   in if t' == t
+         then t
+         else removeDoubleSpaces t'
+
+endsWithSpace :: Text -> Bool
+endsWithSpace t = not (T.null t) && isSpace (T.last t)
+
+beginsWithSpace :: Text -> Bool
+beginsWithSpace t = not (T.null t) && isSpace (T.head t)
+
+eitherToMaybe :: Either a b -> Maybe b
+eitherToMaybe (Left _) = Nothing
+eitherToMaybe (Right x) = Just x
 
diff --git a/src/Citeproc/Locale.hs b/src/Citeproc/Locale.hs
--- a/src/Citeproc/Locale.hs
+++ b/src/Citeproc/Locale.hs
@@ -3,15 +3,13 @@
 module Citeproc.Locale
   ( parseLocale,
     getLocale,
-    getPrimaryDialect,
-    lookupQuotes
+    getPrimaryDialect
   )
 where
 import Citeproc.Types
 import Citeproc.Element (runElementParser, pLocale)
 import Citeproc.Data (localeFiles)
 import qualified Data.Map as M
-import Data.Maybe (fromMaybe)
 import Data.Text (Text)
 import qualified Text.XML as X
 import System.FilePath (takeExtension, dropExtension)
@@ -107,19 +105,4 @@
                (\l -> M.lookup (toCode l) locales)) of
         Just loc -> loc
         Nothing  -> Left $ CiteprocLocaleNotFound $ renderLang lang
-
-lookupTerm :: Locale -> Text -> Maybe Text
-lookupTerm locale termname = do
-  let terms = localeTerms locale
-  case M.lookup termname terms of
-     Just ((_,t):_) -> Just t
-     _              -> Nothing
-
-lookupQuotes :: Locale -> ((Text, Text), (Text, Text))
-lookupQuotes locale = ((outerOpen, outerClose), (innerOpen, innerClose))
- where
-  outerOpen = fromMaybe "\x201C" $ lookupTerm locale "open-quote"
-  outerClose = fromMaybe "\x201D" $ lookupTerm locale "close-quote"
-  innerOpen = fromMaybe "\x2018" $ lookupTerm locale "open-inner-quote"
-  innerClose = fromMaybe "\x2019" $ lookupTerm locale "close-inner-quote"
 
diff --git a/src/Citeproc/Pandoc.hs b/src/Citeproc/Pandoc.hs
--- a/src/Citeproc/Pandoc.hs
+++ b/src/Citeproc/Pandoc.hs
@@ -17,11 +17,10 @@
 import Citeproc.CaseTransform
 import Control.Monad.Trans.State.Strict as S
 import Control.Monad (unless, when)
-import Citeproc.Locale (lookupQuotes)
-import Data.Functor.Reverse
 import Data.Char (isSpace, isPunctuation, isAlphaNum)
 
 instance CiteprocOutput Inlines where
+  isEmpty               = null
   toText                = stringify
   fromText t            = (if " " `T.isPrefixOf` t
                               then B.space
@@ -63,6 +62,7 @@
       CapitalizeAll    -> caseTransform mblang withCapitalizeWords
       SentenceCase     -> caseTransform mblang withSentenceCase
       TitleCase        -> caseTransform mblang withTitleCase
+      PreserveCase     -> B.spanWith ("",["nocase"],[])
   addDisplay x          =
     case x of
       DisplayBlock       -> B.spanWith ("",["csl-block"],[])
@@ -119,37 +119,43 @@
       Just (c,_) -> c == '.' || c == ','
       Nothing    -> False
   go [] = []
-  go (Span ("",["csl-quoted"],[]) xs : Str t : rest)
-    | startsWithMovable t
-      = Span ("",["csl-quoted"],[])
-           (xs ++ [Str (T.take 1 t) | not (endWithPunct True xs)]) :
-        if T.length t == 1
-           then go rest
-           else Str (T.drop 1 t) : go rest
-  go (Quoted qt xs : Str t : rest)
+  go (x : Str t : rest)
     | startsWithMovable t
-      = Quoted qt
-           (xs ++ [Str (T.take 1 t) | not (endWithPunct True xs)]) :
+    , Just (wrap, xs) <- endingQuote x
+      = wrap (xs ++ [Str (T.take 1 t) | not (endWithPunct xs)]) :
         if T.length t == 1
            then go rest
            else Str (T.drop 1 t) : go rest
   go (x:xs) = x : go xs
+  endingQuote (Span ("",["csl-quoted"],[]) xs) =
+    Just (Span ("",["csl-quoted"],[]), xs)
+  endingQuote (Quoted qt xs) = Just (Quoted qt, xs)
+  endingQuote (Emph xs) = lastQuote Emph xs
+  endingQuote (Strong xs) = lastQuote Strong xs
+  endingQuote (SmallCaps xs) = lastQuote SmallCaps xs
+  endingQuote (Underline xs) = lastQuote Underline xs
+  endingQuote (Span attr xs) = lastQuote (Span attr) xs
+  endingQuote (Link attr xs target) = lastQuote (\ys -> Link attr ys target) xs
+  endingQuote _ = Nothing
+  lastQuote _ [] = Nothing
+  lastQuote wrap xs = do
+    (wrapQuote, quoted) <- endingQuote (last xs)
+    return (\ys -> wrap (init xs ++ [wrapQuote ys]), quoted)
 
-endWithPunct :: Bool -> [Inline] -> Bool
-endWithPunct _ [] = False
-endWithPunct onlyFinal xs@(_:_) =
-  case reverse (T.unpack $ stringify xs) of
-       []                       -> True
-       -- covers .), .", etc.:
-       (d:c:_) | isPunctuation d
-                 && not onlyFinal
-                 && isEndPunct c -> True
-       (c:_) | isEndPunct c      -> True
-             | otherwise         -> False
-  where isEndPunct c = c `elem` (".,;:!?" :: String)
+endWithPunct :: [Inline] -> Bool
+endWithPunct [] = False
+endWithPunct xs =
+  case T.unsnoc (stringify xs) of
+    Nothing     -> True   -- no text content
+    Just (_, c) -> c `elem` (".,;:!?" :: String)
 
+-- Trimming can reduce a Str, Space, or SoftBreak to an empty Str;
+-- remove these leftovers, at all nesting levels.
+removeEmptyStrs :: Inlines -> Inlines
+removeEmptyStrs = B.fromList . walk (filter (/= Str "")) . B.toList
+
 dropTextWhile' :: (Char -> Bool) -> Inlines -> Inlines
-dropTextWhile' f ils = evalState (walkM go ils) True
+dropTextWhile' f ils = removeEmptyStrs $ evalState (walkM go ils) True
  where
   go x = do
     atStart <- get
@@ -171,10 +177,17 @@
        else return x
 
 
+-- The state records whether we are still at the end, i.e. have not
+-- yet encountered a character that shouldn't be dropped.  We need an
+-- explicit traversal (rather than walkM over Reverse) so that the
+-- children of nested inlines are also processed from right to left.
 dropTextWhileEnd' :: (Char -> Bool) -> Inlines -> Inlines
 dropTextWhileEnd' f ils =
-  getReverse $ evalState (walkM go $ Reverse ils) True
+  removeEmptyStrs $ evalState (fmap B.fromList . goList . B.toList $ ils) True
  where
+  goList :: [Inline] -> State Bool [Inline]
+  goList = fmap reverse . mapM go . reverse
+  go :: Inline -> State Bool Inline
   go x = do
     atEnd <- get
     if atEnd
@@ -185,9 +198,25 @@
              unless (T.null t') $
                put False
              return $ Str t'
-           _ | x == Space || x == SoftBreak
-             , f ' ' -> return $ Str ""
-             | otherwise -> return x
+           Space
+             | f ' '     -> return $ Str ""
+             | otherwise -> put False >> return x
+           SoftBreak
+             | f ' '     -> return $ Str ""
+             | otherwise -> put False >> return x
+           Emph xs -> Emph <$> goList xs
+           Underline xs -> Underline <$> goList xs
+           Strong xs -> Strong <$> goList xs
+           Strikeout xs -> Strikeout <$> goList xs
+           Superscript xs -> Superscript <$> goList xs
+           Subscript xs -> Subscript <$> goList xs
+           SmallCaps xs -> SmallCaps <$> goList xs
+           Quoted qt xs -> Quoted qt <$> goList xs
+           Cite cs xs -> Cite cs <$> goList xs
+           Span attr xs -> Span attr <$> goList xs
+           Link attr xs t -> (\xs' -> Link attr xs' t) <$> goList xs
+           Image attr xs t -> (\xs' -> Image attr xs' t) <$> goList xs
+           _ -> return x
        else return x
 
 -- taken from Text.Pandoc.Shared:
@@ -256,7 +285,6 @@
             st <- get
             case st of
               AfterWordChar | classes == ["nocase"]
-                   -- we need to apply g to update the state:
                 -> return' $ Span nullAttr zs
               _ -> return' $ Span attr zs
       | otherwise = Span attr <$> mapM go zs
diff --git a/src/Citeproc/Style.hs b/src/Citeproc/Style.hs
--- a/src/Citeproc/Style.hs
+++ b/src/Citeproc/Style.hs
@@ -18,7 +18,6 @@
 import Data.Maybe (fromMaybe, isNothing)
 import Data.Default (def)
 import qualified Data.Text.Lazy as TL
-import Control.Monad.Trans.Reader (local)
 
 -- | Merge the locale specified by the first parameter, if any,
 -- with the default locale of the style and locale definitions
@@ -96,136 +95,135 @@
 
 pStyle :: Maybe Lang -> X.Element -> ElementParser (Style a)
 pStyle defaultLocale node = do
-  let attrmap = getInheritableNameAttributes node
-  local (<> attrmap) $ do
-    let attr = getAttributes node
-    macroMap <- M.fromList <$> mapM pMacro (getChildren "macro" node)
-    (cattr, citations)
-        <- case getChildren "citation" node of
-                   [n] -> (getAttributes n,) <$> pLayout macroMap n
-                   []  -> parseFailure "No citation element present"
-                   _   -> parseFailure "More than one citation element present"
-    (battr, bibliography) <- case getChildren "bibliography" node of
-                      [n] -> (\z -> (getAttributes n, Just z))
-                                <$> pLayout macroMap n
-                      []  -> return (mempty, Nothing)
-                      _   -> parseFailure
-                               "More than one bibliography element present"
+  let attr = getAttributes node
+  let nameformat = getInheritableNameFormat attr
+  macros <- M.fromList <$> mapM pMacro (getChildren "macro" node)
+  (cattr, citations)
+      <- case getChildren "citation" node of
+                 [n] -> (getAttributes n,) <$> pLayout n
+                 []  -> parseFailure "No citation element present"
+                 _   -> parseFailure "More than one citation element present"
+  (battr, bibliography) <- case getChildren "bibliography" node of
+                    [n] -> (\z -> (getAttributes n, Just z))
+                              <$> pLayout n
+                    []  -> return (mempty, Nothing)
+                    _   -> parseFailure
+                             "More than one bibliography element present"
 
-    let disambiguateGivenNameRule =
-          case lookupAttribute "givenname-disambiguation-rule" cattr of
-            Just "all-names" -> AllNames
-            Just "all-names-with-initials" -> AllNamesWithInitials
-            Just "primary-name" -> PrimaryName
-            Just "primary-name-with-initials" -> PrimaryNameWithInitials
-            _ -> ByCite
+  let disambiguateGivenNameRule =
+        case lookupAttribute "givenname-disambiguation-rule" cattr of
+          Just "all-names" -> AllNames
+          Just "all-names-with-initials" -> AllNamesWithInitials
+          Just "primary-name" -> PrimaryName
+          Just "primary-name-with-initials" -> PrimaryNameWithInitials
+          _ -> ByCite
 
-    let disambigStrategy =
-          DisambiguationStrategy
-          { disambiguateAddNames =
-              lookupAttribute "disambiguate-add-names" cattr == Just "true"
-          , disambiguateAddGivenNames =
-              case lookupAttribute "disambiguate-add-givenname" cattr of
-                Just "true" -> Just disambiguateGivenNameRule
-                _           -> Nothing
-          , disambiguateAddYearSuffix =
-             lookupAttribute "disambiguate-add-year-suffix" cattr ==
-               Just "true"
-          }
+  let disambigStrategy =
+        DisambiguationStrategy
+        { disambiguateAddNames =
+            lookupAttribute "disambiguate-add-names" cattr == Just "true"
+        , disambiguateAddGivenNames =
+            case lookupAttribute "disambiguate-add-givenname" cattr of
+              Just "true" -> Just disambiguateGivenNameRule
+              _           -> Nothing
+        , disambiguateAddYearSuffix =
+           lookupAttribute "disambiguate-add-year-suffix" cattr ==
+             Just "true"
+        }
 
-    let hasYearSuffixVariable
-          (Element (EText (TextVariable _ "year-suffix")) _) = True
-        hasYearSuffixVariable
-          (Element (EGroup _ es) _) = any hasYearSuffixVariable es
-        hasYearSuffixVariable
-          (Element (EChoose []) _) = False
-        hasYearSuffixVariable
-          (Element (EChoose ((_,_,es):conds)) f) =
-            any hasYearSuffixVariable es ||
+  let hasYearSuffixVariable (Element e f) =
+        case e of
+          EText (TextVariable _ "year-suffix") -> True
+          EText (TextMacro macroname)
+            | Just es' <- M.lookup macroname macros ->
+                 any hasYearSuffixVariable es'
+          EGroup _ es -> any hasYearSuffixVariable es
+          EChoose [] -> False
+          EChoose ((_,_,es):conds) -> any hasYearSuffixVariable es ||
               hasYearSuffixVariable (Element (EChoose conds) f)
-        hasYearSuffixVariable _ = False
-    let usesYearSuffixVariable =
-          any hasYearSuffixVariable $
-            layoutElements citations ++ maybe [] layoutElements bibliography
-
-    let sOpts = StyleOptions
-                 { styleIsNoteStyle =
-                     case lookupAttribute "class" attr of
-                       Just "note" -> True
-                       Nothing     -> True
-                       _           -> False
-                 , styleDefaultLocale = defaultLocale
-                 , styleDemoteNonDroppingParticle =
-                     case lookupAttribute "demote-non-dropping-particle" attr of
-                       Just "never"     -> DemoteNever
-                       Just "sort-only" -> DemoteSortOnly
-                       _                -> DemoteDisplayAndSort
-                 , styleInitializeWithHyphen =
-                   maybe True (== "true") $
-                     lookupAttribute "initialize-with-hyphen" attr
-                 , stylePageRangeFormat =
-                     case lookupAttribute "page-range-format" attr of
-                       Just "chicago"     -> Just PageRangeChicago15
-                       -- chicago is an alias for chicago-15, but this
-                       -- will change to chicago-16 in v1.1
-                       Just "chicago-15"  -> Just PageRangeChicago15
-                       Just "chicago-16"  -> Just PageRangeChicago16
-                       Just "expanded"    -> Just PageRangeExpanded
-                       Just "minimal"     -> Just PageRangeMinimal
-                       Just "minimal-two" -> Just PageRangeMinimalTwo
-                       _                  -> Nothing
-                 , stylePageRangeDelimiter =
-                     lookupAttribute "page-range-delimiter" attr
-                 , styleDisambiguation = disambigStrategy
-                 , styleNearNoteDistance =
-                     lookupAttribute "near-note-distance" attr >>= readAsInt
-                 , styleCiteGroupDelimiter =
-                     lookupAttribute "cite-group-delimiter" cattr <|>
-                     (", " <$ lookupAttribute "collapse" cattr)
-                 , styleLineSpacing =
-                     lookupAttribute "line-spacing" battr >>= readAsInt
-                 , styleEntrySpacing =
-                     lookupAttribute "entry-spacing" battr >>= readAsInt
-                 , styleHangingIndent =
-                     lookupAttribute "hanging-indent" battr == Just "true"
-                 , styleSecondFieldAlign =
-                     case lookupAttribute "second-field-align" battr of
-                       Just "flush" -> Just SecondFieldAlignFlush
-                       Just "margin" -> Just SecondFieldAlignMargin
-                       _ -> Nothing
-                 , styleSubsequentAuthorSubstitute =
-                     case lookupAttribute "subsequent-author-substitute"
-                          battr of
-                       Nothing -> Nothing
-                       Just t  -> Just $
-                         SubsequentAuthorSubstitute t
-                         $ case lookupAttribute
-                             "subsequent-author-substitute-rule" battr of
-                               Just "complete-each" -> CompleteEach
-                               Just "partial-each" -> PartialEach
-                               Just "partial-first" -> PartialFirst
-                               _  -> CompleteAll
-                 , styleUsesYearSuffixVariable = usesYearSuffixVariable
-                 }
-    locales <- mapM pLocale (getChildren "locale" node)
-    let cslVersion = case lookupAttribute "version" attr of
-                       Nothing -> (0,0,0)
-                       Just t  ->
-                         case map readAsInt (T.splitOn "." t) of
-                           (Just x : Just y : Just z :_) -> (x,y,z)
-                           (Just x : Just y : _)         -> (x,y,0)
-                           (Just x : _)                  -> (x,0,0)
-                           _                             -> (0,0,0)
-    return $ Style
-             { styleCslVersion     = cslVersion
-             , styleOptions        = sOpts
-             , styleCitation       = citations
-             , styleBibliography   = bibliography
-             , styleLocales        = locales
-             , styleAbbreviations  = Nothing
-             }
-
+          _ -> False
+  let usesYearSuffixVariable =
+        any hasYearSuffixVariable $
+          layoutElements citations ++ maybe [] layoutElements bibliography
 
+  let sOpts = StyleOptions
+               { styleIsNoteStyle =
+                   case lookupAttribute "class" attr of
+                     Just "note" -> True
+                     Nothing     -> True
+                     _           -> False
+               , styleDefaultLocale = defaultLocale
+               , styleDemoteNonDroppingParticle =
+                   case lookupAttribute "demote-non-dropping-particle" attr of
+                     Just "never"     -> DemoteNever
+                     Just "sort-only" -> DemoteSortOnly
+                     _                -> DemoteDisplayAndSort
+               , styleInitializeWithHyphen =
+                 maybe True (== "true") $
+                   lookupAttribute "initialize-with-hyphen" attr
+               , stylePageRangeFormat =
+                   case lookupAttribute "page-range-format" attr of
+                     Just "chicago"     -> Just PageRangeChicago15
+                     -- chicago is an alias for chicago-15, but this
+                     -- will change to chicago-16 in v1.1
+                     Just "chicago-15"  -> Just PageRangeChicago15
+                     Just "chicago-16"  -> Just PageRangeChicago16
+                     Just "expanded"    -> Just PageRangeExpanded
+                     Just "minimal"     -> Just PageRangeMinimal
+                     Just "minimal-two" -> Just PageRangeMinimalTwo
+                     _                  -> Nothing
+               , stylePageRangeDelimiter =
+                   lookupAttribute "page-range-delimiter" attr
+               , styleDisambiguation = disambigStrategy
+               , styleNearNoteDistance =
+                   lookupAttribute "near-note-distance" attr >>= readAsInt
+               , styleCiteGroupDelimiter =
+                   lookupAttribute "cite-group-delimiter" cattr <|>
+                   (", " <$ lookupAttribute "collapse" cattr)
+               , styleLineSpacing =
+                   lookupAttribute "line-spacing" battr >>= readAsInt
+               , styleEntrySpacing =
+                   lookupAttribute "entry-spacing" battr >>= readAsInt
+               , styleHangingIndent =
+                   lookupAttribute "hanging-indent" battr == Just "true"
+               , styleSecondFieldAlign =
+                   case lookupAttribute "second-field-align" battr of
+                     Just "flush" -> Just SecondFieldAlignFlush
+                     Just "margin" -> Just SecondFieldAlignMargin
+                     _ -> Nothing
+               , styleSubsequentAuthorSubstitute =
+                   case lookupAttribute "subsequent-author-substitute"
+                        battr of
+                     Nothing -> Nothing
+                     Just t  -> Just $
+                       SubsequentAuthorSubstitute t
+                       $ case lookupAttribute
+                           "subsequent-author-substitute-rule" battr of
+                             Just "complete-each" -> CompleteEach
+                             Just "partial-each" -> PartialEach
+                             Just "partial-first" -> PartialFirst
+                             _  -> CompleteAll
+               , styleUsesYearSuffixVariable = usesYearSuffixVariable
+               , styleNameFormat = nameformat -- TODO
+               }
+  locales <- mapM pLocale (getChildren "locale" node)
+  let cslVersion = case lookupAttribute "version" attr of
+                     Nothing -> (0,0,0)
+                     Just t  ->
+                       case map readAsInt (T.splitOn "." t) of
+                         (Just x : Just y : Just z :_) -> (x,y,z)
+                         (Just x : Just y : _)         -> (x,y,0)
+                         (Just x : _)                  -> (x,0,0)
+                         _                             -> (0,0,0)
+  return $ Style
+           { styleCslVersion     = cslVersion
+           , styleOptions        = sOpts
+           , styleCitation       = citations
+           , styleBibliography   = bibliography
+           , styleLocales        = locales
+           , styleAbbreviations  = Nothing
+           , styleMacros         = macros
+           }
 
 pElement :: X.Element -> ElementParser (Element a)
 pElement node =
@@ -280,7 +278,7 @@
              xs (splitVars t)
            _       -> id) .
         (case lookupAttribute "type" attr of
-           Just t  -> \xs -> foldr ((:) . HasType) xs (T.words $ T.strip t)
+           Just t  -> (HasType (T.words $ T.strip t) :)
            _       -> id) .
         (case lookupAttribute "variable" attr of
            Just t  -> \xs -> foldr ((:) . HasVariable) xs (splitVars t)
@@ -322,7 +320,7 @@
 
 pNames :: X.Element -> ElementParser (Element a)
 pNames node = do
-  attr <- getNameAttributes node
+  let attr = getAttributes node
   let formatting = getFormatting attr
   let variables = maybe [] splitVars $ lookupAttribute "variable" attr
   let pChild (nf,subst) n =
@@ -362,7 +360,7 @@
 
 pName :: X.Element -> ElementParser (NameFormat, Formatting)
 pName node = do
-  attr <- getNameAttributes node
+  let attr = getAttributes node
   let formatting = getFormatting attr
   let nameParts = map getAttributes $ getChildren "name-part" node
   let nameformat = NameFormat
@@ -384,43 +382,45 @@
                Just "symbol" -> Just Symbol
                _             -> Nothing
          , nameDelimiter              =
-             fromMaybe ", " $ lookupAttribute "delimiter" attr
+             lookupAttribute "delimiter" attr
          , nameDelimiterPrecedesEtAl  =
              case lookupAttribute "delimiter-precedes-et-al" attr of
-               Just "after-inverted-name" -> PrecedesAfterInvertedName
-               Just "always"              -> PrecedesAlways
-               Just "never"               -> PrecedesNever
-               _                          -> PrecedesContextual
+               Just "after-inverted-name" -> Just PrecedesAfterInvertedName
+               Just "always"              -> Just PrecedesAlways
+               Just "never"               -> Just PrecedesNever
+               Just "contextual"          -> Just PrecedesContextual
+               _                          -> Nothing
          , nameDelimiterPrecedesLast  =
              case lookupAttribute "delimiter-precedes-last" attr of
-               Just "after-inverted-name" -> PrecedesAfterInvertedName
-               Just "always"              -> PrecedesAlways
-               Just "never"               -> PrecedesNever
-               _                          -> PrecedesContextual
+               Just "after-inverted-name" -> Just PrecedesAfterInvertedName
+               Just "always"              -> Just PrecedesAlways
+               Just "never"               -> Just PrecedesNever
+               Just "contextual"          -> Just PrecedesContextual
+               _                          -> Nothing
          , nameEtAlMin                =
-           (lookupAttribute "names-min" attr <|>
-            lookupAttribute "et-al-min" attr) >>= readAsInt
+            lookupAttribute "et-al-min" attr >>= readAsInt
          , nameEtAlUseFirst           =
-           (lookupAttribute "names-use-first" attr <|>
-            lookupAttribute "et-al-use-first" attr) >>= readAsInt
+            lookupAttribute "et-al-use-first" attr >>= readAsInt
          , nameEtAlSubsequentUseFirst =
              lookupAttribute "et-al-subsequent-use-first" attr >>= readAsInt
          , nameEtAlSubsequentMin      =
              lookupAttribute "et-al-subsequent-min" attr >>= readAsInt
          , nameEtAlUseLast            =
-             case lookupAttribute "names-use-last" attr <|>
-                  lookupAttribute "et-al-use-last" attr of
-               Just "true" -> True
-               _           -> False
+             case lookupAttribute "et-al-use-last" attr of
+               Just "true" -> Just True
+               Just "false" -> Just False
+               _           -> Nothing
          , nameForm                   =
              case lookupAttribute "form" attr of
-               Just "short"  -> ShortName
-               Just "count"  -> CountName
-               _             -> LongName
+               Just "short"  -> Just ShortName
+               Just "count"  -> Just CountName
+               Just "long"   -> Just LongName
+               _             -> Nothing
          , nameInitialize             =
              case lookupAttribute "initialize" attr of
-               Just "false" -> False
-               _            -> True
+               Just "false" -> Just False
+               Just "true" -> Just True
+               _            -> Nothing
          , nameInitializeWith         =
              lookupAttribute "initialize-with" attr
          , nameAsSortOrder            =
@@ -429,7 +429,7 @@
                Just "first" -> Just NameAsSortOrderFirst
                _            -> Nothing
          , nameSortSeparator          =
-             fromMaybe ", " $ lookupAttribute "sort-separator" attr
+             lookupAttribute "sort-separator" attr
          }
   return (nameformat, formatting)
 
@@ -461,9 +461,7 @@
            Just var -> return $ EText (TextVariable varform (toVariable var))
            Nothing ->
              case lookupAttribute "macro" attr of
-               Just _ -> do
-                 elements <- mapM pElement (allChildren node)
-                 return $ EGroup True elements
+               Just macroname -> return $ EText (TextMacro macroname)
                Nothing ->
                  case lookupAttribute "term" attr of
                    Just termname ->
@@ -483,132 +481,143 @@
                          parseFailure "text element lacks needed attribute"
   return $ Element elt formatting
 
-pMacro :: X.Element -> ElementParser (Text, [X.Element])
+pMacro :: X.Element -> ElementParser (Text, [Element a])
 pMacro node = do
   name <- case lookupAttribute "name" (getAttributes node) of
             Just t  -> return t
             Nothing -> parseFailure "macro element missing name attribute"
-  return (name, allChildren node)
-
--- these name and names attributes are inheritable from a parent style
--- citation or bibliography element.  We use a map because
--- sometimes the name is different (e.g. name-form and form).
-inheritableNameAttributes :: M.Map X.Name X.Name
-inheritableNameAttributes = M.fromList $
-  map (\(x,y) -> (attname x, attname y))
-  [ ("and", "and")
-  , ("delimiter-precedes-et-al", "delimiter-precedes-et-al")
-  , ("delimiter-precedes-last", "delimiter-precedes-last")
-  , ("et-al-min", "et-al-min")
-  , ("et-al-use-first", "et-al-use-first")
-  , ("et-al-use-last", "et-al-use-last")
-  , ("et-al-subsequent-min", "et-al-subsequent-min")
-  , ("et-al-subsequent-use-first", "et-al-subsequent-use-first")
-  , ("initialize", "initialize")
-  , ("initialize-with", "initialize-with")
-  , ("name-as-sort-order", "name-as-sort-order")
-  , ("sort-separator", "sort-separator")
-  , ("name-form", "form")
-  , ("name-delimiter", "delimiter")
-  , ("names-delimiter", "delimiter")
-  , ("names-min", "names-min")
-  , ("names-use-first", "names-use-first")
-  , ("names-use-last", "names-use-last")
-  ]
+  elts <- mapM pElement (allChildren node)
+  return (name, elts)
 
-getInheritableNameAttributes :: X.Element -> M.Map X.Name Text
-getInheritableNameAttributes elt =
-  M.foldrWithKey
-    (\k v m -> case M.lookup k inheritableNameAttributes of
-                   Just k' -> M.insert k' v m
-                   Nothing -> m) M.empty (X.elementAttributes elt)
+getInheritableNameFormat :: Attributes -> NameFormat
+getInheritableNameFormat attr =
+  NameFormat
+         { nameGivenFormatting = Nothing
+         , nameFamilyFormatting = Nothing
+         , nameAndStyle =
+             case lookupAttribute "and" attr of
+               Just "text"   -> Just Long
+               Just "symbol" -> Just Symbol
+               _             -> Nothing
+         , nameDelimiter =
+             lookupAttribute "name-delimiter" attr <|>
+             lookupAttribute "names-delimiter" attr
+         , nameDelimiterPrecedesEtAl  =
+             case lookupAttribute "delimiter-precedes-et-al" attr of
+               Just "after-inverted-name" -> Just PrecedesAfterInvertedName
+               Just "always"              -> Just PrecedesAlways
+               Just "never"               -> Just PrecedesNever
+               Just "contextual"          -> Just PrecedesContextual
+               _                          -> Nothing
+         , nameDelimiterPrecedesLast  =
+             case lookupAttribute "delimiter-precedes-last" attr of
+               Just "after-inverted-name" -> Just PrecedesAfterInvertedName
+               Just "always"              -> Just PrecedesAlways
+               Just "never"               -> Just PrecedesNever
+               Just "contextual"          -> Just PrecedesContextual
+               _                          -> Nothing
+         , nameEtAlMin                =
+           lookupAttribute "et-al-min" attr >>= readAsInt
+         , nameEtAlUseFirst           =
+            lookupAttribute "et-al-use-first" attr >>= readAsInt
+         , nameEtAlSubsequentUseFirst =
+             lookupAttribute "et-al-subsequent-use-first" attr >>= readAsInt
+         , nameEtAlSubsequentMin      =
+             lookupAttribute "et-al-subsequent-min" attr >>= readAsInt
+         , nameEtAlUseLast            =
+             case lookupAttribute "et-al-use-last" attr of
+               Just "true" -> Just True
+               Just "false" -> Just False
+               _           -> Nothing
+         , nameForm                   =
+             case lookupAttribute "name-form" attr of
+               Just "short"  -> Just ShortName
+               Just "count"  -> Just CountName
+               Just "long"   -> Just LongName
+               _             -> Nothing
+         , nameInitialize             =
+             case lookupAttribute "initialize" attr of
+               Just "false" -> Just False
+               Just "true" -> Just True
+               _            -> Nothing
+         , nameInitializeWith         =
+             lookupAttribute "initialize-with" attr
+         , nameAsSortOrder            =
+             case lookupAttribute "name-as-sort-order" attr of
+               Just "all"   -> Just NameAsSortOrderAll
+               Just "first" -> Just NameAsSortOrderFirst
+               _            -> Nothing
+         , nameSortSeparator          =
+             lookupAttribute "sort-separator" attr
+         }
 
-pLayout :: M.Map Text [X.Element] -> X.Element -> ElementParser (Layout a)
-pLayout macroMap node = do
-  let attrmap = getInheritableNameAttributes node
+pLayout :: X.Element -> ElementParser (Layout a)
+pLayout node = do
   let attr = getAttributes node
-  local (<> attrmap) $ do
-    node' <- expandMacros macroMap node
-    let layouts = getChildren "layout" node'
-    -- In case there are multiple layouts (as CSL-M allows), we raise an error
-    let elname = T.unpack $ X.nameLocalName $ X.elementName node
-    layout <- case layouts of
-                [] -> parseFailure $ "No layout element present in " <> elname
-                [l] -> return l
-                (_:_) -> parseFailure $ "Multiple layout elements present in " <> elname
-    let formatting = getFormatting . getAttributes $ layout
-    let sorts   = getChildren "sort" node'
-    elements <- mapM pElement $ allChildren layout
-    let opts = LayoutOptions
-               { layoutCollapse =
-                   case lookupAttribute "collapse" attr of
-                     Just "citation-number" -> Just CollapseCitationNumber
-                     Just "year"            -> Just CollapseYear
-                     Just "year-suffix"     -> Just CollapseYearSuffix
-                     Just "year-suffix-ranged"
-                                            -> Just CollapseYearSuffixRanged
-                     _                      -> Nothing
-               , layoutYearSuffixDelimiter =
-                   lookupAttribute "year-suffix-delimiter" attr <|>
-                     -- technically the spec doesn't say this, but
-                     -- this seems to be what the test suites want?:
-                     lookupAttribute "cite-group-delimiter" attr <|>
-                     formatDelimiter formatting
-               , layoutAfterCollapseDelimiter =
-                   lookupAttribute "after-collapse-delimiter" attr <|>
-                     formatDelimiter formatting
-               }
-    sortKeys <- mapM pSortKey (concatMap (getChildren "key") sorts)
-    return $ Layout { layoutOptions  = opts
-                    , layoutFormatting = formatting{
-                                           formatAffixesInside = True }
-                    , layoutElements = elements
-                    , layoutSortKeys = sortKeys
-                    }
+  let nameformat = getInheritableNameFormat attr
+  let layouts = getChildren "layout" node
+  -- In case there are multiple layouts (as CSL-M allows), we raise an error
+  let elname = T.unpack $ X.nameLocalName $ X.elementName node
+  layout <- case layouts of
+              [] -> parseFailure $ "No layout element present in " <> elname
+              [l] -> return l
+              (_:_) -> parseFailure $ "Multiple layout elements present in " <> elname
+  let formatting = getFormatting . getAttributes $ layout
+  let sorts   = getChildren "sort" node
+  elements <- mapM pElement $ allChildren layout
+  let opts = LayoutOptions
+             { layoutCollapse =
+                 case lookupAttribute "collapse" attr of
+                   Just "citation-number" -> Just CollapseCitationNumber
+                   Just "year"            -> Just CollapseYear
+                   Just "year-suffix"     -> Just CollapseYearSuffix
+                   Just "year-suffix-ranged"
+                                          -> Just CollapseYearSuffixRanged
+                   _                      -> Nothing
+             , layoutYearSuffixDelimiter =
+                 lookupAttribute "year-suffix-delimiter" attr <|>
+                   -- technically the spec doesn't say this, but
+                   -- this seems to be what the test suites want?:
+                   lookupAttribute "cite-group-delimiter" attr <|>
+                   formatDelimiter formatting
+             , layoutAfterCollapseDelimiter =
+                 lookupAttribute "after-collapse-delimiter" attr <|>
+                   formatDelimiter formatting
+             , layoutNameFormat = nameformat
+             }
+  sortKeys <- mapM pSortKey (concatMap (getChildren "key") sorts)
+  return $ Layout { layoutOptions  = opts
+                  , layoutFormatting = formatting{
+                                         formatAffixesInside = True }
+                  , layoutElements = elements
+                  , layoutSortKeys = sortKeys
+                  }
 
 pSortKey :: X.Element -> ElementParser (SortKey a)
 pSortKey node = do
-  let attrmap = getInheritableNameAttributes node
-  local (<> attrmap) $ do
-    let attr = getAttributes node
-    let direction = case lookupAttribute "sort" attr of
-                      Just "descending" -> Descending
-                      _                 -> Ascending
-    case lookupAttribute "macro" attr of
-        Just _ -> -- should already be expanded
-          SortKeyMacro direction <$> mapM pElement (allChildren node)
-        Nothing   -> return $ SortKeyVariable direction
-                       (toVariable $ fromMaybe mempty $
-                         lookupAttribute "variable" attr)
-
-attname :: Text -> X.Name
-attname t = X.Name t Nothing Nothing
-
-expandMacros :: M.Map Text [X.Element]
-             -> X.Element
-             -> ElementParser X.Element
-expandMacros macroMap el =
-  case X.nameLocalName (X.elementName el) of
-    n | n == "text" ||
-        n == "key" ->
-      case M.lookup (attname "macro") (X.elementAttributes el) of
-        Nothing -> do
-           els' <- mapM expandNode (X.elementNodes el)
-           return $ el{ X.elementNodes = els' }
-        Just macroName ->
-          case M.lookup macroName macroMap of
-            Nothing ->
-              parseFailure $ "macro " <> T.unpack macroName <> " not found"
-            Just els -> do
-              -- the expansion may contain further macros:
-              els' <- mapM (fmap X.NodeElement . expandMacros macroMap) els
-              return $ el{ X.elementNodes = els' }
-    _ -> do
-      els' <- mapM expandNode (X.elementNodes el)
-      return $ el{ X.elementNodes = els' }
- where
-  expandNode (X.NodeElement el') = X.NodeElement <$> expandMacros macroMap el'
-  expandNode x                   = return x
+  let attr@(Attributes attr') = getAttributes node
+  let direction = case lookupAttribute "sort" attr of
+                    Just "descending" -> Descending
+                    _                 -> Ascending
+  -- The attributes names-min, names-use-first, and names-use-last may
+  -- be used to override the values of the corresponding
+  -- et-al-min/et-al-subsequent-min,
+  -- et-al-use-first/et-al-subsequent-use-first and et-al-use-last
+  -- attributes, and affect all names generated via macros called by
+  -- cs:key.
+  let keyChange "names-min" = "et-al-min"
+      keyChange "names-use-first" = "et-al-use-first"
+      keyChange "names-use-last" = "et-al-use-last"
+      keyChange "names-subsequent-min" = "et-al-subsequent-min"
+      keyChange "names-subsequent-use-first" = "et-al-subsequent-use-first"
+      keyChange x = x
+  let nameformat = getInheritableNameFormat
+                     (Attributes (M.mapKeys keyChange attr'))
+  case lookupAttribute "macro" attr of
+      Just macroname -> return $ SortKeyMacro direction nameformat macroname
+      Nothing   -> return $ SortKeyVariable direction
+                     (toVariable $ fromMaybe mempty $
+                       lookupAttribute "variable" attr)
 
 splitVars :: Text -> [Variable]
 splitVars = map toVariable . T.words . T.strip
diff --git a/src/Citeproc/Types.hs b/src/Citeproc/Types.hs
--- a/src/Citeproc/Types.hs
+++ b/src/Citeproc/Types.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveTraversable #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -33,12 +35,14 @@
   , TextType(..)
   , NameFormat(..)
   , defaultNameFormat
+  , combineNameFormat
   , NameAsSortOrder(..)
   , NamesFormat(..)
   , NameForm(..)
   , Name(..)
   , extractParticles
   , isByzantineName
+  , isByzantine
   , DelimiterPrecedes(..)
   , Condition(..)
   , Position(..)
@@ -63,6 +67,7 @@
   , TermNumber(..)
   , TermForm(..)
   , Term(..)
+  , termMatches
   , emptyTerm
   , SortDirection(..)
   , SortKey(..)
@@ -104,6 +109,9 @@
   , lookupAbbreviation
   , Result(..)
   , Inputs(..)
+  , parseCslJson
+  , lookupQuotes
+  , superscriptChars
   )
 where
 import qualified Data.Set as Set
@@ -113,8 +121,11 @@
 import qualified Data.CaseInsensitive as CI
 import Control.Monad (foldM, guard, mzero)
 import Control.Applicative ((<|>), optional)
-import Data.Char (isLower, isDigit, isLetter, isSpace)
+import Data.Char (GeneralCategory(FinalQuote),
+                  generalCategory, isLower, isDigit,
+                  isLetter, isSpace, isAlphaNum, isAscii)
 import Data.Text (Text)
+import GHC.Generics (Generic)
 import qualified Data.Text as T
 import Data.List (elemIndex)
 import Data.Maybe
@@ -190,6 +201,7 @@
 -- that corresponds to the markup allowed in CSL JSON. See
 -- the 'Citeproc.Pandoc' module for an instance for Pandoc 'Inlines'.
 class (Semigroup a, Monoid a, Show a, Eq a, Ord a) => CiteprocOutput a where
+  isEmpty                     :: a -> Bool
   toText                      :: a -> Text
   fromText                    :: Text -> a
   dropTextWhile               :: (Char -> Bool) -> a -> a
@@ -208,9 +220,9 @@
   addHyperlink                :: Text -> a -> a
   localizeQuotes              :: Locale -> a -> a
 
-addFormatting :: CiteprocOutput a => Formatting -> a -> a
-addFormatting f x =
-  if T.null (toText x)  -- TODO inefficient
+addFormatting :: CiteprocOutput a => Locale -> Formatting -> a -> a
+addFormatting locale f x =
+  if isEmpty x
      then mempty
      else
        maybe id addDisplay (formatDisplay f) .
@@ -227,10 +239,10 @@
        $ x
  where
   addPrefix z = case formatPrefix f of
-                  Just s   -> mconcat $ fixPunct [fromText s, z]
+                  Just s   -> mconcat $ fixPunct [parseCslJson locale s, z]
                   Nothing  -> z
   addSuffix z = case formatSuffix f of
-                  Just s   -> mconcat $ fixPunct [z, fromText s]
+                  Just s   -> mconcat $ fixPunct [z, parseCslJson locale s]
                   Nothing  -> z
   affixesInside = formatAffixesInside f
 
@@ -271,7 +283,7 @@
   , citationItemData           :: Maybe (Reference a)
   } deriving (Show, Eq, Ord)
 
-instance (FromJSON a, Eq a) => FromJSON (CitationItem a) where
+instance FromJSON a => FromJSON (CitationItem a) where
   parseJSON = withObject "CitationItem" $ \v -> CitationItem
     <$> (v .: "id" >>= fmap ItemId . asText)
     <*> v .:? "label"
@@ -308,36 +320,53 @@
 -- | A citation (which may include several items, e.g.
 -- in @(Smith 2000; Jones 2010, p. 30)@).
 data Citation a =
-  Citation { citationId         :: Maybe Text
-           , citationNoteNumber :: Maybe Int
-           , citationItems      :: [CitationItem a] }
+  Citation { citationId            :: Maybe Text
+           , citationResetPosition :: Bool -- ^ Reset the position information
+             -- that determines whether citation items are "subsequent,"
+             -- prior to processing this citation.
+             -- Note that this affects all subsequent citations, not just this
+             -- one.
+           , citationNoteNumber    :: Maybe Int
+           , citationPrefix        :: Maybe a
+           , citationSuffix        :: Maybe a
+           , citationItems         :: [CitationItem a]
+           }
   deriving (Show, Eq, Ord)
 
-instance (FromJSON a, Eq a) => FromJSON (Citation a) where
+instance FromJSON a => FromJSON (Citation a) where
  parseJSON v =
    withArray "Citation"
      (\ary ->
        case ary V.!? 0 of
          Just v' -> (withObject "Citation" $ \o
                       -> Citation <$> o .:? "citationID"
+                                  <*> o .:? "citationResetPosition" .!= False
                                   <*> ((o .: "properties"
                                              >>= (.: "noteIndex"))
                                       <|> pure Nothing)
+                                  <*> o .:? "citationPrefix"
+                                  <*> o .:? "citationSuffix"
                                   <*> o .: "citationItems") v'
-                  <|> Citation Nothing Nothing <$> parseJSON v'
+                  <|> Citation Nothing False Nothing Nothing Nothing <$> parseJSON v'
          Nothing -> fail "Empty array") v
    <|>
    withObject "Citation"
      (\o -> Citation <$> o .:? "citationID"
+                     <*> o .:? "citationResetPosition" .!= False
                      <*> o .:? "citationNoteNumber"
+                     <*> o .:? "citationPrefix"
+                     <*> o .:? "citationSuffix"
                      <*> o .: "citationItems") v
    <|>
-   (Citation Nothing Nothing <$> parseJSON v)
+   (Citation Nothing False Nothing Nothing Nothing <$> parseJSON v)
 
 instance ToJSON a => ToJSON (Citation a) where
  toJSON c =
    object $
      [ ("citationID", toJSON $ citationId c) | isJust (citationId c) ] ++
+     [ ("citationResetPosition", toJSON $ citationResetPosition c) ] ++
+     [ ("citationPrefix", toJSON $ citationPrefix c) | isJust (citationPrefix c) ] ++
+     [ ("citationSuffix", toJSON $ citationSuffix c) | isJust (citationSuffix c) ] ++
      [ ("citationItems" , toJSON $ citationItems c) ] ++
      case citationNoteNumber c of
            Nothing -> []
@@ -351,7 +380,7 @@
 
 data Condition =
     HasVariable Variable
-  | HasType Text
+  | HasType [Text]
   | IsUncertainDate Variable
   | IsNumeric Variable
   | HasLocatorType Variable
@@ -453,40 +482,70 @@
   { nameGivenFormatting        :: Maybe Formatting
   , nameFamilyFormatting       :: Maybe Formatting
   , nameAndStyle               :: Maybe TermForm
-  , nameDelimiter              :: Text
-  , nameDelimiterPrecedesEtAl  :: DelimiterPrecedes
-  , nameDelimiterPrecedesLast  :: DelimiterPrecedes
+  , nameDelimiter              :: Maybe Text
+  , nameDelimiterPrecedesEtAl  :: Maybe DelimiterPrecedes
+  , nameDelimiterPrecedesLast  :: Maybe DelimiterPrecedes
   , nameEtAlMin                :: Maybe Int
   , nameEtAlUseFirst           :: Maybe Int
   , nameEtAlSubsequentUseFirst :: Maybe Int
   , nameEtAlSubsequentMin      :: Maybe Int
-  , nameEtAlUseLast            :: Bool
-  , nameForm                   :: NameForm
-  , nameInitialize             :: Bool
+  , nameEtAlUseLast            :: Maybe Bool
+  , nameForm                   :: Maybe NameForm
+  , nameInitialize             :: Maybe Bool
   , nameInitializeWith         :: Maybe Text
   , nameAsSortOrder            :: Maybe NameAsSortOrder
-  , nameSortSeparator          :: Text
-  } deriving (Show, Eq)
+  , nameSortSeparator          :: Maybe Text
+  } deriving (Show, Eq, Generic)
 
+-- | Combine two NameFormats, with the second argument used to
+-- fill Nothing values in the first.
+combineNameFormat :: NameFormat -> NameFormat -> NameFormat
+combineNameFormat a b =
+  NameFormat
+  { nameGivenFormatting          = nameGivenFormatting a
+                                     <|> nameGivenFormatting b
+  , nameFamilyFormatting         = nameFamilyFormatting a
+                                     <|> nameFamilyFormatting b
+  , nameAndStyle                 = nameAndStyle a <|> nameAndStyle b
+  , nameDelimiter                = nameDelimiter a <|> nameDelimiter b
+  , nameDelimiterPrecedesEtAl    = nameDelimiterPrecedesEtAl a
+                                     <|> nameDelimiterPrecedesEtAl b
+  , nameDelimiterPrecedesLast    = nameDelimiterPrecedesLast a
+                                     <|> nameDelimiterPrecedesLast b
+  , nameEtAlMin                  = nameEtAlMin a <|> nameEtAlMin b
+  , nameEtAlUseFirst             = nameEtAlUseFirst a <|> nameEtAlUseFirst b
+  , nameEtAlSubsequentUseFirst   = nameEtAlSubsequentUseFirst a
+                                     <|> nameEtAlSubsequentUseFirst b
+  , nameEtAlSubsequentMin        = nameEtAlSubsequentMin a
+                                     <|> nameEtAlSubsequentMin b
+  , nameEtAlUseLast              = nameEtAlUseLast a <|> nameEtAlUseLast b
+  , nameForm                     = nameForm a <|> nameForm b
+  , nameInitialize               = nameInitialize a <|> nameInitialize b
+  , nameInitializeWith           = nameInitializeWith a
+                                     <|> nameInitializeWith b
+  , nameAsSortOrder              = nameAsSortOrder a <|> nameAsSortOrder b
+  , nameSortSeparator            = nameSortSeparator a <|> nameSortSeparator b
+  }
+
 defaultNameFormat :: NameFormat
 defaultNameFormat =
   NameFormat
   { nameGivenFormatting          = Nothing
-  , nameFamilyFormatting         =  Nothing
+  , nameFamilyFormatting         = Nothing
   , nameAndStyle                 = Nothing
-  , nameDelimiter                = ", "
-  , nameDelimiterPrecedesEtAl    = PrecedesContextual
-  , nameDelimiterPrecedesLast    = PrecedesContextual
+  , nameDelimiter                = Nothing
+  , nameDelimiterPrecedesEtAl    = Nothing
+  , nameDelimiterPrecedesLast    = Nothing
   , nameEtAlMin                  = Nothing
   , nameEtAlUseFirst             = Nothing
   , nameEtAlSubsequentUseFirst   = Nothing
   , nameEtAlSubsequentMin        = Nothing
-  , nameEtAlUseLast              = False
-  , nameForm                     = LongName
-  , nameInitialize               = True
+  , nameEtAlUseLast              = Nothing
+  , nameForm                     = Nothing
+  , nameInitialize               = Nothing
   , nameInitializeWith           = Nothing
   , nameAsSortOrder              = Nothing
-  , nameSortSeparator            = ", "
+  , nameSortSeparator            = Nothing
   }
 
 data NameAsSortOrder =
@@ -550,6 +609,7 @@
    | CapitalizeAll
    | SentenceCase
    | TitleCase
+   | PreserveCase
    deriving (Show, Eq)
 
 data DisplayStyle =
@@ -597,7 +657,7 @@
 
 data SortKey a =
      SortKeyVariable SortDirection Variable
-   | SortKeyMacro SortDirection [Element a]
+   | SortKeyMacro SortDirection NameFormat Text
   deriving (Show, Eq)
 
 data SortKeyValue =
@@ -617,6 +677,7 @@
   { layoutCollapse               :: Maybe Collapsing
   , layoutYearSuffixDelimiter    :: Maybe Text
   , layoutAfterCollapseDelimiter :: Maybe Text
+  , layoutNameFormat             :: NameFormat
   } deriving (Show, Eq)
 
 data Collapsing =
@@ -664,6 +725,7 @@
   , styleSecondFieldAlign           :: Maybe SecondFieldAlign
   , styleSubsequentAuthorSubstitute :: Maybe SubsequentAuthorSubstitute
   , styleUsesYearSuffixVariable     :: Bool
+  , styleNameFormat                 :: NameFormat
   } deriving (Show, Eq)
 
 data SubsequentAuthorSubstitute =
@@ -698,6 +760,7 @@
   , styleBibliography  :: Maybe (Layout a)
   , styleLocales       :: [Locale]
   , styleAbbreviations :: Maybe Abbreviations
+  , styleMacros        :: M.Map Text [Element a]
   } deriving (Show, Eq)
 -- Note: no macros section, because we
 -- expand these after parsing the CSL.
@@ -739,9 +802,12 @@
 emptyTerm :: Term
 emptyTerm = Term mempty Long Nothing Nothing Nothing Nothing
 
-instance Ord Term where
-   (<=)(Term name1 form1 num1 gen1 gf1 match1)
-       (Term name2 form2 num2 gen2 gf2 match2) =
+-- | True if the first term matches the second. Name and form must
+-- be identical; for the other attributes, a 'Nothing' on either side
+-- functions as a wildcard.
+termMatches :: Term -> Term -> Bool
+termMatches (Term name1 form1 num1 gen1 gf1 match1)
+            (Term name2 form2 num2 gen2 gf2 match2) =
      name1 == name2 &&
      form1 == form2 &&
      (isNothing num1   || isNothing num2   || num1 == num2) &&
@@ -835,7 +901,7 @@
   | AddGivenNameIfPrimary
   deriving (Show, Ord, Eq)
 
-instance (Eq a, FromJSON a)  => FromJSON (Reference a) where
+instance FromJSON a => FromJSON (Reference a) where
   parseJSON v = parseJSON v >>= parseReference
 
 lookupVariable :: CiteprocOutput a => Variable -> Reference a -> Maybe (Val a)
@@ -885,21 +951,25 @@
     | otherwise   = Reference i t d <$>
         case variableType k of
           StringVariable -> do
+            v' <- TextVal <$> readString v
+            return $ M.insert k v' m
+          StandardVariable -> do
             v' <- FancyVal <$> parseJSON v <|> TextVal <$> readString v
             return $ M.insert k v' m
           NumberVariable -> do
             v' <- case v of
-                    String{} -> parseJSON v
-                    Number{} -> T.pack . show <$> (parseJSON v :: Parser Int)
+                    String{} -> FancyVal <$> parseJSON v
+                    Number{} -> (NumVal <$> parseJSON v) <|>
+                                (FancyVal <$> parseJSON v)
                     _        -> typeMismatch "String or Number" v
-            return $ M.insert k (TextVal v') m
+            return $ M.insert k v' m
           DateVariable -> do
             v' <- parseJSON v
             return $ M.insert k (DateVal v') m
           NameVariable -> do
             v' <- parseJSON v
             return $ M.insert k (NamesVal v') m
-          UnknownVariable -> -- treat as string variable if possible
+          UnknownVariable -> -- treat as standard variable if possible
             case v of
               String{}  -> (\x -> M.insert k x m) <$>
                     (FancyVal <$> parseJSON v <|> TextVal <$> readString v)
@@ -949,6 +1019,7 @@
   | NameVariable
   | NumberVariable
   | StringVariable
+  | StandardVariable
   | UnknownVariable
   deriving (Show, Eq)
 
@@ -1005,53 +1076,53 @@
 variableType "supplement-number" = NumberVariable
 variableType "version" = NumberVariable
 variableType "volume" = NumberVariable
-variableType "abstract" = StringVariable
-variableType "annote" = StringVariable
-variableType "archive" = StringVariable
-variableType "archive_collection"  = StringVariable
-variableType "archive_location" = StringVariable
-variableType "archive-place" = StringVariable
-variableType "authority" = StringVariable
-variableType "call-number" = StringVariable
-variableType "citation-key" = StringVariable
-variableType "citation-label" = StringVariable
-variableType "collection-title" = StringVariable
-variableType "container-title" = StringVariable
-variableType "container-title-short" = StringVariable
-variableType "dimensions" = StringVariable
-variableType "division" = StringVariable
+variableType "abstract" = StandardVariable
+variableType "annote" = StandardVariable
+variableType "archive" = StandardVariable
+variableType "archive_collection"  = StandardVariable
+variableType "archive_location" = StandardVariable
+variableType "archive-place" = StandardVariable
+variableType "authority" = StandardVariable
+variableType "call-number" = StandardVariable
+variableType "citation-key" = StandardVariable
+variableType "citation-label" = StandardVariable
+variableType "collection-title" = StandardVariable
+variableType "container-title" = StandardVariable
+variableType "container-title-short" = StandardVariable
+variableType "dimensions" = StandardVariable
+variableType "division" = StandardVariable
 variableType "DOI" = StringVariable
-variableType "event" = StringVariable
-variableType "event-place" = StringVariable
-variableType "event-title" = StringVariable --(new name for "event" to avoid confusion with new "event" type) 
-variableType "genre" = StringVariable
+variableType "event" = StandardVariable
+variableType "event-place" = StandardVariable
+variableType "event-title" = StandardVariable --(new name for "event" to avoid confusion with new "event" type) 
+variableType "genre" = StandardVariable
 variableType "ISBN" = StringVariable
 variableType "ISSN" = StringVariable
-variableType "jurisdiction" = StringVariable
-variableType "keyword" = StringVariable
-variableType "language" = StringVariable
-variableType "license" = StringVariable
-variableType "medium" = StringVariable
-variableType "note" = StringVariable
-variableType "original-publisher" = StringVariable
-variableType "original-publisher-place" = StringVariable
-variableType "original-title" = StringVariable
-variableType "part-title" = StringVariable
+variableType "jurisdiction" = StandardVariable
+variableType "keyword" = StandardVariable
+variableType "language" = StandardVariable
+variableType "license" = StandardVariable
+variableType "medium" = StandardVariable
+variableType "note" = StandardVariable
+variableType "original-publisher" = StandardVariable
+variableType "original-publisher-place" = StandardVariable
+variableType "original-title" = StandardVariable
+variableType "part-title" = StandardVariable
 variableType "PMID" = StringVariable
 variableType "PMCID" = StringVariable
-variableType "publisher" = StringVariable
-variableType "publisher-place" = StringVariable
-variableType "references" = StringVariable
-variableType "reviewed-genre" = StringVariable
-variableType "reviewed-title" = StringVariable
-variableType "scale" = StringVariable
-variableType "source" = StringVariable
-variableType "status" = StringVariable
-variableType "title" = StringVariable
-variableType "title-short" = StringVariable
+variableType "publisher" = StandardVariable
+variableType "publisher-place" = StandardVariable
+variableType "references" = StandardVariable
+variableType "reviewed-genre" = StandardVariable
+variableType "reviewed-title" = StandardVariable
+variableType "scale" = StandardVariable
+variableType "source" = StandardVariable
+variableType "status" = StandardVariable
+variableType "title" = StandardVariable
+variableType "title-short" = StandardVariable
 variableType "URL" = StringVariable
-variableType "volume-title" = StringVariable
-variableType "year-suffix" = StringVariable
+variableType "volume-title" = StandardVariable
+variableType "year-suffix" = StandardVariable
 variableType _ = UnknownVariable
 
 newtype (ReferenceMap a) =
@@ -1142,10 +1213,9 @@
 instance FromJSON Name where
   parseJSON (String t) = parseCheaterName t
   parseJSON x =
-    extractParticles <$>
      (withObject "Name" $ \v -> Name
-      <$> (fmap fixApos <$> v .:? "family")
-      <*> (fmap fixApos <$> v .:? "given")
+      <$> (fmap (removeOuterQuotes . fixApos) <$> v .:? "family")
+      <*> (fmap (removeOuterQuotes . fixApos) <$> v .:? "given")
       <*> (fmap fixApos <$> v .:? "dropping-particle")
       <*> (fmap fixApos <$> v .:? "non-dropping-particle")
       <*> (fmap fixApos <$> v .:? "suffix")
@@ -1226,6 +1296,13 @@
                       c == '.'
   isParticleChar c = isLower c || isParticlePunct c
 
+removeOuterQuotes :: Text -> Text
+removeOuterQuotes t
+  | "\"" `T.isPrefixOf` t
+  , "\"" `T.isSuffixOf` t
+   = T.drop 1 $ T.dropEnd 1 t
+  | otherwise = t
+
 -- cheater syntax for name: used in parsing note:
 --  editor: Thompson || Hunter S.
 parseCheaterName :: Text -> Parser Name
@@ -1372,31 +1449,28 @@
                            then return (True, T.drop 1 t')
                            else return (False, t')
         let t''' = T.takeWhile (not . isSpecial) t''
+        let readYear y' = do
+              guard $ T.length y' == 4 || hasY && T.length y' >= 4
+              (if isNeg
+                  then (\x -> (x * (-1)) - 1) -- EDTF -0001 = 2 BC
+                  else (\x -> if x == 0 then -1 else x)) -- EDTF 0000 = 1 BC
+                <$> readAsInt y'
         case T.split (=='-') t''' of
           [""]         -> return $ DateParts [0]
           [y', m', d'] -> do
-            guard $ T.length y' == 4 || hasY && T.length y' >= 4
             guard $ T.length m' == 2
             guard $ T.length d' == 2
-            y <- (if isNeg
-                     then (\x -> (x * (-1)) - 1) -- 0 = 1 BC
-                     else id) <$> readAsInt y'
+            y <- readYear y'
             m <- readAsInt m'
             d <- readAsInt d'
             return $ DateParts [y, m, d]
           [y', m'] -> do
-            guard $ T.length y' == 4 || hasY && T.length y' >= 4
             guard $ T.length m' == 2
-            y <- (if isNeg
-                     then (\x -> (x * (-1)) - 1) -- 0 = 1 BC
-                     else id) <$> readAsInt y'
+            y <- readYear y'
             m <- readAsInt m'
             return $ DateParts [y, m]
           [y'] -> do
-            guard $ T.length y' == 4 || hasY && T.length y' >= 4
-            y <- (if isNeg
-                     then (\x -> (x * (-1)) - 1) -- 0 = 1 BC
-                     else id) <$> readAsInt y'
+            y <- readYear y'
             return $ DateParts [y]
           _ -> mzero
   dps <- mapM dparts ranges
@@ -1524,38 +1598,71 @@
 outputToText (Linked _ xs) = T.unwords $ map outputToText xs
 outputToText (InNote x)   = outputToText x
 
-renderOutput :: CiteprocOutput a => CiteprocOptions -> Output a -> a
-renderOutput _ NullOutput = mempty
-renderOutput _ (Literal x) = x
-renderOutput opts (Tagged (TagItem itemtype ident) x)
+renderOutput :: CiteprocOutput a => CiteprocOptions -> Locale -> Output a -> a
+renderOutput _ _ NullOutput = mempty
+renderOutput _ _ (Literal x) = x
+renderOutput opts locale (Tagged (TagItem itemtype ident) x)
   | linkCitations opts
   , itemtype /= AuthorOnly
-  = addHyperlink ("#ref-" <> unItemId ident) $ renderOutput opts x
-renderOutput opts (Tagged _ x) = renderOutput opts x
-renderOutput opts (Formatted f [Linked url xs])
+  = addHyperlink ("#ref-" <> unItemId ident) $ renderOutput opts locale x
+renderOutput opts locale (Tagged (TagNames _ _ ns) x)
+  -- a hack to ensure that names starting with lowercase don't get
+  -- capitalized in pandoc footnotes: see jgm/pandoc#10983
+  | any hasNonstandardCase ns
+  = addTextCase Nothing PreserveCase $ renderOutput opts locale x
+renderOutput opts locale (Tagged _ x) = renderOutput opts locale x
+renderOutput opts locale (Formatted f [Linked url xs])
   | linkBibliography opts
   , url == prefix <> anchor
   -- ensure correct handling of link prefixes like (https://doi.org/)
   -- when a link's prefix+anchor=target, ensure the link includes the prefix
   -- (see pandoc#6723 and citeproc#88)
-  = renderOutput opts $ Linked url [Formatted f xs]
+  = renderOutput opts locale $ Linked url [Formatted f xs]
   where
     anchor = mconcat (map outputToText xs)
     prefix = fromMaybe "" (formatPrefix f)
-renderOutput opts (Formatted formatting xs) =
-  addFormatting formatting . mconcat . fixPunct .
+renderOutput opts locale (Formatted formatting xs) =
+  addFormatting locale formatting' . mconcat . fixPunct .
     (case formatDelimiter formatting of
        Just d  -> addDelimiters (fromText d)
-       Nothing -> id) . filter (/= mempty) $ map (renderOutput opts) xs
-renderOutput opts (Linked url xs)
+       Nothing -> id) . filter (/= mempty) $ map (renderOutput opts locale) xs
+  where
+    -- italics/oblique set on an element that renders text directly
+    -- are not applied when that text has no romanesque character
+    -- (e.g. CJK), as citeproc-js does
+    formatting'
+      | formatFontStyle formatting `elem` [Just ItalicFont, Just ObliqueFont]
+      , all isTextLeaf xs
+      , txt <- mconcat (map outputToText xs)
+      , T.any isLetter txt
+      , not (isByzantine txt)
+      = formatting{ formatFontStyle = Nothing }
+      | otherwise = formatting
+    -- only text rendered directly by this element, not a nested group
+    isTextLeaf (Literal _)  = True
+    isTextLeaf (Tagged _ y) = isTextLeaf y
+    isTextLeaf _            = False
+renderOutput opts locale (Linked url xs)
   = (if linkBibliography opts
        then addHyperlink url
-       else id) . mconcat . fixPunct $ map (renderOutput opts) xs
-renderOutput opts (InNote x) = inNote $
+       else id) . mconcat . fixPunct $ map (renderOutput opts locale) xs
+renderOutput opts locale (InNote x) = inNote $
   dropTextWhile isSpace $
   dropTextWhile (\c -> c == ',' || c == ';' || c == '.' || c == ':') $
-  renderOutput opts x
+  renderOutput opts locale x
 
+hasNonstandardCase :: Name -> Bool
+hasNonstandardCase name =
+  maybe False startsWithLowercase (nameGiven name) ||
+  maybe False startsWithLowercase (nameFamily name) ||
+  maybe False startsWithLowercase (nameLiteral name)
+ where
+  startsWithLowercase t = case T.uncons t of
+                            Just (c,t')
+                              | isLetter c -> isLower c
+                              | otherwise -> startsWithLowercase t'
+                            Nothing -> False
+
 addDelimiters :: CiteprocOutput a => a -> [a] -> [a]
 addDelimiters delim =
   foldr addDelim []
@@ -1613,10 +1720,30 @@
  where
   xText = toText x
   yText = toText y
-  xEnd = if T.null xText then '\xFFFD' else T.last xText
-  yStart = if T.null yText then '\xFFFD' else T.head yText
+  yStart = fromMaybe '\xFFFD' (firstChar yText)
+  -- see #179
+  xEnd =
+     if yStart == '.'
+       then fromMaybe xLast (terminalCharBeforeQuote xText)
+       else xLast
+  xLast = fromMaybe '\xFFFD' (lastChar xText)
   xTrimmed = dropTextWhileEnd (== xEnd) x
   yTrimmed = dropTextWhile (== yStart) y
+  firstChar = fmap fst . T.uncons
+  lastChar = fmap snd . T.unsnoc
+  terminalCharBeforeQuote t =
+    let trimmed = T.dropWhileEnd isSpace t
+    in case T.unsnoc trimmed of
+         Just (_, q) | isQuoteLike q ->
+           lastChar (T.dropWhileEnd isTrailingCloser trimmed)
+         _ -> Nothing
+  isQuoteLike c =
+       c == '"'
+    || c == '\''
+    || generalCategory c == FinalQuote
+  isTrailingCloser c =
+       isSpace c
+    || isQuoteLike c
   keepFirst = if yTrimmed == y -- see #49
                  then x : fixPunct (y : zs)
                  else fixPunct $ x : yTrimmed : zs
@@ -1641,7 +1768,13 @@
 
 readAsInt :: Text -> Maybe Int
 readAsInt t =
-  case TR.decimal t of
+  case T.uncons t of
+    Just ('-', t') -> (0 -) <$> readAsDecimal t'
+    Just (c, _) | isDigit c -> readAsDecimal t
+    _ -> Nothing
+  where
+    readAsDecimal s =
+      case TR.decimal s of
       Right (x,t') | T.null t' -> Just x
       _                        -> Nothing
 
@@ -1692,7 +1825,7 @@
                     -- each a pair consisting of the item identifier and
                     -- the formatted entry
   , resultWarnings      :: [Text]       -- ^ Warnings from citation processing
-  } deriving (Show, Functor, Traversable, Foldable)
+  } deriving (Eq, Show, Functor, Traversable, Foldable)
 
 instance ToJSON a => ToJSON (Result a) where
   toJSON res = object
@@ -1726,7 +1859,7 @@
     , ("lang",          toJSON $ renderLang <$> inputsLang inp)
     ]
 
-instance (FromJSON a, Eq a) => FromJSON (Inputs a) where
+instance FromJSON a => FromJSON (Inputs a) where
   parseJSON = withObject "Inputs" $ \v ->
     Inputs <$> v .:? "citations"
            <*> v .:? "references"
@@ -1740,3 +1873,227 @@
                          Left _     -> return Nothing
                          Right lang -> return $ Just lang)
 
+parseCslJson :: CiteprocOutput a => Locale -> Text -> a
+parseCslJson locale t =
+  case P.parseOnly
+         (P.many' (pCslJson locale) <* P.endOfInput) t of
+    Left _   -> fromText t
+    Right xs -> mconcat xs
+
+pCslJson :: CiteprocOutput a => Locale -> P.Parser a
+pCslJson locale = P.choice
+  [ pCslText
+  , pCslQuoted
+  , pCslItalic
+  , pCslBold
+  , pCslUnderline
+  , pCslNoDecoration
+  , pCslSmallCaps
+  , pCslSup
+  , pCslSub
+  , pCslBaseline
+  , pCslNoCase
+  , pCslSymbol
+  ]
+ where
+  ((outerOpenQuote, outerCloseQuote), (innerOpenQuote, innerCloseQuote)) =
+     lookupQuotes locale
+  isSpecialChar c = c == '<' || c == '>' || c == '\'' || c == '"' ||
+       c == '’' || (not (isAscii c) && (isQuoteChar c || isSuperscriptChar c))
+  isQuoteChar = P.inClass
+       (T.unpack (outerOpenQuote <> outerCloseQuote <>
+                 innerOpenQuote <> innerCloseQuote))
+  isApostrophe '\'' = True
+  isApostrophe '’'  = True
+  isApostrophe _    = False
+  pCsl = pCslJson locale
+  notFollowedBySpace =
+    P.peekChar' >>= guard . not . isSpaceChar
+  isSpaceChar = P.inClass [' ','\t','\n','\r']
+  pOpenQuote = (("\"" <$ P.char '"')
+                <|> ("'" <$ P.char '\'')
+                <|> (outerCloseQuote <$ P.string outerOpenQuote)
+                <|> (innerCloseQuote <$ P.string innerOpenQuote))
+                 <* notFollowedBySpace
+  pSpace = P.skipWhile isSpaceChar
+  pCslText = fromText . addNarrowSpace <$>
+    (  do t <- P.takeWhile1 (\c -> isAlphaNum c && not (isSpecialChar c))
+          -- apostrophe
+          P.option t $ do _ <- P.satisfy isApostrophe
+                          t' <- P.takeWhile1 isAlphaNum
+                          return (t <> "’" <> t')
+    <|>
+      P.takeWhile1 (\c -> not (isAlphaNum c || isSpecialChar c)) )
+  pCslQuoted = addQuotes <$>
+    do cl <- pOpenQuote
+       mbc <- P.peekChar
+       case mbc of
+         Just c  | T.singleton c == cl -> fail "unexpected close quote"
+         _ -> return ()
+       mconcat <$> P.manyTill' pCsl (P.string cl)
+  pCslSymbol = do
+    c <- P.satisfy isSpecialChar
+    return $
+       if isApostrophe c
+          then fromText "’"
+          else fromText $ T.singleton c
+  pCslItalic = addFontStyle ItalicFont . mconcat <$>
+    (P.string "<i>" *> P.manyTill' pCsl (P.string "</i>"))
+  pCslBold = addFontWeight BoldWeight . mconcat <$>
+    (P.string "<b>" *> P.manyTill' pCsl (P.string "</b>"))
+  pCslUnderline = addTextDecoration UnderlineDecoration . mconcat <$>
+    (P.string "<u>" *> P.manyTill' pCsl (P.string "</u>"))
+  pCslNoDecoration = addTextDecoration NoDecoration . mconcat <$>
+    (P.string "<span" *> pSpace *>
+     P.string "class=\"nodecor\"" *> pSpace *> P.char '>' *>
+     P.manyTill' pCsl (P.string "</span>"))
+  pCslSup = addVerticalAlign SupAlign . mconcat <$>
+    (P.string "<sup>" *> P.manyTill' pCsl (P.string "</sup>"))
+  pCslSub = addVerticalAlign SubAlign . mconcat <$>
+    (P.string "<sub>" *> P.manyTill' pCsl (P.string "</sub>"))
+  pCslBaseline = addVerticalAlign BaselineAlign . mconcat <$>
+    (P.string "<span" *> pSpace *> P.string "class=\"baseline\">" *>
+      P.manyTill' pCsl (P.string "</span>"))
+  pCslSmallCaps = addFontVariant SmallCapsVariant . mconcat <$>
+    ((P.string "<span" *> pSpace *>
+      P.string "style=\"font-variant:" *> pSpace *>
+      P.string "small-caps;" *> pSpace *> P.char '"' *>
+      pSpace *> P.char '>' *> P.manyTill' pCsl (P.string "</span>"))
+    <|>
+     (P.string "<sc>" *> P.manyTill' pCsl (P.string "</sc>")))
+  pCslNoCase = addTextCase (localeLanguage locale) PreserveCase . mconcat <$>
+    (P.string "<span" *> pSpace *>
+     P.string "class=\"nocase\"" *> pSpace *> P.char '>' *>
+     P.manyTill' pCsl (P.string "</span>"))
+  addNarrowSpace =
+    T.replace " ;" "\x202F;" .
+    T.replace " ?" "\x202F?" .
+    T.replace " !" "\x202F!" .
+    T.replace " »" "\x202F»" .
+    T.replace "« " "«\x202F"
+
+lookupLocaleTerm :: Locale -> Text -> Maybe Text
+lookupLocaleTerm locale termname = do
+  let terms = localeTerms locale
+  case M.lookup termname terms of
+     Just ((_,t):_) -> Just t
+     _              -> Nothing
+
+lookupQuotes :: Locale -> ((Text, Text), (Text, Text))
+lookupQuotes locale = ((outerOpen, outerClose), (innerOpen, innerClose))
+ where
+  outerOpen = fromMaybe "\x201C" $ lookupLocaleTerm locale "open-quote"
+  outerClose = fromMaybe "\x201D" $ lookupLocaleTerm locale "close-quote"
+  innerOpen = fromMaybe "\x2018" $ lookupLocaleTerm locale "open-inner-quote"
+  innerClose = fromMaybe "\x2019" $ lookupLocaleTerm locale "close-inner-quote"
+
+isSuperscriptChar :: Char -> Bool
+isSuperscriptChar c = M.member c superscriptChars
+
+superscriptChars :: M.Map Char Text
+superscriptChars = M.fromList
+  [ ('\x00AA' , "\x0061")
+  , ('\x00B2' , "\x0032")
+  , ('\x00B3' , "\x0033")
+  , ('\x00B9' , "\x0031")
+  , ('\x00BA' , "\x006F")
+  , ('\x02B0' , "\x0068")
+  , ('\x02B1' , "\x0266")
+  , ('\x02B2' , "\x006A")
+  , ('\x02B3' , "\x0072")
+  , ('\x02B4' , "\x0279")
+  , ('\x02B5' , "\x027B")
+  , ('\x02B6' , "\x0281")
+  , ('\x02B7' , "\x0077")
+  , ('\x02B8' , "\x0079")
+  , ('\x02E0' , "\x0263")
+  , ('\x02E1' , "\x006C")
+  , ('\x02E2' , "\x0073")
+  , ('\x02E3' , "\x0078")
+  , ('\x02E4' , "\x0295")
+  , ('\x1D2C' , "\x0041")
+  , ('\x1D2D' , "\x00C6")
+  , ('\x1D2E' , "\x0042")
+  , ('\x1D30' , "\x0044")
+  , ('\x1D31' , "\x0045")
+  , ('\x1D32' , "\x018E")
+  , ('\x1D33' , "\x0047")
+  , ('\x1D34' , "\x0048")
+  , ('\x1D35' , "\x0049")
+  , ('\x1D36' , "\x004A")
+  , ('\x1D37' , "\x004B")
+  , ('\x1D38' , "\x004C")
+  , ('\x1D39' , "\x004D")
+  , ('\x1D3A' , "\x004E")
+  , ('\x1D3C' , "\x004F")
+  , ('\x1D3D' , "\x0222")
+  , ('\x1D3E' , "\x0050")
+  , ('\x1D3F' , "\x0052")
+  , ('\x1D40' , "\x0054")
+  , ('\x1D41' , "\x0055")
+  , ('\x1D42' , "\x0057")
+  , ('\x1D43' , "\x0061")
+  , ('\x1D44' , "\x0250")
+  , ('\x1D45' , "\x0251")
+  , ('\x1D46' , "\x1D02")
+  , ('\x1D47' , "\x0062")
+  , ('\x1D48' , "\x0064")
+  , ('\x1D49' , "\x0065")
+  , ('\x1D4A' , "\x0259")
+  , ('\x1D4B' , "\x025B")
+  , ('\x1D4C' , "\x025C")
+  , ('\x1D4D' , "\x0067")
+  , ('\x1D4F' , "\x006B")
+  , ('\x1D50' , "\x006D")
+  , ('\x1D51' , "\x014B")
+  , ('\x1D52' , "\x006F")
+  , ('\x1D53' , "\x0254")
+  , ('\x1D54' , "\x1D16")
+  , ('\x1D55' , "\x1D17")
+  , ('\x1D56' , "\x0070")
+  , ('\x1D57' , "\x0074")
+  , ('\x1D58' , "\x0075")
+  , ('\x1D59' , "\x1D1D")
+  , ('\x1D5A' , "\x026F")
+  , ('\x1D5B' , "\x0076")
+  , ('\x1D5C' , "\x1D25")
+  , ('\x1D5D' , "\x03B2")
+  , ('\x1D5E' , "\x03B3")
+  , ('\x1D5F' , "\x03B4")
+  , ('\x1D60' , "\x03C6")
+  , ('\x1D61' , "\x03C7")
+  , ('\x2070' , "\x0030")
+  , ('\x2071' , "\x0069")
+  , ('\x2074' , "\x0034")
+  , ('\x2075' , "\x0035")
+  , ('\x2076' , "\x0036")
+  , ('\x2077' , "\x0037")
+  , ('\x2078' , "\x0038")
+  , ('\x2079' , "\x0039")
+  , ('\x207A' , "\x002B")
+  , ('\x207B' , "\x2212")
+  , ('\x207C' , "\x003D")
+  , ('\x207D' , "\x0028")
+  , ('\x207E' , "\x0029")
+  , ('\x207F' , "\x006E")
+  , ('\x2120' , "\x0053\x004D")
+  , ('\x2122' , "\x0054\x004D")
+  , ('\x3192' , "\x4E00")
+  , ('\x3193' , "\x4E8C")
+  , ('\x3194' , "\x4E09")
+  , ('\x3195' , "\x56DB")
+  , ('\x3196' , "\x4E0A")
+  , ('\x3197' , "\x4E2D")
+  , ('\x3198' , "\x4E0B")
+  , ('\x3199' , "\x7532")
+  , ('\x319A' , "\x4E59")
+  , ('\x319B' , "\x4E19")
+  , ('\x319C' , "\x4E01")
+  , ('\x319D' , "\x5929")
+  , ('\x319E' , "\x5730")
+  , ('\x319F' , "\x4EBA")
+  , ('\x02C0' , "\x0294")
+  , ('\x02C1' , "\x0295")
+  , ('\x06E5' , "\x0648")
+  , ('\x06E6' , "\x064A")
+  ]
diff --git a/stack.yaml b/stack.yaml
deleted file mode 100644
--- a/stack.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-flags:
-  citeproc:
-    executable: true
-    icu: false
-resolver: lts-23.0
-extra-deps:
-- Diff-1.0.2
-ghc-options:
-  "$locals": -fhide-source-paths
diff --git a/test/NOTES.md b/test/NOTES.md
--- a/test/NOTES.md
+++ b/test/NOTES.md
@@ -1,3 +1,20 @@
+## Known failures
+
+A test that we know we do not yet pass has, alongside its `.txt` file, an
+`.expected` file containing the output we currently produce (which differs
+from the test's own `RESULT` section).  Such a test counts as an expected
+failure only if its output still matches that file exactly; any other
+output is an unexpected failure and fails the suite.  A test that passes
+but still has an `.expected` file is reported as an unexpected pass, and
+the file should be deleted.
+
+By default only unexpected results are reported.  Pass `--verbose` to also
+report warnings, passes, and expected failures with their diffs.
+
+`cabal test --test-options=--accept` rewrites the `.expected` file of every
+failing test with its current output and removes the file of every test
+that now passes.  Review the resulting diff before committing it.
+
 ## Notes on failures
 
 ### test/csl/bugreports_UnisaHarvardInitialization.txt
diff --git a/test/Spec.hs b/test/Spec.hs
--- a/test/Spec.hs
+++ b/test/Spec.hs
@@ -7,12 +7,12 @@
 import Citeproc.CslJson
 import Data.Algorithm.DiffContext
 import System.TimeIt (timeIt)
-import Control.Monad (unless)
+import Control.Monad (unless, when)
 import Control.Monad.Trans.State
 import Control.Monad.IO.Class (liftIO)
 import System.Environment (getArgs)
 import System.Exit
-import System.Directory (getDirectoryContents, doesFileExist)
+import System.Directory (getDirectoryContents, doesFileExist, removeFile)
 import Data.Text (Text)
 import qualified Data.Set as Set
 import qualified Text.PrettyPrint as Pretty
@@ -49,6 +49,7 @@
   , citations     :: Maybe [Citation a]
   , abbreviations :: Maybe Abbreviations
   , skipReason    :: Maybe Text
+  , expectedFailure :: Maybe Text
   , options       :: Maybe TestOptions
   } deriving (Show)
 
@@ -73,9 +74,17 @@
   | Errored CiteprocError
   deriving (Show, Eq)
 
-runTest :: CiteprocTest (CslJson Text)
+-- | Command line options of the test suite itself.
+data SpecOptions =
+  SpecOptions
+  { accept  :: Bool  -- ^ record failures in .expected files
+  , verbose :: Bool  -- ^ report warnings, passes and expected failures
+  } deriving (Show)
+
+runTest :: SpecOptions
+        -> CiteprocTest (CslJson Text)
         -> StateT Counts IO TestResult
-runTest test = do
+runTest specOpts test = do
   let opts = fromMaybe defaultTestOptions . options $ test
   let cites =
         case citations test of
@@ -91,14 +100,14 @@
                         (nubOrdOn referenceId (input test))
                 Just cs -> cs
   let doError err = do
-        modify $ \st -> st{ errored = category test : errored st }
+        modify $ \st -> st{ errored = (category test, path test) : errored st }
         liftIO $ do
           TIO.putStrLn $ "[ERRORED]  " <> T.pack (path test)
           TIO.putStrLn $ T.pack $ show err
           TIO.putStrLn ""
         return $ Errored err
   let doSkip reason = do
-        modify $ \st -> st{ skipped = category test : skipped st }
+        modify $ \st -> st{ skipped = (category test, path test) : skipped st }
         liftIO $ do
           TIO.putStrLn $ "[SKIPPED]  " <> T.pack (path test)
           -- TIO.putStrLn $ T.strip reason
@@ -116,16 +125,16 @@
             let loc = mergeLocales Nothing style
             let actual = citeproc (testCiteprocOpts opts)
                            style Nothing (input test) cites
-            unless (null (resultWarnings actual)) $ do
+            when (verbose specOpts && not (null (resultWarnings actual))) $
               liftIO $ do
                 TIO.putStrLn $ "[WARNING]  " <> T.pack (path test)
                 mapM_ (TIO.putStrLn . ("==> " <>))
                      $ resultWarnings actual
             case mode test of
-              "citation" -> compareTest test
+              "citation" -> compareTest specOpts test
                   (T.intercalate "\n" $ map (renderCslJson' loc)
                                           (resultCitations actual))
-              "bibliography" -> compareTest test
+              "bibliography" -> compareTest specOpts test
                   (T.intercalate "\n"
                     (addDivs $ map (renderCslJson' loc . snd)
                                           (resultBibliography actual)))
@@ -152,7 +161,10 @@
 referencesToCitation :: [Reference a] -> Citation a
 referencesToCitation rs =
   Citation { citationId = Nothing
+           , citationResetPosition = False
            , citationNoteNumber = Nothing
+           , citationPrefix = Nothing
+           , citationSuffix = Nothing
            , citationItems = map (\r ->
                CitationItem{ citationItemId = referenceId r
                            , citationItemLabel = Nothing
@@ -173,28 +185,57 @@
                                  c == '[' || c == ']' || isDigit c)
 
 
-compareTest :: CiteprocTest (CslJson Text)
+compareTest :: SpecOptions
+            -> CiteprocTest (CslJson Text)
             -> Text
             -> StateT Counts IO TestResult
-compareTest test actual = do
+compareTest specOpts test actual = do
   let expected = if mode test == "citation" && isJust (citations test)
                     then removeCitationNums $ result test
                     else result test
+  let expectedFailureFile = expectedFailurePath (path test)
   if actual == expected
      then do
-       modify $ \st -> st{ passed = category test : passed st }
-       -- suppress PASSED messages
-       -- liftIO $ TIO.putStrLn $ "[PASSED]   " <> path test
+       modify $ \st -> st{ passed = (category test, path test) : passed st }
+       when (verbose specOpts) $
+         liftIO $ TIO.putStrLn $ "[PASSED]   " <> T.pack (path test)
+       case expectedFailure test of
+         Nothing -> return ()
+         Just _
+           | accept specOpts -> liftIO $ do
+               removeFile expectedFailureFile
+               putStrLn $ "[REMOVED]  " <> expectedFailureFile
+           | otherwise -> modify $ \st ->
+               st{ unexpectedPasses = path test : unexpectedPasses st }
        return Passed
      else do
-       modify $ \st -> st{ failed = category test : failed st }
-       liftIO $ do
-         TIO.putStrLn $ "[FAILED]   " <> T.pack (path test)
-         showDiff expected actual
+       modify $ \st -> st{ failed = (category test, path test) : failed st }
+       if expectedFailure test == Just actual
+          then when (verbose specOpts) $ liftIO $ do
+                 TIO.putStrLn $ "[FAILED:EXPECTED] " <> T.pack (path test)
+                 showDiff expected actual
+          else if accept specOpts
+                  then liftIO $ do
+                    TIO.writeFile expectedFailureFile (actual <> "\n")
+                    putStrLn $ "[ACCEPTED] " <> expectedFailureFile
+                  else do
+                    modify $ \st ->
+                      st{ unexpectedFailures =
+                            path test : unexpectedFailures st }
+                    liftIO $ do
+                      TIO.putStrLn $
+                        "[FAILED:UNEXPECTED] " <> T.pack (path test)
+                      showDiff expected actual
        return $ Failed actual expected
 
+-- A test that is known to fail has, alongside its .txt file, an .expected
+-- file containing the output we currently produce.  The failure counts as
+-- an expected failure only if the output still matches this file exactly.
+expectedFailurePath :: FilePath -> FilePath
+expectedFailurePath fp = fp -<.> ".expected"
+
 splitSections :: ByteString -> [(Text, ByteString)]
-splitSections = snd . foldl' go startingState . B.lines . removeBOM
+splitSections = snd . Data.List.foldl' go startingState . B.lines . removeBOM
  where
   removeBOM bs = if "\xef\xbb\xbf" `B.isPrefixOf` bs
                     then B.drop 3 bs
@@ -229,6 +270,13 @@
     if exists
        then Just <$> TIO.readFile (fp <> ".skip")
        else return Nothing
+  expectedFail <- do
+    let expectedFp = expectedFailurePath fp
+    exists <- doesFileExist expectedFp
+    if exists
+       -- the file has a final newline, the test output does not
+       then Just . T.dropWhileEnd (== '\n') <$> TIO.readFile expectedFp
+       else return Nothing
   return CiteprocTest
     { name = T.pack $ dropExtension $ takeBaseName fp
     , path = fp
@@ -249,6 +297,7 @@
     , abbreviations = fromJSON "ABBREVIATIONS" <$>
                      lookup "abbreviations" sections
     , skipReason = reason
+    , expectedFailure = expectedFail
     , options = fromJSON "TESTOPTIONS" <$> lookup "options" sections
     }
 
@@ -276,12 +325,18 @@
 main :: IO ()
 main = do
   args <- getArgs
+  -- with --accept, the .expected file of every failing test is (re)written
+  -- with its current output, and that of every passing test is removed;
+  -- with --verbose, passes and expected failures are reported too
+  let specOpts = SpecOptions{ accept  = "--accept" `elem` args
+                            , verbose = "--verbose" `elem` args }
+  let patterns = filter (`notElem` ["--accept", "--verbose"]) args
   let matchesPattern x =
         takeExtension x == ".txt" &&
-        case args of
+        case patterns of
           [] -> True
-          _  -> any (\arg -> map toLower arg `isInfixOf` map toLower x) args
-  overrides <- if any ('/' `elem`) args
+          _  -> any (\arg -> map toLower arg `isInfixOf` map toLower x) patterns
+  overrides <- if any ('/' `elem`) patterns
                   then return []
                   else filter matchesPattern <$>
                           getDirectoryContents overrideDir
@@ -290,8 +345,8 @@
                      then overrideDir </> fp
                      else testDir </> fp
 
-  testFiles <- if any ('/' `elem`) args
-                  then return args
+  testFiles <- if any ('/' `elem`) patterns
+                  then return patterns
                   else do
                     cslTests <- map addDir . filter matchesPattern
                                  <$> getDirectoryContents testDir
@@ -302,55 +357,70 @@
 
   testCases <- sortOn name <$> mapM loadTestCase testFiles
   (_,counts) <- timeIt $
-                 runStateT (mapM_ runTest testCases)
+                 runStateT (mapM_ (runTest specOpts) testCases)
                            Counts{ failed   = []
                                  , errored  = []
                                  , passed   = []
-                                 , skipped  = [] }
+                                 , skipped  = []
+                                 , unexpectedFailures = []
+                                 , unexpectedPasses   = [] }
   putStrLn ""
   let categories = sort $ Set.toList
                         $ foldr (Set.insert . category) mempty testCases
-  putStrLn $ printf "%-15s %6s %6s %6s %6s"
+  putStrLn $ printf "%-29s %6s %6s %6s %6s"
                ("CATEGORY" :: String)
-               ("PASS" :: String)
-               ("FAIL" :: String)
-               ("ERROR" :: String)
-               ("SKIP" :: String)
+               ("  PASS" :: String)
+               ("  FAIL" :: String)
+               (" ERROR" :: String)
+               ("  SKIP" :: String)
   let resultsFor cat = do
-        let p = length . filter (== cat) . passed $ counts
-        let f = length . filter (== cat) . failed $ counts
-        let e = length . filter (== cat) . errored $ counts
-        let s = length . filter (== cat) . skipped $ counts
+        let p = length . filter ((== cat) . fst) . passed $ counts
+        let f = length . filter ((== cat) . fst) . failed $ counts
+        let e = length . filter ((== cat) . fst) . errored $ counts
+        let s = length . filter ((== cat) . fst) . skipped $ counts
         let percent = (fromIntegral p / fromIntegral (p + f + e) :: Double)
-        putStrLn $ printf "%-15s %6d %6d %6d %6d    |%-20s|"
+        putStrLn $ printf "%-29s %6d %6d %6d %6d |%-20s|"
                      (T.unpack cat) p f e s
                      (replicate (floor (percent * 20.0)) '+')
   mapM_ resultsFor categories
-  putStrLn $ printf "%-15s %6s %6s %6s %6s"
+  putStrLn $ printf "%-30s %6s %6s %6s %6s"
                ("-------------" :: String)
                ("-----" :: String)
                ("-----" :: String)
                ("-----" :: String)
                ("-----" :: String)
-  putStrLn $ printf "%-15s %6d %6d %6d %6d"
+  putStrLn $ printf "%-30s %6d %6d %6d %6d"
                ("(all)" :: String)
                (length (passed counts))
                (length (failed counts))
                (length (errored counts))
                (length (skipped counts))
-  case length (failed counts) + length (errored counts) of
-    0 -> exitSuccess
-    n | n <= 62 -> do
-         putStrLn "We have passed all the CSL tests we expect to..."
-         exitSuccess
-      | otherwise -> exitWith $ ExitFailure n
+  unless (null (unexpectedFailures counts)) $ do
+    putStrLn ""
+    putStrLn "Unexpected failures"
+    putStrLn "-------------------"
+    mapM_ putStrLn (unexpectedFailures counts)
+    putStrLn ""
+  unless (null (unexpectedPasses counts)) $ do
+    putStrLn ""
+    putStrLn "Unexpected passes"
+    putStrLn "-----------------"
+    mapM_ putStrLn (unexpectedPasses counts)
+    putStrLn ""
+  case length (unexpectedFailures counts) + length (errored counts) of
+    0 -> do
+      putStrLn "(All failures were expected failures.)"
+      exitSuccess
+    n -> exitWith $ ExitFailure n
 
 data Counts  =
     Counts
-    { failed   :: [Text]
-    , errored  :: [Text]
-    , passed   :: [Text]
-    , skipped  :: [Text]
+    { failed   :: [(Text,FilePath)]  -- category, filepath
+    , errored  :: [(Text,FilePath)]
+    , passed   :: [(Text,FilePath)]
+    , skipped  :: [(Text,FilePath)]
+    , unexpectedFailures :: [FilePath]  -- failed, but not as recorded
+    , unexpectedPasses   :: [FilePath]  -- passed, though a failure was recorded
     } deriving (Show)
 
 showDiff :: Text -> Text -> IO ()
@@ -365,4 +435,3 @@
     (Pretty.text "actual")
     (Pretty.text . T.unpack . unnumber)
     $ getContextDiff Nothing (T.lines expected) (T.lines actual)
-
diff --git a/test/Unit.hs b/test/Unit.hs
new file mode 100644
--- /dev/null
+++ b/test/Unit.hs
@@ -0,0 +1,125 @@
+{-# LANGUAGE OverloadedStrings #-}
+-- | Unit tests for backend functions not covered by the file-based
+-- CSL test suite (which only exercises the CslJson backend's HTML
+-- rendering).
+module Main (main) where
+import Citeproc.Types (CiteprocOutput(..))
+import Citeproc.CslJson (CslJson(..), cslJsonToJson, parseCslJson)
+import Citeproc.Pandoc ()
+import Text.Pandoc.Builder
+import Data.Aeson (Value(..), object, toJSON)
+import Data.Text (Text)
+import Data.Maybe (mapMaybe)
+import System.Exit (exitFailure, exitSuccess)
+import Text.Printf (printf)
+
+main :: IO ()
+main = do
+  let failures = mapMaybe check inlineCases ++ mapMaybe check jsonCases
+                   ++ mapMaybe check quoteCases
+  let total = length inlineCases + length jsonCases + length quoteCases
+  mapM_ report failures
+  printf "%d of %d unit tests passed.\n" (total - length failures) total
+  if null failures
+     then exitSuccess
+     else exitFailure
+ where
+  check (name, actual, expected)
+    | actual == expected = Nothing
+    | otherwise          = Just (name, show expected, show actual)
+  report (name, expected, actual) = do
+    putStrLn $ "[FAILED] " <> name
+    putStrLn $ "  expected: " <> expected
+    putStrLn $ "  actual:   " <> actual
+
+-- dropTextWhile/dropTextWhileEnd on pandoc Inlines:
+inlineCases :: [(String, Inlines, Inlines)]
+inlineCases =
+  -- dropTextWhileEnd must trim from the *last* Str of a trailing
+  -- nested inline, not the first:
+  [ ("dropTextWhileEnd: trims last Str inside trailing nested inline",
+     dropTextWhileEnd (== '.') (fromList [Emph [Str "a.", Str "b."]]),
+     fromList [Emph [Str "a.", Str "b"]])
+  -- a Space that doesn't match the predicate must stop the trimming:
+  , ("dropTextWhileEnd: stops at non-matching Space",
+     dropTextWhileEnd (== '.') (fromList [Str "etc.", Space, Str "."]),
+     fromList [Str "etc.", Space])
+  -- as long as everything so far has been dropped, trimming continues
+  -- past nesting boundaries:
+  , ("dropTextWhileEnd: continues across nesting while dropping",
+     dropTextWhileEnd (== '.') (fromList [Emph [Str "a.", Str "."], Str "."]),
+     fromList [Emph [Str "a"]])
+  -- trailing space trimming (the trimR use case in Citeproc.hs):
+  , ("dropTextWhileEnd: drops a trailing Space",
+     dropTextWhileEnd (== ' ') (fromList [Str "hi", Space]),
+     fromList [Str "hi"])
+  , ("dropTextWhileEnd: single Str inside trailing nested inline",
+     dropTextWhileEnd (== '.') (fromList [Str "x ", Emph [Str "Title."]]),
+     fromList [Str "x ", Emph [Str "Title"]])
+  -- fully-dropped Strs and Spaces leave no empty Strs behind:
+  , ("dropTextWhile: drops a leading Str and Space entirely",
+     dropTextWhile (== '.') (fromList [Str ".", Str ".a"]),
+     fromList [Str "a"])
+  , ("dropTextWhile: drops a leading Space",
+     dropTextWhile (== ' ') (fromList [Space, Str "hi"]),
+     fromList [Str "hi"])
+  , ("punctuationInsideQuotes: moves a bold label's suffix inside quotes",
+     movePunctuationInsideQuotes (strong (addQuotes (text "Title")) <> text "."),
+     strong (addQuotes (fromList [Str "Title", Str "."])))
+  ]
+
+-- flip-flop formatting state in cslJsonToJson's JSON output:
+jsonCases :: [(String, [Value], [Value])]
+jsonCases =
+  [ ("cslJsonToJson: bold flip-flops in nested bold",
+     jsonOf "<b>One <b>Two <b>Three</b></b></b>",
+     [fmt "bold" [String "One ",
+        fmt "no-bold" [String "Two ",
+          fmt "bold" [String "Three"]]]])
+  , ("cslJsonToJson: bold state unaffected by italic context",
+     jsonOf "<i>One <b>Two</b></i>",
+     [fmt "italics" [String "One ", fmt "bold" [String "Two"]]])
+  , ("cslJsonToJson: italics flip-flop in nested italics",
+     jsonOf "<i>One <i>Two <i>Three</i></i></i>",
+     [fmt "italics" [String "One ",
+        fmt "no-italics" [String "Two ",
+          fmt "italics" [String "Three"]]]])
+  , ("cslJsonToJson: small-caps flip-flop in nested small-caps",
+     jsonOf "<span style=\"font-variant:small-caps;\">One \
+            \<span style=\"font-variant:small-caps;\">Two \
+            \<span style=\"font-variant:small-caps;\">Three\
+            \</span></span></span>",
+     [fmt "small-caps" [String "One ",
+        fmt "no-small-caps" [String "Two ",
+          fmt "small-caps" [String "Three"]]]])
+  ]
+ where
+  jsonOf = cslJsonToJson . parseCslJson mempty
+  fmt :: Text -> [Value] -> Value
+  fmt f xs = object [("format", String f), ("contents", toJSON xs)]
+
+-- punctuation moving (punctuation-in-quote) on the CslJson backend:
+quoteCases :: [(String, CslJson Text, CslJson Text)]
+quoteCases =
+  -- the basic case: movable punctuation after a quoted span moves inside:
+  [ ("punctuationInsideQuotes: moves comma following a quote inside",
+     movePunctuationInsideQuotes
+       (CslQuoted (CslText "Hi") <> CslText ", she said"),
+     CslQuoted (CslText "Hi" <> CslText ",") <> CslText " she said")
+  -- when the text after a quoted span starts with something unmovable,
+  -- punctuation moving must still be applied *inside* the quoted span:
+  , ("punctuationInsideQuotes: processes nested content of a quote",
+     movePunctuationInsideQuotes
+       (CslQuoted (CslQuoted (CslText "inner") <> CslText ", outer")
+          <> CslText " rest"),
+     CslQuoted (CslQuoted (CslText "inner" <> CslText ",") <> CslText " outer")
+       <> CslText " rest")
+  -- a quote that ends formatted text with other content before it:
+  , ("punctuationInsideQuotes: quote at the end of italic text",
+     movePunctuationInsideQuotes
+       (CslItalic (CslText "See" <> CslText " " <> CslQuoted (CslText "A"))
+          <> CslText ". 1900"),
+     CslItalic (CslText "See" <> CslText " "
+                  <> CslQuoted (CslText "A" <> CslText "."))
+       <> CslText " 1900")
+  ]
diff --git a/test/csl/affix_CommaAfterQuote.expected b/test/csl/affix_CommaAfterQuote.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/affix_CommaAfterQuote.expected
@@ -0,0 +1,1 @@
+“quote,” Hello Thing
diff --git a/test/csl/affix_WithCommas.expected b/test/csl/affix_WithCommas.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/affix_WithCommas.expected
@@ -0,0 +1,3 @@
+John Smith, <i>Book C</i>, 2000, and David Jones, <i>Book D</i>, 2000.
+Smith, <i>Book C</i> is one source,; Jones, <i>Book D</i> is another.
+Smith, <i>Book C</i>, 23 is one source,; Jones, <i>Book D</i> is another.
diff --git a/test/csl/affix_WithCommas.txt b/test/csl/affix_WithCommas.txt
--- a/test/csl/affix_WithCommas.txt
+++ b/test/csl/affix_WithCommas.txt
@@ -1019,7 +1019,12 @@
                 "noteIndex": 2
             }
         },
-        [["CITATION-1", 1]],
+        [
+            [
+                "CITATION-1",
+                1
+            ]
+        ],
         []
     ],
     [
@@ -1040,7 +1045,16 @@
                 "noteIndex": 3
             }
         },
-        [["CITATION-1", 1],["CITATION-2", 2]],
+        [
+            [
+                "CITATION-1",
+                1
+            ],
+            [
+                "CITATION-2",
+                2
+            ]
+        ],
         []
     ]
 ]
diff --git a/test/csl/bugreports_AccidentalAllCaps.txt b/test/csl/bugreports_AccidentalAllCaps.txt
--- a/test/csl/bugreports_AccidentalAllCaps.txt
+++ b/test/csl/bugreports_AccidentalAllCaps.txt
@@ -38,7 +38,7 @@
          <term name="accessed">consulté le </term>
          <term name="at">disponible sur&#160;: </term>
          <term name="et-al">[et al.]</term>
-	 <term name="sub verbo" form="short">
+	 <term name="sub-verbo" form="short">
 	    <single></single>
 	    <multiple></multiple>
 	 </term>
diff --git a/test/csl/bugreports_AllCapsLeakage.txt b/test/csl/bugreports_AllCapsLeakage.txt
--- a/test/csl/bugreports_AllCapsLeakage.txt
+++ b/test/csl/bugreports_AllCapsLeakage.txt
@@ -42,7 +42,7 @@
          <term name="accessed">consulté le </term>
          <term name="at">disponible sur&#160;: </term>
          <term name="et-al">[et al.]</term>
-	 <term name="sub verbo" form="short">
+	 <term name="sub-verbo" form="short">
 	    <single></single>
 	    <multiple></multiple>
 	 </term>
diff --git a/test/csl/bugreports_AutomaticallyDeleteItemsFails.expected b/test/csl/bugreports_AutomaticallyDeleteItemsFails.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_AutomaticallyDeleteItemsFails.expected
@@ -0,0 +1,11 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">
+    <div class="csl-left-margin">[1]</div><div class="csl-right-inline"> J. Doe, <i>Book A</i>, 2000.</div>
+  </div>
+  <div class="csl-entry">
+    <div class="csl-left-margin">[2]</div><div class="csl-right-inline"> J. Doe, <i>Book B</i>, 2000.</div>
+  </div>
+  <div class="csl-entry">
+    <div class="csl-left-margin">[3]</div><div class="csl-right-inline"> R. Snoakes, <i>Book C</i>, 2000.</div>
+  </div>
+</div>
diff --git a/test/csl/bugreports_ChicagoAuthorDateLooping.expected b/test/csl/bugreports_ChicagoAuthorDateLooping.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_ChicagoAuthorDateLooping.expected
@@ -0,0 +1,1 @@
+(Manstein 1982; Anon.; Anon.)
diff --git a/test/csl/bugreports_ChicagoAuthorDateLooping.txt b/test/csl/bugreports_ChicagoAuthorDateLooping.txt
--- a/test/csl/bugreports_ChicagoAuthorDateLooping.txt
+++ b/test/csl/bugreports_ChicagoAuthorDateLooping.txt
@@ -2,6 +2,8 @@
 citation
 <<===== MODE =====<<
 
+
+>>===== DESCRIPTION =====>>
 This is a little weird, but it's what the style wants, I think.
 
 Looping was caused by attempt to render:
@@ -12,7 +14,13 @@
 
 (Anon.a; Anon.b; Manstein 1982)
 
-... but seems more sensibly rendered as ...
+but seems more sensibly rendered as the indicated result, below.
+
+Note also that since this test has no explicit CITATION-ITEMS or CITATIONS, they are synthesized
+from the inputs *after* the inputs are sorted, which is why the Anon cite items precede Manstein.
+See https://github.com/citation-style-language/test-suite/issues/66 for discussion.
+<<===== DESCRIPTION =====<<
+
 
 >>===== RESULT =====>>
 (Anon.; Anon.; Manstein 1982)
diff --git a/test/csl/bugreports_DelimitersOnLocator.txt b/test/csl/bugreports_DelimitersOnLocator.txt
--- a/test/csl/bugreports_DelimitersOnLocator.txt
+++ b/test/csl/bugreports_DelimitersOnLocator.txt
@@ -2,6 +2,11 @@
 citation
 <<==== MODE ====<<
 
+>>==== DESCRIPTION ====>>
+See discussion
+https://forums.zotero.org/discussion/19953/csl-processor-bug-citation-delimiter-in-numeric-styles-with-locator
+<<==== DESCRIPTION ====<<
+
 >>==== RESULT ====>>
 [1, 32; 2, 32; 3, 32]
 <<==== RESULT ====<<
diff --git a/test/csl/bugreports_DemoPageFullCiteCruftOnSubsequent.expected b/test/csl/bugreports_DemoPageFullCiteCruftOnSubsequent.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_DemoPageFullCiteCruftOnSubsequent.expected
@@ -0,0 +1,1 @@
+Nolan J. Malone, U.S. Bureau of the Census, <i>Evaluating Components of International Migration: Consistency of 2000 Nativity Data</i> (New York: Routledge, 2001).
diff --git a/test/csl/bugreports_EnvAndUrb.expected b/test/csl/bugreports_EnvAndUrb.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_EnvAndUrb.expected
@@ -0,0 +1,3 @@
+Baines, T S, O Benedettini and J M Kay, ‘Title One’; Baines, T S, F Gump and J M Kay, ‘Title Two’.
+See reference 1, Baines et al., ‘Title One’.
+See reference 1, Baines et al., ‘Title Two’.
diff --git a/test/csl/bugreports_GreekStyleProblems.txt b/test/csl/bugreports_GreekStyleProblems.txt
--- a/test/csl/bugreports_GreekStyleProblems.txt
+++ b/test/csl/bugreports_GreekStyleProblems.txt
@@ -83,29 +83,6 @@
       <term name="long-ordinal-08">όγδοος</term>
       <term name="long-ordinal-09">ένατος</term>
       <term name="long-ordinal-10">δέκατος</term>
-       <term name="anthropology">ανθρωπολογία</term>
-    <term name="astronomy">αστρονομία</term>
-    <term name="biology">βιολογία</term>
-    <term name="botany">βοτανική</term>
-    <term name="chemistry">χημεία</term>
-    <term name="engineering">μηχανική</term>
-    <term name="generic-base">γενική βάση</term>
-    <term name="geography">γεωγραφία</term>
-    <term name="geology">γεωλογία</term>
-    <term name="history">ιστορία</term>
-    <term name="humanities">ανθρωπιστικές σπουδές</term>
-    <term name="literature">λογοτεχνία</term>
-    <term name="math">μαθηματικά</term>
-    <term name="medicine">ιατρική</term>
-    <term name="philosophy">φιλοσοφία</term>
-    <term name="physics">φυσική</term>
-    <term name="psychology">ψυχολογία</term>
-    <term name="sociology">κοινωνιολογία</term>
-    <term name="science">θετικές επιστήμες</term>
-    <term name="political_science">πολιτικές επιστήμες</term>
-    <term name="social_science">κοινωνικές επιστήμες</term>
-    <term name="theology">θεολογία</term>
-    <term name="zoology">ζωολογία</term>
        <term name="book">
          <single>βιβλίο</single>
          <multiple>βιβλίο</multiple>
@@ -158,7 +135,7 @@
          <single>τμήμα</single>
          <multiple>τμήματα</multiple>
       </term>
-      <term name="sub verbo">
+      <term name="sub-verbo">
          <single>λήμμα</single>
          <multiple>λήμματα</multiple>
       </term>
@@ -184,7 +161,7 @@
      <term name="paragraph" form="short">παρ</term>
       <term name="part" form="short">μερ</term>
       <term name="section" form="short">τμ</term>
-      <term name="sub verbo" form="short">
+      <term name="sub-verbo" form="short">
          <single>λήμ</single>
          <multiple>λήμ</multiple>
       </term>
@@ -499,11 +476,11 @@
         <choose>
           <if variable="author">
              <text variable="title"  prefix="«" suffix="»"/>
-<text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+<text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </if>
           <else>
             <text variable="title" prefix="«" suffix="»"/>
-            <text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+            <text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </else>
         </choose>
       </else-if>
@@ -511,11 +488,11 @@
         <choose>
           <if variable="author">
        <text variable="title"  prefix="«" suffix="»"/>
-<text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+<text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </if>
           <else>
             <text variable="title" prefix="«" suffix="»"/>
-            <text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+            <text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </else>
         </choose>
       </else-if>
@@ -540,11 +517,11 @@
         <choose>
           <if variable="author">
                <text variable="title"  prefix="«" suffix="»"/>
-<text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+<text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </if>
           <else>
             <text variable="title" prefix="«" suffix="»"/>
-            <text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+            <text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </else>
         </choose>
       </else-if>
@@ -552,11 +529,11 @@
         <choose>
           <if variable="author">
            <text variable="title"  prefix="«" suffix="»"/>
-<text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+<text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </if>
           <else>
             <text variable="title" prefix="«" suffix="»"/>
-            <text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+            <text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </else>
         </choose>
       </else-if>
diff --git a/test/csl/bugreports_GreekStyleTwoEditors.txt b/test/csl/bugreports_GreekStyleTwoEditors.txt
--- a/test/csl/bugreports_GreekStyleTwoEditors.txt
+++ b/test/csl/bugreports_GreekStyleTwoEditors.txt
@@ -83,29 +83,6 @@
       <term name="long-ordinal-08">όγδοος</term>
       <term name="long-ordinal-09">ένατος</term>
       <term name="long-ordinal-10">δέκατος</term>
-       <term name="anthropology">ανθρωπολογία</term>
-    <term name="astronomy">αστρονομία</term>
-    <term name="biology">βιολογία</term>
-    <term name="botany">βοτανική</term>
-    <term name="chemistry">χημεία</term>
-    <term name="engineering">μηχανική</term>
-    <term name="generic-base">γενική βάση</term>
-    <term name="geography">γεωγραφία</term>
-    <term name="geology">γεωλογία</term>
-    <term name="history">ιστορία</term>
-    <term name="humanities">ανθρωπιστικές σπουδές</term>
-    <term name="literature">λογοτεχνία</term>
-    <term name="math">μαθηματικά</term>
-    <term name="medicine">ιατρική</term>
-    <term name="philosophy">φιλοσοφία</term>
-    <term name="physics">φυσική</term>
-    <term name="psychology">ψυχολογία</term>
-    <term name="sociology">κοινωνιολογία</term>
-    <term name="science">θετικές επιστήμες</term>
-    <term name="political_science">πολιτικές επιστήμες</term>
-    <term name="social_science">κοινωνικές επιστήμες</term>
-    <term name="theology">θεολογία</term>
-    <term name="zoology">ζωολογία</term>
        <term name="book">
          <single>βιβλίο</single>
          <multiple>βιβλίο</multiple>
@@ -158,7 +135,7 @@
          <single>τμήμα</single>
          <multiple>τμήματα</multiple>
       </term>
-      <term name="sub verbo">
+      <term name="sub-verbo">
          <single>λήμμα</single>
          <multiple>λήμματα</multiple>
       </term>
@@ -184,7 +161,7 @@
      <term name="paragraph" form="short">παρ</term>
       <term name="part" form="short">μερ</term>
       <term name="section" form="short">τμ</term>
-      <term name="sub verbo" form="short">
+      <term name="sub-verbo" form="short">
          <single>λήμ</single>
          <multiple>λήμ</multiple>
       </term>
@@ -499,11 +476,11 @@
         <choose>
           <if variable="author">
              <text variable="title"  prefix="«" suffix="»"/>
-<text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+<text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </if>
           <else>
             <text variable="title" prefix="«" suffix="»"/>
-            <text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+            <text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </else>
         </choose>
       </else-if>
@@ -511,11 +488,11 @@
         <choose>
           <if variable="author">
        <text variable="title"  prefix="«" suffix="»"/>
-<text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+<text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </if>
           <else>
             <text variable="title" prefix="«" suffix="»"/>
-            <text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+            <text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </else>
         </choose>
       </else-if>
@@ -540,11 +517,11 @@
         <choose>
           <if variable="author">
                <text variable="title"  prefix="«" suffix="»"/>
-<text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+<text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </if>
           <else>
             <text variable="title" prefix="«" suffix="»"/>
-            <text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+            <text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </else>
         </choose>
       </else-if>
@@ -552,11 +529,11 @@
         <choose>
           <if variable="author">
            <text variable="title"  prefix="«" suffix="»"/>
-<text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+<text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </if>
           <else>
             <text variable="title" prefix="«" suffix="»"/>
-            <text term="sub verbo" text-case="lowercase" prefix=" (" suffix=")"/>
+            <text term="sub-verbo" text-case="lowercase" prefix=" (" suffix=")"/>
           </else>
         </choose>
       </else-if>
diff --git a/test/csl/bugreports_LegislationCrash.expected b/test/csl/bugreports_LegislationCrash.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_LegislationCrash.expected
@@ -0,0 +1,3 @@
+<div class="csl-bib-body">
+  <div class="csl-entry"><i>Arrêté du 23 mars 1992 relatif au programme des études conduisant au diplôme d’État d’infirmier</i>, 1992.</div>
+</div>
diff --git a/test/csl/bugreports_NoCaseEscape.expected b/test/csl/bugreports_NoCaseEscape.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_NoCaseEscape.expected
@@ -0,0 +1,8 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">
+    <div class="csl-block">Aalto, Alan</div><div class="csl-left-margin"> N.d.a</div><div class="csl-right-inline">“‘PIAAC-Longitudinal (PIAAC-L) 2015.’”</div>
+  </div>
+  <div class="csl-entry">
+    <div class="csl-left-margin"> N.d.b</div><div class="csl-right-inline">“PIAAC-Longitudinal (PIAAC-Lx) 2015.”</div>
+  </div>
+</div>
diff --git a/test/csl/bugreports_OverwriteCitationItems.expected b/test/csl/bugreports_OverwriteCitationItems.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_OverwriteCitationItems.expected
@@ -0,0 +1,2 @@
+Title Two; Title Three
+Title Four; Title Five
diff --git a/test/csl/bugreports_SingleQuoteXml.expected b/test/csl/bugreports_SingleQuoteXml.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_SingleQuoteXml.expected
@@ -0,0 +1,1 @@
+[Cite with a composer ; O A. “hello” <i>Book Title</i>]
diff --git a/test/csl/bugreports_SmallCapsEscape.expected b/test/csl/bugreports_SmallCapsEscape.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_SmallCapsEscape.expected
@@ -0,0 +1,5 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">
+    <div class="csl-block">Aalto, Alan</div><div class="csl-left-margin"> N.d.</div><div class="csl-right-inline"><span style="font-variant:small-caps;">Here</span>.</div>
+  </div>
+</div>
diff --git a/test/csl/bugreports_SortedIeeeItalicsFail.txt b/test/csl/bugreports_SortedIeeeItalicsFail.txt
--- a/test/csl/bugreports_SortedIeeeItalicsFail.txt
+++ b/test/csl/bugreports_SortedIeeeItalicsFail.txt
@@ -7,13 +7,13 @@
 >>===== RESULT =====>>
 <div class="csl-bib-body">
   <div class="csl-entry">
-    <div class="csl-left-margin">[1]</div><div class="csl-right-inline"> J. Doe, “His Anonymous Article,” <i>Journal of Obscurity</i>, vol. 100, p. 15, Jun. 1965.</div>
+    <div class="csl-left-margin">[1]</div><div class="csl-right-inline"> J. Doe, “His Anonymous Article,” <i>Journal of Obscurity</i>, vol. 100, p. 15, June. 1965.</div>
   </div>
   <div class="csl-entry">
-    <div class="csl-left-margin">[2]</div><div class="csl-right-inline"> G. Everhardt, “His Anonymous Article,” <i>Journal of Obscurity</i>, vol. 100, p. 15, Jun. 1965.</div>
+    <div class="csl-left-margin">[2]</div><div class="csl-right-inline"> G. Everhardt, “His Anonymous Article,” <i>Journal of Obscurity</i>, vol. 100, p. 15, June. 1965.</div>
   </div>
   <div class="csl-entry">
-    <div class="csl-left-margin">[3]</div><div class="csl-right-inline"> J. Roe, “His Anonymous Article,” <i>Journal of Obscurity</i>, vol. 100, p. 15, Jun. 1965.</div>
+    <div class="csl-left-margin">[3]</div><div class="csl-right-inline"> J. Roe, “His Anonymous Article,” <i>Journal of Obscurity</i>, vol. 100, p. 15, June. 1965.</div>
   </div>
 </div>
 <<===== RESULT =====<<
@@ -369,4 +369,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/bugreports_UndefinedInName3.txt b/test/csl/bugreports_UndefinedInName3.txt
--- a/test/csl/bugreports_UndefinedInName3.txt
+++ b/test/csl/bugreports_UndefinedInName3.txt
@@ -2,6 +2,7 @@
 citation
 <<===== MODE =====<<
 
+>>===== DESCRIPTION =====>>
 Bug report by Carles Pina.
 
 ## 2013-04-17 :: Frank Bennett <biercenator@gmail.com>
@@ -11,6 +12,7 @@
   specification was subsequently revised to required "by-cite"
   disambiguation. Under by-cite disambiguation, the subsequent form in
   the style is "Kim and Kim", without the given names.
+<<===== DESCRIPTION =====<<
 
 >>===== RESULT =====>>
 B-X Kim and A-Y Kim.
diff --git a/test/csl/bugreports_disambigHang.txt b/test/csl/bugreports_disambigHang.txt
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_disambigHang.txt
@@ -0,0 +1,117 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+
+>>===== RESULT =====>>
+(de Boer et al. 2000a, 2000b)
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style 
+      xmlns="http://purl.org/net/xbiblio/csl"
+      class="in-text"
+      demote-non-dropping-particle="never" default-locale="en-US"
+      version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2009-08-10T04:49:00+09:00</updated>
+  </info>
+  <citation et-al-min="3" et-al-use-first="1"
+    disambiguate-add-givenname="true" disambiguate-add-year-suffix="true"
+    collapse="year" cite-group-delimiter=", ">
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=" ">
+        <names variable="author">
+          <name form="short" and="text" delimiter=", " initialize-with=". "/>
+        </names>
+        <date variable="issued" form="text" date-parts="year"/>
+      </group>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+    {
+        "author": [
+            {
+                "family": "de Boer",
+                "given": "Carl G."
+            },
+            {
+                "family": "Ray",
+                "given": "John P."
+            },
+            {
+                "family": "Hacohen",
+                "given": "Nir"
+            },
+            {
+                "family": "Regev",
+                "given": "Aviv"
+            }
+        ],
+        "id": "ITEM-1",
+        "issued": {
+            "date-parts": [
+                [
+                    2000,
+                    1,
+                    15
+                ]
+            ]
+        },
+        "type": "book"
+    },
+    {
+        "author": [
+            {
+                "family": "de Boer",
+                "given": "Carl G."
+            },
+            {
+                "family": "Vaishnav",
+                "given": "Eeshit Dhaval"
+            },
+            {
+                "family": "Sadeh",
+                "given": "Ronen"
+            },
+            {
+                "family": "Abeyta",
+                "given": "Esteban Luis"
+            },
+            {
+                "family": "Friedman",
+                "given": "Nir"
+            },
+            {
+                "family": "Regev",
+                "given": "Aviv"
+            }
+        ],
+        "id": "ITEM-2",
+        "issued": {
+            "date-parts": [
+                [
+                    2000,
+                    1,
+                    15
+                ]
+            ]
+        },
+        "type": "book"
+    }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/csl/bugreports_ikeyOne.expected b/test/csl/bugreports_ikeyOne.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_ikeyOne.expected
@@ -0,0 +1,2 @@
+(John Smith)
+(James Smith)
diff --git a/test/csl/bugreports_parseName.expected b/test/csl/bugreports_parseName.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/bugreports_parseName.expected
@@ -0,0 +1,4 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">van Happel, Eduard 2008</div>
+  <div class="csl-entry">von Hoppel, Gustav 2008</div>
+</div>
diff --git a/test/csl/collapse_AuthorCollapseNoDateSorted.txt b/test/csl/collapse_AuthorCollapseNoDateSorted.txt
--- a/test/csl/collapse_AuthorCollapseNoDateSorted.txt
+++ b/test/csl/collapse_AuthorCollapseNoDateSorted.txt
@@ -12,7 +12,7 @@
 
 
 >>===== RESULT =====>>
-(Smith 325AD, 2000)
+(Smith 325 AD, 2000)
 <<===== RESULT =====<<
 
 >>===== CITATION-ITEMS =====>>
@@ -32,7 +32,7 @@
 <<===== CITATION-ITEMS =====<<
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -66,48 +66,48 @@
     {
         "author": [
             {
-                "family": "Smith", 
+                "family": "Smith",
                 "given": "John"
             }
-        ], 
-        "id": "ITEM-1", 
+        ],
+        "id": "ITEM-1",
         "issued": {
             "date-parts": [
                 [
                     325
                 ]
             ]
-        }, 
-        "title": "Ignore me 1", 
+        },
+        "title": "Ignore me 1",
         "type": "book"
-    }, 
+    },
     {
         "author": [
             {
-                "family": "Smith", 
+                "family": "Smith",
                 "given": "John"
             }
-        ], 
-        "id": "ITEM-2", 
+        ],
+        "id": "ITEM-2",
         "issued": {
             "date-parts": [
                 [
                     2000
                 ]
             ]
-        }, 
-        "title": "Ignore me 2", 
+        },
+        "title": "Ignore me 2",
         "type": "book"
     },
     {
         "author": [
             {
-                "family": "Smith", 
+                "family": "Smith",
                 "given": "John"
             }
-        ], 
-        "id": "ITEM-3", 
-        "title": "Ignore me 3", 
+        ],
+        "id": "ITEM-3",
+        "title": "Ignore me 3",
         "type": "book"
     }
 ]
@@ -117,4 +117,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/collapse_TrailingDelimiter.txt b/test/csl/collapse_TrailingDelimiter.txt
--- a/test/csl/collapse_TrailingDelimiter.txt
+++ b/test/csl/collapse_TrailingDelimiter.txt
@@ -62,7 +62,7 @@
       <group delimiter=" ">
         <names variable="author">
           <name and="symbol" delimiter=", " form="short" />
-          <et-al prefix=" " />
+          <et-al/>
         </names>
         <date variable="issued">
           <date-part name="year" />
diff --git a/test/csl/date_DateAD.txt b/test/csl/date_DateAD.txt
--- a/test/csl/date_DateAD.txt
+++ b/test/csl/date_DateAD.txt
@@ -6,12 +6,12 @@
 
 
 >>===== RESULT =====>>
-(499AD)
+(499 AD)
 <<===== RESULT =====<<
 
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -54,4 +54,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/date_DateBC.txt b/test/csl/date_DateBC.txt
--- a/test/csl/date_DateBC.txt
+++ b/test/csl/date_DateBC.txt
@@ -6,12 +6,12 @@
 
 
 >>===== RESULT =====>>
-(250BC)
+(250 BC)
 <<===== RESULT =====<<
 
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -54,4 +54,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/date_NegativeDateSort.txt b/test/csl/date_NegativeDateSort.txt
--- a/test/csl/date_NegativeDateSort.txt
+++ b/test/csl/date_NegativeDateSort.txt
@@ -9,12 +9,12 @@
 (whether ascending or descending).
 
 >>===== RESULT =====>>
-100BC-7-13, 44BC-3-15, 54AD-10-13, 68AD-6-11
+100 BC-7-13, 44 BC-3-15, 54 AD-10-13, 68 AD-6-11
 <<===== RESULT =====<<
 
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -104,4 +104,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/date_NegativeDateSortViaMacro.txt b/test/csl/date_NegativeDateSortViaMacro.txt
--- a/test/csl/date_NegativeDateSortViaMacro.txt
+++ b/test/csl/date_NegativeDateSortViaMacro.txt
@@ -9,12 +9,12 @@
 (whether ascending or descending).
 
 >>===== RESULT =====>>
-100BC-7-13, 44BC-3-15, 54AD-10-13, 68AD-6-11
+100 BC-7-13, 44 BC-3-15, 54 AD-10-13, 68 AD-6-11
 <<===== RESULT =====<<
 
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -107,4 +107,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/date_NegativeDateSortViaMacroOnYearMonthOnly.txt b/test/csl/date_NegativeDateSortViaMacroOnYearMonthOnly.txt
--- a/test/csl/date_NegativeDateSortViaMacroOnYearMonthOnly.txt
+++ b/test/csl/date_NegativeDateSortViaMacroOnYearMonthOnly.txt
@@ -9,12 +9,12 @@
 (whether ascending or descending).
 
 >>===== RESULT =====>>
-BookX (100BC-7-14), BookY (100BC-7-13), BookA (68AD-3-16), BookB (68AD-3-15)
+BookX (100 BC-7-14), BookY (100 BC-7-13), BookA (68 AD-3-16), BookB (68 AD-3-15)
 <<===== RESULT =====<<
 
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -117,4 +117,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/date_SortEmptyDatesBibliography.txt b/test/csl/date_SortEmptyDatesBibliography.txt
--- a/test/csl/date_SortEmptyDatesBibliography.txt
+++ b/test/csl/date_SortEmptyDatesBibliography.txt
@@ -2,10 +2,11 @@
 bibliography
 <<===== MODE =====<<
 
-Sort position of empty dates differs in citations and bibliographies.
-In citations, empty dates have a value equivalent to zero.  In
-bibliographies, they are always placed at the end of the sort
-(whether ascending or descending).
+
+>>===== DESCRIPTION =====>>
+Citation and bibliography items should both sort empty dates last. See discussion
+https://github.com/citation-style-language/test-suite/issues/70
+<<===== DESCRIPTION =====<<
 
 
 >>===== RESULT =====>>
diff --git a/test/csl/date_SortEmptyDatesCitation.txt b/test/csl/date_SortEmptyDatesCitation.txt
--- a/test/csl/date_SortEmptyDatesCitation.txt
+++ b/test/csl/date_SortEmptyDatesCitation.txt
@@ -2,10 +2,12 @@
 citation
 <<===== MODE =====<<
 
-Sort position of empty dates differs in citations and bibliographies.
-In citations, empty dates have a value equivalent to zero.  In
-bibliographies, they are always placed at the end of the sort
-(whether ascending or descending).
+
+>>===== DESCRIPTION =====>>
+Citation and bibliography items should both sort empty dates last. See discussion
+https://github.com/citation-style-language/test-suite/issues/70
+<<===== DESCRIPTION =====<<
+
 
 >>===== RESULT =====>>
 BookD 1999; BookB 2000; BookA; BookC; BookE.
diff --git a/test/csl/date_VariousInvalidDates.txt b/test/csl/date_VariousInvalidDates.txt
--- a/test/csl/date_VariousInvalidDates.txt
+++ b/test/csl/date_VariousInvalidDates.txt
@@ -3,14 +3,33 @@
 <<===== MODE =====<<
 
 
+>>==== DESCRIPTION ====>>
 
+This depends on correct handling of seasons expressed in month parts per the
+discussion at
+https://discourse.citationstyles.org/t/edtf-and-date-representation/1663
+
+Additionally, it depends on further, special handling for month values 17 and
+18 per the code comment at
+
+https://github.com/Juris-M/citeproc-js/blob/master/src/node_datepart.js#L249
+
+which describes seasons derived from months "with a value of 13, 14, 15, 16,
+or (to allow correct ranging with Down Under dates) 17 or 18."
+
+This test is also described in
+https://github.com/zotero/citeproc-rs/blob/master/crates/citeproc/tests/data/snapshot.txt#L60
+
+<<==== DESCRIPTION ====<<
+
+
 >>===== RESULT =====>>
 Date: (); Date: (Spring); Date: (Spring); Date: (); Date: (Winter)
 <<===== RESULT =====<<
 
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -106,4 +125,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/date_YearSuffixImplicitWithNoDate.expected b/test/csl/date_YearSuffixImplicitWithNoDate.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/date_YearSuffixImplicitWithNoDate.expected
@@ -0,0 +1,1 @@
+(John Doe n.d. [Accessed: June 1, 1965]; John Doe n.d. [Accessed: June 1, 2065])
diff --git a/test/csl/date_YearSuffixWithNoDate.expected b/test/csl/date_YearSuffixWithNoDate.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/date_YearSuffixWithNoDate.expected
@@ -0,0 +1,1 @@
+(John Doe n.d. [Accessed: June 1, 1965]; John Doe n.d. [Accessed: June 1, 2065])
diff --git a/test/csl/decorations_Baseline.txt b/test/csl/decorations_Baseline.txt
--- a/test/csl/decorations_Baseline.txt
+++ b/test/csl/decorations_Baseline.txt
@@ -6,13 +6,13 @@
 
 >>== RESULT ==>>
 <div class="csl-bib-body">
-  <div class="csl-entry"><sup>Little, Stuart, <span style="baseline">My Short Narrative</span> (1990)</sup></div>
+  <div class="csl-entry"><sup>Little, Stuart, <span class="baseline">My Short Narrative</span> (1990)</sup></div>
 </div>
 <<== RESULT ==<<
 
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -70,4 +70,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/disambiguate_AndreaEg1a.txt b/test/csl/disambiguate_AndreaEg1a.txt
--- a/test/csl/disambiguate_AndreaEg1a.txt
+++ b/test/csl/disambiguate_AndreaEg1a.txt
@@ -3,15 +3,17 @@
 <<===== MODE =====<<
 
 
+>>===== DESCRIPTION =====>>
 ## 2013-04-17 :: Frank Bennett <biercenator@gmail.com>
 
-  This test has been recast in three forms, with:
+This test has been recast in three forms, with:
 
-    (1) disambiguate-add-names="true" disambiguate-add-givenname="true"
-    (2) disambiguate-add-names="true"
-    (3) disambiguate-add-givenname="true"
+  (1) disambiguate-add-names="true" disambiguate-add-givenname="true"
+  (2) disambiguate-add-names="true"
+  (3) disambiguate-add-givenname="true"
 
-  This version is (2).
+This version is (2).
+<<===== DESCRIPTION =====<<
 
 
 >>===== RESULT =====>>
diff --git a/test/csl/disambiguate_AndreaEg1b.txt b/test/csl/disambiguate_AndreaEg1b.txt
--- a/test/csl/disambiguate_AndreaEg1b.txt
+++ b/test/csl/disambiguate_AndreaEg1b.txt
@@ -3,7 +3,19 @@
 <<===== MODE =====<<
 
 
+>>===== DESCRIPTION =====>>
+## 2013-04-17 :: Frank Bennett <biercenator@gmail.com>
 
+This test has been recast in three forms, with:
+
+  (1) disambiguate-add-names="true" disambiguate-add-givenname="true" (default by-cite rule)
+  (2) disambiguate-add-names="true"
+  (3) disambiguate-add-givenname="true"
+
+This version is (1).
+<<===== DESCRIPTION =====<<
+
+
 >>===== RESULT =====>>
 Smith, Brown &#38; J. Jones (1980); Smith, Brown &#38; J. Jones (1980)
 Smith, Brown &#38; J. Jones (1980); Smith, Benson, et al. (1980)
@@ -40,15 +52,6 @@
 ]
 <<===== CITATION-ITEMS =====<<
 
-## 2013-04-17 :: Frank Bennett <biercenator@gmail.com>
-
-  This test has been recast in three forms, with:
-
-    (1) disambiguate-add-names="true" disambiguate-add-givenname="true" (default by-cite rule)
-    (2) disambiguate-add-names="true"
-    (3) disambiguate-add-givenname="true"
-
-  This version is (1).
 
 >>===== CSL =====>>
 <style 
diff --git a/test/csl/disambiguate_AndreaEg1c.txt b/test/csl/disambiguate_AndreaEg1c.txt
--- a/test/csl/disambiguate_AndreaEg1c.txt
+++ b/test/csl/disambiguate_AndreaEg1c.txt
@@ -3,18 +3,21 @@
 <<===== MODE =====<<
 
 
+>>===== DESCRIPTION =====>>
 ## 2013-04-17 :: Frank Bennett <biercenator@gmail.com>
 
-  This test has been recast in three forms, with:
+This test has been recast in three forms, with:
 
-    (1) disambiguate-add-names="true" disambiguate-add-givenname="true" (default by-cite rule)
-    (2) disambiguate-add-names="true"
-    (3) disambiguate-add-givenname="true"
+  (1) disambiguate-add-names="true" disambiguate-add-givenname="true" (default by-cite rule)
+  (2) disambiguate-add-names="true"
+  (3) disambiguate-add-givenname="true"
 
-  This version is (3).
+This version is (3).
 
-  The result would be useless in this case, but it is what the style
-  has been set to deliver.
+The result would be useless in this case, but it is what the style
+has been set to deliver.
+<<===== DESCRIPTION =====<<
+  
 
 >>===== RESULT =====>>
 Smith et al. (1980); Smith et al. (1980)
diff --git a/test/csl/disambiguate_CitationLabelInData.expected b/test/csl/disambiguate_CitationLabelInData.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_CitationLabelInData.expected
@@ -0,0 +1,1 @@
+SpiffLabel1900a; SpiffLabel1900b; Bron00; BrCh98; vEFG26
diff --git a/test/csl/disambiguate_DifferentSpacingInInitials.expected b/test/csl/disambiguate_DifferentSpacingInInitials.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_DifferentSpacingInInitials.expected
@@ -0,0 +1,1 @@
+Doe, J. J., His Anonymous Life (part 1); Doe, J. J., His Anonymous Life (part 2)
diff --git a/test/csl/disambiguate_DisambiguationHang.expected b/test/csl/disambiguate_DisambiguationHang.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_DisambiguationHang.expected
@@ -0,0 +1,3 @@
+(Caminiti, Johnson, Burnod, Galli, &#38; Ferraina 1990a)
+(Caminiti, Johnson, Burnod, Galli, &#38; Ferraina 1990b)
+(Caminiti, Johnson, &#38; Urbano 1990a)
diff --git a/test/csl/disambiguate_IncrementalExtraText.expected b/test/csl/disambiguate_IncrementalExtraText.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_IncrementalExtraText.expected
@@ -0,0 +1,5 @@
+Yost Trisk
+John Smith, Book One, ed. 3
+John Smith, Book Two, ed. 4
+John Smith, Complete Works, ed. 5
+John Smith, Complete Works, ed. 6
diff --git a/test/csl/disambiguate_InitializeWithButNoDisambiguation.expected b/test/csl/disambiguate_InitializeWithButNoDisambiguation.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_InitializeWithButNoDisambiguation.expected
@@ -0,0 +1,1 @@
+(Doe, 1965b; Doe, 1965a)
diff --git a/test/csl/disambiguate_PrimaryNameWithNonDroppingParticle.txt b/test/csl/disambiguate_PrimaryNameWithNonDroppingParticle.txt
--- a/test/csl/disambiguate_PrimaryNameWithNonDroppingParticle.txt
+++ b/test/csl/disambiguate_PrimaryNameWithNonDroppingParticle.txt
@@ -46,8 +46,119 @@
 
 >>===== INPUT =====>>
 [
-  {"id":"dosSantos2016CurrentState","accessed":{"date-parts":[[2020,11,3]]},"author":[{"family":"Santos","given":"Rafael G","non-dropping-particle":"dos"},{"family":"Balthazar","given":"Fermanda M"},{"family":"Bouso","given":"José C"},{"family":"Hallak","given":"Jaime EC"}],"container-title":"Journal of Psychopharmacology","container-title-short":"J Psychopharmacol","DOI":"10.1177/0269881116652578","ISSN":"0269-8811","issue":"12","issued":{"date-parts":[[2016,12,1]]},"language":"en","page":"1230-1247","publisher":"SAGE Publications Ltd STM","source":"SAGE Journals","title":"The current state of research on ayahuasca: A systematic review of human studies assessing psychiatric symptoms, neuropsychological functioning, and neuroimaging","title-short":"The current state of research on ayahuasca","type":"article-journal","URL":"https://doi.org/10.1177/0269881116652578","volume":"30"},
-  {"id":"Santos2020BiodiversityVCarboline","accessed":{"date-parts":[[2020,11,3]]},"author":[{"family":"Santos","given":"Beatriz Werneck Lopes"},{"family":"Oliveira","given":"Regina Célia","dropping-particle":"de"},{"family":"Sonsin-Oliveira","given":"Julia"},{"family":"Fagg","given":"Christopher William"},{"family":"Barbosa","given":"José Beethoven Figueiredo"},{"family":"Caldas","given":"Eloisa Dutra"}],"container-title":"Plants","DOI":"10.3390/plants9070870","issue":"7","issued":{"date-parts":[[2020,7]]},"language":"en","number":"7","page":"870","publisher":"Multidisciplinary Digital Publishing Institute","source":"www.mdpi.com","title":"Biodiversity of β-Carboline Profile of Banisteriopsis caapi and Ayahuasca, a Plant and a Brew with Neuropharmacological Potential","type":"article-journal","URL":"https://www.mdpi.com/2223-7747/9/7/870","volume":"9"}
+    {
+        "DOI": "10.1177/0269881116652578",
+        "ISSN": "0269-8811",
+        "URL": "https://doi.org/10.1177/0269881116652578",
+        "accessed": {
+            "date-parts": [
+                [
+                    2020,
+                    11,
+                    3
+                ]
+            ]
+        },
+        "author": [
+            {
+                "family": "Santos",
+                "given": "Rafael G",
+                "non-dropping-particle": "dos"
+            },
+            {
+                "family": "Balthazar",
+                "given": "Fermanda M"
+            },
+            {
+                "family": "Bouso",
+                "given": "José C"
+            },
+            {
+                "family": "Hallak",
+                "given": "Jaime EC"
+            }
+        ],
+        "container-title": "Journal of Psychopharmacology",
+        "container-title-short": "J Psychopharmacol",
+        "id": "dosSantos2016CurrentState",
+        "issue": "12",
+        "issued": {
+            "date-parts": [
+                [
+                    2016,
+                    12,
+                    1
+                ]
+            ]
+        },
+        "language": "en",
+        "page": "1230-1247",
+        "publisher": "SAGE Publications Ltd STM",
+        "source": "SAGE Journals",
+        "title": "The current state of research on ayahuasca: A systematic review of human studies assessing psychiatric symptoms, neuropsychological functioning, and neuroimaging",
+        "title-short": "The current state of research on ayahuasca",
+        "type": "article-journal",
+        "volume": "30"
+    },
+    {
+        "DOI": "10.3390/plants9070870",
+        "URL": "https://www.mdpi.com/2223-7747/9/7/870",
+        "accessed": {
+            "date-parts": [
+                [
+                    2020,
+                    11,
+                    3
+                ]
+            ]
+        },
+        "author": [
+            {
+                "family": "Santos",
+                "given": "Beatriz Werneck Lopes"
+            },
+            {
+                "dropping-particle": "de",
+                "family": "Oliveira",
+                "given": "Regina Célia"
+            },
+            {
+                "family": "Sonsin-Oliveira",
+                "given": "Julia"
+            },
+            {
+                "family": "Fagg",
+                "given": "Christopher William"
+            },
+            {
+                "family": "Barbosa",
+                "given": "José Beethoven Figueiredo"
+            },
+            {
+                "family": "Caldas",
+                "given": "Eloisa Dutra"
+            }
+        ],
+        "container-title": "Plants",
+        "id": "Santos2020BiodiversityVCarboline",
+        "issue": "7",
+        "issued": {
+            "date-parts": [
+                [
+                    2020,
+                    7
+                ]
+            ]
+        },
+        "language": "en",
+        "number": "7",
+        "page": "870",
+        "publisher": "Multidisciplinary Digital Publishing Institute",
+        "source": "www.mdpi.com",
+        "title": "Biodiversity of β-Carboline Profile of Banisteriopsis caapi and Ayahuasca, a Plant and a Brew with Neuropharmacological Potential",
+        "type": "article-journal",
+        "volume": "9"
+    }
 ]
 <<===== INPUT =====<<
 
diff --git a/test/csl/disambiguate_SkipAccessedYearSuffix.txt b/test/csl/disambiguate_SkipAccessedYearSuffix.txt
--- a/test/csl/disambiguate_SkipAccessedYearSuffix.txt
+++ b/test/csl/disambiguate_SkipAccessedYearSuffix.txt
@@ -13,7 +13,7 @@
 
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -29,8 +29,8 @@
     </names>
   </macro>
   <macro name="publisher">
-    <text variable="publisher" suffix=", "/>       
-    <text variable="publisher-place" suffix=", "/>     
+    <text variable="publisher" suffix=", "/>
+    <text variable="publisher-place" suffix=", "/>
     <text macro="date"/>
   </macro>
   <macro name="date">
@@ -104,7 +104,8 @@
   <!--   formatting citation      -->
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
     <layout>
-      <text value="BOGUS"/>
+      <text macro="title" suffix=". "/>
+      <text macro="publisher"/>
     </layout>
   </citation>
   <!--   formatting bibliography      -->
@@ -193,4 +194,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/disambiguate_YearCollapseWithInstitution.expected b/test/csl/disambiguate_YearCollapseWithInstitution.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_YearCollapseWithInstitution.expected
@@ -0,0 +1,3 @@
+(Smith Co 2000a, 2000b, 2000c)
+(Smith Co 2000b)
+(Smith Co 2000c)
diff --git a/test/csl/disambiguate_YearSuffixAndSort.txt b/test/csl/disambiguate_YearSuffixAndSort.txt
--- a/test/csl/disambiguate_YearSuffixAndSort.txt
+++ b/test/csl/disambiguate_YearSuffixAndSort.txt
@@ -3,6 +3,14 @@
 <<===== MODE =====<<
 
 
+>>===== DESCRIPTION =====>>
+Per the CSL specification, with the add-year-suffix disambiguation method, "the assignment of
+year-suffixes follows the order of the bibliographies entries."
+
+https://docs.citationstyles.org/en/stable/specification.html#disambiguation
+<<===== DESCRIPTION =====<<
+
+
 >>===== CITATION-ITEMS =====>>
 [
     [
@@ -48,6 +56,7 @@
     ]
 ]
 <<===== CITATION-ITEMS =====<<
+
 
 >>===== RESULT =====>>
 1990m!; 1990l!; 1990k!; 1990j!; 1990i!; 1990h!; 1990g!; 1990f!; 1990e!; 1990d!; 1990c!; 1990b!; 1990a!
diff --git a/test/csl/disambiguate_YearSuffixAtTwoLevels.expected b/test/csl/disambiguate_YearSuffixAtTwoLevels.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_YearSuffixAtTwoLevels.expected
@@ -0,0 +1,1 @@
+Smith et al. (1986a); Smith et al. (1986b); Smith et al. (1986c); Smith et al. (1986d)
diff --git a/test/csl/disambiguate_YearSuffixWithEtAlSubequent.expected b/test/csl/disambiguate_YearSuffixWithEtAlSubequent.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_YearSuffixWithEtAlSubequent.expected
@@ -0,0 +1,3 @@
+(Smith 2000a, 2000b, 2000c)
+(Smith 2000b)
+(Smith 2000c)
diff --git a/test/csl/disambiguate_YearSuffixWithEtAlSubsequent.expected b/test/csl/disambiguate_YearSuffixWithEtAlSubsequent.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_YearSuffixWithEtAlSubsequent.expected
@@ -0,0 +1,3 @@
+(Smith 2000a, 2000b, 2000c)
+(Smith 2000b)
+(Smith 2000c)
diff --git a/test/csl/disambiguate_YearSuffixWithEtAlSubsequent.txt b/test/csl/disambiguate_YearSuffixWithEtAlSubsequent.txt
new file mode 100644
--- /dev/null
+++ b/test/csl/disambiguate_YearSuffixWithEtAlSubsequent.txt
@@ -0,0 +1,138 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+
+>>===== RESULT =====>>
+(Smith 2000a; 2000b; 2000c)
+(Smith 2000b)
+(Smith 2000c)
+<<===== RESULT =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[
+    [
+        {
+            "id": "ITEM-1"
+        },
+        {
+            "id": "ITEM-2"
+        },
+        {
+            "id": "ITEM-3"
+        }
+    ],
+    [
+        {
+            "id": "ITEM-2"
+        }
+    ],
+    [
+        {
+            "id": "ITEM-3"
+        }
+    ]
+]
+<<===== CITATION-ITEMS =====<<
+
+>>===== CSL =====>>
+<style 
+      xmlns="http://purl.org/net/xbiblio/csl"
+      class="note"
+      version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2009-08-10T04:49:00+09:00</updated>
+  </info>
+  <citation 
+         et-al-min="3"
+         et-al-use-first="1"
+         et-al-subsequent-min="3"
+         et-al-subsequent-use-first="1"
+         disambiguate-add-names="true"
+		 disambiguate-add-year-suffix="true"
+		 collapse="year">
+
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=" ">
+        <names delimiter=", " variable="author">
+          <name and="symbol" form="short"/>
+        </names>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </group>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+    {
+        "author": [
+            {
+                "family": "Smith", 
+                "given": "John"
+            }
+        ], 
+        "id": "ITEM-1", 
+        "issued": {
+            "date-parts": [
+                [
+                    2000
+                ]
+            ]
+        }, 
+		"title": "Book A",
+        "type": "book"
+    }, 
+    {
+        "author": [
+            {
+                "family": "Smith", 
+                "given": "John"
+            }
+        ], 
+        "id": "ITEM-2", 
+        "issued": {
+            "date-parts": [
+                [
+                    2000
+                ]
+            ]
+        }, 
+		"title": "Book B",
+        "type": "book"
+    },
+   {
+       "author": [
+           {
+               "family": "Smith",
+               "given": "John"
+           }
+       ],
+       "id": "ITEM-3",
+       "issued": {
+           "date-parts": [
+               [
+                   2000
+               ]
+           ]
+       },
+       "title": "Book C",
+       "type": "book"
+   }
+]
+<<===== INPUT =====<<
+
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+
diff --git a/test/csl/display_AuthorAsHeading.txt b/test/csl/display_AuthorAsHeading.txt
--- a/test/csl/display_AuthorAsHeading.txt
+++ b/test/csl/display_AuthorAsHeading.txt
@@ -2,9 +2,11 @@
 bibliography
 <<===== MODE =====<<
 
+
+>>===== DESCRIPTION =====>>
 An illustration of how the class attribute could be used to support
 the grouping of authors in the AAA style bibliography format.
-
+<<===== DESCRIPTION =====<<
 
 
 >>===== RESULT =====>>
diff --git a/test/csl/flipflop_LeadingMarkupWithApostrophe.expected b/test/csl/flipflop_LeadingMarkupWithApostrophe.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/flipflop_LeadingMarkupWithApostrophe.expected
@@ -0,0 +1,1 @@
+<i>Insha’Allah</i> is an Arabic phrase meaning “God willing.” Another Arabic word is <i>bukra</i>. Aalto
diff --git a/test/csl/flipflop_OrphanQuote.expected b/test/csl/flipflop_OrphanQuote.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/flipflop_OrphanQuote.expected
@@ -0,0 +1,1 @@
+Nation of “Positive Obligations ” of State under the European Convention on Human Rights (1)
diff --git a/test/csl/fullstyles_ABdNT.txt b/test/csl/fullstyles_ABdNT.txt
--- a/test/csl/fullstyles_ABdNT.txt
+++ b/test/csl/fullstyles_ABdNT.txt
@@ -91,7 +91,7 @@
             <name-part name="family" text-case="uppercase"/>
             <name-part name="given" text-case="uppercase"/>
           </name>
-          <et-al prefix=" " font-style="italic"/>
+          <et-al font-style="italic"/>
           <label form="short" prefix=" (" suffix=".). " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
@@ -122,7 +122,7 @@
         <name-part name="given" text-case="capitalize-first"/>
         <name-part name="family" text-case="capitalize-first"/>
       </name>
-      <et-al prefix=" " font-style="italic"/>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <!--A macro 'author' e responsavel por mostrar os nomes dos autores na bibliografia, serao no formato SOBRENOME, INICIAIS PRENOMES, tendo 
@@ -134,7 +134,7 @@
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given" text-case="uppercase"/>
       </name>
-      <et-al prefix=" " font-style="italic"/>
+      <et-al font-style="italic"/>
       <label form="short" prefix=" (" suffix=".)" text-case="uppercase"/>
       <substitute>
         <names variable="editor"/>
@@ -150,7 +150,7 @@
     <names variable="author">
       <name form="short" name-as-sort-order="all" sort-separator=", " and="text" initialize-with=". " delimiter=", " delimiter-precedes-last="never">
     </name>
-      <et-al prefix=" " font-style="italic"/>
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
diff --git a/test/csl/fullstyles_APA.txt b/test/csl/fullstyles_APA.txt
--- a/test/csl/fullstyles_APA.txt
+++ b/test/csl/fullstyles_APA.txt
@@ -2,12 +2,14 @@
 citation
 <<===== MODE =====<<
 
+>>===== DESCRIPTION =====>>
 This is correct APA ...
 
 See:
    http://forums.zotero.org/discussion/17859/style-error-for-apa-non-primary-author-initials-incorrectly-included/
 and followup thread:
    http://forums.zotero.org/discussion/19570/option-to-disable-disambiguation/
+<<===== DESCRIPTION =====<<
 
 >>===== RESULT =====>>
 (Oblinger &#38; Oblinger, 2009)
diff --git a/test/csl/fullstyles_ChicagoArticleTitleQuestion.txt b/test/csl/fullstyles_ChicagoArticleTitleQuestion.txt
--- a/test/csl/fullstyles_ChicagoArticleTitleQuestion.txt
+++ b/test/csl/fullstyles_ChicagoArticleTitleQuestion.txt
@@ -119,7 +119,7 @@
   <macro name="contributors">
     <names variable="author">
       <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
-      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" />
+      <label form="short" prefix=", " suffix="." text-case="lowercase" />
       <substitute>
         <text macro="editor" />
         <text macro="translator" />
diff --git a/test/csl/fullstyles_ChicagoAuthorDateSimple.txt b/test/csl/fullstyles_ChicagoAuthorDateSimple.txt
--- a/test/csl/fullstyles_ChicagoAuthorDateSimple.txt
+++ b/test/csl/fullstyles_ChicagoAuthorDateSimple.txt
@@ -121,7 +121,7 @@
   <macro name="contributors">
     <names variable="author">
       <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
-      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" />
+      <label form="short" prefix=", " suffix="." text-case="lowercase" />
       <substitute>
         <text macro="editor" />
         <text macro="translator" />
diff --git a/test/csl/integration_DisambiguateAddGivenname1.txt b/test/csl/integration_DisambiguateAddGivenname1.txt
--- a/test/csl/integration_DisambiguateAddGivenname1.txt
+++ b/test/csl/integration_DisambiguateAddGivenname1.txt
@@ -34,7 +34,7 @@
                 }
             ],
             "properties": {
-                "notIndex": 0
+                "noteIndex": 0
             }
         },
         [],
diff --git a/test/csl/integration_FirstReferenceNoteNumberPositionChange.expected b/test/csl/integration_FirstReferenceNoteNumberPositionChange.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/integration_FirstReferenceNoteNumberPositionChange.expected
@@ -0,0 +1,5 @@
+Doe, “Life of Doe” (1901).
+Roe, “Life of Roe” (1900).
+Doe, supra note 1.
+Roe, supra note 2.
+Snoakes, “Life of Snoakes” (1902).
diff --git a/test/csl/integration_IbidOnInsert.expected b/test/csl/integration_IbidOnInsert.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/integration_IbidOnInsert.expected
@@ -0,0 +1,4 @@
+(Doe p. 12)
+(Noakes p. 34)
+(Snoakes p. 45)
+(ibid.)
diff --git a/test/csl/label_EditorTranslator1.txt b/test/csl/label_EditorTranslator1.txt
--- a/test/csl/label_EditorTranslator1.txt
+++ b/test/csl/label_EditorTranslator1.txt
@@ -6,7 +6,7 @@
 
 >>===== RESULT =====>>
 <div class="csl-bib-body">
-  <div class="csl-entry">1.	Иванов И.И. Пример оформления книги с редактором и переводчиком в одном лице : вид издания : in 5 vols. Vol. 2 / И.И. Иванов, П.П. Петров, С.С. Сидоров; ed &#38; trans. Р.Р. Романов Дополнительно. – Тюмень: Дом, 2013. – 10. – 100 p.</div>
+  <div class="csl-entry">1.	Иванов И.И. Пример оформления книги с редактором и переводчиком в одном лице : вид издания : in 5 vols. Vol. 2 / И.И. Иванов, П.П. Петров, С.С. Сидоров; ed &#38; trans. Р.Р. Романов Дополнительно. – Тюмень: Дом, 2013. – No. 10. – 100 p.</div>
 </div>
 <<===== RESULT =====<<
 
@@ -610,4 +610,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/label_MissingReturnsEmpty.txt b/test/csl/label_MissingReturnsEmpty.txt
--- a/test/csl/label_MissingReturnsEmpty.txt
+++ b/test/csl/label_MissingReturnsEmpty.txt
@@ -3,7 +3,7 @@
 <<==== MODE ====<<
 
 >>==== RESULT ====>>
-Aalto, 23
+Aalto
 <<==== RESULT ====<<
 
 >>==== CITATION-ITEMS ====>>
@@ -17,7 +17,7 @@
 <<==== CITATION-ITEMS ====<<
 
 >>==== CSL ====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -32,15 +32,12 @@
   <macro name="author">
     <names variable="author">
       <name form="short" />
+      <label form="long" prefix=", "/>
     </names>
   </macro>
   <citation>
     <layout delimiter="; ">
       <text macro="author" />
-      <group delimiter=" " prefix=", ">
-        <text term="number"/>
-        <number variable="collection-number"/>
-      </group>
     </layout>
   </citation>
 </style>
@@ -55,7 +52,6 @@
         "given": "Alan"
       }
     ],
-    "collection-number": 23,
     "id": "ITEM-1",
     "type": "book"
   }
@@ -67,4 +63,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/magic_CapitalizeFirstOccurringTerm.expected b/test/csl/magic_CapitalizeFirstOccurringTerm.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/magic_CapitalizeFirstOccurringTerm.expected
@@ -0,0 +1,1 @@
+and
diff --git a/test/csl/magic_NameSuffixNoComma.expected b/test/csl/magic_NameSuffixNoComma.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/magic_NameSuffixNoComma.expected
@@ -0,0 +1,1 @@
+John, III Doe
diff --git a/test/csl/magic_NameSuffixWithComma.expected b/test/csl/magic_NameSuffixWithComma.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/magic_NameSuffixWithComma.expected
@@ -0,0 +1,1 @@
+John,! Jr. Doe
diff --git a/test/csl/magic_SubsequentAuthorSubstituteNotFooled.txt b/test/csl/magic_SubsequentAuthorSubstituteNotFooled.txt
--- a/test/csl/magic_SubsequentAuthorSubstituteNotFooled.txt
+++ b/test/csl/magic_SubsequentAuthorSubstituteNotFooled.txt
@@ -6,7 +6,7 @@
 
 >>===== RESULT =====>>
 <div class="csl-bib-body">
-  <div class="csl-entry">Silverstein, Theodore, tran. “Sir Gawain and the Green Knight.” Chicago: University of Chicago Press, 1974.</div>
+  <div class="csl-entry">Silverstein, Theodore, trans. “Sir Gawain and the Green Knight.” Chicago: University of Chicago Press, 1974.</div>
   <div class="csl-entry">Soltes, Ori A., ed. “Georgia: Art and Civilization through the Ages.” London: Philip Wilson, 1999.</div>
   <div class="csl-entry">“The Chicago Manual of Style.” Chicago: University of Chicago Press, 1993.</div>
 </div>
@@ -433,7 +433,7 @@
     <text suffix=" " variable="title" />
     <text variable="genre" />
   </macro>
-  <citation 
+  <citation
          disambiguate-add-names="true"
          et-al-min="4"
          et-al-subsequent-min="4"
@@ -460,7 +460,7 @@
       </choose>
     </layout>
   </citation>
-  <bibliography 
+  <bibliography
          entry-spacing="0"
          et-al-min="11"
          et-al-use-first="7"
@@ -557,4 +557,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/magic_TermCapitalizationWithPrefix.expected b/test/csl/magic_TermCapitalizationWithPrefix.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/magic_TermCapitalizationWithPrefix.expected
@@ -0,0 +1,4 @@
+Doe (1965)
+See ibid.
+This has been said. Ibid.
+ibid.
diff --git a/test/csl/name_CiteGroupDelimiterWithYearSuffixCollapse2.expected b/test/csl/name_CiteGroupDelimiterWithYearSuffixCollapse2.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_CiteGroupDelimiterWithYearSuffixCollapse2.expected
@@ -0,0 +1,1 @@
+(Aalto 2015a–e; Bartleby 2010)
diff --git a/test/csl/name_DelimiterAfterInverted.txt b/test/csl/name_DelimiterAfterInverted.txt
--- a/test/csl/name_DelimiterAfterInverted.txt
+++ b/test/csl/name_DelimiterAfterInverted.txt
@@ -47,63 +47,63 @@
 
 >>===== INPUT =====>>
 [
-  {
-    "id": "AustralianGovernmentProductivityCommissionStrengtheningtransTasmaneconomic2012",
-    "author": [
-      {
-        "literal": "Australian Government Productivity Commission"
-      },
-      {
-        "literal": "New Zealand Productivity Commission"
-      }
-    ],
-    "issued": {
-      "date-parts": [
-        [
-          2012
-        ]
-      ]
-    },
-    "title": "Strengthening trans-Tasman economic relations",
-    "type": "report",
-    "URL": "https://www.pc.gov.au/inquiries/completed/australia-new-zealand/report/trans-tasman.pdf"
-  },
-  {
-    "id": "WeinstockDefiningforensicpsychiatry2003",
-    "author": [
-      {
-        "family": "Weinstock",
-        "given": "R."
-      },
-      {
-        "family": "Leong",
-        "given": "G. B."
-      },
-      {
-        "family": "Silva",
-        "given": "J. A."
-      }
-    ],
-    "container-title": "Principles and practice of forensic psychiatry",
-    "edition": "2",
-    "editor": [
-      {
-        "family": "Rosner",
-        "given": "R."
-      }
-    ],
-    "issued": {
-      "date-parts": [
-        [
-          2003
-        ]
-      ]
+    {
+        "URL": "https://www.pc.gov.au/inquiries/completed/australia-new-zealand/report/trans-tasman.pdf",
+        "author": [
+            {
+                "literal": "Australian Government Productivity Commission"
+            },
+            {
+                "literal": "New Zealand Productivity Commission"
+            }
+        ],
+        "id": "AustralianGovernmentProductivityCommissionStrengtheningtransTasmaneconomic2012",
+        "issued": {
+            "date-parts": [
+                [
+                    2012
+                ]
+            ]
+        },
+        "title": "Strengthening trans-Tasman economic relations",
+        "type": "report"
     },
-    "page": "7-13",
-    "publisher": "CRC Press",
-    "title": "Defining forensic psychiatry: Roles and responsibilities",
-    "type": "chapter"
-  }
+    {
+        "author": [
+            {
+                "family": "Weinstock",
+                "given": "R."
+            },
+            {
+                "family": "Leong",
+                "given": "G. B."
+            },
+            {
+                "family": "Silva",
+                "given": "J. A."
+            }
+        ],
+        "container-title": "Principles and practice of forensic psychiatry",
+        "edition": "2",
+        "editor": [
+            {
+                "family": "Rosner",
+                "given": "R."
+            }
+        ],
+        "id": "WeinstockDefiningforensicpsychiatry2003",
+        "issued": {
+            "date-parts": [
+                [
+                    2003
+                ]
+            ]
+        },
+        "page": "7-13",
+        "publisher": "CRC Press",
+        "title": "Defining forensic psychiatry: Roles and responsibilities",
+        "type": "chapter"
+    }
 ]
 <<===== INPUT =====<<
 
diff --git a/test/csl/name_EditorTranslatorSameWithTerm.txt b/test/csl/name_EditorTranslatorSameWithTerm.txt
--- a/test/csl/name_EditorTranslatorSameWithTerm.txt
+++ b/test/csl/name_EditorTranslatorSameWithTerm.txt
@@ -11,7 +11,7 @@
 
 
 >>===== RESULT =====>>
-John Doe (ed. &#38; tran.)
+John Doe (ed. &#38; trans.)
 <<===== RESULT =====<<
 
 
diff --git a/test/csl/name_EtAlWithCombined.expected b/test/csl/name_EtAlWithCombined.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_EtAlWithCombined.expected
@@ -0,0 +1,5 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">John Doe。</div>
+  <div class="csl-entry">——，Ziggy Zither 等點校。</div>
+  <div class="csl-entry">田中太郎, Yossarian Yoda, 等翻譯員。</div>
+</div>
diff --git a/test/csl/name_EtAlWithCombined.txt b/test/csl/name_EtAlWithCombined.txt
--- a/test/csl/name_EtAlWithCombined.txt
+++ b/test/csl/name_EtAlWithCombined.txt
@@ -8,7 +8,7 @@
 >>===== RESULT =====>>
 <div class="csl-bib-body">
   <div class="csl-entry">John Doe。</div>
-  <div class="csl-entry">——著，Ziggy Zither等點校。</div>
+  <div class="csl-entry">——，Ziggy Zither等點校。</div>
   <div class="csl-entry">田中太郎, Yossarian Yoda, 等翻譯員。</div>
 </div>
 <<===== RESULT =====<<
diff --git a/test/csl/name_HebrewAnd.expected b/test/csl/name_HebrewAnd.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_HebrewAnd.expected
@@ -0,0 +1,1 @@
+תפוח ו  תפוז
diff --git a/test/csl/name_HyphenatedNonDroppingParticle1.expected b/test/csl/name_HyphenatedNonDroppingParticle1.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_HyphenatedNonDroppingParticle1.expected
@@ -0,0 +1,5 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">al-One, Alan</div>
+  <div class="csl-entry">Marple, Mary</div>
+  <div class="csl-entry">Participle, Paul</div>
+</div>
diff --git a/test/csl/name_HyphenatedNonDroppingParticle2.expected b/test/csl/name_HyphenatedNonDroppingParticle2.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_HyphenatedNonDroppingParticle2.expected
@@ -0,0 +1,5 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">Alan al-One</div>
+  <div class="csl-entry">Mary Marple</div>
+  <div class="csl-entry">Paul Participle</div>
+</div>
diff --git a/test/csl/name_InTextMarkupInitialize.expected b/test/csl/name_InTextMarkupInitialize.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_InTextMarkupInitialize.expected
@@ -0,0 +1,4 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">&#60;b&#62;Doe&#60;/b&#62;, &#60;b&#62;John&#60;/b&#62;. Q.</div>
+  <div class="csl-entry">&#60;b&#62;Doe&#60;/b&#62;, &#60;b&#62;John&#60;/b&#62;.-Q.</div>
+</div>
diff --git a/test/csl/name_InTextMarkupNormalizeInitials.expected b/test/csl/name_InTextMarkupNormalizeInitials.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_InTextMarkupNormalizeInitials.expected
@@ -0,0 +1,4 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">&#60;b&#62;Doe&#60;/b&#62;, &#60;b&#62;J&#60;/b&#62;. Q.</div>
+  <div class="csl-entry">&#60;b&#62;Doe&#60;/b&#62;, &#60;b&#62;J&#60;/b&#62;.-Q.</div>
+</div>
diff --git a/test/csl/name_InstitutionDecoration.txt b/test/csl/name_InstitutionDecoration.txt
--- a/test/csl/name_InstitutionDecoration.txt
+++ b/test/csl/name_InstitutionDecoration.txt
@@ -26,7 +26,7 @@
          <name-part name="given" text-case="uppercase"/>
          <name-part name="family" text-case="uppercase"/>
         </name>
-        <et-al prefix=" " font-style="italic"/>
+        <et-al font-style="italic"/>
         <label form="short" prefix=" (" suffix=".)" text-case="uppercase"/>
         <substitute>
           <names variable="editor"/>
diff --git a/test/csl/name_ParseNames.expected b/test/csl/name_ParseNames.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_ParseNames.expected
@@ -0,0 +1,1 @@
+Humboldt, Alexander von; van der Vlist, Eric; van Gogh, Vincent
diff --git a/test/csl/name_ParsedDroppingParticleWithApostrophe.expected b/test/csl/name_ParsedDroppingParticleWithApostrophe.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_ParsedDroppingParticleWithApostrophe.expected
@@ -0,0 +1,1 @@
+François Hédelin d’(Aubignac)
diff --git a/test/csl/name_ParsedNonDroppingParticleWithApostrophe.expected b/test/csl/name_ParsedNonDroppingParticleWithApostrophe.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_ParsedNonDroppingParticleWithApostrophe.expected
@@ -0,0 +1,1 @@
+<span style="font-variant:small-caps;">d’Aubignac</span> (François Hédelin)
diff --git a/test/csl/name_ParticlesDemoteNonDroppingNever.expected b/test/csl/name_ParticlesDemoteNonDroppingNever.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/name_ParticlesDemoteNonDroppingNever.expected
@@ -0,0 +1,61 @@
+<b>Familyname</b>, <i>Givenname al</i>
+<b>Familyname</b>, <i>Givenname dos</i>
+<b>Familyname</b>, <i>Givenname el</i>
+<b>Las Familyname</b>, <i>Givenname de</i>
+<b>Familyname</b>, <i>Givenname lo</i>
+<b>Familyname</b>, <i>Givenname les</i>
+<b>Familyname</b>, <i>Givenname il</i>
+<b>del Familyname</b>, <i>Givenname</i>
+<b>Familyname</b>, <i>Givenname dela</i>
+<b>Familyname</b>, <i>Givenname della</i>
+<b>Familyname</b>, <i>Givenname dello</i>
+<b>Di Familyname</b>, <i>Givenname</i>
+<b>Da Familyname</b>, <i>Givenname</i>
+<b>Do Familyname</b>, <i>Givenname</i>
+<b>Des Familyname</b>, <i>Givenname</i>
+<b>Lou Familyname</b>, <i>Givenname</i>
+<b>Pietro Familyname</b>, <i>Givenname</i>
+<b>de Familyname</b>, <i>Givenname</i>
+<b>La Familyname</b>, <i>Givenname de</i>
+<b>Familyname</b>, <i>Givenname du</i>
+<b>Familyname</b>, <i>Givenname d’</i>
+<b>Le Familyname</b>, <i>Givenname</i>
+<b>La Familyname</b>, <i>Givenname</i>
+<b>L’Familyname</b>, <i>Givenname</i>
+<b>Saint Familyname</b>, <i>Givenname</i>
+<b>Sainte Familyname</b>, <i>Givenname</i>
+<b>St. Familyname</b>, <i>Givenname</i>
+<b>Ste. Familyname</b>, <i>Givenname</i>
+<b>van Familyname</b>, <i>Givenname</i>
+<b>van de Familyname</b>, <i>Givenname</i>
+<b>van der Familyname</b>, <i>Givenname</i>
+<b>van den Familyname</b>, <i>Givenname</i>
+<b>vander Familyname</b>, <i>Givenname</i>
+<b>v.d. Familyname</b>, <i>Givenname</i>
+<b>vd Familyname</b>, <i>Givenname</i>
+<b>van het Familyname</b>, <i>Givenname</i>
+<b>ver Familyname</b>, <i>Givenname</i>
+<b>ten Familyname</b>, <i>Givenname</i>
+<b>ter Familyname</b>, <i>Givenname</i>
+<b>te Familyname</b>, <i>Givenname</i>
+<b>Familyname</b>, <i>Givenname op de</i>
+<b>in de Familyname</b>, <i>Givenname</i>
+<b>in ’t Familyname</b>, <i>Givenname</i>
+<b>’t Familyname</b>, <i>Givenname</i>
+<b>in het Familyname</b>, <i>Givenname</i>
+<b>uit de Familyname</b>, <i>Givenname</i>
+<b>uit den Familyname</b>, <i>Givenname</i>
+<b>Familyname</b>, <i>Givenname von</i>
+<b>Familyname</b>, <i>Givenname von der</i>
+<b>Familyname</b>, <i>Givenname von dem</i>
+<b>Familyname</b>, <i>Givenname von zu</i>
+<b>v. Familyname</b>, <i>Givenname</i>
+<b>v Familyname</b>, <i>Givenname</i>
+<b>Familyname</b>, <i>Givenname vom</i>
+<b>Familyname</b>, <i>Givenname das</i>
+<b>Familyname</b>, <i>Givenname zum</i>
+<b>Familyname</b>, <i>Givenname zur</i>
+<b>Familyname</b>, <i>Givenname den</i>
+<b>Familyname</b>, <i>Givenname der</i>
+<b>Familyname</b>, <i>Givenname des</i>
+<b>Familyname</b>, <i>Givenname auf den</i>
diff --git a/test/csl/name_ParticlesDemoteNonDroppingNever.txt b/test/csl/name_ParticlesDemoteNonDroppingNever.txt
--- a/test/csl/name_ParticlesDemoteNonDroppingNever.txt
+++ b/test/csl/name_ParticlesDemoteNonDroppingNever.txt
@@ -3,6 +3,33 @@
 <<===== MODE =====<<
 
 
+>>===== DESCRIPTION =====>>
+This test depends on the particular way citeproc-js applies formatting to names and so may not pass
+for other CSL processors that nonetheless parse name particles correctly.
+
+Specifically, it expects bold and italic pseudo-HTML* to be applied separately to name particles
+before they are appended to the given or family name. For example, with a main family name of
+"George", this test would expect
+
+<b>St. George</b>
+<b>de</b> <b>George</b>
+
+identifying "de" as a non-dropping particle and "St." as part of the family name, not a particle.
+
+From a formatting perspective, however, these are the same
+
+<b>de George</b>
+<b>de</b> <b>George</b>
+
+and so CSL processors may reasonably prefer the former, causing this test to fail incorrectly.
+
+This test should be re-written so it doesn't depend on invisible formatting subtlies.
+
+* https://citeproc-js.readthedocs.io/en/latest/csl-json/markup.html#html-like-formatting-tags
+
+<<===== DESCRIPTION =====<<
+
+
 >>===== RESULT =====>>
 <b>Familyname</b>, <i>Givenname</i> <i>al</i>
 <b>Familyname</b>, <i>Givenname</i> <i>dos</i>
diff --git a/test/csl/name_SubsequentAuthorSubstituteMultipleNames.txt b/test/csl/name_SubsequentAuthorSubstituteMultipleNames.txt
--- a/test/csl/name_SubsequentAuthorSubstituteMultipleNames.txt
+++ b/test/csl/name_SubsequentAuthorSubstituteMultipleNames.txt
@@ -4,7 +4,7 @@
 
 >>==== RESULT ====>>
 <div class="csl-bib-body">
-  <div class="csl-entry">Bumke, Courtly Culture: Literature and Society in the High Middle Ages, Dunlap tran.</div>
+  <div class="csl-entry">Bumke, Courtly Culture: Literature and Society in the High Middle Ages, Dunlap trans.</div>
   <div class="csl-entry">-----, Höfische</div>
 </div>
 <<==== RESULT ====<<
@@ -25,7 +25,7 @@
 <<==== CITATION-ITEMS ====<<
 
 >>==== CSL ====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -94,4 +94,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/number_LimitOrdinalsToDayOne.txt b/test/csl/number_LimitOrdinalsToDayOne.txt
--- a/test/csl/number_LimitOrdinalsToDayOne.txt
+++ b/test/csl/number_LimitOrdinalsToDayOne.txt
@@ -57,19 +57,18 @@
 
 >>===== INPUT =====>>
 [
-	{
-		"id": "first_day_1_second_not1",
-		"type": "book",
-		"language": "fr",
-		"note": "event-date: 2004-10-01/2004-10-14"
-	},
-  {
-		"id": "first_day_not1_second_1",
-		"type": "book",
-		"language": "fr",
-		"note": "event-date: 2004-10-14/2004-11-01"
-	}
-  
+    {
+        "id": "first_day_1_second_not1",
+        "language": "fr",
+        "note": "event-date: 2004-10-01/2004-10-14",
+        "type": "book"
+    },
+    {
+        "id": "first_day_not1_second_1",
+        "language": "fr",
+        "note": "event-date: 2004-10-14/2004-11-01",
+        "type": "book"
+    }
 ]
 <<===== INPUT =====<<
 
diff --git a/test/csl/number_OrdinalSpacing.expected b/test/csl/number_OrdinalSpacing.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/number_OrdinalSpacing.expected
@@ -0,0 +1,1 @@
+Blah blah. 7th, p. 3rd–8thDD<i>ed</i>
diff --git a/test/csl/number_PlainHyphenOrEnDashAlwaysPlural.expected b/test/csl/number_PlainHyphenOrEnDashAlwaysPlural.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/number_PlainHyphenOrEnDashAlwaysPlural.expected
@@ -0,0 +1,1 @@
+His Anonymous Life (1) pages 1–2 (cs:text) vs His Anonymous Life (1) pages 1–2 (cs:number); His Anonymous Life (2) pages i–ix (cs:text) vs His Anonymous Life (2) pages i–ix (cs:number); His Anonymous Life (3) page 3-B (cs:text) vs His Anonymous Life (3) page 3-B (cs:number); His Anonymous Life (4) pages Michaelson–Morely (cs:text) vs His Anonymous Life (4) pages Michaelson–Morely (cs:number)
diff --git a/test/csl/number_PlainHyphenOrEnDashAlwaysPlural.txt b/test/csl/number_PlainHyphenOrEnDashAlwaysPlural.txt
--- a/test/csl/number_PlainHyphenOrEnDashAlwaysPlural.txt
+++ b/test/csl/number_PlainHyphenOrEnDashAlwaysPlural.txt
@@ -3,9 +3,13 @@
 <<===== MODE =====<<
 
 
+>>===== DESCRIPTION =====>>
 Test to cover request here:
+http://xbiblio-devel.2463403.n2.nabble.com/contextual-labels-for-non-numeric-page-ranges-td7578166.html
 
-  http://xbiblio-devel.2463403.n2.nabble.com/contextual-labels-for-non-numeric-page-ranges-td7578166.html
+See also:
+https://discourse.citationstyles.org/t/contextual-labels-for-non-numeric-page-ranges/1117
+<<===== DESCRIPTION =====<<
 
 
 >>===== RESULT =====>>
diff --git a/test/csl/page_Chicago.txt b/test/csl/page_Chicago.txt
--- a/test/csl/page_Chicago.txt
+++ b/test/csl/page_Chicago.txt
@@ -22,6 +22,7 @@
 Example P, at 13792–803
 Example Q, at 1496–1504
 Example R, at 2787–2816
+Example S, at 11153–2359
 <<===== RESULT =====<<
 
 
@@ -116,6 +117,11 @@
         {
             "id": "ITEM-18"
         }
+    ],
+    [
+        {
+            "id": "ITEM-19"
+        }
     ]
 ]
 <<===== CITATION-ITEMS =====<<
@@ -252,9 +258,15 @@
         "type": "book"
     }, 
     {
-        "id": "ITEM-18", 
-        "page": "2787-816", 
-        "title": "Example R", 
+        "id": "ITEM-18",
+        "page": "2787-816",
+        "title": "Example R",
+        "type": "book"
+    },
+    {
+        "id": "ITEM-19",
+        "page": "11153-12359",
+        "title": "Example S",
         "type": "book"
     }
 ]
diff --git a/test/csl/page_Expand.txt b/test/csl/page_Expand.txt
--- a/test/csl/page_Expand.txt
+++ b/test/csl/page_Expand.txt
@@ -3,7 +3,18 @@
 <<===== MODE =====<<
 
 
+>>===== DESCRIPTION =====>>
+Per the CSL documentation (link below), dashes are standardized for page ranges
+but not everything with a dash is a valid page range. Valid page ranges are
+numbers with the same or no prefix.
 
+For example, 110–115 and N110–N115 are valid page ranges but 110-N6 is not and
+thus retains its original dash character.
+
+https://docs.citationstyles.org/en/stable/specification.html#range-delimiters
+<<===== DESCRIPTION =====<<
+
+
 >>===== RESULT =====>>
 Example: minimal, at 110–115
 Example: prefix on first number only, at N110-5
@@ -19,51 +30,51 @@
 >>===== INPUT =====>>
 [
     {
-        "id": "ITEM-1", 
-        "page": "110-5", 
-        "title": "Example: minimal", 
+        "id": "ITEM-1",
+        "page": "110-5",
+        "title": "Example: minimal",
         "type": "book"
-    }, 
+    },
     {
-        "id": "ITEM-2", 
-        "page": "N110 - 5", 
-        "title": "Example: prefix on first number only", 
+        "id": "ITEM-2",
+        "page": "N110 - 5",
+        "title": "Example: prefix on first number only",
         "type": "book"
-    }, 
+    },
     {
-        "id": "ITEM-3", 
-        "page": "N110 - N5", 
-        "title": "Example: same prefix on both numbers", 
+        "id": "ITEM-3",
+        "page": "N110 - N5",
+        "title": "Example: same prefix on both numbers",
         "type": "book"
-    }, 
+    },
     {
-        "id": "ITEM-4", 
-        "page": "110 - N6", 
-        "title": "Example: prefix on last number only", 
+        "id": "ITEM-4",
+        "page": "110 - N6",
+        "title": "Example: prefix on last number only",
         "type": "book"
-    }, 
+    },
     {
-        "id": "ITEM-5", 
-        "page": "N110 - P5", 
-        "title": "Example: different prefixes on both numbers", 
+        "id": "ITEM-5",
+        "page": "N110 - P5",
+        "title": "Example: different prefixes on both numbers",
         "type": "book"
-    }, 
+    },
     {
-        "id": "ITEM-6", 
-        "page": "123N110 - N5", 
-        "title": "Example: leading number before prefix", 
+        "id": "ITEM-6",
+        "page": "123N110 - N5",
+        "title": "Example: leading number before prefix",
         "type": "book"
-    }, 
+    },
     {
-        "id": "ITEM-7", 
-        "page": "123N110 - N5, 456K200 - 99", 
-        "title": "Example: multiple ranges", 
+        "id": "ITEM-7",
+        "page": "123N110 - N5, 456K200 - 99",
+        "title": "Example: multiple ranges",
         "type": "book"
-    }, 
+    },
     {
-        "id": "ITEM-8", 
-        "page": "123N110 - N5, 000c23 - 22", 
-        "title": "Example: first less than second", 
+        "id": "ITEM-8",
+        "page": "123N110 - N5, 000c23 - 22",
+        "title": "Example: first less than second",
         "type": "book"
     }
 ]
@@ -116,7 +127,7 @@
 
 
 >>===== CSL =====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0"
@@ -141,4 +152,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/position_FirstTrueOnlyOnce.expected b/test/csl/position_FirstTrueOnlyOnce.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/position_FirstTrueOnlyOnce.expected
@@ -0,0 +1,2 @@
+Appleton “Tom Swift and His Electric Runabout” (1910).
+ibid. p. 23.
diff --git a/test/csl/position_IbidInText.expected b/test/csl/position_IbidInText.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/position_IbidInText.expected
@@ -0,0 +1,3 @@
+Appleton “Tom Swift and His Electric Runabout” (1910).
+Bloggs “A Very Short Book Indeed” (2012).
+Appleton “Tom Swift and His Electric Runabout” (1910).
diff --git a/test/csl/position_IbidSeparateCiteSameNote.expected b/test/csl/position_IbidSeparateCiteSameNote.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/position_IbidSeparateCiteSameNote.expected
@@ -0,0 +1,7 @@
+[citation1-item1-note1] Appleton “Tom Swift and His Electric Runabout” (1910).
+[citation2-item1-note2] ibid.
+[citation3-item1-note2] ibid. page 33.
+[citation4-item2-note3] Bloggs “A Very Short Book Indeed” (2012); [citation4-item1-note3] Appleton supra.
+[citation5-item1-note4] Appleton supra page 99.
+[citation6-item1-note4] Appleton supra.
+[citation7-item1-note4] ibid.
diff --git a/test/csl/position_IbidWithLocator.expected b/test/csl/position_IbidWithLocator.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/position_IbidWithLocator.expected
@@ -0,0 +1,2 @@
+Appleton “Tom Swift and His Electric Runabout” (1910).
+ibid. p. 23.
diff --git a/test/csl/position_IbidWithMultipleSoloCitesInBackref.expected b/test/csl/position_IbidWithMultipleSoloCitesInBackref.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/position_IbidWithMultipleSoloCitesInBackref.expected
@@ -0,0 +1,4 @@
+Aalto
+Álvarez
+Álvarez
+ibid.
diff --git a/test/csl/position_IfIbidWithLocatorIsTrueThenIbidIsTrue.expected b/test/csl/position_IfIbidWithLocatorIsTrueThenIbidIsTrue.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/position_IfIbidWithLocatorIsTrueThenIbidIsTrue.expected
@@ -0,0 +1,2 @@
+Appleton “Tom Swift and His Electric Runabout” (1910).
+ibid.
diff --git a/test/csl/position_NearNoteSameNote.expected b/test/csl/position_NearNoteSameNote.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/position_NearNoteSameNote.expected
@@ -0,0 +1,3 @@
+Plain+Vanilla:Book-A; Near+Ibid:Book-A
+Plain+Vanilla:Book-B
+Near+Ibid:Book-B; Plain+Vanilla:Book-A
diff --git a/test/csl/position_ResetNoteNumbers.expected b/test/csl/position_ResetNoteNumbers.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/position_ResetNoteNumbers.expected
@@ -0,0 +1,8 @@
+Book A, n 1 (note 1)
+ibid (note 2)
+Book C, n 3 (note 3)
+ibid (note 1)
+Book A, n 1 (note 2)
+ibid (note 3)
+Book C, n 3 (note 4)
+Book A, n 1 (note 5)
diff --git a/test/csl/punctuation_DateStripPeriods.txt b/test/csl/punctuation_DateStripPeriods.txt
--- a/test/csl/punctuation_DateStripPeriods.txt
+++ b/test/csl/punctuation_DateStripPeriods.txt
@@ -5,7 +5,7 @@
 
 
 >>===== RESULT =====>>
-Jun 1965
+June 1965
 <<===== RESULT =====<<
 
 
diff --git a/test/csl/punctuation_FrenchOrthography.txt b/test/csl/punctuation_FrenchOrthography.txt
--- a/test/csl/punctuation_FrenchOrthography.txt
+++ b/test/csl/punctuation_FrenchOrthography.txt
@@ -3,6 +3,7 @@
 <<===== MODE =====<<
 
 
+>>===== DESCRIPTION =====>>
 It may not be immediately apparent, but the spaces immediately
 inside the double angle quotes below are half-width no-break
 spaces ("narrow no-break space").
@@ -10,6 +11,8 @@
 See http://en.wikipedia.org/wiki/Space_(punctuation)#Breaking_and_non-breaking_spaces
 and http://forums.zotero.org/discussion/4933/localized-quotes/#Comment_88384
 for details.
+<<===== DESCRIPTION =====<<
+
 
 >>===== RESULT =====>>
 His « Anonymous » Life
diff --git a/test/csl/punctuation_FullMontyQuotesIn.expected b/test/csl/punctuation_FullMontyQuotesIn.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/punctuation_FullMontyQuotesIn.expected
@@ -0,0 +1,47 @@
+ENDING IN COLON
+“colon”: colon
+“period.”: colon
+“semicolon”; colon
+“exclamation”! colon
+“question”? colon
+“comma,”: colon
+
+ENDING IN PERIOD
+“colon”: period
+“period.” period
+“semicolon”; period
+“exclamation”! period
+“question”? period
+“comma,”. period
+
+ENDING IN SEMICOLON
+“colon”:; semicolon
+“period.”; semicolon
+“semicolon”; semicolon
+“exclamation”!; semicolon
+“question”?; semicolon
+“comma,”; semicolon
+
+ENDING IN EXCLAMATION
+“colon”! exclamation
+“period.”! exclamation
+“semicolon”! exclamation
+“exclamation”! exclamation
+“question”?! exclamation
+“comma,”! exclamation
+
+ENDING IN QUESTION
+“colon”? question
+“period.”? question
+“semicolon”? question
+“exclamation”!? question
+“question”? question
+“comma,”? question
+
+ENDING IN COMMA
+“colon”:, comma
+“period.”, comma
+“semicolon”;, comma
+“exclamation”!, comma
+“question”?, comma
+“comma,” comma
diff --git a/test/csl/quotes_QuotesUnderQuotesFalse.expected b/test/csl/quotes_QuotesUnderQuotesFalse.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/quotes_QuotesUnderQuotesFalse.expected
@@ -0,0 +1,3 @@
+<div class="csl-bib-body">
+  <div class="csl-entry"> ’Title with ‘quotes’ in it’,.</div>
+</div>
diff --git a/test/csl/sort_BibliographyCitationNumberDescending.expected b/test/csl/sort_BibliographyCitationNumberDescending.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/sort_BibliographyCitationNumberDescending.expected
@@ -0,0 +1,10 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">[8] Book 008</div>
+  <div class="csl-entry">[7] Book 007</div>
+  <div class="csl-entry">[6] Book 005</div>
+  <div class="csl-entry">[5] Book 002</div>
+  <div class="csl-entry">[4] Book 006</div>
+  <div class="csl-entry">[3] Book 004</div>
+  <div class="csl-entry">[2] Book 003</div>
+  <div class="csl-entry">[1] Book 001</div>
+</div>
diff --git a/test/csl/sort_BibliographyCitationNumberDescendingViaCompositeMacro.expected b/test/csl/sort_BibliographyCitationNumberDescendingViaCompositeMacro.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/sort_BibliographyCitationNumberDescendingViaCompositeMacro.expected
@@ -0,0 +1,6 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">[1] Aaaa</div>
+  <div class="csl-entry">[2] Bbbb</div>
+  <div class="csl-entry">[3] Xxxx</div>
+  <div class="csl-entry">[4] Zzzz</div>
+</div>
diff --git a/test/csl/sort_BibliographyCitationNumberDescendingViaMacro.expected b/test/csl/sort_BibliographyCitationNumberDescendingViaMacro.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/sort_BibliographyCitationNumberDescendingViaMacro.expected
@@ -0,0 +1,10 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">[1] Book One</div>
+  <div class="csl-entry">[2] Book Three</div>
+  <div class="csl-entry">[3] Book Four</div>
+  <div class="csl-entry">[4] Book Six</div>
+  <div class="csl-entry">[5] Book Two</div>
+  <div class="csl-entry">[6] Book Five</div>
+  <div class="csl-entry">[7] Book Seven</div>
+  <div class="csl-entry">[8] Book Eight</div>
+</div>
diff --git a/test/csl/sort_ChicagoYearSuffix1.txt b/test/csl/sort_ChicagoYearSuffix1.txt
--- a/test/csl/sort_ChicagoYearSuffix1.txt
+++ b/test/csl/sort_ChicagoYearSuffix1.txt
@@ -116,7 +116,7 @@
   <macro name="contributors">
     <names variable="author">
       <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
-      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" />
+      <label form="short" prefix=", " suffix="." text-case="lowercase" />
       <substitute>
         <text macro="editor" />
         <text macro="translator" />
diff --git a/test/csl/sort_ChicagoYearSuffix2.txt b/test/csl/sort_ChicagoYearSuffix2.txt
--- a/test/csl/sort_ChicagoYearSuffix2.txt
+++ b/test/csl/sort_ChicagoYearSuffix2.txt
@@ -117,7 +117,7 @@
   <macro name="contributors">
     <names variable="author">
       <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
-      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" />
+      <label form="short" prefix=", " suffix="." text-case="lowercase" />
       <substitute>
         <text macro="editor" />
         <text macro="translator" />
diff --git a/test/csl/sort_CitationNumberPrimaryAscendingViaMacroBibliography.txt b/test/csl/sort_CitationNumberPrimaryAscendingViaMacroBibliography.txt
--- a/test/csl/sort_CitationNumberPrimaryAscendingViaMacroBibliography.txt
+++ b/test/csl/sort_CitationNumberPrimaryAscendingViaMacroBibliography.txt
@@ -3,6 +3,15 @@
 <<===== MODE =====<<
 
 
+>>==== DESCRIPTION ====>>
+Sorting on and rendering citation-numbers is accomplished with specialized logic that isn't fully
+documented in the specification. Please see the links below for an explanation.
+
+https://github.com/citation-style-language/test-suite/issues/62
+https://forums.zotero.org/discussion/71443/reverse-number-bibliography
+<<==== DESCRIPTION ====<<
+
+
 >>===== RESULT =====>>
 <div class="csl-bib-body">
   <div class="csl-entry">[1] Aaaa (first-cited)</div>
diff --git a/test/csl/sort_CitationNumberPrimaryAscendingViaMacroCitation.txt b/test/csl/sort_CitationNumberPrimaryAscendingViaMacroCitation.txt
--- a/test/csl/sort_CitationNumberPrimaryAscendingViaMacroCitation.txt
+++ b/test/csl/sort_CitationNumberPrimaryAscendingViaMacroCitation.txt
@@ -3,6 +3,15 @@
 <<===== MODE =====<<
 
 
+>>==== DESCRIPTION ====>>
+Sorting on and rendering citation-numbers is accomplished with specialized logic that isn't fully
+documented in the specification. Please see the links below for an explanation.
+
+https://github.com/citation-style-language/test-suite/issues/62
+https://forums.zotero.org/discussion/71443/reverse-number-bibliography
+<<==== DESCRIPTION ====<<
+
+
 >>===== RESULT =====>>
 >>[0] [1] Aaaa (first-cited); [2] Bbbb (second-cited); [3] Zzzz (third-cited); [4] Xxxx (fourth-cited)
 <<===== RESULT =====<<
diff --git a/test/csl/sort_CitationNumberPrimaryAscendingViaVariableBibliography.txt b/test/csl/sort_CitationNumberPrimaryAscendingViaVariableBibliography.txt
--- a/test/csl/sort_CitationNumberPrimaryAscendingViaVariableBibliography.txt
+++ b/test/csl/sort_CitationNumberPrimaryAscendingViaVariableBibliography.txt
@@ -3,6 +3,15 @@
 <<===== MODE =====<<
 
 
+>>==== DESCRIPTION ====>>
+Sorting on and rendering citation-numbers is accomplished with specialized logic that isn't fully
+documented in the specification. Please see the links below for an explanation.
+
+https://github.com/citation-style-language/test-suite/issues/62
+https://forums.zotero.org/discussion/71443/reverse-number-bibliography
+<<==== DESCRIPTION ====<<
+
+
 >>===== RESULT =====>>
 <div class="csl-bib-body">
   <div class="csl-entry">[1] Aaaa (first-cited)</div>
diff --git a/test/csl/sort_CitationNumberPrimaryAscendingViaVariableCitation.txt b/test/csl/sort_CitationNumberPrimaryAscendingViaVariableCitation.txt
--- a/test/csl/sort_CitationNumberPrimaryAscendingViaVariableCitation.txt
+++ b/test/csl/sort_CitationNumberPrimaryAscendingViaVariableCitation.txt
@@ -3,6 +3,15 @@
 <<===== MODE =====<<
 
 
+>>==== DESCRIPTION ====>>
+Sorting on and rendering citation-numbers is accomplished with specialized logic that isn't fully
+documented in the specification. Please see the links below for an explanation.
+
+https://github.com/citation-style-language/test-suite/issues/62
+https://forums.zotero.org/discussion/71443/reverse-number-bibliography
+<<==== DESCRIPTION ====<<
+
+
 >>===== RESULT =====>>
 >>[0] [1] Aaaa (first-cited); [2] Bbbb (second-cited); [3] Zzzz (third-cited); [4] Xxxx (fourth-cited)
 <<===== RESULT =====<<
diff --git a/test/csl/sort_OmittedBibRefMixedNumericStyle.expected b/test/csl/sort_OmittedBibRefMixedNumericStyle.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/sort_OmittedBibRefMixedNumericStyle.expected
@@ -0,0 +1,5 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">1. Anderson, Book One</div>
+  <div class="csl-entry">[CSL STYLE ERROR: reference with no printed form.]</div>
+  <div class="csl-entry">3. Crane, Book Two</div>
+</div>
diff --git a/test/csl/sort_OmittedBibRefMixedNumericStyle.txt b/test/csl/sort_OmittedBibRefMixedNumericStyle.txt
--- a/test/csl/sort_OmittedBibRefMixedNumericStyle.txt
+++ b/test/csl/sort_OmittedBibRefMixedNumericStyle.txt
@@ -2,6 +2,27 @@
 bibliography
 <<==== MODE ====<<
 
+>>==== DESCRIPTION ====>>
+
+This depends on
+
+1. identifying when citation-number is used,
+
+2. outputting a particular error message in place of a reference that produces
+   no output, to maintain citation-number sequencing, and
+
+2. rendering the <bibliography/> <text variable="citation-number"/>
+   for the omitted reference, ignoring the conditions that omitted the
+   reference.
+
+For an implementation example, see
+https://github.com/zotero/citeproc-rs/blob/master/crates/proc/src/db.rs#L1414
+
+Compare to the sort_OmittedBibRefNonNumericStyle test which has a similar
+non-rendering reference but no citation-numbers.
+
+<<==== DESCRIPTION ====<<
+
 >>==== RESULT ====>>
 <div class="csl-bib-body">
   <div class="csl-entry">1. Anderson, Book One</div>
@@ -27,7 +48,7 @@
 <<==== CITATION-ITEMS ====<<
 
 >>==== CSL ====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -120,4 +141,3 @@
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/test/csl/sort_OmittedBibRefNonNumericStyle.expected b/test/csl/sort_OmittedBibRefNonNumericStyle.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/sort_OmittedBibRefNonNumericStyle.expected
@@ -0,0 +1,5 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">Anderson, Book One</div>
+  <div class="csl-entry">[CSL STYLE ERROR: reference with no printed form.]</div>
+  <div class="csl-entry">Crane, Book Two</div>
+</div>
diff --git a/test/csl/sort_RangeUnaffected.expected b/test/csl/sort_RangeUnaffected.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/sort_RangeUnaffected.expected
@@ -0,0 +1,2 @@
+<sup>1–3</sup>
+<sup>3</sup>
diff --git a/test/csl/sort_VariousNameMacros1.txt b/test/csl/sort_VariousNameMacros1.txt
--- a/test/csl/sort_VariousNameMacros1.txt
+++ b/test/csl/sort_VariousNameMacros1.txt
@@ -77,7 +77,7 @@
 	<macro name="author-cit">
 		<names variable="author">
 			<name form="short" and="symbol" delimiter=" " initialize-with=""/>
-			<et-al font-style="italic" prefix=" "/>
+			<et-al font-style="italic"/>
 			<substitute>
 				<names variable="editor"/>
 				<names variable="translator"/>
diff --git a/test/csl/sort_VariousNameMacros2.txt b/test/csl/sort_VariousNameMacros2.txt
--- a/test/csl/sort_VariousNameMacros2.txt
+++ b/test/csl/sort_VariousNameMacros2.txt
@@ -77,7 +77,7 @@
 	<macro name="author-cit">
 		<names variable="author">
 			<name form="short" and="symbol" delimiter=" " initialize-with=""/>
-			<et-al font-style="italic" prefix=" "/>
+			<et-al font-style="italic"/>
 			<substitute>
 				<names variable="editor"/>
 				<names variable="translator"/>
diff --git a/test/csl/sort_VariousNameMacros3.txt b/test/csl/sort_VariousNameMacros3.txt
--- a/test/csl/sort_VariousNameMacros3.txt
+++ b/test/csl/sort_VariousNameMacros3.txt
@@ -77,7 +77,7 @@
 	<macro name="author-cit">
 		<names variable="author">
 			<name form="short" and="symbol" delimiter=" " initialize-with=""/>
-			<et-al font-style="italic" prefix=" "/>
+			<et-al font-style="italic"/>
 			<substitute>
 				<names variable="editor"/>
 				<names variable="translator"/>
diff --git a/test/csl/substitute_SubstituteOnlyOnceString.txt b/test/csl/substitute_SubstituteOnlyOnceString.txt
--- a/test/csl/substitute_SubstituteOnlyOnceString.txt
+++ b/test/csl/substitute_SubstituteOnlyOnceString.txt
@@ -21,7 +21,7 @@
   </info>
   <citation>
     <layout>
-      <names>
+      <names variable="author">
         <substitute>
           <text value="a"/>
           <text value="b"/>
diff --git a/test/csl/substitute_SubstituteOnlyOnceTerm.txt b/test/csl/substitute_SubstituteOnlyOnceTerm.txt
--- a/test/csl/substitute_SubstituteOnlyOnceTerm.txt
+++ b/test/csl/substitute_SubstituteOnlyOnceTerm.txt
@@ -27,7 +27,7 @@
   </locale>
   <citation>
     <layout>
-      <names>
+      <names variable="author">
         <substitute>
           <text term="editor"/>
           <text term="author"/>
diff --git a/test/csl/substitute_SubstituteOnlyOnceTermEmpty.expected b/test/csl/substitute_SubstituteOnlyOnceTermEmpty.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/substitute_SubstituteOnlyOnceTermEmpty.expected
@@ -0,0 +1,1 @@
+[CSL STYLE ERROR: reference with no printed form.]
diff --git a/test/csl/substitute_SubstituteOnlyOnceVariable.txt b/test/csl/substitute_SubstituteOnlyOnceVariable.txt
--- a/test/csl/substitute_SubstituteOnlyOnceVariable.txt
+++ b/test/csl/substitute_SubstituteOnlyOnceVariable.txt
@@ -21,7 +21,7 @@
   </info>
   <citation>
     <layout>
-      <names>
+      <names variable="author">
         <substitute>
           <text variable="title"/>
           <text variable="container-title"/>
@@ -36,10 +36,10 @@
 >>===== INPUT =====>>
 [
     {
+        "container-title": "ContainerTitle",
         "id": "ITEM-1",
-        "type": "book",
         "title": "Title",
-        "container-title": "ContainerTitle"
+        "type": "book"
     }
 ]
 <<===== INPUT =====<<
diff --git a/test/csl/testers_FirstAutoGeneratedZoteroPluginTest.expected b/test/csl/testers_FirstAutoGeneratedZoteroPluginTest.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/testers_FirstAutoGeneratedZoteroPluginTest.expected
@@ -0,0 +1,2 @@
+Center &#60;sup&#62;for&#60;/sup&#62; History &#60;sub&#62;and&#60;/sub&#62; New Media, “<b>Zotero</b> … ‘Quick Start’ &#38; <span style="font-variant:small-caps;">Guide</span> 日本語,” 47, http://zotero.org/support/quick_start_guide.
+John Smith, <i>Book A</i>, 2000; Center &#60;sup&#62;for&#60;/sup&#62; History &#60;sub&#62;and&#60;/sub&#62; New Media, “<b>Zotero</b> … ‘Quick Start’ &#38; <span style="font-variant:small-caps;">Guide</span> 日本語.”
diff --git a/test/csl/testers_SecondAutoGeneratedZoteroPluginTest.expected b/test/csl/testers_SecondAutoGeneratedZoteroPluginTest.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/testers_SecondAutoGeneratedZoteroPluginTest.expected
@@ -0,0 +1,5 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">Center &#60;sup&#62;for&#60;/sup&#62; History &#60;sub&#62;and&#60;/sub&#62; New Media. “<b>Zotero</b> … ‘Quick Start’ &#38; <span style="font-variant:small-caps;">Guide</span> 日本語.” http://zotero.org/support/quick_start_guide.</div>
+  <div class="csl-entry">Smith, John. <i>Book A</i>, 2000.</div>
+  <div class="csl-entry">Smith, Steven. <i>Book A</i>, 2000.</div>
+</div>
diff --git a/test/csl/textcase_LocaleUnicode.txt b/test/csl/textcase_LocaleUnicode.txt
--- a/test/csl/textcase_LocaleUnicode.txt
+++ b/test/csl/textcase_LocaleUnicode.txt
@@ -2,10 +2,10 @@
 citation
 <<===== MODE =====<<
 
+>>===== DESCRIPTION =====>>
 Details here:
-
 https://forums.zotero.org/discussion/83567/uppercase-letter-problem-in-turkish
-
+<<===== DESCRIPTION =====<<
 
 >>===== RESULT =====>>
 IA AND IB EN
@@ -16,26 +16,26 @@
 
 >>===== CITATION-ITEMS =====>>
 [
-  [
-    {
-      "id": "ITEM-1"
-    }
-  ],
-  [
-    {
-      "id": "ITEM-2"
-    }
-  ],
-  [
-    {
-      "id": "ITEM-3"
-    }
-  ],
-  [
-    {
-      "id": "ITEM-4"
-    }
-  ]
+    [
+        {
+            "id": "ITEM-1"
+        }
+    ],
+    [
+        {
+            "id": "ITEM-2"
+        }
+    ],
+    [
+        {
+            "id": "ITEM-3"
+        }
+    ],
+    [
+        {
+            "id": "ITEM-4"
+        }
+    ]
 ]
 <<===== CITATION-ITEMS =====<<
 
@@ -44,7 +44,7 @@
 <style 
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
-      default-locale="en">
+      default-locale="en"
       version="1.0">
   <info>
     <id />
diff --git a/test/csl/textcase_StopWordBeforeHyphen.expected b/test/csl/textcase_StopWordBeforeHyphen.expected
new file mode 100644
--- /dev/null
+++ b/test/csl/textcase_StopWordBeforeHyphen.expected
@@ -0,0 +1,1 @@
+Employee pro-Environmental Behavior
diff --git a/test/csl/textcase_TitleCaseWithVolumeTitle.txt b/test/csl/textcase_TitleCaseWithVolumeTitle.txt
new file mode 100644
--- /dev/null
+++ b/test/csl/textcase_TitleCaseWithVolumeTitle.txt
@@ -0,0 +1,90 @@
+>>===== MODE =====>>
+bibliography
+<<===== MODE =====<<
+
+
+>>===== DESCRIPTION =====>>
+Title case not disabled on volume-title with alternative languages
+
+<https://github.com/Juris-M/citeproc-js/issues/251>
+<<===== DESCRIPTION =====<<
+
+
+>>===== RESULT =====>>
+<div class="csl-bib-body">
+  <div class="csl-entry">Syntax und Stilistik</div>
+  <div class="csl-entry">Syntax und Stilistik</div>
+  <div class="csl-entry">Syntax und Stilistik</div>
+  <div class="csl-entry">Syntax und Stilistik</div>
+  <div class="csl-entry">Syntax und Stilistik</div>
+</div>
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style
+      xmlns="http://purl.org/net/xbiblio/csl"
+      class="note"
+      version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2025-03-12T12:22:26+00:00</updated>
+  </info>
+  <citation>
+    <layout delimiter="; ">
+      <text value="DUMMY"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <layout>
+      <text text-case="title" variable="event-title"/>
+      <text text-case="title" variable="original-title"/>
+      <text text-case="title" variable="part-title"/>
+      <text text-case="title" variable="reviewed-title"/>
+      <text text-case="title" variable="volume-title"/>
+    </layout>
+  </bibliography>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+    {
+        "event-title": "Syntax und Stilistik",
+        "id": "ITEM-1",
+        "language": "de",
+        "type": "book"
+    },
+    {
+        "id": "ITEM-2",
+        "language": "de",
+        "original-title": "Syntax und Stilistik",
+        "type": "book"
+    },
+    {
+        "id": "ITEM-3",
+        "language": "de",
+        "part-title": "Syntax und Stilistik",
+        "type": "book"
+    },
+    {
+        "id": "ITEM-4",
+        "language": "de",
+        "reviewed-title": "Syntax und Stilistik",
+        "type": "book"
+    },
+    {
+        "id": "ITEM-5",
+        "language": "de",
+        "type": "book",
+        "volume-title": "Syntax und Stilistik"
+    }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/collapse_NamelessCitesWithDifferentTitlesDoNotGroup.txt b/test/extra/collapse_NamelessCitesWithDifferentTitlesDoNotGroup.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/collapse_NamelessCitesWithDifferentTitlesDoNotGroup.txt
@@ -0,0 +1,52 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+(Smith v Jones 1998; Water Act 2007)
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2026-10-11T00:00:00+00:00</updated>
+  </info>
+  <citation collapse="year">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text variable="title"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </group>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "id": "ITEM-1",
+    "type": "legal_case",
+    "title": "Smith v Jones",
+    "issued": {"date-parts": [[1998]]}
+  },
+  {
+    "id": "ITEM-2",
+    "type": "legislation",
+    "title": "Water Act",
+    "issued": {"date-parts": [[2007]]}
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/collapse_TmpRealStyle.txt b/test/extra/collapse_TmpRealStyle.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/collapse_TmpRealStyle.txt
@@ -0,0 +1,285 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+(Hennelly et al., 2023, 2025)
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="en-US">
+  <info>
+    <title>Elsevier (author-date/Harvard, with titles)</title>
+    <id>http://www.zotero.org/styles/elsevier-harvard</id>
+    <link href="http://www.zotero.org/styles/elsevier-harvard" rel="self"/>
+    <link href="http://www.zotero.org/styles/ecology-letters" rel="template"/>
+    <link href="http://www.elsevier.com/journals/biological-conservation/0006-3207/guide-for-authors#68000" rel="documentation"/>
+    <author>
+      <name>David Kaplan</name>
+      <email>david.kaplan@ird.fr</email>
+    </author>
+    <contributor>
+      <name>Simon Kornblith</name>
+      <email>simon@simonster.com</email>
+    </contributor>
+    <contributor>
+      <name>Bruce D'Arcus</name>
+    </contributor>
+    <contributor>
+      <name>Curtis M. Humphrey</name>
+    </contributor>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <updated>2014-03-04T00:09:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" prefix=", " suffix=": "/>
+        <names variable="editor translator" delimiter=", " suffix=", ">
+          <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+        </names>
+        <group delimiter=", ">
+          <text variable="container-title" text-case="title"/>
+          <text variable="collection-title" text-case="title"/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group prefix=", " delimiter=", ">
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>
+      </else-if>
+      <else>
+        <group prefix=". " delimiter=", ">
+          <text variable="container-title" form="short"/>
+          <text variable="collection-title"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <group delimiter=" ">
+          <text value="URL"/>
+          <text variable="URL"/>
+          <group prefix="(" suffix=").">
+            <text term="accessed" suffix=" "/>
+            <date variable="accessed">
+              <date-part name="month" form="numeric" suffix="."/>
+              <date-part name="day" suffix="."/>
+              <date-part name="year" form="short"/>
+            </date>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report thesis" match="any">
+        <text variable="title"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="genre"/>
+          <text variable="number" prefix="No. "/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech" match="any">
+        <text variable="title"/>
+        <text macro="edition" prefix=", "/>
+      </else-if>
+      <else-if type="webpage">
+        <text variable="title"/>
+        <text value="WWW Document" prefix=" [" suffix="]"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <text term="presented at" text-case="capitalize-first" suffix=" "/>
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <number variable="edition" form="ordinal"/>
+        </if>
+        <else>
+          <text variable="edition" suffix="."/>
+        </else>
+      </choose>
+      <text value="ed"/>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group prefix=" " delimiter=", ">
+          <group>
+            <text variable="volume"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <group>
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <text variable="number" prefix=". "/>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
+    <sort>
+      <key macro="author" names-min="3" names-use-first="1"/>
+      <key macro="issued"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued"/>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+    <sort>
+      <key macro="author" names-min="3" names-use-first="1"/>
+      <key macro="issued"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <text macro="author" suffix=","/>
+        <text macro="issued" prefix=" "/>
+        <group prefix=". ">
+          <text macro="title"/>
+          <text macro="container"/>
+          <text macro="locators"/>
+        </group>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "id": "hennelly2023",
+    "type": "article-journal",
+    "author": [
+      {"family": "Hennelly", "given": "Lauren M."},
+      {"family": "Sarwar", "given": "Ghulam"},
+      {"family": "Fatima", "given": "Hira"}
+    ],
+    "title": "Genomic analysis of wolves from Pakistan",
+    "container-title": "Journal of Heredity",
+    "issued": {"date-parts": [[2023]]}
+  },
+  {
+    "id": "hennelly2025",
+    "type": "article-journal",
+    "author": [
+      {"family": "Hennelly", "given": "Lauren M."},
+      {"family": "Parreira", "given": "Bárbara R."},
+      {"family": "Noble", "given": "Ash"}
+    ],
+    "title": "Continent-wide view of genomic diversity in the wolves of Asia",
+    "container-title": "Communications Biology",
+    "issued": {"date-parts": [[2025]]}
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/collapse_YearWithIdenticalEtAlNames.txt b/test/extra/collapse_YearWithIdenticalEtAlNames.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/collapse_YearWithIdenticalEtAlNames.txt
@@ -0,0 +1,76 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+(Hennelly et al., 2023, 2025)
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2026-10-21T00:00:00+00:00</updated>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-et-al="never"/>
+    </names>
+  </macro>
+  <macro name="issued">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
+    <sort>
+      <key macro="author" names-min="3" names-use-first="1"/>
+      <key macro="issued"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author"/>
+        <text macro="issued"/>
+      </group>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "id": "hennelly2023",
+    "type": "article-journal",
+    "author": [
+      {"family": "Hennelly", "given": "Lauren M."},
+      {"family": "Sarwar", "given": "Ghulam"},
+      {"family": "Fatima", "given": "Hira"}
+    ],
+    "title": "Genomic analysis of wolves from Pakistan",
+    "container-title": "Journal of Heredity",
+    "issued": {"date-parts": [[2023]]}
+  },
+  {
+    "id": "hennelly2025",
+    "type": "article-journal",
+    "author": [
+      {"family": "Hennelly", "given": "Lauren M."},
+      {"family": "Parreira", "given": "Bárbara R."},
+      {"family": "Noble", "given": "Ash"}
+    ],
+    "title": "Continent-wide view of genomic diversity in the wolves of Asia",
+    "container-title": "Communications Biology",
+    "issued": {"date-parts": [[2025]]}
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/date_LiteralOnlyWhereYearIsRendered.txt b/test/extra/date_LiteralOnlyWhereYearIsRendered.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/date_LiteralOnlyWhereYearIsRendered.txt
@@ -0,0 +1,45 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+in press Forthcoming results; 2020 Earlier results (May)
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2026-10-11T00:00:00+00:00</updated>
+  </info>
+  <citation>
+    <layout delimiter="; ">
+      <group delimiter=" ">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text variable="title"/>
+        <date variable="issued" prefix="(" suffix=")">
+          <date-part name="month"/>
+        </date>
+      </group>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {"id": "ITEM-1", "type": "article-journal", "title": "Forthcoming results", "issued": {"literal": "in press"}},
+  {"id": "ITEM-2", "type": "article-journal", "title": "Earlier results", "issued": {"date-parts": [[2020, 5]]}}
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/etal_AndOthersWithEtAlUseLast.txt b/test/extra/etal_AndOthersWithEtAlUseLast.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/etal_AndOthersWithEtAlUseLast.txt
@@ -0,0 +1,101 @@
+Literal "others" as the last name, which is what BibTeX's "and others"
+becomes, is rendered as "et al." with et-al-use-last="true", whether the
+list is shorter than et-al-min, exactly as long, or longer.  It is not
+a real last name: it must not be printed after "et al." and must not
+turn the "et al." into an ellipsis.  A complete list still gets the
+ellipsis and its real last name.
+
+>>===== MODE =====>>
+bibliography
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+<div class="csl-bib-body">
+  <div class="csl-entry">Alice Adams, Bob Brown, Carol Clark, et al.</div>
+  <div class="csl-entry">Alice Adams, Bob Brown, Carol Clark, et al.</div>
+  <div class="csl-entry">Alice Adams, Bob Brown, et al.</div>
+  <div class="csl-entry">Alice Adams, Bob Brown, Carol Clark, … Frank Foster</div>
+</div>
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style
+      xmlns="http://purl.org/net/xbiblio/csl"
+      class="note"
+      version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2009-08-10T04:49:00+09:00</updated>
+  </info>
+  <citation>
+    <layout>
+      <text value="Oops"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <layout>
+      <names variable="author">
+        <name et-al-min="5" et-al-use-first="3" et-al-use-last="true"/>
+      </names>
+    </layout>
+  </bibliography>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "id": "others-above-min",
+    "type": "article-journal",
+    "author": [
+      {"family": "Adams", "given": "Alice"},
+      {"family": "Brown", "given": "Bob"},
+      {"family": "Clark", "given": "Carol"},
+      {"family": "Davis", "given": "Dan"},
+      {"family": "Evans", "given": "Eve"},
+      {"literal": "others"}
+    ]
+  },
+  {
+    "id": "others-at-min",
+    "type": "article-journal",
+    "author": [
+      {"family": "Adams", "given": "Alice"},
+      {"family": "Brown", "given": "Bob"},
+      {"family": "Clark", "given": "Carol"},
+      {"family": "Davis", "given": "Dan"},
+      {"literal": "others"}
+    ]
+  },
+  {
+    "id": "others-below-min",
+    "type": "article-journal",
+    "author": [
+      {"family": "Adams", "given": "Alice"},
+      {"family": "Brown", "given": "Bob"},
+      {"literal": "others"}
+    ]
+  },
+  {
+    "id": "complete-above-min",
+    "type": "article-journal",
+    "author": [
+      {"family": "Adams", "given": "Alice"},
+      {"family": "Brown", "given": "Bob"},
+      {"family": "Clark", "given": "Carol"},
+      {"family": "Davis", "given": "Dan"},
+      {"family": "Evans", "given": "Eve"},
+      {"family": "Foster", "given": "Frank"}
+    ]
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/flipflop_NoItalicsOnCjkText.txt b/test/extra/flipflop_NoItalicsOnCjkText.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/flipflop_NoItalicsOnCjkText.txt
@@ -0,0 +1,38 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+农业经济; <i>Seed Science</i>; <i>مجلة الزراعة</i>
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2026-10-11T00:00:00+00:00</updated>
+  </info>
+  <citation>
+    <layout delimiter="; ">
+      <text variable="container-title" font-style="italic"/>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {"id": "ITEM-1", "type": "article-journal", "container-title": "农业经济"},
+  {"id": "ITEM-2", "type": "article-journal", "container-title": "Seed Science"},
+  {"id": "ITEM-3", "type": "article-journal", "container-title": "مجلة الزراعة"}
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/issue_151.txt b/test/extra/issue_151.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_151.txt
@@ -0,0 +1,59 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+
+
+>>===== RESULT =====>>
+type is article-journal or chaptertype is article-journal or chapter
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+  <info>
+    <title>Type conditional test</title>
+    <id>http://www.zotero.org/styles/type-conditional-test</id>
+    <updated>2025-03-27T23:03:22+00:00</updated>
+  </info>
+  <citation>
+    <layout>
+      <choose>
+        <if match="all" type="article-journal chapter">
+          <text value="type is article-journal or chapter"/>
+        </if>
+      </choose>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[ [ {"id":"test1"}, {"id":"test2"} ] ]
+<<===== CITATION-ITEMS =====<<
+
+
+
+>>===== INPUT =====>>
+[
+  {
+    "id": "test1",
+    "type": "article-journal",
+    "title": "Test One"
+  },
+  {
+    "id": "test2",
+    "type": "chapter",
+    "title": "Test Two"
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+
diff --git a/test/extra/issue_156.txt b/test/extra/issue_156.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_156.txt
@@ -0,0 +1,717 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+
+
+>>===== RESULT =====>>
+(e.g., Cork 2018; Doe 2019; Doe 2020, among others)
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
+  <info>
+    <title>Chicago Manual of Style 17th edition (author-date)</title>
+    <id>http://www.zotero.org/styles/chicago-author-date</id>
+    <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <contributor>
+      <name>Andrew Dunning</name>
+      <email>andrew.dunning@utoronto.ca</email>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
+    </contributor>
+    <contributor>
+      <name>Matthew Roth</name>
+      <email>matthew.g.roth@yale.edu</email>
+      <uri> https://orcid.org/0000-0001-7902-6331</uri>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>The author-date variant of the Chicago style</summary>
+    <updated>2018-01-24T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editor" form="verb-short">ed.</term>
+      <term name="container-author" form="verb">by</term>
+      <term name="translator" form="verb-short">trans.</term>
+      <term name="editortranslator" form="verb">edited and translated by</term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+        <group delimiter=". ">
+          <names variable="editor translator" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+          <names variable="director" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <group prefix=", " delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="recipient">
+    <choose>
+      <if type="personal_communication">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text term="letter" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="substitute-title">
+    <choose>
+      <if type="article-magazine article-newspaper review review-book" match="any">
+        <text macro="container-title"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="contributors">
+    <group delimiter=". ">
+      <names variable="author">
+        <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+        <label form="short" prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+          <names variable="director"/>
+          <text macro="substitute-title"/>
+          <text macro="title"/>
+        </substitute>
+      </names>
+      <text macro="recipient"/>
+    </group>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <names variable="director"/>
+        <text macro="substitute-title"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <text variable="archive_location" text-case="capitalize-first"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group delimiter=". ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if type="webpage post-weblog" match="any">
+          <date variable="issued" form="text"/>
+        </if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="https://doi.org/"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="bill book graphic legislation motion_picture song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <choose>
+          <if variable="reviewed-title">
+            <group delimiter=". ">
+              <text variable="title" text-case="title" quotes="true"/>
+              <group delimiter=", ">
+                <text variable="reviewed-title" text-case="title" font-style="italic" prefix="Review of "/>
+                <names variable="reviewed-author">
+                  <label form="verb-short" text-case="lowercase" suffix=" "/>
+                  <name and="text" delimiter=", "/>
+                </names>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="title" text-case="title" font-style="italic" prefix="Review of "/>
+              <names variable="reviewed-author">
+                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" " prefix=". ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" strip-periods="true"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" text-case="capitalize-first" prefix=". "/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" " prefix=", ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" prefix=", "/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume">
+            <text variable="volume" prefix=" "/>
+            <group prefix=" (" suffix=")">
+              <choose>
+                <if variable="issue">
+                  <text variable="issue"/>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="month"/>
+                  </date>
+                </else>
+              </choose>
+            </group>
+          </if>
+          <else-if variable="issue">
+            <group delimiter=" " prefix=", ">
+              <text term="issue" form="short"/>
+              <text variable="issue"/>
+              <date variable="issued" prefix="(" suffix=")">
+                <date-part name="month"/>
+              </date>
+            </group>
+          </else-if>
+          <else>
+            <date variable="issued" prefix=", ">
+              <date-part name="month"/>
+            </date>
+          </else>
+        </choose>
+      </if>
+      <else-if type="legal_case">
+        <text variable="volume" prefix=", "/>
+        <text variable="container-title" prefix=" "/>
+        <text variable="page" prefix=" "/>
+      </else-if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group prefix=". " delimiter=". ">
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " plural="true"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if variable="page" match="none">
+            <group prefix=". ">
+              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+              <number variable="volume" form="numeric"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if variable="page">
+            <group prefix=", ">
+              <text variable="volume" suffix=":"/>
+              <text variable="page"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-article">
+    <choose>
+      <if type="article-newspaper">
+        <group prefix=", " delimiter=", ">
+          <group delimiter=" ">
+            <text variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=" "/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text variable="page" prefix=": "/>
+          </if>
+          <else>
+            <text variable="page" prefix=", "/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <choose>
+              <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+                <choose>
+                  <if variable="volume">
+                    <group>
+                      <text term="volume" form="short" suffix=" "/>
+                      <number variable="volume" form="numeric"/>
+                      <label variable="locator" form="short" prefix=", " suffix=" "/>
+                    </group>
+                  </if>
+                  <else>
+                    <label variable="locator" form="short" suffix=" "/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <label variable="locator" form="short" suffix=" "/>
+              </else>
+            </choose>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <number variable="volume" form="numeric" suffix=":"/>
+          </else-if>
+        </choose>
+        <text variable="locator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <text term="in" text-case="capitalize-first"/>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <text macro="container-prefix" suffix=" "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="webpage">
+        <text variable="container-title" text-case="title"/>
+      </if>
+      <else-if type="legal_case" match="none">
+        <group delimiter=" ">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+          <choose>
+            <if type="post-weblog">
+              <text value="(blog)"/>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if variable="issued">
+        <group delimiter=" ">
+          <date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="capitalize-first"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-in-text">
+    <choose>
+      <if variable="issued">
+        <group delimiter=" ">
+          <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="collection-title">
+    <choose>
+      <if match="none" type="article-journal">
+        <choose>
+          <if match="none" is-numeric="collection-number">
+            <group delimiter=", ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-title-journal">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=" ">
+          <text variable="collection-title"/>
+          <text variable="collection-number"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="description">
+    <choose>
+      <if type="interview">
+        <group delimiter=". ">
+          <text macro="interviewer"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else-if type="patent">
+        <group delimiter=" " prefix=". ">
+          <text variable="authority"/>
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else>
+        <text variable="medium" text-case="capitalize-first" prefix=". "/>
+      </else>
+    </choose>
+    <choose>
+      <if variable="title" match="none"/>
+      <else-if type="thesis personal_communication speech" match="any"/>
+      <else>
+        <group delimiter=" " prefix=". ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <choose>
+            <if type="report">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="legal_case">
+        <text variable="authority" prefix=". "/>
+      </if>
+      <else-if type="speech">
+        <group prefix=". " delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text macro="event"/>
+          </group>
+          <text variable="event-place"/>
+          <text macro="day-month"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine personal_communication" match="any">
+        <date variable="issued" form="text" prefix=", "/>
+      </else-if>
+      <else-if type="patent">
+        <group delimiter=", " prefix=", ">
+          <group delimiter=" ">
+            <!--Needs Localization-->
+            <text value="filed"/>
+            <date variable="submitted" form="text"/>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if variable="issued submitted" match="all">
+                <text term="and"/>
+              </if>
+            </choose>
+            <!--Needs Localization-->
+            <text value="issued"/>
+            <date variable="issued" form="text"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-journal" match="any"/>
+      <else>
+        <group prefix=". " delimiter=", ">
+          <choose>
+            <if type="thesis">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text macro="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
+  <sort>
+    <key macro="contributors"/>
+    <key variable="issued"/>
+    <key variable="title"/>
+  </sort>
+  <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <choose>
+          <if variable="issued accessed" match="any">
+            <group delimiter=" ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text"/>
+            </group>
+          </if>
+          <!---comma before forthcoming and n.d.-->
+          <else>
+            <group delimiter=", ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text"/>
+            </group>
+          </else>
+        </choose>
+        <text macro="point-locators"/>
+      </group>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+>>===== CITATIONS =====>>
+[{ "citationItems":
+    [ {"id":"doeA"},
+      {"id":"cork"},
+      {"id":"doeB"} ],
+   "citationPrefix": "e.g., ",
+   "citationSuffix": ", among others"
+}]
+<<===== CITATIONS =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "author": [
+      {
+        "family": "Doe",
+        "given": "John"
+      }
+    ],
+    "id": "doeA",
+    "title": "Fruits",
+    "type": "book",
+    "issued": {
+      "date-parts": [
+        [
+          2020
+        ]
+      ]
+    }
+  },
+  {
+    "author": [
+      {
+        "family": "Doe",
+        "given": "John"
+      }
+    ],
+    "id": "doeB",
+    "title": "Veggies",
+    "type": "book",
+    "issued": {
+      "date-parts": [
+        [
+          2019
+        ]
+      ]
+    }
+  },
+  {
+    "author": [
+      {
+        "family": "Cork",
+        "given": "John"
+      }
+    ],
+    "id": "cork",
+    "title": "Meat",
+    "type": "book",
+    "issued": {
+      "date-parts": [
+        [
+          2018
+        ]
+      ]
+    }
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+
diff --git a/test/extra/issue_159.txt b/test/extra/issue_159.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_159.txt
@@ -0,0 +1,108 @@
+>>===== MODE =====>>
+bibliography
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+<div class="csl-bib-body">
+  <div class="csl-entry">Isabelle Ferreras, Julie Battilana, Dominique Méda</div>
+</div>
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0">
+  <info>
+    <title>Names substitution test</title>
+    <id>http://www.zotero.org/styles/names-substitution</id>
+    <updated>2025-07-08T00:00:00+00:00</updated>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-conditional">
+    <names variable="author">
+      <substitute>
+        <choose>
+          <if match="none" type="standard">
+            <names variable="editor"/>
+            <names variable="translator"/>
+          </if>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <citation>
+      <text macro="author"/>
+    <layout>
+    </layout>
+  </citation>
+  <bibliography>
+    <layout>
+      <text macro="author-conditional"/>
+    </layout>
+  </bibliography>
+</style>
+<<===== CSL =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[ [ {"id":"FerrerasDemocratizeWorkCase2022"} ] ]
+<<===== CITATION-ITEMS =====<<
+
+
+
+>>===== INPUT =====>>
+[
+  {
+    "ISBN": "978-0-226-81962-4 978-0-226-81963-1",
+    "citation-key": "FerrerasDemocratizeWorkCase2022",
+    "editor": [
+      {
+        "family": "Ferreras",
+        "given": "Isabelle"
+      },
+      {
+        "family": "Battilana",
+        "given": "Julie"
+      },
+      {
+        "family": "Méda",
+        "given": "Dominique"
+      }
+    ],
+    "id": "FerrerasDemocratizeWorkCase2022",
+    "issued": {
+      "date-parts": [
+        [
+          2022
+        ]
+      ]
+    },
+    "language": "en",
+    "publisher": "University of Chicago Press",
+    "publisher-place": "Chicago",
+    "title": "Democratize work: the case for reorganizing the economy",
+    "title-short": "Democratize work",
+    "translator": [
+      {
+        "family": "Richmond Mouillot",
+        "given": "Miranda"
+      }
+    ],
+    "type": "book"
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+
diff --git a/test/extra/issue_160.txt b/test/extra/issue_160.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_160.txt
@@ -0,0 +1,96 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+..[0] (Doe)
+..[1] (Doe)
+<<===== RESULT =====<<
+
+
+>>===== CITATIONS =====>>
+[
+   {
+       "citationID": "CITATION-1",
+       "citationItems": [
+           {
+               "id": "ITEM-1"
+           }
+       ],
+       "properties": {
+           "noteIndex": 1
+       }
+   }
+,  {
+       "citationID": "CITATION-2",
+       "citationResetPosition": true,
+       "citationItems": [
+           {
+               "id": "ITEM-1"
+           }
+       ],
+       "properties": {
+           "noteIndex": 3
+       }
+   }
+]
+<<===== CITATIONS =====<<
+
+
+
+>>===== CSL =====>>
+<style 
+      xmlns="http://purl.org/net/xbiblio/csl"
+      class="note"
+      version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2009-08-10T04:49:00+09:00</updated>
+  </info>
+  <citation>
+    <layout delimiter="; " prefix="(" suffix=")">
+      <choose>
+        <if position="first">
+          <names variable="author">
+            <name form="short"/>
+          </names>
+          <group prefix=" ">
+            <label variable="locator" form="short" suffix=" "/>
+            <text variable="locator"/>
+          </group>
+        </if>
+        <else-if position="subsequent">
+ 		    <text value="I am subsequent"/>
+		</else-if>
+        <else>
+            <text value="I am ibid or ibid-with-locator"/>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+    {
+        "author": [
+            {
+                "family": "Doe", 
+                "given": "John"
+            }
+        ], 
+        "id": "ITEM-1", 
+        "type": "book"
+    }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+
diff --git a/test/extra/issue_164.txt b/test/extra/issue_164.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_164.txt
@@ -0,0 +1,81 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+
+>>===== RESULT =====>>
+chap. 2.
+<<===== RESULT =====<<
+
+
+>>===== CITATIONS =====>>
+[ [{"id":"BarnesCompleteWorksAristotle1984", "locator": "2","label":"chapter"} ] ]
+<<===== CITATIONS =====<<
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" and="text" class="note" demote-non-dropping-particle="display-and-sort" page-range-format="chicago-16" version="1.0">
+  <macro name="label-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="page"/>
+        <else-if is-numeric="locator">
+          <label form="short" variable="locator"/>
+        </else-if>
+        <else-if locator="chapter line verse" match="any"/>
+        <!-- a non-numeric canonical reference is identified by its formatting and does not need a label (CMOS18 14.143-54) -->
+        <else>
+          <label form="short" variable="locator"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation disambiguate-add-givenname="true" disambiguate-add-names="true" et-al-min="3" et-al-use-first="1">
+    <layout delimiter="; " suffix=".">
+      <text macro="label-locator"/>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "DOI": "10.1515/9781400835843",
+    "ISBN": "978-0-691-01650-4 978-1-4008-3584-3",
+    "citation-key": "BarnesCompleteWorksAristotle1984",
+    "collection-number": "192",
+    "collection-title": "Bollingen Series",
+    "editor": [
+      {
+        "family": "Barnes",
+        "given": "Jonathan"
+      }
+    ],
+    "event-place": "Princeton, NJ",
+    "id": "BarnesCompleteWorksAristotle1984",
+    "issued": {
+      "date-parts": [
+        [
+          1984
+        ]
+      ]
+    },
+    "language": "en",
+    "number-of-volumes": "2",
+    "publisher": "Princeton University Press",
+    "publisher-place": "Princeton, NJ",
+    "title": "The complete works of Aristotle: the revised Oxford translation",
+    "type": "book"
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/issue_165.txt b/test/extra/issue_165.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_165.txt
@@ -0,0 +1,93 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+
+
+>>===== RESULT =====>>
+no page locator; no chapter locator; no locator
+page locator present; no chapter locator; locator present
+no page locator; chapter locator present; locator present
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-model href="https://raw.githubusercontent.com/citation-style-language/schema/refs/heads/master/schemas/styles/csl.rnc"
+  type="application/relax-ng-compact-syntax" schematypens="http://relaxng.org/ns/compatibility/annotations/1.0"?>
+<?xml-model href="https://raw.githubusercontent.com/citation-style-language/schema/refs/heads/master/schemas/styles/csl.rnc"
+  type="application/relax-ng-compact-syntax" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<style class="note" version="1.0" xmlns="http://purl.org/net/xbiblio/csl">
+  <info>
+    <title>Locator test</title>
+    <id>http://www.zotero.org/styles/locator-test</id>
+    <link href="http://www.zotero.org/styles/locator-test" rel="self"/>
+    <updated>2025-05-20T00:00:00+00:00</updated>
+  </info>
+  <macro name="locator-test">
+    <group delimiter="; ">
+      <choose>
+        <if locator="page">
+          <text value="page locator present"/>
+        </if>
+        <else>
+          <text value="no page locator"/>
+        </else>
+      </choose>
+      <choose>
+        <if locator="chapter">
+          <text value="chapter locator present"/>
+        </if>
+        <else>
+          <text value="no chapter locator"/>
+        </else>
+      </choose>
+      <choose>
+        <if variable="locator">
+          <text value="locator present"/>
+        </if>
+        <else>
+          <text value="no locator"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <citation>
+    <layout>
+      <text macro="locator-test"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <layout>
+      <text macro="locator-test"/>
+    </layout>
+  </bibliography>
+</style>
+<<===== CSL =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[ [ {"id":"test"} ]
+, [ {"id":"test", "locator": "123", "label": "page"} ]
+, [ {"id":"test", "locator": "456", "label": "chapter"} ]
+]
+<<===== CITATION-ITEMS =====<<
+
+
+
+>>===== INPUT =====>>
+[
+  {
+    "id": "test",
+    "type": "book",
+    "title": "Title"
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+
diff --git a/test/extra/issue_166.txt b/test/extra/issue_166.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_166.txt
@@ -0,0 +1,91 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+
+>>===== RESULT =====>>
+numeric locator: 123
+numeric locator: 123
+numeric locator: 123a
+numeric locator: L123
+non-numeric locator: 123.55
+numeric locator: 123, 55
+numeric locator: 123, 55 &#38; 66
+non-numeric locator: iv.123
+non-numeric locator: iv.123
+<<===== RESULT =====<<
+
+
+>>===== CITATIONS =====>>
+[[ { "id":"a", "locator": "123", "label": "page" } ]
+,[ { "id":"a", "locator": "123", "label": "chapter" } ]
+,[ { "id":"a", "locator": "123a", "label": "page" } ]
+,[ { "id":"a", "locator": "L123", "label": "page" } ]
+,[ { "id":"a", "locator": "123.55", "label": "page" } ]
+,[ { "id":"a", "locator": "123, 55", "label": "page" } ]
+,[ { "id":"a", "locator": "123, 55 & 66", "label": "page" } ]
+,[ { "id":"a", "locator": "iv.123", "label": "page" } ]
+,[ { "id":"a", "locator": "iv.123", "label": "chapter" } ]
+]
+<<===== CITATIONS =====<<
+
+
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style class="note" version="1.0" xmlns="http://purl.org/net/xbiblio/csl">
+  <info>
+    <title>Numeric locator test</title>
+    <id>http://www.zotero.org/styles/locator-numeric</id>
+    <link href="http://www.zotero.org/styles/locator-numeric" rel="self"/>
+    <updated>2025-08-13T00:00:00+00:00</updated>
+  </info>
+  <citation>
+    <layout>
+      <group delimiter=" ">
+        <choose>
+          <if is-numeric="locator">
+            <text value="numeric locator: "/>
+          </if>
+          <else>
+            <text value="non-numeric locator: "/>
+          </else>
+        </choose>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "author": [
+      {
+        "family": "Dummy",
+        "given": "John"
+      }
+    ],
+    "id": "a",
+    "issued": {
+      "date-parts": [
+        [
+          2022
+        ]
+      ]
+    },
+    "title": "A dummy book",
+    "type": "book"
+  }
+]
+
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/issue_173.txt b/test/extra/issue_173.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_173.txt
@@ -0,0 +1,66 @@
+>>===== MODE =====>>
+bibliography
+<<===== MODE =====<<
+
+
+
+
+>>===== RESULT =====>>
+<div class="csl-bib-body">
+  <div class="csl-entry">https://www.researchgate.net/publication/308399994_Teo's_Brew_-_The_Re-composition_of_'Bitches_Brew'_in_the_Studio</div>
+</div>
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style
+    xmlns="http://purl.org/net/xbiblio/csl"
+    class="note"
+    version="1.0">
+  <info>
+    <id />
+    <title />
+  </info>
+  <citation>
+    <layout>
+      <text variable="URL"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <layout>
+      <text variable="URL"/>
+    </layout>
+  </bibliography>
+</style>
+<<===== CSL =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[ [ {"id":"Doe" } ] ]
+<<===== CITATION-ITEMS =====<<
+
+
+
+>>===== INPUT =====>>
+[
+  {
+    "author": [
+      {
+        "family": "Doe",
+        "given": "John"
+      }
+    ],
+    "id": "Doe",
+    "type": "book",
+    "title": "Title",
+     "URL":"https://www.researchgate.net/publication/308399994_Teo's_Brew_-_The_Re-composition_of_'Bitches_Brew'_in_the_Studio"
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+
diff --git a/test/extra/issue_174.txt b/test/extra/issue_174.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_174.txt
@@ -0,0 +1,98 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+Title, ALCT, 3
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style class="note" version="1.0" xmlns="http://purl.org/net/xbiblio/csl">
+  <info>
+    <title>Variable substitution test</title>
+    <id>http://www.zotero.org/styles/subsitute-test</id>
+  </info>
+  <citation>
+    <layout>
+      <group delimiter=", ">
+        <!-- short title -->
+        <names variable="composer">
+          <substitute>
+            <text form="short" variable="title"/>
+          </substitute>
+        </names>
+        <text form="short" variable="title"/>
+        <!-- short container title -->
+        <names variable="author">
+          <substitute>
+            <text form="short" variable="container-title"/>
+          </substitute>
+        </names>
+        <text form="short" variable="container-title"/>
+        <!-- number -->
+        <names variable="illustrator">
+          <substitute>
+            <number variable="volume"/>
+          </substitute>
+        </names>
+        <number variable="volume"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <layout>
+      <group delimiter=", ">
+        <!-- title -->
+        <names variable="composer">
+          <substitute>
+            <text variable="title"/>
+          </substitute>
+        </names>
+        <text variable="title"/>
+        <!-- container title -->
+        <names variable="author">
+          <substitute>
+            <text variable="container-title"/>
+          </substitute>
+        </names>
+        <text variable="container-title"/>
+        <!-- number as text -->
+        <names variable="illustrator">
+          <substitute>
+            <text variable="volume"/>
+          </substitute>
+        </names>
+        <text variable="volume"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
+<<===== CSL =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[ [ {"id":"test" } ] ]
+<<===== CITATION-ITEMS =====<<
+
+
+
+>>===== INPUT =====>>
+[
+ { "id": "test",
+   "title": "A title with a long form",
+   "title-short": "Title",
+   "container-title": "A long container title",
+   "container-title-short": "ALCT",
+   "volume": "3"
+ }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+
diff --git a/test/extra/issue_175.txt b/test/extra/issue_175.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_175.txt
@@ -0,0 +1,79 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+numeric volume: volumes 1–2
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style class="note" version="1.0" xmlns="http://purl.org/net/xbiblio/csl">
+  <info>
+    <title>Numeric test</title>
+    <id>http://www.zotero.org/styles/numeric-test</id>
+    <link href="http://www.zotero.org/styles/locator-test" rel="self"/>
+    <updated>2025-05-20T00:00:00+00:00</updated>
+  </info>
+  <citation>
+    <layout>
+      <group delimiter=" ">
+        <choose>
+          <if variable="volume">
+            <choose>
+              <if is-numeric="volume">
+                <text value="numeric volume:"/>
+              </if>
+              <else>
+                <text value="non-numeric volume:"/>
+              </else>
+            </choose>
+            <label variable="volume"/>
+            <text variable="volume"/>
+          </if>
+        </choose>
+        <choose>
+          <if variable="locator">
+            <choose>
+              <if is-numeric="locator">
+                <text value="numeric locator:"/>
+              </if>
+              <else>
+                <text value="non-numeric locator:"/>
+              </else>
+            </choose>
+            <label variable="locator"/>
+            <text variable="locator"/>
+          </if>
+        </choose>
+      </group>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[ [ {"id":"VolumeTest1" } ] ]
+<<===== CITATION-ITEMS =====<<
+
+
+
+>>===== INPUT =====>>
+[
+  {
+    "id": "VolumeTest1",
+    "type": "book",
+    "title": "Title",
+    "volume": "1–2"
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
+
diff --git a/test/extra/issue_179.txt b/test/extra/issue_179.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_179.txt
@@ -0,0 +1,84 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+Doe, ‘Ends with period inside quotes.’
+Doe, ‘Ends with question mark?’
+Doe, ‘Ends with an exclamation mark!’
+Doe, ‘Ends with period outside quotes’.
+<<===== RESULT =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[
+  [
+    {
+      "id": "ITEM-1",
+      "suffix": ", 'Ends with period inside quotes.'"
+    }
+  ],
+  [
+    {
+      "id": "ITEM-1",
+      "suffix": ", 'Ends with question mark?'"
+    }
+  ],
+  [
+    {
+      "id": "ITEM-1",
+      "suffix": ", 'Ends with an exclamation mark!'"
+    }
+  ],
+  [
+    {
+      "id": "ITEM-1",
+      "suffix": ", 'Ends with period outside quotes'."
+    }
+  ]
+]
+<<===== CITATION-ITEMS =====<<
+
+
+>>===== CSL =====>>
+<style
+      xmlns="http://purl.org/net/xbiblio/csl"
+      class="note"
+      version="1.0"
+      default-locale="en-GB">
+  <info>
+    <id />
+    <title />
+    <updated>2026-05-03T22:24:00+00:00</updated>
+  </info>
+  <citation>
+    <layout suffix=".">
+      <names variable="author">
+        <name form="short" />
+      </names>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "author": [
+      {
+        "family": "Doe",
+        "given": "John"
+      }
+    ],
+    "id": "ITEM-1",
+    "type": "book"
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/issue_179_enUS.txt b/test/extra/issue_179_enUS.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_179_enUS.txt
@@ -0,0 +1,77 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+Doe, “Ends with period inside quotes.”
+Doe, “Ends with question mark?”
+Doe, “Ends with an exclamation mark!”
+<<===== RESULT =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[
+  [
+    {
+      "id": "ITEM-1",
+      "suffix": ", \"Ends with period inside quotes.\""
+    }
+  ],
+  [
+    {
+      "id": "ITEM-1",
+      "suffix": ", \"Ends with question mark?\""
+    }
+  ],
+  [
+    {
+      "id": "ITEM-1",
+      "suffix": ", \"Ends with an exclamation mark!\""
+    }
+  ]
+]
+<<===== CITATION-ITEMS =====<<
+
+
+>>===== CSL =====>>
+<style
+      xmlns="http://purl.org/net/xbiblio/csl"
+      class="note"
+      version="1.0"
+      default-locale="en-US">
+  <info>
+    <id />
+    <title />
+    <updated>2026-05-03T22:24:00+00:00</updated>
+  </info>
+  <citation>
+    <layout suffix=".">
+      <names variable="author">
+        <name form="short" />
+      </names>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "author": [
+      {
+        "family": "Doe",
+        "given": "John"
+      }
+    ],
+    "id": "ITEM-1",
+    "type": "book"
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/issue_179_paren.txt b/test/extra/issue_179_paren.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/issue_179_paren.txt
@@ -0,0 +1,63 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+Doe, (E.D. Wisc.).
+<<===== RESULT =====<<
+
+
+>>===== CITATION-ITEMS =====>>
+[
+  [
+    {
+      "id": "ITEM-1",
+      "suffix": ", (E.D. Wisc.)"
+    }
+  ]
+]
+<<===== CITATION-ITEMS =====<<
+
+
+>>===== CSL =====>>
+<style
+      xmlns="http://purl.org/net/xbiblio/csl"
+      class="note"
+      version="1.0"
+      default-locale="en-US">
+  <info>
+    <id />
+    <title />
+    <updated>2026-05-03T22:24:00+00:00</updated>
+  </info>
+  <citation>
+    <layout suffix=".">
+      <names variable="author">
+        <name form="short" />
+      </names>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {
+    "author": [
+      {
+        "family": "Doe",
+        "given": "John"
+      }
+    ],
+    "id": "ITEM-1",
+    "type": "book"
+  }
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/label_DigitGroupedNumberIsSingular.txt b/test/extra/label_DigitGroupedNumberIsSingular.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/label_DigitGroupedNumberIsSingular.txt
@@ -0,0 +1,43 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+no. US 9,876,543; no. 9,876,543; no. US 123; nos. 5, 6; nos. 5-7
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2026-10-11T00:00:00+00:00</updated>
+  </info>
+  <citation>
+    <layout delimiter="; ">
+      <group delimiter=" ">
+        <label variable="number" form="short"/>
+        <text variable="number"/>
+      </group>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {"id": "ITEM-1", "type": "patent", "number": "US 9,876,543"},
+  {"id": "ITEM-2", "type": "patent", "number": "9,876,543"},
+  {"id": "ITEM-3", "type": "patent", "number": "US 123"},
+  {"id": "ITEM-4", "type": "patent", "number": "5, 6"},
+  {"id": "ITEM-5", "type": "patent", "number": "5-7"}
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/name_InitializeArabicGivenName.txt b/test/extra/name_InitializeArabicGivenName.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/name_InitializeArabicGivenName.txt
@@ -0,0 +1,39 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+الحسن, أ.; Doe, J.
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2026-10-11T00:00:00+00:00</updated>
+  </info>
+  <citation>
+    <layout delimiter="; ">
+      <names variable="author">
+        <name initialize-with=". " name-as-sort-order="all"/>
+      </names>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {"id": "ITEM-1", "type": "book", "author": [{"family": "الحسن", "given": "أحمد"}]},
+  {"id": "ITEM-2", "type": "book", "author": [{"family": "Doe", "given": "John"}]}
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/name_InitializeTurkishDotlessI.txt b/test/extra/name_InitializeTurkishDotlessI.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/name_InitializeTurkishDotlessI.txt
@@ -0,0 +1,51 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+Initialization of a name like "MIsak" abbreviates to the first two
+letters (cf. name_LongAbbreviation), lowercasing the second.  With a
+Turkish locale, "I" must lowercase to dotless "ı", not "i".
+
+>>===== RESULT =====>>
+Mı. Yılmaz
+<<===== RESULT =====<<
+
+>>===== CSL =====>>
+<style
+      xmlns="http://purl.org/net/xbiblio/csl"
+      class="in-text"
+      version="1.0"
+      default-locale="tr-TR">
+  <info>
+    <id />
+    <title />
+    <updated>2009-08-10T04:49:00+09:00</updated>
+  </info>
+  <citation>
+    <layout>
+      <names variable="author">
+        <name initialize-with=". "/>
+      </names>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+>>===== INPUT =====>>
+[
+    {
+        "id": "ITEM-1",
+        "author": [
+            {
+                "family": "Yılmaz",
+                "given": "MIsak"
+            }
+        ],
+        "type": "book"
+    }
+]
+<<===== INPUT =====<<
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/extra/name_NoInitialsForCjkGivenName.txt b/test/extra/name_NoInitialsForCjkGivenName.txt
new file mode 100644
--- /dev/null
+++ b/test/extra/name_NoInitialsForCjkGivenName.txt
@@ -0,0 +1,39 @@
+>>===== MODE =====>>
+citation
+<<===== MODE =====<<
+
+
+>>===== RESULT =====>>
+王小明; J. Doe
+<<===== RESULT =====<<
+
+
+>>===== CSL =====>>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
+  <info>
+    <id />
+    <title />
+    <updated>2026-10-11T00:00:00+00:00</updated>
+  </info>
+  <citation>
+    <layout delimiter="; ">
+      <names variable="author">
+        <name initialize-with=". "/>
+      </names>
+    </layout>
+  </citation>
+</style>
+<<===== CSL =====<<
+
+
+>>===== INPUT =====>>
+[
+  {"id": "ITEM-1", "type": "book", "author": [{"family": "王", "given": "小明"}]},
+  {"id": "ITEM-2", "type": "book", "author": [{"family": "Doe", "given": "John"}]}
+]
+<<===== INPUT =====<<
+
+
+>>===== VERSION =====>>
+1.0
+<<===== VERSION =====<<
diff --git a/test/overrides/flipflop_NumericField.expected b/test/overrides/flipflop_NumericField.expected
new file mode 100644
--- /dev/null
+++ b/test/overrides/flipflop_NumericField.expected
@@ -0,0 +1,1 @@
+1er
diff --git a/test/overrides/flipflop_NumericField.txt b/test/overrides/flipflop_NumericField.txt
--- a/test/overrides/flipflop_NumericField.txt
+++ b/test/overrides/flipflop_NumericField.txt
@@ -1,7 +1,3 @@
-Note:  since the spec doesn't demand the strange output
-expected by citeproc-js, and the output our library gives
-seems clearly better, we treat this as passing.
-
 >>===== MODE =====>>
 citation
 <<===== MODE =====<<
@@ -20,7 +16,7 @@
 
 
 >>===== RESULT =====>>
-1<sup>er</sup>
+1&#60;sup&#62;er&#60;/sup&#62;
 <<===== RESULT =====<<
 
 >>===== CSL =====>>
diff --git a/test/overrides/fullstyles_ABdNT.expected b/test/overrides/fullstyles_ABdNT.expected
new file mode 100644
--- /dev/null
+++ b/test/overrides/fullstyles_ABdNT.expected
@@ -0,0 +1,3 @@
+<div class="csl-bib-body">
+  <div class="csl-entry">COLE, S. J.; MOORE, R. Hydrological modelling using raingauge- and radar-based estimators of areal rainfall. <b>Journal of Hydrology</b>, v. 358, n. 3-4, p. 159–181, 2008.</div>
+</div>